From 53566166c2528c0b25d6320617f297647428f241 Mon Sep 17 00:00:00 2001
From: Italo A <italoaurelior@gmail.com>
Date: Fri, 16 Jun 2023 23:58:17 -0300
Subject: [PATCH 1/2] fix: prettier bug in recent version
 prettier/prettier-vscode/issues/3020

---
 .gitignore            | 2 --
 .vscode/settings.json | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.gitignore b/.gitignore
index cdb02b84..c7bf6a2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,5 +105,3 @@ dist
 
 # PostgreSQL directory
 postgres/
-
-.vscode
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..5aaab13e
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1 @@
+{ "prettier.prettierPath": "./node_modules/prettier" }

From 364646beff8b4de30820b75120fc59719a11282d Mon Sep 17 00:00:00 2001
From: Italo A <italoaurelior@gmail.com>
Date: Fri, 16 Jun 2023 23:58:35 -0300
Subject: [PATCH 2/2] fix: env logic inside project

---
 .devcontainer/docker-compose.yml |  2 --
 .env.example                     | 20 --------------------
 backend/.env.example             |  2 +-
 3 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 .env.example

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index b5462150..90e00a71 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -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
diff --git a/.env.example b/.env.example
deleted file mode 100644
index 2f00880c..00000000
--- a/.env.example
+++ /dev/null
@@ -1,20 +0,0 @@
-############################### NestJS Setup ################################
-SESSION_SECRET="example"
-
-
-############################### Prisma Setup ################################
-POSTGRES_USER="example"
-POSTGRES_PASSWORD="example"
-POSTGRES_DB="example"
-POSTGRES_HOST="example"
-
-DATABASE_URL="postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?schema=public"
-
-############################### Intra Auth Setup ################################
-INTRA_CLIENT_ID=""
-INTRA_CLIENT_SECRET=""
-INTRA_CALLBACK_URL="http://localhost:3000/auth/intra/callback"
-
-############################### React Setup ################################
-
-API_URL="localhost:3000"
\ No newline at end of file
diff --git a/backend/.env.example b/backend/.env.example
index 47b848a0..e58739c1 100644
--- a/backend/.env.example
+++ b/backend/.env.example
@@ -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=""