diff --git a/src/pages/Home/MainHome.jsx b/src/pages/Home/MainHome.jsx
index e6d969a..ef1cc4c 100644
--- a/src/pages/Home/MainHome.jsx
+++ b/src/pages/Home/MainHome.jsx
@@ -5,7 +5,7 @@ import Complete from "./StatusHome/Complete";
import Progress from "./StatusHome/Progress";
import Wait from "./StatusHome/Wait";
-const MainHome = () => {
+function MainHome (props) {
const [status, setStatus] = useState({
Wait: true,
Progress: false,
diff --git a/src/pages/Inventory/Inventory.css b/src/pages/Inventory/Inventory.css
index 435245c..5e5d655 100644
--- a/src/pages/Inventory/Inventory.css
+++ b/src/pages/Inventory/Inventory.css
@@ -5,8 +5,9 @@
nav{
width: 8.875rem;
- height: 46.25rem;
+ /* height: 46.25rem; */
/* height: 42.5rem; */
+ height: 45.75rem;
z-index: 1;
}
diff --git a/src/pages/Inventory/MainInven.css b/src/pages/Inventory/MainInven.css
index f4bf933..2de0b41 100644
--- a/src/pages/Inventory/MainInven.css
+++ b/src/pages/Inventory/MainInven.css
@@ -40,7 +40,7 @@
.mainInven-title__span3{
width: 60%;
- min-width: 39.625rem;
+ /* min-width: 39.625rem; */
}
.mainInven-category__modal{
@@ -72,7 +72,8 @@
.mainInven-category-content__wrapper{
width: 100%;
- height: calc(46.25rem - 5.0625rem);
+ height: calc(45.75rem - 5.0625rem);
+ /* height: calc(46.25rem - 5.0625rem); */
/* height: calc(42.5rem - 5.0625rem); */
overflow-y: auto;
overflow-x: hidden;
diff --git a/src/pages/Main/MainPage.css b/src/pages/Main/MainPage.css
new file mode 100644
index 0000000..a032044
--- /dev/null
+++ b/src/pages/Main/MainPage.css
@@ -0,0 +1,24 @@
+.mainpage-wrapper{
+ width: 100%;
+ /* height: 100%; */
+ background-color: #fff;
+
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: space-around;
+}
+
+.mainpage-btn__wrapper{
+ width: 37.5rem;
+ height: 5.625rem;
+ line-height: 5.625rem;
+ background-color: #ffe812;
+ border-radius: 0.875rem;
+}
+
+.mainpage-btn__wrapper span{
+ text-align: center;
+ font-family: "Regular";
+ font-size: 1.375rem;
+}
\ No newline at end of file
diff --git a/src/pages/Main/MainPage.jsx b/src/pages/Main/MainPage.jsx
new file mode 100644
index 0000000..c3ecef3
--- /dev/null
+++ b/src/pages/Main/MainPage.jsx
@@ -0,0 +1,20 @@
+import logo from "../../assets/icons/Big_LOGO.svg";
+import kakao from "../../assets/icons/img_kakao.png";
+import "./MainPage.css";
+
+function MainPage () {
+ const handleKakaoLogin = () => {
+ // console.log(process.env.REACT_APP_KAKAO_LOGIN);
+ window.location.href = `${process.env.REACT_APP_KAKAO_LOGIN}`;
+ };
+
+ return(
+
+
+
+
+
+ )
+}
+
+export default MainPage;
\ No newline at end of file
diff --git a/src/pages/Mypage/MainMypage.jsx b/src/pages/Mypage/MainMypage.jsx
index 90b5e1c..1fd44d2 100644
--- a/src/pages/Mypage/MainMypage.jsx
+++ b/src/pages/Mypage/MainMypage.jsx
@@ -1,9 +1,22 @@
+import axios from "axios";
import React, { useEffect } from "react";
+import { useCookies } from "react-cookie";
+import { useNavigate } from "react-router-dom";
+import { useSetRecoilState } from 'recoil';
+import { isAuthenticatedState, loginState } from '../../Atom/status';
import kakao from "../../assets/icons/icon_kakao.svg";
import readyvery from "../../assets/icons/img_readyVery.svg";
+
+
import "./MainMypage.css";
const MainMypage = () => {
+ const navigate = useNavigate();
+ const apiUrl = process.env.REACT_APP_API_ROOT;
+ const [, ,removeCookies] = useCookies();
+ const setIsLoggedIn = useSetRecoilState(loginState);
+ const setIsAuthenticated = useSetRecoilState(isAuthenticatedState);
+
const fetchData = async () => {
// const response = await axios.get(`${process.env.REACT_APP_API_URL}/user/info`);
// console.log(response);
@@ -13,6 +26,31 @@ const MainMypage = () => {
fetchData();
}, []);
+ const handleLogout = () => {
+ const config = {
+ withCredentials: true,
+ };
+
+ axios.get(apiUrl + "/api/v1/user/logout", config)
+ .then((response) => {
+ console.log(response);
+ setIsAuthenticated(false);
+ setIsLoggedIn({
+ accessToken: null,
+ expiredTime: null
+ })
+ navigate("/");
+ removeCookies("accessToken");
+ removeCookies("JSESSIONID");
+ window.localStorage.setItem("isAuthenticated", false);
+ })
+ .catch((error) => {
+ alert("관리자에게 문의하세요.");
+ navigate("/");
+
+ });
+ }
+
return (
@@ -64,7 +102,7 @@ const MainMypage = () => {
-
로그아웃
+
로그아웃
);
};
diff --git a/src/pages/Mypage/Mypage.css b/src/pages/Mypage/Mypage.css
index 89dda7d..bdb94ab 100644
--- a/src/pages/Mypage/Mypage.css
+++ b/src/pages/Mypage/Mypage.css
@@ -4,8 +4,9 @@
nav{
width: 8.875rem;
- height: 46.25rem;
+ /* height: 46.25rem; */
/* height: 42.5rem; */
+ height: 45.75rem;
padding-top: 5.5rem;
}
diff --git a/src/pages/Mypage/Mypage.jsx b/src/pages/Mypage/Mypage.jsx
index ef02590..15739e9 100644
--- a/src/pages/Mypage/Mypage.jsx
+++ b/src/pages/Mypage/Mypage.jsx
@@ -5,7 +5,7 @@ import NavBar from "../../components/views/NavBar/NavBar";
import MainMypage from "./MainMypage";
import "./Mypage.css";
-const Mypage = () => {
+function Mypage (props) {
return (
diff --git a/src/pages/Sales/Sales.css b/src/pages/Sales/Sales.css
index 8f1d94a..55491e5 100644
--- a/src/pages/Sales/Sales.css
+++ b/src/pages/Sales/Sales.css
@@ -5,7 +5,8 @@
nav{
width: 8.875rem;
- height: 46.25rem;
+ /* height: 46.25rem; */
+ height: 45.75rem;
padding-top: 5.5rem;
}
diff --git a/src/pages/Sales/Sales.jsx b/src/pages/Sales/Sales.jsx
index d86129e..105ceff 100644
--- a/src/pages/Sales/Sales.jsx
+++ b/src/pages/Sales/Sales.jsx
@@ -4,7 +4,7 @@ import NavBar from "../../components/views/NavBar/NavBar";
import MainSales from "./MainSales";
import "./Sales.css";
-const Sales = () => {
+function Sales (props) {
return (
홈
@@ -36,9 +36,9 @@ const NavBar = () => {
홈
)}
- 
@@ -50,9 +50,9 @@ const NavBar = () => {
재고관리
)}
- 
@@ -64,9 +64,9 @@ const NavBar = () => {
매출관리
)}
- 
@@ -78,10 +78,10 @@ const NavBar = () => {
마이페이지
)}
-