調査物件登録
diff --git a/src/components/ui/common/Spinner.tsx b/src/components/ui/common/Spinner.tsx
new file mode 100644
index 0000000..4a2aa38
--- /dev/null
+++ b/src/components/ui/common/Spinner.tsx
@@ -0,0 +1,7 @@
+export default function Spinner() {
+ return (
+
+
+
+ )
+}
diff --git a/src/hooks/useAxios.ts b/src/hooks/useAxios.ts
new file mode 100644
index 0000000..ac59166
--- /dev/null
+++ b/src/hooks/useAxios.ts
@@ -0,0 +1,93 @@
+import axios from 'axios'
+import { useSpinnerStore } from '@/store/spinnerStore'
+
+export const useAxios = () => {
+ const { setIsShow } = useSpinnerStore()
+
+ const axiosInstance = (url: string | null | undefined) => {
+ const baseURL = url || process.env.NEXT_PUBLIC_API_URL
+ const instance = axios.create({
+ baseURL,
+ headers: {
+ Accept: 'application/json',
+ },
+ })
+
+ instance.interceptors.request.use(
+ (config) => {
+ // console.log('🚀 ~ config:', config)
+ setIsShow(true)
+ return config
+ },
+ (error) => {
+ return Promise.reject(error)
+ },
+ )
+
+ instance.interceptors.response.use(
+ (response) => {
+ response.data = transferResponse(response)
+ setIsShow(false)
+ return response
+ },
+ (error) => {
+ // 에러 처리 로직
+ return Promise.reject(error)
+ },
+ )
+
+ return instance
+ }
+
+ // response데이터가 array, object에 따라 분기하여 키 변환
+ const transferResponse = (response: any) => {
+ if (!response.data) return response.data
+
+ // 배열인 경우 각 객체의 키를 변환
+ if (Array.isArray(response.data)) {
+ return response.data.map((item: any) => transformObjectKeys(item))
+ }
+
+ // 단일 객체인 경우
+ return transformObjectKeys(response.data)
+ }
+
+ // camel case object 반환
+ const transformObjectKeys = (obj: any): any => {
+ if (Array.isArray(obj)) {
+ return obj.map(transformObjectKeys)
+ }
+
+ if (obj !== null && typeof obj === 'object') {
+ return Object.keys(obj).reduce((acc: any, key: string) => {
+ let transformedKey = key
+
+ // Handle uppercase snake_case (e.g., USER_NAME -> userName)
+ // Handle lowercase snake_case (e.g., user_name -> userName)
+ if (/^[A-Z_]+$/.test(key) || /^[a-z_]+$/.test(key)) {
+ transformedKey = snakeToCamel(key)
+ }
+ // Handle single uppercase word (e.g., ROLE -> role)
+ else if (/^[A-Z]+$/.test(key)) {
+ transformedKey = key.toLowerCase()
+ }
+ // Preserve existing camelCase
+
+ acc[transformedKey] = transformObjectKeys(obj[key])
+ return acc
+ }, {})
+ }
+
+ return obj
+ }
+
+ const snakeToCamel = (str: string): string => {
+ return str.toLowerCase().replace(/([-_][a-z])/g, (group) => group.toUpperCase().replace('-', '').replace('_', ''))
+ }
+
+ return {
+ axiosInstance,
+ transferResponse,
+ transformObjectKeys,
+ }
+}
diff --git a/src/hooks/useSurvey.ts b/src/hooks/useSurvey.ts
index 043cfce..6610cea 100644
--- a/src/hooks/useSurvey.ts
+++ b/src/hooks/useSurvey.ts
@@ -1,11 +1,10 @@
-import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import type { SurveyBasicInfo, SurveyDetailInfo, SurveyDetailRequest, SurveyDetailCoverRequest, SurveyRegistRequest } from '@/types/Survey'
-import { axiosInstance } from '@/libs/axios'
-import { useSurveyFilterStore } from '@/store/surveyFilterStore'
-import { queryStringFormatter } from '@/utils/common-utils'
-import { useSessionStore } from '@/store/session'
import { useMemo } from 'react'
-import { AxiosResponse } from 'axios'
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
+import { useSurveyFilterStore } from '@/store/surveyFilterStore'
+import { useSessionStore } from '@/store/session'
+import { useAxios } from './useAxios'
+import { queryStringFormatter } from '@/utils/common-utils'
export const requiredFields = [
{
@@ -65,9 +64,9 @@ export function useServey(id?: number): {
isDeletingSurvey: boolean
createSurvey: (survey: SurveyRegistRequest) => Promise
createSurveyDetail: (params: { surveyId: number; surveyDetail: SurveyDetailCoverRequest }) => void
- updateSurvey: (survey: SurveyRegistRequest) => void
+ updateSurvey: ({ survey, isTemporary, storeId }: { survey: SurveyRegistRequest; isTemporary: boolean; storeId?: string }) => void
deleteSurvey: () => Promise
- submitSurvey: (saveId?: number) => void
+ submitSurvey: (params: { saveId?: number; targetId?: string; storeId?: string; srlNo?: string }) => void
validateSurveyDetail: (surveyDetail: SurveyDetailRequest) => string
getZipCode: (zipCode: string) => Promise
refetchSurveyList: () => void
@@ -75,6 +74,7 @@ export function useServey(id?: number): {
const queryClient = useQueryClient()
const { keyword, searchOption, isMySurvey, sort, offset } = useSurveyFilterStore()
const { session } = useSessionStore()
+ const { axiosInstance } = useAxios()
const {
data: surveyListData,
@@ -119,7 +119,7 @@ export function useServey(id?: number): {
const { mutateAsync: createSurvey, isPending: isCreatingSurvey } = useMutation({
mutationFn: async (survey: SurveyRegistRequest) => {
- const resp = await axiosInstance(null).post('/api/survey-sales', survey)
+ const resp = await axiosInstance(null).post('/api/survey-sales', { survey: survey, storeId: session?.storeId ?? null })
return resp.data.id ?? 0
},
onSuccess: (data) => {
@@ -130,10 +130,14 @@ export function useServey(id?: number): {
})
const { mutate: updateSurvey, isPending: isUpdatingSurvey } = useMutation({
- mutationFn: async (survey: SurveyRegistRequest) => {
+ mutationFn: async ({ survey, isTemporary, storeId }: { survey: SurveyRegistRequest; isTemporary: boolean; storeId?: string }) => {
console.log('updateSurvey, survey:: ', survey)
if (id === undefined) throw new Error('id is required')
- const resp = await axiosInstance(null).put(`/api/survey-sales/${id}`, survey)
+ const resp = await axiosInstance(null).put(`/api/survey-sales/${id}`, {
+ survey: survey,
+ isTemporary: isTemporary,
+ storeId: storeId,
+ })
return resp.data
},
onSuccess: () => {
@@ -166,11 +170,13 @@ export function useServey(id?: number): {
})
const { mutateAsync: submitSurvey } = useMutation({
- mutationFn: async (saveId?: number) => {
+ mutationFn: async ({ saveId, targetId, storeId, srlNo }: { saveId?: number; targetId?: string; storeId?: string; srlNo?: string }) => {
const submitId = saveId ?? id
if (!submitId) throw new Error('id is required')
const resp = await axiosInstance(null).patch(`/api/survey-sales/${submitId}`, {
- submit: true,
+ targetId,
+ storeId,
+ srlNo,
})
return resp.data
},
diff --git a/src/libs/axios.ts b/src/libs/axios.ts
index 0abc6ab..6007c47 100644
--- a/src/libs/axios.ts
+++ b/src/libs/axios.ts
@@ -1,3 +1,4 @@
+import { useSpinnerStore } from '@/store/spinnerStore'
import axios from 'axios'
export const axiosInstance = (url: string | null | undefined) => {
diff --git a/src/providers/EdgeProvider.tsx b/src/providers/EdgeProvider.tsx
index 77b8edd..e04f0e5 100644
--- a/src/providers/EdgeProvider.tsx
+++ b/src/providers/EdgeProvider.tsx
@@ -8,6 +8,8 @@ import { usePopupController } from '@/store/popupController'
import { useSideNavState } from '@/store/sideNavState'
import { useSessionStore } from '@/store/session'
import { tracking } from '@/libs/tracking'
+import Spinner from '@/components/ui/common/Spinner'
+import { useSpinnerStore } from '@/store/spinnerStore'
declare global {
interface Window {
@@ -28,6 +30,7 @@ export default function EdgeProvider({ children, sessionData }: EdgeProviderProp
const { reset } = useSideNavState()
const { setAlertMsg, setAlertBtn, setAlert, setAlert2, setAlert2BtnYes, setAlert2BtnNo } = usePopupController()
const { session, setSession } = useSessionStore()
+ const { isShow, setIsShow } = useSpinnerStore()
/**
* 사용자 이벤트 트래킹 처리
@@ -110,5 +113,10 @@ export default function EdgeProvider({ children, sessionData }: EdgeProviderProp
handlePageEvent(pathname)
}, [pathname])
- return <>{children}
+ return (
+ <>
+ {children}
+ {isShow && }
+
+ )
}
diff --git a/src/store/spinnerStore.ts b/src/store/spinnerStore.ts
new file mode 100644
index 0000000..976382e
--- /dev/null
+++ b/src/store/spinnerStore.ts
@@ -0,0 +1,21 @@
+import { create } from 'zustand'
+
+type SpinnerState = {
+ isShow: boolean
+ setIsShow: (isShow: boolean) => void
+ resetCount: () => void
+}
+
+type InitialState = {
+ isShow: boolean
+}
+
+const initialState: InitialState = {
+ isShow: false,
+}
+
+export const useSpinnerStore = create((set) => ({
+ ...initialState,
+ setIsShow: (isShow: boolean) => set({ isShow }),
+ resetCount: () => set(initialState),
+}))
diff --git a/src/styles/base/_button.scss b/src/styles/base/_button.scss
index b4d61a4..c6d11ad 100644
--- a/src/styles/base/_button.scss
+++ b/src/styles/base/_button.scss
@@ -49,14 +49,6 @@
background-size: cover;
margin-left: 12px;
}
- .btn-arr-up{
- display: block;
- width: 10px;
- height: 6px;
- background: url(/assets/images/common/btn_arr_up.svg)no-repeat center;
- background-size: cover;
- margin-left: 12px;
- }
.btn-edit{
display: block;
width: 10px;
diff --git a/src/styles/base/_check-radio.scss b/src/styles/base/_check-radio.scss
index 47c50cb..f6ff573 100644
--- a/src/styles/base/_check-radio.scss
+++ b/src/styles/base/_check-radio.scss
@@ -201,7 +201,7 @@
}
}
input:checked + .slider {
- background-color: #A8B6C7;
+ background-color: #0081b5;
&:after {
content: '';
left: 10px;
diff --git a/src/styles/components/_index.scss b/src/styles/components/_index.scss
index 4ebdd02..3ae03f1 100644
--- a/src/styles/components/_index.scss
+++ b/src/styles/components/_index.scss
@@ -1,4 +1,6 @@
@forward 'main';
@forward 'login';
@forward 'pop-contents';
-@forward 'sub';
\ No newline at end of file
+@forward 'sub';
+@forward 'pdfview';
+@forward 'spinner';
\ No newline at end of file
diff --git a/src/styles/components/_pdfview.scss b/src/styles/components/_pdfview.scss
new file mode 100644
index 0000000..8db6cf7
--- /dev/null
+++ b/src/styles/components/_pdfview.scss
@@ -0,0 +1,57 @@
+@use "../abstracts" as *;
+
+.pdf-contents{
+ padding: 0 20px;
+ border-top: 1px solid #ececec;
+}
+.pdf-cont-head{
+ align-items: center;
+ padding: 24px 0 15px;
+ border-bottom: 2px solid $black-1010;
+ .pdf-cont-head-tit{
+ @include defaultFont($font-s-16, $font-w-600, $black-1010);
+ margin-bottom: 10px;
+ }
+}
+.pdf-cont-head-data-wrap{
+ @include flex(20px);
+ align-items: center;
+ .pdf-cont-head-data-tit{
+ @include defaultFont($font-s-13, $font-w-500, $black-1010);
+ }
+ .pdf-cont-head-data{
+ @include defaultFont($font-s-13, $font-w-400, #FF5656);
+ }
+}
+.pdf-cont-body{
+ padding: 24px 0 0;
+}
+.pdf-data-tit{
+ @include defaultFont($font-s-13, $font-w-500, $black-1010);
+ margin-bottom: 5px;
+}
+.pdf-table{
+ margin-bottom: 24px;
+ table{
+ width: 100%;
+ table-layout: fixed;
+ border-collapse: collapse;
+ th{
+ padding: 9.5px;
+ @include defaultFont($font-s-11, $font-w-500, $black-1010);
+ border: 1px solid #2E3A59;
+ background-color: #F5F6FA;
+ }
+ td{
+ padding: 9.5px;
+ @include defaultFont($font-s-11, $font-w-400, #FF5656);
+ border: 1px solid #2E3A59;
+ }
+ }
+}
+.pdf-textarea-data{
+ padding: 10px;
+ @include defaultFont($font-s-11, $font-w-400, #FF5656);
+ border: 1px solid $black-1010;
+ min-height: 150px;
+}
\ No newline at end of file
diff --git a/src/styles/components/_pop-contents.scss b/src/styles/components/_pop-contents.scss
index f0f18d5..b598397 100644
--- a/src/styles/components/_pop-contents.scss
+++ b/src/styles/components/_pop-contents.scss
@@ -103,16 +103,12 @@
@include defaultFont($font-s-13, $font-w-400, $font-c);
}
.pop-data-table-footer{
- @include flex(0px);
.pop-data-table-footer-unit{
- flex: 1;
padding: 10px;
@include defaultFont($font-s-13, $font-w-500, $font-c);
- border-right: 1px solid #2E3A59;
+ border-bottom: 1px solid #2E3A59;
}
.pop-data-table-footer-data{
- flex: none;
- width: 104px;
padding: 10px;
@include defaultFont($font-s-13, $font-w-400, $font-c);
}
diff --git a/src/styles/components/_spinner.scss b/src/styles/components/_spinner.scss
new file mode 100644
index 0000000..f37f12d
--- /dev/null
+++ b/src/styles/components/_spinner.scss
@@ -0,0 +1,37 @@
+.spinner-wrap{
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100vh;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background-color: rgba($color: #101010, $alpha: 0.5);
+ z-index: 2000000;
+}
+.loader {
+ width: 16px;
+ height: 16px;
+ border-radius: 50%;
+ background-color: #fff;
+ box-shadow: 32px 0 #fff, -32px 0 #fff;
+ position: relative;
+ animation: flash 0.5s ease-out infinite alternate;
+}
+
+@keyframes flash {
+ 0% {
+ background-color: #FFF2;
+ box-shadow: 32px 0 #FFF2, -32px 0 #FFF;
+ }
+ 50% {
+ background-color: #FFF;
+ box-shadow: 32px 0 #FFF2, -32px 0 #FFF2;
+ }
+ 100% {
+ background-color: #FFF2;
+ box-shadow: 32px 0 #FFF, -32px 0 #FFF2;
+ }
+}
+
\ No newline at end of file
diff --git a/src/types/Survey.ts b/src/types/Survey.ts
index 36e7aa5..8066836 100644
--- a/src/types/Survey.ts
+++ b/src/types/Survey.ts
@@ -14,6 +14,8 @@ export type SurveyBasicInfo = {
detailInfo: SurveyDetailInfo | null
regDt: Date
uptDt: Date
+ submissionTargetId: string | null
+ srlNo: string | null //판매점IDyyMMdd000
}
export type SurveyDetailInfo = {
@@ -70,6 +72,8 @@ export type SurveyBasicRequest = {
addressDetail: string | null
submissionStatus: boolean
submissionDate: string | null
+ submissionTargetId: string | null
+ srlNo: string | null //판매점IDyyMMdd000
}
export type SurveyDetailRequest = {
@@ -127,6 +131,8 @@ export type SurveyRegistRequest = {
submissionStatus: boolean
submissionDate: string | null
detailInfo: SurveyDetailRequest | null
+ submissionTargetId: string | null
+ srlNo: string | null //판매점IDyyMMdd000
}
export type Mode = 'CREATE' | 'EDIT' | 'READ' | 'TEMP' // 등록 | 수정 | 상세 | 임시저장