diff --git a/public/src/Components/Landing/main.jsx b/public/src/Components/Landing/main.jsx
index 55f74d5..c81e39d 100644
--- a/public/src/Components/Landing/main.jsx
+++ b/public/src/Components/Landing/main.jsx
@@ -7,6 +7,7 @@ import Sections from "./component/Sections";
const Main = () => {
return (
+
diff --git a/public/src/Components/Products/LoggedProduct.jsx b/public/src/Components/Products/LoggedProduct.jsx
deleted file mode 100644
index ab56f89..0000000
--- a/public/src/Components/Products/LoggedProduct.jsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import BestProducts from "./component/BestProducts";
-import Cellphones from "./component/Cellphones";
-import Computers from "./component/Computers";
-import Footer from "./component/Footer";
-import News from "./component/News";
-import Products from "./component/Products";
-import Search from "./component/Search";
-
-
-
-const LoggedProduct = () =>{
- return(
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- )
-}
-
-export default LoggedProduct;
\ No newline at end of file
diff --git a/public/src/Components/SignUpForm/index.jsx b/public/src/Components/SignUpForm/index.jsx
index 5b5bf46..0ff775e 100644
--- a/public/src/Components/SignUpForm/index.jsx
+++ b/public/src/Components/SignUpForm/index.jsx
@@ -39,8 +39,9 @@ const SignUpForm = () => {
})
.then((res) => {
console.log(res);
- if (res.data.status === 'success') {
- alert('SignUp Success');
+ if (res.status === 200) {
+ alert(res.data.message);
+ window.location.href = '/';
}
});
} else {
diff --git a/server/app.js b/server/app.js
index 870b845..798dfb3 100644
--- a/server/app.js
+++ b/server/app.js
@@ -1,6 +1,7 @@
const express = require('express');
const compression = require('compression');
const cookieParser = require('cookie-parser');
+const request = require('request');
const router = require('./router');
require('dotenv').config();
@@ -8,7 +9,7 @@ const app = express();
const { PORT } = process.env;
app.set('port', PORT || 3000);
-
+app.set('trust proxy', true);
app.disable('x-powered-by');
app.use([
express.json(),
@@ -19,4 +20,21 @@ app.use([
app.use('/api/v1', router);
+app.get('/location', (req, res) => {
+ const ipAddress = req.ip;
+ console.log(ipAddress);
+ const apiUrl = `http://ip-api.com/json/${ipAddress}`;
+
+ request(apiUrl, (error, response, body) => {
+ if (!error && response.statusCode === 200) {
+ const locationData = JSON.parse(body);
+ console.log(locationData);
+ const location = `${locationData.city}, ${locationData.regionName}, ${locationData.country}`;
+ res.send(location);
+ } else {
+ res.send('Unable to determine your location');
+ }
+ });
+});
+
module.exports = app;
diff --git a/server/controller/cart/getCart.js b/server/controller/cart/getCart.js
index 6272fb7..b8b477d 100644
--- a/server/controller/cart/getCart.js
+++ b/server/controller/cart/getCart.js
@@ -1,7 +1,8 @@
const { getCartQuery } = require('../../database/query');
const getCart = (req, res) => {
- getCartQuery()
+ const { id } = req.user;
+ getCartQuery(id)
.then((data) => {
res.status(200).json(data.rows);
})
diff --git a/server/controller/homeController.js b/server/controller/homeController.js
index 91ded14..1588b04 100644
--- a/server/controller/homeController.js
+++ b/server/controller/homeController.js
@@ -1,9 +1,28 @@
+const { verifyToken } = require('../utils');
+
const homeController = (req, res) => {
- res.json({
- error: false,
- data: {
- message: 'Happy Hacking! 🚀',
- },
+ const { token } = req.cookies;
+
+ if (!token) {
+ return res.json({
+ success: false,
+ message: 'not logged in',
+ });
+ }
+ const decoded = verifyToken(token);
+
+ if (decoded) {
+ return res.json({
+ success: true,
+ message: 'logged in',
+ data: {
+ username: decoded.username, // always undefined
+ },
+ });
+ }
+ return res.json({
+ success: false,
+ message: 'invalid token',
});
};
diff --git a/server/database/query/cart/getCartQuery.js b/server/database/query/cart/getCartQuery.js
index daa8ca0..8f8573c 100644
--- a/server/database/query/cart/getCartQuery.js
+++ b/server/database/query/cart/getCartQuery.js
@@ -2,7 +2,7 @@ const connection = require('../../config/connection');
const getCartQuery = (id) => {
const sql = {
- text: `select products.name from cart join
+ text: `select products.id, products.name,products.image ,products.price,products.category,cart.quantity from cart join
products ON products.id = cart.product_id
where cart.user_id = $1`,
values: [id],
diff --git a/server/router/index.js b/server/router/index.js
index 07e310b..d8b59e9 100644
--- a/server/router/index.js
+++ b/server/router/index.js
@@ -7,8 +7,7 @@ const userRouter = require('./userRouter');
router.use('/', mainPageRouter);
router.use('/products', productsRouter);
-router.use('/cart',checkAuth, cartRouter);
+router.use('/cart', checkAuth, cartRouter);
router.use('/user', userRouter);
module.exports = router;
-
From d73fb7b96a2ba093ae5d28aa32a18b03fc3d3f6c Mon Sep 17 00:00:00 2001
From: Ahmed Izz Murtaja <56529633+ahmedmurtaja@users.noreply.github.com>
Date: Sat, 27 May 2023 20:18:09 +0300
Subject: [PATCH 02/16] edit
---
public/src/Components/Cart/Cart.jsx | 2 +-
public/src/Components/Cart/CartItem.jsx | 64 +++++++++++++++++++++++++
server/controller/cart/getCart.js | 10 +++-
3 files changed, 74 insertions(+), 2 deletions(-)
create mode 100644 public/src/Components/Cart/CartItem.jsx
diff --git a/public/src/Components/Cart/Cart.jsx b/public/src/Components/Cart/Cart.jsx
index 876135e..b447db8 100644
--- a/public/src/Components/Cart/Cart.jsx
+++ b/public/src/Components/Cart/Cart.jsx
@@ -43,7 +43,7 @@ const Cart = () => {
useEffect(() => {
-
+ setCardsItems(data)
}, [])
const removeItem = ({id}) => {
diff --git a/public/src/Components/Cart/CartItem.jsx b/public/src/Components/Cart/CartItem.jsx
new file mode 100644
index 0000000..fa06c07
--- /dev/null
+++ b/public/src/Components/Cart/CartItem.jsx
@@ -0,0 +1,64 @@
+const CartItem = ({
+ name,
+ category,
+ totalPrice,
+ id,
+ quantity,
+ removeItem,
+ handleAdd,
+ handleSubtract,
+}) => {
+ return (
+ <>
+
+
+
+
+
{name}
+
{category}
+ {/* suppose to be button */}
+
{
+ removeItem({ id });
+ }}
+ >
+ Remove
+
+
+
+
+
+
+ {quantity}
+
+
+
+
+
${totalPrice}
+
+
+ );
+};
+
+export default CartItem;
diff --git a/server/controller/cart/getCart.js b/server/controller/cart/getCart.js
index b8b477d..c24a6bb 100644
--- a/server/controller/cart/getCart.js
+++ b/server/controller/cart/getCart.js
@@ -4,7 +4,15 @@ const getCart = (req, res) => {
const { id } = req.user;
getCartQuery(id)
.then((data) => {
- res.status(200).json(data.rows);
+ const dataWithTotal = data.rows.map((item) => {
+ const totalPrice = item.price * item.quantity;
+ return { ...item, totalPrice };
+ });
+ const total = dataWithTotal.reduce(
+ (acc, item) => acc + item.totalPrice,
+ 0,
+ );
+ res.status(200).json({ dataWithTotal, total });
})
.catch((err) => res.status(500).send(err));
};
From 0d974d93a2401a1cca89ca3fe1d424dff342b5d1 Mon Sep 17 00:00:00 2001
From: Ahmed Izz Murtaja <56529633+ahmedmurtaja@users.noreply.github.com>
Date: Sat, 27 May 2023 20:19:25 +0300
Subject: [PATCH 03/16] edit
---
server/controller/cart/getCart.js | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/server/controller/cart/getCart.js b/server/controller/cart/getCart.js
index c24a6bb..6272fb7 100644
--- a/server/controller/cart/getCart.js
+++ b/server/controller/cart/getCart.js
@@ -1,18 +1,9 @@
const { getCartQuery } = require('../../database/query');
const getCart = (req, res) => {
- const { id } = req.user;
- getCartQuery(id)
+ getCartQuery()
.then((data) => {
- const dataWithTotal = data.rows.map((item) => {
- const totalPrice = item.price * item.quantity;
- return { ...item, totalPrice };
- });
- const total = dataWithTotal.reduce(
- (acc, item) => acc + item.totalPrice,
- 0,
- );
- res.status(200).json({ dataWithTotal, total });
+ res.status(200).json(data.rows);
})
.catch((err) => res.status(500).send(err));
};
From a59b4e0f02d9551cdb10e352e5082fa4bbe2d13b Mon Sep 17 00:00:00 2001
From: Ahmed Izz Murtaja <56529633+ahmedmurtaja@users.noreply.github.com>
Date: Sat, 27 May 2023 20:19:44 +0300
Subject: [PATCH 04/16] edit
---
server/controller/cart/getCart.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/server/controller/cart/getCart.js b/server/controller/cart/getCart.js
index 6272fb7..b8b477d 100644
--- a/server/controller/cart/getCart.js
+++ b/server/controller/cart/getCart.js
@@ -1,7 +1,8 @@
const { getCartQuery } = require('../../database/query');
const getCart = (req, res) => {
- getCartQuery()
+ const { id } = req.user;
+ getCartQuery(id)
.then((data) => {
res.status(200).json(data.rows);
})
From e8e4a9ae74e3717a28f650ba666fb593e1a2e485 Mon Sep 17 00:00:00 2001
From: Ahmed Izz Murtaja <56529633+ahmedmurtaja@users.noreply.github.com>
Date: Sat, 27 May 2023 21:20:34 +0300
Subject: [PATCH 05/16] edit
---
public/src/Components/Cart/Cart.jsx | 218 ++++++++++++++++------------
server/controller/cart/quantity.js | 8 +-
server/router/cartRouter.js | 5 +-
3 files changed, 133 insertions(+), 98 deletions(-)
diff --git a/public/src/Components/Cart/Cart.jsx b/public/src/Components/Cart/Cart.jsx
index b447db8..a42462b 100644
--- a/public/src/Components/Cart/Cart.jsx
+++ b/public/src/Components/Cart/Cart.jsx
@@ -1,97 +1,122 @@
import { useState, useEffect } from 'react';
import './cart.css';
import CartItem from './CartItem';
-import { Link ,NavLink } from 'react-router-dom';
-
-
-const data = [
- {
- id: '1',
- image: './images/product-03.jpg',
- name: 'IPhone',
- category: 'Mobile',
- price: 350,
- totalPrice: 350,
- quantity: 1,
- },
- {
- id: '2',
- image: './images/product-03.jpg',
- name: 'IPhone1',
- category: 'Mobile1',
- price: 250,
- totalPrice: 250,
- quantity: 1,
-
- },
- {
- id: '3',
- image: './images/product-03.jpg',
- name: 'IPhone2',
- category: 'Mobile2',
- price: 220,
- totalPrice: 220,
- quantity: 1,
-
- },
-]
+import { Link, NavLink } from 'react-router-dom';
+import axios from 'axios';
+
+// const data = [
+// {
+// id: '1',
+// image: './images/product-03.jpg',
+// name: 'IPhone',
+// category: 'Mobile',
+// price: 350,
+// totalPrice: 350,
+// quantity: 1,
+// },
+// {
+// id: '2',
+// image: './images/product-03.jpg',
+// name: 'IPhone1',
+// category: 'Mobile1',
+// price: 250,
+// totalPrice: 250,
+// quantity: 1,
+
+// },
+// {
+// id: '3',
+// image: './images/product-03.jpg',
+// name: 'IPhone2',
+// category: 'Mobile2',
+// price: 220,
+// totalPrice: 220,
+// quantity: 1,
+
+// },
+// ]
const Cart = () => {
-
-
- const [cardsItems, setCardsItems] = useState([]);
-
-
- useEffect(() => {
- setCardsItems(data)
- }, [])
-
-const removeItem = ({id}) => {
- const result = cardsItems.filter(item => item.id !== id);
- setCardsItems(result)
-}
-
-const handleAdd = ({id}) => {
- const result = cardsItems.map(item => {
- if(item.id === id) {
- return {...item, quantity: item.quantity + 1, totalPrice: item.totalPrice+item.price}
- }else {
- return item
- }
- });
- setCardsItems(result)
-}
-const handleSubtract = ({id}) => {
- const selectedItem = cardsItems.find(item => item.id === id);
- if(selectedItem.quantity === 1) {
- return removeItem({id})
- }
- const result = cardsItems.map(item => {
- if(item.id === id) {
- return {...item, quantity: item.quantity - 1, totalPrice: item.totalPrice-item.price}
- }else {
- return item
- }
- });
- setCardsItems(result)
-}
-
-
-
- const handleItemsNumber = () => {
- const totalItems = cardsItems.reduce((sum, currentValue) => {
- return sum + currentValue.quantity
- }, 0)
- return totalItems
- }
-
- const handleTotalPrice = () => {
- const totalItems = cardsItems.reduce((sum, currentValue) => {
- return sum + currentValue.totalPrice
- }, 0)
- return totalItems
- }
-
+ const [cardsItems, setCardsItems] = useState([]);
+
+ useEffect(() => {
+ axios
+ .get('/api/v1/cart')
+ .then((res) => {
+ if (res.status === 200) {
+ setCardsItems(res.data);
+ }
+ })
+ .catch((err) => {
+ console.log(err);
+ });
+ }, []);
+
+ const removeItem = ({ id }) => {
+ const result = cardsItems.filter((item) => item.id !== id);
+ setCardsItems(result);
+ };
+
+ const handleAdd = ({ id }) => {
+ axios.post(`/api/v1/cart/increase/${id}`).then((res) => {
+ console.log(res);
+ if (res.status === 200) {
+ const result = cardsItems.map((item) => {
+ if (item.id === id) {
+ return {
+ ...item,
+ quantity: item.quantity + 1,
+ price: +item.price + item.price,
+ };
+ } else {
+ return item;
+ }
+ });
+ setCardsItems(result);
+ } else {
+ console.log('error');
+ }
+ });
+ };
+ const handleSubtract = ({ id }) => {
+ axios.post(`/api/v1/cart/decrease/${id}`).then((res) => {
+ console.log(res);
+ if (res.status === 200) {
+ const selectedItem = cardsItems.find((item) => item.id === id);
+ if (selectedItem.quantity === 1) {
+ return removeItem({ id });
+ }
+ const result = cardsItems.map((item) => {
+ if (item.id === id) {
+ return {
+ ...item,
+ quantity: item.quantity - 1,
+ totalPrice: +item.price * +item.quantity - +item.price,
+ };
+ } else {
+ return item;
+ }
+ });
+ setCardsItems(result);
+ } else {
+ console.log('error');
+ }
+ });
+ };
+
+ const handleItemsNumber = () => {
+ const totalItems = cardsItems.reduce((sum, currentValue) => {
+ return sum + currentValue.quantity;
+ }, 0);
+ return totalItems;
+ };
+
+ const handleTotalPrice = () => {
+ const totalItems = cardsItems.reduce((sum, currentValue) => {
+ return sum + currentValue.price * currentValue.quantity;
+ }, 0);
+ return totalItems;
+ };
return (
@@ -111,9 +136,16 @@ const handleSubtract = ({id}) => {
- {cardsItems.map(item => )}
-
-
+ {cardsItems.map((item) => (
+
+ ))}