Merge pull request #469 from waterkail/part3-이현승-week13

[이현승] week 15
codeit-bootcamp-frontend · May 29, 2024 · cf6a7a5 · cf6a7a5
2 parents 0cd46ad + 0535d70
commit cf6a7a5
Show file tree

Hide file tree

Showing 106 changed files with 1,316 additions and 2,522 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@
 /node_modules
 /.pnp
 /WeeklyMissionPart1
+/.next
 .pnp.js
 
 # testing

diff --git a/.next/build-manifest.json b/.next/build-manifest.json
@@ -12,11 +12,6 @@
   ],
   "rootMainFiles": [],
   "pages": {
-    "/": [
-      "static/chunks/webpack.js",
-      "static/chunks/main.js",
-      "static/chunks/pages/index.js"
-    ],
     "/_app": [
       "static/chunks/webpack.js",
       "static/chunks/main.js",
@@ -27,15 +22,10 @@
       "static/chunks/main.js",
       "static/chunks/pages/_error.js"
     ],
-    "/folder": [
-      "static/chunks/webpack.js",
-      "static/chunks/main.js",
-      "static/chunks/pages/folder.js"
-    ],
-    "/shared": [
+    "/folder/[[...folderid]]": [
       "static/chunks/webpack.js",
       "static/chunks/main.js",
-      "static/chunks/pages/shared.js"
+      "static/chunks/pages/folder/[[...folderid]].js"
     ]
   },
   "ampFirstPages": []

diff --git a/...KRhCnxasNHizyinim5nzA=/60.1715992671300.jeoj53wBVuYFoUKWsGo2hfeanyIneY-Wa2LpzqM27fA=.webp b/...KRhCnxasNHizyinim5nzA=/60.1715992671300.jeoj53wBVuYFoUKWsGo2hfeanyIneY-Wa2LpzqM27fA=.webp
diff --git a/...YUxDc8jZglCwo6bPM=/604800.1716533120026.PI92o1sJVkrEjK6mR6-Su3RBAUrxLLE0mzDGpyfi+A0=.webp b/...YUxDc8jZglCwo6bPM=/604800.1716533120026.PI92o1sJVkrEjK6mR6-Su3RBAUrxLLE0mzDGpyfi+A0=.webp
diff --git a/...B5zfk3Qv-HSW1Bq1yz+LA=/60.1715992676775.5CX5P0mePufcSxMw1Gu+JIYLYGssVeCPfb1BlxhJVOQ=.webp b/...B5zfk3Qv-HSW1Bq1yz+LA=/60.1715992676775.5CX5P0mePufcSxMw1Gu+JIYLYGssVeCPfb1BlxhJVOQ=.webp
diff --git a/...jJQlAube4nFRGf3sU0pt8=/60.1715992670741.PUiqQg7t1Yw1EvJT5AR9yB3cy4skA9PS1rZ8GM+B87k=.webp b/...jJQlAube4nFRGf3sU0pt8=/60.1715992670741.PUiqQg7t1Yw1EvJT5AR9yB3cy4skA9PS1rZ8GM+B87k=.webp
diff --git a/...ERVVWyhjX2OVge3l5D-5I=/60.1715936389322.DNs2FwHe4Jk0Ez5VEbyBS4xM5woea+05HNI-jPPfBzw=.webp b/...ERVVWyhjX2OVge3l5D-5I=/60.1715936389322.DNs2FwHe4Jk0Ez5VEbyBS4xM5woea+05HNI-jPPfBzw=.webp
diff --git a/...RABk2FUGPROFOMQTC+1ss=/60.1715992671154.BDlL-Ksum7i2j8QicR5tqom516uf9r5Te9FHjucr9sE=.webp b/...RABk2FUGPROFOMQTC+1ss=/60.1715992671154.BDlL-Ksum7i2j8QicR5tqom516uf9r5Te9FHjucr9sE=.webp
diff --git a/...qjboMAaEjpA7fMGD7tVHs=/60.1715992670802.v4OB+YR7bvjLgNrHY15AbzEKMARSEdUqJVMtkwLA1Io=.webp b/...qjboMAaEjpA7fMGD7tVHs=/60.1715992670802.v4OB+YR7bvjLgNrHY15AbzEKMARSEdUqJVMtkwLA1Io=.webp
diff --git a/...zmDxRLIiMadBBo7hhxX38=/60.1715992670899.RAglTY4OKUctEZu0QYyexqmFUVs6PbaFfaGaxAtegCo=.webp b/...zmDxRLIiMadBBo7hhxX38=/60.1715992670899.RAglTY4OKUctEZu0QYyexqmFUVs6PbaFfaGaxAtegCo=.webp
diff --git a/.next/cache/webpack/client-development-fallback/0.pack.gz b/.next/cache/webpack/client-development-fallback/0.pack.gz
diff --git a/.next/cache/webpack/client-development-fallback/1.pack.gz b/.next/cache/webpack/client-development-fallback/1.pack.gz
diff --git a/.next/cache/webpack/client-development-fallback/index.pack.gz b/.next/cache/webpack/client-development-fallback/index.pack.gz
diff --git a/.next/cache/webpack/client-development-fallback/index.pack.gz.old b/.next/cache/webpack/client-development-fallback/index.pack.gz.old
diff --git a/.next/cache/webpack/client-development/0.pack.gz b/.next/cache/webpack/client-development/0.pack.gz
diff --git a/.next/cache/webpack/client-development/1.pack.gz b/.next/cache/webpack/client-development/1.pack.gz
diff --git a/.next/cache/webpack/client-development/11.pack.gz b/.next/cache/webpack/client-development/11.pack.gz
diff --git a/.next/cache/webpack/client-development/12.pack.gz b/.next/cache/webpack/client-development/12.pack.gz
diff --git a/.next/cache/webpack/client-development/13.pack.gz b/.next/cache/webpack/client-development/13.pack.gz
diff --git a/.next/cache/webpack/client-development/14.pack.gz b/.next/cache/webpack/client-development/14.pack.gz
diff --git a/.next/cache/webpack/client-development/15.pack.gz b/.next/cache/webpack/client-development/15.pack.gz
diff --git a/.next/cache/webpack/client-development/16.pack.gz b/.next/cache/webpack/client-development/16.pack.gz
diff --git a/.next/cache/webpack/client-development/17.pack.gz b/.next/cache/webpack/client-development/17.pack.gz
diff --git a/.next/cache/webpack/client-development/19.pack.gz b/.next/cache/webpack/client-development/19.pack.gz
diff --git a/.next/cache/webpack/client-development/2.pack.gz b/.next/cache/webpack/client-development/2.pack.gz
diff --git a/.next/cache/webpack/client-development/20.pack.gz b/.next/cache/webpack/client-development/20.pack.gz
diff --git a/.next/cache/webpack/client-development/21.pack.gz b/.next/cache/webpack/client-development/21.pack.gz
diff --git a/.next/cache/webpack/client-development/22.pack.gz b/.next/cache/webpack/client-development/22.pack.gz
diff --git a/.next/cache/webpack/client-development/23.pack.gz b/.next/cache/webpack/client-development/23.pack.gz
diff --git a/.next/cache/webpack/client-development/3.pack.gz b/.next/cache/webpack/client-development/3.pack.gz
diff --git a/.next/cache/webpack/client-development/4.pack.gz b/.next/cache/webpack/client-development/4.pack.gz
diff --git a/.next/cache/webpack/client-development/5.pack.gz b/.next/cache/webpack/client-development/5.pack.gz
diff --git a/.next/cache/webpack/client-development/6.pack.gz b/.next/cache/webpack/client-development/6.pack.gz
diff --git a/.next/cache/webpack/client-development/8.pack.gz b/.next/cache/webpack/client-development/8.pack.gz
diff --git a/.next/cache/webpack/client-development/9.pack.gz b/.next/cache/webpack/client-development/9.pack.gz
diff --git a/.next/cache/webpack/client-development/index.pack.gz b/.next/cache/webpack/client-development/index.pack.gz
diff --git a/.next/cache/webpack/client-development/index.pack.gz.old b/.next/cache/webpack/client-development/index.pack.gz.old
diff --git a/.next/cache/webpack/server-development/0.pack.gz b/.next/cache/webpack/server-development/0.pack.gz
diff --git a/.next/cache/webpack/server-development/1.pack.gz b/.next/cache/webpack/server-development/1.pack.gz
diff --git a/.next/cache/webpack/server-development/10.pack.gz b/.next/cache/webpack/server-development/10.pack.gz
diff --git a/.next/cache/webpack/server-development/11.pack.gz b/.next/cache/webpack/server-development/11.pack.gz
diff --git a/.next/cache/webpack/server-development/12.pack.gz b/.next/cache/webpack/server-development/12.pack.gz
diff --git a/.next/cache/webpack/server-development/13.pack.gz b/.next/cache/webpack/server-development/13.pack.gz
diff --git a/.next/cache/webpack/server-development/16.pack.gz b/.next/cache/webpack/server-development/16.pack.gz
diff --git a/.next/cache/webpack/server-development/2.pack.gz b/.next/cache/webpack/server-development/2.pack.gz
diff --git a/.next/cache/webpack/server-development/3.pack.gz b/.next/cache/webpack/server-development/3.pack.gz
diff --git a/.next/cache/webpack/server-development/4.pack.gz b/.next/cache/webpack/server-development/4.pack.gz
diff --git a/.next/cache/webpack/server-development/5.pack.gz b/.next/cache/webpack/server-development/5.pack.gz
diff --git a/.next/cache/webpack/server-development/6.pack.gz b/.next/cache/webpack/server-development/6.pack.gz
diff --git a/.next/cache/webpack/server-development/7.pack.gz b/.next/cache/webpack/server-development/7.pack.gz
diff --git a/.next/cache/webpack/server-development/8.pack.gz b/.next/cache/webpack/server-development/8.pack.gz
diff --git a/.next/cache/webpack/server-development/9.pack.gz b/.next/cache/webpack/server-development/9.pack.gz
diff --git a/.next/cache/webpack/server-development/index.pack.gz b/.next/cache/webpack/server-development/index.pack.gz
diff --git a/.next/cache/webpack/server-development/index.pack.gz.old b/.next/cache/webpack/server-development/index.pack.gz.old
diff --git a/.next/server/middleware-build-manifest.js b/.next/server/middleware-build-manifest.js
diff --git a/.next/server/pages-manifest.json b/.next/server/pages-manifest.json
@@ -2,7 +2,5 @@
   "/_app": "pages/_app.js",
   "/_error": "pages/_error.js",
   "/_document": "pages/_document.js",
-  "/": "pages/index.js",
-  "/folder": "pages/folder.js",
-  "/shared": "pages/shared.js"
+  "/folder/[[...folderid]]": "pages/folder/[[...folderid]].js"
 }
diff --git a/.next/server/pages/_app.js b/.next/server/pages/_app.js
diff --git a/.next/server/pages/_error.js b/.next/server/pages/_error.js
diff --git a/.next/server/pages/folder.js b/.next/server/pages/folder.js
diff --git a/.next/server/pages/index.js b/.next/server/pages/index.js
diff --git a/.next/server/pages/shared.js b/.next/server/pages/shared.js
diff --git a/.next/server/vendor-chunks/next.js b/.next/server/vendor-chunks/next.js
diff --git a/.next/server/vendor-chunks/react-toastify.js b/.next/server/vendor-chunks/react-toastify.js
diff --git a/.next/static/chunks/pages/_app.js b/.next/static/chunks/pages/_app.js
diff --git a/.next/static/chunks/pages/folder.js b/.next/static/chunks/pages/folder.js
diff --git a/.next/static/chunks/pages/index.js b/.next/static/chunks/pages/index.js
diff --git a/.next/static/chunks/pages/shared.js b/.next/static/chunks/pages/shared.js
diff --git a/.next/static/chunks/webpack.js b/.next/static/chunks/webpack.js
@@ -183,7 +183,7 @@
 /******/ 	
 /******/ 	/* webpack/runtime/getFullHash */
 /******/ 	!function() {
-/******/ 		__webpack_require__.h = function() { return "c45f4f379cb7f03f"; }
+/******/ 		__webpack_require__.h = function() { return "ecd5d1d48da095ab"; }
 /******/ 	}();
 /******/ 	
 /******/ 	/* webpack/runtime/global */

diff --git a/.next/static/development/_buildManifest.js b/.next/static/development/_buildManifest.js
diff --git a/.next/static/webpack/0e40387e97b26598.webpack.hot-update.json b/.next/static/webpack/0e40387e97b26598.webpack.hot-update.json
diff --git a/.next/static/webpack/fdb78ce2c21e7ffd.webpack.hot-update.json b/.next/static/webpack/fdb78ce2c21e7ffd.webpack.hot-update.json
diff --git a/.next/static/webpack/webpack.0e40387e97b26598.hot-update.js b/.next/static/webpack/webpack.0e40387e97b26598.hot-update.js
diff --git a/.next/static/webpack/webpack.fdb78ce2c21e7ffd.hot-update.js b/.next/static/webpack/webpack.fdb78ce2c21e7ffd.hot-update.js
diff --git a/.next/trace b/.next/trace
diff --git a/components/Api/Api.ts → Api/Api.ts b/components/Api/Api.ts → Api/Api.ts
@@ -9,19 +9,17 @@ export interface AuthProps {
   password: string;
 }
 
-export async function getUserData() {
-  const response = await fetch(`${BASE_URL}/sample/user`, {
+export async function getUserData(userToken: string) {
+  const response = await fetch(`${BASE_URL}/users`, {
     method: "GET",
-    headers: { accept: `*/*` },
+    headers: { accept: `*/*`, Authorization: userToken },
   });
   if (!response.ok) throw new Error(`유저데이터 ${BASE_ERROR_MESSAGE}`);
-  const { name, id, email, profileImageSource } = await response.json();
-
-  return { name, id, email, profileImageSource };
+  return response.json();
 }
 
-export async function getFolderData() {
-  const response = await fetch(`${BASE_URL}/sample/folder`, {
+export async function getFolderData(folderId?: string | number) {
+  const response = await fetch(`${BASE_URL}/folders/${folderId}`, {
     method: "GET",
     headers: { accept: `*/*` },
   });
@@ -38,18 +36,30 @@ export async function getUsersData(userId?: string | number) {
   return response.json();
 }
 
-export async function getFoldersData() {
-  const response = await fetch(`${BASE_URL}/users/1/folders`, {
+export async function getFoldersData(userId: string | number = 1) {
+  const response = await fetch(`${BASE_URL}/users/${userId}/folders`, {
     method: "GET",
     headers: { accept: `*/*` },
   });
   if (!response.ok) throw new Error(`폴더들 ${BASE_ERROR_MESSAGE}`);
   return response.json();
 }
 
-export async function getLinksData(folderId?: string | number) {
+export async function getFolderDataByToken(userToken: string) {
+  const response = await fetch(`${BASE_URL}/folders`, {
+    method: "GET",
+    headers: { accept: `*/*`, Authorization: userToken },
+  });
+  if (!response.ok) throw new Error(`폴더들 ${BASE_ERROR_MESSAGE}`);
+  return response.json();
+}
+
+export async function getLinksData(
+  folderId?: string | number,
+  userId: string | number = 1
+) {
   const response = await fetch(
-    `${BASE_URL}/users/1/links?folderId=${folderId}`,
+    `${BASE_URL}/users/${userId}/links?folderId=${folderId}`,
     {
       method: "GET",
       headers: { accept: `*/*` },

diff --git a/Hooks/useData.ts b/Hooks/useData.ts
@@ -1,14 +1,14 @@
 import { useCallback, useState } from "react";
 
-export function useData(
-  asyncFunction: (pram?: string | number) => Promise<any>
-) {
+type Pram = (number | string | undefined | null)[];
+
+export function useData(asyncFunction: (...pram: any) => Promise<any>) {
   const [data, setData] = useState<any>(null);
 
   const getData = useCallback(
-    async (value?: string | number) => {
+    async (...value: Pram) => {
       try {
-        const result = await asyncFunction(value);
+        const result = await asyncFunction(...value);
         setData(result);
       } catch (err) {
         setData(null);
@@ -17,10 +17,7 @@ export function useData(
     [asyncFunction]
   );
 
-  const returnArray: [any, (value?: string | number) => Promise<void>] = [
-    data,
-    getData,
-  ];
+  const returnArray: [any, (...value: Pram) => Promise<void>] = [data, getData];
 
   return returnArray;
 }
diff --git a/components/AddLink.tsx b/components/AddLink.tsx
@@ -19,6 +19,7 @@ const AddLink = ({ folder, footView }: { folder: any; footView: boolean }) => {
     e.preventDefault();
     setAdd(!add);
     setUrl(AddLink.current?.value);
+    console.log(folder);
   };
 
   return (

diff --git a/components/App.tsx b/components/App.tsx
@@ -1,8 +1,6 @@
 import Header from "./Header";
 import Footer from "./Footer";
-import { ReactNode, useCallback, useEffect, useState } from "react";
-import { getUsersData } from "./Api/Api";
-import { useData } from "../Hooks/useData";
+import { ReactNode } from "react";
 
 function App({
   children,
@@ -13,30 +11,9 @@ function App({
   headerFixed: boolean;
   foot?: (node?: Element | null | undefined) => void;
 }) {
-  const [user, getUser] = useData(getUsersData);
-  const [isLogIn, setIsLogIn] = useState(true);
-
-  const getData = useCallback(async () => {
-    try {
-      await getUser(1);
-      setIsLogIn(true);
-    } catch (err) {
-      setIsLogIn(false);
-    }
-  }, [getUser]);
-
-  useEffect(() => {
-    getData();
-  }, [isLogIn, getData]);
-
   return (
     <>
-      <Header
-        isLogIn={isLogIn}
-        email={user?.data[0]?.email}
-        img={user?.data[0]?.image_source}
-        fixed={headerFixed}
-      />
+      <Header fixed={headerFixed} />
       {children}
       <Footer observer={foot} />
     </>

diff --git a/components/CardList.tsx b/components/CardList.tsx
@@ -5,11 +5,13 @@ export interface LinkItem {
   id: number;
   createdAt?: string;
   created_at?: string;
+  updated_at?: string | null;
   url: string;
   title: string;
   description: string;
   imageSource?: string;
   image_source?: string;
+  folder_id?: number;
 }
 
 export type FolderObject = {

diff --git a/components/FolderPage/Folder.tsx b/components/FolderPage/Folder.tsx
@@ -3,7 +3,7 @@ import MainContent from "../MainContent";
 import SearchBar from "../SearchBar";
 import FolderBar from "./FolderBar";
 import CardList, { LinkItem } from "../CardList";
-import { FolderType } from "../../pages/folder";
+import { FolderType } from "../../pages/folder/[[...folderid]]";
 import { MouseEvent, useRef, useState } from "react";
 
 interface Props {