Merge branch 'main' of github.com:my-trash-bin/ft_transcendence

my-trash-bin · Dec 16, 2023 · 5280422 · 5280422
2 parents 0cc4533 + 006d84b
commit 5280422
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.env.sample b/.env.sample
@@ -4,8 +4,8 @@ DATABASE_URL="postgresql://ft_transcendence:supersecretpassword@db/ft_transcende
 NEXT_PUBLIC_API_ENDPOINT="https://localhost"
 NEXT_PUBLIC_UPLOADS_BASE="https://localhost"
 NEXT_PUBLIC_WS_ENDPOINT="wss://localhost"
-API_42_UID="u-s4t2ud-94c0c5cf7592264ccffbc786dac656324fd173fd328b1bc442dbf9e2d1f316a1"
-API_42_SECRET="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"
+API_42_UID="u-s4t2ud-something-something"
+API_42_SECRET="s-s4t2ud-something-something"
 API_42_CALLBACK="https://localhost/api/auth/42/callback"
 FRONTEND_ORIGIN="https://localhost"
 JWT_SECRET="super secret key :)"

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,7 +10,7 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode",
   },
   "editor.codeActionsOnSave": {
-    "source.organizeImports": true,
+    "source.organizeImports": "explicit"
   },
   "[prisma]": {
     "editor.formatOnSave": true,

diff --git a/project/backend/.env.sample.dev b/project/backend/.env.sample.dev
@@ -2,8 +2,8 @@ NODE_ENV="development"
 PORT=60080
 DATABASE_URL="postgresql://ft_transcendence:supersecretpassword@localhost:65432/ft_transcendence?schema=public"
 # TODO: regenerate/replace API secret later
-API_42_UID="u-s4t2ud-94c0c5cf7592264ccffbc786dac656324fd173fd328b1bc442dbf9e2d1f316a1"
-API_42_SECRET="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"
+API_42_UID="u-s4t2ud-something-something"
+API_42_SECRET="s-s4t2ud-something-something"
 API_42_CALLBACK="http://localhost:53000/api/auth/42/callback"
 FRONTEND_ORIGIN="http://localhost:53000"
 JWT_SECRET="super secret key :)"