From 1a824a3fdcaf7bea78dff775b1a9a33b2c04b679 Mon Sep 17 00:00:00 2001 From: shin-minhyuk Date: Thu, 7 Nov 2024 17:29:58 +0900 Subject: [PATCH 001/306] =?UTF-8?q?=E2=9C=85=20feat:=20update=20tailwind?= =?UTF-8?q?=20config=20setting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/logo-black.svg | 11 +++++++++ src/assets/mic_golf_logo.svg | 20 ---------------- src/layouts/commonLayout/Header.tsx | 8 ++++++- src/pages/home/HomePage.tsx | 2 +- tailwind.config.js | 36 ++++++++++++++++++++++++++++- 5 files changed, 54 insertions(+), 23 deletions(-) create mode 100644 src/assets/logo-black.svg delete mode 100644 src/assets/mic_golf_logo.svg diff --git a/src/assets/logo-black.svg b/src/assets/logo-black.svg new file mode 100644 index 0000000..7695ab9 --- /dev/null +++ b/src/assets/logo-black.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/assets/mic_golf_logo.svg b/src/assets/mic_golf_logo.svg deleted file mode 100644 index 45f0189..0000000 --- a/src/assets/mic_golf_logo.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/layouts/commonLayout/Header.tsx b/src/layouts/commonLayout/Header.tsx index d4fb640..cf88e89 100644 --- a/src/layouts/commonLayout/Header.tsx +++ b/src/layouts/commonLayout/Header.tsx @@ -1,5 +1,11 @@ const Header = () => { - return
Header
; + return ( +
+
+ +
+
+ ); }; export default Header; diff --git a/src/pages/home/HomePage.tsx b/src/pages/home/HomePage.tsx index b2f0bf4..f07dc62 100644 --- a/src/pages/home/HomePage.tsx +++ b/src/pages/home/HomePage.tsx @@ -1,5 +1,5 @@ const HomePage = () => { - return
HomePage
; + return
HomePage
; }; export default HomePage; diff --git a/tailwind.config.js b/tailwind.config.js index d37737f..ea6cb1e 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -5,7 +5,41 @@ export default { "./src/**/*.{js,ts,jsx,tsx}", ], theme: { - extend: {}, + extend: { + colors: { + primary: "#000", // 메인 브랜드 색상 + secondary: "#fff", // 배경에 사용하는 중립 색상 + // accent: "#FFD700", // 포인트 색상 (골드) + // textPrimary: "#333333", // 기본 텍스트 색상 (짙은 회색) + // textSecondary: "#777777", // 보조 텍스트 색상 (연한 회색) + }, + fontSize: { + xs: "0.75rem", // 12px + sm: "0.875rem", // 14px + base: "1rem", // 16px + lg: "1.125rem", // 18px + xl: "1.25rem", // 20px + "2xl": "1.5rem", // 24px + }, + spacing: { + "2": "0.5rem", // 8px + "4": "1rem", // 16px + "6": "1.5rem", // 24px + "8": "2rem", // 32px + "10": "2.5rem", // 40px + }, + borderRadius: { + sm: "0.125rem", // 2px + DEFAULT: "0.25rem", // 4px + lg: "0.5rem", // 8px + full: "9999px", // 완전한 원형 + }, + boxShadow: { + sm: "0 1px 2px rgba(0, 0, 0, 0.05)", // 작은 그림자 + DEFAULT: "0 1px 3px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.06)", // 기본 그림자 + lg: "0 10px 15px rgba(0, 0, 0, 0.1), 0 4px 6px rgba(0, 0, 0, 0.05)", // 큰 그림자 + }, + }, }, plugins: [], } From 904551d8119483d0656fe0498071de065a3c3721 Mon Sep 17 00:00:00 2001 From: shin-minhyuk Date: Thu, 7 Nov 2024 18:11:34 +0900 Subject: [PATCH 002/306] =?UTF-8?q?=E2=9C=85=20feat:=20route=20=ED=8F=B4?= =?UTF-8?q?=EB=8D=94=20=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F?= =?UTF-8?q?=20tailwind=20config=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.tsx | 59 +++-------------------------- src/layouts/commonLayout/Header.tsx | 13 ++++++- src/pages/notice/NoticePage.tsx | 5 +++ src/routes/AdminRoutes.tsx | 19 ++++++++++ src/routes/UserRoutes.tsx | 54 ++++++++++++++++++++++++++ tailwind.config.js | 8 ++-- 6 files changed, 100 insertions(+), 58 deletions(-) create mode 100644 src/pages/notice/NoticePage.tsx create mode 100644 src/routes/AdminRoutes.tsx create mode 100644 src/routes/UserRoutes.tsx diff --git a/src/App.tsx b/src/App.tsx index 888e212..a70aea4 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,59 +1,12 @@ -import { Route, Routes } from 'react-router-dom'; -import HomePage from './pages/home/HomePage'; -import ShopPage from './pages/shop/ShopPage'; -import EventMainPage from './pages/event/EventMainPage'; -import EventDetailPage from './pages/event/EventDetailPage'; -import SignInPage from './pages/auth/SignInPage'; -import SignUpPage from './pages/auth/SignUpPage'; -import SignUpCompletePage from './pages/auth/SignUpCompletePage'; -import PasswordResetPage from './pages/auth/PasswordResetPage'; -import MyPage from './pages/mypage/MyPage'; -import AdminPage from './pages/admin/AdminPage'; -import AdminLoginPage from './pages/admin/AdminLoginPage'; -import DetailPage from './pages/shop/DetailPage'; -import CategoryPage from './pages/shop/CategoryPage'; -import CartPage from './pages/cart/CartPage'; -import PrivateRoute from './routes/PrivateRoute'; -import AdminRoute from './routes/AdminRoute'; +import AdminRoutes from './routes/AdminRoutes'; +import UserRoutes from './routes/UserRoutes'; function App() { return ( - - {/* PrivateRoute */} - {/* 마이페이지 */} - }> - } /> - - - {/* PublicRoute */} - {/* 쇼핑 */} - } /> - } /> - } /> - - {/* 이벤트 */} - } /> - } /> - - {/* 인증 */} - } /> - } /> - } /> - } /> - - {/* 장바구니 */} - } /> - - {/* 메인 */} - } /> - - {/* AdminRoute */} - {/* 관리자 */} - }> - } /> - } /> - - + <> + + + ); } diff --git a/src/layouts/commonLayout/Header.tsx b/src/layouts/commonLayout/Header.tsx index cf88e89..5e69323 100644 --- a/src/layouts/commonLayout/Header.tsx +++ b/src/layouts/commonLayout/Header.tsx @@ -1,8 +1,17 @@ +import logoBlack from '@/assets/logo-black.svg'; +import { Link } from 'react-router-dom'; + const Header = () => { return (
-
- +
+ 믹골프 로고 +
+
); diff --git a/src/pages/notice/NoticePage.tsx b/src/pages/notice/NoticePage.tsx new file mode 100644 index 0000000..444bb01 --- /dev/null +++ b/src/pages/notice/NoticePage.tsx @@ -0,0 +1,5 @@ +const NoticePage = () => { + return
NoticePage
; +}; + +export default NoticePage; diff --git a/src/routes/AdminRoutes.tsx b/src/routes/AdminRoutes.tsx new file mode 100644 index 0000000..a819435 --- /dev/null +++ b/src/routes/AdminRoutes.tsx @@ -0,0 +1,19 @@ +import { Route, Routes } from 'react-router-dom'; +import AdminRoute from './AdminRoute'; +import AdminPage from '@/pages/admin/AdminPage'; +import AdminLoginPage from '@/pages/admin/AdminLoginPage'; + +const AdminRoutes = () => { + return ( + + {/* AdminRoute */} + {/* 관리자 */} + }> + } /> + } /> + + + ); +}; + +export default AdminRoutes; diff --git a/src/routes/UserRoutes.tsx b/src/routes/UserRoutes.tsx new file mode 100644 index 0000000..e49d5d3 --- /dev/null +++ b/src/routes/UserRoutes.tsx @@ -0,0 +1,54 @@ +import { Route, Routes } from 'react-router-dom'; +import PrivateRoute from './PrivateRoute'; +import MyPage from '@/pages/mypage/MyPage'; +import ShopPage from '@/pages/shop/ShopPage'; +import CategoryPage from '@/pages/shop/CategoryPage'; +import DetailPage from '@/pages/shop/DetailPage'; +import EventMainPage from '@/pages/event/EventMainPage'; +import EventDetailPage from '@/pages/event/EventDetailPage'; +import SignInPage from '@/pages/auth/SignInPage'; +import SignUpPage from '@/pages/auth/SignUpPage'; +import SignUpCompletePage from '@/pages/auth/SignUpCompletePage'; +import PasswordResetPage from '@/pages/auth/PasswordResetPage'; +import CartPage from '@/pages/cart/CartPage'; +import NoticePage from '@/pages/notice/NoticePage'; +import HomePage from '@/pages/home/HomePage'; + +const UserRoutes = () => { + return ( + + {/* PrivateRoute */} + {/* 마이페이지 */} + }> + } /> + + + {/* PublicRoute */} + {/* 쇼핑 */} + } /> + } /> + } /> + + {/* 이벤트 */} + } /> + } /> + + {/* 인증 */} + } /> + } /> + } /> + } /> + + {/* 장바구니 */} + } /> + + {/* 공지사항 */} + } /> + + {/* 메인 */} + } /> + + ); +}; + +export default UserRoutes; diff --git a/tailwind.config.js b/tailwind.config.js index ea6cb1e..43fffdb 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -9,9 +9,11 @@ export default { colors: { primary: "#000", // 메인 브랜드 색상 secondary: "#fff", // 배경에 사용하는 중립 색상 - // accent: "#FFD700", // 포인트 색상 (골드) - // textPrimary: "#333333", // 기본 텍스트 색상 (짙은 회색) - // textSecondary: "#777777", // 보조 텍스트 색상 (연한 회색) + + gray100: "#F1F1F1", + gray300: "#CBCAC7", + gray500: "#B2B2B2", + gray700: "#7F7F7F" }, fontSize: { xs: "0.75rem", // 12px From d59fe1e59c5cf436c84ec1bc89c858e8bc9aabb5 Mon Sep 17 00:00:00 2001 From: moriroKim Date: Thu, 7 Nov 2024 18:26:39 +0900 Subject: [PATCH 003/306] =?UTF-8?q?=F0=9F=8E=A8=20design:=20tailwind-confi?= =?UTF-8?q?g=20=ED=85=8C=EB=A7=88=20=EB=B0=8F=20=ED=8F=B0=ED=8A=B8?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .nvmrc | 1 + src/global.css | 2 ++ tailwind.config.js | 50 +++++++++++++++++----------------------------- 3 files changed, 21 insertions(+), 32 deletions(-) create mode 100644 .nvmrc diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..9aef5aa --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +v20.17.0 \ No newline at end of file diff --git a/src/global.css b/src/global.css index b5c61c9..9addf7d 100644 --- a/src/global.css +++ b/src/global.css @@ -1,3 +1,5 @@ @tailwind base; @tailwind components; @tailwind utilities; + +@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@100..900&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap'); diff --git a/tailwind.config.js b/tailwind.config.js index ea6cb1e..337d3c5 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -7,40 +7,26 @@ export default { theme: { extend: { colors: { - primary: "#000", // 메인 브랜드 색상 - secondary: "#fff", // 배경에 사용하는 중립 색상 - // accent: "#FFD700", // 포인트 색상 (골드) - // textPrimary: "#333333", // 기본 텍스트 색상 (짙은 회색) - // textSecondary: "#777777", // 보조 텍스트 색상 (연한 회색) - }, - fontSize: { - xs: "0.75rem", // 12px - sm: "0.875rem", // 14px - base: "1rem", // 16px - lg: "1.125rem", // 18px - xl: "1.25rem", // 20px - "2xl": "1.5rem", // 24px - }, - spacing: { - "2": "0.5rem", // 8px - "4": "1rem", // 16px - "6": "1.5rem", // 24px - "8": "2rem", // 32px - "10": "2.5rem", // 40px - }, - borderRadius: { - sm: "0.125rem", // 2px - DEFAULT: "0.25rem", // 4px - lg: "0.5rem", // 8px - full: "9999px", // 완전한 원형 - }, - boxShadow: { - sm: "0 1px 2px rgba(0, 0, 0, 0.05)", // 작은 그림자 - DEFAULT: "0 1px 3px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.06)", // 기본 그림자 - lg: "0 10px 15px rgba(0, 0, 0, 0.1), 0 4px 6px rgba(0, 0, 0, 0.05)", // 큰 그림자 + primary: "#000000", // 메인 브랜드 색상 + secondary: "#ffffff", // 배경에 사용하는 중립 색상 + accent: "##F77830", // 포인트 색상 + text: "#000000", // 기본 텍스트 색상 (짙은 회색) + textSub: "#7F7F7F", // 보조 텍스트 색상 (연한 회색) + textLink: '#0000FF', // 링크 + textGray: '#C7C7C7', + success: '#008541', + error: '#FF6E66', + border: '#D9D9D9', + borderGray: '#7F7F7F', + boxGray: '#F6F6F6', + boxDarkGray: '#3C3C3C', }, + fontFamily: { + sans: ["Noto Sans KR", "Arial", "sans-serif"], + roboto: ["Roboto", "sans-serif"] + } }, }, plugins: [], -} +} From 36eb356608f89d495c696e7f749d842695d44173 Mon Sep 17 00:00:00 2001 From: shin-minhyuk Date: Thu, 7 Nov 2024 18:26:55 +0900 Subject: [PATCH 004/306] =?UTF-8?q?=F0=9F=90=9B=20fix:=20route=20=ED=8F=B4?= =?UTF-8?q?=EB=8D=94=20=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.tsx | 59 ++++++++++++++++++++++++++++--- src/main.tsx | 16 ++++++--- src/routes/AdminRoutes.tsx | 19 ---------- src/routes/UserRoutes.tsx | 54 ---------------------------- src/utils/QueryClientProvider.tsx | 17 +++++++++ 5 files changed, 84 insertions(+), 81 deletions(-) delete mode 100644 src/routes/AdminRoutes.tsx delete mode 100644 src/routes/UserRoutes.tsx create mode 100644 src/utils/QueryClientProvider.tsx diff --git a/src/App.tsx b/src/App.tsx index a70aea4..9798514 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,11 +1,62 @@ -import AdminRoutes from './routes/AdminRoutes'; -import UserRoutes from './routes/UserRoutes'; +import { Route, Routes } from 'react-router-dom'; +import HomePage from './pages/home/HomePage'; +import ShopPage from './pages/shop/ShopPage'; +import EventMainPage from './pages/event/EventMainPage'; +import EventDetailPage from './pages/event/EventDetailPage'; +import SignInPage from './pages/auth/SignInPage'; +import SignUpPage from './pages/auth/SignUpPage'; +import SignUpCompletePage from './pages/auth/SignUpCompletePage'; +import PasswordResetPage from './pages/auth/PasswordResetPage'; +import MyPage from './pages/mypage/MyPage'; +import AdminPage from './pages/admin/AdminPage'; +import AdminLoginPage from './pages/admin/AdminLoginPage'; +import DetailPage from './pages/shop/DetailPage'; +import CategoryPage from './pages/shop/CategoryPage'; +import CartPage from './pages/cart/CartPage'; +import PrivateRoute from './routes/PrivateRoute'; +import AdminRoute from './routes/AdminRoute'; +import NoticePage from './pages/notice/NoticePage'; function App() { return ( <> - - + + {/* PrivateRoute */} + {/* 마이페이지 */} + }> + } /> + + + {/* PublicRoute */} + {/* 쇼핑 */} + } /> + } /> + } /> + + {/* 이벤트 */} + } /> + } /> + + {/* 인증 */} + } /> + } /> + } /> + } /> + + {/* 장바구니 */} + } /> + + {/* 공지사항 */} + } /> + + {/* 메인 */} + } /> + + }> + } /> + } /> + + ); } diff --git a/src/main.tsx b/src/main.tsx index 587c3db..9217956 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -3,10 +3,18 @@ import './global.css'; import App from './App.tsx'; import { BrowserRouter } from 'react-router-dom'; import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; +import { QueryClientBoundary } from './utils/QueryClientProvider.tsx'; createRoot(document.getElementById('root')!).render( - - - - + + + + + + ); diff --git a/src/routes/AdminRoutes.tsx b/src/routes/AdminRoutes.tsx deleted file mode 100644 index a819435..0000000 --- a/src/routes/AdminRoutes.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import { Route, Routes } from 'react-router-dom'; -import AdminRoute from './AdminRoute'; -import AdminPage from '@/pages/admin/AdminPage'; -import AdminLoginPage from '@/pages/admin/AdminLoginPage'; - -const AdminRoutes = () => { - return ( - - {/* AdminRoute */} - {/* 관리자 */} - }> - } /> - } /> - - - ); -}; - -export default AdminRoutes; diff --git a/src/routes/UserRoutes.tsx b/src/routes/UserRoutes.tsx deleted file mode 100644 index e49d5d3..0000000 --- a/src/routes/UserRoutes.tsx +++ /dev/null @@ -1,54 +0,0 @@ -import { Route, Routes } from 'react-router-dom'; -import PrivateRoute from './PrivateRoute'; -import MyPage from '@/pages/mypage/MyPage'; -import ShopPage from '@/pages/shop/ShopPage'; -import CategoryPage from '@/pages/shop/CategoryPage'; -import DetailPage from '@/pages/shop/DetailPage'; -import EventMainPage from '@/pages/event/EventMainPage'; -import EventDetailPage from '@/pages/event/EventDetailPage'; -import SignInPage from '@/pages/auth/SignInPage'; -import SignUpPage from '@/pages/auth/SignUpPage'; -import SignUpCompletePage from '@/pages/auth/SignUpCompletePage'; -import PasswordResetPage from '@/pages/auth/PasswordResetPage'; -import CartPage from '@/pages/cart/CartPage'; -import NoticePage from '@/pages/notice/NoticePage'; -import HomePage from '@/pages/home/HomePage'; - -const UserRoutes = () => { - return ( - - {/* PrivateRoute */} - {/* 마이페이지 */} - }> - } /> - - - {/* PublicRoute */} - {/* 쇼핑 */} - } /> - } /> - } /> - - {/* 이벤트 */} - } /> - } /> - - {/* 인증 */} - } /> - } /> - } /> - } /> - - {/* 장바구니 */} - } /> - - {/* 공지사항 */} - } /> - - {/* 메인 */} - } /> - - ); -}; - -export default UserRoutes; diff --git a/src/utils/QueryClientProvider.tsx b/src/utils/QueryClientProvider.tsx new file mode 100644 index 0000000..3b784dd --- /dev/null +++ b/src/utils/QueryClientProvider.tsx @@ -0,0 +1,17 @@ +import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; +// import { MutationCache, QueryCache } from '@tanstack/react-query'; + +export const QueryClientBoundary = ({ children }: React.PropsWithChildren) => { + // const { updateError } = useErrorStore(); + + const queryClient = new QueryClient({ + // queryCache: new QueryCache({ + // onError: (error: Error) => updateError(error), + // }), + // mutationCache: new MutationCache({ + // onError: (error: Error) => updateError(error), + // }), + }); + + return {children}; +}; From 5ac008fcaf73bfd10b92fd913b111eeca88e2188 Mon Sep 17 00:00:00 2001 From: shin-minhyuk Date: Thu, 7 Nov 2024 18:30:50 +0900 Subject: [PATCH 005/306] =?UTF-8?q?=F0=9F=90=9B=20fix:=20file=20name=20cha?= =?UTF-8?q?nge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layouts/{commonLayout => userLayout}/Footer.tsx | 0 src/layouts/{commonLayout => userLayout}/Header.tsx | 0 src/layouts/{commonLayout => userLayout}/types.ts | 2 +- .../CommonLayout.tsx => userLayout/userLayout.tsx} | 6 +++--- 4 files changed, 4 insertions(+), 4 deletions(-) rename src/layouts/{commonLayout => userLayout}/Footer.tsx (100%) rename src/layouts/{commonLayout => userLayout}/Header.tsx (100%) rename src/layouts/{commonLayout => userLayout}/types.ts (62%) rename src/layouts/{commonLayout/CommonLayout.tsx => userLayout/userLayout.tsx} (54%) diff --git a/src/layouts/commonLayout/Footer.tsx b/src/layouts/userLayout/Footer.tsx similarity index 100% rename from src/layouts/commonLayout/Footer.tsx rename to src/layouts/userLayout/Footer.tsx diff --git a/src/layouts/commonLayout/Header.tsx b/src/layouts/userLayout/Header.tsx similarity index 100% rename from src/layouts/commonLayout/Header.tsx rename to src/layouts/userLayout/Header.tsx diff --git a/src/layouts/commonLayout/types.ts b/src/layouts/userLayout/types.ts similarity index 62% rename from src/layouts/commonLayout/types.ts rename to src/layouts/userLayout/types.ts index cda2c47..c1dd5b8 100644 --- a/src/layouts/commonLayout/types.ts +++ b/src/layouts/userLayout/types.ts @@ -1,5 +1,5 @@ import { ReactNode } from 'react'; -export interface CommonLayoutProps { +export interface UserLayoutProps { children: ReactNode; } diff --git a/src/layouts/commonLayout/CommonLayout.tsx b/src/layouts/userLayout/userLayout.tsx similarity index 54% rename from src/layouts/commonLayout/CommonLayout.tsx rename to src/layouts/userLayout/userLayout.tsx index aa00f02..700df97 100644 --- a/src/layouts/commonLayout/CommonLayout.tsx +++ b/src/layouts/userLayout/userLayout.tsx @@ -1,8 +1,8 @@ import Header from './Header'; import Footer from './Footer'; -import { CommonLayoutProps } from './types'; +import { UserLayoutProps } from './types'; -const CommonLayout = ({ children }: CommonLayoutProps) => { +const userLayout = ({ children }: UserLayoutProps) => { return ( <>
@@ -12,4 +12,4 @@ const CommonLayout = ({ children }: CommonLayoutProps) => { ); }; -export default CommonLayout; +export default userLayout; From 5b469b3fc8007a5e1937e64b9e5dc1a11f243243 Mon Sep 17 00:00:00 2001 From: moriroKim Date: Thu, 7 Nov 2024 18:43:07 +0900 Subject: [PATCH 006/306] =?UTF-8?q?Design:=20tailwind=20config=20=ED=85=8C?= =?UTF-8?q?=EB=A7=88=EC=84=A4=EC=A0=95=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/global.css | 4 +++- src/pages/home/HomePage.tsx | 2 +- tailwind.config.js | 15 ++++++--------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/global.css b/src/global.css index 9addf7d..fa41d67 100644 --- a/src/global.css +++ b/src/global.css @@ -1,5 +1,7 @@ +@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@100..900&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap'); + @tailwind base; @tailwind components; @tailwind utilities; -@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@100..900&family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap'); + diff --git a/src/pages/home/HomePage.tsx b/src/pages/home/HomePage.tsx index f07dc62..f3f9bed 100644 --- a/src/pages/home/HomePage.tsx +++ b/src/pages/home/HomePage.tsx @@ -1,5 +1,5 @@ const HomePage = () => { - return
HomePage
; + return
HomePage
; }; export default HomePage; diff --git a/tailwind.config.js b/tailwind.config.js index 337d3c5..753c9e0 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -9,17 +9,14 @@ export default { colors: { primary: "#000000", // 메인 브랜드 색상 secondary: "#ffffff", // 배경에 사용하는 중립 색상 - accent: "##F77830", // 포인트 색상 - text: "#000000", // 기본 텍스트 색상 (짙은 회색) - textSub: "#7F7F7F", // 보조 텍스트 색상 (연한 회색) - textLink: '#0000FF', // 링크 - textGray: '#C7C7C7', + accent: "#F77830", // 포인트 색상 + gray100: "#F1F1F1", + gray300: "#CBCAC7", + gray500: "#B2B2B2", + gray700: "#7F7F7F", + blue700: '#0000FF', // 링크 success: '#008541', error: '#FF6E66', - border: '#D9D9D9', - borderGray: '#7F7F7F', - boxGray: '#F6F6F6', - boxDarkGray: '#3C3C3C', }, fontFamily: { sans: ["Noto Sans KR", "Arial", "sans-serif"], From da22eb425bbeb2b129ca58ed5e693da897090369 Mon Sep 17 00:00:00 2001 From: shin-minhyuk Date: Thu, 7 Nov 2024 18:45:36 +0900 Subject: [PATCH 007/306] chore: tailwind config change --- tailwind.config.js | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/tailwind.config.js b/tailwind.config.js index 43fffdb..9b06efd 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -15,32 +15,6 @@ export default { gray500: "#B2B2B2", gray700: "#7F7F7F" }, - fontSize: { - xs: "0.75rem", // 12px - sm: "0.875rem", // 14px - base: "1rem", // 16px - lg: "1.125rem", // 18px - xl: "1.25rem", // 20px - "2xl": "1.5rem", // 24px - }, - spacing: { - "2": "0.5rem", // 8px - "4": "1rem", // 16px - "6": "1.5rem", // 24px - "8": "2rem", // 32px - "10": "2.5rem", // 40px - }, - borderRadius: { - sm: "0.125rem", // 2px - DEFAULT: "0.25rem", // 4px - lg: "0.5rem", // 8px - full: "9999px", // 완전한 원형 - }, - boxShadow: { - sm: "0 1px 2px rgba(0, 0, 0, 0.05)", // 작은 그림자 - DEFAULT: "0 1px 3px rgba(0, 0, 0, 0.1), 0 1px 2px rgba(0, 0, 0, 0.06)", // 기본 그림자 - lg: "0 10px 15px rgba(0, 0, 0, 0.1), 0 4px 6px rgba(0, 0, 0, 0.05)", // 큰 그림자 - }, }, }, plugins: [], From a3e6ed546f1508d47085c74c7d73a856497f9487 Mon Sep 17 00:00:00 2001 From: shin-minhyuk Date: Thu, 7 Nov 2024 19:07:26 +0900 Subject: [PATCH 008/306] =?UTF-8?q?=20feat:=20=EC=9C=A0=EC=A0=80,=20?= =?UTF-8?q?=EC=96=B4=EB=93=9C=EB=AF=BC=20=EB=A0=88=EC=9D=B4=EC=95=84?= =?UTF-8?q?=EC=9B=83=20=EA=B5=AC=EC=A1=B0=20=EB=B3=80=EA=B2=BD=20=ED=83=80?= =?UTF-8?q?=EC=9E=85=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.tsx | 57 ++++++++++++++----------- src/layouts/adminLayout/AdminLayout.tsx | 9 +++- src/layouts/adminLayout/types.ts | 0 src/layouts/userLayout/types.ts | 5 --- src/layouts/userLayout/userLayout.tsx | 10 +++-- 5 files changed, 46 insertions(+), 35 deletions(-) create mode 100644 src/layouts/adminLayout/types.ts diff --git a/src/App.tsx b/src/App.tsx index 9798514..7afd8a7 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -16,6 +16,8 @@ import CartPage from './pages/cart/CartPage'; import PrivateRoute from './routes/PrivateRoute'; import AdminRoute from './routes/AdminRoute'; import NoticePage from './pages/notice/NoticePage'; +import AdminLayout from './layouts/adminLayout/AdminLayout'; +import UserLayout from './layouts/userLayout/UserLayout'; function App() { return ( @@ -23,38 +25,43 @@ function App() { {/* PrivateRoute */} {/* 마이페이지 */} - }> - } /> - + }> + }> + } /> + - {/* PublicRoute */} - {/* 쇼핑 */} - } /> - } /> - } /> + {/* PublicRoute */} + {/* 쇼핑 */} + } /> + } /> + } /> - {/* 이벤트 */} - } /> - } /> + {/* 이벤트 */} + } /> + } /> - {/* 인증 */} - } /> - } /> - } /> - } /> + {/* 인증 */} + } /> + } /> + } /> + } /> - {/* 장바구니 */} - } /> + {/* 장바구니 */} + } /> - {/* 공지사항 */} - } /> + {/* 공지사항 */} + } /> - {/* 메인 */} - } /> + {/* 메인 */} + } /> + - }> - } /> - } /> + {/* 관리자 */} + } /> + }> + }> + } /> + diff --git a/src/layouts/adminLayout/AdminLayout.tsx b/src/layouts/adminLayout/AdminLayout.tsx index f14e610..9629f17 100644 --- a/src/layouts/adminLayout/AdminLayout.tsx +++ b/src/layouts/adminLayout/AdminLayout.tsx @@ -1,5 +1,12 @@ +import { Outlet } from 'react-router-dom'; + const AdminLayout = () => { - return
AdminLayout
; + return ( +
+
테스트
+ +
+ ); }; export default AdminLayout; diff --git a/src/layouts/adminLayout/types.ts b/src/layouts/adminLayout/types.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/layouts/userLayout/types.ts b/src/layouts/userLayout/types.ts index c1dd5b8..e69de29 100644 --- a/src/layouts/userLayout/types.ts +++ b/src/layouts/userLayout/types.ts @@ -1,5 +0,0 @@ -import { ReactNode } from 'react'; - -export interface UserLayoutProps { - children: ReactNode; -} diff --git a/src/layouts/userLayout/userLayout.tsx b/src/layouts/userLayout/userLayout.tsx index 700df97..d00de0f 100644 --- a/src/layouts/userLayout/userLayout.tsx +++ b/src/layouts/userLayout/userLayout.tsx @@ -1,15 +1,17 @@ import Header from './Header'; import Footer from './Footer'; -import { UserLayoutProps } from './types'; +import { Outlet } from 'react-router-dom'; -const userLayout = ({ children }: UserLayoutProps) => { +const UserLayout = () => { return ( <>
-
{children}
+
+ +