Merge pull request #198 from SW-CSS/develop

RELEASE

frontend/src/app/(auth)/find-id/page.tsx → frontend/src/app/(client)/(auth)/find-id/page.tsx

@@ -1,4 +1,4 @@
-import PageTitle from '@/app/components/PageTitle';
+import PageTitle from '@/app/(client)/components/PageTitle';
 import TabButton from '@/components/TabButton';
 
 import FindFooter from '../components/FindFooter';

frontend/src/app/(auth)/find-password/page.tsx → frontend/src/app/(client)/(auth)/find-password/page.tsx

@@ -1,4 +1,4 @@
-import PageTitle from '@/app/components/PageTitle';
+import PageTitle from '@/app/(client)/components/PageTitle';
 import TabButton from '@/components/TabButton';
 
 import FindForm from './components/FindForm';

frontend/src/app/(auth)/sign-in/components/InputUserInfo/index.tsx → frontend/src/app/(client)/(auth)/sign-in/components/InputUserInfo/index.tsx

@@ -2,7 +2,7 @@
 
 import { useRouter } from 'next/navigation';
 
-import { InputFixedText, Input, InputLabel, InputWrapper, SignButton } from '@/app/(auth)/styled';
+import { InputFixedText, Input, InputLabel, InputWrapper, SignButton } from '@/app/(client)/(auth)/styled';
 import { useAppDispatch, useAppSelector } from '@/lib/hooks/redux';
 import { signIn } from '@/store/auth.slice';
 import { useSignInMutation } from '@/lib/hooks/useApi';

frontend/src/app/(auth)/sign-up/components/SignUpFirstPage/index.tsx → frontend/src/app/(client)/(auth)/sign-up/components/SignUpFirstPage/index.tsx

@@ -5,7 +5,7 @@
 import { Formik, Form } from 'formik';
 import * as Yup from 'yup';
 
-import { TextInput } from '@/app/components/Formik/TextInput';
+import { TextInput } from '@/app/(client)/components/Formik/TextInput';
 
 import EmailTextInput from './components/EmailTextInput';
 import { useState } from 'react';

frontend/src/app/(auth)/sign-up/components/SignUpSecondPage/index.tsx → frontend/src/app/(client)/(auth)/sign-up/components/SignUpSecondPage/index.tsx

@@ -6,8 +6,8 @@
 import { Formik, Form } from 'formik';
 import * as Yup from 'yup';
 
-import { Dropdown } from '@/app/components/Formik/Dropdown';
-import { TextInput } from '@/app/components/Formik/TextInput';
+import { Dropdown } from '@/app/(client)/components/Formik/Dropdown';
+import { TextInput } from '@/app/(client)/components/Formik/TextInput';
 import { careerCategory } from '@/data/signUp';
 
 import MajorDropdown from './components/MajorDropdown';

frontend/src/app/(auth)/sign-up/page.tsx → frontend/src/app/(client)/(auth)/sign-up/page.tsx

@@ -2,7 +2,7 @@
 
 import { useEffect, useState } from 'react';
 
-import PageTitle from '@/app/components/PageTitle';
+import PageTitle from '@/app/(client)/components/PageTitle';
 import { SignUpPhase } from '@/data/signUp';
 
 import SignUpFirstPage, { FirstInfo } from './components/SignUpFirstPage';

frontend/src/app/(withSidebar)/hackathon/[slug]/vote/page.tsx → frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/vote/page.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import Pagination from '@/app/components/Pagination';
+import Pagination from '@/app/(client)/components/Pagination';
 import { useHackathonTeamsQuery } from '@/lib/hooks/useApi';
 import { HackathonTeamDto } from '@/types/common.dto';
 import Image from 'next/image';

frontend/src/app/(withSidebar)/hackathon/page.tsx → frontend/src/app/(client)/(withSidebar)/hackathon/page.tsx

@@ -1,4 +1,4 @@
-import Pagination from '@/app/components/Pagination';
+import Pagination from '@/app/(client)/components/Pagination';
 import Title from '@/components/Title';
 import { HackathonState } from '@/data/hackathon';
 import { getHackathons } from '@/lib/api/server.api';

frontend/src/app/(withSidebar)/layout.tsx → frontend/src/app/(client)/(withSidebar)/layout.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable @next/next/no-page-custom-font */
 
-import Sidebar from '@/components/Sidebar';
+import Sidebar from '@/app/(client)/components/Sidebar';
 
 import { Content, ContentWrapper, PageWithSidebarWrapper } from './styled';
 

frontend/src/app/(withSidebar)/my-page/milestone/components/MilestoneHistoryTable/index.tsx → frontend/src/app/(client)/(withSidebar)/my-page/milestone/components/MilestoneHistoryTable/index.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable jsx-a11y/control-has-associated-label */
 /* eslint-disable max-len */
-import Pagination from '@/app/components/Pagination';
+import Pagination from '@/app/(client)/components/Pagination';
 import MilestoneGroupLabel from '@/components/MilestoneGroupLabel';
 import { MilestoneHistoryStatus } from '@/data/milestone';
 import { useAppSelector } from '@/lib/hooks/redux';

frontend/src/app/(withSidebar)/my-page/milestone/page.tsx → frontend/src/app/(client)/(withSidebar)/my-page/milestone/page.tsx

@@ -9,7 +9,7 @@ import { Period } from '@/types/common';
 import MilestoneHistoryTable from './components/MilestoneHistoryTable';
 import MilestoneOverview from './components/MilestoneOverview';
 import { Content, SubTitle } from './styled';
-import MilestonePeriodSearchForm from '../../../../components/MilestonePeriodSearchForm';
+import MilestonePeriodSearchForm from '@/components/MilestonePeriodSearchForm';
 import { useSearchParams } from 'next/navigation';
 
 const Page = () => {

frontend/src/app/(withSidebar)/my-page/milestone/register/components/MilestoneHistoryTable/index.tsx → frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/components/MilestoneHistoryTable/index.tsx

@@ -1,13 +1,13 @@
 /* eslint-disable jsx-a11y/control-has-associated-label */
 /* eslint-disable max-len */
 
-import MilestoneHistoryStatusLabel from '@/app/(withSidebar)/my-page/components/MilestoneHistoryStatusLabel';
+import MilestoneHistoryStatusLabel from '@/app/(client)/(withSidebar)/my-page/components/MilestoneHistoryStatusLabel';
 import { getMilestoneHistoriesOfStudent } from '@/lib/api/server.api';
 import { getAuthFromCookie } from '@/lib/utils/auth';
 import { MilestoneHistorySortCriteria, SortDirection } from '@/types/milestone';
 
 import MilestoneHistoryDeleteButton from '../MilestoneHistoryDeleteButton';
-import Pagination from '@/app/components/Pagination';
+import Pagination from '@/app/(client)/components/Pagination';
 import { headers } from 'next/headers';
 
 interface MilestoneHistoryTableProp {

frontend/src/app/(withSidebar)/my-page/milestone/register/page.tsx → frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/page.tsx

@@ -1,6 +1,6 @@
 import Link from 'next/link';
 
-import PageTitle from '@/app/components/PageTitle';
+import PageTitle from '@/app/(client)/components/PageTitle';
 
 import MilestoneHistoryTable from './components/MilestoneHistoryTable';
 

frontend/src/app/(withSidebar)/my-page/milestone/register/write/components/MilestoneDropdown/index.tsx → frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/write/components/MilestoneDropdown/index.tsx

@@ -2,7 +2,7 @@
 /* eslint-disable implicit-arrow-linebreak */
 import { Dispatch, SetStateAction, useEffect, useMemo, useState } from 'react';
 
-import { Dropdown, DropdownOption, DropdownProps } from '@/app/components/Formik/Dropdown';
+import { Dropdown, DropdownOption, DropdownProps } from '@/app/(client)/components/Formik/Dropdown';
 import { MilestoneGroup } from '@/data/milestone';
 import { useMilestoneQuery } from '@/lib/hooks/useApi';
 import { Milestone, MilestoneCategory } from '@/types/milestone';

frontend/src/app/(withSidebar)/my-page/milestone/register/write/page.tsx → frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/write/page.tsx

@@ -9,10 +9,10 @@ import { useState } from 'react';
 import * as Yup from 'yup';
 import { toast } from 'react-toastify';
 
-import { DatePicker } from '@/app/components/Formik/DatePicker';
-import { FileUploader } from '@/app/components/Formik/FileUploader';
-import { TextInput } from '@/app/components/Formik/TextInput';
-import PageTitle from '@/app/components/PageTitle';
+import { DatePicker } from '@/components/Formik/DatePicker';
+import { FileUploader } from '@/components/Formik/FileUploader';
+import { TextInput } from '@/app/(client)/components/Formik/TextInput';
+import PageTitle from '@/app/(client)/components/PageTitle';
 import { useMilestoneHistoryCreateMutation } from '@/lib/hooks/useApi';
 import { MilestoneHistoryCreateDto } from '@/types/common.dto';
 import { Milestone, MilestoneCategory } from '@/types/milestone';

frontend/src/components/Sidebar/index.tsx → frontend/src/app/(client)/components/Sidebar/index.tsx

@@ -33,6 +33,7 @@ const Sidebar = () => {
 
   useEffect(() => {
     setCurrentCategory(headerInfos.filter((headerInfo) => pathname.startsWith(headerInfo.url))[0]);
+    setIsOpenNavigationBar(false);
   }, [pathname]);
 
   useEffect(() => {

frontend/src/components/Sidebar/styled.ts → frontend/src/app/(client)/components/Sidebar/styled.ts

@@ -45,7 +45,7 @@ export const SidebarCategoryList = styled.div<SidebarCategoryListProps>`
   display: flex;
   margin-top: 30px;
   flex-direction: column;
-  z-index: 0;
+  z-index: 49;
 
   @media screen and (max-width: ${RESPONSIVE_WIDTH.desktop}) {
     transition: all 0.6s ease-in-out;
@@ -105,7 +105,7 @@ export const SidebarMobileButton = styled.button`
   background-color: ${COLOR.secondary.main};
   color: ${COLOR.white};
   padding: 0px 15px;
-  z-index: 0;
+  z-index: 49;
 
   @media screen and (max-width: ${RESPONSIVE_WIDTH.desktop}) {
     display: flex;

frontend/src/app/(client)/layout.tsx

@@ -0,0 +1,15 @@
+/* eslint-disable @next/next/no-page-custom-font */
+
+import Footer from '@/components/Footer';
+import Header from '@/components/Header';
+
+import { PageWrapper } from './layout-styled';
+
+const RootLayout = ({ children }: Readonly<{ children: React.ReactNode }>) => (
+  <>
+    <Header />
+    <PageWrapper>{children}</PageWrapper>
+    <Footer />
+  </>
+);
+export default RootLayout;

frontend/src/app/admin/layout.tsx

@@ -0,0 +1,18 @@
+/* eslint-disable @next/next/no-page-custom-font */
+
+import AdminFooter from '@/adminComponents/Footer';
+import AdminHeader from '@/adminComponents/Header';
+import AdminSidebar from '@/adminComponents/Sidebar';
+import { ADMIN_HEADER_HEIGHT, ADMIN_SIDEBAR_WIDTH, COLOR } from '@/adminConstants';
+
+const Layout = ({ children }: Readonly<{ children: React.ReactNode }>) => (
+  <>
+    <AdminHeader />
+    <AdminSidebar />
+    <div className={`min-h-[100vh] w-[100vw] bg-[${COLOR.secondary.light}] pt-adminHeaderHeight pl-adminSidebarWidth`}>
+      <section className="relative m-5 min-h-[80vh] min-w-admin rounded-sm bg-white p-5">{children}</section>
+      <AdminFooter />
+    </div>
+  </>
+);
+export default Layout;

frontend/src/app/admin/milestone/register/page.tsx

@@ -10,7 +10,7 @@ import { useRouter } from 'next/navigation';
 import { toast } from 'react-toastify';
 import * as Yup from 'yup';
 
-import { FileUploader } from '@/app/components/Formik/FileUploader';
+import { FileUploader } from '@/components/Formik/FileUploader';
 import { useRegisterHistoryInBatchMutation } from '@/lib/hooks/useAdminApi';
 
 const validationSchema = Yup.object().shape({

frontend/src/app/layout.tsx

@@ -6,8 +6,6 @@ import ReactQueryProvider from '@/lib/utils/reactQueryProvider';
 import ReduxProvider from '@/lib/utils/reduxProvider';
 import StyledComponentsRegistry from '@/theme/StyledComponentsRegistry';
 
-import CustomLayout from './CustomLayout';
-
 import './globals.css';
 
 export const metadata: Metadata = {
@@ -27,7 +25,7 @@ const RootLayout = ({ children }: Readonly<{ children: React.ReactNode }>) => (
       <ReactQueryProvider>
         <ReduxProvider>
           <StyledComponentsRegistry>
-            <CustomLayout>{children}</CustomLayout>
+            {children}
             <ToastContainer autoClose={1500} position="bottom-right" />
           </StyledComponentsRegistry>
         </ReduxProvider>

frontend/src/lib/hooks/useApi.ts

@@ -1,6 +1,6 @@
 /* eslint-disable implicit-arrow-linebreak */
-import { FirstInfo } from '@/app/(auth)/sign-up/components/SignUpFirstPage';
-import { SecondInfo } from '@/app/(auth)/sign-up/components/SignUpSecondPage';
+import { FirstInfo } from '@/app/(client)/(auth)/sign-up/components/SignUpFirstPage';
+import { SecondInfo } from '@/app/(client)/(auth)/sign-up/components/SignUpSecondPage';
 import { MilestoneHistoryStatus } from '@/data/milestone';
 import { QueryKeys } from '@/data/queryKey';
 import { client } from '@/lib/api/client.axios';

frontend/tailwind.config.js

@@ -13,6 +13,10 @@ module.exports = {
         md: '768px',
         lg: '1200px',
       },
+      padding: {
+        adminSidebarWidth: '220px',
+        adminHeaderHeight: '55px',
+      },
       colors: {
         white: '#FFFFFF',
         black: '#333333',