diff --git a/.env.dev b/.env.dev new file mode 100644 index 0000000..99081c1 --- /dev/null +++ b/.env.dev @@ -0,0 +1,5 @@ +VITE_DOMAIN = http://localhost:5173/ +# VITE_LOGIN_URL = http://localhost:10325/ms/ +# VITE_FILE_URL = http://localhost:10325/ms/ +# VITE_API_URL = http://localhost:10325/api/ +VITE_API_URL = http://localhost:10325/test/ \ No newline at end of file diff --git a/public/css/custom.css b/public/css/custom.css index 5c3e23b..2bf9c1b 100644 --- a/public/css/custom.css +++ b/public/css/custom.css @@ -29,68 +29,82 @@ /* 휴가*/ - .half-day-buttons { display: flex; justify-content: center; gap: 10px; margin-top: 20px; - } - .half-day-buttons .btn.active { - border: 2px solid black; - } - .fc-daygrid-day-frame { - min-height: 80px !important; - max-height: 120px !important; - overflow: hidden !important; - padding-top: 25px !important; - } - .fc-daygrid-day-events { - max-height: 100px !important; - overflow-y: auto !important; - } - .fc-daygrid-event { - position: absolute !important; - height: 20px !important; - width: 100% !important; - left: 0 !important; - margin: 2px 0 !important; - padding: 0 !important; - border-radius: 2px !important; - border: none !important; - } - .fc-daygrid-event-harness { - display: flex; - flex-direction: column; - align-items: flex-start; - justify-content: flex-start; - width: 100%; - gap: 22px; - } - .fc-daygrid-event.half-day-am { - width: 45% !important; - left: 0 !important; - } - .fc-daygrid-event.half-day-pm { - width: 45% !important; - left: auto !important; - right: 0 !important; - } - .fc-daygrid-event.full-day { - width: 100% !important; - left: 0 !important; - } - .fc-day-sun .fc-daygrid-day-number, - .fc-col-header-cell:first-child .fc-col-header-cell-cushion { - color: #ff4500 !important; - } - .fc-day-sat .fc-daygrid-day-number, - .fc-col-header-cell:last-child .fc-col-header-cell-cushion { - color: #6076e0 !important; - } - .fc-daygrid-day-number { - position: absolute !important; - top: 0px !important; - left: 5px !important; - text-align: left !important; - } \ No newline at end of file +} +.half-day-buttons .btn.active { + border: 2px solid black; +} +.fc-daygrid-day-frame { + min-height: 80px !important; + max-height: 120px !important; + overflow: hidden !important; + padding-top: 25px !important; +} +.fc-daygrid-day-events { + max-height: 100px !important; + overflow-y: auto !important; +} +.fc-daygrid-event { + position: absolute !important; + height: 20px !important; + width: 100% !important; + left: 0 !important; + margin: 2px 0 !important; + padding: 0 !important; + border-radius: 2px !important; + border: none !important; +} +.fc-daygrid-event-harness { + display: flex; + flex-direction: column; + align-items: flex-start; + justify-content: flex-start; + width: 100%; + gap: 22px; +} +.fc-daygrid-event.half-day-am { + width: 45% !important; + left: 0 !important; +} +.fc-daygrid-event.half-day-pm { + width: 45% !important; + left: auto !important; + right: 0 !important; +} +.fc-daygrid-event.full-day { + width: 100% !important; + left: 0 !important; +} +.fc-day-sun .fc-daygrid-day-number, +.fc-col-header-cell:first-child .fc-col-header-cell-cushion { + color: #ff4500 !important; +} +.fc-day-sat .fc-daygrid-day-number, +.fc-col-header-cell:last-child .fc-col-header-cell-cushion { + color: #6076e0 !important; +} +.fc-daygrid-day-number { + position: absolute !important; + top: 0px !important; + left: 5px !important; + text-align: left !important; +} + +.user-avatar { + border: 3px solid; + width: 110px; + height: 110px; + object-fit: cover; + background-color: white; + transition: transform 0.2s ease-in-out; +} + + + +.grayscaleImg { + filter: grayscale(100%); +} \ No newline at end of file diff --git a/src/common/axios-interceptor.js b/src/common/axios-interceptor.js index 05f3abd..a6ae5a1 100644 --- a/src/common/axios-interceptor.js +++ b/src/common/axios-interceptor.js @@ -1,12 +1,12 @@ -import axios from "axios"; +import axios from 'axios'; import { useRoute } from 'vue-router'; import { useToastStore } from '@s/toastStore'; const $api = axios.create({ baseURL: 'http://localhost:10325/api/', timeout: 300000, - withCredentials : true -}) + withCredentials: true, +}); /** * Default Content-Type : json @@ -14,7 +14,6 @@ const $api = axios.create({ */ $api.interceptors.request.use( function (config) { - let contentType = 'application/json'; if (config.isFormData) contentType = 'multipart/form-data'; @@ -23,21 +22,21 @@ $api.interceptors.request.use( config.headers['X-Requested-With'] = 'XMLHttpRequest'; return config; - }, function (error) { + }, + function (error) { // 요청 오류가 있는 작업 수행 return Promise.reject(error); - } + }, ); // 응답 인터셉터 추가하기 $api.interceptors.response.use( - function (response) { // 2xx 범위의 응답 처리 return response; }, function (error) { - const toastStore = useToastStore() + const toastStore = useToastStore(); const currentPage = error.config.headers['X-Page-Route']; // 오류 응답 처리 if (error.response) { @@ -70,7 +69,7 @@ $api.interceptors.response.use( } return Promise.reject(error); - } + }, ); export default $api; diff --git a/src/components/button/BoardRecommendBtn.vue b/src/components/button/BoardRecommendBtn.vue index e90055c..7125374 100644 --- a/src/components/button/BoardRecommendBtn.vue +++ b/src/components/button/BoardRecommendBtn.vue @@ -62,17 +62,19 @@ watch(() => props.dislikeCount, (newVal) => { }); const handleLike = () => { - console.log('좋아요',likeCount.value) - // emit('updateReaction', { type: 'like', boardId: props.boardId, commentId: props.commentId }); - // likeClicked.value = true; - emit('updateReaction', { boardId: props.boardId, commentId: props.commentId, isLike: true, isDislike: false }); + const isLike = !likeClicked.value; + const isDislike = false; + emit('updateReaction', { boardId: props.boardId, commentId: props.commentId, isLike, isDislike }); + likeClicked.value = isLike; + dislikeClicked.value = false; }; const handleDislike = () => { - console.log('싫어요') - // emit('updateReaction', { type: 'dislike', boardId: props.boardId, commentId: props.commentId }); - // dislikeClicked.value = true; - emit('updateReaction', { boardId: props.boardId, commentId: props.commentId, isLike: false, isDislike: true }); + const isDislike = !dislikeClicked.value; + const isLike = false; + emit('updateReaction', { boardId: props.boardId, commentId: props.commentId, isLike, isDislike }); + dislikeClicked.value = isDislike; + likeClicked.value = false; }; diff --git a/src/components/user/LoginForm.vue b/src/components/user/LoginForm.vue index 55b1e4a..48a3c77 100644 --- a/src/components/user/LoginForm.vue +++ b/src/components/user/LoginForm.vue @@ -1,14 +1,7 @@