Merge pull request #45 from GCVD-2024/develop

[메인 머지] dev -> main 머지 진행
GCVD-2024 · Oct 17, 2024 · 4ba3afc · 4ba3afc
2 parents 6288764 + db6d627
commit 4ba3afc
Show file tree

Hide file tree

Showing 28 changed files with 360 additions and 94 deletions.
diff --git a/index.html b/index.html
@@ -1,9 +1,13 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, maximum-scale=1.0, 
+    user-scalable=0"
+    />
     <title>Digging Club</title>
   </head>
   <body>

diff --git a/public/about/ConceptSavoring/concept-savoring-bg.svg b/public/about/ConceptSavoring/concept-savoring-bg.svg
diff --git a/public/about/MainTitle/main_stars.svg b/public/about/MainTitle/main_stars.svg
diff --git a/src/constants/constants.ts b/src/constants/constants.ts
@@ -1,7 +1,7 @@
 export const NAVIGATION_ITEMS = [
   { name: 'ABOUT', path: '/' },
-  { name: 'WORKS', path: 'work' },
-  { name: 'GUEST', path: 'guest' },
+  { name: 'WORKS', path: '/work' },
+  { name: 'GUEST', path: '/guest' },
 ];
 
 export const MOBILE_BREAKPOINT = 768;
@@ -49,3 +49,5 @@ export const WORDS = [
 
 // CategoriesSection.tsx
 export const CATEGORIES = ['ALL', 'UX', 'BRAND', 'GRAPHIC', 'ILLUST', 'MEDIA'] as const;
+export const DETAIL_RESPONSE_CATEGORIES = ['ALL', 'UXUI', 'BX', 'GRAPHIC', 'ILLUSTRATION', 'MEDIA'] as const;
+export const WORK_CATEGORIES = ['ALL', 'UX/UI', 'BRAND', 'GRAPHIC', 'ILLUST', 'MEDIA'] as const;
diff --git a/src/hooks/queries/useGetWorkList.tsx b/src/hooks/queries/useGetWorkList.tsx
@@ -20,14 +20,21 @@ const getWorkList = async (category: string, currentPage: number) => {
   const res = await get<WorkListResponseType>(
     `work?category=${mappedCategory}&currentPage=${currentPage}`
   );
-  console.log('API Response:', res);
   return res.result.works as WorkListType[];
 };
 
 export const useGetWorkList = ({ category, currentPage }: WorkListRequestType) => {
+      let mappedCategory = (() => {
+        switch (category) {
+          case 'UX/UI':
+            return 'UX';
+          default:
+            return category;
+        }
+      })();
   const { data, hasNextPage, fetchNextPage, isFetchingNextPage } = useInfiniteQuery({
-    queryKey: WORK_KEYS.list(category, currentPage),
-    queryFn: ({ pageParam = currentPage }) => getWorkList(category, pageParam),
+    queryKey: WORK_KEYS.list(mappedCategory, currentPage),
+    queryFn: ({ pageParam = currentPage }) => getWorkList(mappedCategory, pageParam),
     getNextPageParam: (lastPage, allPages) => {
       if (lastPage && Array.isArray(lastPage) && lastPage?.length === 10) {
         return allPages?.length ? allPages.length + 1 : 1;

diff --git a/src/main.tsx b/src/main.tsx
@@ -3,6 +3,7 @@ import ReactDOM from 'react-dom/client';
 import './index.css';
 import { RouterProvider } from 'react-router-dom';
 import router from './routes/Router';
+import './../public/fonts/font.css';
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>

diff --git a/src/pages/About/About.tsx b/src/pages/About/About.tsx
@@ -1,7 +1,6 @@
 import { Helmet } from 'react-helmet-async';
 import styled from 'styled-components';
 import MainTitle from './components/MainTitle/MainTitle';
-import ExhibitionInfo from './components/ExhibitionInfo/ExhibitionInfo';
 import ExhibitionIntroduction from './components/ExhibitionIntroduction/ExhibitionIntroduction';
 import ExhibitionMeaning from './components/ExhibitionMeaning/ExhibitionMeaning';
 import GraduationCommittee from './components/GraduationCommittee/GraduationCommittee';
@@ -32,7 +31,7 @@ function About() {
         />
         {isMobile ? <></> : <ScrollIndicator scrollPercentage={scrollPercentage} />}
         <MainTitle />
-        <ExhibitionInfo />
+        {/* <ExhibitionInfo /> */}
         <ExhibitionIntroduction />
         <ExhibitionMeaning />
         <GraduationCommittee />

diff --git a/src/pages/About/components/ConceptExperiencing/ConceptExperiencing.tsx b/src/pages/About/components/ConceptExperiencing/ConceptExperiencing.tsx
@@ -77,19 +77,20 @@ const MatterJsContainer = styled.div<{ isMobile: boolean }>`
 const ContentWrapper = styled.div<{ isMobile: boolean }>`
   display: flex;
   flex-direction: ${(props) => (props.isMobile ? 'column' : 'row')};
-  gap: ${(props) => (props.isMobile ? '30px' : '300px')};
-  align-items: ${(props) => (props.isMobile ? 'center' : 'flex-start')};
+  gap: ${(props) => (props.isMobile ? '30px' : '250px')};
+  align-items: flex-start;
 `;
 
 const Title = styled.h1<{ isMobile: boolean }>`
   font-size: ${(props) => (props.isMobile ? '32px' : '40px')};
   font-weight: 800;
-  text-align: ${(props) => (props.isMobile ? 'center' : 'left')};
+  text-align: left;
+  line-height: 140%;
 `;
 
 const Description = styled.p<{ isMobile: boolean }>`
-  font-size: ${(props) => (props.isMobile ? '14px' : '16px')};
+  font-size: ${(props) => (props.isMobile ? '12px' : '16px')};
   font-weight: 500;
-  line-height: 150%;
-  text-align: ${(props) => (props.isMobile ? 'center' : 'left')};
+  line-height: 140%;
+  text-align: left;
 `;