[RAC-471] chore: 폴더 구조 재정리

package.json

@@ -15,8 +15,7 @@
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@hookform/resolvers": "^3.9.0",
-    "@mui/material": "^5.14.18",
-    "@mui/styled-engine-sc": "^6.0.0-alpha.6",
+    "@mui/material": "^6.1.9",
     "@reactour/mask": "^1.1.0",
     "@reactour/tour": "^3.7.0",
     "@sentry/nextjs": "^8.41.0",

src/api/api.ts

@@ -1,7 +1,8 @@
 import useAuth from '@/hooks/useAuth';
 import findExCode from '@/utils/findExCode';
 import axios, { InternalAxiosRequestConfig } from 'axios';
-import { sendServerErrorMsgToSlack } from './slack/sendSeverError';
+import { captureException } from '@sentry/nextjs';
+import { useToast } from '@/hooks/useToast';
 
 const withAuthInstance = axios.create({
   baseURL: process.env.NEXT_PUBLIC_SERVER_URL,
@@ -31,10 +32,21 @@ withAuthInstance.interceptors.request.use(
 withAuthInstance.interceptors.response.use(
   (res) => {
     const { removeTokens } = useAuth();
+    const { addToast } = useToast();
     if (findExCode(res.data.code)) {
+      captureException(res.data.code, {
+        level: 'error',
+        extra: {
+          header: res.config.headers,
+          request: res.request,
+          type: 'Network Error!',
+        },
+      });
       removeTokens();
-      alert(res.data.message);
-      sendServerErrorMsgToSlack(res);
+      addToast({
+        status: 'error',
+        message: res.data.message,
+      });
 
       if (typeof window !== 'undefined') {
         window.location.reload();
@@ -52,10 +64,6 @@ withAuthInstance.interceptors.response.use(
 
 withOutAuthInstance.interceptors.response.use(
   (res) => {
-    if (findExCode(res.data.code)) {
-      sendServerErrorMsgToSlack(res);
-    }
-
     return res;
   },
   (error) => {

src/app/add-chat-link/page.tsx

@@ -1,7 +1,7 @@
 'use client';
 import ProgressBar from '@/components/Bar/ProgressBar';
-import BackHeader from '@/components/Header/BackHeader';
-import SingleValidator from '@/components/Validator/SingleValidator';
+import BackHeader from '@/components/comon/Header/BackHeader';
+import SingleValidator from '@/components/comon/SingleValidator';
 import {
   PROFILE_DIRECTION,
   PROFILE_PLACEHOLDER,

src/app/add-profile/page.tsx

@@ -3,12 +3,12 @@
 import ProgressBar from '@/components/Bar/ProgressBar';
 
 import { addProfileSchema } from '@/app/add-profile/schema';
-import BackHeader from '@/components/Header/BackHeader';
+import BackHeader from '@/components/comon/Header/BackHeader';
 
 import { FieldError, useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
-import ProfileForm from '@/components/SingleForm/ProfileForm';
-import SingleValidator from '@/components/Validator/SingleValidator';
+import ProfileForm from '@/components/Form/ProfileForm';
+import SingleValidator from '@/components/comon/SingleValidator';
 
 import {
   PROFILE_DIRECTION,

src/app/add-time/page.tsx

@@ -1,8 +1,8 @@
 'use client';
 import ProgressBar from '@/components/Bar/ProgressBar';
-import BackHeader from '@/components/Header/BackHeader';
-import Scheduler from '@/components/Scheduler';
-import SingleValidator from '@/components/Validator/SingleValidator';
+import BackHeader from '@/components/comon/Header/BackHeader';
+import Scheduler from '@/components/domain/mentoring/Scheduler';
+import SingleValidator from '@/components/comon/SingleValidator';
 import {
   PROFILE_DIRECTION,
   PROFILE_SUB_DIRECTION,

src/app/apply-wanted-senior/(components)/(modal)/WishSeniorApplyAgreeModal.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useRef, useState } from 'react';
 import Image from 'next/image';
-import NextBtn from '@/components/Button/NextBtn';
+import NextBtn from '@/components/comon/Button/NextBtn';
 import { useOutSideClick } from '@/hooks/useOutsideClick';
 import { styled } from 'styled-components';
 

src/app/apply-wanted-senior/(components)/(steps)/Field.tsx

@@ -6,7 +6,7 @@ import {
 } from '../../constant';
 import { WishSeniorSubTitle, WishSeniorTitle, NextBtnBox } from '../(template)';
 import { parseAsJson, useQueryState } from 'nuqs';
-import NextBtn from '@/components/Button/NextBtn';
+import NextBtn from '@/components/comon/Button/NextBtn';
 import * as y from 'yup';
 
 const schema = y.object({
@@ -72,6 +72,7 @@ export function WishSeniorField({
           {field?.type === WISH_SENIOR_FIELD_ETC ? (
             <EtcInput
               type="text"
+              autoFocus
               value={field?.value}
               onChange={(e) =>
                 handleFieldChange(WISH_SENIOR_FIELD_ETC, e.target.value)
@@ -171,4 +172,3 @@ const EtcInput = styled.input`
   padding-left: 4px;
   height: 45px;
 `;
-

src/app/apply-wanted-senior/(components)/(steps)/Info.tsx

@@ -1,7 +1,7 @@
 import Image from 'next/image';
 import styled from 'styled-components';
 import { WISH_SENIOR_MENTOR_MSG } from '../../constant';
-import NextBtn from '@/components/Button/NextBtn';
+import NextBtn from '@/components/comon/Button/NextBtn';
 import { WishSeniorTitle, WishSeniorSubTitle, NextBtnBox } from '../(template)';
 
 export function WishSeniorInfo({ onClick }: { onClick: () => void }) {

src/app/apply-wanted-senior/(components)/(steps)/Lab.tsx

@@ -1,9 +1,9 @@
 import styled from 'styled-components';
 import { WISH_SENIOR_MENTOR_MSG } from '../../constant';
 import { NextBtnBox, WishSeniorSubTitle, WishSeniorTitle } from '../(template)';
-import TextForm from '@/components/SingleForm/TextForm';
+import TextForm from '@/components/Form/TextForm';
 import { useForm } from 'react-hook-form';
-import NextBtn from '@/components/Button/NextBtn';
+import NextBtn from '@/components/comon/Button/NextBtn';
 
 export function WishSeniorLab({ onClick }: { onClick: (lab: string) => void }) {
   const { register, getValues } = useForm({

src/app/apply-wanted-senior/(components)/(steps)/Phone.tsx

@@ -1,12 +1,12 @@
 import styled from 'styled-components';
 import { WISH_SENIOR_MENTOR_MSG } from '../../constant';
 import { NextBtnBox, WishSeniorSubTitle, WishSeniorTitle } from '../(template)';
-import NextBtn from '@/components/Button/NextBtn';
+import NextBtn from '@/components/comon/Button/NextBtn';
 import { useForm } from 'react-hook-form';
 import { yupResolver } from '@hookform/resolvers/yup';
-import { phoneNumSchema } from '@/components/SingleForm/PhoneNumForm/phoneNumSchema';
-import TextForm from '@/components/SingleForm/TextForm';
-import SingleValidator from '@/components/Validator/SingleValidator';
+import { phoneNumSchema } from '@/components/Form/PhoneNumForm/phoneNumSchema';
+import TextForm from '@/components/Form/TextForm';
+import SingleValidator from '@/components/comon/SingleValidator';
 import { useEffect } from 'react';
 
 export function WishSeniorPhoneNum({

src/app/apply-wanted-senior/(components)/(steps)/Postgradu.tsx

@@ -1,21 +1,19 @@
 import styled from 'styled-components';
 import { WISH_SENIOR_MENTOR_MSG } from '../../constant';
 import { NextBtnBox, WishSeniorSubTitle, WishSeniorTitle } from '../(template)';
-import TextForm from '@/components/SingleForm/TextForm';
-import { useForm } from 'react-hook-form';
-import NextBtn from '@/components/Button/NextBtn';
+import { useAtomValue } from 'jotai';
+import { overlay } from 'overlay-kit';
+import NextBtn from '@/components/comon/Button/NextBtn';
+import { sPostGraduAtom } from '@/stores/senior';
+import RiseUpModal from '@/components/Modal/RiseUpModal';
+import { TextFormEl } from '@/components/Form/TextForm/TextForm.styled';
 
 export function WishSeniorPostGradu({
   onClick,
 }: {
   onClick: (postgradu: string) => void;
 }) {
-  const { register, getValues } = useForm({
-    defaultValues: {
-      postgradu: '',
-    },
-    mode: 'onChange',
-  });
+  const postgradu = useAtomValue(sPostGraduAtom);
 
   return (
     <div style={{ margin: '1.6rem 1rem' }}>
@@ -28,18 +26,22 @@ export function WishSeniorPostGradu({
       </WishSeniorSubTitle>
 
       <PostGraduWrapper>
-        <TextForm
-          targetAtom={''}
+        <TextFormEl
+          value={postgradu}
           placeholder={'ex.연세대학교'}
-          register={register('postgradu')}
+          onClick={() =>
+            overlay.open(({ unmount }) => (
+              <RiseUpModal modalType="postgradu" modalHandler={unmount} />
+            ))
+          }
         />
       </PostGraduWrapper>
 
       <NextBtnBox>
         <NextBtn
           btnText="다음"
           kind="route"
-          onClick={() => onClick(getValues('postgradu'))}
+          onClick={() => onClick(postgradu)}
         />
       </NextBtnBox>
     </div>

src/app/apply-wanted-senior/(components)/(steps)/Professor.tsx

@@ -1,9 +1,9 @@
 import styled from 'styled-components';
 import { WISH_SENIOR_MENTOR_MSG } from '../../constant';
 import { NextBtnBox, WishSeniorSubTitle, WishSeniorTitle } from '../(template)';
-import TextForm from '@/components/SingleForm/TextForm';
+import TextForm from '@/components/Form/TextForm';
 import { useForm } from 'react-hook-form';
-import NextBtn from '@/components/Button/NextBtn';
+import NextBtn from '@/components/comon/Button/NextBtn';
 
 export function WishSeniorProfessor({
   onClick,

src/app/apply-wanted-senior/(components)/(steps)/Submit.tsx

@@ -1,6 +1,6 @@
-import NextBtn from '@/components/Button/NextBtn';
+import NextBtn from '@/components/comon/Button/NextBtn';
 import { WishSeniorSubTitle, WishSeniorTitle } from '../(template)';
-import { BtnStyleNonM } from '@/components/Button/NextBtn/NextBtn.styled';
+import { BtnStyleNonM } from '@/components/comon/Button/NextBtn/NextBtn.styled';
 import Image from 'next/image';
 
 interface ApplyWantedSeniorSubmitProp {
@@ -61,4 +61,3 @@ export function ApplyWantedSeniorSubmit({
     </div>
   );
 }
-

src/app/apply-wanted-senior/page.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import BackHeader from '@/components/Header/BackHeader';
+import BackHeader from '@/components/comon/Header/BackHeader';
 import useFunnel from '@/hooks/useFunnel';
 import {
   WishSeniorInfo,
@@ -13,7 +13,6 @@ import {
 } from './(components)/(steps)';
 import { useWishSeniorApply } from '@/hooks/mutations/useWishSeniorApply';
 import { useRouter } from 'next/navigation';
-import styled from 'styled-components';
 import { overlay } from 'overlay-kit';
 import { useState } from 'react';
 import type { WishSeniorApplyRequest } from '@/api/senior/wishSeniorApply';
@@ -146,4 +145,3 @@ export default function ApplyWantedSeniorPage() {
     </main>
   );
 }
-

src/app/junior/mentoring/page.tsx

@@ -10,7 +10,7 @@ const TabBar = dynamic(
 import React, { useEffect } from 'react';
 import styled from 'styled-components';
 import MenuBar from '@/components/Bar/MenuBar';
-import LogoLayer from '@/components/LogoLayer/LogoLayer';
+import LogoLayer from '@/components/comon/LogoLayer/LogoLayer';
 import SearchModal from '@/components/Modal/SearchModal';
 import { overlay } from 'overlay-kit';
 import useAuth from '@/hooks/useAuth';

src/app/layout.tsx

@@ -2,10 +2,12 @@ import './globals.css';
 import type { Metadata } from 'next';
 import Providers from '@/components/Provider/providers';
 import StyledComponentsRegistry from '@/lib/registry';
-import GTMAnalytics from '@/components/GA/GTM';
-import GoogleAnalytics from '@/components/GA/GA';
+
 import { SERVICE_METADATA } from '@/constants/meta/metaData';
 import OverlayKitProvider from '@/lib/overlay';
+import GA from '@/components/comon/GA/GA';
+import GTM from '@/components/comon/GA/GTM';
+import { ToastProvider } from '@/components/comon/Toast/ToastProvider';
 
 export const metadata: Metadata = {
   title: SERVICE_METADATA.title,
@@ -67,8 +69,8 @@ export default function RootLayout({
         />
       </head>
       <body>
-        {process.env.NEXT_PUBLIC_GTM_ID ? <GTMAnalytics /> : <></>}
-        {process.env.NEXT_PUBLIC_GA4_ID ? <GoogleAnalytics /> : <></>}
+        {process.env.NEXT_PUBLIC_GTM_ID ? <GTM /> : <></>}
+        {process.env.NEXT_PUBLIC_GA4_ID ? <GA /> : <></>}
         <Providers>
           <StyledComponentsRegistry>
             <OverlayKitProvider>
@@ -80,6 +82,7 @@ export default function RootLayout({
               <div id="senior-auth-portal"></div>
               <div id=" mentoring-cancel-success"></div>
             </OverlayKitProvider>
+            <ToastProvider />
           </StyledComponentsRegistry>
         </Providers>
       </body>

src/app/login/oauth2/code/kakao/page.tsx

@@ -2,7 +2,7 @@
 
 import React from 'react';
 import styled from 'styled-components';
-import Spinner from '@/components/Spinner';
+import Spinner from '@/components/comon/Spinner';
 import useKakaoLogin from '@/hooks/useKakaoLogin';
 
 function KakaoPage() {

src/components/SelectTime/SelectTime.tsx → src/app/mentoring-apply/[seniorId]/(components)/SelectTime/SelectTime.tsx

@@ -7,7 +7,7 @@ import {
   SelectTimeWrapper,
 } from './SelectTime.styled';
 import Image from 'next/image';
-import down_arrow from '../../../public/arrow-down.png';
+import down_arrow from '../../../../../../public/arrow-down.png';
 import { useAtomValue } from 'jotai';
 import { useEffect, useState } from 'react';
 import { MENTORING_SCHEDULE } from '@/constants/form/cMentoringApply';

src/app/mentoring-apply/[seniorId]/pay/page.js

@@ -1,12 +1,12 @@
 'use client';
 import ProgressBar from '@/components/Bar/ProgressBar';
-import BackHeader from '@/components/Header/BackHeader';
-import RoundedImage from '@/components/Image/RoundedImage';
+import BackHeader from '@/components/comon/Header/BackHeader';
+import RoundedImage from '@/components/comon/RoundedImage';
 import styled from 'styled-components';
 import user_icon from '../../../../../public/user.png';
-import AuthLabeledText from '@/components/Text/AuthLabeledText';
+import AuthLabeledText from '@/components/comon/Text/AuthLabeledText';
 import { useAtom, useAtomValue } from 'jotai';
-import '../../../../components/JQ/loader';
+import './(components)/JQ/loader';
 import {
   PhoneNumberAtom,
   paySeniorIdAtom,

src/app/mentoring-apply/[seniorId]/question/page.tsx

@@ -1,9 +1,8 @@
 'use client';
 import ProgressBar from '@/components/Bar/ProgressBar';
-import GoogleAnalytics from '@/components/GA/GA';
-import BackHeader from '@/components/Header/BackHeader';
+import BackHeader from '@/components/comon/Header/BackHeader';
 import ShortRiseUpModal from '@/components/Modal/ShortRiseUpModal';
-import TextareaForm from '@/components/SingleForm/TextareaForm';
+import TextareaForm from '@/components/Form/TextareaForm';
 import {
   MENTORING_NOTICE,
   MENTORING_QUESTION,

src/app/mentoring-apply/[seniorId]/schedule/page.tsx

@@ -1,9 +1,8 @@
 'use client';
 import ProgressBar from '@/components/Bar/ProgressBar';
-import TimeListBox from '@/components/Box/TimeListBox';
-import GoogleAnalytics from '@/components/GA/GA';
-import BackHeader from '@/components/Header/BackHeader';
-import SelectTime from '@/components/SelectTime';
+import TimeListBox from '../(components)/TimeListBox';
+import BackHeader from '@/components/comon/Header/BackHeader';
+import SelectTime from '../(components)/SelectTime';
 import { MENTORING_SCHEDULE } from '@/constants/form/cMentoringApply';
 import useAuth from '@/hooks/useAuth';
 import {

src/components/Profile/Profile.tsx → src/app/mypage/(components)/Profile/Profile.tsx

@@ -11,7 +11,7 @@ import {
   ImageBox,
 } from './Profile.styled';
 import { ProfileProps } from '@/types/profile/profile';
-import user_icon from '../../../public/user.png';
+import user_icon from '../../../../../public/user.png';
 
 function Profile(props: ProfileProps) {
   return (

src/components/Profile/ProfileManage/JuniorManage/JuniorManage.tsx → src/app/mypage/(components)/Profile/ProfileManage/JuniorManage/JuniorManage.tsx

@@ -1,6 +1,6 @@
 import { JuniorManageContainer } from './JuniorManage.styled';
-import ContentComponent from '../../Box/ContentBox';
-import TitleComponent from '../../Box/TitleBox';
+import ContentComponent from '../../../ProfileStateChange/ContentBox';
+import TitleComponent from '../../../ProfileStateChange/TitleBox';
 import { useRouter } from 'next/navigation';
 import { NotSeniorProps } from '@/types/modal/mypage';
 
@@ -49,4 +49,3 @@ function JuniorManage(props: NotSeniorProps) {
 }
 
 export default JuniorManage;
-