Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

api 연동 #12

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 103 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,17 @@
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"antd": "^5.4.0",
"axios": "^1.3.5",
"axios": "^1.4.0",
"hooks": "^0.3.2",
"react": "^18.2.0",
"react-bootstrap": "^2.7.2",
"react-daum-postcode": "^3.1.1",
"react-dom": "^18.2.0",
"react-router": "^6.10.0",
"react-router-dom": "^6.10.0",
"react-scripts": "5.0.1",
"reactstrap": "^9.1.8",
"three": "^0.152.2",
"web-vitals": "^2.1.4"
},
"scripts": {
Expand Down
25 changes: 19 additions & 6 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,39 @@ 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 FindAddress from "./page/login/FindAddress";

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";
import SetPallet from "./page/manager/SetPallet";
import MainPageLayoutForUser from "./page/MainPageLayoutForUser";
import GoodsRegister from "./page/user/GoodsRegister";
import OrderDelivery from "./page/user/OrderDelivery";
import Mapping from "./page/manager/Mapping";

function App() {
return (
<BrowserRouter>
<Routes>
<Route path="/account" element={<LoginPage/>}/>
<Route path="/account/Login" element={<LoginPage2/>}/>

<Route path="/account/Register" element={<RegisterPage/>}/>

<Route exact path="/" element={<MainPageLayout/>}>
<Route path="/data-manage" element={<DataManage/>}/>
<Route path="/order-manage" element={<OrderManage/>}/>
<Route path="/load-result-manage" element={<LoadResultManage/>}/>
</Route>
<Route exact path="/user" element={<MainPageLayoutForUser/>}>
<Route path="/user/goods-register" element={<GoodsRegister/>}/>
<Route path="/user/order-delivery" element={<OrderDelivery/>}/>
</Route>
<Route path="/SetPallet" element={<SetPallet/>}/>
<Route path="/upload" element={<Upload />}/>
<Route path="/mapping" element={<Mapping />}/>
<Route path="/account/Register/address" element={<FindAddress />}/>
</Routes>
</BrowserRouter>
);
Expand Down
19 changes: 19 additions & 0 deletions src/component/CheckDupId.module.css
Original file line number Diff line number Diff line change
@@ -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;
}
14 changes: 3 additions & 11 deletions src/component/LoginPage.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,9 @@
}
span {
font-size:18px;
margin-right:25px;
/*margin-right:25px;*/

}
span:hover {
color: black;
}




.page_middle {
height:600px;
Expand Down Expand Up @@ -75,11 +69,9 @@ h2 {
color : black;
}




.page_footer {
height:190px;
background: #b0b0b0;
text-align : center;
}
}

25 changes: 12 additions & 13 deletions src/component/LoginPage2.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,8 @@
}
span {
font-size:18px;
margin-right:25px;
/*margin-right:25px;*/
}
span:hover {
color: black;
}




.page_middle {
height:600px;
Expand Down Expand Up @@ -53,18 +47,23 @@ span:hover {
margin-bottom : 20px;
width: 100%;
height : 40px;
/*background-color : #1677ff;*/
/*color : white;*/
}
/*.login_form_button:hover {*/
/* background-color : #69b1ff; */
/*}*/

.login_form_register {
font-size : 20px;
}





.login_error {
font-size : 15px;
color : red;
}

.page_footer {
height:190px;
background: #b0b0b0;
text-align : center;
}
}
Loading