-
+ 로그인
-SNS로 솔리투어에 로그인하고 더 많은 서비스를 즐겨보세요!
- - -
-
-
-
-
- 1초만의 빠른 회원가입
-
-
- - 아직 계정이 없으신가요? 회원가입
-
-
+ 회원가입
-1초 회원가입으로 입력없이 간편하게 솔리투어를 시작해보세요!
- - -- 이미 계정이 있으신가요? 로그인
-
+
+ );
+}
diff --git a/src/app/diary/[id]/page.tsx b/src/app/diary/[id]/page.tsx
new file mode 100644
index 00000000..638a1ecb
--- /dev/null
+++ b/src/app/diary/[id]/page.tsx
@@ -0,0 +1,58 @@
+import Breadcrumbs from "@/components/common/Breadcrumb";
+import DiaryViewerContainer from "@/containers/diary/detail/DiaryViewerContainer";
+import { GetDiaryResponseDto } from "@/types/DiaryDto";
+import { cookies } from "next/headers";
+
+async function getDiary(id: number) {
+ const cookie = cookies().get("access_token");
+ const response = await fetch(`${process.env.BACKEND_URL}/api/diary/${id}`, {
+ method: "GET",
+ headers: {
+ Cookie: `${cookie?.name}=${cookie?.value}`,
+ },
+ next: { revalidate: 60, tags: [`getDiary/${id}`] },
+ });
+
+ if (!response.ok) {
+ throw new Error(response.statusText);
+ }
+
+ return response.json() as Promise
+
+ );
+}
diff --git a/src/app/diary/edit/[id]/page.tsx b/src/app/diary/edit/[id]/page.tsx
new file mode 100644
index 00000000..a8104025
--- /dev/null
+++ b/src/app/diary/edit/[id]/page.tsx
@@ -0,0 +1,58 @@
+import Breadcrumbs from "@/components/common/Breadcrumb";
+import DiaryEditorContainer from "@/containers/diary/edit/DiaryEditorContainer";
+import { GetDiaryResponseDto } from "@/types/DiaryDto";
+import { cookies } from "next/headers";
+
+async function getDiary(id: number) {
+ const cookie = cookies().get("access_token");
+ const response = await fetch(`${process.env.BACKEND_URL}/api/diary/${id}`, {
+ method: "GET",
+ headers: {
+ Cookie: `${cookie?.name}=${cookie?.value}`,
+ },
+ next: { revalidate: 60, tags: [`getDiary/${id}`] },
+ });
+
+ if (!response.ok) {
+ throw new Error(response.statusText);
+ }
+
+ return response.json() as Promise
+
+ );
+}
diff --git a/src/app/diary/list/page.tsx b/src/app/diary/list/page.tsx
new file mode 100644
index 00000000..b96a1901
--- /dev/null
+++ b/src/app/diary/list/page.tsx
@@ -0,0 +1,28 @@
+import DiaryList from "@/components/diary/list/DiaryList";
+import DiaryListSkeleton from "@/components/skeleton/diary/list/DiaryListSkeleton";
+import { Metadata } from "next";
+import { Suspense } from "react";
+
+interface Props {
+ searchParams: { [key: string]: string | undefined };
+}
+
+export const metadata: Metadata = {
+ title: "여행 일기",
+ description: "Solitour 여행 일기 목록 페이지",
+};
+
+export default function page({ searchParams }: Props) {
+ const page = Number(searchParams["page"]);
+ if (page <= 0 || !Number.isSafeInteger(page)) {
+ throw new Error("Invalid Page Number");
+ }
+
+ return (
+
+
+ );
+}
diff --git a/src/app/diary/write/page.tsx b/src/app/diary/write/page.tsx
new file mode 100644
index 00000000..01e56902
--- /dev/null
+++ b/src/app/diary/write/page.tsx
@@ -0,0 +1,22 @@
+import Breadcrumbs from "@/components/common/Breadcrumb";
+import DiaryEditorContainer from "@/containers/diary/write/DiaryEditorContainer";
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+ title: "일기 등록하기",
+ description: "Solitour의 여행 일기 등록 페이지",
+};
+
+export default function page() {
+ return (
+
+
+ );
+}
diff --git a/src/app/error.tsx b/src/app/error.tsx
new file mode 100644
index 00000000..843eb8ee
--- /dev/null
+++ b/src/app/error.tsx
@@ -0,0 +1,50 @@
+"use client"; // Error components must be Client Components
+
+import BackButtonContainer from "@/containers/common/BackButtonContainer";
+import { Metadata } from "next";
+import Image from "next/image";
+import Link from "next/link";
+
+export const metadata: Metadata = {
+ title: "error",
+ description: "Solitour의 error 페이지",
+};
+
+const Error = () => {
+ return (
+
+
+
+
+ + 앗..오류가 발생하였습니다. +
+
+
+ 시스템에 오류가 발생하였습니다.
+잠시 후에 다시 시도해 주세요.
+
+
+ 홈으로
+
+
+
+
+
+
+
+ {/* 제일 상단 */}
+
+ );
+}
diff --git a/src/app/gathering/edit/[id]/page.tsx b/src/app/gathering/edit/[id]/page.tsx
new file mode 100644
index 00000000..5e15e3bf
--- /dev/null
+++ b/src/app/gathering/edit/[id]/page.tsx
@@ -0,0 +1,64 @@
+import GatheringUpdateContainer from "@/containers/gathering/createUpdate/GatheringUpdateContainer";
+import { GatheringDetailResponseDto } from "@/types/GatheringDto";
+import { NextResponse } from "next/server";
+
+interface PageProps {
+ params: { id: string };
+}
+
+async function fetchGatheringData(id: number): Promise
+
+ );
+ } catch (error) {
+ // 데이터 로딩 실패 시 처리
+ return (
+
+
+ );
+ }
+}
diff --git a/src/app/gathering/page.tsx b/src/app/gathering/page.tsx
new file mode 100644
index 00000000..d8a7c03b
--- /dev/null
+++ b/src/app/gathering/page.tsx
@@ -0,0 +1,55 @@
+import Banner from "@/components/common/Banner";
+import TopList from "@/components/common/TopList";
+import GatheringListContainer from "@/containers/gathering/read/GatheringListContainer";
+import { Metadata } from "next";
+
+type MyProps = {
+ searchParams: { [key: string]: string | undefined };
+};
+
+export const metadata: Metadata = {
+ title: "모임",
+ description: "Solitour의 모임(탭)",
+};
+
+async function getData() {
+ const res = await fetch(
+ `${process.env.BACKEND_URL}/api/categories/gathering`,
+ {
+ cache: "no-store",
+ },
+ );
+
+ if (!res.ok) {
+ throw new Error("Failed to fetch data");
+ }
+
+ return res.json();
+}
+
+export default async function Page({
+ searchParams,
+}: {
+ searchParams: { [key: string]: string | undefined };
+}) {
+ const gatheringCategoryList = await getData();
+
+ return (
+ 데이터를 가져오는 중 오류가 발생했습니다.
+
+
+ );
+}
diff --git a/src/app/gathering/write/page.tsx b/src/app/gathering/write/page.tsx
new file mode 100644
index 00000000..25baec95
--- /dev/null
+++ b/src/app/gathering/write/page.tsx
@@ -0,0 +1,15 @@
+import GatheringCreateContainer from "@/containers/gathering/createUpdate/GatheringCreateContainer";
+import { Metadata } from "next";
+
+export const metadata: Metadata = {
+ title: "모임 등록하기",
+ description: "Solitour의 모임 등록하기 페이지",
+};
+
+export default function page() {
+ return (
+
+ 직접 내 모임을`, "만들어보세요!"]}
+ buttonText="모임 등록하기"
+ category={"모임"}
+ />
+
+
+
+
+
+
+ );
+}
diff --git a/src/app/informations/(detail)/[id]/loading.tsx b/src/app/informations/(detail)/[id]/loading.tsx
new file mode 100644
index 00000000..8a9a51a1
--- /dev/null
+++ b/src/app/informations/(detail)/[id]/loading.tsx
@@ -0,0 +1,21 @@
+import Breadcrumbs from "@/components/common/Breadcrumb";
+import InformationViewerSkeleton from "@/components/skeleton/informations/detail/InformationViewerSkeleton";
+import RecommendationListSkeleton from "@/components/skeleton/informations/detail/RecommendationListSkeleton";
+
+export default function Loading() {
+ return (
+
+
+ );
+}
diff --git a/src/app/informations/(detail)/[id]/page.tsx b/src/app/informations/(detail)/[id]/page.tsx
new file mode 100644
index 00000000..621aab36
--- /dev/null
+++ b/src/app/informations/(detail)/[id]/page.tsx
@@ -0,0 +1,67 @@
+import Breadcrumbs from "@/components/common/Breadcrumb";
+import InformationViewer from "@/components/informations/detail/InformationViewer";
+import RecommendationList from "@/components/informations/detail/RecommendationList";
+import { InformationDetailDto } from "@/types/InformationDto";
+import { cookies } from "next/headers";
+
+async function getInformation(id: number) {
+ const cookie = cookies().get("access_token");
+ const response = await fetch(
+ `${process.env.BACKEND_URL}/api/informations/${id}`,
+ {
+ method: "GET",
+ headers: {
+ Cookie: `${cookie?.name}=${cookie?.value}`,
+ },
+ next: { revalidate: 60, tags: [`getInformation/${id}`] },
+ },
+ );
+
+ if (!response.ok) {
+ // This will activate the closest 'error.tsx' Error Boundary.
+ throw new Error(response.statusText);
+ }
+
+ return response.json() as Promise
+
+ );
+}
diff --git a/src/app/informations/accommondation/[id]/page.tsx b/src/app/informations/accommondation/[id]/page.tsx
deleted file mode 100644
index c8535dda..00000000
--- a/src/app/informations/accommondation/[id]/page.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import RecommendationList from "@/components/informations/RecommendationList";
-import InformationViewerContainer from "@/containers/informations/InformationViewerContainer";
-
-type MyProps = {
- params: { id: string };
-};
-
-// TODO
-export async function generateMetadata({ params: { id } }: MyProps) {
- const postId = Number(id);
- if (postId <= 0 || !Number.isSafeInteger(postId)) {
- throw Error("Not Found");
- }
-
- //const response = await getPost(postId);
- //const post: Post = await response.json();
-
- return {
- title: `정보 - 숙박 - ${postId}`,
- description: "Solitour의 숙박 정보글 조회 페이지",
- };
-}
-
-export default function page({ params: { id } }: MyProps) {
- const postId = Number(id);
- if (postId < 1 || !Number.isSafeInteger(postId)) {
- throw Error("Not Found");
- }
-
- return (
-
-
- );
-}
diff --git a/src/app/informations/accommondation/page.tsx b/src/app/informations/accommondation/page.tsx
deleted file mode 100644
index 516fb875..00000000
--- a/src/app/informations/accommondation/page.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import CategoryLinks from "@/components/informations/CategoryLinks";
-import BannerContainer from "@/containers/common/BannerContainer";
-import InformationListContainer from "@/containers/informations/InformationListContainer";
-import TopListContainer from "@/containers/informations/TopListContainer";
-import { Metadata } from "next";
-
-type MyProps = {
- searchParams: { [key: string]: string | undefined };
-};
-
-export const metadata: Metadata = {
- title: "정보 - 숙박",
- description: "Solitour의 정보(탭)",
-};
-
-export default function page({ searchParams }: MyProps) {
- return (
-
-
- );
-}
diff --git a/src/app/informations/activity/[id]/page.tsx b/src/app/informations/activity/[id]/page.tsx
deleted file mode 100644
index c2ae3e6d..00000000
--- a/src/app/informations/activity/[id]/page.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import RecommendationList from "@/components/informations/RecommendationList";
-import InformationViewerContainer from "@/containers/informations/InformationViewerContainer";
-
-type MyProps = {
- params: { id: string };
-};
-
-// TODO
-export async function generateMetadata({ params: { id } }: MyProps) {
- const postId = Number(id);
- if (postId <= 0 || !Number.isSafeInteger(postId)) {
- throw Error("Not Found");
- }
-
- //const response = await getPost(postId);
- //const post: Post = await response.json();
-
- return {
- title: `정보 - 액티비티 - ${postId}`,
- description: "Solitour의 액티비티 정보글 조회 페이지",
- };
-}
-
-export default function page({ params: { id } }: MyProps) {
- const postId = Number(id);
- if (postId < 1 || !Number.isSafeInteger(postId)) {
- throw Error("Not Found");
- }
-
- return (
-
-
- );
-}
diff --git a/src/app/informations/activity/page.tsx b/src/app/informations/activity/page.tsx
deleted file mode 100644
index 0dfe7da1..00000000
--- a/src/app/informations/activity/page.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import CategoryLinks from "@/components/informations/CategoryLinks";
-import BannerContainer from "@/containers/common/BannerContainer";
-import InformationListContainer from "@/containers/informations/InformationListContainer";
-import TopListContainer from "@/containers/informations/TopListContainer";
-import { Metadata } from "next";
-
-type MyProps = {
- searchParams: { [key: string]: string | undefined };
-};
-
-export const metadata: Metadata = {
- title: "정보 - 액티비티",
- description: "Solitour의 정보(탭)",
-};
-
-export default function page({ searchParams }: MyProps) {
- return (
-
-
- );
-}
diff --git a/src/app/informations/edit/[id]/page.tsx b/src/app/informations/edit/[id]/page.tsx
new file mode 100644
index 00000000..a0b0306f
--- /dev/null
+++ b/src/app/informations/edit/[id]/page.tsx
@@ -0,0 +1,65 @@
+import Breadcrumbs from "@/components/common/Breadcrumb";
+import InformationEditorContainer from "@/containers/informations/edit/InformationEditorContainer";
+import { InformationDetailDto } from "@/types/InformationDto";
+import { cookies } from "next/headers";
+
+async function getInformation(id: number) {
+ const cookie = cookies().get("access_token");
+ const response = await fetch(
+ `${process.env.BACKEND_URL}/api/informations/${id}`,
+ {
+ method: "GET",
+ headers: {
+ Cookie: `${cookie?.name}=${cookie?.value}`,
+ },
+ next: { revalidate: 60, tags: [`getInformation/${id}`] },
+ },
+ );
+
+ if (!response.ok) {
+ // This will activate the closest 'error.tsx' Error Boundary.
+ throw new Error(response.statusText);
+ }
+
+ return response.json() as Promise
+
+ );
+}
diff --git a/src/app/informations/layout.tsx b/src/app/informations/layout.tsx
deleted file mode 100644
index df1b7b04..00000000
--- a/src/app/informations/layout.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function RootLayout({
- children,
-}: Readonly<{
- children: React.ReactNode;
-}>) {
- return {children}
;
-}
diff --git a/src/app/informations/list/layout.tsx b/src/app/informations/list/layout.tsx
new file mode 100644
index 00000000..77ccff73
--- /dev/null
+++ b/src/app/informations/list/layout.tsx
@@ -0,0 +1,31 @@
+import Banner from "@/components/common/Banner";
+import TopList from "@/components/common/TopList";
+import TopListSkeleton from "@/components/skeleton/common/TopListSkeleton";
+import { Metadata } from "next";
+import { Suspense } from "react";
+
+export const metadata: Metadata = {
+ title: "정보",
+ description: "Solitour의 정보 목록 페이지",
+};
+
+export default function RootLayout({
+ children,
+}: Readonly<{
+ children: React.ReactNode;
+}>) {
+ return (
+
+ 여행 정보를`, "공유해보세요!"]}
+ buttonText={`정보 등록하기`}
+ category="정보"
+ />
+
+
+ );
+}
diff --git a/src/app/informations/list/page.tsx b/src/app/informations/list/page.tsx
new file mode 100644
index 00000000..d90c745a
--- /dev/null
+++ b/src/app/informations/list/page.tsx
@@ -0,0 +1,48 @@
+import CategoryList from "@/components/informations/list/CategoryList";
+import InformationList from "@/components/informations/list/InformationList";
+import CategoryListSkeleton from "@/components/skeleton/informations/list/CategoryListSkeleton";
+import InformationListSkeleton from "@/components/skeleton/informations/list/InformationListSkeleton";
+import { Suspense } from "react";
+
+interface Props {
+ searchParams: { [key: string]: string | undefined };
+}
+
+export default function page({ searchParams }: Props) {
+ const page = Number(searchParams["page"]);
+ if (page <= 0 || !Number.isSafeInteger(page)) {
+ throw new Error("Invalid Page Number");
+ }
+
+ const parentCategoryId = Number(searchParams["parentCategoryId"]);
+ if (parentCategoryId <= 0 || !Number.isSafeInteger(parentCategoryId)) {
+ throw new Error("Invalid ParentCategoryId");
+ }
+
+ const childCategoryId = Number(searchParams["childCategoryId"] || 0);
+ if (childCategoryId < 0 || !Number.isSafeInteger(childCategoryId)) {
+ throw new Error("Invalid ChildCategoryId");
+ }
+
+ return (
+
+
+ );
+}
diff --git a/src/app/informations/restaurant/[id]/page.tsx b/src/app/informations/restaurant/[id]/page.tsx
deleted file mode 100644
index 80af2cdf..00000000
--- a/src/app/informations/restaurant/[id]/page.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import RecommendationList from "@/components/informations/RecommendationList";
-import InformationViewerContainer from "@/containers/informations/InformationViewerContainer";
-
-type MyProps = {
- params: { id: string };
-};
-
-// TODO
-export async function generateMetadata({ params: { id } }: MyProps) {
- const postId = Number(id);
- if (postId <= 0 || !Number.isSafeInteger(postId)) {
- throw Error("Not Found");
- }
-
- //const response = await getPost(postId);
- //const post: Post = await response.json();
-
- return {
- title: `정보 - 맛집 - ${postId}`,
- description: "Solitour의 맛집 정보글 조회 페이지",
- };
-}
-
-export default function page({ params: { id } }: MyProps) {
- const postId = Number(id);
- if (postId < 1 || !Number.isSafeInteger(postId)) {
- throw Error("Not Found");
- }
-
- return (
-
-
- );
-}
diff --git a/src/app/informations/restaurant/page.tsx b/src/app/informations/restaurant/page.tsx
deleted file mode 100644
index 050d7220..00000000
--- a/src/app/informations/restaurant/page.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import CategoryLinks from "@/components/informations/CategoryLinks";
-import BannerContainer from "@/containers/common/BannerContainer";
-import InformationListContainer from "@/containers/informations/InformationListContainer";
-import TopListContainer from "@/containers/informations/TopListContainer";
-import { Metadata } from "next";
-
-type MyProps = {
- searchParams: { [key: string]: string | undefined };
-};
-
-export const metadata: Metadata = {
- title: "정보 - 맛집",
- description: "Solitour의 정보(탭)",
-};
-
-export default function page({ searchParams }: MyProps) {
- return (
-
-
- );
-}
diff --git a/src/app/informations/write/page.tsx b/src/app/informations/write/page.tsx
index 87d3f460..07ece1d8 100644
--- a/src/app/informations/write/page.tsx
+++ b/src/app/informations/write/page.tsx
@@ -1,3 +1,4 @@
+import Breadcrumbs from "@/components/common/Breadcrumb";
import InformationEditorContainer from "@/containers/informations/write/InformationEditorContainer";
import { Metadata } from "next";
@@ -8,7 +9,16 @@ export const metadata: Metadata = {
export default function page() {
return (
-
+ ({
+ url: `${process.env.BACKEND_URL}/api/users/info`,
+ accessToken: access_token,
+ refreshToken: refresh_token,
+ });
+
+ return response;
+}
+
+
+export default async function page() {
+ const userInfo = await getUserInfo();
return (
-
);
diff --git a/src/app/mypage/profile/page.tsx b/src/app/mypage/profile/page.tsx
index 8804dae4..72c91d5a 100644
--- a/src/app/mypage/profile/page.tsx
+++ b/src/app/mypage/profile/page.tsx
@@ -1,20 +1,31 @@
import MyProfileContainer from "@/containers/mypage/MyProfileContainer";
+import { userResponseDto } from "@/types/UserDto";
+import { fetchWithTokenRefreshSSR } from "@/utils/getNewAccessTokenAndRerequest";
import { Metadata } from "next";
+import { cookies } from "next/headers";
export const metadata: Metadata = {
title: "마이페이지-프로필 설정",
description: "Solitour 사용자 마이페이지-프로필 설정",
};
-export default function page() {
+async function getUserInfo() {
+ const response = fetchWithTokenRefreshSSR({
+ accessToken: cookies().get("access_token"),
+ refreshToken: cookies().get("refresh_token"),
+ url: `${process.env.BACKEND_URL}/api/users/info`,
+ cache: "no-store",
+ });
+
+ return response;
+}
+
+export default async function page() {
+ const userInfo = await getUserInfo();
+
return (
-
-
+
+
+ );
};
export default NotFound;
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 110dfa8e..c39b6a6e 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,16 +1,63 @@
import BestInformationList from "@/components/home/BestInformationList";
-import NewMeetingList from "@/components/home/NewMeetingList";
+import NewGatheringList from "@/components/home/NewGatheringList";
import TabList from "@/components/home/TabList";
+import BestInformationListSkeleton from "@/components/skeleton/home/BestInformationListSkeleton";
+import NewGatheringListSkeleton from "@/components/skeleton/home/NewGatheringListSkeleton";
import HomeCarouselContainer from "@/containers/home/HomeCarouselContainer";
+import ListTemplateContainer from "@/containers/home/ListTemplateContainer";
+import { Suspense } from "react";
+
+// async function fetchBannerList(): Promise {
+// const url = `${process.env.BACKEND_URL}/api/banner`;
+
+// try {
+// const response = await fetch(url);
+
+// if (!response.ok) {
+// const errorText = await response.text();
+// console.error(`Failed to fetch data: ${response.status} - ${errorText}`);
+// return []; // 빈 배열 반환
+// }
+
+// const data: Banner[] = await response.json();
+// return data;
+// } catch (error) {
+// console.error("An error occurred while fetching the banner list:", error);
+// return []; // 빈 배열 반환
+// }
+// }
+
+export default async function Home() {
+ // const initBannerList = await fetchBannerList();
-// todo
-export default function Home() {
return (
-
+
);
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index f04399c3..fc230b40 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -3,17 +3,43 @@ import FloatingButtonContainer from "@/containers/common/FloatingButtonContainer
import HeaderContainer from "@/containers/common/HeaderContainer";
import "@/styles/globals.css";
import type { Metadata } from "next";
-import { Noto_Sans_KR } from "next/font/google";
import Script from "next/script";
-const notoSansKr = Noto_Sans_KR({ weight: "400", subsets: ["latin"] });
-
export const metadata: Metadata = {
+ metadataBase: new URL("https://www.solitourist.com"),
title: {
template: "Solitour | %s",
default: "Solitour - 새로운 나를 찾는 여행",
},
- description: "Solitour",
+ description:
+ "Solitour(솔리투어)는 사용자들이 여행한 정보를 기록하고 공유하여 정보나 팁 같은 것들을 이미지와 함께 제공하거나, 사용자들이 모임 기간, 모임 마감일, 성별, 나이, 장소, 참여 인원 등을 설정하여 모임을 등록하고, 모임에 신청할 수 있는 서비스를 제공합니다. 또한 본인의 여행 기록을 남길 수 있는 서비스도 제공합니다.",
+ keywords: [
+ "Solitour",
+ "Solitourist",
+ "솔리투어",
+ "여행",
+ "정보",
+ "모임",
+ "일기",
+ "여행일기",
+ ],
+ openGraph: {
+ title: "Solitour - 새로운 나를 찾는 여행",
+ description:
+ "Solitour(솔리투어)는 사용자들이 여행한 정보를 기록하고 공유하여 정보나 팁 같은 것들을 이미지와 함께 제공하거나, 사용자들이 모임 기간, 모임 마감일, 성별, 나이, 장소, 참여 인원 등을 설정하여 모임을 등록하고, 모임에 신청할 수 있는 서비스를 제공합니다. 또한 본인의 여행 기록을 남길 수 있는 서비스도 제공합니다.",
+ url: "https://www.solitourist.com/",
+ siteName: "솔리투어",
+ images: [
+ {
+ url: "/home/background1.png",
+ width: 1440,
+ height: 600,
+ alt: "솔리투어 메인 이미지",
+ },
+ ],
+ locale: "ko_KR",
+ type: "website",
+ },
};
declare global {
@@ -28,10 +54,23 @@ export default function RootLayout({
children: React.ReactNode;
}>) {
return (
-
-
+
+
+
+
+
+
+ {children}
+
+
-
- );
-}
diff --git a/src/app/meetings/layout.tsx b/src/app/meetings/layout.tsx
deleted file mode 100644
index df1b7b04..00000000
--- a/src/app/meetings/layout.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function RootLayout({
- children,
-}: Readonly<{
- children: React.ReactNode;
-}>) {
- return {children}
;
-}
diff --git a/src/app/meetings/page.tsx b/src/app/meetings/page.tsx
deleted file mode 100644
index e9c3fa14..00000000
--- a/src/app/meetings/page.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import Banner from "@/components/common/Banner";
-import TopListContainer from "@/containers/informations/TopListContainer";
-import MeetingsListContainer from "@/containers/meetings/MeetingsListContainer";
-import { Metadata } from "next";
-
-type MyProps = {
- searchParams: { [key: string]: string | undefined };
-};
-
-export const metadata: Metadata = {
- title: "모임",
- description: "Solitour의 모임(탭)",
-};
-
-export default function page({ searchParams }: MyProps) {
- return (
-
- 직접 내 모임을`, "만들어보세요!"]}
- buttonText="모임 등록하기"
- category={"모임"}
- />
- {/* TODO : 나중에 API 연결하게 되면 그때 가서 공통컴포넌트 수정하기 */}
-
- );
-}
\ No newline at end of file
diff --git a/src/app/mypage/layout.tsx b/src/app/mypage/layout.tsx
deleted file mode 100644
index b1be0647..00000000
--- a/src/app/mypage/layout.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-
-export default function RootLayout({
- children,
-}: Readonly<{
- children: React.ReactNode;
-}>) {
- return (
-
- {children}
-
- );
-}
diff --git a/src/app/mypage/page.tsx b/src/app/mypage/page.tsx
index 9336a653..93d1bda7 100644
--- a/src/app/mypage/page.tsx
+++ b/src/app/mypage/page.tsx
@@ -1,20 +1,38 @@
import MyPageHeaderContainer from "@/containers/mypage/MyPageHeaderContainer";
import MyPageMainContainer from "@/containers/mypage/MyPageMainContainer";
+import { userResponseDto } from "@/types/UserDto";
+import { fetchWithTokenRefreshSSR } from "@/utils/getNewAccessTokenAndRerequest";
import { Metadata } from "next";
+import { cookies } from "next/headers";
export const metadata: Metadata = {
title: "마이페이지",
description: "Solitour 사용자 마이페이지",
};
-export default function page() {
+async function getUserInfo() {
+
+ const access_token = cookies().get("access_token");
+ const refresh_token = cookies().get("refresh_token");
+ const response = await fetchWithTokenRefreshSSR
+
);
}
-
\ No newline at end of file
diff --git a/src/app/not-found.tsx b/src/app/not-found.tsx
index 602c0f1d..2d78d285 100644
--- a/src/app/not-found.tsx
+++ b/src/app/not-found.tsx
@@ -1,11 +1,46 @@
+import BackButtonContainer from "@/containers/common/BackButtonContainer";
import { Metadata } from "next";
+import Image from "next/image";
+import Link from "next/link";
export const metadata: Metadata = {
title: "Not Found",
+ description: "Solitour의 Not found 페이지",
};
const NotFound = () => {
- return Not Found
; + return ( +
+
+
+
+ 앗..요청하신 페이지를
+찾을 수 없습니다.
+
+
+ 존재하지 않는 주소를 입력하셨거나,
+
+
+ {"요청하신 페이지의 주소가 변경, "}
+{"삭제되어 찾을 수 없습니다."}
+
+
+ 홈으로
+
+
+
- ({
+ url: `${process.env.BACKEND_URL}/api/qna/${id}`,
+ accessToken: accessToken,
+ refreshToken: refreshToken,
+ });
+}
+
+export default async function Page({ params: { id } }: Props) {
+ const qnaId = Number(id);
+ if (qnaId <= 0 || !Number.isSafeInteger(qnaId)) {
+ throw Error("Not Found");
+ }
+
+ const data = await fetchData(qnaId);
+
+ return (
+
+
+ );
+}
diff --git a/src/app/support/qna/write/page.tsx b/src/app/support/qna/write/page.tsx
new file mode 100644
index 00000000..b9614ca4
--- /dev/null
+++ b/src/app/support/qna/write/page.tsx
@@ -0,0 +1,11 @@
+import SupportQnAWriteContainer from "@/containers/support/qna/SupportQnAWriteContainer";
+
+interface IPage {
+
+}
+const Page = (props: IPage) => {
+ return (
+ ) => {
+ const { value } = e.target;
+ if (!/^\d*$/.test(value)) return;
+ setValue("age", Number(value));
+ trigger();
+ };
+
+ const addUserInformationSubmit = async () => {
+ const response = await fetchWithAuth('/api/auth/user', {
+ method: "PUT",
+ body: JSON.stringify({
+ sex: getValues("sex"),
+ name: getValues("name"),
+ age: getValues("age"),
+ })
+ })
+
+ if (response.status == 204) {
+ toastifyStore.setToastify({
+ type: "success",
+ message: "등록 성공"
+ })
+ authStore.setUser({
+ sex: getValues("sex"),
+ age: getValues("age"),
+ });
+ props.closeModal();
+ }
+ }
+
+ return (
+
+
+ );
+};
+export default AddUserInformationForm
\ No newline at end of file
diff --git a/src/components/auth/AddUserInformationInitForm.tsx b/src/components/auth/AddUserInformationInitForm.tsx
new file mode 100644
index 00000000..47adde08
--- /dev/null
+++ b/src/components/auth/AddUserInformationInitForm.tsx
@@ -0,0 +1,143 @@
+"use client"
+
+import Image from "next/image";
+import Link from "next/link";
+import { useFormContext } from "react-hook-form";
+
+interface IAddUserInformationInitForm {
+ kakaoLogin: () => void;
+ addUserInformationSubmit: () => void;
+ handleInputChange: (e: React.ChangeEvent) => void;
+}
+const AddUserInformationInitForm = ({kakaoLogin, addUserInformationSubmit, handleInputChange}: IAddUserInformationInitForm) => {
+
+ const formContext = useFormContext();
+
+return (
+
+
+
+
+
);
}
diff --git a/src/app/support/notice/[id]/page.tsx b/src/app/support/notice/[id]/page.tsx
new file mode 100644
index 00000000..c91e2cf1
--- /dev/null
+++ b/src/app/support/notice/[id]/page.tsx
@@ -0,0 +1,49 @@
+// app/page.tsx
+import SupportNoticeDetail from "@/components/support/SupportNoticeDetail";
+import { Metadata } from "next";
+import { cookies } from "next/headers";
+
+export const metadata: Metadata = {
+ title: "공지사항 상세조회",
+ description: "공지사항 상세조회",
+};
+
+interface PageProps {
+ params: { id: string };
+}
+
+async function fetchData(id: number) {
+ const cookie = cookies().get("access_token");
+
+ try {
+ const res = await fetch(
+ `${process.env.BACKEND_URL}/api/notice/${id}`,
+ {
+ headers: {
+ "Content-Type": "application/json",
+ Cookie: `${cookie?.name}=${cookie?.value}`,
+ },
+ next: { revalidate: 3600 },
+ },
+ );
+ if (!res.ok) {
+ throw new Error(`Failed to fetch data: ${res.statusText}`);
+ }
+ return res.json();
+ } catch (error) {
+ return { error: "Failed to fetch data" };
+ }
+}
+
+export default async function Page({ params: { id } }: PageProps) {
+ const noticeId = Number(id);
+ if (noticeId <= 0 || !Number.isSafeInteger(noticeId)) {
+ throw Error("Not Found");
+ }
+
+ const data = await fetchData(noticeId);
+
+ return (
+
+ 0 ? initBannerList : []}
+ initBannerList={[]}
+ />
+
+
+
+ );
+};
+
+export default Page;
diff --git a/src/app/support/qna/detail/[id]/page.tsx b/src/app/support/qna/detail/[id]/page.tsx
new file mode 100644
index 00000000..628336fc
--- /dev/null
+++ b/src/app/support/qna/detail/[id]/page.tsx
@@ -0,0 +1,46 @@
+import SupportQnADetailEditContainer from "@/containers/support/qna/SupportQnADetailEditContainer";
+import { QnADetailType } from "@/types/QnADto";
+import { fetchWithTokenRefreshSSR } from "@/utils/getNewAccessTokenAndRerequest";
+import { cookies } from "next/headers";
+
+interface Props {
+ params: { id: string };
+}
+
+export async function generateMetadata({ params: { id } }: Props) {
+ const qnaId = Number(id);
+ if (qnaId <= 0 || !Number.isSafeInteger(qnaId)) {
+ throw Error("Not Found");
+ }
+
+ return {
+ title: `QnA 상세 조회`,
+ description: "QnA 상세 조회",
+ };
+}
+
+async function fetchData(id: number) {
+ const accessToken = cookies().get("access_token");
+ const refreshToken = cookies().get("refresh_token");
+
+ return await fetchWithTokenRefreshSSR+ 안녕하세요 솔리투어입니다 +
++ 신뢰할 수 있는 이용 환경을 위해 필요한 정보를 입력해 주세요 +
+
+
+
+
+
+
+
+
+ 성별
+
+
+
+
+ 연도(나이) {new Date().getFullYear() - 58} ~ {new Date().getFullYear() - 19}
+
+
+
+ + 정보를 입력하지 않아도 서비스를 이용할 수 있으나 일부 서비스 이용이 + 제한될 수 있습니다 +
+ + + +
+
+
+
+
+
+ );
+};
+export default AddUserInformationInitForm
\ No newline at end of file
diff --git a/src/components/auth/AuthLoading.tsx b/src/components/auth/AuthLoading.tsx
new file mode 100644
index 00000000..af29d393
--- /dev/null
+++ b/src/components/auth/AuthLoading.tsx
@@ -0,0 +1,21 @@
+import LottieAirplane from "@/../public/lottie/loading-airplane.json";
+import LottieComponent from "@/components/common/lottie/LottieComponent";
+
+const AuthLoading = () => {
+ return (
+
+
+ {/*
+ + 안녕하세요 솔리투어입니다 +
++ 신뢰할 수 있는 이용 환경을 위해 필요한 정보를 입력해 주세요 +
+
+
+
+
+
+
+
+
+ 이름
+ +성별
+
+
+
+
+ 연도(나이)
+ 현재는 {new Date().getFullYear() - 58} ~ {new Date().getFullYear() - 19}년생만 모임 서비스를 이용할 수 있습니다. +
+
+
+ + 정보를 입력하지 않아도 서비스를 이용할 수 있으나 일부 서비스 이용이 + 제한될 수 있습니다 +
+ + + + +
+
+ );
+};
+export default AuthLoading;
diff --git a/src/components/auth/SignIn.tsx b/src/components/auth/SignIn.tsx
new file mode 100644
index 00000000..ac908da0
--- /dev/null
+++ b/src/components/auth/SignIn.tsx
@@ -0,0 +1,95 @@
+import introLottie from "@/../public/lottie/solitour-auth-intro-image.json";
+import LottieComponent from "@/components/common/lottie/LottieComponent";
+import Image from "next/image";
+import Link from "next/link";
+
+const SignIn = () => {
+ return (
+
+
+ 로딩 중...
+
+
+ );
+};
+export default SignIn;
diff --git a/src/components/auth/SignUp.tsx b/src/components/auth/SignUp.tsx
new file mode 100644
index 00000000..fe76bea4
--- /dev/null
+++ b/src/components/auth/SignUp.tsx
@@ -0,0 +1,82 @@
+import introLottie from "@/../public/lottie/solitour-auth-intro-image.json";
+import LottieComponent from "@/components/common/lottie/LottieComponent";
+import Image from "next/image";
+import Link from "next/link";
+
+const SignUp = () => {
+ return (
+ 로그인
+
+
+ + SNS로 솔리투어에 로그인하고 더 많은 서비스를 즐겨보세요! +
+
+
+
+
+
+
+
+
+ 카카오로 로그인
+
+
+ {/*
+
+
+ 구글로 로그인
+ */}
+
+
+
+
+
+
+ 1초만의 빠른 회원가입
+
+
+ + 아직 계정이 없으신가요? + + 회원가입 + +
+
+
+ );
+};
+export default SignUp;
diff --git a/src/components/auth/UserImage.tsx b/src/components/auth/UserImage.tsx
new file mode 100644
index 00000000..80d78528
--- /dev/null
+++ b/src/components/auth/UserImage.tsx
@@ -0,0 +1,33 @@
+import Image from "next/image";
+
+interface IUserImage {
+ userImageAddress: string,
+ userSex?: string,
+ size: number,
+ addressStyle?: string,
+ defaultStyle?: string,
+}
+const UserImage = ({
+ userImageAddress,
+ userSex,
+ size,
+ addressStyle = "rounded-[50%] border-[0.03125rem] border-[#B8EDD9] bg-[#F2FAF7]",
+ defaultStyle = "rounded-[50%] border-[0.03125rem] border-[#B8EDD9] bg-[#F2FAF7]",
+}: IUserImage) => {
+ return (
+ <>
+ {userImageAddress ? (
+ 회원가입
+
+
+ + 1초 회원가입으로 입력없이 간편하게 솔리투어를 시작해보세요! +
+
+
+
+
+
+
+
+
+ 카카오로 1초만에 시작하기
+
+
+ {/*
+
+
+
+ 구글로 1초만에 시작하기
+
+ */}
+
+
+ + 계정이 있으신가요? + + 로그인 + +
+ null
+ )}
+
+ );
+};
+export default UserImage
\ No newline at end of file
diff --git a/src/components/common/BackButton.tsx b/src/components/common/BackButton.tsx
new file mode 100644
index 00000000..534ce81b
--- /dev/null
+++ b/src/components/common/BackButton.tsx
@@ -0,0 +1,19 @@
+import { AppRouterInstance } from "next/dist/shared/lib/app-router-context.shared-runtime";
+
+interface Props {
+ router: AppRouterInstance;
+}
+
+const BackButton = ({ router }: Props) => {
+ return (
+
+ );
+};
+
+export default BackButton;
diff --git a/src/components/common/Banner.tsx b/src/components/common/Banner.tsx
index 55485d02..4c4f5a97 100644
--- a/src/components/common/Banner.tsx
+++ b/src/components/common/Banner.tsx
@@ -1,32 +1,49 @@
import Image from "next/image";
import Link from "next/link";
-type MyProps = {
- title: string;
+interface Props {
content: string[];
buttonText: string;
category: "정보" | "모임";
-};
-
-const bannerImage = {
- 정보: "/banner-image.png",
- 모임: "/banner2-image.svg",
-};
+}
const buttonPath = {
정보: "/informations/write",
- 모임: "/meetings/write",
+ 모임: "/gathering/write",
};
-// todo
-const Banner = ({ title, content, buttonText, category }: MyProps) => {
+const Banner = ({ content, buttonText, category }: Props) => {
+ if (category == "모임") {
+ return (
+
+
+ );
+ }
+
return (
-
+
+
+ {content.map((str, index) => (
+
+ ))}
+
+ {buttonText}
+
+
+
-
-
+
+ = ({ categories }) => {
+ return (
+
+ );
+};
+
+export default Breadcrumbs;
diff --git a/src/components/common/CategoryList.tsx b/src/components/common/CategoryList.tsx
new file mode 100644
index 00000000..d4fa108c
--- /dev/null
+++ b/src/components/common/CategoryList.tsx
@@ -0,0 +1,43 @@
+
+type T = string | number;
+
+interface ICategoryList {
+ categories: {
+ name: string;
+ value: T;
+ }[];
+ onClickHandler: (value: T) => void;
+ activeCategory: T;
+}
+
+const CategoryList = ({
+ categories,
+ onClickHandler,
+ activeCategory
+}: ICategoryList) => {
+ const onClickMenu = (value: T) => {
+ onClickHandler(value);
+ };
+
+ return (
+ ) => void;
+}
+
+const FloatingButton = forwardRef(
+ ({ visible, animationFlag, onClick, onScrollToTop, createGatheringClick }, ref) => {
+ return (
+
+
);
};
-
export default Banner;
diff --git a/src/components/common/Breadcrumb.tsx b/src/components/common/Breadcrumb.tsx
new file mode 100644
index 00000000..5794fe8f
--- /dev/null
+++ b/src/components/common/Breadcrumb.tsx
@@ -0,0 +1,42 @@
+import Image from "next/image";
+import Link from "next/link";
+import { FC } from "react";
+import { IoIosArrowForward } from "react-icons/io";
+
+interface Category {
+ label: string;
+ href: string;
+}
+
+interface BreadcrumbsProps {
+ categories: Category[];
+}
+
+const Breadcrumbs: FC
{content.map((str, index) => (
@@ -38,19 +55,16 @@ const Banner = ({ title, content, buttonText, category }: MyProps) => {
{buttonText}
-
+
+
+ );
+};
+
+export default CategoryList;
diff --git a/src/components/common/DeleteModal.tsx b/src/components/common/DeleteModal.tsx
new file mode 100644
index 00000000..4d0b2c89
--- /dev/null
+++ b/src/components/common/DeleteModal.tsx
@@ -0,0 +1,35 @@
+import HashSpinner from "./HashSpinner";
+
+interface Props {
+ loading: boolean;
+ onDeleteClick: () => void;
+ onCancelClick: () => void;
+}
+
+const DeleteModal = ({ loading, onDeleteClick, onCancelClick }: Props) => {
+ return (
+
+ {categories.map((i) => (
+
+ ))}
+
+
+
+ );
+};
+
+export default DeleteModal;
diff --git a/src/components/common/FloatingButton.tsx b/src/components/common/FloatingButton.tsx
index d6c324bc..fc535cba 100644
--- a/src/components/common/FloatingButton.tsx
+++ b/src/components/common/FloatingButton.tsx
@@ -1,16 +1,84 @@
+import Image from "next/image";
+import Link from "next/link";
+import { forwardRef } from "react";
import { IoIosArrowUp } from "react-icons/io";
+import { MdClose } from "react-icons/md";
-const FloatingButton = ({ onClick }: Readonly<{ onClick: () => void }>) => {
- return (
-
+
+ 정말 삭제하시겠습니까?
+삭제하시면 다시 복구할 수 없습니다.
+
+
+
+
+
-
-
- );
-};
+interface Props {
+ visible: boolean;
+ animationFlag: boolean;
+ onClick: () => void;
+ onScrollToTop: () => void;
+ createGatheringClick: (e: React.MouseEvent
+ {visible && (
+
+ );
+ },
+);
+
+FloatingButton.displayName = "FloatingButton";
export default FloatingButton;
diff --git a/src/components/common/Footer.tsx b/src/components/common/Footer.tsx
index b05d4502..abd40d05 100644
--- a/src/components/common/Footer.tsx
+++ b/src/components/common/Footer.tsx
@@ -1,15 +1,15 @@
+import Image from "next/image";
import Link from "next/link";
import { FcGoogle } from "react-icons/fc";
import { RiKakaoTalkFill } from "react-icons/ri";
-import Image from "next/image";
const Footer = () => {
return (
-
+
+ )}
+ {!visible && (
+
+ )}
+
+
+
+
+
+ 일기
+등록하기
+ + createGatheringClick(e)} + > +모임
+등록하기
+ + +여행정보
+등록하기
+ +
-
+