Skip to content

Commit 31fe52e

Browse files
committed
order page
1 parent ccf4904 commit 31fe52e

File tree

17 files changed

+389
-165
lines changed

17 files changed

+389
-165
lines changed

app.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
#root{
2-
background-color: "#DEE3E9",
1+
.bod{
2+
background-color:#DEE3E9;
33
}

index.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
<html lang="en">
33
<head>
44
<meta charset="UTF-8" />
5-
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
5+
<link rel="stylesheet" href="app.css"/>
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
77
<title>Vite + React</title>
88
</head>
9-
<body>
10-
<div id="root"></div>
9+
<body class="bod">
10+
<div id="root">
11+
12+
</div>
1113
<script type="module" src="/src/main.jsx"></script>
1214
</body>
1315
</html>

src/App.jsx

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Inter from "../public/static/fonts/Inter.ttf";
2-
import { ThemeProvider, CssBaseline, createTheme } from "@mui/material";
2+
import { ThemeProvider, CssBaseline, createTheme, Box } from "@mui/material";
33
import RootComponent from "./components/RootComponent";
44
import RootPage from "./components/RootPage";
55
import DataTable from "./test/DataTable";
@@ -12,14 +12,20 @@ import {
1212
RouterProvider,
1313
} from "react-router-dom";
1414
import Home from "./components/bodyComponents/home/Home";
15-
import Products from "./components/bodyComponents/inventory/Products";
1615
import Inventory from "./components/bodyComponents/inventory/Inventory";
16+
import Customer from "./components/bodyComponents/customer/Customer";
17+
import Revenue from "./components/bodyComponents/revenue/Revenue";
18+
import Growth from "./components/bodyComponents/growth/Growth";
19+
import Report from "./components/bodyComponents/report/Report";
20+
import Setting from "./components/bodyComponents/Settings/Setting";
21+
import Order from "./components/bodyComponents/order/Order";
1722

1823
function App() {
1924
const theme = createTheme({
2025
spacing: 4,
2126
palette: {
2227
mode: "light",
28+
2329
// primary: {
2430
// main: "#573BFE",
2531
// },
@@ -60,12 +66,12 @@ function App() {
6066
<Route index element={<RootPage />} />
6167
<Route path="/home" element={<Home />}></Route>
6268
<Route path="/inventory" element={<Inventory />}></Route>
63-
<Route path="/orders"></Route>
64-
<Route path="/customers"></Route>
65-
<Route path="/revenue"></Route>
66-
<Route path="/growth"></Route>
67-
<Route path="/reports"></Route>
68-
<Route path="/settings"></Route>
69+
<Route path="/orders" element={<Order />}></Route>
70+
<Route path="/customers" element={<Customer />}></Route>
71+
<Route path="/revenue" element={<Revenue />}></Route>
72+
<Route path="/growth" element={<Growth />}></Route>
73+
<Route path="/reports" element={<Report />}></Route>
74+
<Route path="/settings" element={<Setting />}></Route>
6975
</Route>
7076
)
7177
);
@@ -75,7 +81,7 @@ function App() {
7581
{/* <DataTable /> */}
7682
{/* <Products /> */}
7783
<RouterProvider router={router} />
78-
84+
{/* bgcolor: "#DEE3E9", height: 899 */}
7985
<CssBaseline />
8086
</ThemeProvider>
8187
);

src/components/RootComponent.jsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,14 @@ export default function RootComponent() {
88
return (
99
<>
1010
<NavBarComponent />
11-
<Box sx={{ bgcolor: "#DEE3E9", height: 899 }}>
11+
<Box
12+
sx={
13+
{
14+
// bgcolor: "#DEE3E9",
15+
// height: 899,
16+
}
17+
}
18+
>
1219
<Grid container spacing={0}>
1320
<Grid item md={2} sm={0}>
1421
<SideBarComponent />

src/components/SideBarComponent.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export default function SideBarComponent() {
3131
};
3232
const location = useLocation();
3333
const currentPage = location.pathname;
34+
console.log(currentPage);
3435
// const styles = theme => ({
3536
// listItemText:{
3637
// fontSize:'0.7em',//Insert your required size
@@ -88,7 +89,7 @@ export default function SideBarComponent() {
8889
// selected={}
8990
selected={
9091
index === selected &&
91-
currentPage === "/" + comp.title.toLocaleLowerCase()
92+
currentPage === "/" + comp.title.toLowerCase()
9293
}
9394
sx={{
9495
mb: 3,

src/components/bodyComponents/Home/TopSellingProduct.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export default function TopSellingProduct() {
3232
height: "95%",
3333
}}
3434
>
35-
<Typography variant="h6" sx={{ mx: 3 }}>
35+
<Typography variant="h6" fontWeight={"bold"} sx={{ mx: 3 }}>
3636
Top selling products
3737
</Typography>
3838
<TableContainer>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import React, { Component } from "react";
2+
3+
export default class Setting extends Component {
4+
render() {
5+
return <div>Setting</div>;
6+
}
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import React, { Component } from "react";
2+
3+
export default class Customer extends Component {
4+
render() {
5+
return <div>Customer</div>;
6+
}
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import React, { Component } from "react";
2+
3+
export default class Growth extends Component {
4+
render() {
5+
return <div>Growth</div>;
6+
}
7+
}

src/components/bodyComponents/inventory/Inventory.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ export default class Inventory extends Component {
99
}
1010
render() {
1111
return (
12-
<Box p={3}>
13-
<Grid container sx={{ mx: 3 }}>
12+
<Box>
13+
<Grid container sx={{ mx: 3, p: 3 }}>
1414
<Grid item md={9}>
1515
<Box
1616
sx={{

0 commit comments

Comments
 (0)