Skip to content

Commit

Permalink
Merge pull request #11 from vevcom/feat/frontpage
Browse files Browse the repository at this point in the history
Feat/frontpage
  • Loading branch information
JohanHjelsethStorstad authored Oct 4, 2023
2 parents 0807ce3 + 3b34a70 commit cf50309
Show file tree
Hide file tree
Showing 30 changed files with 582 additions and 91 deletions.
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## Config
You need a .env file (this file is gitignored). You can fined default values in default.env

## Development
You have to run veven repo alongside this project to get access to the api and database. So have veven running in its docker-containers.
You have to run veven alongside this project to get access to the api and database. So have veven running in its docker-containers.

Then run:
```bash
Expand Down
3 changes: 2 additions & 1 deletion default.env
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
PROXY_URL=localhost:8080
PROXY_URL=localhost:8080
GOOGLE_MAPS_API_KEY=HMMMMMMMMM
3 changes: 2 additions & 1 deletion docker-compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ services:
volumes:
- ./src:/usr/src/app/src
environment:
PROXY_URL: ${PROXY_URL}
PROXY_URL: ${PROXY_URL}
GOOGLE_MAPS_API_KEY: ${GOOGLE_MAPS_API_KEY}
1 change: 1 addition & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ services:
- 3000:3000
environment:
PROXY_URL: ${PROXY_URL}
GOOGLE_MAPS_API_KEY: ${GOOGLE_MAPS_API_KEY}

160 changes: 96 additions & 64 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"@fortawesome/react-fontawesome": "^0.2.0",
"eslint": "8.48.0",
"eslint-config-next": "13.4.19",
"next": "13.4.19",
"google-map-react": "^2.2.1",
"next": "^13.5.4",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-fontawesome": "^1.7.1",
Expand Down
Loading

0 comments on commit cf50309

Please sign in to comment.