Skip to content

new #10

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.

Sign up for GitHub

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

Open
minuri12 wants to merge 13 commits into
base: DISARA
Choose a base branch
from
Open

new #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
183acb7
Order Completed
minuri12 May 10, 2024
0a24379
Order page completed
minuri12 May 10, 2024
8d41661
Product Edit Main Completed
minuri12 May 10, 2024
1793e52
Product Edited
minuri12 May 11, 2024
6a79579
Admin Product Add page completed
minuri12 May 11, 2024
903a73e
Update Navbar.jsx
disara7 May 11, 2024
79836ad
Update AdminDashboard.jsx
minuri12 May 11, 2024
b76ffda
d
disara7 May 11, 2024
ba1c85a
sales stat added
disara7 May 11, 2024
0a8d7d5
omkk
DushyanthaAT May 11, 2024
83fe424
Merge pull request #5 from DushyanthaAT/main
minuri12 May 11, 2024
76902a5
Completed
minuri12 May 11, 2024
6901e05
Completed
minuri12 May 11, 2024
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
1,065 changes: 1,056 additions & 9 deletions shopsense_seller/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions shopsense_seller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,24 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@mui/icons-material": "^5.15.17",
"@mui/material": "^5.15.17",
"@mui/x-charts": "^7.4.0",
"@ramonak/react-progress-bar": "^5.2.0",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-flags-select": "^2.2.3",
"react-popup": "^0.11.2",
"react-router-dom": "^6.23.0",
"react-scripts": "5.0.1",
"react-select": "^5.8.0",
"rechart": "^0.0.1",
"recharts": "^2.12.7",
"web-vitals": "^2.1.4"
},
"scripts": {
Expand Down
Binary file added shopsense_seller/public/Invoice.pdf
View file
Open in desktop
Binary file not shown.
92 changes: 92 additions & 0 deletions shopsense_seller/src/AdminSide/AdminPages/AdminDashboard/Edit/AdminEdit.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
.dashboard-container {
display: flex;
position: relative;
width: 100%;
top: 85px;
/* height: calc(100vh - 85px); */
.left-flex {
position: relative;
display: flex;
width: 250px;
justify-content: center;
align-items: center;
height: calc(100vh - 85px);
position: fixed;
}
.right-flex {
display: flex;
flex-direction: column;
height: auto;
width: calc(100vw - 250px);
margin-left: 250px;
.right-top-flex {
display: flex;
height: auto;

margin-left: 20px;
margin-right: 20px;
flex-direction: column;
.rt-txt {
display: flex;
flex-direction: column;
.rt-txt1 {
font-size: 1.5rem;
font-weight: bold;
margin-top: 0px;
}
.rt-txt2 {
font-size: 1.5rem;
color: #575757;
}
}
.rt-card-container {
display: flex;

gap: 20px;
margin-top: 20px;
}
}
.right-bottom-flex {
display: flex;
flex-direction: column;
.tp-txt {
font-size: 1.5rem;
font-weight: bold;
margin: 20px 0px 0px 20px;
}
.top-products {
margin: 20px;
}
}
}
}

.TopMenuAdmin {
position: fixed;
top: 0;
width: 100%;
z-index: 999;
margin-bottom: 10px;
}

.OrderButtonHolder {
margin-top: 40px;
}

.OrderButtonHolder button {
background-color: #575757;
margin-right: 10px;
width: 140px;
height: 32px;
background: #dbdbdb;
border-radius: 8px;
cursor: pointer;
border: none;
}

.rt-txt1 {
font-size: 1.5rem;
font-weight: bold;
margin-top: 30px;
margin-top: 0px;
}
38 changes: 38 additions & 0 deletions shopsense_seller/src/AdminSide/AdminPages/AdminDashboard/Edit/AdminEdit.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import React from "react";
import SideNav from "../../../adminComponents/sideNavbar/SideNav";
import "./AdminEdit.css";
import FormNavBar from "../../../../Components/FormNavBar/FormNavBar";
import Card from "../../../adminComponents/card/Card";
import TableComponent from "../../../adminComponents/tableComponent/TableComponent";
import BarChartOutlinedIcon from "@mui/icons-material/BarChartOutlined";
import DescriptionOutlinedIcon from "@mui/icons-material/DescriptionOutlined";
import SellOutlinedIcon from "@mui/icons-material/SellOutlined";
import PersonAddOutlinedIcon from "@mui/icons-material/PersonAddOutlined";
import { Bt } from "react-flags-select";
import TableComponentOrder from "../../../adminComponents/tableComponentOrder/tableComponentOrder";
import PopupScreen from "../../../../Components/Popup/Popup";
import TableComponentProduct from "../../../adminComponents/tableComponentProduct/tableComponentProduct";
import EditProduct from "../../../../Pages/EditProduct/EditProduct";
import SignUpNavBar from "../../../../Components/SignUpNavBar/SignUpNavBar";
const AdminEdit = () => {
return (
<div className="dashboard-wrapper">
<div className="TopMenuAdmin">
<SignUpNavBar />
</div>

<div className="dashboard-container">
<div className="left-flex">
<SideNav />
</div>
<div className="right-flex">
<div className="right-bottom-flex">
<EditProduct />
</div>
</div>
</div>
</div>
);
};

export default AdminEdit;
85 changes: 85 additions & 0 deletions shopsense_seller/src/AdminSide/AdminPages/AdminDashboard/Orders/AdminOrders.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
.dashboard-container {
display: flex;
position: relative;
width: 100%;
top: 85px;
/* height: calc(100vh - 85px); */
.left-flex {
position: relative;
display: flex;
width: 250px;
justify-content: center;
align-items: center;
height: calc(100vh - 85px);
position: fixed;
}
.right-flex {
display: flex;
flex-direction: column;
height: auto;
width: calc(100vw - 250px);
margin-left: 250px;
.right-top-flex {
display: flex;
height: auto;

margin-left: 20px;
margin-right: 20px;
flex-direction: column;
.rt-txt {
display: flex;
flex-direction: column;
.rt-txt1 {
font-size: 1.5rem;
font-weight: bold;
margin-top: 0px;
}
.rt-txt2 {
font-size: 1.5rem;
color: #575757;
}
}
.rt-card-container {
display: flex;

gap: 20px;
margin-top: 20px;
}
}
.right-bottom-flex {
display: flex;
flex-direction: column;
.tp-txt {
font-size: 1.5rem;
font-weight: bold;
margin: 20px 0px 0px 20px;
}
.top-products {
margin: 20px;
}
}
}
}

.TopMenuAdmin {
position: fixed;
top: 0;
width: 100%;
z-index: 999;
margin-bottom: 10px;
}

.OrderButtonHolder {
margin-top: 40px;
}

.OrderButtonHolder button {
background-color: #575757;
margin-right: 10px;
width: 140px;
height: 32px;
background: #dbdbdb;
border-radius: 8px;
cursor: pointer;
border: none;
}
49 changes: 49 additions & 0 deletions shopsense_seller/src/AdminSide/AdminPages/AdminDashboard/Orders/AdminOrders.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import React from "react";
import SideNav from "../../../adminComponents/sideNavbar/SideNav";
import "./AdminOrders.css";
import FormNavBar from "../../../../Components/FormNavBar/FormNavBar";
import Card from "../../../adminComponents/card/Card";
import TableComponent from "../../../adminComponents/tableComponent/TableComponent";
import BarChartOutlinedIcon from "@mui/icons-material/BarChartOutlined";
import DescriptionOutlinedIcon from "@mui/icons-material/DescriptionOutlined";
import SellOutlinedIcon from "@mui/icons-material/SellOutlined";
import PersonAddOutlinedIcon from "@mui/icons-material/PersonAddOutlined";
import { Bt } from "react-flags-select";
import TableComponentOrder from "../../../adminComponents/tableComponentOrder/tableComponentOrder";
import PopupScreen from "../../../../Components/Popup/Popup";
import SignUpNavBar from "../../../../Components/SignUpNavBar/SignUpNavBar";

const AdminOrder = () => {
return (
<div className="dashboard-wrapper">
<div className="TopMenuAdmin">
<SignUpNavBar />
</div>

<div className="dashboard-container">
<div className="left-flex">
<SideNav />
</div>
<div className="right-flex">
<div className="right-top-flex">
<div className="rt-txt"></div>
</div>
<div className="right-bottom-flex">
<div className="OrderButtonHolder">
<button>All</button>
<button>Pending</button>
<button>Ready to Ship</button>
<button>Shipped</button>
<button>Completed</button>
</div>
<div className="top-products">
<TableComponentOrder />
</div>
</div>
</div>
</div>
</div>
);
};

export default AdminOrder;
92 changes: 92 additions & 0 deletions shopsense_seller/src/AdminSide/AdminPages/AdminDashboard/Products/AdminProduct.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
.dashboard-container {
display: flex;
position: relative;
width: 100%;
top: 85px;
/* height: calc(100vh - 85px); */
.left-flex {
position: relative;
display: flex;
width: 250px;
justify-content: center;
align-items: center;
height: calc(100vh - 85px);
position: fixed;
}
.right-flex {
display: flex;
flex-direction: column;
height: auto;
width: calc(100vw - 250px);
margin-left: 250px;
.right-top-flex {
display: flex;
height: auto;

margin-left: 20px;
margin-right: 20px;
flex-direction: column;
.rt-txt {
display: flex;
flex-direction: column;
.rt-txt1 {
font-size: 1.5rem;
font-weight: bold;
margin-top: 30px;
margin-top: 0px;
}
.rt-txt2 {
font-size: 1.5rem;
color: #575757;
}
}
.rt-card-container {
display: flex;

gap: 20px;
margin-top: 20px;
}
}
.right-bottom-flex {
display: flex;
flex-direction: column;
.tp-txt {
font-size: 1.5rem;
font-weight: bold;
margin: 20px 0px 0px 20px;
}
.top-products {
margin: 20px;
}
}
}
}

.TopMenuAdmin {
position: fixed;
top: 0;
width: 100%;
z-index: 999;
margin-bottom: 10px;
}

.OrderButtonHolder {
margin-top: 40px;
}

.OrderButtonHolder button {
background-color: #575757;
margin-right: 10px;
width: 140px;
height: 32px;
background: #dbdbdb;
border-radius: 8px;
cursor: pointer;
border: none;
}

.rt-txt1 {
font-size: 1.5rem;
font-weight: bold;
margin-top: 0px;
}
Loading