From c55cd57140a49ee595e80d1af78f911ec160af70 Mon Sep 17 00:00:00 2001
From: Mahmood83367 <84744874+Mahmood83367@users.noreply.github.com>
Date: Sun, 5 Dec 2021 18:05:07 +0300
Subject: [PATCH 01/17] Complete
---
package-lock.json | 1 +
src/App.js | 23 ++++++++++-----------
src/components/Drawer.jsx | 42 +++++++++++++++++++++------------------
src/index.js | 6 ++++--
src/pages/Dashboard.jsx | 2 --
src/pages/Login.jsx | 2 +-
src/pages/Products.jsx | 2 +-
7 files changed, 41 insertions(+), 37 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index ce6b57b..e9b0998 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,6 +5,7 @@
"requires": true,
"packages": {
"": {
+ "name": "axios-app",
"version": "0.1.0",
"dependencies": {
"@emotion/react": "^11.7.0",
diff --git a/src/App.js b/src/App.js
index 2a28a2d..e8ef067 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,19 +1,18 @@
-import logo from './logo.svg';
import './App.css';
-import Dashboard from './pages/Dashboard'
-import Categories from './pages/Categories'
-import Products from './pages/Products'
-import Login from './pages/Login'
-import {Route, Routes} from 'react-router-dom'
import Drawer from './components/Drawer'
+import {useLocation} from 'react-router-dom'
+import Login from './pages/Login';
+
function App(props) {
- return
- }/>
- }/>
- }/>
- }/>
+ let location = useLocation()
+
+ return (
+
+{ console.log(location.pathname)
+} {location.pathname ==='/login'? : }
+
-
+ )
}
export default App;
diff --git a/src/components/Drawer.jsx b/src/components/Drawer.jsx
index 39e76ec..9ff8a65 100644
--- a/src/components/Drawer.jsx
+++ b/src/components/Drawer.jsx
@@ -15,9 +15,7 @@ import ChevronRightIcon from '@mui/icons-material/ChevronRight';
import ListItem from '@mui/material/ListItem';
import ListItemIcon from '@mui/material/ListItemIcon';
import ListItemText from '@mui/material/ListItemText';
-import InboxIcon from '@mui/icons-material/MoveToInbox';
-import MailIcon from '@mui/icons-material/Mail';
-import {Routes,Link, Route, useLocation} from 'react-router-dom'
+import {Routes,Link, Route} from 'react-router-dom'
import Dashboard from '../pages/Dashboard'
import Categories from '../pages/Categories'
import Products from '../pages/Products'
@@ -25,7 +23,6 @@ import LogoutIcon from '@mui/icons-material/Logout';
import GridViewIcon from '@mui/icons-material/GridView';
import CategoryIcon from '@mui/icons-material/Category';
import ProductionQuantityLimitsIcon from '@mui/icons-material/ProductionQuantityLimits';
-import Login from '../pages/Login'
const drawerWidth = 240;
const Main = styled('main', { shouldForwardProp: (prop) => prop !== 'open' })(
@@ -74,7 +71,7 @@ const DrawerHeader = styled('div')(({ theme }) => ({
}));
function PersistentDrawerLeft(props) {
- let location = useLocation()
+ // let location = useLocation()
const theme = useTheme();
const [open, setOpen] = React.useState(false);
const handleDrawerOpen = () => {
@@ -85,19 +82,19 @@ const DrawerHeader = styled('div')(({ theme }) => ({
setOpen(false);
};
- const renderContent = (pathName)=>{
- switch(pathName)
- {
- case '/login':
- return
- case '/products':
- return
- case '/dashboard':
- return
- case '/categories':
- return
- }
- }
+ // const renderContent = (pathName)=>{
+ // switch(pathName)
+ // {
+ // case '/login':
+ // return
+ // case '/products':
+ // return
+ // case '/dashboard':
+ // return
+ // case '/categories':
+ // return
+ // }
+ // }
return (
@@ -168,7 +165,14 @@ const DrawerHeader = styled('div')(({ theme }) => ({
- {renderContent(location.pathname)}
+ {/* {renderContent(location.pathname)} */}
+
+ }/>
+ }/>
+ }/>
+ {/* }/> */}
+
+
diff --git a/src/index.js b/src/index.js
index 549a583..c83a42a 100644
--- a/src/index.js
+++ b/src/index.js
@@ -4,11 +4,13 @@ import './index.css';
import App from './App';
import reportWebVitals from './reportWebVitals';
import {BrowserRouter} from 'react-router-dom'
-import Drawer from './components/Drawer'
+
+
+
ReactDOM.render(
-
+
,
document.getElementById('root')
diff --git a/src/pages/Dashboard.jsx b/src/pages/Dashboard.jsx
index fa3000f..06bc8a0 100644
--- a/src/pages/Dashboard.jsx
+++ b/src/pages/Dashboard.jsx
@@ -1,5 +1,3 @@
-import React, { useEffect, useState } from 'react';
-import {Navigate} from 'react-router-dom'
function Dashboard(props) {
diff --git a/src/pages/Login.jsx b/src/pages/Login.jsx
index 72b2bbc..061acdb 100644
--- a/src/pages/Login.jsx
+++ b/src/pages/Login.jsx
@@ -15,7 +15,7 @@ function Login(props) {
)
.then((response)=>{
console.log(response)
- let token = response.data.token.access_token;
+ // let token = response.data.token.access_token;
let data = response.data;
localStorage.setItem('token', JSON.stringify(data))
})
diff --git a/src/pages/Products.jsx b/src/pages/Products.jsx
index e3fcba4..5c42151 100644
--- a/src/pages/Products.jsx
+++ b/src/pages/Products.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React from 'react';
function Products(props) {
From 78a4dae3c729519d76627bdc05efafbe8beda843 Mon Sep 17 00:00:00 2001
From: Mahmood83367 <84744874+Mahmood83367@users.noreply.github.com>
Date: Mon, 6 Dec 2021 20:54:36 +0300
Subject: [PATCH 02/17] Update App.js
---
src/App.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/App.js b/src/App.js
index e8ef067..9d9f23e 100644
--- a/src/App.js
+++ b/src/App.js
@@ -8,7 +8,6 @@ function App(props) {
return (
-{ console.log(location.pathname)
} {location.pathname ==='/login'? : }
From 527df777456e7276afc07b1bbf5ed522f457d3f3 Mon Sep 17 00:00:00 2001
From: Mahmood83367 <84744874+Mahmood83367@users.noreply.github.com>
Date: Mon, 6 Dec 2021 21:08:10 +0300
Subject: [PATCH 03/17] Update App.js
---
src/App.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/App.js b/src/App.js
index 9d9f23e..b5f0853 100644
--- a/src/App.js
+++ b/src/App.js
@@ -8,7 +8,7 @@ function App(props) {
return (
-} {location.pathname ==='/login'? : }
+ {location.pathname ==='/login'? : }
)
From fe30c325f619e2440899197a60beaa1af4cabbc2 Mon Sep 17 00:00:00 2001
From: Mahmood83367 <84744874+Mahmood83367@users.noreply.github.com>
Date: Tue, 7 Dec 2021 16:05:25 +0300
Subject: [PATCH 04/17] complete login page style
---
src/pages/Login.css | 56 +++++++++++++++++++++++++++++++++++++++++++++
src/pages/Login.jsx | 42 +++++++++++++++++++++++++++-------
2 files changed, 90 insertions(+), 8 deletions(-)
create mode 100644 src/pages/Login.css
diff --git a/src/pages/Login.css b/src/pages/Login.css
new file mode 100644
index 0000000..fcb0743
--- /dev/null
+++ b/src/pages/Login.css
@@ -0,0 +1,56 @@
+@media (min-width: 1000px) {
+ .css-123re6j {
+ padding-top: 120px;
+ padding-bottom: 120px;
+ }
+}
+@media (min-width: 0px) {
+ .css-123re6j {
+ padding-top: 60px;
+ padding-bottom: 60px;
+ }
+}
+@media (min-width: 600px) {
+ .css-123re6j {
+ max-width: 600px;
+ }
+}
+@media (min-width: 600px) {
+ .css-123re6j {
+ padding-left: 24px;
+ padding-right: 24px;
+ }
+}
+.css-123re6j {
+ width: 100%;
+ margin-left: auto;
+ box-sizing: border-box;
+ margin-right: auto;
+ display: block;
+ padding-left: 16px;
+ padding-right: 16px;
+}
+.css-xilcp4 {
+ background-color: rgb(17, 24, 39) !important;
+ color: rgb(237, 242, 247) !important ;
+ transition: box-shadow 300ms cubic-bezier(0.4, 0, 0.2, 1) 0ms !important;
+ border-radius: 8px !important;
+ box-shadow: rgb(0 0 0 / 24%) 0px 10px 15px !important;
+ background-image: none;
+ overflow: hidden;
+ padding: 32px;
+}
+.Boxclass {
+ align-items: center;
+ display: flex;
+ flex-direction: column;
+}
+.formStyle {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ height: 206px;
+}
+.css-1t8l2tu-MuiInputBase-input-MuiOutlinedInput-input {
+ color: white !important;
+}
diff --git a/src/pages/Login.jsx b/src/pages/Login.jsx
index 061acdb..6596aec 100644
--- a/src/pages/Login.jsx
+++ b/src/pages/Login.jsx
@@ -1,5 +1,13 @@
-import React from 'react';
+import * as React from 'react'
+import './Login.css'
+import Box from '@mui/material/Box'
+import Container from '@mui/material/Container'
import axios from '../utils/axios'
+import Paper from '@mui/material/Paper';
+import TextField from '@mui/material/TextField';
+import Button from '@mui/material/Button';
+
+
function Login(props) {
const [email, setEmail] = React.useState('')
@@ -24,13 +32,31 @@ function Login(props) {
})
}
return (
-
-
-
+
+
+
+
+
+ Login
+ Sign in on the internal platform
+
+
+
+
+
+
+
+
);
}
From 79d5c6b1f4603a1872da8642d1e4cf65a639e1ac Mon Sep 17 00:00:00 2001
From: Mahmood83367 <84744874+Mahmood83367@users.noreply.github.com>
Date: Fri, 10 Dec 2021 04:03:30 +0300
Subject: [PATCH 05/17] Complete 90%
---
package-lock.json | 16 ++
package.json | 1 +
public/index.html | 2 +-
src/App.js | 11 +-
src/components/Drawer.jsx | 42 +++--
src/index.js | 3 +-
src/pages/Auth.jsx | 80 ++++++++++
src/pages/Dashboard.jsx | 8 +-
src/pages/Login.css | 56 +++++++
src/pages/Login.jsx | 73 ++++++---
src/pages/ProductPage/AddItem.js | 21 +++
src/pages/ProductPage/AddItemComp.js | 115 +++++++++++++
src/pages/ProductPage/Button.js | 13 ++
src/pages/ProductPage/Content.js | 49 ++++++
src/pages/ProductPage/DeleteProduct.jsx | 11 ++
src/pages/ProductPage/Header.js | 21 +++
src/pages/ProductPage/Input.js | 21 +++
src/pages/ProductPage/OneProduct.js | 32 ++++
src/pages/ProductPage/Popup.js | 16 ++
src/pages/ProductPage/Product.js | 57 +++++++
src/pages/ProductPage/ProductDetials.jsx | 27 ++++
src/pages/ProductPage/ProductImage.jsx | 10 ++
src/pages/ProductPage/Products.js | 25 +++
src/pages/ProductPage/assisst/1.jpg | Bin 0 -> 5211 bytes
src/pages/ProductPage/assisst/2.jpg | Bin 0 -> 58458 bytes
src/pages/ProductPage/assisst/3.jpg | Bin 0 -> 27339 bytes
src/pages/ProductPage/assisst/4.jpg | Bin 0 -> 13400 bytes
src/pages/ProductPage/assisst/5.jpg | Bin 0 -> 97647 bytes
src/pages/ProductPage/styles.css | 195 +++++++++++++++++++++++
src/pages/Products.jsx | 12 --
src/pages/cart/Cart.jsx | 12 ++
src/pages/cart/ItemsCart.jsx | 52 ++++++
src/pages/ggg.js | 0
yarn.lock | 5 +
34 files changed, 926 insertions(+), 60 deletions(-)
create mode 100644 src/pages/Auth.jsx
create mode 100644 src/pages/Login.css
create mode 100644 src/pages/ProductPage/AddItem.js
create mode 100644 src/pages/ProductPage/AddItemComp.js
create mode 100644 src/pages/ProductPage/Button.js
create mode 100644 src/pages/ProductPage/Content.js
create mode 100644 src/pages/ProductPage/DeleteProduct.jsx
create mode 100644 src/pages/ProductPage/Header.js
create mode 100644 src/pages/ProductPage/Input.js
create mode 100644 src/pages/ProductPage/OneProduct.js
create mode 100644 src/pages/ProductPage/Popup.js
create mode 100644 src/pages/ProductPage/Product.js
create mode 100644 src/pages/ProductPage/ProductDetials.jsx
create mode 100644 src/pages/ProductPage/ProductImage.jsx
create mode 100644 src/pages/ProductPage/Products.js
create mode 100644 src/pages/ProductPage/assisst/1.jpg
create mode 100644 src/pages/ProductPage/assisst/2.jpg
create mode 100644 src/pages/ProductPage/assisst/3.jpg
create mode 100644 src/pages/ProductPage/assisst/4.jpg
create mode 100644 src/pages/ProductPage/assisst/5.jpg
create mode 100644 src/pages/ProductPage/styles.css
delete mode 100644 src/pages/Products.jsx
create mode 100644 src/pages/cart/Cart.jsx
create mode 100644 src/pages/cart/ItemsCart.jsx
create mode 100644 src/pages/ggg.js
diff --git a/package-lock.json b/package-lock.json
index 7a4ab34..aaca79b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,6 +5,7 @@
"requires": true,
"packages": {
"": {
+ "name": "axios-app",
"version": "0.1.0",
"dependencies": {
"@emotion/react": "^11.7.0",
@@ -18,6 +19,7 @@
"react": "^17.0.2",
"react-cookie": "^4.1.1",
"react-dom": "^17.0.2",
+ "react-icons": "^4.3.1",
"react-router-dom": "^6.0.2",
"react-scripts": "4.0.3",
"web-vitals": "^1.0.1"
@@ -14638,6 +14640,14 @@
"resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz",
"integrity": "sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew=="
},
+ "node_modules/react-icons": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.3.1.tgz",
+ "integrity": "sha512-cB10MXLTs3gVuXimblAdI71jrJx8njrJZmNMEMC+sQu5B/BIOmlsAjskdqpn81y8UBVEGuHODd7/ci5DvoSzTQ==",
+ "peerDependencies": {
+ "react": "*"
+ }
+ },
"node_modules/react-is": {
"version": "17.0.1",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.1.tgz",
@@ -30680,6 +30690,12 @@
"resolved": "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.9.tgz",
"integrity": "sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew=="
},
+ "react-icons": {
+ "version": "4.3.1",
+ "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.3.1.tgz",
+ "integrity": "sha512-cB10MXLTs3gVuXimblAdI71jrJx8njrJZmNMEMC+sQu5B/BIOmlsAjskdqpn81y8UBVEGuHODd7/ci5DvoSzTQ==",
+ "requires": {}
+ },
"react-is": {
"version": "17.0.1",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.1.tgz",
diff --git a/package.json b/package.json
index 2c613e9..2de7fca 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
"react": "^17.0.2",
"react-cookie": "^4.1.1",
"react-dom": "^17.0.2",
+ "react-icons": "^4.3.1",
"react-router-dom": "^6.0.2",
"react-scripts": "4.0.3",
"web-vitals": "^1.0.1"
diff --git a/public/index.html b/public/index.html
index aa069f2..cbb4fe7 100644
--- a/public/index.html
+++ b/public/index.html
@@ -26,7 +26,7 @@
-->
React App
-
+