From 27608d7e8cbed612f1c294f5d0f1addc3f109543 Mon Sep 17 00:00:00 2001 From: megiSW Date: Sun, 29 Oct 2023 11:45:33 +0100 Subject: [PATCH 01/13] fix: use regular commands instead of workspace cmd --- vercel.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vercel.json b/vercel.json index 7621614..cb36583 100644 --- a/vercel.json +++ b/vercel.json @@ -6,7 +6,7 @@ }, "installCommand": "npm i", - "buildCommand": "npm run build -w=packages/frontend && npm run build -w=packages/backend", + "buildCommand": "cd packages/frontend && npm run build && cd ../backend && npm run build", "builds": [ { "src": "/dist/packages/backend/main.ts", From 90d227583698f3cf5d0967a9a4902f8fa0dffbbb Mon Sep 17 00:00:00 2001 From: megiSW Date: Sun, 29 Oct 2023 11:48:41 +0100 Subject: [PATCH 02/13] fix --- vercel.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vercel.json b/vercel.json index cb36583..88549a4 100644 --- a/vercel.json +++ b/vercel.json @@ -5,8 +5,7 @@ "enabled": false }, "installCommand": "npm i", - - "buildCommand": "cd packages/frontend && npm run build && cd ../backend && npm run build", + "buildCommand": "ls && pwd && cd packages/frontend && npm run build && cd ../backend && npm run build", "builds": [ { "src": "/dist/packages/backend/main.ts", From 344944797bb495f0aeaae9f000e528fd8454aaf4 Mon Sep 17 00:00:00 2001 From: megiSW Date: Sun, 29 Oct 2023 11:59:00 +0100 Subject: [PATCH 03/13] use proxy for user login --- packages/frontend/vite.config.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/frontend/vite.config.ts b/packages/frontend/vite.config.ts index 14fa6c6..fd7238b 100644 --- a/packages/frontend/vite.config.ts +++ b/packages/frontend/vite.config.ts @@ -6,7 +6,13 @@ import { defineConfig } from 'vite' export default defineConfig({ plugins: [vue()], server: { - port: 8080 + port: 8080, + proxy: { + '/user/login': { + target: 'https://hay-baselhack-dev.vercel.app', + changeOrigin: true + } + } }, resolve: { alias: { From 8c4f863277b2a55ed969f0c591eb3748c279c049 Mon Sep 17 00:00:00 2001 From: nadiakramer Date: Sun, 29 Oct 2023 11:59:02 +0100 Subject: [PATCH 04/13] wip: skip question if already answered --- packages/frontend/src/main.ts | 10 ++++++++++ packages/frontend/src/pages/Question.vue | 7 +++++++ 2 files changed, 17 insertions(+) diff --git a/packages/frontend/src/main.ts b/packages/frontend/src/main.ts index bd47add..22817f3 100644 --- a/packages/frontend/src/main.ts +++ b/packages/frontend/src/main.ts @@ -9,6 +9,7 @@ import 'vuetify/styles' import { createVuetify } from 'vuetify' import * as components from 'vuetify/components' import * as directives from 'vuetify/directives' +import axios from "axios"; const vuetify = createVuetify({ components, @@ -20,3 +21,12 @@ const app = createApp(App); app.use(vuetify); app.use(router); app.mount('#app'); + +axios.interceptors.response.use((response) => { + return response +}, (error) => { + if (error.response.status === 403) { + router.push('/login'); + } + return Promise.reject(error) +}) \ No newline at end of file diff --git a/packages/frontend/src/pages/Question.vue b/packages/frontend/src/pages/Question.vue index 5983616..eb2fe46 100644 --- a/packages/frontend/src/pages/Question.vue +++ b/packages/frontend/src/pages/Question.vue @@ -3,6 +3,7 @@ import QuestionInput from '@/components/ui/question-input/QuestionInput.vue' import QuestionCard from '@/components/ui/question-card/QuestionCard.vue' import { onMounted, ref } from 'vue' import axios from 'axios' +import router from "@/router"; type Question = { title: string @@ -13,6 +14,12 @@ type Question = { const question = ref({ title: '', description: '', id: -1 }) onMounted(async () => { + // TODO: make user id dynamic + axios.get(`${import.meta.env.VITE_BACKEND_HOST}/circle/answer/user/24/daily`).then((response) => { + if (response.data) { + router.push('innercircles') + } + }) await getQuestion() }) From 6527b60401de184aaf7cab8f026cbbc98ef61f4b Mon Sep 17 00:00:00 2001 From: yveswehrli Date: Sun, 29 Oct 2023 12:06:23 +0100 Subject: [PATCH 05/13] Fix frontend --- packages/frontend/src/pages/Circle.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/src/pages/Circle.vue b/packages/frontend/src/pages/Circle.vue index 284f011..8181e6f 100644 --- a/packages/frontend/src/pages/Circle.vue +++ b/packages/frontend/src/pages/Circle.vue @@ -13,7 +13,7 @@ type Answer = { username: string answerId: number answer: string - emotion: string + emotion: 'surprised' | 'happy' | 'scared' | 'sad' | 'angry' | 'rejecting' | undefined; } const answers = ref([]) From 7e5054a6def84fef43d7be3ea21eeff8b2c1fdd9 Mon Sep 17 00:00:00 2001 From: leonden Date: Sun, 29 Oct 2023 12:07:06 +0100 Subject: [PATCH 06/13] Post page comments etc. --- packages/frontend/src/pages/Post.vue | 106 ++++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 4 deletions(-) diff --git a/packages/frontend/src/pages/Post.vue b/packages/frontend/src/pages/Post.vue index ec1fa3a..c01c978 100644 --- a/packages/frontend/src/pages/Post.vue +++ b/packages/frontend/src/pages/Post.vue @@ -1,15 +1,113 @@ From 215b6b92a15eb59321ce6a6f81074d933d9ba06a Mon Sep 17 00:00:00 2001 From: mereditsommer Date: Sun, 29 Oct 2023 12:16:19 +0100 Subject: [PATCH 07/13] get answers and post answer --- .../ui/question-input/QuestionInput.vue | 134 +++++++++++++----- packages/frontend/src/pages/Circle.vue | 15 +- 2 files changed, 109 insertions(+), 40 deletions(-) diff --git a/packages/frontend/src/components/ui/question-input/QuestionInput.vue b/packages/frontend/src/components/ui/question-input/QuestionInput.vue index a384c02..6bb2abd 100644 --- a/packages/frontend/src/components/ui/question-input/QuestionInput.vue +++ b/packages/frontend/src/components/ui/question-input/QuestionInput.vue @@ -1,75 +1,135 @@