🔀 [fix] : conflict resolved

Author: seorang42

src/api/auth.ts

@@ -0,0 +1,28 @@
+import { axiosInstance } from '@/utils/axios'
+import Cookies from 'js-cookie'
+import type { loginDataTypes } from '@/types/auth'
+
+export const postLogin = async (loginData: loginDataTypes, sessionId: string) => {
+  const response = await axiosInstance.post('/api/auths/login', loginData, {
+    headers: { sessionId: sessionId }
+  })
+  Cookies.set('accessToken', response.data.accessToken, {
+    path: '/',
+    sameSite: 'strict'
+  })
+  return response.data
+}
+
+export const patchPassword = async (password: string) => {
+  const accessToken = Cookies.get('accessToken')
+
+  if (!accessToken) return
+
+  const response = await axiosInstance.patch('/api/members/password', password, {
+    headers: {
+      Authorization: `Bearer ${accessToken}`
+    }
+  })
+
+  return response.data
+}

src/api/common.ts

@@ -0,0 +1,11 @@
+import { axiosInstance } from '../utils/axios'
+
+export const getMainCategory = async () => {
+  const response = await axiosInstance.get('/api/main-category')
+  return response.data
+}
+
+export const getSubCategory = async () => {
+  const response = await axiosInstance.get('/api/sub-category')
+  return response.data
+}

src/api/test.ts

@@ -1,4 +1,4 @@
-import axiosInstance from '../utils/axios'
+import { axiosInstance } from '../utils/axios'
 
 export const getNotifications = async () => {
   const response = await axiosInstance.get('/api/notifications?page=0&size=5')

src/api/user.ts

@@ -0,0 +1,6 @@
+import { formDataAxiosInstance } from '@/utils/axios'
+
+export const postTaskRequest = async (formdata: FormData) => {
+  const response = await formDataAxiosInstance.post('/api/tasks', formdata)
+  return response.data
+}

src/components/SideBar.vue

@@ -39,8 +39,14 @@
 
       <div class="flex w-full justify-between px-6 py-4 bg-white">
         <div class="flex w-full items-center gap-3">
-          <!-- 프로필 사진 API 필요 -->
-          <div class="w-10 h-10 rounded-full bg-background-1" />
+          <img
+            v-if="info?.imageUrl"
+            class="rounded-[50%] w-10 h-10"
+            :src="info.imageUrl"
+            alt="프로필 이미지" />
+          <div
+            v-else
+            class="w-10 h-10 rounded-full bg-background-1" />
           <div class="flex flex-col gap-1">
             <p class="text-xs text-body font-bold">{{ name }}</p>
             <p class="text-sm text-black">{{ nickname }}</p>
@@ -61,22 +67,26 @@
 
 <script setup lang="ts">
 import { useRoute } from 'vue-router'
-import { computed, ref } from 'vue'
+import { computed } from 'vue'
 import CommonIcons from './common/CommonIcons.vue'
 import { hamburgerIcon } from '@/constants/iconPath'
 import { SIDE_USER_MENU, SIDE_MANAGER_MENU, SIDE_ADMIN_MENU } from '@/constants/menu'
+import { useMemberStore } from '@/stores/member'
+import { storeToRefs } from 'pinia'
+
+const memberStore = useMemberStore()
+const { info } = storeToRefs(memberStore)
 
 const route = useRoute()
 
-// 회원 역할, 닉네임 필요
-const role = ref('manager')
-const name = ref('백지연')
-const nickname = ref('Chloe.yeon')
+const role = computed(() => info.value.memberRole)
+const name = computed(() => info.value.memberName)
+const nickname = computed(() => info.value.nickname)
 
 const filteredMenu = computed(() => {
-  return role.value === 'user'
+  return role.value === 'ROLE_USER'
     ? SIDE_USER_MENU
-    : role.value === 'manager'
+    : role.value === 'ROLE_MANAGER'
       ? SIDE_MANAGER_MENU
       : SIDE_ADMIN_MENU
 })

src/components/TopBar.vue

@@ -14,8 +14,14 @@
         v-show="isLogined"
         class="flex items-center gap-6">
         <NotificationIcon :new-notification="12" />
-        <!-- 프로필 사진 API 필요 -->
-        <div class="rounded-[50%] bg-zinc-100 p-5" />
+        <img
+          v-if="info?.imageUrl"
+          class="rounded-[50%] w-10 h-10"
+          :src="info.imageUrl"
+          alt="프로필 이미지" />
+        <div
+          v-else
+          class="rounded-[50%] bg-zinc-100 p-5" />
       </div>
     </div>
   </div>
@@ -25,13 +31,21 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { ref, onMounted } from 'vue'
 import CommonIcons from './common/CommonIcons.vue'
 import SideBar from './SideBar.vue'
 import { hamburgerIcon } from '../constants/iconPath'
 import NotificationIcon from './icons/NotificationIcon.vue'
+import { storeToRefs } from 'pinia'
+import { useMemberStore } from '@/stores/member'
+
+const memberStore = useMemberStore()
+const { info } = storeToRefs(memberStore)
+
+onMounted(async () => {
+  await memberStore.updateMemberInfoWithToken()
+})
 
-// 로그인 정보 필요
 const isSideOpen = ref(false)
 const isLogined = ref(true)
 

src/components/my-request/MyRequestFilterBar.vue

@@ -33,15 +33,15 @@
 </template>
 
 <script setup lang="ts">
-import FilterDropdown from '../filters/FilterDropdown.vue'
+import { PAGE_SIZE_LIST, TASK_STATUS_LIST, TERM_LIST } from '@/constants/common'
+import { useRequestParamsStore } from '@/stores/params'
+import { axiosInstance } from '@/utils/axios'
+import { useQuery } from '@tanstack/vue-query'
 import FilterCategory from '../filters/FilterCategory.vue'
-import FilterInput from '../filters/FilterInput.vue'
+import FilterDropdown from '../filters/FilterDropdown.vue'
 import FilterDropdownMulti from '../filters/FilterDropdownMulti.vue'
-import { useRequestParamsStore } from '@/stores/params'
-import { PAGE_SIZE_LIST, TASK_STATUS_LIST, TERM_LIST } from '@/constants/common'
+import FilterInput from '../filters/FilterInput.vue'
 import { useRequestParamsChange } from '../hooks/useRequestParamsChange'
-import axiosInstance from '@/utils/axios'
-import { useQuery } from '@tanstack/vue-query'
 
 const store = useRequestParamsStore()
 store.$reset()

src/components/my-request/MyRequestList.vue

@@ -22,17 +22,17 @@
 </template>
 
 <script setup lang="ts">
-import MyRequestListBar from './MyRequestListBar.vue'
-import MyRequestListCard from './MyRequestListCard.vue'
-import ListPagination from '../lists/ListPagination.vue'
-import ListContainer from '../lists/ListContainer.vue'
 import { useRequestParamsStore } from '@/stores/params'
-import axiosInstance from '@/utils/axios'
+import type { MyRequestResponse } from '@/types/user'
+import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
 import { useParseParams } from '../hooks/useParseParams'
-import type { MyRequestResponse } from '@/types/user'
-import { computed } from 'vue'
+import ListContainer from '../lists/ListContainer.vue'
+import ListPagination from '../lists/ListPagination.vue'
 import NoContent from '../lists/NoContent.vue'
+import MyRequestListBar from './MyRequestListBar.vue'
+import MyRequestListCard from './MyRequestListCard.vue'
+import { computed } from 'vue'
 
 const { params } = useRequestParamsStore()
 const onPageChange = (value: number) => {

src/components/my-task/MyTaskFilterBar.vue

@@ -41,7 +41,7 @@ import { useRequestParamsStore } from '@/stores/params'
 import { PAGE_SIZE_LIST, TASK_STATUS_LIST, TERM_LIST } from '@/constants/common'
 import { useRequestParamsChange } from '../hooks/useRequestParamsChange'
 import { useQuery } from '@tanstack/vue-query'
-import axiosInstance from '@/utils/axios'
+import {axiosInstance} from '@/utils/axios'
 
 const store = useRequestParamsStore()
 store.$reset()

src/components/request-history/RequestHistoryFilterBar.vue

@@ -33,15 +33,15 @@
 </template>
 
 <script setup lang="ts">
-import FilterDropdown from '../filters/FilterDropdown.vue'
-import FilterCategory from '../filters/FilterCategory.vue'
-import FilterInput from '../filters/FilterInput.vue'
 import { PAGE_SIZE_LIST, TASK_STATUS_LIST, TERM_LIST } from '@/constants/common'
-import FilterDropdownMulti from '../filters/FilterDropdownMulti.vue'
 import { useRequestParamsStore } from '@/stores/params'
-import { useRequestParamsChange } from '../hooks/useRequestParamsChange'
+import { axiosInstance } from '@/utils/axios'
 import { useQuery } from '@tanstack/vue-query'
-import axiosInstance from '@/utils/axios'
+import FilterCategory from '../filters/FilterCategory.vue'
+import FilterDropdown from '../filters/FilterDropdown.vue'
+import FilterDropdownMulti from '../filters/FilterDropdownMulti.vue'
+import FilterInput from '../filters/FilterInput.vue'
+import { useRequestParamsChange } from '../hooks/useRequestParamsChange'
 
 const store = useRequestParamsStore()
 store.$reset()