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.

Sign up for GitHub

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

Fix/configs #49

Merged
merged 2 commits into from
Jun 17, 2023
Merged

Fix/configs #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5356616
fix: prettier bug in recent version prettier/prettier-vscode/issues/3020
iaurg Jun 17, 2023
364646b
fix: env logic inside project
iaurg Jun 17, 2023
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
2 changes: 0 additions & 2 deletions .devcontainer/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ services:
dockerfile: Dockerfile
working_dir: /workspaces/transcendence
entrypoint: /bin/sh -c 'tail --follow /dev/null'
env_file:
- ../.env
volumes:
# Map host folder to workspace
- ..:/workspaces/transcendence
Expand Down
20 changes: 0 additions & 20 deletions .env.example
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,5 +105,3 @@ dist

# PostgreSQL directory
postgres/

.vscode
1 change: 1 addition & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{ "prettier.prettierPath": "./node_modules/prettier" }
2 changes: 1 addition & 1 deletion backend/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ POSTGRES_PASSWORD="example"
POSTGRES_DB="example"
POSTGRES_HOST="example"

DATABASE_URL="postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?schema=public"
DATABASE_URL="postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:5432/${POSTGRES_DB}?schema=public"

############################### Intra Auth Setup ###############################
INTRA_CLIENT_ID=""
Expand Down