bradtraversy · chaithrakulal · Dec 15, 2024 · Dec 15, 2024
diff --git a/.env.example b/.env.example
diff --git a/backend/config/db.js → backend/src/config/db.js b/backend/config/db.js → backend/src/config/db.js
diff --git a/backend/controllers/orderController.js → backend/src/controllers/orderController.js b/backend/controllers/orderController.js → backend/src/controllers/orderController.js
diff --git a/backend/controllers/productController.js → backend/src/controllers/productController.js b/backend/controllers/productController.js → backend/src/controllers/productController.js
diff --git a/backend/controllers/userController.js → backend/src/controllers/userController.js b/backend/controllers/userController.js → backend/src/controllers/userController.js
diff --git a/backend/data/products.js → backend/src/data/products.js b/backend/data/products.js → backend/src/data/products.js
diff --git a/backend/data/users.js → backend/src/data/users.js b/backend/data/users.js → backend/src/data/users.js
diff --git a/backend/middleware/asyncHandler.js → backend/src/middleware/asyncHandler.js b/backend/middleware/asyncHandler.js → backend/src/middleware/asyncHandler.js
diff --git a/backend/middleware/authMiddleware.js → backend/src/middleware/authMiddleware.js b/backend/middleware/authMiddleware.js → backend/src/middleware/authMiddleware.js
diff --git a/backend/middleware/checkObjectId.js → backend/src/middleware/checkObjectId.js b/backend/middleware/checkObjectId.js → backend/src/middleware/checkObjectId.js
diff --git a/backend/middleware/errorMiddleware.js → backend/src/middleware/errorMiddleware.js b/backend/middleware/errorMiddleware.js → backend/src/middleware/errorMiddleware.js
diff --git a/backend/models/orderModel.js → backend/src/models/orderModel.js b/backend/models/orderModel.js → backend/src/models/orderModel.js
diff --git a/backend/models/productModel.js → backend/src/models/productModel.js b/backend/models/productModel.js → backend/src/models/productModel.js
diff --git a/backend/models/userModel.js → backend/src/models/userModel.js b/backend/models/userModel.js → backend/src/models/userModel.js
diff --git a/backend/routes/orderRoutes.js → backend/src/routes/orderRoutes.js b/backend/routes/orderRoutes.js → backend/src/routes/orderRoutes.js
diff --git a/backend/routes/productRoutes.js → backend/src/routes/productRoutes.js b/backend/routes/productRoutes.js → backend/src/routes/productRoutes.js
diff --git a/backend/routes/uploadRoutes.js → backend/src/routes/uploadRoutes.js b/backend/routes/uploadRoutes.js → backend/src/routes/uploadRoutes.js
diff --git a/backend/routes/userRoutes.js → backend/src/routes/userRoutes.js b/backend/routes/userRoutes.js → backend/src/routes/userRoutes.js
diff --git a/backend/seeder.js → backend/src/seeder.js b/backend/seeder.js → backend/src/seeder.js
diff --git a/backend/server.js → backend/src/server.js b/backend/server.js → backend/src/server.js
diff --git a/backend/utils/calcPrices.js → backend/src/utils/calcPrices.js b/backend/utils/calcPrices.js → backend/src/utils/calcPrices.js
diff --git a/backend/utils/generateToken.js → backend/src/utils/generateToken.js b/backend/utils/generateToken.js → backend/src/utils/generateToken.js
diff --git a/backend/utils/paypal.js → backend/src/utils/paypal.js b/backend/utils/paypal.js → backend/src/utils/paypal.js
diff --git a/frontend/.gitignore b/frontend/.gitignore
@@ -0,0 +1,11 @@
+.vercel
+# dependencies
+node_modules
+/node_modules
+
+# production
+/build
+
+# misc
+.DS_Store
+.env
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/public/images/airpods.jpg b/frontend/public/images/airpods.jpg
diff --git a/frontend/public/images/alexa.jpg b/frontend/public/images/alexa.jpg
diff --git a/frontend/public/images/camera.jpg b/frontend/public/images/camera.jpg
diff --git a/frontend/public/images/mouse.jpg b/frontend/public/images/mouse.jpg
diff --git a/frontend/public/images/phone.jpg b/frontend/public/images/phone.jpg
diff --git a/frontend/public/images/playstation.jpg b/frontend/public/images/playstation.jpg
diff --git a/frontend/public/images/salwar1.jpg b/frontend/public/images/salwar1.jpg
diff --git a/frontend/public/images/salwar2.jpg b/frontend/public/images/salwar2.jpg
diff --git a/frontend/public/images/salwar3.jpg b/frontend/public/images/salwar3.jpg
diff --git a/frontend/public/images/sample.jpg b/frontend/public/images/sample.jpg
diff --git a/frontend/public/images/screens.png b/frontend/public/images/screens.png
diff --git a/frontend/src/components/Product.jsx b/frontend/src/components/Product.jsx
@@ -23,7 +23,7 @@ const Product = ({ product }) => {
           />
         </Card.Text>
 
-        <Card.Text as='h3'>${product.price}</Card.Text>
+        <Card.Text as='h3'>₹{product.price}</Card.Text>
       </Card.Body>
     </Card>
   );

diff --git a/frontend/src/components/ProductCarousel.jsx b/frontend/src/components/ProductCarousel.jsx
@@ -16,7 +16,7 @@ const ProductCarousel = () => {
             <Image src={product.image} alt={product.name} fluid />
             <Carousel.Caption className='carousel-caption'>
               <h2 className='text-white text-right'>
-                {product.name} (${product.price})
+                {product.name} (₹{product.price})
               </h2>
             </Carousel.Caption>
           </Link>

diff --git a/frontend/src/screens/HomeScreen.jsx b/frontend/src/screens/HomeScreen.jsx
@@ -16,7 +16,7 @@ const HomeScreen = () => {
     keyword,
     pageNumber,
   });
-
+  console.log('data', data);
   return (
     <>
       {!keyword ? (

diff --git a/frontend/src/screens/OrderScreen.jsx b/frontend/src/screens/OrderScreen.jsx
@@ -190,25 +190,25 @@ const OrderScreen = () => {
               <ListGroup.Item>
                 <Row>
                   <Col>Items</Col>
-                  <Col>${order.itemsPrice}</Col>
+                  <Col>₹{order.itemsPrice}</Col>
                 </Row>
               </ListGroup.Item>
               <ListGroup.Item>
                 <Row>
                   <Col>Shipping</Col>
-                  <Col>${order.shippingPrice}</Col>
+                  <Col>₹{order.shippingPrice}</Col>
                 </Row>
               </ListGroup.Item>
               <ListGroup.Item>
                 <Row>
                   <Col>Tax</Col>
-                  <Col>${order.taxPrice}</Col>
+                  <Col>₹{order.taxPrice}</Col>
                 </Row>
               </ListGroup.Item>
               <ListGroup.Item>
                 <Row>
                   <Col>Total</Col>
-                  <Col>${order.totalPrice}</Col>
+                  <Col>₹{order.totalPrice}</Col>
                 </Row>
               </ListGroup.Item>
               {!order.isPaid && (

diff --git a/frontend/src/screens/ProductScreen.jsx b/frontend/src/screens/ProductScreen.jsx
@@ -94,7 +94,7 @@ const ProductScreen = () => {
                     text={`${product.numReviews} reviews`}
                   />
                 </ListGroup.Item>
-                <ListGroup.Item>Price: ${product.price}</ListGroup.Item>
+                <ListGroup.Item>Price: ₹{product.price}</ListGroup.Item>
                 <ListGroup.Item>
                   Description: {product.description}
                 </ListGroup.Item>
@@ -107,7 +107,7 @@ const ProductScreen = () => {
                     <Row>
                       <Col>Price:</Col>
                       <Col>
-                        <strong>${product.price}</strong>
+                        <strong>₹{product.price}</strong>
                       </Col>
                     </Row>
                   </ListGroup.Item>

diff --git a/frontend/src/screens/admin/OrderListScreen.jsx b/frontend/src/screens/admin/OrderListScreen.jsx
@@ -36,7 +36,7 @@ const OrderListScreen = () => {
                 <td>{order._id}</td>
                 <td>{order.user && order.user.name}</td>
                 <td>{order.createdAt.substring(0, 10)}</td>
-                <td>${order.totalPrice}</td>
+                <td>₹{order.totalPrice}</td>
                 <td>
                   {order.isPaid ? (
                     order.paidAt.substring(0, 10)

diff --git a/frontend/src/screens/admin/ProductListScreen.jsx b/frontend/src/screens/admin/ProductListScreen.jsx
@@ -83,7 +83,7 @@ const ProductListScreen = () => {
                 <tr key={product._id}>
                   <td>{product._id}</td>
                   <td>{product.name}</td>
-                  <td>${product.price}</td>
+                  <td>₹{product.price}</td>
                   <td>{product.category}</td>
                   <td>{product.brand}</td>
                   <td>

diff --git a/frontend/src/screens/admin/RazorPay.js b/frontend/src/screens/admin/RazorPay.js
@@ -0,0 +1,9 @@
+// const Razorpay = require('razorpay');
+import { Razorpay } from 'razorpay';
+
+const razorpayInstance = new Razorpay({
+  key_id: 'YOUR_RAZORPAY_KEY_ID',
+  key_secret: 'YOUR_RAZORPAY_KEY_SECRET',
+});
+
+module.exports = razorpayInstance;
diff --git a/frontend/src/slices/apiSlice.js b/frontend/src/slices/apiSlice.js
@@ -13,6 +13,7 @@ const baseQuery = fetchBaseQuery({
 });
 
 async function baseQueryWithAuth(args, api, extra) {
+  console.log('api', api);
   const result = await baseQuery(args, api, extra);
   // Dispatch the logout action on 401.
   if (result.error && result.error.status === 401) {

diff --git a/frontend/src/slices/authSlice.js b/frontend/src/slices/authSlice.js
@@ -5,7 +5,7 @@ const initialState = {
     ? JSON.parse(localStorage.getItem('userInfo'))
     : null,
 };
-
+console.log('initialState', initialState);
 const authSlice = createSlice({
   name: 'auth',
   initialState,