Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Website fixtures & Deployment #122

Merged
merged 7 commits into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deployment/dev/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ services:
- "2600:5432"
volumes:
- ./init.sql:/docker-entrypoint-initdb.d/init.sql
- ./psql-data/app:/var/lib/postgresql/betterfleet/data/pgdata
- /psql-data/app:/var/lib/postgresql/data
- /etc/localtime:/etc/localtime:ro
environment:
POSTGRES_USER: ${POSTGRES_USER}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
POSTGRES_DB: BetterFleet
PGDATA: /var/lib/postgresql/betterfleet/data/pgdata
PGDATA: /var/lib/postgresql/data
restart: unless-stopped
2 changes: 1 addition & 1 deletion deployment/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
- "2600:5432"
volumes:
- ./init.sql:/docker-entrypoint-initdb.d/init.sql
- ./psql-data/app:/var/lib/postgresql/betterfleet/data/pgdata
- /psql-data/app:/var/lib/postgresql/betterfleet/data/pgdata
- /etc/localtime:/etc/localtime:ro
environment:
POSTGRES_USER: ${POSTGRES_USER}
Expand Down
1 change: 1 addition & 0 deletions webapp/.env.development
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
VITE_BACKEND_HOST="http://127.0.0.1:8080"
VITE_SOCKET_HOST="ws://127.0.0.1:8080/sessions"
VITE_VERSION=$npm_package_version
VITE_DEBUG=true
3 changes: 2 additions & 1 deletion webapp/.env.production
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
VITE_SOCKET_HOST=wss://betterfleet.fr/api/sessions
VITE_VERSION=$npm_package_version
VITE_VERSION=$npm_package_version
VITE_DEBUG=false
2 changes: 1 addition & 1 deletion webapp/src/assets/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ html, body {

.v-enter-active,
.v-leave-active {
transition: 0.3s ease;
transition: 0.1s ease;
}

.v-enter-from,
Expand Down
1 change: 1 addition & 0 deletions website/.env.development
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
VITE_BACKEND_HOST="http://127.0.0.1:8080"
VITE_VERSION=$npm_package_version
VITE_DEBUG=true
3 changes: 2 additions & 1 deletion website/.env.production
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
VITE_BACKEND_HOST=VITE_BACKEND_HOST_PLACEHOLDER
VITE_VERSION=$npm_package_version
VITE_VERSION=$npm_package_version
VITE_DEBUG=false
3 changes: 3 additions & 0 deletions website/src/assets/backgrounds/card-footer-blue.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions website/src/assets/backgrounds/card-footer-gray.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions website/src/assets/backgrounds/card-footer-orange.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading