From ff66bf1f983b3c5f02ff500840d41452250a2b0a Mon Sep 17 00:00:00 2001 From: jueunelf Date: Wed, 3 May 2023 22:30:45 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20?= =?UTF-8?q?=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 8 ++- src/component/LoginPage.module.css | 13 +--- src/component/LoginPage2.module.css | 15 +---- src/component/LoginPageHeader.js | 35 ++++++++++ src/component/LoginPageHeader.module.css | 26 ++++++++ src/component/Message.js | 2 +- src/component/Navigation.css | 24 +++++-- src/component/Navigation.js | 24 ++++++- src/component/RegisterPage.module.css | 8 +-- src/page/MainPageLayout.js | 39 +++++++----- src/page/login/LoginPage.js | 15 ++--- src/page/login/LoginPage2.js | 14 ++-- src/page/login/Register.js | 17 ++--- src/page/manager/DataManage.css | 13 ++-- src/page/manager/DataManage.js | 26 ++++++-- src/page/manager/LoadResultManage.js | 40 ++++++++++++ src/page/manager/OrderManage.js | 26 ++++++-- src/page/manager/Upload.js | 81 ++++++++++++++++++++++++ 18 files changed, 325 insertions(+), 101 deletions(-) create mode 100644 src/component/LoginPageHeader.js create mode 100644 src/component/LoginPageHeader.module.css create mode 100644 src/page/manager/LoadResultManage.js create mode 100644 src/page/manager/Upload.js diff --git a/src/App.js b/src/App.js index 2445085..6187fcd 100644 --- a/src/App.js +++ b/src/App.js @@ -4,12 +4,14 @@ import './App.css'; import LoginPage from "./page/login/LoginPage" import RegisterPage from "./page/login/Register"; -import LoginPage2 from "./page/login/LoginPage2" +import LoginPage2 from "./page/login/LoginPage2"; import DataManage from "./page/manager/DataManage"; import OrderManage from "./page/manager/OrderManage"; -import MainPageLayout from "./page/MainPageLayout" +import MainPageLayout from "./page/MainPageLayout"; +import Upload from "./page/manager/Upload"; +import LoadResultManage from "./page/manager/LoadResultManage"; function App() { return ( @@ -23,7 +25,9 @@ function App() { }> }/> }/> + }/> + }/> ); diff --git a/src/component/LoginPage.module.css b/src/component/LoginPage.module.css index 19de839..c81935e 100644 --- a/src/component/LoginPage.module.css +++ b/src/component/LoginPage.module.css @@ -16,14 +16,9 @@ } span { font-size:18px; - margin-right:25px; + /*margin-right:25px;*/ } -span:hover { - color: black; -} - - .page_middle { @@ -75,11 +70,9 @@ h2 { color : black; } - - - .page_footer { height:190px; background: #b0b0b0; text-align : center; -} \ No newline at end of file +} + diff --git a/src/component/LoginPage2.module.css b/src/component/LoginPage2.module.css index f8a0f1c..014360d 100644 --- a/src/component/LoginPage2.module.css +++ b/src/component/LoginPage2.module.css @@ -16,14 +16,8 @@ } span { font-size:18px; - margin-right:25px; + /*margin-right:25px;*/ } -span:hover { - color: black; -} - - - .page_middle { height:600px; @@ -58,13 +52,8 @@ span:hover { font-size : 20px; } - - - - - .page_footer { height:190px; background: #b0b0b0; text-align : center; -} \ No newline at end of file +} diff --git a/src/component/LoginPageHeader.js b/src/component/LoginPageHeader.js new file mode 100644 index 0000000..dfe19ea --- /dev/null +++ b/src/component/LoginPageHeader.js @@ -0,0 +1,35 @@ +import styles from "./LoginPageHeader.module.css"; +import {useNavigate} from "react-router-dom"; + + +const LoginPageHeader = (props) => { + const navigate = useNavigate(); + + const goRegisterPage = () => { + navigate('/account/Register'); + } + const goLoginPage = () => { + navigate('/account/Login'); + } + const goAccountPage = () => { + navigate('/account'); + } + const goMainPage = () => { + navigate('/'); + } + return( +
+

Everything Of Container

+ +
+ + ) +} + +export default LoginPageHeader; diff --git a/src/component/LoginPageHeader.module.css b/src/component/LoginPageHeader.module.css new file mode 100644 index 0000000..9263001 --- /dev/null +++ b/src/component/LoginPageHeader.module.css @@ -0,0 +1,26 @@ + +.login_menu_tab { + margin-left : 25px; + margin-right : 25px; +} + +.login_menu:hover { + color : black; +} + +.login_navigation { + margin-right : 30px; +} + +.page_header { + height:75px; + padding:1rem; + color:white; + background: #7F7FD5; + background: -webkit-linear-gradient(to right, #91EAE4, #86A8E7, #7F7FD5); + background: linear-gradient(to right, #91EAE4, #86A8E7, #7F7FD5); + font-weight:bold; + display:flex; + justify-content:space-between; + align-items:center; +} \ No newline at end of file diff --git a/src/component/Message.js b/src/component/Message.js index c4c5878..e2f9eef 100644 --- a/src/component/Message.js +++ b/src/component/Message.js @@ -1,7 +1,7 @@ const Message = (props) => { return(
-

메세지가 들어갈 부분입니다.

+

Everything of Container

) } diff --git a/src/component/Navigation.css b/src/component/Navigation.css index c253eda..ac04cd6 100644 --- a/src/component/Navigation.css +++ b/src/component/Navigation.css @@ -1,8 +1,18 @@ -.logo{ - float: left; - width: 150px; - font-weight: bold; - font-size: 15px; - color : blue; - margin-left: 10px; +.login_menu { + margin-left: 15px; + margin-right: 15px; + /*텍스트굵게*/ +} + +.signup_menu { + margin-left: 15px; + margin-right : 50px; +} + +.login_menu:hover { + color: black; +} + +.signup_menu:hover { + color: black; } \ No newline at end of file diff --git a/src/component/Navigation.js b/src/component/Navigation.js index 5d0f496..33fa489 100644 --- a/src/component/Navigation.js +++ b/src/component/Navigation.js @@ -1,14 +1,14 @@ import {Menu} from "antd"; import {useState} from "react"; -import "./Navigation.css" import {useNavigate} from "react-router-dom"; +import './Navigation.css'; const Navigation = (props) => { const navigate = useNavigate(); const items = [ {key: 'data-manage', label: '적재데이터관리'}, {key: 'order-manage', label: '상품주문관리'}, - {key: 'part-3', label: '적재결과관리'}, + {key: 'load-result-manage', label: '적재결과관리'}, ] const [current, setCurrent] = useState('mail'); const onClick = (e) => { @@ -17,9 +17,27 @@ const Navigation = (props) => { setCurrent(e.key); }; + const goRegisterPage = () => { + navigate('./account/Register'); + } + const goLoginPage = () => { + navigate('./account/Login'); + } + + const navStyle = { + textAlign : 'right', + backgroundColor: '#abcdef', + color : 'white', + textStyle: 'bold', + } + return (
-
컨테이너의 모든것
+
) diff --git a/src/component/RegisterPage.module.css b/src/component/RegisterPage.module.css index c9aeb75..80f14eb 100644 --- a/src/component/RegisterPage.module.css +++ b/src/component/RegisterPage.module.css @@ -16,12 +16,10 @@ } span { font-size:18px; - margin-right:25px; + /*margin-right:25px;*/ } -span:hover { - color: black; -} + .font_style { font-size:20px; @@ -65,4 +63,4 @@ span:hover { height:190px; background: #b0b0b0; text-align : center; -} \ No newline at end of file +} diff --git a/src/page/MainPageLayout.js b/src/page/MainPageLayout.js index 779a473..90e3d74 100644 --- a/src/page/MainPageLayout.js +++ b/src/page/MainPageLayout.js @@ -1,39 +1,44 @@ import {Layout} from "antd"; import Navigation from "../component/Navigation"; import Message from "../component/Message"; -import { Outlet } from "react-router" +import { Outlet } from "react-router"; +import {useNavigate} from "react-router-dom"; + import { Routes, Route} from "react-router-dom"; import DataManage from "./manager/DataManage"; -const {Header, Footer} = Layout; +const {Header} = Layout; const headerStyle = { - textAlign: 'right', - color: '#000', - paddingInline: 50, - backgroundColor: '#fff', + textAlign: 'left', + color: '#fff', + backgroundColor: '#abcdef', }; -const footerStyle = { - textAlign: 'center', - color: '#000', - backgroundColor: '#fff', -}; +// const footerStyle = { +// textAlign: 'center', +// color: '#000', +// backgroundColor: '#bbbbbb', +// }; + const MainPageLayout = (props) => { + const navigate = useNavigate(); + const goMainPage = () => { + navigate('./'); + } return (
- +

Everything of Container

- + - -
- -
+ {/*
*/} + {/* */} + {/*
*/} ) } diff --git a/src/page/login/LoginPage.js b/src/page/login/LoginPage.js index dfbc28d..af4dc83 100644 --- a/src/page/login/LoginPage.js +++ b/src/page/login/LoginPage.js @@ -3,7 +3,7 @@ import styles from "../../component/LoginPage.module.css"; import {useNavigate} from "react-router-dom"; import user_login from "../../user-login.png"; import user_register from "../../user-register.png"; - +import LoginPageHeader from "../../component/LoginPageHeader"; const LoginPage = (props) => { const navigate = useNavigate(); @@ -17,19 +17,14 @@ const LoginPage = (props) => { const goAccountPage = () => { navigate('../account'); } + const goMainPage = () => { + navigate('../'); + } return (
-
-

Everything Of Container

- -
- +
diff --git a/src/page/login/LoginPage2.js b/src/page/login/LoginPage2.js index efacffc..5424912 100644 --- a/src/page/login/LoginPage2.js +++ b/src/page/login/LoginPage2.js @@ -4,6 +4,7 @@ import { LockOutlined, UserOutlined } from "@ant-design/icons"; import {useNavigate} from "react-router-dom"; import {Form,Input,Checkbox,Button,Radio} from "antd"; import React, {useState} from 'react'; +import LoginPageHeader from "../../component/LoginPageHeader"; @@ -20,19 +21,14 @@ const LoginPage2 = (props) => { navigate('../account'); } - + const goMainPage = () => { + navigate('../'); + } return (
-
-

Everything Of Container

- -
+
diff --git a/src/page/login/Register.js b/src/page/login/Register.js index 6d336ae..9642295 100644 --- a/src/page/login/Register.js +++ b/src/page/login/Register.js @@ -3,14 +3,11 @@ import styles from "../../component/RegisterPage.module.css"; import {useNavigate} from "react-router-dom"; import {Form,Input,Radio,Select,Button} from "antd"; import React, {useState} from 'react'; +import LoginPageHeader from "../../component/LoginPageHeader"; const { Option }= Select; - - const Register = (props) => { - - const navigate = useNavigate(); const goRegisterPage = () => { @@ -22,6 +19,9 @@ const Register = (props) => { const goAccountPage = () => { navigate('../account'); } + const goMainPage = () => { + navigate('../'); + } const [admin_informDisabled, setAdmin_informDisabled] = useState (true); const [user_informDisabled, setUser_informDisabled] = useState(true); @@ -41,14 +41,7 @@ const Register = (props) => { return (
-
-

Everything Of Container

- -
+
diff --git a/src/page/manager/DataManage.css b/src/page/manager/DataManage.css index e18d91b..bb061c7 100644 --- a/src/page/manager/DataManage.css +++ b/src/page/manager/DataManage.css @@ -1,9 +1,14 @@ .search { - width : 150px; - margin-top : 60px; + width: 170px; + margin-top: 50px; + margin-left: 10px; } - .button { margin-top : 10px; - height : 30px; + height : 40px; + width: 100px; +} + +.uploadForm { + margin-left : 10px; } \ No newline at end of file diff --git a/src/page/manager/DataManage.js b/src/page/manager/DataManage.js index a3aa62c..11cffcf 100644 --- a/src/page/manager/DataManage.js +++ b/src/page/manager/DataManage.js @@ -22,7 +22,7 @@ const onSearch = (value) => { }; const onClick = (value) => { console.log(value) - window.open("/", "a", "width=400, height=300, left=100, top=50"); // 팝업 띄우기 + window.open("/upload", "a", "width=700, height=400, left=100, top=50"); // 팝업 띄우기 }; const contentStyle = { textAlign: 'center', @@ -53,7 +53,6 @@ const DataManage = (props) => { - ) @@ -61,7 +60,16 @@ const DataManage = (props) => { const ContainerManage = (props) => { const [containers, setContainers] = useState([ - + {id: '1', width: 32, depth: 10, height: 100, volume:1000, weight: 32000, weightlimit: 50000, deadline: '2023-04-28 11:00', }, + {id: '1', width: 32, depth: 10, height: 100, volume:1000, weight: 32000, weightlimit: 50000, deadline: '2023-04-28 11:00', }, + {id: '1', width: 32, depth: 10, height: 100, volume:1000, weight: 32000, weightlimit: 50000, deadline: '2023-04-28 11:00', }, + {id: '1', width: 32, depth: 10, height: 100, volume:1000, weight: 32000, weightlimit: 50000, deadline: '2023-04-28 11:00', }, + {id: '1', width: 32, depth: 10, height: 100, volume:1000, weight: 32000, weightlimit: 50000, deadline: '2023-04-28 11:00', }, + {id: '1', width: 32, depth: 10, height: 100, volume:1000, weight: 32000, weightlimit: 50000, deadline: '2023-04-28 11:00', }, + {id: '1', width: 32, depth: 10, height: 100, volume:1000, weight: 32000, weightlimit: 50000, deadline: '2023-04-28 11:00', }, + {id: '1', width: 32, depth: 10, height: 100, volume:1000, weight: 32000, weightlimit: 50000, deadline: '2023-04-28 11:00', }, + {id: '1', width: 32, depth: 10, height: 100, volume:1000, weight: 32000, weightlimit: 50000, deadline: '2023-04-28 11:00', }, + {id: '1', width: 32, depth: 10, height: 100, volume:1000, weight: 32000, weightlimit: 50000, deadline: '2023-04-28 11:00', }, ]); useEffect(()=>{ @@ -94,7 +102,16 @@ const ContainerManage = (props) => { const PalleteManage = (props) => { const [pallete, setPallete] = useState([ - + {id: '1', name:'삼성갤럭시Z플립4', count: '5', width: 32, depth: 10, height: 100, volume:1000, weight: 32000, deadline: '2023-04-28 11:00', }, + {id: '1', name:'삼성갤럭시Z플립4', count: '5', width: 32, depth: 10, height: 100, volume:1000, weight: 32000, deadline: '2023-04-28 11:00', }, + {id: '1', name:'삼성갤럭시Z플립4', count: '5', width:32, depth: 10, height: 100, volume:1000, weight: 32000, deadline: '2023-04-28 11:00', }, + {id: '1', name:'삼성갤럭시Z플립4', count: '5', width: 32, depth: 10, height: 100, volume:1000, weight: 32000, deadline: '2023-04-28 11:00', }, + {id: '1', name:'삼성갤럭시Z플립4', count: '5', width: 32, depth: 10, height: 100, volume:1000, weight: 32000, deadline: '2023-04-28 11:00', }, + {id: '1', name:'삼성갤럭시Z플립4', count: '5', width: 32, depth: 10, height: 100, volume:1000, weight: 32000, deadline: '2023-04-28 11:00', }, + {id: '1', name:'삼성갤럭시Z플립4', count: '5', width: 32, depth: 10, height: 100, volume:1000, weight: 32000, deadline: '2023-04-28 11:00', }, + {id: '1', name:'삼성갤럭시Z플립4', count: '5', width:32, depth: 10, height: 100, volume:1000, weight: 32000, deadline: '2023-04-28 11:00', }, + {id: '1', name:'삼성갤럭시Z플립4', count: '5', width: 32, depth: 10, height: 100, volume:1000, weight: 32000, deadline: '2023-04-28 11:00', }, + {id: '1', name:'삼성갤럭시Z플립4', count: '5', width: 32, depth: 10, height: 100, volume:1000, weight: 32000, deadline: '2023-04-28 11:00', }, ]); useEffect(()=>{ @@ -110,6 +127,7 @@ const PalleteManage = (props) => { {title: '높이(m)', dataIndex: 'height', key: 'height',}, {title: '부피(m^3)', dataIndex: 'volume', key: 'volume',}, {title: '무게(kg)', dataIndex: 'weight', key: 'weight',}, + {title: '출고마감시간', dataIndex: 'deadline', key: 'deadline',}, ]; const getPalleteData = async ()=>{ diff --git a/src/page/manager/LoadResultManage.js b/src/page/manager/LoadResultManage.js new file mode 100644 index 0000000..6615490 --- /dev/null +++ b/src/page/manager/LoadResultManage.js @@ -0,0 +1,40 @@ +import {Anchor, Layout, Table, Tabs} from "antd"; +import Sider from "antd/es/layout/Sider"; +import {Content} from "antd/es/layout/layout"; +import axios from "axios"; +import {useEffect, useState} from "react"; +import Search from "antd/es/input/Search"; +import './DataManage.css'; + + +const contentStyle = { + textAlign: 'center', + minHeight: 120, + lineHeight: '120px', + backgroundColor: '#fff', +}; +const siderStyle = { + textAlign: 'right', + lineHeight: '120px', + color: '#fff', + backgroundColor: '#fff', +}; + +const onSearch = (value) => { + console.log(value) +}; + +const LoadResultManage = (props) => { + return ( + + + + + +

3D 부분입니다

+ + + ) +} + +export default LoadResultManage; \ No newline at end of file diff --git a/src/page/manager/OrderManage.js b/src/page/manager/OrderManage.js index ae0febc..291ffa5 100644 --- a/src/page/manager/OrderManage.js +++ b/src/page/manager/OrderManage.js @@ -1,8 +1,9 @@ -import {Anchor, Layout, Table, Tabs} from "antd"; +import {Anchor, Button, Layout, Table, Tabs} from "antd"; import Sider from "antd/es/layout/Sider"; import {Content} from "antd/es/layout/layout"; import axios from "axios"; import {useEffect, useState} from "react"; +import Search from "antd/es/input/Search"; const contentStyle = { textAlign: 'center', @@ -17,13 +18,25 @@ const siderStyle = { backgroundColor: '#fff', }; +const onSearch = (value) => { + console.log(value) +}; + + const OrderManage = (props) => { const [orders, setOrders] = useState([ {index: '1', orderNum: 2023, name: '삼성갤럭시Z플립4', count: 5, width: 32, depth: 10, height: 100, volume:1000, weight: 32000, }, {index: '1', orderNum: 2023, name: '삼성갤럭시Z플립4', count: 5, width: 32, depth: 10, height: 100, volume:1000, weight: 32000, }, {index: '1', orderNum: 2023, name: '삼성갤럭시Z플립4', count: 5, width: 32, depth: 10, height: 100, volume:1000, weight: 32000, }, + {index: '1', orderNum: 2023, name: '삼성갤럭시Z플립4', count: 5, width: 32, depth: 10, height: 100, volume:1000, weight: 32000, }, + {index: '1', orderNum: 2023, name: '삼성갤럭시Z플립4', count: 5, width: 32, depth: 10, height: 100, volume:1000, weight: 32000, }, + {index: '1', orderNum: 2023, name: '삼성갤럭시Z플립4', count: 5, width: 32, depth: 10, height: 100, volume:1000, weight: 32000, }, + {index: '1', orderNum: 2023, name: '삼성갤럭시Z플립4', count: 5, width: 32, depth: 10, height: 100, volume:1000, weight: 32000, }, + {index: '1', orderNum: 2023, name: '삼성갤럭시Z플립4', count: 5, width: 32, depth: 10, height: 100, volume:1000, weight: 32000, }, + {index: '1', orderNum: 2023, name: '삼성갤럭시Z플립4', count: 5, width: 32, depth: 10, height: 100, volume:1000, weight: 32000, }, ]); + useEffect(()=>{ getOrderData() },[]) @@ -47,9 +60,14 @@ const OrderManage = (props) => { } return ( -
- - + + + + + +
+ + ) } export default OrderManage; \ No newline at end of file diff --git a/src/page/manager/Upload.js b/src/page/manager/Upload.js new file mode 100644 index 0000000..4edc37e --- /dev/null +++ b/src/page/manager/Upload.js @@ -0,0 +1,81 @@ +import React, { useState } from 'react'; +import { + Button, + Cascader, + DatePicker, + Form, + Input, + InputNumber, + Radio, + Select, + Switch, + TreeSelect, +} from 'antd'; +import styles from "../manager/DataManage.css"; + +type SizeType = Parameters[0]['size']; + +const Upload = () => { + + /* FORM 템플릿 코드 + + + + + + + + + + */ + + return ( +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); +}; + +export default Upload; From 23cc380c80c90d410bc49d424681077090c9c902 Mon Sep 17 00:00:00 2001 From: wkc0509 Date: Fri, 12 May 2023 09:31:06 +0900 Subject: [PATCH 2/5] =?UTF-8?q?#9=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.js | 6 +- src/component/CheckDupId.module.css | 19 ++++++ src/component/LoginPageHeader.js | 2 +- src/component/LoginPageHeader.module.css | 4 ++ src/component/Navigation.css | 3 + src/component/Navigation.js | 1 + src/component/RegisterPage.module.css | 18 +++-- src/page/MainPageLayout.js | 5 +- src/page/login/CheckDupId.js | 24 +++++++ src/page/login/FindAddress.js | 18 +++++ src/page/login/Register.js | 85 +++++++++++++++--------- src/page/manager/DataManage.js | 46 +++++++------ src/page/manager/Upload.js | 2 - 13 files changed, 171 insertions(+), 62 deletions(-) create mode 100644 src/component/CheckDupId.module.css create mode 100644 src/page/login/CheckDupId.js create mode 100644 src/page/login/FindAddress.js diff --git a/src/App.js b/src/App.js index 6187fcd..86a1288 100644 --- a/src/App.js +++ b/src/App.js @@ -5,7 +5,8 @@ import './App.css'; import LoginPage from "./page/login/LoginPage" import RegisterPage from "./page/login/Register"; import LoginPage2 from "./page/login/LoginPage2"; - +import FindAddress from "./page/login/FindAddress"; +import CheckDupId from "./page/login/CheckDupId"; import DataManage from "./page/manager/DataManage"; import OrderManage from "./page/manager/OrderManage"; @@ -19,7 +20,6 @@ function App() { }/> }/> - }/> }> @@ -28,6 +28,8 @@ function App() { }/> }/> + }/> + }/> ); diff --git a/src/component/CheckDupId.module.css b/src/component/CheckDupId.module.css new file mode 100644 index 0000000..07352c7 --- /dev/null +++ b/src/component/CheckDupId.module.css @@ -0,0 +1,19 @@ +.h1 { + text-align: center; + margin-top: 100px; +} +.page_wrapper { + background-color: #abcdef; + border: 5px solid #abcdef; + border-radius:10px; + width: 600px; + height: 100px; + margin-top: 70px; + margin-left: 130px; +} +.check_form { + margin-top: 30px; + margin-left:110px; + width : 500px; + display:flex; +} \ No newline at end of file diff --git a/src/component/LoginPageHeader.js b/src/component/LoginPageHeader.js index dfe19ea..d239576 100644 --- a/src/component/LoginPageHeader.js +++ b/src/component/LoginPageHeader.js @@ -19,7 +19,7 @@ const LoginPageHeader = (props) => { } return(
-

Everything Of Container

+

Everything Of Container

+ + + + + + + + + + + + + + + + + + + + + + +
Pallet Type가로 길이높이 길이세로 길이제한 적재량
1.10.951.1unknown
1.20.951.2unknown
+ +
+ + ); +}; + +export default SetPallet; \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 5b9ac55..e3f3bae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9472,6 +9472,11 @@ text-table@^0.2.0: resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz" integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== +three@^0.152.2: + version "0.152.2" + resolved "https://registry.npmjs.org/three/-/three-0.152.2.tgz" + integrity sha512-Ff9zIpSfkkqcBcpdiFo2f35vA9ZucO+N8TNacJOqaEE6DrB0eufItVMib8bK8Pcju/ZNT6a7blE1GhTpkdsILw== + throat@^6.0.1: version "6.0.2" resolved "https://registry.npmjs.org/throat/-/throat-6.0.2.tgz" From 4e1fc37e8cbcf906c97c3e2037bf22c40ff7f18b Mon Sep 17 00:00:00 2001 From: jueunelf Date: Sun, 28 May 2023 18:44:18 +0900 Subject: [PATCH 5/5] =?UTF-8?q?#12=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EA=B5=AC=ED=98=84,=20=ED=8C=94?= =?UTF-8?q?=EB=A0=88=ED=8A=B8=20=EB=93=B1=EB=A1=9D=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 | 12 +- src/App.js | 6 + src/component/LoginPage.module.css | 1 - src/component/LoginPageHeader.js | 2 +- src/component/NavigationForUser.js | 45 + src/page/MainPageLayout.js | 3 - src/page/MainPageLayoutForUser.js | 32 + src/page/login/Register.js | 31 +- src/page/login/useInput.js | 10 + src/page/manager/DataManage.js | 14 +- src/page/manager/Upload.js | 46 +- src/page/user/GoodsRegister.js | 131 + yarn.lock | 16430 +++++++++++++-------------- 13 files changed, 8477 insertions(+), 8286 deletions(-) create mode 100644 src/component/NavigationForUser.js create mode 100644 src/page/MainPageLayoutForUser.js create mode 100644 src/page/login/useInput.js create mode 100644 src/page/user/GoodsRegister.js diff --git a/package-lock.json b/package-lock.json index 4a4e0df..9e2e84a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4449,9 +4449,9 @@ "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==" }, "node_modules/@types/react": { - "version": "18.0.28", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.28.tgz", - "integrity": "sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew==", + "version": "18.2.7", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.7.tgz", + "integrity": "sha512-ojrXpSH2XFCmHm7Jy3q44nXDyN54+EYKP2lBhJ2bqfyPj6cIUW/FZW/Csdia34NQgq7KYcAlHi5184m4X88+yw==", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -21559,9 +21559,9 @@ "integrity": "sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==" }, "@types/react": { - "version": "18.0.28", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.0.28.tgz", - "integrity": "sha512-RD0ivG1kEztNBdoAK7lekI9M+azSnitIn85h4iOiaLjaTrMjzslhaqCGaI4IyCJ1RljWiLCEu4jyrLLgqxBTew==", + "version": "18.2.7", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.7.tgz", + "integrity": "sha512-ojrXpSH2XFCmHm7Jy3q44nXDyN54+EYKP2lBhJ2bqfyPj6cIUW/FZW/Csdia34NQgq7KYcAlHi5184m4X88+yw==", "requires": { "@types/prop-types": "*", "@types/scheduler": "*", diff --git a/src/App.js b/src/App.js index 22ad36b..2f7b81d 100644 --- a/src/App.js +++ b/src/App.js @@ -14,6 +14,8 @@ import MainPageLayout from "./page/MainPageLayout"; import Upload from "./page/manager/Upload"; import LoadResultManage from "./page/manager/LoadResultManage"; import SetPallet from "./page/manager/SetPallet"; +import MainPageLayoutForUser from "./page/MainPageLayoutForUser"; +import GoodsRegister from "./page/user/GoodsRegister"; function App() { return ( @@ -28,6 +30,10 @@ function App() { }/> }/> + }> + }/> + + }/> }/> }/> }/> diff --git a/src/component/LoginPage.module.css b/src/component/LoginPage.module.css index c81935e..be55fd7 100644 --- a/src/component/LoginPage.module.css +++ b/src/component/LoginPage.module.css @@ -20,7 +20,6 @@ span { } - .page_middle { height:600px; display:flex; diff --git a/src/component/LoginPageHeader.js b/src/component/LoginPageHeader.js index d239576..dfe19ea 100644 --- a/src/component/LoginPageHeader.js +++ b/src/component/LoginPageHeader.js @@ -19,7 +19,7 @@ const LoginPageHeader = (props) => { } return(
-

Everything Of Container

+

Everything Of Container