From 6cf6c4b31026e02c1005e9054689c5de1e21b9ab Mon Sep 17 00:00:00 2001
From: heejin <dlwlrgkwk82@gmail.com>
Date: Sat, 16 Nov 2024 18:37:33 +0900
Subject: [PATCH 01/11] =?UTF-8?q?=E2=9C=A8=20feat:=20add=20header=20and=20?=
 =?UTF-8?q?sidebar=20css=20and=20types?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../(with-header-sidebar)/layout.module.css   | 14 ++++-
 src/app/(with-header-sidebar)/layout.tsx      | 13 +++--
 .../mydashboard/hooks/useApi.ts               | 57 +++++++++++++++++++
 .../mydashboard/hooks/useWindowSize.ts        | 33 +++++++++++
 .../mydashboard/types/dashboards.ts           | 22 +++++++
 .../mydashboard/types/user.ts                 |  8 +++
 .../mydashboard/utils/axiosInstance.ts        | 31 ++++++++++
 src/app/reset.css                             |  1 +
 src/components/Button.tsx                     |  3 +-
 src/components/Header.module.css              |  2 +-
 src/components/Header.tsx                     | 13 ++++-
 src/components/MainContainer.module.css       |  0
 src/components/MainContainer.tsx              | 12 ++++
 src/components/SideBar.module.css             | 10 ++++
 src/components/SideBar.tsx                    | 35 +++++++++++-
 src/constants/urls.ts                         |  2 +-
 16 files changed, 241 insertions(+), 15 deletions(-)
 create mode 100644 src/app/(with-header-sidebar)/mydashboard/hooks/useApi.ts
 create mode 100644 src/app/(with-header-sidebar)/mydashboard/hooks/useWindowSize.ts
 create mode 100644 src/app/(with-header-sidebar)/mydashboard/types/dashboards.ts
 create mode 100644 src/app/(with-header-sidebar)/mydashboard/types/user.ts
 create mode 100644 src/app/(with-header-sidebar)/mydashboard/utils/axiosInstance.ts
 create mode 100644 src/components/MainContainer.module.css
 create mode 100644 src/components/MainContainer.tsx

diff --git a/src/app/(with-header-sidebar)/layout.module.css b/src/app/(with-header-sidebar)/layout.module.css
index 1dfd0fb..1737a4c 100644
--- a/src/app/(with-header-sidebar)/layout.module.css
+++ b/src/app/(with-header-sidebar)/layout.module.css
@@ -1,3 +1,13 @@
-.header {
-  color: yellowgreen;
+.container {
+  display: flex;
+  height: 100%;
+}
+
+.sideBarWrapper {
+  border-right: 1px solid var(--gray-300);
+  padding: 22px;
+}
+
+.mainWrapper {
+  flex: 1;
 }
diff --git a/src/app/(with-header-sidebar)/layout.tsx b/src/app/(with-header-sidebar)/layout.tsx
index c085669..de9f3fb 100644
--- a/src/app/(with-header-sidebar)/layout.tsx
+++ b/src/app/(with-header-sidebar)/layout.tsx
@@ -1,16 +1,17 @@
 import { ReactNode } from 'react';
 import SideBar from '@/components/SideBar';
 import styles from './layout.module.css';
-import Header from '@/components/Header';
+import MainContainer from '@/components/MainContainer';
 
 export default function Layout({ children }: { children: ReactNode }) {
   return (
-    <>
-      <Header />
-      <nav>
+    <div className={styles.container}>
+      <nav className={styles.sideBarWrapper}>
         <SideBar />
       </nav>
-      <main>{children}</main>
-    </>
+      <div className={styles.mainWrapper}>
+        <MainContainer>{children}</MainContainer>
+      </div>
+    </div>
   );
 }
diff --git a/src/app/(with-header-sidebar)/mydashboard/hooks/useApi.ts b/src/app/(with-header-sidebar)/mydashboard/hooks/useApi.ts
new file mode 100644
index 0000000..3af9bdc
--- /dev/null
+++ b/src/app/(with-header-sidebar)/mydashboard/hooks/useApi.ts
@@ -0,0 +1,57 @@
+import { useState, useEffect, useCallback } from 'react';
+import { AxiosResponse, AxiosError } from 'axios';
+import axiosInstance from '../utils/axiosInstance';
+
+type UseApiFetchReturnType<T> = {
+  data: T | null;
+  loading: boolean;
+  error: AxiosError | null;
+  refetch: () => Promise<void>;
+};
+
+type RequestOptions<
+  TParams = Record<string, unknown>,
+  TBody = Record<string, unknown>,
+> = {
+  method: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE';
+  params?: TParams;
+  body?: TBody;
+};
+
+export default function useApi<
+  T,
+  TParams = Record<string, unknown>,
+  TBody = Record<string, unknown>,
+>(
+  url: string,
+  options: RequestOptions<TParams, TBody>
+): UseApiFetchReturnType<T> {
+  const [data, setData] = useState<T | null>(null);
+  const [loading, setLoading] = useState<boolean>(true);
+  const [error, setError] = useState<AxiosError | null>(null);
+
+  const fetchData = useCallback(async () => {
+    setLoading(true);
+
+    try {
+      const config = {
+        method: options.method,
+        url,
+        params: options.params,
+        data: options.body,
+      };
+      const response: AxiosResponse<T> = await axiosInstance.request(config);
+      setData(response.data);
+    } catch (err) {
+      setError(err as AxiosError);
+    } finally {
+      setLoading(false);
+    }
+  }, [url, options]);
+
+  useEffect(() => {
+    fetchData();
+  }, [fetchData]);
+
+  return { data, loading, error, refetch: fetchData };
+}
diff --git a/src/app/(with-header-sidebar)/mydashboard/hooks/useWindowSize.ts b/src/app/(with-header-sidebar)/mydashboard/hooks/useWindowSize.ts
new file mode 100644
index 0000000..d7b6aaa
--- /dev/null
+++ b/src/app/(with-header-sidebar)/mydashboard/hooks/useWindowSize.ts
@@ -0,0 +1,33 @@
+import { useState, useEffect } from 'react';
+
+interface WindowSize {
+  width: number;
+  height: number;
+  isMobile: boolean;
+}
+
+export default function useWindowSize(): WindowSize {
+  const [windowSize, setWindowSize] = useState<WindowSize>({
+    width: 0,
+    height: 0,
+    isMobile: true,
+  });
+
+  useEffect(() => {
+    function handleResize() {
+      setWindowSize({
+        width: window.innerWidth,
+        height: window.innerHeight,
+        isMobile: window.innerWidth <= 768,
+      });
+    }
+
+    window.addEventListener('resize', handleResize);
+
+    handleResize();
+
+    return () => window.removeEventListener('resize', handleResize);
+  }, []);
+
+  return windowSize;
+}
diff --git a/src/app/(with-header-sidebar)/mydashboard/types/dashboards.ts b/src/app/(with-header-sidebar)/mydashboard/types/dashboards.ts
new file mode 100644
index 0000000..1d4f881
--- /dev/null
+++ b/src/app/(with-header-sidebar)/mydashboard/types/dashboards.ts
@@ -0,0 +1,22 @@
+interface Dashboard {
+  id: number;
+  title: string;
+  color: string;
+  userId: number;
+  createdAt: string;
+  updatedAt?: string;
+  createdByMe: boolean;
+}
+
+interface GetDashboardsRequestParams {
+  navigationMethod: 'infiniteScroll' | 'pagination';
+  cursorId?: number;
+  page?: number;
+  size?: number;
+}
+
+interface GetDashboardsResponse {
+  dashboards: Dashboard[];
+  totalCount: number;
+  cursorId: number | null;
+}
diff --git a/src/app/(with-header-sidebar)/mydashboard/types/user.ts b/src/app/(with-header-sidebar)/mydashboard/types/user.ts
new file mode 100644
index 0000000..22bf27d
--- /dev/null
+++ b/src/app/(with-header-sidebar)/mydashboard/types/user.ts
@@ -0,0 +1,8 @@
+export interface User {
+  id: number;
+  email: string;
+  nickname: string;
+  profileImageUrl: string | null;
+  createdAt: string;
+  updatedAt?: string;
+}
diff --git a/src/app/(with-header-sidebar)/mydashboard/utils/axiosInstance.ts b/src/app/(with-header-sidebar)/mydashboard/utils/axiosInstance.ts
new file mode 100644
index 0000000..6769a29
--- /dev/null
+++ b/src/app/(with-header-sidebar)/mydashboard/utils/axiosInstance.ts
@@ -0,0 +1,31 @@
+import axios, { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
+import { BASE_URL } from '@/constants/urls';
+
+const axiosInstance: AxiosInstance = axios.create({
+  baseURL: BASE_URL,
+  headers: {
+    'Content-Type': 'application/json',
+  },
+  timeout: 10000,
+});
+
+axiosInstance.interceptors.request.use(
+  (config) => {
+    const token = 'your-token-here'; // TODO: Add token
+    if (token) {
+      config.headers['Authorization'] = `Bearer ${token}`;
+    }
+    return config;
+  },
+  (error) => {
+    return Promise.reject(error);
+  }
+);
+
+export const apiCall = async <T>(
+  config: AxiosRequestConfig
+): Promise<AxiosResponse<T>> => {
+  return axiosInstance.request<T>(config);
+};
+
+export default axiosInstance;
diff --git a/src/app/reset.css b/src/app/reset.css
index 68c6765..55e1c49 100644
--- a/src/app/reset.css
+++ b/src/app/reset.css
@@ -7,6 +7,7 @@
 
 body {
   font-family: var(--font-pretendard), sans-serif;
+  height: 100vh;
 }
 
 ul,
diff --git a/src/components/Button.tsx b/src/components/Button.tsx
index cf832c9..62fe2d1 100644
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -8,10 +8,11 @@ interface ButtonProps extends ButtonHTMLAttributes<HTMLButtonElement> {
 export default function Button({
   className = '',
   children,
+  type = 'button',
   ...props
 }: PropsWithChildren<ButtonProps>) {
   return (
-    <button className={`${styles.button} ${className}`} {...props}>
+    <button type={type} className={`${styles.button} ${className}`} {...props}>
       {children}
     </button>
   );
diff --git a/src/components/Header.module.css b/src/components/Header.module.css
index 034074a..c646ab7 100644
--- a/src/components/Header.module.css
+++ b/src/components/Header.module.css
@@ -1,3 +1,3 @@
 .header {
-  color: skyblue;
+  border-bottom: 1px solid var(--gray-300);
 }
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index e4e0cf7..182e1a4 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -1,9 +1,20 @@
 'use client';
 import { usePathname } from 'next/navigation';
 import styles from './Header.module.css';
+import type { User } from '@/app/(with-header-sidebar)/mydashboard/types/user';
+
+const user: User = {
+  id: 1,
+  email: 'heejin@gmail.com',
+  nickname: 'heejin',
+  profileImageUrl: null,
+  createdAt: '2024-11-15T14:29:07.482Z',
+};
 
 export default function Header() {
   const pathname = usePathname();
 
-  return <header className={styles.header}>헤더 {pathname}</header>;
+  const { nickname, profileImageUrl } = user;
+
+  return <header className={styles.header}>내 대시보드</header>;
 }
diff --git a/src/components/MainContainer.module.css b/src/components/MainContainer.module.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/components/MainContainer.tsx b/src/components/MainContainer.tsx
new file mode 100644
index 0000000..4bc323d
--- /dev/null
+++ b/src/components/MainContainer.tsx
@@ -0,0 +1,12 @@
+import { ReactNode } from 'react';
+import styles from './MainContainer.module.css';
+import Header from './Header';
+
+export default function MainContainer({ children }: { children: ReactNode }) {
+  return (
+    <>
+      <Header />
+      <main>{children}</main>
+    </>
+  );
+}
diff --git a/src/components/SideBar.module.css b/src/components/SideBar.module.css
index 4b8c8dd..9d6700a 100644
--- a/src/components/SideBar.module.css
+++ b/src/components/SideBar.module.css
@@ -1,3 +1,13 @@
+.sideBar {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+
+.button {
+  background-color: transparent !important;
+}
+
 .active {
   color: salmon;
 }
diff --git a/src/components/SideBar.tsx b/src/components/SideBar.tsx
index fe709f6..54fb51c 100644
--- a/src/components/SideBar.tsx
+++ b/src/components/SideBar.tsx
@@ -3,23 +3,52 @@
 import Link from 'next/link';
 import { usePathname } from 'next/navigation';
 import styles from './SideBar.module.css';
+import Image from 'next/image';
+import Button from './Button';
+import useWindowSize from '@/app/(with-header-sidebar)/mydashboard/hooks/useWindowSize';
 
 export default function SideBar() {
   const pathname = usePathname();
+  const { isMobile } = useWindowSize();
 
   return (
-    <div>
+    <div className={styles.sideBar}>
+      <Button aria-label="홈페이지 이동" className={styles.button}>
+        {isMobile ? (
+          <Image
+            src="/images/logo_small.svg"
+            alt="로고 홈페이지이동"
+            width={24}
+            height={27}
+          />
+        ) : (
+          <Image
+            src="/images/logo_large.svg"
+            alt="로고 홈페이지이동"
+            width={109}
+            height={33}
+          />
+        )}
+      </Button>
+      <Button aria-label="대시보드 추가하기" className={styles.button}>
+        <Image
+          src="/icons/add_box.svg"
+          alt="대시보드 추가하기"
+          width={20}
+          height={20}
+        />
+      </Button>
       <Link
         href={'/dashboard/1'}
         className={`link ${pathname === '/dashboard/1' ? styles.active : ''}`}
       >
-        대시보드1
+        O
       </Link>
       <Link
         href={'/dashboard/2'}
         className={`link ${pathname === '/dashboard/2' ? styles.active : ''}`}
       >
-        대시보드2
+        O
       </Link>
     </div>
   );
diff --git a/src/constants/urls.ts b/src/constants/urls.ts
index 4b8b014..668089a 100644
--- a/src/constants/urls.ts
+++ b/src/constants/urls.ts
@@ -1,4 +1,4 @@
-const BASE_URL = 'https://sp-taskify-api.vercel.app/10-1';
+export const BASE_URL = 'https://sp-taskify-api.vercel.app/10-1';
 
 export const AUTH_URL = `${BASE_URL}/auth`;
 export const CARD_URL = `${BASE_URL}/cards`;

From 5d7f72c62fdfead4f36f1ccb75ac71a6d686af8e Mon Sep 17 00:00:00 2001
From: heejin <dlwlrgkwk82@gmail.com>
Date: Sat, 16 Nov 2024 20:13:09 +0900
Subject: [PATCH 02/11] =?UTF-8?q?=F0=9F=8D=B1=20style:=20add=20favicon=20a?=
 =?UTF-8?q?nd=20title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/favicon.ico | Bin 25931 -> 8254 bytes
 src/app/layout.tsx  |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/favicon.ico b/src/app/favicon.ico
index 718d6fea4835ec2d246af9800eddb7ffb276240c..ac28f4a2ed56885a6ad7c030321ef4e8ed50c6ec 100644
GIT binary patch
literal 8254
zcmeHKYitx%6kdFxfCwsRwMrGDr6P8jxwGAEYu3b|HGs6;JJanWX$(RA(V&UphmowJ
z{_qj;7skYdn3za>5q}60MI=Urq!mlo?#|q8w+|`x(HJ8de6HU&wq~>0+UY|Q<Fq+@
z-}gJ`yXT&JCJ>m1|FW_G{>lR7D3_yF?zRGfC`ydt7k_2$?|<^g4$G^RVcubD@tTZi
zil|UaMY{T)i*td*IkPdy)|(AVMmMYbg?VeXs;O*5+q$4|Po-Ha9o=jk(c+hnXd4%#
z4C@BAZ9~>8y(v1ek6U6+;rhwi{kpudKNP>BPm`CZpj_ruS*sl(D>LENRio?M7AD5+
z%SPKT?A01d((4-6D!no2&WTuSRK!|o>*npY5vx63xp~PzZEMMZA+O_}lVRrf_v+S~
z{z$`$u~5rmVkIl&qHJaRl60`?DkU0k%7o0@(%4Vcb<8K%#7KtarQm-tb?Vf%o=?1N
zI9{%5<uX-QH=q1)EFWjG`iYyHmy&y1SR#K8^td2p)L+&cY*+!jRcY|#tg}{A7wVWl
zm%hRAFGDS*xoGsf{4p=}tQIf-%co=oaSPWZqjFIuQono%oM7HHlob4=4?aN2fJ6F6
z{&^Md@lWmHu)GL96jZuwBZoOD&n-4ThpS9}2Wy&_4rr|<@R@5Vtn)mIt?}B2^`(ws
zZJ_kPKCkQMYTjX-+xQ)S689=jK6w_jd9E;~+K0aA2=gJOo4cUHc4frFUj2Bgy}gXn
z4;X_ST|SLFy$|J!DMN-C8@#Na?Ht}^-Y;N3sD#`Lf7}l~UO~BucYe0}dtDE^pRk2_
z2<Py!t;<weH{amhNLO!~b-eeYgRRG&gANCkupWaSbRpIz(S99edk^9&ebvi8Go9mT
zau4iPwBHfd9$+5@4+D^HoX1Yvux|M`b%33_f!PPV1F-)o)Q_WY4E0{<^&|CBy7d5K
zPA)OK_qP~F@V)yX`{9S3wk8h&_Xs#~fO{JFohVO2w=u{uoKXwoMzMWn+Q+v5m@fe5
zd*FVG@<Yfm^eG7Ys0;b|1#-$gCnL6Drg(+xkV9PWh}ceG{0zJva6gRtd*mGF{{?La
z4?h9-cW`tX<4MT#PE})QF5(sUa5VEiV4eY1C-(jd_3n%?9|zvU<7bdV-*335r!f94
z`UcQG2>o`DKjssKc1@?95%Nyhegu1x`=k=&0dW8^8F}EN=<A030bKgyAY_=Fpd5mH
zgt^Z!FJnxd4(`NUH{TF)8|;4x_8rE4pF`fYndcxcLf<yvbV1IbJ`5gg=z9|FA0S_&
z?-N%CVQysJHnFeQa&&FmLh1ngHu(5n*l**!doqT(nYoAxHIxD`4y-qER}R=hevI}Y
z=8ph74e7xc;+FaLOz%hz?*a2r#3054aBL1ik7pTwXb1g-xf{;Pa`f1C=zv&d_L2{m
z16_Ux4o1;_A2Bt7I9@#+|K!`x`LH{IeY@a$C$QhEhzT|MJo0T~&Z0uH0^>U{Zy$I-
z%rb{i@;rWpj6nC-QX&?a?t5zMRvkFp4L!ObA0RhbpN~IL&joVx{?6qLYm3X9kZ%E-
zKKz+0xTk%(c~@4*D<{@XRq`&WkaagWcn9*0t;M!@;gNYHzgIFLsqs6-F=8FyWEXP0
z4u!m8I(NhUMiEv6Y&hy@u}7GTPo?){<J8^FVezdp*_>ki{I1|PU`mhO%lJ@i&e`bW
tdo$N>&e_o0$M6~O8SokK8SokK8SokK8SokK8SokK8SokK8TfxP@F!gr$7BEi

literal 25931
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
LrJugUA?W`A8`#=m

diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 540ff9d..8535599 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -11,8 +11,8 @@ const pretendard = localFont({
 });
 
 export const metadata: Metadata = {
-  title: 'Create Next App',
-  description: 'Generated by create next app',
+  title: 'Taskify',
+  description: 'Task management application',
 };
 
 export default function RootLayout({

From d34e36fcc56b90aaa283081e431e17c1d5e50a27 Mon Sep 17 00:00:00 2001
From: heejin <dlwlrgkwk82@gmail.com>
Date: Sat, 16 Nov 2024 20:19:30 +0900
Subject: [PATCH 03/11] =?UTF-8?q?=F0=9F=92=84=20style:=20add=20header=20bu?=
 =?UTF-8?q?tton=20css?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mydashboard/hooks/useApi.ts               | 17 +++++----
 .../mydashboard/hooks/useWindowSize.ts        |  2 +-
 src/components/Button.module.css              |  1 +
 src/components/Header.module.css              | 35 +++++++++++++++++++
 src/components/Header.tsx                     | 25 +++++++++++--
 src/components/SideBar.module.css             |  2 +-
 src/components/SideBar.tsx                    |  2 +-
 7 files changed, 71 insertions(+), 13 deletions(-)

diff --git a/src/app/(with-header-sidebar)/mydashboard/hooks/useApi.ts b/src/app/(with-header-sidebar)/mydashboard/hooks/useApi.ts
index 3af9bdc..45b8381 100644
--- a/src/app/(with-header-sidebar)/mydashboard/hooks/useApi.ts
+++ b/src/app/(with-header-sidebar)/mydashboard/hooks/useApi.ts
@@ -31,15 +31,18 @@ export default function useApi<
   const [error, setError] = useState<AxiosError | null>(null);
 
   const fetchData = useCallback(async () => {
+    // TODO if (loading) return; add?
     setLoading(true);
+    setError(null);
+
+    const config = {
+      method: options.method,
+      url,
+      params: options.params,
+      data: options.body,
+    };
 
     try {
-      const config = {
-        method: options.method,
-        url,
-        params: options.params,
-        data: options.body,
-      };
       const response: AxiosResponse<T> = await axiosInstance.request(config);
       setData(response.data);
     } catch (err) {
@@ -47,7 +50,7 @@ export default function useApi<
     } finally {
       setLoading(false);
     }
-  }, [url, options]);
+  }, [url, options.method, options.params, options.body]);
 
   useEffect(() => {
     fetchData();
diff --git a/src/app/(with-header-sidebar)/mydashboard/hooks/useWindowSize.ts b/src/app/(with-header-sidebar)/mydashboard/hooks/useWindowSize.ts
index d7b6aaa..10a6e90 100644
--- a/src/app/(with-header-sidebar)/mydashboard/hooks/useWindowSize.ts
+++ b/src/app/(with-header-sidebar)/mydashboard/hooks/useWindowSize.ts
@@ -18,7 +18,7 @@ export default function useWindowSize(): WindowSize {
       setWindowSize({
         width: window.innerWidth,
         height: window.innerHeight,
-        isMobile: window.innerWidth <= 768,
+        isMobile: window.innerWidth < 768,
       });
     }
 
diff --git a/src/components/Button.module.css b/src/components/Button.module.css
index 9d5de36..2c0dc85 100644
--- a/src/components/Button.module.css
+++ b/src/components/Button.module.css
@@ -5,6 +5,7 @@
   font-size: 14px;
   font-weight: 600;
   color: var(--white);
+  white-space: nowrap;
 }
 
 .button:disabled {
diff --git a/src/components/Header.module.css b/src/components/Header.module.css
index c646ab7..2d31087 100644
--- a/src/components/Header.module.css
+++ b/src/components/Header.module.css
@@ -1,3 +1,38 @@
 .header {
+  padding: 16px;
   border-bottom: 1px solid var(--gray-300);
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+  gap: 16px;
+}
+
+.title {
+  flex: 1;
+  color: var(--black-100);
+  font-size: 16px;
+  font-weight: 700;
+}
+
+.buttonContainer {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 6px;
+}
+
+.button {
+  padding: 6px 12px;
+  background-color: transparent;
+  border-radius: 6px;
+  border: 1px solid var(--gray-300);
+  color: var(---gray-500);
+  font-size: 14px;
+  font-weight: 500;
+}
+
+@media screen and (min-width: 768px) {
+  .buttonContainer {
+    gap: 16px;
+  }
 }
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index 182e1a4..e0b0bb2 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -1,7 +1,8 @@
 'use client';
 import { usePathname } from 'next/navigation';
-import styles from './Header.module.css';
 import type { User } from '@/app/(with-header-sidebar)/mydashboard/types/user';
+import Button from './Button';
+import styles from './Header.module.css';
 
 const user: User = {
   id: 1,
@@ -11,10 +12,28 @@ const user: User = {
   createdAt: '2024-11-15T14:29:07.482Z',
 };
 
-export default function Header() {
+interface HeaderProps {
+  component: React.ComponentType;
+}
+
+export default function Header({ component: Component }: HeaderProps) {
   const pathname = usePathname();
 
   const { nickname, profileImageUrl } = user;
 
-  return <header className={styles.header}>내 대시보드</header>;
+  return (
+    <header className={styles.header}>
+      <span className={styles.title}>나의 대시보드</span>
+      <div className={styles.buttonContainer}>
+        <Button className={styles.button}>관리</Button>
+        <Button className={styles.button}>초대하기</Button>
+      </div>
+      {Component && (
+        <div>
+          <Component />
+        </div>
+      )}
+      <div>userInfo</div>
+    </header>
+  );
 }
diff --git a/src/components/SideBar.module.css b/src/components/SideBar.module.css
index 9d6700a..51a7cce 100644
--- a/src/components/SideBar.module.css
+++ b/src/components/SideBar.module.css
@@ -5,7 +5,7 @@
 }
 
 .button {
-  background-color: transparent !important;
+  background-color: transparent;
 }
 
 .active {
diff --git a/src/components/SideBar.tsx b/src/components/SideBar.tsx
index 54fb51c..bb6e058 100644
--- a/src/components/SideBar.tsx
+++ b/src/components/SideBar.tsx
@@ -2,10 +2,10 @@
 
 import Link from 'next/link';
 import { usePathname } from 'next/navigation';
-import styles from './SideBar.module.css';
 import Image from 'next/image';
 import Button from './Button';
 import useWindowSize from '@/app/(with-header-sidebar)/mydashboard/hooks/useWindowSize';
+import styles from './SideBar.module.css';
 
 export default function SideBar() {
   const pathname = usePathname();

From c4311a76b4ecc07569438402aeae1d94430d1a2d Mon Sep 17 00:00:00 2001
From: heejin <dlwlrgkwk82@gmail.com>
Date: Sat, 16 Nov 2024 20:35:24 +0900
Subject: [PATCH 04/11] =?UTF-8?q?=F0=9F=92=84=20style:=20add=20header=20bu?=
 =?UTF-8?q?tton=20icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Header.module.css | 18 +++++++++++++++++-
 src/components/Header.tsx        | 27 +++++++++++++++++++++++++--
 2 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/src/components/Header.module.css b/src/components/Header.module.css
index 2d31087..969ad05 100644
--- a/src/components/Header.module.css
+++ b/src/components/Header.module.css
@@ -23,16 +23,32 @@
 
 .button {
   padding: 6px 12px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
   background-color: transparent;
   border-radius: 6px;
   border: 1px solid var(--gray-300);
-  color: var(---gray-500);
+  color: var(--gray-500);
   font-size: 14px;
   font-weight: 500;
 }
 
 @media screen and (min-width: 768px) {
+  .header {
+    padding-left: 40px;
+  }
+
+  .title {
+    font-size: 20px;
+  }
+
   .buttonContainer {
     gap: 16px;
   }
+
+  .button {
+    padding: 10px 16px;
+    font-size: 16px;
+  }
 }
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index e0b0bb2..308cc37 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -1,7 +1,9 @@
 'use client';
 import { usePathname } from 'next/navigation';
 import type { User } from '@/app/(with-header-sidebar)/mydashboard/types/user';
+import Image from 'next/image';
 import Button from './Button';
+import useWindowSize from '@/app/(with-header-sidebar)/mydashboard/hooks/useWindowSize';
 import styles from './Header.module.css';
 
 const user: User = {
@@ -18,6 +20,7 @@ interface HeaderProps {
 
 export default function Header({ component: Component }: HeaderProps) {
   const pathname = usePathname();
+  const { isMobile } = useWindowSize();
 
   const { nickname, profileImageUrl } = user;
 
@@ -25,8 +28,28 @@ export default function Header({ component: Component }: HeaderProps) {
     <header className={styles.header}>
       <span className={styles.title}>나의 대시보드</span>
       <div className={styles.buttonContainer}>
-        <Button className={styles.button}>관리</Button>
-        <Button className={styles.button}>초대하기</Button>
+        <Button className={styles.button}>
+          {!isMobile && (
+            <Image
+              src="/icons/settings.svg"
+              alt="관리"
+              width={20}
+              height={20}
+            />
+          )}
+          관리
+        </Button>
+        <Button className={styles.button}>
+          {!isMobile && (
+            <Image
+              src="/icons/add_box.svg"
+              alt="초대하기"
+              width={20}
+              height={20}
+            />
+          )}
+          초대하기
+        </Button>
       </div>
       {Component && (
         <div>

From ab405fc00e0472ecc605d1a8fe174db3c448c350 Mon Sep 17 00:00:00 2001
From: heejin <dlwlrgkwk82@gmail.com>
Date: Sat, 16 Nov 2024 22:39:54 +0900
Subject: [PATCH 05/11] =?UTF-8?q?=E2=9C=A8=20feat:=20add=20userInfo=20comp?=
 =?UTF-8?q?onent=20with=20skeleton?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 next.config.ts                                |  6 +-
 .../dashboard/[id]/page.tsx                   |  3 +
 src/components/Header.module.css              | 37 +++++++++
 src/components/Header.tsx                     | 52 +++++--------
 src/components/SideBar.module.css             |  6 ++
 src/components/UserInfo.module.css            | 25 ++++++
 src/components/UserInfo.tsx                   | 76 +++++++++++++++++++
 .../skeleton/UserInfoSkeleton.module.css      | 23 ++++++
 src/components/skeleton/UserInfoSkeleton.tsx  | 10 +++
 9 files changed, 205 insertions(+), 33 deletions(-)
 create mode 100644 src/app/(with-header-sidebar)/dashboard/[id]/page.tsx
 create mode 100644 src/components/UserInfo.module.css
 create mode 100644 src/components/UserInfo.tsx
 create mode 100644 src/components/skeleton/UserInfoSkeleton.module.css
 create mode 100644 src/components/skeleton/UserInfoSkeleton.tsx

diff --git a/next.config.ts b/next.config.ts
index e9ffa30..0ccb075 100644
--- a/next.config.ts
+++ b/next.config.ts
@@ -1,7 +1,9 @@
-import type { NextConfig } from "next";
+import type { NextConfig } from 'next';
 
 const nextConfig: NextConfig = {
-  /* config options here */
+  images: {
+    domains: ['sprint-fe-project.s3.ap-northeast-2.amazonaws.com'],
+  },
 };
 
 export default nextConfig;
diff --git a/src/app/(with-header-sidebar)/dashboard/[id]/page.tsx b/src/app/(with-header-sidebar)/dashboard/[id]/page.tsx
new file mode 100644
index 0000000..9ea98f6
--- /dev/null
+++ b/src/app/(with-header-sidebar)/dashboard/[id]/page.tsx
@@ -0,0 +1,3 @@
+export default function Page() {
+  return <div>dashboard page</div>;
+}
diff --git a/src/components/Header.module.css b/src/components/Header.module.css
index 969ad05..ea977d4 100644
--- a/src/components/Header.module.css
+++ b/src/components/Header.module.css
@@ -34,9 +34,32 @@
   font-weight: 500;
 }
 
+.icon {
+  display: none;
+}
+
+.userInfoContainer {
+  display: flex;
+  align-items: center;
+}
+
+.userInfoContainer::before {
+  content: '';
+  border: 0.5px solid var(--gray-300);
+  height: 34px;
+}
+
+.userInfoWrapper {
+  margin-left: 16px;
+  display: flex;
+  align-items: center;
+}
+
 @media screen and (min-width: 768px) {
   .header {
     padding-left: 40px;
+    padding-right: 30px;
+    gap: 36px;
   }
 
   .title {
@@ -51,4 +74,18 @@
     padding: 10px 16px;
     font-size: 16px;
   }
+
+  .userInfoWrapper {
+    margin-left: 36px;
+  }
+}
+
+@media screen and (min-width: 1199px) {
+  .header {
+    padding-right: 80px;
+  }
+
+  .icon {
+    display: block;
+  }
 }
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index 308cc37..ef44bfa 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -1,53 +1,39 @@
 'use client';
 import { usePathname } from 'next/navigation';
-import type { User } from '@/app/(with-header-sidebar)/mydashboard/types/user';
 import Image from 'next/image';
 import Button from './Button';
-import useWindowSize from '@/app/(with-header-sidebar)/mydashboard/hooks/useWindowSize';
+import UserInfo from './UserInfo';
 import styles from './Header.module.css';
 
-const user: User = {
-  id: 1,
-  email: 'heejin@gmail.com',
-  nickname: 'heejin',
-  profileImageUrl: null,
-  createdAt: '2024-11-15T14:29:07.482Z',
-};
-
 interface HeaderProps {
   component: React.ComponentType;
 }
 
 export default function Header({ component: Component }: HeaderProps) {
   const pathname = usePathname();
-  const { isMobile } = useWindowSize();
-
-  const { nickname, profileImageUrl } = user;
 
   return (
     <header className={styles.header}>
-      <span className={styles.title}>나의 대시보드</span>
+      <span className={styles.title}>내 대시보드</span>
       <div className={styles.buttonContainer}>
         <Button className={styles.button}>
-          {!isMobile && (
-            <Image
-              src="/icons/settings.svg"
-              alt="관리"
-              width={20}
-              height={20}
-            />
-          )}
+          <Image
+            src="/icons/settings.svg"
+            alt="관리"
+            width={20}
+            height={20}
+            className={styles.icon}
+          />
           관리
         </Button>
         <Button className={styles.button}>
-          {!isMobile && (
-            <Image
-              src="/icons/add_box.svg"
-              alt="초대하기"
-              width={20}
-              height={20}
-            />
-          )}
+          <Image
+            src="/icons/add_box.svg"
+            alt="초대하기"
+            width={20}
+            height={20}
+            className={styles.icon}
+          />
           초대하기
         </Button>
       </div>
@@ -56,7 +42,11 @@ export default function Header({ component: Component }: HeaderProps) {
           <Component />
         </div>
       )}
-      <div>userInfo</div>
+      <div className={styles.userInfoContainer}>
+        <div className={styles.userInfoWrapper}>
+          <UserInfo />
+        </div>
+      </div>
     </header>
   );
 }
diff --git a/src/components/SideBar.module.css b/src/components/SideBar.module.css
index 51a7cce..5b07566 100644
--- a/src/components/SideBar.module.css
+++ b/src/components/SideBar.module.css
@@ -11,3 +11,9 @@
 .active {
   color: salmon;
 }
+
+@media screen and (min-width: 768px) {
+  .sideBar {
+    min-width: 155px;
+  }
+}
diff --git a/src/components/UserInfo.module.css b/src/components/UserInfo.module.css
new file mode 100644
index 0000000..19bd968
--- /dev/null
+++ b/src/components/UserInfo.module.css
@@ -0,0 +1,25 @@
+.image {
+  border-radius: 50%;
+  object-fit: cover;
+}
+
+.userInfo {
+  display: flex;
+  align-items: center;
+  gap: 15px;
+}
+
+.userIcon {
+  width: 30px;
+  height: 30px;
+  border-radius: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.nickname {
+  color: var(--black-100);
+  font-size: 16px;
+  font-weight: 500;
+}
diff --git a/src/components/UserInfo.tsx b/src/components/UserInfo.tsx
new file mode 100644
index 0000000..f51e6ef
--- /dev/null
+++ b/src/components/UserInfo.tsx
@@ -0,0 +1,76 @@
+'use client';
+
+import type { User } from '@/app/(with-header-sidebar)/mydashboard/types/user';
+import styles from './UserInfo.module.css';
+import Image from 'next/image';
+import useWindowSize from '@/app/(with-header-sidebar)/mydashboard/hooks/useWindowSize';
+import { useState, useEffect } from 'react';
+import UserInfoSkeleton from './skeleton/UserInfoSkeleton';
+
+const user: User = {
+  id: 1,
+  email: 'heejin@gmail.com',
+  nickname: 'heejin',
+  // profileImageUrl:
+  // 'https://sprint-fe-project.s3.ap-northeast-2.amazonaws.com/taskify/profile_image/10-1_4804_1731757528194.jpeg',
+  profileImageUrl: null,
+  createdAt: '2024-11-15T14:29:07.482Z',
+};
+
+export default function UserInfo() {
+  const { email, nickname, profileImageUrl } = user;
+  const { isMobile } = useWindowSize();
+
+  const [colors, setColors] = useState<{
+    randomColor: string;
+    invertedColor: string;
+  } | null>(null);
+
+  useEffect(() => {
+    const { randomColor, invertedColor } = getRandomColor();
+    setColors({ randomColor, invertedColor });
+  }, []);
+
+  if (!colors) {
+    return <UserInfoSkeleton />;
+  }
+
+  return (
+    <>
+      {profileImageUrl ? (
+        <Image
+          src={profileImageUrl}
+          alt="프로필 이미지"
+          width={30}
+          height={30}
+          className={styles.image}
+        />
+      ) : (
+        <div className={styles.userInfo}>
+          <div
+            style={{
+              backgroundColor: colors.randomColor,
+              color: colors.invertedColor,
+            }}
+            className={styles.userIcon}
+          >
+            <span>{email[0].toUpperCase()}</span>
+          </div>
+          {!isMobile && <span className={styles.nickname}>{nickname}</span>}
+        </div>
+      )}
+    </>
+  );
+}
+
+function getRandomColor() {
+  const randomColor = `#${Math.floor(Math.random() * 16777215).toString(16)}`;
+
+  const r = parseInt(randomColor.slice(1, 3), 16);
+  const g = parseInt(randomColor.slice(3, 5), 16);
+  const b = parseInt(randomColor.slice(5, 7), 16);
+
+  const invertedColor = `rgb(${255 - r}, ${255 - g}, ${255 - b})`;
+
+  return { randomColor, invertedColor };
+}
diff --git a/src/components/skeleton/UserInfoSkeleton.module.css b/src/components/skeleton/UserInfoSkeleton.module.css
new file mode 100644
index 0000000..4afea0f
--- /dev/null
+++ b/src/components/skeleton/UserInfoSkeleton.module.css
@@ -0,0 +1,23 @@
+.userIcon {
+  width: 30px;
+  height: 30px;
+  border-radius: 50%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: var(--gray-300);
+}
+
+@media screen and (min-width: 768px) {
+  .userInfo {
+    display: flex;
+    align-items: center;
+    gap: 15px;
+  }
+
+  .nickname {
+    background-color: var(--gray-300);
+    width: 45px;
+    height: 20px;
+  }
+}
diff --git a/src/components/skeleton/UserInfoSkeleton.tsx b/src/components/skeleton/UserInfoSkeleton.tsx
new file mode 100644
index 0000000..c12ab80
--- /dev/null
+++ b/src/components/skeleton/UserInfoSkeleton.tsx
@@ -0,0 +1,10 @@
+import styles from './UserInfoSkeleton.module.css';
+
+export default function UserInfoSkeleton() {
+  return (
+    <div className={styles.userInfo}>
+      <div className={styles.userIcon} />
+      <span className={styles.nickname}></span>
+    </div>
+  );
+}

From 5f459ee225f435b1d68d9d2ba5ba3835d8edf88a Mon Sep 17 00:00:00 2001
From: heejin <dlwlrgkwk82@gmail.com>
Date: Sat, 16 Nov 2024 23:40:57 +0900
Subject: [PATCH 06/11] =?UTF-8?q?=F0=9F=92=84=20style:=20add=20sidebar=20d?=
 =?UTF-8?q?ashboard=20span?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Header.tsx         |  2 +-
 src/components/SideBar.module.css | 40 ++++++++++++++++++++++++-
 src/components/SideBar.tsx        | 49 ++++++++++++++++++-------------
 src/components/UserInfo.tsx       |  2 +-
 4 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index ef44bfa..2702660 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -14,7 +14,7 @@ export default function Header({ component: Component }: HeaderProps) {
 
   return (
     <header className={styles.header}>
-      <span className={styles.title}>내 대시보드</span>
+      <h2 className={styles.title}>내 대시보드</h2>
       <div className={styles.buttonContainer}>
         <Button className={styles.button}>
           <Image
diff --git a/src/components/SideBar.module.css b/src/components/SideBar.module.css
index 5b07566..e87ac20 100644
--- a/src/components/SideBar.module.css
+++ b/src/components/SideBar.module.css
@@ -2,10 +2,35 @@
   display: flex;
   flex-direction: column;
   align-items: center;
+  gap: 30px;
 }
 
-.button {
+.logo {
   background-color: transparent;
+  text-align: left;
+}
+
+.dashBoardsContainer {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+}
+
+.addDashBoardsTitle {
+  display: none;
+}
+
+.addButton {
+  background-color: transparent;
+  width: 20px;
+}
+
+.dashboardsContainer {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  gap: 6px;
 }
 
 .active {
@@ -16,4 +41,17 @@
   .sideBar {
     min-width: 155px;
   }
+
+  .addDashBoardsTitle {
+    display: inline;
+    color: var(--gray-500);
+    font-size: 12px;
+    font-weight: 600;
+  }
+}
+
+@media screen and (min-width: 1199px) {
+  .sideBar {
+    min-width: 300px;
+  }
 }
diff --git a/src/components/SideBar.tsx b/src/components/SideBar.tsx
index bb6e058..5384ce7 100644
--- a/src/components/SideBar.tsx
+++ b/src/components/SideBar.tsx
@@ -13,13 +13,14 @@ export default function SideBar() {
 
   return (
     <div className={styles.sideBar}>
-      <Button aria-label="홈페이지 이동" className={styles.button}>
+      <Button aria-label="홈페이지 이동" className={styles.logo}>
         {isMobile ? (
           <Image
             src="/images/logo_small.svg"
             alt="로고 홈페이지이동"
             width={24}
             height={27}
+            priority
           />
         ) : (
           <Image
@@ -27,29 +28,35 @@ export default function SideBar() {
             alt="로고 홈페이지이동"
             width={109}
             height={33}
+            priority
           />
         )}
       </Button>
-      <Button aria-label="대시보드 추가하기" className={styles.button}>
-        <Image
-          src="/icons/add_box.svg"
-          alt="대시보드 추가하기"
-          width={20}
-          height={20}
-        />
-      </Button>
-      <Link
-        href={'/dashboard/1'}
-        className={`link ${pathname === '/dashboard/1' ? styles.active : ''}`}
-      >
-        O
-      </Link>
-      <Link
-        href={'/dashboard/2'}
-        className={`link ${pathname === '/dashboard/2' ? styles.active : ''}`}
-      >
-        O
-      </Link>
+      <div className={styles.dashBoardsContainer}>
+        <span className={styles.addDashBoardsTitle}>Dash Boards</span>
+        <Button aria-label="대시보드 추가하기" className={styles.addButton}>
+          <Image
+            src="/icons/add_box.svg"
+            alt="대시보드 추가하기"
+            width={20}
+            height={20}
+          />
+        </Button>
+      </div>
+      <div className={styles.dashboardsContainer}>
+        <Link
+          href={'/dashboard/1'}
+          className={`link ${pathname === '/dashboard/1' ? styles.active : ''}`}
+        >
+          O
+        </Link>
+        <Link
+          href={'/dashboard/2'}
+          className={`link ${pathname === '/dashboard/2' ? styles.active : ''}`}
+        >
+          O
+        </Link>
+      </div>
     </div>
   );
 }
diff --git a/src/components/UserInfo.tsx b/src/components/UserInfo.tsx
index f51e6ef..1b573a1 100644
--- a/src/components/UserInfo.tsx
+++ b/src/components/UserInfo.tsx
@@ -1,11 +1,11 @@
 'use client';
 
 import type { User } from '@/app/(with-header-sidebar)/mydashboard/types/user';
-import styles from './UserInfo.module.css';
 import Image from 'next/image';
 import useWindowSize from '@/app/(with-header-sidebar)/mydashboard/hooks/useWindowSize';
 import { useState, useEffect } from 'react';
 import UserInfoSkeleton from './skeleton/UserInfoSkeleton';
+import styles from './UserInfo.module.css';
 
 const user: User = {
   id: 1,

From c3e80b236dd7fa6aaa9cbfdefeba520a630dfd4f Mon Sep 17 00:00:00 2001
From: heejin <dlwlrgkwk82@gmail.com>
Date: Sun, 17 Nov 2024 00:07:10 +0900
Subject: [PATCH 07/11] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20refactor:=20add=20he?=
 =?UTF-8?q?ader=20directory?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MainContainer.tsx                | 2 +-
 src/components/{ => header}/Header.module.css   | 0
 src/components/{ => header}/Header.tsx          | 4 ++--
 src/components/{ => header}/UserInfo.module.css | 0
 src/components/{ => header}/UserInfo.tsx        | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename src/components/{ => header}/Header.module.css (100%)
 rename src/components/{ => header}/Header.tsx (94%)
 rename src/components/{ => header}/UserInfo.module.css (100%)
 rename src/components/{ => header}/UserInfo.tsx (97%)

diff --git a/src/components/MainContainer.tsx b/src/components/MainContainer.tsx
index 4bc323d..edf065c 100644
--- a/src/components/MainContainer.tsx
+++ b/src/components/MainContainer.tsx
@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
+import Header from './header/Header';
 import styles from './MainContainer.module.css';
-import Header from './Header';
 
 export default function MainContainer({ children }: { children: ReactNode }) {
   return (
diff --git a/src/components/Header.module.css b/src/components/header/Header.module.css
similarity index 100%
rename from src/components/Header.module.css
rename to src/components/header/Header.module.css
diff --git a/src/components/Header.tsx b/src/components/header/Header.tsx
similarity index 94%
rename from src/components/Header.tsx
rename to src/components/header/Header.tsx
index 2702660..74024a7 100644
--- a/src/components/Header.tsx
+++ b/src/components/header/Header.tsx
@@ -1,12 +1,12 @@
 'use client';
 import { usePathname } from 'next/navigation';
 import Image from 'next/image';
-import Button from './Button';
+import Button from '../Button';
 import UserInfo from './UserInfo';
 import styles from './Header.module.css';
 
 interface HeaderProps {
-  component: React.ComponentType;
+  component?: React.ComponentType;
 }
 
 export default function Header({ component: Component }: HeaderProps) {
diff --git a/src/components/UserInfo.module.css b/src/components/header/UserInfo.module.css
similarity index 100%
rename from src/components/UserInfo.module.css
rename to src/components/header/UserInfo.module.css
diff --git a/src/components/UserInfo.tsx b/src/components/header/UserInfo.tsx
similarity index 97%
rename from src/components/UserInfo.tsx
rename to src/components/header/UserInfo.tsx
index 1b573a1..bb306d7 100644
--- a/src/components/UserInfo.tsx
+++ b/src/components/header/UserInfo.tsx
@@ -4,7 +4,7 @@ import type { User } from '@/app/(with-header-sidebar)/mydashboard/types/user';
 import Image from 'next/image';
 import useWindowSize from '@/app/(with-header-sidebar)/mydashboard/hooks/useWindowSize';
 import { useState, useEffect } from 'react';
-import UserInfoSkeleton from './skeleton/UserInfoSkeleton';
+import UserInfoSkeleton from '../skeleton/UserInfoSkeleton';
 import styles from './UserInfo.module.css';
 
 const user: User = {

From 1f9ab1119b42f475348dca4a0aa288a1050f6631 Mon Sep 17 00:00:00 2001
From: heejin <dlwlrgkwk82@gmail.com>
Date: Sun, 17 Nov 2024 01:55:31 +0900
Subject: [PATCH 08/11] =?UTF-8?q?=F0=9F=8E=A8=20chore:=20add=20sidebar=20d?=
 =?UTF-8?q?irectory?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/(with-header-sidebar)/layout.tsx      |  2 +-
 .../mydashboard/types/dashboards.ts           |  6 ++---
 .../mydashboard/utils/axiosInstance.ts        |  3 ++-
 .../{ => sidebar}/SideBar.module.css          | 13 +----------
 src/components/{ => sidebar}/SideBar.tsx      | 23 ++++---------------
 5 files changed, 11 insertions(+), 36 deletions(-)
 rename src/components/{ => sidebar}/SideBar.module.css (79%)
 rename src/components/{ => sidebar}/SideBar.tsx (66%)

diff --git a/src/app/(with-header-sidebar)/layout.tsx b/src/app/(with-header-sidebar)/layout.tsx
index de9f3fb..ec7f6db 100644
--- a/src/app/(with-header-sidebar)/layout.tsx
+++ b/src/app/(with-header-sidebar)/layout.tsx
@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import SideBar from '@/components/SideBar';
+import SideBar from '@/components/sidebar/SideBar';
 import styles from './layout.module.css';
 import MainContainer from '@/components/MainContainer';
 
diff --git a/src/app/(with-header-sidebar)/mydashboard/types/dashboards.ts b/src/app/(with-header-sidebar)/mydashboard/types/dashboards.ts
index 1d4f881..6d243ef 100644
--- a/src/app/(with-header-sidebar)/mydashboard/types/dashboards.ts
+++ b/src/app/(with-header-sidebar)/mydashboard/types/dashboards.ts
@@ -1,4 +1,4 @@
-interface Dashboard {
+export interface Dashboard {
   id: number;
   title: string;
   color: string;
@@ -8,14 +8,14 @@ interface Dashboard {
   createdByMe: boolean;
 }
 
-interface GetDashboardsRequestParams {
+export interface GetDashboardsRequestParams {
   navigationMethod: 'infiniteScroll' | 'pagination';
   cursorId?: number;
   page?: number;
   size?: number;
 }
 
-interface GetDashboardsResponse {
+export interface GetDashboardsResponse {
   dashboards: Dashboard[];
   totalCount: number;
   cursorId: number | null;
diff --git a/src/app/(with-header-sidebar)/mydashboard/utils/axiosInstance.ts b/src/app/(with-header-sidebar)/mydashboard/utils/axiosInstance.ts
index 6769a29..bbf84ce 100644
--- a/src/app/(with-header-sidebar)/mydashboard/utils/axiosInstance.ts
+++ b/src/app/(with-header-sidebar)/mydashboard/utils/axiosInstance.ts
@@ -11,7 +11,8 @@ const axiosInstance: AxiosInstance = axios.create({
 
 axiosInstance.interceptors.request.use(
   (config) => {
-    const token = 'your-token-here'; // TODO: Add token
+    const token =
+      'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6NDgwNCwidGVhbUlkIjoiMTAtMSIsImlhdCI6MTczMTcyMzkwNywiaXNzIjoic3AtdGFza2lmeSJ9.k8FqEAl7DbhwxhJNAkkMq8lYrgStN-9I3xrsR0cYm2c'; // TODO: Add token
     if (token) {
       config.headers['Authorization'] = `Bearer ${token}`;
     }
diff --git a/src/components/SideBar.module.css b/src/components/sidebar/SideBar.module.css
similarity index 79%
rename from src/components/SideBar.module.css
rename to src/components/sidebar/SideBar.module.css
index e87ac20..7221a2e 100644
--- a/src/components/SideBar.module.css
+++ b/src/components/sidebar/SideBar.module.css
@@ -10,7 +10,7 @@
   text-align: left;
 }
 
-.dashBoardsContainer {
+.addDashBoardsContainer {
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -26,17 +26,6 @@
   width: 20px;
 }
 
-.dashboardsContainer {
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  gap: 6px;
-}
-
-.active {
-  color: salmon;
-}
-
 @media screen and (min-width: 768px) {
   .sideBar {
     min-width: 155px;
diff --git a/src/components/SideBar.tsx b/src/components/sidebar/SideBar.tsx
similarity index 66%
rename from src/components/SideBar.tsx
rename to src/components/sidebar/SideBar.tsx
index 5384ce7..60bf542 100644
--- a/src/components/SideBar.tsx
+++ b/src/components/sidebar/SideBar.tsx
@@ -1,14 +1,12 @@
 'use client';
 
-import Link from 'next/link';
-import { usePathname } from 'next/navigation';
 import Image from 'next/image';
-import Button from './Button';
+import Button from '../Button';
 import useWindowSize from '@/app/(with-header-sidebar)/mydashboard/hooks/useWindowSize';
+import Dashboards from './DashBoards';
 import styles from './SideBar.module.css';
 
 export default function SideBar() {
-  const pathname = usePathname();
   const { isMobile } = useWindowSize();
 
   return (
@@ -32,7 +30,7 @@ export default function SideBar() {
           />
         )}
       </Button>
-      <div className={styles.dashBoardsContainer}>
+      <div className={styles.addDashBoardsContainer}>
         <span className={styles.addDashBoardsTitle}>Dash Boards</span>
         <Button aria-label="대시보드 추가하기" className={styles.addButton}>
           <Image
@@ -43,20 +41,7 @@ export default function SideBar() {
           />
         </Button>
       </div>
-      <div className={styles.dashboardsContainer}>
-        <Link
-          href={'/dashboard/1'}
-          className={`link ${pathname === '/dashboard/1' ? styles.active : ''}`}
-        >
-          O
-        </Link>
-        <Link
-          href={'/dashboard/2'}
-          className={`link ${pathname === '/dashboard/2' ? styles.active : ''}`}
-        >
-          O
-        </Link>
-      </div>
+      <Dashboards />
     </div>
   );
 }

From ddc18c694977c9604ae4a846e85a322fdaeba612 Mon Sep 17 00:00:00 2001
From: heejin <dlwlrgkwk82@gmail.com>
Date: Sun, 17 Nov 2024 01:56:19 +0900
Subject: [PATCH 09/11] =?UTF-8?q?=E2=9C=A8=20feat:=20add=20call=20dashboar?=
 =?UTF-8?q?ds=20on=20sidebar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mydashboard/hooks/useApi.ts               |  2 +-
 src/components/sidebar/Dashboards.module.css  | 10 ++++++
 src/components/sidebar/Dashboards.tsx         | 31 +++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 src/components/sidebar/Dashboards.module.css
 create mode 100644 src/components/sidebar/Dashboards.tsx

diff --git a/src/app/(with-header-sidebar)/mydashboard/hooks/useApi.ts b/src/app/(with-header-sidebar)/mydashboard/hooks/useApi.ts
index 45b8381..ace4646 100644
--- a/src/app/(with-header-sidebar)/mydashboard/hooks/useApi.ts
+++ b/src/app/(with-header-sidebar)/mydashboard/hooks/useApi.ts
@@ -50,7 +50,7 @@ export default function useApi<
     } finally {
       setLoading(false);
     }
-  }, [url, options.method, options.params, options.body]);
+  }, [url, JSON.stringify(options)]);
 
   useEffect(() => {
     fetchData();
diff --git a/src/components/sidebar/Dashboards.module.css b/src/components/sidebar/Dashboards.module.css
new file mode 100644
index 0000000..ca35715
--- /dev/null
+++ b/src/components/sidebar/Dashboards.module.css
@@ -0,0 +1,10 @@
+.dashBoards {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  gap: 6px;
+}
+
+.active {
+  color: salmon;
+}
diff --git a/src/components/sidebar/Dashboards.tsx b/src/components/sidebar/Dashboards.tsx
new file mode 100644
index 0000000..528d82a
--- /dev/null
+++ b/src/components/sidebar/Dashboards.tsx
@@ -0,0 +1,31 @@
+import Link from 'next/link';
+import { usePathname } from 'next/navigation';
+import type { GetDashboardsResponse } from '@/app/(with-header-sidebar)/mydashboard/types/dashboards';
+import styles from './Dashboards.module.css';
+import useApi from '@/app/(with-header-sidebar)/mydashboard/hooks/useApi';
+
+export default function Dashboards() {
+  const pathname = usePathname();
+
+  const { data } = useApi<GetDashboardsResponse>('/dashboards', {
+    method: 'GET',
+    params: { navigationMethod: 'infiniteScroll', page: 1, size: 10 },
+  });
+
+  const dashboards = data?.dashboards;
+
+  return (
+    <div className={styles.dashBoards}>
+      {dashboards &&
+        dashboards.map((board) => (
+          <Link
+            key={board.id}
+            href={`/dashboard/${board.id}`}
+            className={`link ${pathname === '/dashboard/' + board.id ? styles.active : ''}`}
+          >
+            {board.title}
+          </Link>
+        ))}
+    </div>
+  );
+}

From 8c59f5e4b7dc329ed7f1241721d4f023cfd4e9ca Mon Sep 17 00:00:00 2001
From: heejin <dlwlrgkwk82@gmail.com>
Date: Sun, 17 Nov 2024 02:54:54 +0900
Subject: [PATCH 10/11] =?UTF-8?q?=F0=9F=9A=9A=20chore:=20rename=20director?=
 =?UTF-8?q?y=20name=20under=20mydashboard=20to=20avoid=20routing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mydashboard/{hooks => _hooks}/useApi.ts                   | 2 +-
 .../mydashboard/{hooks => _hooks}/useWindowSize.ts            | 0
 .../mydashboard/{types => _types}/dashboards.ts               | 0
 .../mydashboard/{types => _types}/user.ts                     | 0
 .../mydashboard/{utils => _utils}/axiosInstance.ts            | 0
 src/components/header/UserInfo.tsx                            | 4 ++--
 src/components/sidebar/Dashboards.tsx                         | 4 ++--
 src/components/sidebar/SideBar.tsx                            | 2 +-
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename src/app/(with-header-sidebar)/mydashboard/{hooks => _hooks}/useApi.ts (96%)
 rename src/app/(with-header-sidebar)/mydashboard/{hooks => _hooks}/useWindowSize.ts (100%)
 rename src/app/(with-header-sidebar)/mydashboard/{types => _types}/dashboards.ts (100%)
 rename src/app/(with-header-sidebar)/mydashboard/{types => _types}/user.ts (100%)
 rename src/app/(with-header-sidebar)/mydashboard/{utils => _utils}/axiosInstance.ts (100%)

diff --git a/src/app/(with-header-sidebar)/mydashboard/hooks/useApi.ts b/src/app/(with-header-sidebar)/mydashboard/_hooks/useApi.ts
similarity index 96%
rename from src/app/(with-header-sidebar)/mydashboard/hooks/useApi.ts
rename to src/app/(with-header-sidebar)/mydashboard/_hooks/useApi.ts
index ace4646..54c9b8f 100644
--- a/src/app/(with-header-sidebar)/mydashboard/hooks/useApi.ts
+++ b/src/app/(with-header-sidebar)/mydashboard/_hooks/useApi.ts
@@ -1,6 +1,6 @@
 import { useState, useEffect, useCallback } from 'react';
 import { AxiosResponse, AxiosError } from 'axios';
-import axiosInstance from '../utils/axiosInstance';
+import axiosInstance from '../_utils/axiosInstance';
 
 type UseApiFetchReturnType<T> = {
   data: T | null;
diff --git a/src/app/(with-header-sidebar)/mydashboard/hooks/useWindowSize.ts b/src/app/(with-header-sidebar)/mydashboard/_hooks/useWindowSize.ts
similarity index 100%
rename from src/app/(with-header-sidebar)/mydashboard/hooks/useWindowSize.ts
rename to src/app/(with-header-sidebar)/mydashboard/_hooks/useWindowSize.ts
diff --git a/src/app/(with-header-sidebar)/mydashboard/types/dashboards.ts b/src/app/(with-header-sidebar)/mydashboard/_types/dashboards.ts
similarity index 100%
rename from src/app/(with-header-sidebar)/mydashboard/types/dashboards.ts
rename to src/app/(with-header-sidebar)/mydashboard/_types/dashboards.ts
diff --git a/src/app/(with-header-sidebar)/mydashboard/types/user.ts b/src/app/(with-header-sidebar)/mydashboard/_types/user.ts
similarity index 100%
rename from src/app/(with-header-sidebar)/mydashboard/types/user.ts
rename to src/app/(with-header-sidebar)/mydashboard/_types/user.ts
diff --git a/src/app/(with-header-sidebar)/mydashboard/utils/axiosInstance.ts b/src/app/(with-header-sidebar)/mydashboard/_utils/axiosInstance.ts
similarity index 100%
rename from src/app/(with-header-sidebar)/mydashboard/utils/axiosInstance.ts
rename to src/app/(with-header-sidebar)/mydashboard/_utils/axiosInstance.ts
diff --git a/src/components/header/UserInfo.tsx b/src/components/header/UserInfo.tsx
index bb306d7..311d008 100644
--- a/src/components/header/UserInfo.tsx
+++ b/src/components/header/UserInfo.tsx
@@ -1,8 +1,8 @@
 'use client';
 
-import type { User } from '@/app/(with-header-sidebar)/mydashboard/types/user';
+import type { User } from '@/app/(with-header-sidebar)/mydashboard/_types/user';
 import Image from 'next/image';
-import useWindowSize from '@/app/(with-header-sidebar)/mydashboard/hooks/useWindowSize';
+import useWindowSize from '@/app/(with-header-sidebar)/mydashboard/_hooks/useWindowSize';
 import { useState, useEffect } from 'react';
 import UserInfoSkeleton from '../skeleton/UserInfoSkeleton';
 import styles from './UserInfo.module.css';
diff --git a/src/components/sidebar/Dashboards.tsx b/src/components/sidebar/Dashboards.tsx
index 528d82a..7b099c3 100644
--- a/src/components/sidebar/Dashboards.tsx
+++ b/src/components/sidebar/Dashboards.tsx
@@ -1,8 +1,8 @@
 import Link from 'next/link';
 import { usePathname } from 'next/navigation';
-import type { GetDashboardsResponse } from '@/app/(with-header-sidebar)/mydashboard/types/dashboards';
+import type { GetDashboardsResponse } from '@/app/(with-header-sidebar)/mydashboard/_types/dashboards';
 import styles from './Dashboards.module.css';
-import useApi from '@/app/(with-header-sidebar)/mydashboard/hooks/useApi';
+import useApi from '@/app/(with-header-sidebar)/mydashboard/_hooks/useApi';
 
 export default function Dashboards() {
   const pathname = usePathname();
diff --git a/src/components/sidebar/SideBar.tsx b/src/components/sidebar/SideBar.tsx
index 60bf542..f41be79 100644
--- a/src/components/sidebar/SideBar.tsx
+++ b/src/components/sidebar/SideBar.tsx
@@ -2,7 +2,7 @@
 
 import Image from 'next/image';
 import Button from '../Button';
-import useWindowSize from '@/app/(with-header-sidebar)/mydashboard/hooks/useWindowSize';
+import useWindowSize from '@/app/(with-header-sidebar)/mydashboard/_hooks/useWindowSize';
 import Dashboards from './DashBoards';
 import styles from './SideBar.module.css';
 

From 420261850156f7af40a3f195fdbbe538fa2f18a7 Mon Sep 17 00:00:00 2001
From: heejin <dlwlrgkwk82@gmail.com>
Date: Sun, 17 Nov 2024 03:10:48 +0900
Subject: [PATCH 11/11] =?UTF-8?q?=E2=9C=A8=20feat:=20add=20middleware=20an?=
 =?UTF-8?q?d=20404=20empty=20page?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/not-found.module.css |  3 +++
 src/app/not-found.tsx        |  5 +++++
 src/middleware.ts            | 24 ++++++++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 src/app/not-found.module.css
 create mode 100644 src/app/not-found.tsx
 create mode 100644 src/middleware.ts

diff --git a/src/app/not-found.module.css b/src/app/not-found.module.css
new file mode 100644
index 0000000..f287a9e
--- /dev/null
+++ b/src/app/not-found.module.css
@@ -0,0 +1,3 @@
+.title {
+  color: skyblue;
+}
diff --git a/src/app/not-found.tsx b/src/app/not-found.tsx
new file mode 100644
index 0000000..ee2b899
--- /dev/null
+++ b/src/app/not-found.tsx
@@ -0,0 +1,5 @@
+import styles from './not-found.module.css';
+
+export default function NotFoundPage() {
+  return <div className={styles.title}>Page not found!!</div>;
+}
diff --git a/src/middleware.ts b/src/middleware.ts
new file mode 100644
index 0000000..84c6b3f
--- /dev/null
+++ b/src/middleware.ts
@@ -0,0 +1,24 @@
+import { NextRequest, NextResponse } from 'next/server';
+
+export function middleware(request: NextRequest) {
+  const user = request.cookies.get('user'); // TODO get token
+
+  // const restrictedPaths = ['/dashboard', '/mypage', '/mydashboard'];
+  const restrictedPaths = ['/test'];
+
+  if (
+    restrictedPaths.some((path) => request.nextUrl.pathname.startsWith(path))
+  ) {
+    if (!user) {
+      // return NextResponse.redirect(new URL('/login', request.url));
+      return NextResponse.redirect(new URL('/', request.url));
+    }
+  }
+
+  return NextResponse.next();
+}
+
+export const config = {
+  // matcher: ['/dashboard/:path*', '/mypage', '/mydashboard/:path*'],
+  matcher: ['/test'],
+};