From ad4bfae0de94d7ad8e6bdbf370da164a0ad5cc8b Mon Sep 17 00:00:00 2001 From: study2895 <144806675+study2895@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:35:02 +0900 Subject: [PATCH 1/5] =?UTF-8?q?Docs:=20.env=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index bb72122..8edb782 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ #백엔드 포트 번호 -VUE_APP_BE_API_URL=http://localhost:8082 +VUE_APP_BE_API_URL=http://ec2-43-202-20-87.ap-northeast-2.compute.amazonaws.com:8080/ From 5af465ef6bc185a84cc331e942f4656d8d132b50 Mon Sep 17 00:00:00 2001 From: study2895 <144806675+study2895@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:35:29 +0900 Subject: [PATCH 2/5] =?UTF-8?q?Chore:=20proxy=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue.config.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vue.config.js b/vue.config.js index ac2a854..b80d265 100644 --- a/vue.config.js +++ b/vue.config.js @@ -17,9 +17,9 @@ module.exports = defineConfig({ devServer: { proxy: { '/api': { - target: 'http://localhost:8082', // 백엔드 서버 주소 - changeOrigin: true, // 백엔드 서버의 도메인과 상관없이 요청을 보낼 수 있게 허용 - secure: false // HTTPS가 아니므로 설정 (필요한 경우 추가) + target: + 'http://ec2-43-202-20-87.ap-northeast-2.compute.amazonaws.com:8080', + changeOrigin: true } }, port: 3000 From f46aade67d3768a2b70a61fbc3900ac6c6d60f34 Mon Sep 17 00:00:00 2001 From: study2895 <144806675+study2895@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:39:09 +0900 Subject: [PATCH 3/5] =?UTF-8?q?[Feature]=20#21=20-=20=EC=8A=A4=ED=83=AC?= =?UTF-8?q?=ED=94=84=20=EB=B6=80=EB=B6=84=20=EC=A0=9C=EC=99=B8=20=EB=B0=B1?= =?UTF-8?q?=EC=97=94=EB=93=9C=20=EC=97=B0=EA=B2=B0=20=EB=A1=9C=EC=A7=81=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1(=ED=80=98=EC=8A=A4=ED=8A=B8,=20=EC=95=84?= =?UTF-8?q?=EC=BD=94=20=EC=BA=90=EB=A6=AD=ED=84=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/mainpage/MainpageView.vue | 75 ++++++++++++++++++++++++----- 1 file changed, 62 insertions(+), 13 deletions(-) diff --git a/src/views/mainpage/MainpageView.vue b/src/views/mainpage/MainpageView.vue index ee1d75c..599878f 100644 --- a/src/views/mainpage/MainpageView.vue +++ b/src/views/mainpage/MainpageView.vue @@ -110,11 +110,7 @@ 토실토실 아코가 자라는 중

- 아코 이미지 + 아코 이미지 @@ -123,7 +119,8 @@ From db92065ddbad0a8fd1f20309ee132a4a62af5b71 Mon Sep 17 00:00:00 2001 From: study2895 <144806675+study2895@users.noreply.github.com> Date: Mon, 4 Nov 2024 16:46:06 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[Feature]=20#21=20-=20=EC=8A=A4=ED=83=AC?= =?UTF-8?q?=ED=94=84=20=EB=B6=80=EB=B6=84=20=EB=B0=B1=EC=97=94=EB=93=9C=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 추후에 url 수정 필요 --- src/views/mainpage/MainpageView.vue | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/src/views/mainpage/MainpageView.vue b/src/views/mainpage/MainpageView.vue index 599878f..75a9fae 100644 --- a/src/views/mainpage/MainpageView.vue +++ b/src/views/mainpage/MainpageView.vue @@ -154,15 +154,35 @@ const fetchQuestStatus = async () => { // 스탬프 상태 정의 const stamps = ref([ - { label: 'A', completed: true, position: { top: '-18px', left: '12px' } }, - { label: 'K', completed: true, position: { top: '-18px', left: '147px' } }, - { label: 'O', completed: true, position: { top: '62px', left: '262px' } }, + { label: 'A', completed: false, position: { top: '-18px', left: '12px' } }, + { label: 'K', completed: false, position: { top: '-18px', left: '147px' } }, + { label: 'O', completed: false, position: { top: '62px', left: '262px' } }, { label: 'M', completed: false, position: { top: '144px', left: '157px' } }, { label: 'I', completed: false, position: { top: '144px', left: '22px' } }, { label: 'N', completed: false, position: { top: '297px', left: '102px' } }, { label: 'G', completed: false, position: { top: '297px', left: '237px' } } ]) +// 각 스탬프의 상태를 받아와서 stamps에 업데이트하는 함수 +const fetchStampsStatus = async () => { + try { + const userId = 'user-id' // 실제 사용자 ID로 설정해야 함 + const response = await axios.get(`/api/quests/${userId}`) + const { stamp1, stamp2, stamp3, stamp4, stamp5, stamp6, stamp7 } = + response.data + + stamps.value[0].completed = stamp1 // 스탬프 A + stamps.value[1].completed = stamp2 // 스탬프 K + stamps.value[2].completed = stamp3 // 스탬프 O + stamps.value[3].completed = stamp4 // 스탬프 M + stamps.value[4].completed = stamp5 // 스탬프 I + stamps.value[5].completed = stamp6 // 스탬프 N + stamps.value[6].completed = stamp7 // 스탬프 G + } catch (error) { + console.error('스탬프 상태를 가져오는 중 오류 발생:', error) + } +} + // 아코 이미지 경로 저장할 변수 const elephantIcons = [ '@/assets/Icons/akoming/mainpage/ako-01.svg', @@ -216,8 +236,10 @@ const getTaskIcon = (taskName) => { } } +// onMounted에서 호출하여 초기 데이터 로드 onMounted(() => { fetchQuestStatus() + fetchStampsStatus() // 스탬프 상태도 불러오기 setElephantIconByLevel() }) From 0a05812f5b886bd1b293d70c96cf064d91379d3c Mon Sep 17 00:00:00 2001 From: study2895 <144806675+study2895@users.noreply.github.com> Date: Wed, 6 Nov 2024 14:55:53 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[Fix]=20Tailwind=20CSS=20purge=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tailwind.config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tailwind.config.js b/tailwind.config.js index c2d3c9f..c5068bb 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -17,5 +17,6 @@ module.exports = { } } }, - plugins: [] + plugins: [], + purge: ['./src/**/*.html', './src/**/*.vue', './public/**/*.html'] }