From bd1dbcddaed3d8ef9206dd1ab33c9c313ac040a3 Mon Sep 17 00:00:00 2001 From: Christian Beutel <> Date: Fri, 29 Mar 2024 14:44:37 +0100 Subject: [PATCH] makes upload folder variable --- .gitignore | 3 --- docker-compose.yml | 5 +++-- web/cron.sh | 2 +- web/src/lib/stores/user_store.ts | 4 +--- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 1b45bf8a..e8fd0cda 100644 --- a/.gitignore +++ b/.gitignore @@ -7,9 +7,6 @@ search/meilisearch search/data.ms search/dumps -web/uploads/* -web/cookie.txt - run.sh build*.sh diff --git a/docker-compose.yml b/docker-compose.yml index 1f8df57d..7bcad73e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -53,8 +53,9 @@ services: BODY_SIZE_LIMIT: Infinity PUBLIC_POCKETBASE_URL: http://db:8090 PUBLIC_DISABLE_SIGNUP: false - UPLOAD_USER: Flomp - UPLOAD_PASSWORD: 12345678 + UPLOAD_FOLDER: /app/uploads + UPLOAD_USER: + UPLOAD_PASSWORD: volumes: - ./data/uploads:/app/uploads ports: diff --git a/web/cron.sh b/web/cron.sh index 608661e8..336e495c 100644 --- a/web/cron.sh +++ b/web/cron.sh @@ -4,7 +4,7 @@ API_URL="http://localhost:3000/api/v1" # Folder containing files to upload -UPLOAD_FOLDER="/app/uploads" +UPLOAD_FOLDER=$UPLOAD_FOLDER # Credentials for login USERNAME=$UPLOAD_USER diff --git a/web/src/lib/stores/user_store.ts b/web/src/lib/stores/user_store.ts index 2a8d916b..7f73102e 100644 --- a/web/src/lib/stores/user_store.ts +++ b/web/src/lib/stores/user_store.ts @@ -62,9 +62,7 @@ export async function oauth_login(data: { name: string, code: string, codeVerifi const r = await fetch('/api/v1/auth/oauth', { method: 'POST', body: JSON.stringify(data) - }) - console.log(r); - + }) if (r.ok) { pb.authStore.loadFromCookie(document.cookie)