-
1 review for "Colorful Stylish Shirt"
-
-

-
-
John Doe - 01 Jan 2045
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {product?.longDescription}
+
+
+
+
+
+
1 review for "{product?.name}"
+
+

+
+
John Doe - 01 Jan 2045
+
+
+
+
+
+
+
+
Diam amet duo labore stet elitr ea clita ipsum, tempor labore accusam ipsum et no at. Kasd diam tempor rebum magna dolores sed sed eirmod ipsum.
-
Diam amet duo labore stet elitr ea clita ipsum, tempor labore accusam ipsum
- et no at. Kasd diam tempor rebum magna dolores sed sed eirmod ipsum.
-
-
-
Leave a review
-
Your email address will not be published. Required fields are marked *
-
-
Your Rating * :
-
-
-
-
-
-
+
+
Để lại đánh giá và nhận xét của bạn
+
Địa chỉ email của bạn sẽ không được công khai. Các trường bắt buộc được đánh dấu *
+
+
Đánh giá của bạn * :
+
+
+
+
+
+
+
+
-
-
+
-
)
}
diff --git a/app/src/theme/theme.ts b/app/src/theme/theme.ts
new file mode 100644
index 000000000..398e9d10e
--- /dev/null
+++ b/app/src/theme/theme.ts
@@ -0,0 +1,31 @@
+import {createTheme} from "@mui/material/styles";
+
+const theme = createTheme({
+ components: {
+ MuiTabs: {
+ styleOverrides: {
+ indicator: {
+ backgroundColor: "#D19C97",
+ }
+ }
+ },
+ MuiTab: {
+ styleOverrides: {
+ root: {
+ fontFamily: 'Manrope',
+ fontSize: '1rem',
+ textTransform: 'capitalize',
+ letterSpacing: '-0.5px',
+ '&.Mui-selected': {
+ color: "#D19C97",
+ fontWeight: 800,
+ border: 'none',
+ outline:'none'
+ }
+ }
+ }
+ }
+ }
+})
+
+export default theme;
\ No newline at end of file
From c62cd618107034907c3cd328065e3866cd44eb5f Mon Sep 17 00:00:00 2001
From: john9101 <21130319@st.hcmuaf.edu.vn>
Date: Mon, 10 Jun 2024 12:44:30 +0700
Subject: [PATCH 08/66] slipt navbar
---
app/package-lock.json | 165 ++++++++----------
app/src/components/SingelCarousel.tsx | 40 +++++
app/src/components/common/Navbar.tsx | 46 +----
app/src/pages/MainLayout.tsx | 2 +
app/src/pages/ProductDetail.tsx | 9 +-
app/yarn.lock | 134 ++++++++------
server/index.ts | 2 +
.../src/controllers/categories.controllers.ts | 11 ++
.../src/controllers/products.controllers.ts | 2 +-
server/src/routes/catogories.routes.ts | 7 +
server/src/services/categories.services.ts | 14 ++
11 files changed, 239 insertions(+), 193 deletions(-)
create mode 100644 app/src/components/SingelCarousel.tsx
create mode 100644 server/src/controllers/categories.controllers.ts
create mode 100644 server/src/routes/catogories.routes.ts
create mode 100644 server/src/services/categories.services.ts
diff --git a/app/package-lock.json b/app/package-lock.json
index 594d05098..cb79892de 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -14,6 +14,8 @@
"@fortawesome/free-brands-svg-icons": "^6.5.2",
"@fortawesome/free-regular-svg-icons": "^6.5.2",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
+ "@fortawesome/react-fontawesome": "^0.2.2",
+ "@mui/icons-material": "^5.15.18",
"@mui/material": "^5.15.18",
"@reduxjs/toolkit": "^2.2.5",
"@testing-library/jest-dom": "^5.17.0",
@@ -2795,6 +2797,18 @@
"node": ">=6"
}
},
+ "node_modules/@fortawesome/react-fontawesome": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.2.tgz",
+ "integrity": "sha512-EnkrprPNqI6SXJl//m29hpaNzOp1bruISWaOiRtkMi/xSvHJlzc2j2JAYS7egxt/EbjSNV/k6Xy0AQI6vB2+1g==",
+ "dependencies": {
+ "prop-types": "^15.8.1"
+ },
+ "peerDependencies": {
+ "@fortawesome/fontawesome-svg-core": "~1 || ~6",
+ "react": ">=16.3"
+ }
+ },
"node_modules/@humanwhocodes/config-array": {
"version": "0.11.14",
"resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz",
@@ -3634,6 +3648,31 @@
"url": "https://opencollective.com/mui-org"
}
},
+ "node_modules/@mui/icons-material": {
+ "version": "5.15.19",
+ "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.15.19.tgz",
+ "integrity": "sha512-RsEiRxA5azN9b8gI7JRqekkgvxQUlitoBOtZglflb8cUDyP12/cP4gRwhb44Ea1/zwwGGjAj66ZJpGHhKfibNA==",
+ "dependencies": {
+ "@babel/runtime": "^7.23.9"
+ },
+ "engines": {
+ "node": ">=12.0.0"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/mui-org"
+ },
+ "peerDependencies": {
+ "@mui/material": "^5.0.0",
+ "@types/react": "^17.0.0 || ^18.0.0",
+ "react": "^17.0.0 || ^18.0.0"
+ },
+ "peerDependenciesMeta": {
+ "@types/react": {
+ "optional": true
+ }
+ }
+ },
"node_modules/@mui/material": {
"version": "5.15.18",
"resolved": "https://registry.npmjs.org/@mui/material/-/material-5.15.18.tgz",
@@ -4072,6 +4111,38 @@
"react-dom": ">=16.9.0"
}
},
+ "node_modules/@reduxjs/toolkit": {
+ "version": "2.2.5",
+ "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.2.5.tgz",
+ "integrity": "sha512-aeFA/s5NCG7NoJe/MhmwREJxRkDs0ZaSqt0MxhWUrwCf1UQXpwR87RROJEql0uAkLI6U7snBOYOcKw83ew3FPg==",
+ "dependencies": {
+ "immer": "^10.0.3",
+ "redux": "^5.0.1",
+ "redux-thunk": "^3.1.0",
+ "reselect": "^5.1.0"
+ },
+ "peerDependencies": {
+ "react": "^16.9.0 || ^17.0.0 || ^18",
+ "react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0"
+ },
+ "peerDependenciesMeta": {
+ "react": {
+ "optional": true
+ },
+ "react-redux": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/@reduxjs/toolkit/node_modules/immer": {
+ "version": "10.1.1",
+ "resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz",
+ "integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==",
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/immer"
+ }
+ },
"node_modules/@remix-run/router": {
"version": "1.16.1",
"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.16.1.tgz",
@@ -4462,95 +4533,6 @@
"url": "https://github.com/sponsors/gregberge"
}
},
- "node_modules/@testing-library/dom": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.1.0.tgz",
- "integrity": "sha512-wdsYKy5zupPyLCW2Je5DLHSxSfbIp6h80WoHOQc+RPtmPGA52O9x5MJEkv92Sjonpq+poOAtUKhh1kBGAXBrNA==",
- "peer": true,
- "dependencies": {
- "@babel/code-frame": "^7.10.4",
- "@babel/runtime": "^7.12.5",
- "@types/aria-query": "^5.0.1",
- "aria-query": "5.3.0",
- "chalk": "^4.1.0",
- "dom-accessibility-api": "^0.5.9",
- "lz-string": "^1.5.0",
- "pretty-format": "^27.0.2"
- },
- "engines": {
- "node": ">=18"
- }
- },
- "node_modules/@testing-library/dom/node_modules/ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "peer": true,
- "dependencies": {
- "color-convert": "^2.0.1"
- },
- "engines": {
- "node": ">=8"
- },
- "funding": {
- "url": "https://github.com/chalk/ansi-styles?sponsor=1"
- }
- },
- "node_modules/@testing-library/dom/node_modules/chalk": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
- "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
- "peer": true,
- "dependencies": {
- "ansi-styles": "^4.1.0",
- "supports-color": "^7.1.0"
- },
- "engines": {
- "node": ">=10"
- },
- "funding": {
- "url": "https://github.com/chalk/chalk?sponsor=1"
- }
- },
- "node_modules/@testing-library/dom/node_modules/color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "peer": true,
- "dependencies": {
- "color-name": "~1.1.4"
- },
- "engines": {
- "node": ">=7.0.0"
- }
- },
- "node_modules/@testing-library/dom/node_modules/color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "peer": true
- },
- "node_modules/@testing-library/dom/node_modules/has-flag": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
- "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
- "peer": true,
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/@testing-library/dom/node_modules/supports-color": {
- "version": "7.2.0",
- "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
- "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
- "peer": true,
- "dependencies": {
- "has-flag": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/@testing-library/jest-dom": {
"version": "5.17.0",
"resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.17.0.tgz",
@@ -17250,6 +17232,11 @@
"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
},
+ "node_modules/reselect": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz",
+ "integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w=="
+ },
"node_modules/resize-observer-polyfill": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
diff --git a/app/src/components/SingelCarousel.tsx b/app/src/components/SingelCarousel.tsx
new file mode 100644
index 000000000..6125d5013
--- /dev/null
+++ b/app/src/components/SingelCarousel.tsx
@@ -0,0 +1,40 @@
+const SingleCarousel = ()=>{
+ return (
+
+ )
+}
+
+export default SingleCarousel
\ No newline at end of file
diff --git a/app/src/components/common/Navbar.tsx b/app/src/components/common/Navbar.tsx
index a9c3447a7..294ee6094 100644
--- a/app/src/components/common/Navbar.tsx
+++ b/app/src/components/common/Navbar.tsx
@@ -1,4 +1,9 @@
+import { useLocation } from "react-router-dom";
+import SingleCarousel from "../SingelCarousel";
+
const Navbar = () => {
+ const {pathname} = useLocation()
+ const isHomePage = pathname === '/'
return (
@@ -65,46 +70,7 @@ const Navbar = () => {
-
+ {isHomePage &&
}