From 2dd06b58c0b46bf10d63b2c608cd98bc3080e350 Mon Sep 17 00:00:00 2001
From: as4c <sagarkumarsameer@gmail.com>
Date: Fri, 8 Mar 2024 21:35:56 +0530
Subject: [PATCH 1/6] backend ready

---
 Backend/Dockerfile         | 23 +++++++++++++++++++
 Backend/docker-compose.yml | 36 ++++++++++++++++++++++++++++++
 Backend/requirements.txt   | 45 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 104 insertions(+)
 create mode 100644 Backend/Dockerfile
 create mode 100644 Backend/docker-compose.yml
 create mode 100644 Backend/requirements.txt

diff --git a/Backend/Dockerfile b/Backend/Dockerfile
new file mode 100644
index 0000000..07d3e96
--- /dev/null
+++ b/Backend/Dockerfile
@@ -0,0 +1,23 @@
+FROM python:3.10 
+
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONUNBUFFERED 1
+
+# Set the working directory in the container
+WORKDIR /opt/app
+
+RUN pip install --upgrade pip
+# Copy the requirements file into the container
+COPY ./requirements.txt /opt/app
+
+# Install the required packages
+RUN pip install -r requirements.txt
+
+# Copy the Django backend files into the container
+COPY . /opt/app 
+
+# Expose port 8000 for the Django server
+EXPOSE 8000
+
+# Run the Django server
+CMD ["python", "manage.py", "runserver", "0.0.0.0:8000"]
\ No newline at end of file
diff --git a/Backend/docker-compose.yml b/Backend/docker-compose.yml
new file mode 100644
index 0000000..2eb0c94
--- /dev/null
+++ b/Backend/docker-compose.yml
@@ -0,0 +1,36 @@
+version: '3'
+
+services:
+  web:
+    build: .
+    command: python manage.py runserver 0.0.0.0:8000
+    volumes:
+      - .:/app
+    ports:
+      - "8000:8000"
+    depends_on:
+      - db
+    environment:
+      DJANGO_SETTINGS_MODULE: "backend.settings"
+      POSTGRES_DB: ${DB_NAME}
+      POSTGRES_USER: ${DB_USER}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+    networks:
+      - backend
+
+  db:
+    image: postgres:latest
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_DB: ${DATABASE_NAME}
+      POSTGRES_USER: ${DB_USER}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+    networks:
+      - backend
+
+networks:
+  backend:
+
+volumes:
+  postgres_data:
diff --git a/Backend/requirements.txt b/Backend/requirements.txt
new file mode 100644
index 0000000..077174c
--- /dev/null
+++ b/Backend/requirements.txt
@@ -0,0 +1,45 @@
+asgiref==3.7.2
+cachetools==5.3.2
+certifi==2023.11.17
+cffi==1.16.0
+charset-normalizer==3.3.2
+cloudinary==1.39.0
+cryptography==41.0.7
+defusedxml==0.7.1
+dj-database-url==2.1.0
+dj-rest-auth==5.0.2
+Django==5.0
+django-allauth==0.59.0
+django-ckeditor==6.7.1
+django-cloudinary-storage==0.3.0
+django-cors-headers==4.3.1
+django-environ==0.11.2
+django-js-asset==2.2.0
+djangorestframework==3.14.0
+djangorestframework-simplejwt==5.3.1
+google-auth==2.25.2
+google-auth-httplib2==0.2.0
+google-auth-oauthlib==1.2.0
+httplib2==0.22.0
+idna==3.6
+oauthlib==3.2.2
+Pillow==10.1.0
+psycopg2==2.9.9
+psycopg2-binary==2.9.9
+pyasn1==0.5.1
+pyasn1-modules==0.3.0
+pycparser==2.21
+PyJWT==2.8.0
+pyparsing==3.1.1
+python-dotenv==1.0.0
+python3-openid==3.2.0
+pytube==15.0.0
+pytz==2023.3.post1
+razorpay==1.4.1
+requests==2.31.0
+requests-oauthlib==1.3.1
+rsa==4.9
+six==1.16.0
+sqlparse==0.4.4
+typing_extensions==4.9.0
+urllib3==2.1.0

From 0447787b257797091b7af3de73e29210f2b97601 Mon Sep 17 00:00:00 2001
From: as4c <sagarkumarsameer@gmail.com>
Date: Fri, 8 Mar 2024 21:37:30 +0530
Subject: [PATCH 2/6] frontend ready

---
 frontend/Dockerfile         | 23 +++++++++++++++++++++++
 frontend/docker-compose.yml | 14 ++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 frontend/Dockerfile
 create mode 100644 frontend/docker-compose.yml

diff --git a/frontend/Dockerfile b/frontend/Dockerfile
new file mode 100644
index 0000000..ad138de
--- /dev/null
+++ b/frontend/Dockerfile
@@ -0,0 +1,23 @@
+# Use the official Node image as the base image
+FROM node:20-alpine
+
+# Set the working directory inside the container
+WORKDIR /app
+
+# Copy package.json and package-lock.json to the working directory
+COPY package*.json ./
+
+# Install project dependencies
+RUN npm install
+
+# Copy the entire project to the working directory
+COPY . .
+
+# Build the React app
+RUN npm run build
+
+# Expose the port on which the app will run
+EXPOSE 3000
+
+# Command to start the application
+CMD ["npm", "start"]
diff --git a/frontend/docker-compose.yml b/frontend/docker-compose.yml
new file mode 100644
index 0000000..2ca8b32
--- /dev/null
+++ b/frontend/docker-compose.yml
@@ -0,0 +1,14 @@
+version: '3'
+
+services:
+  frontend:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - "3000:3000"
+    volumes:
+      - ./src:/app/src
+      - ./public:/app/public
+    environment:
+      - NODE_ENV=development

From 23128825e3921f268d70890fc74f1ce1c5d8a0e0 Mon Sep 17 00:00:00 2001
From: as4c <sagarkumarsameer@gmail.com>
Date: Fri, 8 Mar 2024 22:11:32 +0530
Subject: [PATCH 3/6] frontend ready

---
 frontend/src/category/AddCategory.js          |  4 +-
 frontend/src/helper/DisplayOrderList.jsx      |  3 +-
 frontend/src/helper/ProductFilter.jsx         |  2 +-
 frontend/src/homepage/Layout.jsx              |  2 -
 frontend/src/product/GetProduct.jsx           |  3 +-
 frontend/src/product/ProductList.jsx          |  1 -
 frontend/src/product/RelatedProduct.jsx       |  3 +-
 frontend/src/product/UpdateModal.jsx          |  6 +--
 frontend/src/product/UpdatePage.jsx           |  5 +--
 frontend/src/seller/OrderDashboard.jsx        |  2 +-
 frontend/src/seller/ProcessOrder.jsx          |  3 +-
 frontend/src/seller/SellerDashboard.jsx       |  2 +-
 frontend/src/seller/SellerProductLists.jsx    | 10 -----
 frontend/src/user/Profile.js                  |  2 -
 frontend/src/user/Signup.js                   |  1 -
 frontend/src/user/helper/userapicalls.js      |  3 +-
 frontend/src/useraction/cart/UserCart.jsx     |  3 +-
 frontend/src/useraction/order/OrderDetail.jsx |  4 +-
 .../src/useraction/order/OrderFromCart.jsx    | 41 ++++---------------
 frontend/src/useraction/order/OrderList.jsx   | 17 +-------
 .../src/useraction/order/OrderSummary.jsx     | 37 ++++-------------
 frontend/src/useraction/wishlist/Wishlist.jsx |  3 +-
 22 files changed, 33 insertions(+), 124 deletions(-)

diff --git a/frontend/src/category/AddCategory.js b/frontend/src/category/AddCategory.js
index 75dfcf5..0912d0d 100644
--- a/frontend/src/category/AddCategory.js
+++ b/frontend/src/category/AddCategory.js
@@ -30,11 +30,9 @@ const AddCategory = () => {
         };
 
     const onSubmit = async (e) => {
-        e.preventDefault();  // Corrected typo
-    
+        e.preventDefault();  
         const res1 = await dispatch(createCategory({ name, description }));
         const res = await unwrapResult(res1);
-        console.log("category res...", res);
         if (!res.errors) {
             Swal.fire({
                 icon: 'success',
diff --git a/frontend/src/helper/DisplayOrderList.jsx b/frontend/src/helper/DisplayOrderList.jsx
index 83f78dd..b2a39e8 100644
--- a/frontend/src/helper/DisplayOrderList.jsx
+++ b/frontend/src/helper/DisplayOrderList.jsx
@@ -1,6 +1,5 @@
 import React, { useState } from 'react';
 import { Link } from 'react-router-dom';
-import { BaseUrl } from '../backend';
 import {
     mapDeliveryTime,
     mapOderType,
@@ -38,7 +37,7 @@ const DisplayOrderList = ({ data }) => {
                             <Link to={`/user/seller/order-info/${order.order.uid}`} className='grid grid-cols-2' >
                                 <div className="flex flex-row mx-auto">
 
-                                    <img className='w-40 h-auto block mb-3' src={`${BaseUrl}/${order.product?.image}`} alt='product image' />
+                                    <img className='w-40 h-auto block mb-3' src={`${order.product?.image}`} alt='product image' />
                                     <div className="start inline">
                                         <svg xmlns="http://www.w3.org/2000/svg" className="h-5 w-5 text-yellow-400" viewBox="0 0 20 20" fill="currentColor">
                                             <path d="M9.049 2.927c.3-.921 1.603-.921 1.902 0l1.07 3.292a1 1 0 00.95.69h3.462c.969 0 1.371 1.24.588 1.81l-2.8 2.034a1 1 0 00-.364 1.118l1.07 3.292c.3.921-.755 1.688-1.54 1.118l-2.8-2.034a1 1 0 00-1.175 0l-2.8 2.034c-.784.57-1.838-.197-1.539-1.118l1.07-3.292a1 1 0 00-.364-1.118L2.98 8.72c-.783-.57-.38-1.81.588-1.81h3.461a1 1 0 00.951-.69l1.07-3.292z" />
diff --git a/frontend/src/helper/ProductFilter.jsx b/frontend/src/helper/ProductFilter.jsx
index a44d4d8..725f86d 100644
--- a/frontend/src/helper/ProductFilter.jsx
+++ b/frontend/src/helper/ProductFilter.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import React, { useState } from 'react'
 import { useDispatch } from 'react-redux';
 import { filterProduct } from '../features/actions/productActions';
 
diff --git a/frontend/src/homepage/Layout.jsx b/frontend/src/homepage/Layout.jsx
index ef7ef35..2500a04 100644
--- a/frontend/src/homepage/Layout.jsx
+++ b/frontend/src/homepage/Layout.jsx
@@ -1,8 +1,6 @@
 import React, { useEffect } from 'react';
 import Navbar from './Component/Navbar';
 import Footer from './Component/Footer';
-import { useDispatch, useSelector } from 'react-redux';
-import { refreshToken } from '../features/actions/authActions';
 import Categories from '../category/Categories';
 
 
diff --git a/frontend/src/product/GetProduct.jsx b/frontend/src/product/GetProduct.jsx
index 36df258..afc2e3e 100644
--- a/frontend/src/product/GetProduct.jsx
+++ b/frontend/src/product/GetProduct.jsx
@@ -3,7 +3,6 @@ import Layout from '../homepage/Layout'
 import { Link, useParams } from 'react-router-dom'
 import { useDispatch, useSelector } from 'react-redux'
 import { loadProductData, searchProduct } from '../features/actions/productActions'
-import { BaseUrl } from '../backend'
 import { timeAgo } from '../helper'
 import Loading from '../helper/Loading'
 import { unwrapResult } from '@reduxjs/toolkit';
@@ -79,7 +78,7 @@ const GetProduct = () => {
                 <div className='grid grid-cols-1 md:grid-cols-2 md:gap-5 w-5/6  p-3 shadow-lg'>
                     <div className='mx-5'>
                         <div className="overflow-hidden rounded-xl flex flex-grow">
-                            <img src={`${BaseUrl}/${product.image}`} alt="" />
+                            <img src={`${product.image}`} alt="" />
 
                         </div>
                     </div>
diff --git a/frontend/src/product/ProductList.jsx b/frontend/src/product/ProductList.jsx
index d1bf377..b0ebff0 100644
--- a/frontend/src/product/ProductList.jsx
+++ b/frontend/src/product/ProductList.jsx
@@ -1,7 +1,6 @@
 import React from 'react'
 import { Link } from 'react-router-dom'
 import { timeAgo } from '../helper'
-import { BaseUrl } from '../backend'
 import WishlistButton from './Component/WishlistButton'
 import CartButton from './Component/CartButton'
 import BuyNowButton from './Component/BuyNowButton'
diff --git a/frontend/src/product/RelatedProduct.jsx b/frontend/src/product/RelatedProduct.jsx
index 036cfa7..8649cc5 100644
--- a/frontend/src/product/RelatedProduct.jsx
+++ b/frontend/src/product/RelatedProduct.jsx
@@ -1,6 +1,5 @@
 import React from 'react'
 import { Link } from 'react-router-dom'
-import { BaseUrl } from '../backend'
 import { timeAgo } from '../helper'
 import WishlistButton from './Component/WishlistButton'
 
@@ -18,7 +17,7 @@ const RelatedProduct = ({ data }) => {
                             <Link to={`/product/${product.uid}`} className="flex flex-col h-70">
                             <WishlistButton uid={product.uid} />
                                 <div className="relative flex items-end overflow-hidden rounded-xl flex-grow justify-center">
-                                    <img src={`${BaseUrl}/${product.image}`} alt="Default Product" className='w-40 h-auto' />
+                                    <img src={`${product.image}`} alt="Default Product" className='w-40 h-auto' />
                                     <div className="absolute bottom-3 left-3 inline-flex items-center rounded-lg bg-white p-2 shadow-md">
                                         <svg xmlns="http://www.w3.org/2000/svg" className="h-5 w-5 text-yellow-400" viewBox="0 0 20 20" fill="currentColor">
                                             <path d="M9.049 2.927c.3-.921 1.603-.921 1.902 0l1.07 3.292a1 1 0 00.95.69h3.462c.969 0 1.371 1.24.588 1.81l-2.8 2.034a1 1 0 00-.364 1.118l1.07 3.292c.3.921-.755 1.688-1.54 1.118l-2.8-2.034a1 1 0 00-1.175 0l-2.8 2.034c-.784.57-1.838-.197-1.539-1.118l1.07-3.292a1 1 0 00-.364-1.118L2.98 8.72c-.783-.57-.38-1.81.588-1.81h3.461a1 1 0 00.951-.69l1.07-3.292z" />
diff --git a/frontend/src/product/UpdateModal.jsx b/frontend/src/product/UpdateModal.jsx
index fbb6a3c..207dc05 100644
--- a/frontend/src/product/UpdateModal.jsx
+++ b/frontend/src/product/UpdateModal.jsx
@@ -1,12 +1,10 @@
-import React, { useEffect, useState, useCallback } from 'react'
+import React, { useEffect, useState} from 'react'
 import { useDispatch, useSelector } from 'react-redux';
 import { useNavigate, useParams } from 'react-router-dom';
-import { loadAllProduct, loadProductData, updateProductData } from '../features/actions/productActions';
+import { loadAllProduct, updateProductData } from '../features/actions/productActions';
 import { unwrapResult } from '@reduxjs/toolkit';
 import Swal from 'sweetalert2';
 import DatePicker from 'react-datepicker'
-import { loadCategory } from '../features/actions/categoryActions';
-import { resetProductData } from '../features/slices/productSlice';
 import Loading from '../helper/Loading';
 import { CKEditor } from '@ckeditor/ckeditor5-react';
 import ClassicEditor from '@ckeditor/ckeditor5-build-classic';
diff --git a/frontend/src/product/UpdatePage.jsx b/frontend/src/product/UpdatePage.jsx
index 4fd80ef..16275f3 100644
--- a/frontend/src/product/UpdatePage.jsx
+++ b/frontend/src/product/UpdatePage.jsx
@@ -1,8 +1,7 @@
 import React, {useEffect, useState } from 'react'
-import { useDispatch, useSelector } from 'react-redux';
+import { useSelector } from 'react-redux';
 import { useParams } from 'react-router-dom';
 import Layout from '../homepage/Layout';
-import { BaseUrl } from '../backend';
 import UpdateModal from './UpdateModal';
 import Loading from '../helper/Loading';
 
@@ -148,7 +147,7 @@ const UpdatePage = () => {
                                         <tr className='border-b-2'>
                                             <td className='justify-center flex'>
 
-                                                <img src={`${BaseUrl}/${product.image}`} alt="No Product Image" className='max-w-full h-40' />
+                                                <img src={`${product.image}`} alt="No Product Image" className='max-w-full h-40' />
 
                                             </td>
                                             <td>
diff --git a/frontend/src/seller/OrderDashboard.jsx b/frontend/src/seller/OrderDashboard.jsx
index 8325865..a42c95b 100644
--- a/frontend/src/seller/OrderDashboard.jsx
+++ b/frontend/src/seller/OrderDashboard.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux';
-import { UpdateOrderStatus, getOrders } from '../features/actions/sellerActions';
+import { getOrders } from '../features/actions/sellerActions';
 import Layout from '../homepage/Layout';
 import { Watch } from 'react-loader-spinner';
 import { filterOrder } from '../features/actions/orderActions';
diff --git a/frontend/src/seller/ProcessOrder.jsx b/frontend/src/seller/ProcessOrder.jsx
index 188a9b8..398b169 100644
--- a/frontend/src/seller/ProcessOrder.jsx
+++ b/frontend/src/seller/ProcessOrder.jsx
@@ -4,7 +4,6 @@ import { Link, useParams } from 'react-router-dom';
 import { UpdateOrderStatus, getOrderDetails } from '../features/actions/sellerActions';
 import Layout from '../homepage/Layout';
 import { Watch } from 'react-loader-spinner';
-import { BaseUrl } from '../backend';
 import {
   mapAddressCodeToLabel,
   mapGenderCodeToLabel,
@@ -88,7 +87,7 @@ const ProcessOrder = () => {
               <div className='flex flex-col justify-between my-3'>
                 <div className="flex flex-row mx-auto">
                   <Link to={`/product/${product.uid}`}>
-                    <img className='w-40 h-auto block mb-3' src={`${BaseUrl}/${product.image}`} alt='product image' />
+                    <img className='w-40 h-auto block mb-3' src={`${product.image}`} alt='product image' />
                   </Link>
                 </div>
               </div>
diff --git a/frontend/src/seller/SellerDashboard.jsx b/frontend/src/seller/SellerDashboard.jsx
index d37bae2..995920e 100644
--- a/frontend/src/seller/SellerDashboard.jsx
+++ b/frontend/src/seller/SellerDashboard.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux';
-import { Link, useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
 import Layout from '../homepage/Layout';
 import { loadDashboard } from '../features/actions/sellerActions';
 import Loading from '../helper/Loading';
diff --git a/frontend/src/seller/SellerProductLists.jsx b/frontend/src/seller/SellerProductLists.jsx
index 46fac78..ae6f73e 100644
--- a/frontend/src/seller/SellerProductLists.jsx
+++ b/frontend/src/seller/SellerProductLists.jsx
@@ -2,9 +2,7 @@ import React, { useEffect, useState } from 'react'
 import Layout from '../homepage/Layout'
 import { useDispatch, useSelector } from 'react-redux'
 import { loadProductList } from '../features/actions/sellerActions';
-import { BaseUrl } from '../backend';
 import { Link, useNavigate } from 'react-router-dom';
-import UpdateModal from '../product/UpdateModal';
 import Loading from '../helper/Loading';
 
 const SellerProductLists = () => {
@@ -31,14 +29,6 @@ const SellerProductLists = () => {
     )
   }
 
-
-  const showModalHandler = () => {
-    setShowModal(true);
-  };
-  const hideModalHandler = () => {
-    setShowModal(false);
-  };
-
   return (
     <Layout>
 
diff --git a/frontend/src/user/Profile.js b/frontend/src/user/Profile.js
index 21c161a..6b97862 100644
--- a/frontend/src/user/Profile.js
+++ b/frontend/src/user/Profile.js
@@ -4,7 +4,6 @@ import { Link, useNavigate } from 'react-router-dom';
 import Layout from '../homepage/Layout';
 import { laodProfile } from '../features/actions/authActions';
 import { deleteAddress, loadAddress } from '../features/actions/addressAction';
-import { BaseUrl } from '../backend';
 import { formateDate, mapAddressCodeToLabel, mapGenderCodeToLabel } from '../helper';
 
 const Profile = () => {
@@ -57,7 +56,6 @@ const Profile = () => {
                                 <div className="image overflow-hidden text-center">
                                     {/* src={`${BaseUrl}/${user.profile_pic}`} */}
                                     {user.profile_pic ? (
-                                        // src="https://lavinephotography.com.au/wp-content/uploads/2022/09/Fam_Kids024-1.jpg" 
                                         <img src={`${user.profile_pic}`} alt="Profile"
                                             className='w-40 h-40 mx-auto rounded-full'
                                         />
diff --git a/frontend/src/user/Signup.js b/frontend/src/user/Signup.js
index f2e8087..3ac8b24 100644
--- a/frontend/src/user/Signup.js
+++ b/frontend/src/user/Signup.js
@@ -5,7 +5,6 @@ import { signup } from '../features/actions/authActions';
 import { useDispatch, useSelector } from 'react-redux';
 import Swal from 'sweetalert2';
 import { unwrapResult } from '@reduxjs/toolkit';
-import { Watch } from 'react-loader-spinner';
 import GoogleLoginButton from './SocialAuth/GoogleButton';
 import Loading from '../helper/Loading';
 
diff --git a/frontend/src/user/helper/userapicalls.js b/frontend/src/user/helper/userapicalls.js
index 094fae5..6ed7b3a 100644
--- a/frontend/src/user/helper/userapicalls.js
+++ b/frontend/src/user/helper/userapicalls.js
@@ -16,8 +16,7 @@ export const signin = async (user) => {
             method: "POST",
             body: formData,
         });
-        const data = await response.json(); // Extract JSON data from the response
-        // console.log("Success from userapi...", data); 
+        const data = await response.json();
         return data;
 
     } catch (err) {
diff --git a/frontend/src/useraction/cart/UserCart.jsx b/frontend/src/useraction/cart/UserCart.jsx
index 2da1503..cf73fae 100644
--- a/frontend/src/useraction/cart/UserCart.jsx
+++ b/frontend/src/useraction/cart/UserCart.jsx
@@ -2,7 +2,6 @@ import React, { useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { addToCart, loadCart, removeFromCart } from '../../features/actions/cartAction';
 import Layout from '../../homepage/Layout';
-import { BaseUrl } from '../../backend';
 import { Link } from 'react-router-dom';
 
 const UserCart = () => {
@@ -64,7 +63,7 @@ const UserCart = () => {
                                 <div className="grid grid-cols-2">
                                     <div className='flex flex-col justify-between'>
                                         <div className="flex flex-row mx-auto">
-                                            <img className='w-40 h-auto block mb-3' src={`${BaseUrl}/${product.product?.image}`} alt='product image' />
+                                            <img className='w-40 h-auto block mb-3' src={`${product.product?.image}`} alt='product image' />
                                             <div className="start inline">
                                                 <svg xmlns="http://www.w3.org/2000/svg" className="h-5 w-5 text-yellow-400" viewBox="0 0 20 20" fill="currentColor">
                                                     <path d="M9.049 2.927c.3-.921 1.603-.921 1.902 0l1.07 3.292a1 1 0 00.95.69h3.462c.969 0 1.371 1.24.588 1.81l-2.8 2.034a1 1 0 00-.364 1.118l1.07 3.292c.3.921-.755 1.688-1.54 1.118l-2.8-2.034a1 1 0 00-1.175 0l-2.8 2.034c-.784.57-1.838-.197-1.539-1.118l1.07-3.292a1 1 0 00-.364-1.118L2.98 8.72c-.783-.57-.38-1.81.588-1.81h3.461a1 1 0 00.951-.69l1.07-3.292z" />
diff --git a/frontend/src/useraction/order/OrderDetail.jsx b/frontend/src/useraction/order/OrderDetail.jsx
index 2dc4ddb..ffc43d1 100644
--- a/frontend/src/useraction/order/OrderDetail.jsx
+++ b/frontend/src/useraction/order/OrderDetail.jsx
@@ -1,10 +1,8 @@
 import React, { useEffect } from 'react'
 import Layout from '../../homepage/Layout'
 import { useDispatch, useSelector } from 'react-redux'
-import { BaseUrl } from '../../backend'
 import { useParams } from 'react-router-dom'
 import { cancelOrReturnOrder, loadOrderData } from '../../features/actions/orderActions'
-import { Watch } from 'react-loader-spinner';
 import { Link } from 'react-router-dom';
 import {
     mapAddressCodeToLabel,
@@ -58,7 +56,7 @@ const OrderDetail = () => {
                             <div className='flex flex-col justify-between my-3'>
                                 <div className="flex flex-row mx-auto">
                                     <Link to={`/product/${product.uid}`}>
-                                        <img className='w-40 h-auto block mb-3' src={`${BaseUrl}/${product.image}`} alt='product' />
+                                        <img className='w-40 h-auto block mb-3' src={`${product.image}`} alt='product' />
                                     </Link>
                                 </div>
                             </div>
diff --git a/frontend/src/useraction/order/OrderFromCart.jsx b/frontend/src/useraction/order/OrderFromCart.jsx
index 3a9f5ca..db92076 100644
--- a/frontend/src/useraction/order/OrderFromCart.jsx
+++ b/frontend/src/useraction/order/OrderFromCart.jsx
@@ -1,32 +1,23 @@
 
 import React, { useEffect, useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux';
-import Layout from '../../homepage/Layout';
-import { Link, useLocation, useNavigate, useParams } from 'react-router-dom';
-import { loadProductData } from '../../features/actions/productActions';
-import { BaseUrl } from '../../backend';
+import { Link, useNavigate} from 'react-router-dom';
 import { loadAddress } from '../../features/actions/addressAction';
 import { buyAll } from '../../features/actions/orderActions';
 import { unwrapResult } from '@reduxjs/toolkit';
 import { CompletePaymentForAll, InitiatePaymentForAll } from '../../features/actions/paymentAction';
 import useRazorpay from "react-razorpay";
 import Swal from 'sweetalert2';
-import { Watch } from 'react-loader-spinner'
 import { mapAddressCodeToLabel } from '../../helper';
+import Loading from '../../helper/Loading';
 
 
 const OrderFromCart = () => {
     const [Razorpay] = useRazorpay();
     const dispatch = useDispatch();
     const navigate = useNavigate();
-    const [add, setAdd] = useState(0);
-    const [remove, setRemove] = useState(0);
     const [addressdata, setAddress] = useState("");
     const [paymentMode, setPaymentMode] = useState("");
-
-    const { pathname } = useLocation();
-    const { uid } = useParams();
-
     const { isAuthenticated, redirect, user } = useSelector((state) => state.auth);
     const { address } = useSelector((state) => state.address);
 
@@ -46,8 +37,8 @@ const OrderFromCart = () => {
     }, [isAuthenticated, dispatch]);
 
 
-    const { product, loading } = useSelector((state) => state.product);
-    const { payment_loading, payments, error } = useSelector((state) => state.payment);
+    const {  loading } = useSelector((state) => state.product);
+    const { payment_loading, } = useSelector((state) => state.payment);
 
     const [checked, setChecked] = useState(false);
 
@@ -73,15 +64,12 @@ const OrderFromCart = () => {
         if (paymentMode === "") {
             alert("Select Payment Mode.")
         }
-        console.log("submit clicked!")
-        console.log("address...", addressdata);
-        console.log("payment mode... ", paymentMode);
+        
         const res1 = await dispatch(buyAll({
             address: addressdata,
             payment_mode: paymentMode
         }));
         const res = await unwrapResult(res1);
-        console.log("order res..", res);
         if (!res.errors) {
             if (paymentMode === 'ONL') {
 
@@ -91,7 +79,6 @@ const OrderFromCart = () => {
 
                 const payment_res = await dispatch(InitiatePaymentForAll({ orders: orders, amount: amount }));
                 const response = await unwrapResult(payment_res);
-                console.log("response1...", response);
                 if (response.success) {
                     var order_id = response.data.razorpay_order_id
 
@@ -109,7 +96,6 @@ const OrderFromCart = () => {
                                 signature: response.razorpay_signature,
                                 amount: amount
                             }))
-                            console.log("complete response...", response);
                             Swal.fire({
                                 icon: 'success',
                                 title: 'Orders Placed Successfully.',
@@ -124,7 +110,7 @@ const OrderFromCart = () => {
                             contact: user.phone,
                         },
                         notes: {
-                            address: "B P Mandal Colllege of engineering, Madhepura",
+                            address: "XYZ, 2229992, Singapore",
                         },
                         theme: {
                             color: "#3399cc",
@@ -166,20 +152,9 @@ const OrderFromCart = () => {
 
     }
 
-    if (loading) {
+    if (loading || payment_loading) {
         return (
-            <div className="flex items-center justify-center h-screen">
-                <Watch
-                    visible={true}
-                    height="80"
-                    width="80"
-                    radius="48"
-                    color="#4fa94d"
-                    ariaLabel="watch-loading"
-                    wrapperStyle={{}}
-                    wrapperClass=""
-                />
-            </div>
+            <Loading />
         )
     }
     return (
diff --git a/frontend/src/useraction/order/OrderList.jsx b/frontend/src/useraction/order/OrderList.jsx
index 89b0f21..9c22851 100644
--- a/frontend/src/useraction/order/OrderList.jsx
+++ b/frontend/src/useraction/order/OrderList.jsx
@@ -1,11 +1,11 @@
 import React, { useEffect } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
-import { BaseUrl } from '../../backend';
 import Layout from '../../homepage/Layout';
 import { loadOrder } from '../../features/actions/orderActions';
 import { Watch } from 'react-loader-spinner';
 import { Link } from 'react-router-dom';
 import { mapOrderStatusToLabel, mapPaymentStatusToLabel,mapPaymentCodeToLabel } from '../../helper';
+import Loading from '../../helper/Loading';
 
 
 
@@ -22,20 +22,7 @@ const OrderList = () => {
 
     if (order_loading) {
         return (
-            
-                <div className="flex items-center justify-center h-screen">
-                    <Watch
-                        visible={true}
-                        height="80"
-                        width="80"
-                        radius="48"
-                        color="#4fa94d"
-                        ariaLabel="watch-loading"
-                        wrapperStyle={{}}
-                        wrapperClass=""
-                    />
-                </div>
-            
+            <Loading />
         )
     }
   
diff --git a/frontend/src/useraction/order/OrderSummary.jsx b/frontend/src/useraction/order/OrderSummary.jsx
index bbfe899..fe19e4e 100644
--- a/frontend/src/useraction/order/OrderSummary.jsx
+++ b/frontend/src/useraction/order/OrderSummary.jsx
@@ -3,14 +3,13 @@ import { useDispatch, useSelector } from 'react-redux';
 import Layout from '../../homepage/Layout';
 import { Link, useLocation, useNavigate, useParams } from 'react-router-dom';
 import { loadProductData } from '../../features/actions/productActions';
-import { BaseUrl } from '../../backend';
 import { loadAddress } from '../../features/actions/addressAction';
 import { createOrder } from '../../features/actions/orderActions';
 import { unwrapResult } from '@reduxjs/toolkit';
 import { CompletePayment, InitiatePayment } from '../../features/actions/paymentAction';
 import useRazorpay from "react-razorpay";
 import Swal from 'sweetalert2';
-import { Watch } from 'react-loader-spinner'
+import Loading from '../../helper/Loading';
 
 const OrderSummary = () => {
 
@@ -31,6 +30,7 @@ const OrderSummary = () => {
     useEffect(() => {
         document.title = 'Order summary';
     }, []);
+
     useEffect(() => {
         if (isAuthenticated) {
             dispatch(loadProductData({ uid }));
@@ -54,7 +54,7 @@ const OrderSummary = () => {
 
 
     const { product, loading } = useSelector((state) => state.product);
-    const { payment_loading, payments, error } = useSelector((state) => state.payment);
+    const { payment_loading } = useSelector((state) => state.payment);
 
     const removeItem = () => {
         if (quantity > 1) {
@@ -93,36 +93,14 @@ const OrderSummary = () => {
 
     if (product.length === 0 || loading) {
         return (
-            <div className='min-h-screen'>
-                <Watch
-                    visible={true}
-                    height="80"
-                    width="80"
-                    radius="48"
-                    color="#4fa94d"
-                    ariaLabel="watch-loading"
-                    wrapperStyle={{}}
-                    wrapperClass=""
-                />
-            </div>
+            <Loading />
         )
     }
 
     const onSubmit = async () => {
         if (payment_loading) {
             return (
-                <div className="flex items-center justify-center h-screen">
-                    <Watch
-                        visible={true}
-                        height="80"
-                        width="80"
-                        radius="48"
-                        color="#4fa94d"
-                        ariaLabel="watch-loading"
-                        wrapperStyle={{}}
-                        wrapperClass=""
-                    />
-                </div>
+                <Loading />
             )
         }
         if (addressdata === "") {
@@ -184,7 +162,7 @@ const OrderSummary = () => {
                             contact: user.phone,
                         },
                         notes: {
-                            address: "B P Mandal Colllege of engineering, Madhepura",
+                            address: "XYZ, 8877667, Singapore",
                         },
                         theme: {
                             color: "#3399cc",
@@ -192,7 +170,6 @@ const OrderSummary = () => {
                     };
 
                     const rzp1 = new Razorpay(options);
-                    // console.log("rzp1..", rzp1);
                     rzp1.on("payment.failed", function (response) {
                         Swal.fire({
                             icon: 'error',
@@ -261,7 +238,7 @@ const OrderSummary = () => {
                         <div className="grid grid-cols-2">
                             <div className='flex flex-col justify-between'>
                                 <div className="flex flex-row mx-auto">
-                                    <img className='w-40 h-auto block mb-3' src={`${BaseUrl}/${product?.image}`} alt='product' />
+                                    <img className='w-40 h-auto block mb-3' src={`${product?.image}`} alt='product' />
                                     <div className="start inline">
                                         <svg xmlns="http://www.w3.org/2000/svg" className="h-5 w-5 text-yellow-400" viewBox="0 0 20 20" fill="currentColor">
                                             <path d="M9.049 2.927c.3-.921 1.603-.921 1.902 0l1.07 3.292a1 1 0 00.95.69h3.462c.969 0 1.371 1.24.588 1.81l-2.8 2.034a1 1 0 00-.364 1.118l1.07 3.292c.3.921-.755 1.688-1.54 1.118l-2.8-2.034a1 1 0 00-1.175 0l-2.8 2.034c-.784.57-1.838-.197-1.539-1.118l1.07-3.292a1 1 0 00-.364-1.118L2.98 8.72c-.783-.57-.38-1.81.588-1.81h3.461a1 1 0 00.951-.69l1.07-3.292z" />
diff --git a/frontend/src/useraction/wishlist/Wishlist.jsx b/frontend/src/useraction/wishlist/Wishlist.jsx
index becd547..510dcc0 100644
--- a/frontend/src/useraction/wishlist/Wishlist.jsx
+++ b/frontend/src/useraction/wishlist/Wishlist.jsx
@@ -1,7 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { loadWishlist, removeFromWishlist } from '../../features/actions/wishlistAction';
-import { BaseUrl } from '../../backend';
 import { addToCart } from '../../features/actions/cartAction';
 import Layout from '../../homepage/Layout';
 
@@ -44,7 +43,7 @@ const Wishlist = () => {
                                 <div className="grid grid-cols-2">
                                     <div className='flex flex-col justify-between'>
                                         <div className="flex flex-row mx-auto">
-                                            <img className='w-40 h-auto block mb-3' src={`${BaseUrl}/${product.product?.image}`} alt='product image' />
+                                            <img className='w-40 h-auto block mb-3' src={`${product.product?.image}`} alt='product image' />
                                             <div className="start inline">
                                                 <svg xmlns="http://www.w3.org/2000/svg" className="h-5 w-5 text-yellow-400" viewBox="0 0 20 20" fill="currentColor">
                                                     <path d="M9.049 2.927c.3-.921 1.603-.921 1.902 0l1.07 3.292a1 1 0 00.95.69h3.462c.969 0 1.371 1.24.588 1.81l-2.8 2.034a1 1 0 00-.364 1.118l1.07 3.292c.3.921-.755 1.688-1.54 1.118l-2.8-2.034a1 1 0 00-1.175 0l-2.8 2.034c-.784.57-1.838-.197-1.539-1.118l1.07-3.292a1 1 0 00-.364-1.118L2.98 8.72c-.783-.57-.38-1.81.588-1.81h3.461a1 1 0 00.951-.69l1.07-3.292z" />

From 939af13de6c8b0cc17c64a9c61bee664126368a9 Mon Sep 17 00:00:00 2001
From: as4c <sagarkumarsameer@gmail.com>
Date: Fri, 8 Mar 2024 22:14:52 +0530
Subject: [PATCH 4/6] backend ready

---
 Backend/backend/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Backend/backend/settings.py b/Backend/backend/settings.py
index 5db3ec6..4994064 100644
--- a/Backend/backend/settings.py
+++ b/Backend/backend/settings.py
@@ -25,7 +25,7 @@
 SECRET_KEY = 'django-insecure-x*ykqto7f*@*#nmi*_l2ametk2rw@_q3wrhwq_xm!_0%4768z9'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
 
 ALLOWED_HOSTS = ['*']
 

From a7fd4ac66963a866347f8abee844f018ecb67cac Mon Sep 17 00:00:00 2001
From: as4c <sagarkumarsameer@gmail.com>
Date: Fri, 8 Mar 2024 23:19:37 +0530
Subject: [PATCH 5/6] push to production

---
 .gitignore                                    |   4 +---
 Backend/api/__pycache__/views.cpython-310.pyc | Bin 444 -> 407 bytes
 Backend/api/views.py                          |   2 +-
 .../__pycache__/settings.cpython-310.pyc      | Bin 6166 -> 6235 bytes
 .../backend/__pycache__/urls.cpython-310.pyc  | Bin 522 -> 576 bytes
 Backend/backend/settings.py                   |   4 +++-
 Backend/backend/urls.py                       |   3 ++-
 README.md                                     |   2 +-
 frontend/src/category/AddCategory.js          |   6 +-----
 frontend/src/category/Categories.jsx          |   2 +-
 .../src/features/actions/paymentAction.js     |   1 -
 frontend/src/product/UpdatePage.jsx           |  16 +---------------
 frontend/src/seller/SellerProductLists.jsx    |   7 +++----
 .../src/useraction/address/AddAddress.jsx     |   1 -
 frontend/src/useraction/order/OrderList.jsx   |   3 +--
 15 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7b7dcdc..831cf37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,12 +3,10 @@
 
 *.sqlite3
 
-*.cpp
-*.txt
-
 *node_modules
 *.bin
 *db.sqlite3
 db.sqlite3
 *.vscode
 vscode
+*media
diff --git a/Backend/api/__pycache__/views.cpython-310.pyc b/Backend/api/__pycache__/views.cpython-310.pyc
index 018c5a49d7003ee9fbc46002558ecd24b1001406..625bea28bb3f10db891e3a787ed7c5434f42c2bb 100644
GIT binary patch
delta 133
zcmdnPJe`?0pO=@50SNSbU#D)I$Xo8o4CFWiaWM~&C}BupOkv7oY-S8*&}8<z#gdtq
zmR}_pl95@g07OZN#i<I31(|w9AYGb_x7dqP3rkarOI9)zu}}Pz%EH4~#5p;d(Lj_F
PC||^mN^neGz$gO%Mvos5

delta 187
zcmbQvyoZ@LpO=@50SJP)t5dH|<Snmf0dkyyxR?(}lrW?)rZA;2&tYn23}(<|@vD+>
z$x6&i&sQi)O-wFPaL&(7$}d*%$j?o!5(-XCPb^aKF3km!!HK!4sYRMhw^%as((-Sy
z<N^6b%s>-08E>%{r52W^7MHAKDB=K${0h|1O-;#6)K4rnN!FiuFNB4Uv50H38KZ$H
P$Yo$PNCfBPYDO6VAAT_R

diff --git a/Backend/api/views.py b/Backend/api/views.py
index a0173fc..b1c7317 100644
--- a/Backend/api/views.py
+++ b/Backend/api/views.py
@@ -3,4 +3,4 @@
 
 # Create your views here.
 def home(request):
-    return JsonResponse({'info':'Django react Combos Home','name': 'Sagar Kumar Sameer'})
\ No newline at end of file
+    return JsonResponse({'info':'This is base api.'})
\ No newline at end of file
diff --git a/Backend/backend/__pycache__/settings.cpython-310.pyc b/Backend/backend/__pycache__/settings.cpython-310.pyc
index 81cdb1580ce417fb722687f0483e853653b6c631..8b499b4bded4032596d9f3a20ff13427a6f54e64 100644
GIT binary patch
delta 840
zcmX|<%TE(g6vnyJT1=s}rL^Tuf$}JiQr=G=1&RgAbBgFyspvNyDK9fXbk{#Xn@GmE
zDu%LP;mV|OLE_Rsz#uDh>&m@}F;P#O8z!0W{LY;3%(-{&ybXK{SavKHa{*niB0rVC
z2bOB~`k*bIEQUobfc2QIGh9m>RmSbG@e<e-Q^KJb5~W8@lw=qjDROWZO5r4DDO`DV
z=e2B|sYdQbIWI#6FGn%2pt};4yb4vkn%+`#RI8X#jhc*sdr-^ks9q0`%96Yx7q}N5
z)Tt70q{Y-9Gc>3S-n7J<(8!yWD`-M<icxHVFU8P`HngJyesm&$E_9<OUBp|^%YEqM
zt?1`%7~t(<`GXn8I|L6A`)PP*E>Ad-9HzmJl*9wVFhYhd!K1|8xXyd1p%*6Jha0>f
zH~E05-=g}U;2?34;IRx7G=51F^bJF410TX9ABG*b5k@hll9<K}BACS-=F>(j(Eb-`
z|4V5JGI3P!GVvY3E5vsN-vg)YzQ`UBKNP%5925MAc<r*|F=bCg)&nSrt5SZTil<l?
zoWKSh0WCwdViQ~Gt91G!FvtbI?d&J%4P%qpMdNz|i)Q~6ew6et<`Zw7rtI#;;@aAl
z@_a|z@IPDAb`@>cKP}JCE#%oJ=^xCVvJ2NlXfn7QiN+R!OLAx_HXaGea!AhZ7k!qp
z!`82ig>|cKg*0w!B|Wg6lFryi++q5GFAC@P_n>U=U6`h}b5RTHhxSTxoZ3fOIQz@~
zgR%bXcgGp?`pK_#=9(;_+2B+pwk(HY(TJ=Ca)qv(bn9o%m#j};b&Z+Ma}Un-6W1m)
W>JE3zY%)qF>7VJh(W<|2zxxl6FZPK5

delta 778
zcmX|<$!imF6vy+MjAKcfnx##;rTdm{NxE+?t+p}RS~aQF=MtCibZo2@O1&tOi#MA?
z8Sxaf=|%8p5cD7j9=$aOp@KIN#J@mLd=q|jV7~A3=6&D1H_Nxki-_xi%jK}~@#OC>
z{mZs1D7LnHRx%pO4I5m$VpX6bry7DhI6_{ybuI1F?di&$DtPh&-Yh%F4<9Po=|fdX
z{Ur^o3PYs;s;L?^R0EA_`K&`N)uWDre3youM%{sW1oL)kLIX8(y#<Yi$WW^ls11#1
zG8Ae@Gq2NPtwSAXrB3}2+R&aA96QjN73e|;-RMCt`p}OsB8cXk)P(^GVUW5pL_HX$
zUb*^6UQnOpQRaRg9Jcaw6~=gG#+y|rA`Rngh)SMd9>63Ga>Ed&Xc$Ln1jlGp){k?2
zO!5h4r{w9pkTi2ZC;9!I%GqfgvorxW<`9F1(}?3t24^vk1)R&NSmY-^zbkMdr{E%U
zLUNLMN%AG;WyzOug)@@bRpx7wuQT6}oMOIt&~b~i+cLWYAgmioY2XSB+?BkFv{72a
zsK7m}<;wVDOv0Y9h3*$VDbIyS7M9dE_P1s46f@&&QbYDfQS-N>!TjoYT6pjLtcbb7
z<BFmXF>}$q%=+5h&AR9Qz`Es`48-_1+&{eda1;9a=DrqRx8g?3{O+k^#~;s>h!sY?
zKZF=A1S|JMTOa#3`mH9{?80<>KDCsXO(o|O8)2&uu_S8x{LjRY`N}_|6|D<J^QV7J
T*vw=grIo4bKegQa7<l;~oSET4

diff --git a/Backend/backend/__pycache__/urls.cpython-310.pyc b/Backend/backend/__pycache__/urls.cpython-310.pyc
index a785e8ca28493a3cfdf8d94469845f1fa7761114..3f4002478b4489f44f122d4309a52d5f6fc9a85b 100644
GIT binary patch
delta 224
zcmeBTIl!Ww&&$ij00iHCUZ-|4GB7*_agYHUkmCTv#SIg+&HYjsQdo01bGf3p7#UKT
zQ`k}&v$(T(nwfxX_EeS>j%G$Mn-j)PXO7}c<xOQv<;da#V*V7aUM6#fDBcwAU<OT|
zi8D+&G#PKPWaQ_jPCP3ic8dYX<4ws=F3nBND~T`4&oA-Q6qxukmWMO3AXBd_Gqt?9
kh<$PpqZykB&`CuillvGmBtT3aMgc}12xJD)EPo}~0N!6QVE_OC

delta 173
zcmX@W(#4{k&&$ij00gbgFH(IN85kaeILLq%$Z-JT;*5#f=4PqPDXgiCS)5s1%}hWx
zTPjNmdoyD*Q#w-=cPe)(TPjBu4-oUFaP%^nGemKxa0WAIa!uS|I`OT9h$iDL-jw|0
z(%jU%lK7(h{1QJ+zRA*zv6DL(jo1W%b`%LtKERkEA^>FaFbXj8fFKJGBg;PtRsgQ&
BBdY)a

diff --git a/Backend/backend/settings.py b/Backend/backend/settings.py
index 4994064..7eb7b6f 100644
--- a/Backend/backend/settings.py
+++ b/Backend/backend/settings.py
@@ -187,7 +187,9 @@
         'rest_framework.authentication.SessionAuthentication',
         'rest_framework_simplejwt.authentication.JWTAuthentication',
     ],
-  
+    'DEFAULT_PARSER_CLASSES': [
+        'rest_framework.parsers.JSONParser',
+    ]
 }
 
 
diff --git a/Backend/backend/urls.py b/Backend/backend/urls.py
index dda67ab..cac92f5 100644
--- a/Backend/backend/urls.py
+++ b/Backend/backend/urls.py
@@ -3,11 +3,12 @@
 from django.urls import path,include
 from django.conf.urls.static import static
 from django.conf import settings
-
+from api.views import home
 
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('api/',include('api.urls')),
+    path('',include('api.urls')),
 ]
 
 urlpatterns += static(settings.MEDIA_URL,document_root=settings.MEDIA_ROOT)
diff --git a/README.md b/README.md
index 582ed35..77ae6e7 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ This is an eCommerce web application built with Django and React.js. It utilizes
 - Frontend:
   - React.js: JavaScript library for building interactive user interfaces.
   - React Router Dom: Library for handling client-side routing in a React application.
-
+  - React Redux Toolkit: Library for Managing states.
 ## Installation and Setup
 
 1. Clone the repository:
diff --git a/frontend/src/category/AddCategory.js b/frontend/src/category/AddCategory.js
index 0912d0d..d1d8f4d 100644
--- a/frontend/src/category/AddCategory.js
+++ b/frontend/src/category/AddCategory.js
@@ -4,14 +4,10 @@ import { useDispatch } from 'react-redux';
 import { createCategory } from '../features/actions/categoryActions';
 import { unwrapResult } from '@reduxjs/toolkit';
 import Swal from 'sweetalert2';
-import { useLocation, useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
 
 
 const AddCategory = () => {
-
-    const location = useLocation();
-    // console.log("location...", location);
-
     const [values, setValues] = useState({
         name: "",
         description: "",
diff --git a/frontend/src/category/Categories.jsx b/frontend/src/category/Categories.jsx
index e85466b..21f0845 100644
--- a/frontend/src/category/Categories.jsx
+++ b/frontend/src/category/Categories.jsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState, useRef } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { Link, useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
 import { loadCategory } from '../features/actions/categoryActions';
 
 const Categories = () => {
diff --git a/frontend/src/features/actions/paymentAction.js b/frontend/src/features/actions/paymentAction.js
index 0b2eea4..60beff3 100644
--- a/frontend/src/features/actions/paymentAction.js
+++ b/frontend/src/features/actions/paymentAction.js
@@ -1,5 +1,4 @@
 
-import Swal from 'sweetalert2';
 import { API } from '../../backend';
 import { createAsyncThunk } from "@reduxjs/toolkit";
 
diff --git a/frontend/src/product/UpdatePage.jsx b/frontend/src/product/UpdatePage.jsx
index 16275f3..5a124f0 100644
--- a/frontend/src/product/UpdatePage.jsx
+++ b/frontend/src/product/UpdatePage.jsx
@@ -22,9 +22,7 @@ const UpdatePage = () => {
     
     const { uid } = useParams();
    
-    const { data } = useSelector((state) => state.category);
-  
-    const { loading, list, error } = useSelector(
+    const { loading, list} = useSelector(
         (state) => state.seller
     );
     const product = list.filter(product => product.uid === uid);
@@ -93,18 +91,6 @@ const UpdatePage = () => {
         setShowDate(true);
     }
 
-    const renderDetailRow = (label, value) => (
-        <tr className='border-b-2 mt-5'>
-            <td>
-                <p className='font-semibold text-gray-400 inline'>{label}:</p> {value}
-            </td>
-            <td>
-                <button onClick={showModalHandler} className='block bg-emerald-500 hover:bg-emerald-700 text-white rounded-md m-1 text-center mx-auto px-5 py-1'>
-                    Edit
-                </button>
-            </td>
-        </tr>
-    );
 
     return (
         <Layout>
diff --git a/frontend/src/seller/SellerProductLists.jsx b/frontend/src/seller/SellerProductLists.jsx
index ae6f73e..cac08c8 100644
--- a/frontend/src/seller/SellerProductLists.jsx
+++ b/frontend/src/seller/SellerProductLists.jsx
@@ -6,8 +6,7 @@ import { Link, useNavigate } from 'react-router-dom';
 import Loading from '../helper/Loading';
 
 const SellerProductLists = () => {
-  const [showModal, setShowModal] = useState(false);
-
+ 
   const dispatch = useDispatch();
   const navigate = useNavigate();
 
@@ -23,7 +22,7 @@ const SellerProductLists = () => {
     navigate(`/user/seller/update-product/${uid}`)
   }
 
-  if (list.length === 0) {
+  if (list.length === 0 || loading) {
     return (
       <Loading />
     )
@@ -56,7 +55,7 @@ const SellerProductLists = () => {
                 <tr key={data.uid} className='px-auto mx-auto items-center text-center border-b-2'>
                   <td className='justify-center flex'>
                     <Link to={`/product/${data.uid}`}>
-                      <img src={`${data.image}`} alt="No Product Image" className='max-w-full h-40' />
+                      <img src={`${data.image}`} alt="No Product pic" className='max-w-full h-40' />
                     </Link>
                   </td>
                   <td className=''>
diff --git a/frontend/src/useraction/address/AddAddress.jsx b/frontend/src/useraction/address/AddAddress.jsx
index e6cf382..1b830cf 100644
--- a/frontend/src/useraction/address/AddAddress.jsx
+++ b/frontend/src/useraction/address/AddAddress.jsx
@@ -1,6 +1,5 @@
 import React, {  useEffect, useState } from 'react'
 import { createAddress } from '../../features/actions/addressAction';
-import Swal from 'sweetalert2';
 import { useNavigate } from 'react-router-dom';
 import { unwrapResult } from '@reduxjs/toolkit';
 import { useDispatch } from 'react-redux';
diff --git a/frontend/src/useraction/order/OrderList.jsx b/frontend/src/useraction/order/OrderList.jsx
index 9c22851..6c5d9f9 100644
--- a/frontend/src/useraction/order/OrderList.jsx
+++ b/frontend/src/useraction/order/OrderList.jsx
@@ -2,7 +2,6 @@ import React, { useEffect } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import Layout from '../../homepage/Layout';
 import { loadOrder } from '../../features/actions/orderActions';
-import { Watch } from 'react-loader-spinner';
 import { Link } from 'react-router-dom';
 import { mapOrderStatusToLabel, mapPaymentStatusToLabel,mapPaymentCodeToLabel } from '../../helper';
 import Loading from '../../helper/Loading';
@@ -45,7 +44,7 @@ const OrderList = () => {
                                     <div className='flex flex-col justify-between my-3'>
                                         <div className="flex flex-row mx-auto">
                                             
-                                            <img className='w-40 h-auto block mb-3' src={`${BaseUrl}/${order.product?.image}`} alt='product' />
+                                            <img className='w-40 h-auto block mb-3' src={`${order.product?.image}`} alt='product' />
                                             <div className="start inline">
                                                 <svg xmlns="http://www.w3.org/2000/svg" className="h-5 w-5 text-yellow-400" viewBox="0 0 20 20" fill="currentColor">
                                                     <path d="M9.049 2.927c.3-.921 1.603-.921 1.902 0l1.07 3.292a1 1 0 00.95.69h3.462c.969 0 1.371 1.24.588 1.81l-2.8 2.034a1 1 0 00-.364 1.118l1.07 3.292c.3.921-.755 1.688-1.54 1.118l-2.8-2.034a1 1 0 00-1.175 0l-2.8 2.034c-.784.57-1.838-.197-1.539-1.118l1.07-3.292a1 1 0 00-.364-1.118L2.98 8.72c-.783-.57-.38-1.81.588-1.81h3.461a1 1 0 00.951-.69l1.07-3.292z" />

From 4f2c1f249ca914f75395fcfe2feb2548905091e2 Mon Sep 17 00:00:00 2001
From: as4c <sagarkumarsameer@gmail.com>
Date: Wed, 3 Jul 2024 17:27:18 +0530
Subject: [PATCH 6/6] dockerized

---
 .../__pycache__/serializers.cpython-310.pyc   | Bin 6795 -> 6755 bytes
 .../__pycache__/views.cpython-310.pyc         | Bin 11236 -> 11441 bytes
 Backend/api/accounts/serializers.py           |   5 ----
 Backend/api/accounts/views.py                 |   7 +++--
 .../__pycache__/settings.cpython-310.pyc      | Bin 6235 -> 6271 bytes
 Backend/backend/settings.py                   |  26 +++++++++---------
 6 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/Backend/api/accounts/__pycache__/serializers.cpython-310.pyc b/Backend/api/accounts/__pycache__/serializers.cpython-310.pyc
index 3618d23c813f3af4b5646d22e59e101a2cad52f0..3dcd50130e9e5d9a92f9aadce7aab0375e1509b6 100644
GIT binary patch
delta 457
zcmXw!%_{_99LMKt?e6UE%<LLtX9$t<lG?PbLh_P0s||TslGSdjyv%Mm%s8y03;l8+
zX<ZzU(w>z+z|BoL?L~5PRs5cn=jr+M`~Kdaqy9=l+fvn_#OE^cxqe;$pv6N#c|3Fi
zjM0nIiz59ftr(_Ob)YZpb$q7e`qMtg?|5>-wEx26%7su#apWsNa*&h?YDr78DxxPq
z$Lb_~s4l{k)kf)F%a{{9D&NcqLWjmzK?E`=7IraGz6<vO3-lKG#x%XwoiexeZlvf;
zKWj{K)r=??`^u651DZ$i*hxAG7_?GfL4hWWTkj%=_vy>XVv&{_TH04w+g$>)0{rqa
zLzZM7Z`9he<?{wFa6qN#a$;SibTWEiF9|#I@2GnJ`sCPmAp9EwYZNzQ$kM9W#!ZUm
z5O(O%jHxaM^EC_$_HK1Y#TvvMO<BvnLs2+SH&#b<kIkZxBLYJ4=ryWX@7Sd0##BW7
Z`)~E#Y6d+;Oqy<r2kLZFZwZE?-d`wQWmEtF

delta 530
zcmXw#&r2Io5XW~mZnD|zZjyEDCY6SqtWuC7idE1cC@4tj4?z*lwsq4Q4MyKCB!x{6
zMpV#?3?2jz3f?@mp{M=_?XfqndMN!H1f7Za9`D1v@4Okl^R5REhRmvAXcDcHoByS0
z`@1=i0J$}hI0Bf!zxoR}#5+Alan5)(8fcypMw>E7UNnq4QX}TY!dMttOL*#Oq@f1-
znGvez08$9=rNBH(dhv7EhCU5<jVZhH%}3v_RfU&-SMp0iezv@^j=zm>kir?W5W7+~
zMR_B@ee+9pk{tOtf(90tv~@WpYoN*)O*Wv=+DX0yaPepA7T)5I^f7VT>V;3ZWu0W_
zsBV!P@L;NBgAHaxkBB)uirYBcc@1B&+rCtmDBZw6_G*EnE5mhHD&%mbRH?YG=ppR^
zA2@o>m?zZe_$on_R5E6Fi20Uyq5w3p-c=m@%<s6i55zLZtB=A%vv!|#(weMS7#?a)
zKa_FA$y1X>XA}e;JN?EsC4HHY0a0svzi~!j0dtvRdY=n<NYP7pEyghY)Nw?eE_<ww
mGx$a}Jp7gU2UWbtE~of!+G7ZwL)58kCT>~X)-x^9rQ8GZpmwAH

diff --git a/Backend/api/accounts/__pycache__/views.cpython-310.pyc b/Backend/api/accounts/__pycache__/views.cpython-310.pyc
index 00fe14d4a9f0bb3516bbe03b627a8d5613a9caa8..39a37abcff77b96c009a0c099ef8c72cebd6f709 100644
GIT binary patch
delta 3486
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

delta 3249
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
YYLf<UxKJz<4n;#+NP|BYQtJHw0ubDoU;qFB

diff --git a/Backend/api/accounts/serializers.py b/Backend/api/accounts/serializers.py
index 3b7603e..0cda5b6 100644
--- a/Backend/api/accounts/serializers.py
+++ b/Backend/api/accounts/serializers.py
@@ -50,7 +50,6 @@ def validate(self, attrs):
     password = attrs.get('password')
     password2 = attrs.get('password2')
     user = self.context.get('user')
-    # print(user)
     if password != password2:
         raise serializers.ValidationError("Password and Confirm Password don't match")
 
@@ -70,12 +69,8 @@ def validate(self, attrs):
     if CustomUser.objects.filter(email=email).exists():
       user = CustomUser.objects.get(email = email)
       uid = urlsafe_base64_encode(force_bytes(user.uid))
-      # print('Encoded UID', uid)
       token = PasswordResetTokenGenerator().make_token(user)
-      # print('Password Reset Token', token)
       link = 'http://localhost:8000/api/accounts/reset-password/'+ uid +'/'+token
-      print('Password Reset Link', link)
-      # Send EMail
       body = 'Click Following Link to Reset Your Password ' + link
       data = {
         'subject':'Reset Your Password',
diff --git a/Backend/api/accounts/views.py b/Backend/api/accounts/views.py
index 4ce78ba..002f9fe 100644
--- a/Backend/api/accounts/views.py
+++ b/Backend/api/accounts/views.py
@@ -34,9 +34,10 @@
 from .mixins import PublicApiMixin, ApiErrorsMixin
 from .utils import google_get_access_token, google_get_user_info, generate_tokens_for_user
 from api.utils import upload_to_cloudinary
-
+from rest_framework.parsers import MultiPartParser, FormParser
 
 # Social Auth
+
 class GoogleLoginApi(PublicApiMixin, ApiErrorsMixin, APIView):
     class InputSerializer(serializers.Serializer):
         code = serializers.CharField(required=False)
@@ -112,7 +113,7 @@ def generate_verification_token(length = 32):
 class UserRegistrationView(APIView):
   permission_classes = [AllowAny]
   renderer_classes = [UserRenderer]
- 
+  parser_classes = [MultiPartParser, FormParser]
   def post(self, request, format=None):
     data = request.data
     data['profile_pic'] = upload_to_cloudinary(data['profile_pic'])
@@ -174,12 +175,14 @@ def verify_account(request, uid, token):
 class UserLoginView(APIView):
     permission_classes = [AllowAny]
     renderer_classes = [UserRenderer]
+    parser_classes = [MultiPartParser, FormParser]
     def post(self, request, format=None):
         serializer = UserLoginSerializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         email = serializer.data.get('email')
         password = serializer.data.get('password')
         user = authenticate(email=email, password=password)
+        print(user)
         if user is not None:
             if user.verified is not False:
                 token = get_tokens_for_user(user)
diff --git a/Backend/backend/__pycache__/settings.cpython-310.pyc b/Backend/backend/__pycache__/settings.cpython-310.pyc
index 8b499b4bded4032596d9f3a20ff13427a6f54e64..c9de30e48da7e9d0f0a0d56e7a3535a813ac2a13 100644
GIT binary patch
delta 703
zcmX|<yHis^6vneR*Be9<3?V!c9^oY>(TEb>A|eEgLQo+p#|J{b%QYb;8W;;KsCCAI
zxs<mc6c*Z<(uNuT1L@))VB^r(I^u!ZVP|&d_wBdmoH@Juv*)PCnRhxXZ9JAf{nr0(
zJDbIa?eJ<)LzQ8Jb5EoNT$XAGa-*7Ra2{^G5;cAsJeHCc<k{Z$FV>=wyzo&SG^*#>
z06#UNiF~>}<KJ!KfM&E5?bM7`YGJ<>0Zte=S=$gmo1suUmuue>=r9C2ErmMJMV)3;
zbZ>PbN*B;a-RP%_7@#0$4ef?8SQK<g@(}Z7&Kx<`nJ|Vq>&Qoiu1Nnn`#q9JnXlpo
zUE}k;7^5g|QXj^tU;4M$ACNpz6kBvoipipo6g#D<qQJCer$OANA-<hB?m)v`%wQG?
z%;6sHTPhxKbMxHXf~6qI{7~{E=Ess3nMv{!JZ1IlL>UU6vsjYW3+83XE6l0W5U|pv
zT7`j^9C=(YjSSW#XYq>fmv;>pa>!d1{Di}>&)b5pOZ&=>5DTTG`q}=q!Yf8MeaI~5
zjC=$uk(K4tnx4aYWc^Jxy`lGRR`RCgpi<UiiRpMER#p?^v$2AQe^V)R_E2>MMZwL&
zY;dK-l=;pTa(E|Z=8}`~(id0t88Kph^L#Ju)RJ(O9eVC<x{%M6?S{T#9(w<12OL>A
cFn`r$g=Q|)hpQBaA~d1?Q;*bu`M&<gf8f>8JOBUy

delta 666
zcmX|<%TH556vjLEUN2JHLTO8dQYbI6RG}(wP<a%5P^bb`IjE@pZm+G_CXHdsKOl+C
zb$J(*n2?yb>W;1dfx%5(yE1X(%8hs+6J|1#-#6cxGtcArkGQ+&b~_zh-Y0(<|H|&L
z_)v~z2VHQR4tVxOPN2coOhH~WQWLy}p7$AQ-oF<>Q$@hH%MsLEJ`Ak~(Lxu|N-c0v
zE4L6r)P^<+b9nn+hv7sR?G=?G=%7yayAa{D-KTvIBIq;~>g7ed_6534fgW3-OX#IO
zYe4kvT*eSZF--j!p%_N#irmClMbK5r<IDq`dGJK%1DN2fzFmdl(w}7in&c_w>$pib
zIDQB^4dWJ#;5Lm)f13R<$ukwPLl>l&tq4hTXO!TZn736L#{x~ji#xar7w+Lc7Lmjf
zmXWeGJmAAU<ioAl3RaodB&V4lNq)@yMDjX_)yAnZ6+C6}Oj^&GHzmJdet9<K6|0O?
zfPpN}JXz4hYvd&7@rLi0M@<j5@YX)hPdEv6)e$XJ50#HXEL2n4XH~3K|JDUWpr$8g
zH`6Q0s3>{)qtvwJnWg#aV*PK;n)YO@Po93=KbK6U6V>mYhI3-d`sw=`&@;tCHfPrA
xjKX%VR4mj~(|A`s@NWpKvH6dF#ED8rR()_wXx4Tx=G1*op&fJeTVI0T{sZ9w#8UtO

diff --git a/Backend/backend/settings.py b/Backend/backend/settings.py
index 7eb7b6f..8acc5e3 100644
--- a/Backend/backend/settings.py
+++ b/Backend/backend/settings.py
@@ -25,7 +25,7 @@
 SECRET_KEY = 'django-insecure-x*ykqto7f*@*#nmi*_l2ametk2rw@_q3wrhwq_xm!_0%4768z9'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = True
 
 ALLOWED_HOSTS = ['*']
 
@@ -101,23 +101,23 @@
 # Database
 # https://docs.djangoproject.com/en/4.1/ref/settings/#databases
 
-# DATABASES = {
-#     'default': {
-#         'ENGINE': 'django.db.backends.sqlite3',
-#         'NAME': BASE_DIR / 'db.sqlite3',
-#     }
-# }
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': BASE_DIR / 'db.sqlite3',
+    }
+}
 
  
 
 
 
 
-DATABASES = {
-    'default': dj_database_url.config(
-        default=os.environ.get('DB_URL')
-    )
-}
+# DATABASES = {
+#     'default': dj_database_url.config(
+#         default=os.environ.get('DB_URL')
+#     )
+# }
 # 'default': {
 #     'ENGINE': 'django.db.backends.postgresql',
 #     'NAME': os.environ.get('DATABASE_NAME'),
@@ -245,7 +245,7 @@
 
 # Cloudinary config
 CLOUDINARY_STORAGE = {
-    'CLOUD_NAME' : os.environ.get('CLOUDNARY_CLOUD_NAME'),
+    'CLOUD_NAME' : os.environ.get('CLOUDINARY_CLOUD_NAME'),
     'API_KEY' : os.environ.get('CLOUDINARY_API_KEY'),
     'API_SECRET' : os.environ.get('CLOUDINARY_API_SECRET')
 }