Merge remote-tracking branch 'origin/main' into board-view-content

index.html

@@ -74,7 +74,7 @@
         <script src="/vendor/libs/hammer/hammer.js"></script>
         <script src="/vendor/libs/i18n/i18n.js"></script>
         <script src="/vendor/libs/typeahead-js/typeahead.js"></script>
-        <!-- <script src="/vendor/js/menu.js"></script> -->
+        <script src="/vendor/js/menu.js"></script>
         <!-- endbuild -->
 
         <!-- Vendors JS -->

src/common/axios-interceptor.js

@@ -1,4 +1,5 @@
 import axios from "axios";
+import { useRoute } from 'vue-router';
 import { useToastStore } from '@s/toastStore';
 
 const $api = axios.create({
@@ -37,11 +38,16 @@ $api.interceptors.response.use(
     },
     function (error) {
         const toastStore = useToastStore()
+        const currentPage = error.config.headers['X-Page-Route'];
         // 오류 응답 처리
         if (error.response) {
             switch (error.response.status) {
                 case 401:
-                    toastStore.onToast('아이디 혹은 비밀번호가 틀렸습니다.', 'e');
+                    if (currentPage === '/login') {
+                        toastStore.onToast('아이디 혹은 비밀번호가 틀렸습니다.', 'e');
+                    } else {
+                        toastStore.onToast('인증이 필요합니다.', 'e');
+                    }
                     break;
                 case 403:
                     toastStore.onToast('접근 권한이 없습니다.', 'e');

src/components/user/LoginForm.vue

@@ -38,10 +38,10 @@
 <script setup>
     import $api from '@api';
     import router from '@/router';
+    import { useRoute } from 'vue-router';
     import { ref } from 'vue';
     import UserFormInput from '@c/input/UserFormInput.vue';
     import { useUserStore } from '@s/useUserStore';
-    import { useToastStore } from '@s/toastStore';
 
     const id = ref('');
     const password = ref('');
@@ -50,7 +50,7 @@
     const remember = ref(false);
 
     const userStore = useUserStore();
-    const toastStore = useToastStore();
+    const route = useRoute();
 
     const handleIdChange = value => {
         id.value = value;
@@ -67,7 +67,7 @@
             loginId: id.value,
             password: password.value,
             remember: remember.value,
-        })
+        }, { headers: { 'X-Page-Route': route.path } })
         .then(res => {
             if (res.status === 200) {
                 userStore.userInfo();