Merge pull request #55 from team-joytas/fix/architecture

[리팩토링] fsd 폴더 구조 적용
team-joytas · Jan 12, 2025 · 9239236 · 9239236
2 parents c539f0e + c4f5a0e
commit 9239236
Show file tree

Hide file tree

Showing 118 changed files with 2,632 additions and 1,898 deletions.
diff --git a/src/app/(legal)/privacy/page.tsx → app/(legal)/privacy/page.tsx b/src/app/(legal)/privacy/page.tsx → app/(legal)/privacy/page.tsx
diff --git a/src/app/(legal)/terms/page.tsx → app/(legal)/terms/page.tsx b/src/app/(legal)/terms/page.tsx → app/(legal)/terms/page.tsx
diff --git a/app/courses/[id]/comments/page.tsx b/app/courses/[id]/comments/page.tsx
@@ -0,0 +1,13 @@
+import PageListComment from '@/src/views/detail-comment'
+import { getCourse } from '@/src/entities/course/api'
+
+export default async function Page({ params }: { params: { id: number } }) {
+  const course = await getCourse(params.id)
+
+  return (
+    <PageListComment
+      courseId={params.id}
+      comments={course.comments_info.comments}
+    />
+  )
+}
diff --git a/app/courses/[id]/page.tsx b/app/courses/[id]/page.tsx
@@ -0,0 +1,8 @@
+import { getCourse } from '@/src/entities/course/api'
+import DetailCourse from '@/src/views/detail-course'
+
+export default async function Page({ params }: { params: { id: number } }) {
+  const course = await getCourse(params.id)
+
+  return <DetailCourse courseId={params.id} course={course} />
+}
diff --git a/app/courses/add-region/page.tsx b/app/courses/add-region/page.tsx
@@ -0,0 +1,7 @@
+'use client'
+
+import RegionCascader from '@/src/views/add-region'
+
+export default function Page() {
+  return <RegionCascader />
+}
diff --git a/app/courses/new/page.tsx b/app/courses/new/page.tsx
@@ -0,0 +1,5 @@
+import AddCoursePlan from '@/src/widgets/AddCoursePlan'
+
+export default function CourseNew() {
+  return <AddCoursePlan type='course' />
+}
diff --git a/app/courses/page.tsx b/app/courses/page.tsx
@@ -0,0 +1,10 @@
+import ListCourse from '@/src/views/list-course'
+import { getCourses } from '@/src/entities/course/api'
+import { getFavoriteRegions } from '@/src/entities/user/api'
+
+export default async function Page() {
+  const courses = await getCourses()
+  const favoriteRegions = await getFavoriteRegions()
+
+  return <ListCourse courses={courses} favoriteRegions={favoriteRegions} />
+}
diff --git a/src/app/error.tsx → app/error.tsx b/src/app/error.tsx → app/error.tsx
diff --git a/src/app/fonts/PretendardVariable.woff2 → app/fonts/PretendardVariable.woff2 b/src/app/fonts/PretendardVariable.woff2 → app/fonts/PretendardVariable.woff2
diff --git a/src/app/globals.css → app/globals.css b/src/app/globals.css → app/globals.css
@@ -21,6 +21,10 @@ body {
   font-family: Arial, Helvetica, sans-serif;
 }
 
+image {
+  width: 100%;
+}
+
 .ant-drawer-bottom > .ant-drawer-content-wrapper {
   box-shadow: none;
 }

diff --git a/src/app/layout.tsx → app/layout.tsx b/src/app/layout.tsx → app/layout.tsx
@@ -1,12 +1,12 @@
 import type { Metadata } from 'next'
 import './globals.css'
-import Header from '@components/(layout)/Header'
-import Footer from '@components/(layout)/Footer'
-import LayoutSpacer from '@components/(layout)/LayoutSpacer'
+import Spacer from '@/src/shared/ui/Spacer'
+import DefaultHeader from '@/src/widgets/DefaultHeader'
+import DefaultFooter from '@/src/widgets/DefaultFooter'
 import localFont from 'next/font/local'
 import { AnimatePresence } from 'framer-motion'
 import { ConfigProvider } from 'antd'
-import ReactQueryProvider from '@/app/provider/ReactQueryProvider'
+import ReactQueryProvider from '@/src/shared/provider/ReactQueryProvider'
 
 export const metadata: Metadata = {
   title: 'WOOCO - 우코',
@@ -43,17 +43,17 @@ export default function RootLayout({
     <html lang='kr' className={`h-vh ${pretendard.variable}`}>
       <body className='h-full flex items-center flex-col overflow-y-scroll'>
         <ReactQueryProvider>
-          <Header />
+          <DefaultHeader />
           <ConfigProvider theme={theme}>
             <AnimatePresence>
               <div className='mx-auto flex-1 text-black w-full max-w-[375px]'>
                 {children}
-                <LayoutSpacer />
+                <Spacer height={60} notShowURLs={['/login']} />
               </div>
             </AnimatePresence>
           </ConfigProvider>
         </ReactQueryProvider>
-        <Footer />
+        <DefaultFooter />
       </body>
     </html>
   )

diff --git a/src/app/login/components/Login.tsx → app/login/components/Login.tsx b/src/app/login/components/Login.tsx → app/login/components/Login.tsx
@@ -1,6 +1,6 @@
-import Spacer from '@components/(layout)/Spacer'
+import Spacer from '@/src/shared/ui/Spacer'
 import Image from 'next/image'
-import splashLogo from '@images/(logo)/splash_logo.svg'
+import splashLogo from '@/src/assets/images/(logo)/splash_logo.svg'
 
 export default async function Login() {
   await new Promise((resolve) => setTimeout(resolve, 3000))

diff --git a/src/app/login/components/Splash.tsx → app/login/components/Splash.tsx b/src/app/login/components/Splash.tsx → app/login/components/Splash.tsx
@@ -1,6 +1,6 @@
-import splashLogo from '@images/(logo)/splash_logo.svg'
+import splashLogo from '@/src/assets/images/(logo)/splash_logo.svg'
 import Image from 'next/image'
-import logo_long from '@images/(logo)/logo_long.png'
+import logo_long from '@/src/assets/images/(logo)/logo_long.png'
 
 export default function Splash() {
   return (

diff --git a/src/app/login/page.tsx → app/login/page.tsx b/src/app/login/page.tsx → app/login/page.tsx
diff --git a/src/app/manifest.ts → app/manifest.ts b/src/app/manifest.ts → app/manifest.ts
diff --git a/src/app/not-found.tsx → app/not-found.tsx b/src/app/not-found.tsx → app/not-found.tsx
diff --git a/app/notifications/page.tsx b/app/notifications/page.tsx
@@ -0,0 +1,7 @@
+import ListNotification from '@/src/views/list-notification'
+import { getNotifications } from '@/src/entities/notification/api'
+
+export default async function Page() {
+  const data = await getNotifications()
+  return <ListNotification data={data} />
+}
diff --git a/app/page.tsx b/app/page.tsx
@@ -0,0 +1,5 @@
+import Main from '@/src/views/main'
+
+export default function Page() {
+  return <Main />
+}
diff --git a/app/plans/[id]/update/page.tsx b/app/plans/[id]/update/page.tsx
@@ -0,0 +1,8 @@
+import { getCourse } from '@/src/entities/course/api'
+import UpdatePlan from '@/src/views/update-plan'
+
+export default async function Page() {
+  const course = await getCourse(1)
+
+  return <UpdatePlan data={course} />
+}
diff --git a/src/app/schedules/components/CourseCard.tsx → app/plans/components/CourseCard.tsx b/src/app/schedules/components/CourseCard.tsx → app/plans/components/CourseCard.tsx
@@ -1,12 +1,16 @@
 'use client'
 
 import { useRouter } from 'next/navigation'
-import { Course } from '../getData'
-import KakaoMap from '@/app/components/KakaoMap'
+import { CourseType } from '@/src/entities/course/type'
+import KakaoMap from '@/src/shared/ui/KakaoMap'
 import { CopyOutlined } from '@ant-design/icons'
 import { message } from 'antd'
 
-export default function CourseCard({ courseData }: { courseData: Course }) {
+interface CourseCardProps {
+  courseData: CourseType
+}
+
+export default function CourseCard({ courseData }: CourseCardProps) {
   const { location, places, planned_for, id } = courseData
   const router = useRouter()
 
@@ -47,7 +51,7 @@ export default function CourseCard({ courseData }: { courseData: Course }) {
           <span>| 장소 정보</span>
           <button
             className='w-[50px] h-[30px] text-[12px] border rounded-[10px] cursor-pointer'
-            onClick={() => router.push('/schedules/1/update')}
+            onClick={() => router.push('/plans/1/update')}
           >
             수정
           </button>

diff --git a/app/plans/new/page.tsx b/app/plans/new/page.tsx
@@ -0,0 +1,5 @@
+import AddCoursePlan from '@/src/widgets/AddCoursePlan'
+
+export default function Page() {
+  return <AddCoursePlan type='plan' />
+}
diff --git a/app/plans/page.tsx b/app/plans/page.tsx
@@ -0,0 +1,26 @@
+import CardCourse from '@/src/features/course/card-course'
+import FloatingWriteButton from '@/src/widgets/FloatingWriteButton'
+import { getCourses } from '@/src/entities/course/api'
+import { getUser } from '@/src/entities/user/api'
+
+export default async function Page() {
+  const courses = await getCourses()
+  const user = await getUser(1)
+
+  const userName = user.user_info.name
+
+  return (
+    <div className='w-full pt-[20px] pb-[20px] px-[16px] flex flex-col'>
+      <span className='border-b text-[18px] inline-flex items-center'>
+        <p className='font-bold'>{userName}</p>
+        <p>님의 코스 플랜</p>
+      </span>
+
+      {courses.map((_, index) => (
+        <CardCourse key={index} />
+      ))}
+
+      <FloatingWriteButton />
+    </div>
+  )
+}
diff --git a/src/app/template.tsx → app/template.tsx b/src/app/template.tsx → app/template.tsx
diff --git a/src/app/users/[id]/like/page.tsx → app/users/[id]/like/page.tsx b/src/app/users/[id]/like/page.tsx → app/users/[id]/like/page.tsx
diff --git a/app/users/[id]/page.tsx b/app/users/[id]/page.tsx
@@ -0,0 +1,8 @@
+import DetailUser from '@/src/views/detail-user'
+import { getUser } from '@/src/entities/user/api'
+
+export default async function Page() {
+  const user = await getUser(1)
+
+  return <DetailUser user={user} />
+}
diff --git a/app/users/[id]/setting/page.tsx b/app/users/[id]/setting/page.tsx
@@ -0,0 +1,7 @@
+'use client'
+
+import UpdateUser from '@/src/views/update-user'
+
+export default function Page() {
+  return <UpdateUser />
+}
diff --git a/src/app/components/(course)/CoursePlaceCarousel.tsx b/src/app/components/(course)/CoursePlaceCarousel.tsx
diff --git a/src/app/components/(course)/getData.tsx b/src/app/components/(course)/getData.tsx
diff --git a/src/app/components/(layout)/LayoutSpacer.tsx b/src/app/components/(layout)/LayoutSpacer.tsx
diff --git a/src/app/components/SectionDivider.tsx b/src/app/components/SectionDivider.tsx
diff --git a/src/app/courses/[id]/components/CommentComponent.tsx b/src/app/courses/[id]/components/CommentComponent.tsx