From c4f7b2283704dd32900916ae643fd827ef9c224f Mon Sep 17 00:00:00 2001
From: PortalCube <35104213+PortalCube@users.noreply.github.com>
Date: Fri, 22 Mar 2024 17:40:34 +0900
Subject: [PATCH 1/8] =?UTF-8?q?feat:=20=ED=99=95=EC=A0=95=EB=90=9C=20?=
 =?UTF-8?q?=EB=B0=A5=EC=95=BD=EC=97=90=EC=84=9C=20user=20role=EC=97=90=20?=
 =?UTF-8?q?=EB=94=B0=EB=9D=BC=20=EB=B3=B4=EC=9D=B4=EB=8A=94=20=EC=BB=B4?=
 =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EC=A1=B0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PaymentAccordion.jsx | 11 ++++++++++-
 src/pages/ScheduledEvent.jsx        | 12 +++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/components/PaymentAccordion.jsx b/src/components/PaymentAccordion.jsx
index 626851d..3e18b1b 100644
--- a/src/components/PaymentAccordion.jsx
+++ b/src/components/PaymentAccordion.jsx
@@ -21,6 +21,10 @@ const Container = styled.div`
     &:hover {
         background-color: #0000000f;
     }
+
+    &.hidden {
+        display: none;
+    }
 `;
 
 const Icon = styled.div`
@@ -90,6 +94,7 @@ const PaymentAccordion = ({
     children,
     value,
     onChange,
+    hidden,
     ...props
 }) => {
     const [isTransition, setIsTransition] = useState(false);
@@ -129,7 +134,11 @@ const PaymentAccordion = ({
 
     return (
         <>
-            <Container onClick={onClick} {...props}>
+            <Container
+                onClick={onClick}
+                {...props}
+                className={classNames({ hidden })}
+            >
                 <Icon>{icon}</Icon>
                 <Text>{text}</Text>
                 <Input>
diff --git a/src/pages/ScheduledEvent.jsx b/src/pages/ScheduledEvent.jsx
index d4d2dcd..d77cf87 100644
--- a/src/pages/ScheduledEvent.jsx
+++ b/src/pages/ScheduledEvent.jsx
@@ -17,6 +17,7 @@ import PaymentAccordion from '../components/PaymentAccordion.jsx';
 import { getEvent, postFinishEvent } from '../api/event.js';
 import dayjs from 'dayjs';
 import { useNavigate } from 'react-router-dom';
+import classNames from 'classnames';
 
 const Container = styled.div`
     padding: 0 24px;
@@ -128,6 +129,10 @@ const MemberContainer = styled.div`
 
 const Button = styled(BlockButton)`
     margin-top: 24px;
+
+    &.hidden {
+        display: none;
+    }
 `;
 
 const TextInput = styled(_TextInput)`
@@ -273,6 +278,7 @@ const ScheduledEvent = ({}) => {
                     icon={<BsQuestionCircleFill />}
                     text="송금 정보를 제공할까요?"
                     value={showPayment}
+                    hidden={userRole === 'member'}
                     onChange={(value) => setShowPayment(value)}
                 >
                     <ContentHeader icon={<BsTagsFill />} text="송금 메모" />
@@ -300,7 +306,11 @@ const ScheduledEvent = ({}) => {
                         onInput={onInput(setAccountNumber)}
                     />
                 </PaymentAccordion>
-                <Button text="밥약 종료" onClick={onSubmit} />
+                <Button
+                    text="밥약 종료"
+                    onClick={onSubmit}
+                    className={classNames({ hidden: userRole === 'member' })}
+                />
             </Wrapper>
         </Container>
     );

From 326d210abc67c7fb1e644a54c1dce33bd537db33 Mon Sep 17 00:00:00 2001
From: PortalCube <35104213+PortalCube@users.noreply.github.com>
Date: Fri, 22 Mar 2024 18:14:48 +0900
Subject: [PATCH 2/8] =?UTF-8?q?refactor:=20=EB=AF=B8=EC=82=AC=EC=9A=A9=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Home.jsx | 30 ------------------------------
 1 file changed, 30 deletions(-)
 delete mode 100644 src/pages/Home.jsx

diff --git a/src/pages/Home.jsx b/src/pages/Home.jsx
deleted file mode 100644
index 4d75a37..0000000
--- a/src/pages/Home.jsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import { useSelector } from 'react-redux';
-import styled from 'styled-components';
-import { selectIsLoggedIn, selectName } from '../redux/userSlice.js';
-import { Link } from 'react-router-dom';
-
-const Container = styled.div``;
-
-const Home = ({}) => {
-    const isLoggedIn = useSelector(selectIsLoggedIn);
-    const userName = useSelector(selectName);
-
-    function getLoginText() {
-        if (isLoggedIn) {
-            return `${userName}님, 안녕하세요!`;
-        } else {
-            return '아직 로그인 하지 않았습니다.';
-        }
-    }
-
-    return (
-        <Container>
-            <p>{getLoginText()}</p>
-            <Link to="/">Home</Link>
-            <Link to="/login">Login</Link>
-            <Link to="/register">Register</Link>
-        </Container>
-    );
-};
-
-export default Home;

From 98007f75533b81d50cccbbcfdcf6ed937c9269a7 Mon Sep 17 00:00:00 2001
From: PortalCube <35104213+PortalCube@users.noreply.github.com>
Date: Fri, 22 Mar 2024 18:15:33 +0900
Subject: [PATCH 3/8] =?UTF-8?q?refactor:=20=EB=AF=B8=EC=82=AC=EC=9A=A9=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=A0=9C=EA=B1=B0=20=EB=B0=8F=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/routes.jsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/routes.jsx b/src/routes.jsx
index 51376ab..c885b28 100644
--- a/src/routes.jsx
+++ b/src/routes.jsx
@@ -1,6 +1,3 @@
-import { Route } from 'react-router-dom';
-
-import Home from './pages/Home.jsx';
 import Login from './pages/Login.jsx';
 import Register from './pages/Register.jsx';
 import Sitemap from './pages/Sitemap.jsx';

From 663a3d84f38f1317dcb43ee2ed89ebeaf428d8ea Mon Sep 17 00:00:00 2001
From: PortalCube <35104213+PortalCube@users.noreply.github.com>
Date: Fri, 22 Mar 2024 18:16:22 +0900
Subject: [PATCH 4/8] =?UTF-8?q?fix:=20Sitemap=EC=97=90=20key=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Sitemap.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Sitemap.jsx b/src/pages/Sitemap.jsx
index 315516a..8d811dd 100644
--- a/src/pages/Sitemap.jsx
+++ b/src/pages/Sitemap.jsx
@@ -17,6 +17,7 @@ const Sitemap = ({}) => {
         .filter((route) => route.name)
         .map((route) => (
             <BlockButton
+                key={route.path}
                 text={route.name}
                 onClick={() => {
                     navigate(route.path);

From d7e12d2a46f2083299823e625523c2759eb13310 Mon Sep 17 00:00:00 2001
From: PortalCube <35104213+PortalCube@users.noreply.github.com>
Date: Fri, 22 Mar 2024 18:29:02 +0900
Subject: [PATCH 5/8] =?UTF-8?q?chore:=20js-cookie=20=ED=8C=A8=ED=82=A4?=
 =?UTF-8?q?=EC=A7=80=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json | 9 +++++++++
 package.json      | 1 +
 2 files changed, 10 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index e379aa8..aedd7eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
                 "classnames": "^2.5.1",
                 "dayjs": "^1.11.10",
                 "immer": "^10.0.4",
+                "js-cookie": "^3.0.5",
                 "prop-types": "^15.8.1",
                 "react": "^18.2.0",
                 "react-date-range": "^2.0.0-alpha.4",
@@ -1459,6 +1460,14 @@
                 "url": "https://opencollective.com/immer"
             }
         },
+        "node_modules/js-cookie": {
+            "version": "3.0.5",
+            "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz",
+            "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==",
+            "engines": {
+                "node": ">=14"
+            }
+        },
         "node_modules/js-tokens": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
diff --git a/package.json b/package.json
index 59c5c60..58b01aa 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
         "classnames": "^2.5.1",
         "dayjs": "^1.11.10",
         "immer": "^10.0.4",
+        "js-cookie": "^3.0.5",
         "prop-types": "^15.8.1",
         "react": "^18.2.0",
         "react-date-range": "^2.0.0-alpha.4",

From ba71fc32afda2926d62a47a1c1d9e87a79c52c4f Mon Sep 17 00:00:00 2001
From: PortalCube <35104213+PortalCube@users.noreply.github.com>
Date: Fri, 22 Mar 2024 18:29:37 +0900
Subject: [PATCH 6/8] =?UTF-8?q?feat:=20User=20API=EB=A5=BC=20API=20?=
 =?UTF-8?q?=EB=AA=85=EC=84=B8=EC=84=9C=EB=8C=80=EB=A1=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.js | 49 ++++++++++++++++++++++++++++++++++---------------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/api/user.js b/src/api/user.js
index 027be15..e61c41f 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -5,12 +5,17 @@ export async function postLogin(request) {
     // const axios = getAxiosInstance();
 
     // const bodyData = {
-    //     id: request.id,
+    //     username: request.id,
     //     password: request.password,
     // };
 
     // const response = await axios.post('/login', bodyData);
-    // return response.data;
+
+    // const data = {
+    //     accessToken: response.headers.getAuthorization().split(' ')[1],
+    // };
+
+    // return data;
 
     if (request.id !== 'admin') {
         throw new Error('아이디 오류');
@@ -21,8 +26,7 @@ export async function postLogin(request) {
     }
 
     return {
-        access_token: '1111',
-        refresh_token: '1111',
+        accessToken: '1111',
     };
 }
 
@@ -31,14 +35,12 @@ export async function postRegister(request) {
     // const axios = getAxiosInstance();
 
     // const bodyData = {
-    //     name: request.name,
-    //     id: request.id,
+    //     nickname: request.name,
+    //     username: request.id,
     //     password: request.password,
-    //     email: request.email,
-    //     emailCode: request.emailCode,
     // };
 
-    // const response = await axios.post('/register', bodyData);
+    // const response = await axios.post('/api/v1/signup', bodyData);
     // return response.data;
 
     return {
@@ -51,13 +53,14 @@ export async function postEmailVerification(request) {
 
     // const bodyData = {
     //     email: request.email,
+    //     univName: request.organization,
     // };
 
-    // const response = await axios.post('/emailVerification', bodyData);
+    // const response = await axios.post('/api/v1/verification', bodyData);
     // return response.data;
 
     return {
-        status: 200,
+        success: true,
     };
 }
 export async function postEmailConfirmation(request) {
@@ -65,17 +68,33 @@ export async function postEmailConfirmation(request) {
 
     // const bodyData = {
     //     email: request.email,
+    //     univName: request.organization,
     //     code: request.code,
     // };
 
-    // const response = await axios.post('/emailConfirmation', bodyData);
-    // return response.data;
+    // const response = await axios.post('/api/v1/verificationCode', bodyData);
+
+    // const data = {
+    //     success: response.data.success,
+    //     email: response.data.certified_email,
+    //     organization: response.data.univName,
+    //     date: response.data.certified_date,
+    // };
+
+    // return data;
 
     if (request.code !== '1111') {
-        throw new Error('코드가 다름');
+        throw new Error({
+            status: 400,
+            success: false,
+            message: '인증 코드 오류',
+        });
     }
 
     return {
-        status: 200,
+        success: true,
+        certified_email: request.email,
+        univName: '서울대학교',
+        certified_date: '2023-01-03T09:30:22',
     };
 }

From 00721481ec3b98e81ca2eeb3048da612c9ccfa51 Mon Sep 17 00:00:00 2001
From: PortalCube <35104213+PortalCube@users.noreply.github.com>
Date: Fri, 22 Mar 2024 18:29:58 +0900
Subject: [PATCH 7/8] =?UTF-8?q?feat:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?=
 =?UTF-8?q?=EB=B0=8F=20=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.jsx            | 14 ++++++++++++++
 src/MobileWrapper.jsx  |  4 ++--
 src/pages/Login.jsx    | 23 ++++++++++++-----------
 src/pages/Logout.jsx   | 18 ++++++++++++++++++
 src/redux/userSlice.js | 32 ++++++++++++++++++++------------
 src/routes.jsx         |  8 ++++++++
 6 files changed, 74 insertions(+), 25 deletions(-)
 create mode 100644 src/pages/Logout.jsx

diff --git a/src/App.jsx b/src/App.jsx
index 1f0c735..995b801 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -4,6 +4,9 @@ import store from './redux/store.js';
 import MobileWrapper from './MobileWrapper.jsx';
 import { Route, BrowserRouter as Router, Routes } from 'react-router-dom';
 import routes from './routes.jsx';
+import { useEffect } from 'react';
+import Cookies from 'js-cookie';
+import { login } from './redux/userSlice.js';
 
 const Container = styled.div`
     height: 100%;
@@ -14,6 +17,17 @@ function App() {
         <Route key={index} path={item.path} element={item.element} />
     ));
 
+    useEffect(() => {
+        const accessToken = Cookies.get('accessToken');
+        const id = Cookies.get('id');
+
+        console.log(accessToken);
+
+        if (accessToken && id) {
+            store.dispatch(login({ accessToken, id }));
+        }
+    }, []);
+
     return (
         <Provider store={store}>
             <Container>
diff --git a/src/MobileWrapper.jsx b/src/MobileWrapper.jsx
index acc7676..7aec1d7 100644
--- a/src/MobileWrapper.jsx
+++ b/src/MobileWrapper.jsx
@@ -177,11 +177,11 @@ const MobileWrapper = ({}) => {
                 <Outlet />
             </Content>
             <Footer className={classNames({ hidden: !showFooter })}>
-                <FooterButton to="/">이츠밥약</FooterButton>
+                <FooterButton to="/">이츠타임?</FooterButton>
                 <FooterRiceButton to="/">
                     <ButtonImage src={RiceBalloonButton} />
                 </FooterRiceButton>
-                <FooterButton to="/">마이페이지</FooterButton>
+                <FooterButton to="/logout">로그아웃</FooterButton>
             </Footer>
         </Container>
     );
diff --git a/src/pages/Login.jsx b/src/pages/Login.jsx
index cf18007..b42fd48 100644
--- a/src/pages/Login.jsx
+++ b/src/pages/Login.jsx
@@ -77,6 +77,7 @@ const RegisterText = styled.p`
 
 const Login = ({}) => {
     const navigate = useNavigate();
+    const dispatch = useDispatch();
     const [fieldHidden, setFieldHidden] = useState(true);
     const [errorText, setErrorText] = useState('');
 
@@ -99,22 +100,19 @@ const Login = ({}) => {
         try {
             response = await postLogin({ id, password });
         } catch (e) {
-            alert('비밀번호나 아이디가 틀립니다\nid: admin pw: 1111');
             setErrorText('비밀번호가 틀렸습니다');
             return;
         }
 
+        dispatch(
+            login({
+                accessToken: response.accessToken,
+                id,
+            })
+        );
+
         alert(`${id}님 환영합니다!`);
-        setErrorText('');
         navigate('/');
-
-        // dispatch(
-        //     login({
-        //         access_token: 'token111',
-        //         refresh_token: 'token222',
-        //         name: '이츠타임',
-        //     })
-        // );
     }
 
     return (
@@ -134,7 +132,10 @@ const Login = ({}) => {
                 />
                 <TextInput
                     value={password}
-                    onInput={(event) => setPassword(event.target.value)}
+                    onInput={(event) => {
+                        setPassword(event.target.value);
+                        setErrorText('');
+                    }}
                     placeholder="비밀번호를 입력해주세요"
                     additionalItem={
                         <PasswordEyeButton
diff --git a/src/pages/Logout.jsx b/src/pages/Logout.jsx
new file mode 100644
index 0000000..68d14db
--- /dev/null
+++ b/src/pages/Logout.jsx
@@ -0,0 +1,18 @@
+import { useEffect } from 'react';
+import { useDispatch } from 'react-redux';
+import { useNavigate } from 'react-router-dom';
+import { logout } from '../redux/userSlice.js';
+
+const Logout = ({}) => {
+    const dispatch = useDispatch();
+    const navigate = useNavigate();
+
+    useEffect(() => {
+        dispatch(logout());
+        navigate('/login');
+    });
+
+    return <></>;
+};
+
+export default Logout;
diff --git a/src/redux/userSlice.js b/src/redux/userSlice.js
index 73c4b07..56d295b 100644
--- a/src/redux/userSlice.js
+++ b/src/redux/userSlice.js
@@ -1,32 +1,40 @@
 import { createSlice } from '@reduxjs/toolkit';
+import Cookies from 'js-cookie';
 
 export const userSlice = createSlice({
     name: 'user',
 
     initialState: {
-        access_token: null,
-        refresh_token: null,
-        name: null,
+        accessToken: null,
+        id: null,
     },
 
     reducers: {
         login: (state, action) => {
-            state.access_token = action.payload.access_token;
-            state.refresh_token = action.payload.refresh_token;
-            state.name = action.payload.name;
+            state.accessToken = action.payload.accessToken;
+            state.id = action.payload.id;
+
+            Cookies.set('accessToken', action.payload.accessToken, {
+                expires: 1,
+            });
+            Cookies.set('id', action.payload.id, {
+                expires: 1,
+            });
         },
         logout: (state) => {
-            state.access_token = null;
-            state.refresh_token = null;
-            state.name = null;
+            state.accessToken = null;
+            state.id = null;
+
+            Cookies.remove('accessToken');
+            Cookies.remove('id');
         },
     },
 });
 
 export const { login, logout } = userSlice.actions;
 
-export const selectName = (state) => state.user.name;
-export const selectIsLoggedIn = (state) => state.user.access_token !== null;
-export const selectToken = (state) => state.user.access_token;
+export const selectId = (state) => state.user.id;
+export const selectIsLoggedIn = (state) => state.user.accessToken !== null;
+export const selectToken = (state) => state.user.accessToken;
 
 export default userSlice.reducer;
diff --git a/src/routes.jsx b/src/routes.jsx
index c885b28..5db69ae 100644
--- a/src/routes.jsx
+++ b/src/routes.jsx
@@ -10,6 +10,7 @@ import SuccessRegister from './pages/SuccessRegister.jsx';
 import ShareBab from './pages/ShareBab.jsx';
 import Payment from './pages/Payment.jsx';
 import ScheduledEvent from './pages/ScheduledEvent.jsx';
+import Logout from './pages/Logout.jsx';
 
 const routes = [
     {
@@ -23,6 +24,13 @@ const routes = [
         logo: false,
         name: '로그인',
     },
+    {
+        path: '/logout',
+        element: <Logout />,
+        logo: false,
+        previous: false,
+        name: '로그아웃',
+    },
     {
         path: '/register',
         element: <Register />,

From dcd7451824461d925e2fea1d4dbc69087a88d373 Mon Sep 17 00:00:00 2001
From: PortalCube <35104213+PortalCube@users.noreply.github.com>
Date: Fri, 22 Mar 2024 18:30:16 +0900
Subject: [PATCH 8/8] =?UTF-8?q?chore:=20=ED=99=95=EC=A0=95=EB=90=9C=20?=
 =?UTF-8?q?=EB=B0=A5=EC=95=BD=EC=9D=98=20=EB=8D=94=EB=AF=B8=20=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=84=B0=EB=A5=BC=20=ED=8C=8C=ED=8B=B0=EC=9E=A5?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/event.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/event.js b/src/api/event.js
index de7e67b..bacc259 100644
--- a/src/api/event.js
+++ b/src/api/event.js
@@ -95,7 +95,7 @@ export async function getEvent(request) {
                 id: 10,
             },
         ],
-        userRole: 'member',
+        userRole: 'owner',
     };
 }