diff --git a/frontend/src/app/(auth)/components/FindFooter/index.tsx b/frontend/src/app/(client)/(auth)/components/FindFooter/index.tsx similarity index 100% rename from frontend/src/app/(auth)/components/FindFooter/index.tsx rename to frontend/src/app/(client)/(auth)/components/FindFooter/index.tsx diff --git a/frontend/src/app/(auth)/find-id/page.tsx b/frontend/src/app/(client)/(auth)/find-id/page.tsx similarity index 96% rename from frontend/src/app/(auth)/find-id/page.tsx rename to frontend/src/app/(client)/(auth)/find-id/page.tsx index 638cf314..9a430e64 100644 --- a/frontend/src/app/(auth)/find-id/page.tsx +++ b/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'; diff --git a/frontend/src/app/(auth)/find-password/components/FindForm/index.tsx b/frontend/src/app/(client)/(auth)/find-password/components/FindForm/index.tsx similarity index 100% rename from frontend/src/app/(auth)/find-password/components/FindForm/index.tsx rename to frontend/src/app/(client)/(auth)/find-password/components/FindForm/index.tsx diff --git a/frontend/src/app/(auth)/find-password/page.tsx b/frontend/src/app/(client)/(auth)/find-password/page.tsx similarity index 92% rename from frontend/src/app/(auth)/find-password/page.tsx rename to frontend/src/app/(client)/(auth)/find-password/page.tsx index 4e8725e9..ad3ca869 100644 --- a/frontend/src/app/(auth)/find-password/page.tsx +++ b/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'; diff --git a/frontend/src/app/(auth)/sign-in/components/InputUserInfo/index.tsx b/frontend/src/app/(client)/(auth)/sign-in/components/InputUserInfo/index.tsx similarity index 98% rename from frontend/src/app/(auth)/sign-in/components/InputUserInfo/index.tsx rename to frontend/src/app/(client)/(auth)/sign-in/components/InputUserInfo/index.tsx index ee785340..15ab95c2 100644 --- a/frontend/src/app/(auth)/sign-in/components/InputUserInfo/index.tsx +++ b/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'; diff --git a/frontend/src/app/(auth)/sign-in/page.tsx b/frontend/src/app/(client)/(auth)/sign-in/page.tsx similarity index 100% rename from frontend/src/app/(auth)/sign-in/page.tsx rename to frontend/src/app/(client)/(auth)/sign-in/page.tsx diff --git a/frontend/src/app/(auth)/sign-in/styled.ts b/frontend/src/app/(client)/(auth)/sign-in/styled.ts similarity index 100% rename from frontend/src/app/(auth)/sign-in/styled.ts rename to frontend/src/app/(client)/(auth)/sign-in/styled.ts diff --git a/frontend/src/app/(auth)/sign-out/page.tsx b/frontend/src/app/(client)/(auth)/sign-out/page.tsx similarity index 100% rename from frontend/src/app/(auth)/sign-out/page.tsx rename to frontend/src/app/(client)/(auth)/sign-out/page.tsx diff --git a/frontend/src/app/(auth)/sign-up/components/SignUpFirstPage/components/EmailTextInput/index.tsx b/frontend/src/app/(client)/(auth)/sign-up/components/SignUpFirstPage/components/EmailTextInput/index.tsx similarity index 100% rename from frontend/src/app/(auth)/sign-up/components/SignUpFirstPage/components/EmailTextInput/index.tsx rename to frontend/src/app/(client)/(auth)/sign-up/components/SignUpFirstPage/components/EmailTextInput/index.tsx diff --git a/frontend/src/app/(auth)/sign-up/components/SignUpFirstPage/index.tsx b/frontend/src/app/(client)/(auth)/sign-up/components/SignUpFirstPage/index.tsx similarity index 99% rename from frontend/src/app/(auth)/sign-up/components/SignUpFirstPage/index.tsx rename to frontend/src/app/(client)/(auth)/sign-up/components/SignUpFirstPage/index.tsx index a53e39ec..639db8b3 100644 --- a/frontend/src/app/(auth)/sign-up/components/SignUpFirstPage/index.tsx +++ b/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'; diff --git a/frontend/src/app/(auth)/sign-up/components/SignUpSecondPage/components/MajorDropdown/index.tsx b/frontend/src/app/(client)/(auth)/sign-up/components/SignUpSecondPage/components/MajorDropdown/index.tsx similarity index 100% rename from frontend/src/app/(auth)/sign-up/components/SignUpSecondPage/components/MajorDropdown/index.tsx rename to frontend/src/app/(client)/(auth)/sign-up/components/SignUpSecondPage/components/MajorDropdown/index.tsx diff --git a/frontend/src/app/(auth)/sign-up/components/SignUpSecondPage/index.tsx b/frontend/src/app/(client)/(auth)/sign-up/components/SignUpSecondPage/index.tsx similarity index 97% rename from frontend/src/app/(auth)/sign-up/components/SignUpSecondPage/index.tsx rename to frontend/src/app/(client)/(auth)/sign-up/components/SignUpSecondPage/index.tsx index a29b1778..18b73e63 100644 --- a/frontend/src/app/(auth)/sign-up/components/SignUpSecondPage/index.tsx +++ b/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'; diff --git a/frontend/src/app/(auth)/sign-up/page.tsx b/frontend/src/app/(client)/(auth)/sign-up/page.tsx similarity index 97% rename from frontend/src/app/(auth)/sign-up/page.tsx rename to frontend/src/app/(client)/(auth)/sign-up/page.tsx index 32ed0187..7b8aacfc 100644 --- a/frontend/src/app/(auth)/sign-up/page.tsx +++ b/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'; diff --git a/frontend/src/app/(auth)/styled.ts b/frontend/src/app/(client)/(auth)/styled.ts similarity index 100% rename from frontend/src/app/(auth)/styled.ts rename to frontend/src/app/(client)/(auth)/styled.ts diff --git a/frontend/src/app/(withSidebar)/hackathon/[slug]/components/HackathonInformationTypeButtons/index.tsx b/frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/components/HackathonInformationTypeButtons/index.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/hackathon/[slug]/components/HackathonInformationTypeButtons/index.tsx rename to frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/components/HackathonInformationTypeButtons/index.tsx diff --git a/frontend/src/app/(withSidebar)/hackathon/[slug]/layout.tsx b/frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/layout.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/hackathon/[slug]/layout.tsx rename to frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/layout.tsx diff --git a/frontend/src/app/(withSidebar)/hackathon/[slug]/page.tsx b/frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/page.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/hackathon/[slug]/page.tsx rename to frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/page.tsx diff --git a/frontend/src/app/(withSidebar)/hackathon/[slug]/prize/page.tsx b/frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/prize/page.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/hackathon/[slug]/prize/page.tsx rename to frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/prize/page.tsx diff --git a/frontend/src/app/(withSidebar)/hackathon/[slug]/vote/components/HackathonTeamCreateModal/index.tsx b/frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/vote/components/HackathonTeamCreateModal/index.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/hackathon/[slug]/vote/components/HackathonTeamCreateModal/index.tsx rename to frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/vote/components/HackathonTeamCreateModal/index.tsx diff --git a/frontend/src/app/(withSidebar)/hackathon/[slug]/vote/components/HackathonTeamReadModal/index.tsx b/frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/vote/components/HackathonTeamReadModal/index.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/hackathon/[slug]/vote/components/HackathonTeamReadModal/index.tsx rename to frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/vote/components/HackathonTeamReadModal/index.tsx diff --git a/frontend/src/app/(withSidebar)/hackathon/[slug]/vote/components/ReadmeViewer/index.tsx b/frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/vote/components/ReadmeViewer/index.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/hackathon/[slug]/vote/components/ReadmeViewer/index.tsx rename to frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/vote/components/ReadmeViewer/index.tsx diff --git a/frontend/src/app/(withSidebar)/hackathon/[slug]/vote/components/TeamCreateInputSection/index.tsx b/frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/vote/components/TeamCreateInputSection/index.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/hackathon/[slug]/vote/components/TeamCreateInputSection/index.tsx rename to frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/vote/components/TeamCreateInputSection/index.tsx diff --git a/frontend/src/app/(withSidebar)/hackathon/[slug]/vote/components/TeamMemberInput/index.tsx b/frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/vote/components/TeamMemberInput/index.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/hackathon/[slug]/vote/components/TeamMemberInput/index.tsx rename to frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/vote/components/TeamMemberInput/index.tsx diff --git a/frontend/src/app/(withSidebar)/hackathon/[slug]/vote/page.tsx b/frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/vote/page.tsx similarity index 97% rename from frontend/src/app/(withSidebar)/hackathon/[slug]/vote/page.tsx rename to frontend/src/app/(client)/(withSidebar)/hackathon/[slug]/vote/page.tsx index 7c9a09c2..506c0553 100644 --- a/frontend/src/app/(withSidebar)/hackathon/[slug]/vote/page.tsx +++ b/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'; diff --git a/frontend/src/app/(withSidebar)/hackathon/page.tsx b/frontend/src/app/(client)/(withSidebar)/hackathon/page.tsx similarity index 98% rename from frontend/src/app/(withSidebar)/hackathon/page.tsx rename to frontend/src/app/(client)/(withSidebar)/hackathon/page.tsx index 298aa125..ff85af86 100644 --- a/frontend/src/app/(withSidebar)/hackathon/page.tsx +++ b/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'; diff --git a/frontend/src/app/(withSidebar)/hackathon/sw-contest/page.tsx b/frontend/src/app/(client)/(withSidebar)/hackathon/sw-contest/page.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/hackathon/sw-contest/page.tsx rename to frontend/src/app/(client)/(withSidebar)/hackathon/sw-contest/page.tsx diff --git a/frontend/src/app/(withSidebar)/layout.tsx b/frontend/src/app/(client)/(withSidebar)/layout.tsx similarity index 87% rename from frontend/src/app/(withSidebar)/layout.tsx rename to frontend/src/app/(client)/(withSidebar)/layout.tsx index bab58dea..bf9d55d8 100644 --- a/frontend/src/app/(withSidebar)/layout.tsx +++ b/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'; diff --git a/frontend/src/app/(withSidebar)/milestone/page.tsx b/frontend/src/app/(client)/(withSidebar)/milestone/page.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/milestone/page.tsx rename to frontend/src/app/(client)/(withSidebar)/milestone/page.tsx diff --git a/frontend/src/app/(withSidebar)/milestone/styled.ts b/frontend/src/app/(client)/(withSidebar)/milestone/styled.ts similarity index 100% rename from frontend/src/app/(withSidebar)/milestone/styled.ts rename to frontend/src/app/(client)/(withSidebar)/milestone/styled.ts diff --git a/frontend/src/app/(withSidebar)/my-page/components/MilestoneHistorySection/index.tsx b/frontend/src/app/(client)/(withSidebar)/my-page/components/MilestoneHistorySection/index.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/my-page/components/MilestoneHistorySection/index.tsx rename to frontend/src/app/(client)/(withSidebar)/my-page/components/MilestoneHistorySection/index.tsx diff --git a/frontend/src/app/(withSidebar)/my-page/components/MilestoneHistoryStatusLabel/index.tsx b/frontend/src/app/(client)/(withSidebar)/my-page/components/MilestoneHistoryStatusLabel/index.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/my-page/components/MilestoneHistoryStatusLabel/index.tsx rename to frontend/src/app/(client)/(withSidebar)/my-page/components/MilestoneHistoryStatusLabel/index.tsx diff --git a/frontend/src/app/(withSidebar)/my-page/components/MilestoneRowBarTable/index.tsx b/frontend/src/app/(client)/(withSidebar)/my-page/components/MilestoneRowBarTable/index.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/my-page/components/MilestoneRowBarTable/index.tsx rename to frontend/src/app/(client)/(withSidebar)/my-page/components/MilestoneRowBarTable/index.tsx diff --git a/frontend/src/app/(withSidebar)/my-page/components/MilestoneSection/index.tsx b/frontend/src/app/(client)/(withSidebar)/my-page/components/MilestoneSection/index.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/my-page/components/MilestoneSection/index.tsx rename to frontend/src/app/(client)/(withSidebar)/my-page/components/MilestoneSection/index.tsx diff --git a/frontend/src/app/(withSidebar)/my-page/components/StudentInfoSection/StudentInfoLabel/index.tsx b/frontend/src/app/(client)/(withSidebar)/my-page/components/StudentInfoSection/StudentInfoLabel/index.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/my-page/components/StudentInfoSection/StudentInfoLabel/index.tsx rename to frontend/src/app/(client)/(withSidebar)/my-page/components/StudentInfoSection/StudentInfoLabel/index.tsx diff --git a/frontend/src/app/(withSidebar)/my-page/components/StudentInfoSection/index.tsx b/frontend/src/app/(client)/(withSidebar)/my-page/components/StudentInfoSection/index.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/my-page/components/StudentInfoSection/index.tsx rename to frontend/src/app/(client)/(withSidebar)/my-page/components/StudentInfoSection/index.tsx diff --git a/frontend/src/app/(withSidebar)/my-page/milestone/components/MilestoneDetail/index.tsx b/frontend/src/app/(client)/(withSidebar)/my-page/milestone/components/MilestoneDetail/index.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/my-page/milestone/components/MilestoneDetail/index.tsx rename to frontend/src/app/(client)/(withSidebar)/my-page/milestone/components/MilestoneDetail/index.tsx diff --git a/frontend/src/app/(withSidebar)/my-page/milestone/components/MilestoneDetail/styled.ts b/frontend/src/app/(client)/(withSidebar)/my-page/milestone/components/MilestoneDetail/styled.ts similarity index 100% rename from frontend/src/app/(withSidebar)/my-page/milestone/components/MilestoneDetail/styled.ts rename to frontend/src/app/(client)/(withSidebar)/my-page/milestone/components/MilestoneDetail/styled.ts diff --git a/frontend/src/app/(withSidebar)/my-page/milestone/components/MilestoneHistoryTable/index.tsx b/frontend/src/app/(client)/(withSidebar)/my-page/milestone/components/MilestoneHistoryTable/index.tsx similarity index 97% rename from frontend/src/app/(withSidebar)/my-page/milestone/components/MilestoneHistoryTable/index.tsx rename to frontend/src/app/(client)/(withSidebar)/my-page/milestone/components/MilestoneHistoryTable/index.tsx index c9a98ad2..438e09b5 100644 --- a/frontend/src/app/(withSidebar)/my-page/milestone/components/MilestoneHistoryTable/index.tsx +++ b/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'; diff --git a/frontend/src/app/(withSidebar)/my-page/milestone/components/MilestoneHistoryTable/styled.ts b/frontend/src/app/(client)/(withSidebar)/my-page/milestone/components/MilestoneHistoryTable/styled.ts similarity index 100% rename from frontend/src/app/(withSidebar)/my-page/milestone/components/MilestoneHistoryTable/styled.ts rename to frontend/src/app/(client)/(withSidebar)/my-page/milestone/components/MilestoneHistoryTable/styled.ts diff --git a/frontend/src/app/(withSidebar)/my-page/milestone/components/MilestoneOverview/index.tsx b/frontend/src/app/(client)/(withSidebar)/my-page/milestone/components/MilestoneOverview/index.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/my-page/milestone/components/MilestoneOverview/index.tsx rename to frontend/src/app/(client)/(withSidebar)/my-page/milestone/components/MilestoneOverview/index.tsx diff --git a/frontend/src/app/(withSidebar)/my-page/milestone/components/MilestoneOverview/styled.ts b/frontend/src/app/(client)/(withSidebar)/my-page/milestone/components/MilestoneOverview/styled.ts similarity index 100% rename from frontend/src/app/(withSidebar)/my-page/milestone/components/MilestoneOverview/styled.ts rename to frontend/src/app/(client)/(withSidebar)/my-page/milestone/components/MilestoneOverview/styled.ts diff --git a/frontend/src/app/(withSidebar)/my-page/milestone/page.tsx b/frontend/src/app/(client)/(withSidebar)/my-page/milestone/page.tsx similarity index 95% rename from frontend/src/app/(withSidebar)/my-page/milestone/page.tsx rename to frontend/src/app/(client)/(withSidebar)/my-page/milestone/page.tsx index 90566abc..02206d48 100644 --- a/frontend/src/app/(withSidebar)/my-page/milestone/page.tsx +++ b/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 = () => { diff --git a/frontend/src/app/(withSidebar)/my-page/milestone/register/components/MilestoneHistoryDeleteButton/index.tsx b/frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/components/MilestoneHistoryDeleteButton/index.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/my-page/milestone/register/components/MilestoneHistoryDeleteButton/index.tsx rename to frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/components/MilestoneHistoryDeleteButton/index.tsx diff --git a/frontend/src/app/(withSidebar)/my-page/milestone/register/components/MilestoneHistoryTable/index.tsx b/frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/components/MilestoneHistoryTable/index.tsx similarity index 95% rename from frontend/src/app/(withSidebar)/my-page/milestone/register/components/MilestoneHistoryTable/index.tsx rename to frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/components/MilestoneHistoryTable/index.tsx index 3bcf7e5a..5273acbe 100644 --- a/frontend/src/app/(withSidebar)/my-page/milestone/register/components/MilestoneHistoryTable/index.tsx +++ b/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 { diff --git a/frontend/src/app/(withSidebar)/my-page/milestone/register/page.tsx b/frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/page.tsx similarity index 92% rename from frontend/src/app/(withSidebar)/my-page/milestone/register/page.tsx rename to frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/page.tsx index 7836ab8f..c6fc020e 100644 --- a/frontend/src/app/(withSidebar)/my-page/milestone/register/page.tsx +++ b/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'; diff --git a/frontend/src/app/(withSidebar)/my-page/milestone/register/write/components/MilestoneDropdown/index.tsx b/frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/write/components/MilestoneDropdown/index.tsx similarity index 97% rename from frontend/src/app/(withSidebar)/my-page/milestone/register/write/components/MilestoneDropdown/index.tsx rename to frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/write/components/MilestoneDropdown/index.tsx index 61d56f4f..f7298846 100644 --- a/frontend/src/app/(withSidebar)/my-page/milestone/register/write/components/MilestoneDropdown/index.tsx +++ b/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'; diff --git a/frontend/src/app/(withSidebar)/my-page/milestone/register/write/page.tsx b/frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/write/page.tsx similarity index 96% rename from frontend/src/app/(withSidebar)/my-page/milestone/register/write/page.tsx rename to frontend/src/app/(client)/(withSidebar)/my-page/milestone/register/write/page.tsx index 90705709..d65abdc4 100644 --- a/frontend/src/app/(withSidebar)/my-page/milestone/register/write/page.tsx +++ b/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'; diff --git a/frontend/src/app/(withSidebar)/my-page/milestone/styled.ts b/frontend/src/app/(client)/(withSidebar)/my-page/milestone/styled.ts similarity index 100% rename from frontend/src/app/(withSidebar)/my-page/milestone/styled.ts rename to frontend/src/app/(client)/(withSidebar)/my-page/milestone/styled.ts diff --git a/frontend/src/app/(withSidebar)/my-page/page.tsx b/frontend/src/app/(client)/(withSidebar)/my-page/page.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/my-page/page.tsx rename to frontend/src/app/(client)/(withSidebar)/my-page/page.tsx diff --git a/frontend/src/app/(withSidebar)/styled.ts b/frontend/src/app/(client)/(withSidebar)/styled.ts similarity index 100% rename from frontend/src/app/(withSidebar)/styled.ts rename to frontend/src/app/(client)/(withSidebar)/styled.ts diff --git a/frontend/src/app/(withSidebar)/team-building/page.tsx b/frontend/src/app/(client)/(withSidebar)/team-building/page.tsx similarity index 100% rename from frontend/src/app/(withSidebar)/team-building/page.tsx rename to frontend/src/app/(client)/(withSidebar)/team-building/page.tsx diff --git a/frontend/src/app/components/Announcement/index.tsx b/frontend/src/app/(client)/components/Announcement/index.tsx similarity index 100% rename from frontend/src/app/components/Announcement/index.tsx rename to frontend/src/app/(client)/components/Announcement/index.tsx diff --git a/frontend/src/app/components/Announcement/styled.ts b/frontend/src/app/(client)/components/Announcement/styled.ts similarity index 100% rename from frontend/src/app/components/Announcement/styled.ts rename to frontend/src/app/(client)/components/Announcement/styled.ts diff --git a/frontend/src/app/components/ExternalLink/index.tsx b/frontend/src/app/(client)/components/ExternalLink/index.tsx similarity index 100% rename from frontend/src/app/components/ExternalLink/index.tsx rename to frontend/src/app/(client)/components/ExternalLink/index.tsx diff --git a/frontend/src/app/components/ExternalLink/styled.ts b/frontend/src/app/(client)/components/ExternalLink/styled.ts similarity index 100% rename from frontend/src/app/components/ExternalLink/styled.ts rename to frontend/src/app/(client)/components/ExternalLink/styled.ts diff --git a/frontend/src/app/components/Formik/Dropdown/index.tsx b/frontend/src/app/(client)/components/Formik/Dropdown/index.tsx similarity index 100% rename from frontend/src/app/components/Formik/Dropdown/index.tsx rename to frontend/src/app/(client)/components/Formik/Dropdown/index.tsx diff --git a/frontend/src/app/components/Formik/TextInput/index.tsx b/frontend/src/app/(client)/components/Formik/TextInput/index.tsx similarity index 100% rename from frontend/src/app/components/Formik/TextInput/index.tsx rename to frontend/src/app/(client)/components/Formik/TextInput/index.tsx diff --git a/frontend/src/app/components/GoPageIcon/index.tsx b/frontend/src/app/(client)/components/GoPageIcon/index.tsx similarity index 100% rename from frontend/src/app/components/GoPageIcon/index.tsx rename to frontend/src/app/(client)/components/GoPageIcon/index.tsx diff --git a/frontend/src/app/components/Milestone/index.tsx b/frontend/src/app/(client)/components/Milestone/index.tsx similarity index 100% rename from frontend/src/app/components/Milestone/index.tsx rename to frontend/src/app/(client)/components/Milestone/index.tsx diff --git a/frontend/src/app/components/Milestone/styled.ts b/frontend/src/app/(client)/components/Milestone/styled.ts similarity index 100% rename from frontend/src/app/components/Milestone/styled.ts rename to frontend/src/app/(client)/components/Milestone/styled.ts diff --git a/frontend/src/app/components/PageTitle/index.tsx b/frontend/src/app/(client)/components/PageTitle/index.tsx similarity index 100% rename from frontend/src/app/components/PageTitle/index.tsx rename to frontend/src/app/(client)/components/PageTitle/index.tsx diff --git a/frontend/src/app/components/Pagination/index.tsx b/frontend/src/app/(client)/components/Pagination/index.tsx similarity index 100% rename from frontend/src/app/components/Pagination/index.tsx rename to frontend/src/app/(client)/components/Pagination/index.tsx diff --git a/frontend/src/app/components/PnuLink/index.tsx b/frontend/src/app/(client)/components/PnuLink/index.tsx similarity index 100% rename from frontend/src/app/components/PnuLink/index.tsx rename to frontend/src/app/(client)/components/PnuLink/index.tsx diff --git a/frontend/src/app/components/PnuLink/styled.ts b/frontend/src/app/(client)/components/PnuLink/styled.ts similarity index 100% rename from frontend/src/app/components/PnuLink/styled.ts rename to frontend/src/app/(client)/components/PnuLink/styled.ts diff --git a/frontend/src/components/Sidebar/index.tsx b/frontend/src/app/(client)/components/Sidebar/index.tsx similarity index 98% rename from frontend/src/components/Sidebar/index.tsx rename to frontend/src/app/(client)/components/Sidebar/index.tsx index 6ef2143d..d1700094 100644 --- a/frontend/src/components/Sidebar/index.tsx +++ b/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(() => { diff --git a/frontend/src/components/Sidebar/styled.ts b/frontend/src/app/(client)/components/Sidebar/styled.ts similarity index 98% rename from frontend/src/components/Sidebar/styled.ts rename to frontend/src/app/(client)/components/Sidebar/styled.ts index 9177c6d6..01d77a24 100644 --- a/frontend/src/components/Sidebar/styled.ts +++ b/frontend/src/app/(client)/components/Sidebar/styled.ts @@ -45,7 +45,7 @@ export const SidebarCategoryList = styled.div` 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; diff --git a/frontend/src/app/components/SignIn/components/InputUserInfo/index.tsx b/frontend/src/app/(client)/components/SignIn/components/InputUserInfo/index.tsx similarity index 100% rename from frontend/src/app/components/SignIn/components/InputUserInfo/index.tsx rename to frontend/src/app/(client)/components/SignIn/components/InputUserInfo/index.tsx diff --git a/frontend/src/app/components/SignIn/components/InputUserInfo/styled.ts b/frontend/src/app/(client)/components/SignIn/components/InputUserInfo/styled.ts similarity index 100% rename from frontend/src/app/components/SignIn/components/InputUserInfo/styled.ts rename to frontend/src/app/(client)/components/SignIn/components/InputUserInfo/styled.ts diff --git a/frontend/src/app/components/SignIn/index.tsx b/frontend/src/app/(client)/components/SignIn/index.tsx similarity index 100% rename from frontend/src/app/components/SignIn/index.tsx rename to frontend/src/app/(client)/components/SignIn/index.tsx diff --git a/frontend/src/app/components/SignIn/styled.ts b/frontend/src/app/(client)/components/SignIn/styled.ts similarity index 100% rename from frontend/src/app/components/SignIn/styled.ts rename to frontend/src/app/(client)/components/SignIn/styled.ts diff --git a/frontend/src/app/components/TeamBuildings/index.tsx b/frontend/src/app/(client)/components/TeamBuildings/index.tsx similarity index 100% rename from frontend/src/app/components/TeamBuildings/index.tsx rename to frontend/src/app/(client)/components/TeamBuildings/index.tsx diff --git a/frontend/src/app/components/TeamBuildings/styled.ts b/frontend/src/app/(client)/components/TeamBuildings/styled.ts similarity index 100% rename from frontend/src/app/components/TeamBuildings/styled.ts rename to frontend/src/app/(client)/components/TeamBuildings/styled.ts diff --git a/frontend/src/app/components/styled.ts b/frontend/src/app/(client)/components/styled.ts similarity index 100% rename from frontend/src/app/components/styled.ts rename to frontend/src/app/(client)/components/styled.ts diff --git a/frontend/src/app/layout-styled.ts b/frontend/src/app/(client)/layout-styled.ts similarity index 100% rename from frontend/src/app/layout-styled.ts rename to frontend/src/app/(client)/layout-styled.ts diff --git a/frontend/src/app/(client)/layout.tsx b/frontend/src/app/(client)/layout.tsx new file mode 100644 index 00000000..bd79c84e --- /dev/null +++ b/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 }>) => ( + <> +
+ {children} +