From 60feb30742f929597e9a820ca2d4f75bff458867 Mon Sep 17 00:00:00 2001
From: MyungJiwoo <1206jiwoo@gmail.com>
Date: Tue, 17 Dec 2024 22:40:58 +0900
Subject: [PATCH 1/2] =?UTF-8?q?#122=20feat:=20navbar=EC=97=90=20=EA=B3=B5?=
=?UTF-8?q?=EC=A7=80=EC=82=AC=ED=95=AD=20=EC=95=84=EC=9D=B4=EC=BD=98=20?=
=?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Navbar.tsx | 27 +++++++++++++++++++++++++++
src/styles/NavBarStyled.tsx | 17 ++++++++++++++++-
2 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index e52294a..806974b 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -67,6 +67,33 @@ const Navbar = () => {
+
+
+
+
+ 공지사항
+
);
};
diff --git a/src/styles/NavBarStyled.tsx b/src/styles/NavBarStyled.tsx
index e2dfc36..ff056e8 100644
--- a/src/styles/NavBarStyled.tsx
+++ b/src/styles/NavBarStyled.tsx
@@ -9,7 +9,7 @@ export const NavBarLayout = styled.nav`
display: flex;
flex-direction: column;
background: ${theme.color.navbar};
- padding: 2.5625rem 1.625rem;
+ padding: 2.4rem 1.625rem 1.5rem;
z-index: 10;
`;
@@ -50,6 +50,21 @@ export const DashboardsContainer = styled.div`
overflow-y: auto;
`;
+export const NoticeContainer = styled.div`
+ padding-top: 1rem;
+
+ display: flex;
+ align-items: center;
+
+ cursor: pointer;
+
+ p {
+ margin-left: 0.3rem;
+ font-size: ${theme.font.size.caption};
+ color: ${theme.color.gray};
+ }
+`;
+
export const NavButton = styled.button<{ variant: 'primary' | 'secondary' }>`
width: 9.3rem;
padding: 0.75rem 1rem;
From 31a066a40b65e6ff28a99fcdaccb67e7c047586d Mon Sep 17 00:00:00 2001
From: MyungJiwoo <1206jiwoo@gmail.com>
Date: Wed, 18 Dec 2024 01:18:08 +0900
Subject: [PATCH 2/2] =?UTF-8?q?#122=20feat:=20=EA=B3=B5=EC=A7=80=EC=82=AC?=
=?UTF-8?q?=ED=95=AD=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.tsx | 10 +++++++++
src/components/Navbar.tsx | 4 +++-
src/pages/NoticePage/NoticePage.tsx | 27 +++++++++++++++++++++++
src/pages/NoticePage/NoticePageStyled.tsx | 18 +++++++++++++++
4 files changed, 58 insertions(+), 1 deletion(-)
create mode 100644 src/pages/NoticePage/NoticePage.tsx
create mode 100644 src/pages/NoticePage/NoticePageStyled.tsx
diff --git a/src/App.tsx b/src/App.tsx
index 01e91eb..a6abdf1 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -36,6 +36,7 @@ import FriendsPage from './pages/FriendsPage/FriendsPage';
import FriendsSearchPage from './pages/FriendsSearchPage/FriendsSearchPage';
import RecommendedFriendsPage from './pages/RecommendedFriendsPage/RecommendedFriendsPage';
import FriendPage from './pages/FriendPage';
+import NoticePage from './pages/NoticePage/NoticePage';
const queryClient = new QueryClient();
@@ -298,6 +299,15 @@ const App = () => {
}
/>
+
+
+
+
+ }
+ />
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index 806974b..771d63b 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -92,7 +92,9 @@ const Navbar = () => {
/>
- 공지사항
+
+ 공지사항
+
);
diff --git a/src/pages/NoticePage/NoticePage.tsx b/src/pages/NoticePage/NoticePage.tsx
new file mode 100644
index 0000000..70082d5
--- /dev/null
+++ b/src/pages/NoticePage/NoticePage.tsx
@@ -0,0 +1,27 @@
+import { Helmet } from 'react-helmet-async';
+import Flex from '../../components/Flex';
+import Navbar from '../../components/Navbar';
+import * as S from './NoticePageStyled';
+import leftarrow from '../../img/leftarrow.png';
+import Friend from '../../components/Friend/Friend';
+import Pagination from '../../components/CustomPagination';
+import { useNavigate } from 'react-router-dom';
+import { useState } from 'react';
+import { useSearchFriendsList } from '../../hooks/useFollowersList';
+import { useDebounce } from '../../hooks/useDebounce';
+
+const NoticePage = () => {
+ return (
+ <>
+
+ 끄적끄적 | 공지사항
+
+
+
+
+
+
+ );
+};
+
+export default NoticePage;
diff --git a/src/pages/NoticePage/NoticePageStyled.tsx b/src/pages/NoticePage/NoticePageStyled.tsx
new file mode 100644
index 0000000..5731ff4
--- /dev/null
+++ b/src/pages/NoticePage/NoticePageStyled.tsx
@@ -0,0 +1,18 @@
+import { styled } from 'styled-components';
+import theme from '../../styles/Theme/Theme';
+
+export const MainDashBoardLayout = styled.div`
+ width: 100vw;
+ min-width: 100vw;
+ height: 100vh;
+ display: flex;
+`;
+
+export const MainDashBoardContainer = styled.section`
+ width: 100%;
+ padding: 4.3125rem 2.5rem;
+ overflow: hidden;
+ hr {
+ border: 1px solid #f4f4f4;
+ }
+`;