From 27b2dad82f54f1b09c998c17ecf31bb049aa6b10 Mon Sep 17 00:00:00 2001
From: hso <sh07202@naver.com>
Date: Thu, 13 Jun 2024 13:49:31 +0900
Subject: [PATCH 1/5] =?UTF-8?q?refactor(App)=20:=20=EA=B8=80=EC=94=A8?=
 =?UTF-8?q?=EC=B2=B4=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/App.vue b/src/App.vue
index ef80e85..b394b7c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -28,10 +28,19 @@ onMounted(() => {
 </script>
 
 <style>
+
+@font-face {
+    font-family: 'Pretendard-Regular';
+    src: url('https://fastly.jsdelivr.net/gh/Project-Noonnu/noonfonts_2107@1.1/Pretendard-Regular.woff') format('woff');
+    font-weight: 400;
+    font-style: normal;
+}
+
 #app {
   display: flex;
   flex-direction: column;
   height: 100vh;
+  font-family: 'Pretendard-Regular';
 }
 
 header {

From 136f011f3f3f74343fb767fc9c1327e50664d128 Mon Sep 17 00:00:00 2001
From: hso <sh07202@naver.com>
Date: Thu, 13 Jun 2024 14:32:33 +0900
Subject: [PATCH 2/5] =?UTF-8?q?hotfix(App)=20:=20=ED=9A=8C=EC=9B=90=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EB=B2=84=ED=8A=BC=EC=A1=B0=EA=B1=B4=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80,=20=EC=95=88=EB=82=B4=20=EB=AC=B8=EA=B5=AC?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/post/CreateNewGeneralPost.vue | 2 +-
 src/components/post/CreateNewPost.vue        | 5 +++--
 src/components/post/SelectedPostDetail.vue   | 4 ++--
 src/components/user/EditMyInfo.vue           | 1 +
 src/views/Study.vue                          | 2 +-
 src/views/WorkspaceView.vue                  | 6 +++---
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/components/post/CreateNewGeneralPost.vue b/src/components/post/CreateNewGeneralPost.vue
index f5f716d..0c3b3e8 100644
--- a/src/components/post/CreateNewGeneralPost.vue
+++ b/src/components/post/CreateNewGeneralPost.vue
@@ -18,7 +18,7 @@
         </div>
 
         <p id="content-info">
-            <small>※ 마우스 오른쪽 버튼 클릭 시, 파일 업로드가 가능합니다.</small>
+            <small class="text-muted">※ 마우스 오른쪽 버튼 클릭 시, 파일 업로드가 가능합니다.</small>
             <span><b-button variant="outline-secondary" data-bs-toggle="modal"
                     data-bs-target="#preview">미리보기</b-button></span>
 
diff --git a/src/components/post/CreateNewPost.vue b/src/components/post/CreateNewPost.vue
index 03ab80a..f6759cb 100644
--- a/src/components/post/CreateNewPost.vue
+++ b/src/components/post/CreateNewPost.vue
@@ -25,7 +25,7 @@
                     </div>
 
                     <p id="content-info">
-                        <small>※ 마우스 오른쪽 버튼 클릭 시, 파일 업로드가 가능합니다.</small>
+                        <small class="text-muted">※ 마우스 오른쪽 버튼 클릭 시, 파일 업로드가 가능합니다.</small>
 
                     <div>
                         <span>
@@ -82,7 +82,7 @@
                             <b-badge class="ai-menu" @click="requestToAI($event)">맞춤법 교정</b-badge>
                         </p>
                         <div id="ai-content" class="card">
-                            <p><span class="material-icons">info</span>&nbsp;<small>응답 메시지 박스 클릭 시, 내용 복사</small>
+                            <p>&nbsp;<small>※ 응답 메시지 박스 클릭 시, 내용 복사</small>
                             </p>
 
                         </div>
@@ -323,6 +323,7 @@ async function getPostById(originId) {
 #content-info {
     display: flex;
     justify-content: space-between;
+    align-items: flex-end;
 }
 
 #container {
diff --git a/src/components/post/SelectedPostDetail.vue b/src/components/post/SelectedPostDetail.vue
index 4ce461c..020a876 100644
--- a/src/components/post/SelectedPostDetail.vue
+++ b/src/components/post/SelectedPostDetail.vue
@@ -127,7 +127,7 @@
               <div class="history" id="historyContent">
                 <h4 id="title"> {{ historyPost.title }} </h4>
                 <div id="date-restore">
-                  <small> {{ convertToDate(historyPost.createdAt) }}</small>
+                  <small class="text-muted"> {{ convertToDate(historyPost.createdAt) }}</small>
                   &nbsp;<b-button size="sm" variant="outline-secondary" @click="restorePost()">버전 복원하기</b-button>
                 </div>
                 <div id="tag-div">
@@ -156,7 +156,7 @@
                           <span> &nbsp;{{ history.author.name }}&nbsp; </span>
                         </h5>
                         </p>
-                        <small>{{ convertToDate(history.createdAt) }}</small>
+                        <small class="text-muted">{{ convertToDate(history.createdAt) }}</small>
                       </div>
                     </b-list-group-item>
                   </template>
diff --git a/src/components/user/EditMyInfo.vue b/src/components/user/EditMyInfo.vue
index 429cbba..5a997a8 100644
--- a/src/components/user/EditMyInfo.vue
+++ b/src/components/user/EditMyInfo.vue
@@ -17,6 +17,7 @@
         <div class="form-group">
           <label for="profileImg">프로필 이미지:</label>
           <input type="file" id="profileImg" @change="handleProfileImgChange" />
+          <p class="text-muted"><small>이미지는 1mb 이하만 업로드 가능합니다.</small></p>
         </div>
       </form>
     </div>
diff --git a/src/views/Study.vue b/src/views/Study.vue
index b384df1..4bb7b82 100644
--- a/src/views/Study.vue
+++ b/src/views/Study.vue
@@ -11,7 +11,7 @@
         </select>
       </span>
       <span v-else class="no-study-message">스터디가 존재하지 않습니다.</span>
-      &nbsp;&nbsp;<span id="addEmployeeModal" data-bs-toggle="modal" data-bs-target="#addTab"><small>+ 스터디원 추가</small></span>
+      &nbsp;&nbsp;<span id="addEmployeeModal" data-bs-toggle="modal" data-bs-target="#addTab" class="text-muted"><small>+ 스터디원 추가</small></span>
 
         <div class="addEmployee-modal">
           <div class="modal fade" id="addTab" tabindex="-1" aria-labelledby="addTabLabel" aria-hidden="true">
diff --git a/src/views/WorkspaceView.vue b/src/views/WorkspaceView.vue
index 9d65106..15ab89c 100644
--- a/src/views/WorkspaceView.vue
+++ b/src/views/WorkspaceView.vue
@@ -3,7 +3,7 @@
         <router-link class="w-tab" active-class="active" :to="`/workspace/${route.params.id}/wiki`">WIKI</router-link>
         &nbsp;
         <router-link class="w-tab" active-class="active" :to="`/workspace/${route.params.id}/docs`">DOCS</router-link>
-        &nbsp;&nbsp;<span data-bs-toggle="modal" data-bs-target="#addTab"><small>+ 팀원 추가</small></span>
+        &nbsp;&nbsp;<span v-if="isAdmin" data-bs-toggle="modal" data-bs-target="#addTab"class="text-muted"><small>+ 팀원 추가</small></span>
 
 
         <div class="addEmployee-modal">
@@ -62,7 +62,7 @@
 </template>
 
 <script setup>
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 import { RouterView, useRoute } from "vue-router";
 import axios from 'axios';
 
@@ -71,7 +71,7 @@ const selected = ref(null);
 const addEmployee = ref(null);
 const search = ref('');
 const searchEmployeeList = ref(null);
-
+const isAdmin = computed(() => ['ROLE_ADMIN', 'ROLE_HR_MANAGER', 'ROLE_LEADER'].includes(localStorage.getItem('userRole')));
 
 async function saveNewTab() {
   const requestData = {

From 89990de1ae16baad4af2bc0f95719691e8c09b2d Mon Sep 17 00:00:00 2001
From: hso <sh07202@naver.com>
Date: Thu, 13 Jun 2024 15:01:23 +0900
Subject: [PATCH 3/5] =?UTF-8?q?hotfix(app)=20:=20=EC=8A=A4=ED=84=B0?=
 =?UTF-8?q?=EB=94=94=20=EC=97=86=EC=9D=84=20=EA=B2=BD=EC=9A=B0,=20?=
 =?UTF-8?q?=EC=8A=A4=ED=84=B0=EB=94=94=EC=9B=90=20=EC=B6=94=EA=B0=80=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Study.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/Study.vue b/src/views/Study.vue
index 4bb7b82..1ee4126 100644
--- a/src/views/Study.vue
+++ b/src/views/Study.vue
@@ -10,8 +10,9 @@
           </option>
         </select>
       </span>
+      &nbsp;&nbsp;<span v-if="studyTab && studyTab.length > 0" id="addEmployeeModal" data-bs-toggle="modal" data-bs-target="#addTab" class="text-muted"><small>+ 스터디원 추가</small></span>
       <span v-else class="no-study-message">스터디가 존재하지 않습니다.</span>
-      &nbsp;&nbsp;<span id="addEmployeeModal" data-bs-toggle="modal" data-bs-target="#addTab" class="text-muted"><small>+ 스터디원 추가</small></span>
+      
 
         <div class="addEmployee-modal">
           <div class="modal fade" id="addTab" tabindex="-1" aria-labelledby="addTabLabel" aria-hidden="true">

From 089737d977a76ae755cbc8dc0f88232d6d3cac00 Mon Sep 17 00:00:00 2001
From: hso <sh07202@naver.com>
Date: Thu, 13 Jun 2024 15:22:48 +0900
Subject: [PATCH 4/5] =?UTF-8?q?hotfix(login)=20:=20navbar=20=EC=83=88?=
 =?UTF-8?q?=EB=A1=9C=EA=B3=A0=EC=B9=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/user/Login.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/user/Login.vue b/src/components/user/Login.vue
index aaf6a6c..38a548b 100644
--- a/src/components/user/Login.vue
+++ b/src/components/user/Login.vue
@@ -71,6 +71,7 @@ async function login() {
         }
         
         await router.push('/wiki/1');
+        location.reload();
       } else if (authResponse.status === 202) {
         // MFA 인증 필요
         mfaRequired.value = true;

From b34e77acb63e73a8083808208d79ed390adba677 Mon Sep 17 00:00:00 2001
From: hso <sh07202@naver.com>
Date: Thu, 13 Jun 2024 15:24:26 +0900
Subject: [PATCH 5/5] =?UTF-8?q?hotfix(axios)=20:=20=EC=9D=B8=ED=84=B0?=
 =?UTF-8?q?=EC=85=89=ED=84=B0=20=EC=A3=BC=EC=84=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main.js b/src/main.js
index 6fcb69a..3f1523f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -19,17 +19,17 @@ axios.defaults.baseURL = 'http://triumers-back.ap-northeast-2.elasticbeanstalk.c
 axios.defaults.withCredentials = true; // 쿠키를 포함하여 요청을 보내도록 설정합니다.
 
 // Axios 인터셉터 설정
-axios.interceptors.response.use(
-    response => response,
-    error => {
-        if (error.response && error.response.status === 403) {
-            alert('로그인 이후 이용해주세요.');
-            store.dispatch('logout'); // Vuex 스토어에서 로그아웃 액션을 호출합니다.
-            router.push('/login'); // 로그인 페이지로 리다이렉트합니다.
-        }
-        return Promise.reject();
-    }
-);
+// axios.interceptors.response.use(
+//     response => response,
+//     error => {
+//         if (error.response && error.response.status === 403) {
+//             alert('로그인 이후 이용해주세요.');
+//             store.dispatch('logout'); // Vuex 스토어에서 로그아웃 액션을 호출합니다.
+//             router.push('/login'); // 로그인 페이지로 리다이렉트합니다.
+//         }
+//         return Promise.reject();
+//     }
+// );
 
 import BootstrapVue3 from 'bootstrap-vue-3';
 import 'bootstrap/dist/css/bootstrap.css';