Loading...
;
+ }
+
+ if (error) {
+ return Error fetching orders
;
+ }
+
+ let statusCount = {
+ pending: statusCounts.pending,
+ delivered: statusCounts.delivered,
+ cancelled: statusCounts.cancelled,
+ };
+ console.log(statusCount);
+
+ const datas = Object.entries(statusCount).map(([status, value], index) => ({
+ name: status,
+ value,
+ color: colors[index % colors.length],
+ }));
+
+ return (
+
+
+ );
+};
+
+export default OrderStatus;
diff --git a/src/Components/Analytics/SellerAnalytics/AnnualSellingReport.tsx b/src/Components/Analytics/SellerAnalytics/AnnualSellingReport.tsx
new file mode 100644
index 00000000..0f59de40
--- /dev/null
+++ b/src/Components/Analytics/SellerAnalytics/AnnualSellingReport.tsx
@@ -0,0 +1,169 @@
+import React, { useEffect, useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import {
+ Bar,
+ BarChart,
+ CartesianGrid,
+ Legend,
+ ResponsiveContainer,
+ Tooltip,
+ XAxis,
+ YAxis,
+} from "recharts";
+
+import { Circles } from "react-loader-spinner";
+
+
+import SalesTable from "./SalesTable";
+import { AppDispatch, RootState } from "../../../Redux/store";
+import { fetchSellerSellingReport } from "../../../Redux/Analytic/SellerAnalytics/SellingReportSlice";
+import { useNavigate } from "react-router-dom";
+
+
+const SellerSellingReport = () => {
+ const navigate = useNavigate()
+ const dispatch: AppDispatch = useDispatch();
+ const { monthlySales, data, isLoading, error } = useSelector(
+ (state: RootState) => state.sellerSellingReport
+ );
+ const [showSales, setShowSales] = useState(false);
+ const [filteredData, setFilteredData] = useState([]);
+
+ useEffect(() => {
+ dispatch(fetchSellerSellingReport());
+ }, [dispatch]);
+ const handelRedirect = ()=>{
+ navigate('/vendor/weekly-details', {state:{datas:data}})
+
+ }
+
+ if (isLoading) {
+ return (
+
+
+
+
+ Order status
+Total Earnings of the Month
+
+
+
+
+ {datas.map((item) => (
+ |
+ ))}
+
+
+
+
+
+
+
+
+ Delivered
+
+
+
+ Pending
+
+
+
+ cancelled
+
+
+
+
+ );
+ }
+
+ if (error) {
+ return (
+
+
+ );
+ }
+
+ const chartData = monthlySales.map(
+ (month: { month: any; totalSales: any; income: any }) => ({
+ name: month.month,
+ TotalSales: month.totalSales,
+ Income: month.income,
+ })
+ );
+
+ interface Sale {
+ product: string;
+ quantity: number;
+ price: number;
+ total: number;
+ date: string;
+ }
+
+ const datas: Sale[] = data.map(
+ (totalSale: {
+ name: any;
+ quantity: any;
+ price: any;
+ Total: any;
+ date: any;
+ }) => ({
+ product: totalSale.name,
+ quantity: totalSale.quantity,
+ price: totalSale.price,
+ total: totalSale.quantity * totalSale.price,
+ date: totalSale.date,
+ })
+ );
+ // console.log(data)
+
+ return (
+
+
+ + An error occurred. Please try again +
+ +
+ {/*
+ );
+};
+
+export default SellerSellingReport;
diff --git a/src/Components/Analytics/SellerAnalytics/OrderTable.tsx b/src/Components/Analytics/SellerAnalytics/OrderTable.tsx
new file mode 100644
index 00000000..d56caed0
--- /dev/null
+++ b/src/Components/Analytics/SellerAnalytics/OrderTable.tsx
@@ -0,0 +1,307 @@
+import { data } from "autoprefixer";
+import React from "react";
+import { useState, useMemo } from "react";
+import { useLocation } from "react-router-dom";
+
+interface Product {
+ status: string;
+ quantity: number;
+ productId: string;
+ productName: string;
+}
+
+interface Order {
+ orderId: string;
+ deliveryAddress: {
+ city: string;
+ street: string;
+ };
+ userId: string;
+ client: string;
+ paymentMethod: string;
+ status: string;
+ products: Product[];
+ totalAmount: number | null;
+ expectedDeliveryDate: string | null;
+ createdAt: string;
+ updatedAt: string;
+}
+
+interface OrderTableProps {
+ data: Order[];
+}
+
+console.log(data);
+
+const OrderStatusTable: React.FC = () => {
+ const location = useLocation();
+ const { state } = location;
+
+ if (!state || !state.datas) {
+ return
+
*/}
+
+
+
+
+
+
+
+
+
+ Reports
+
+
+
+ 
+
+ Year selling Analytics
+
+ No data available
;
+ }
+
+ const { datas } = state as { datas: Order[] };
+
+
+ const [productList] = useState(datas);
+ const [rowsLimit] = useState(5);
+ const [rowsToShow, setRowsToShow] = useState(productList.slice(0, rowsLimit));
+ const [customPagination, setCustomPagination] = useState
+
+ );
+};
+
+export default OrderStatusTable;
diff --git a/src/Components/Analytics/SellerAnalytics/SalesPreview.tsx b/src/Components/Analytics/SellerAnalytics/SalesPreview.tsx
new file mode 100644
index 00000000..2981b1be
--- /dev/null
+++ b/src/Components/Analytics/SellerAnalytics/SalesPreview.tsx
@@ -0,0 +1,74 @@
+import React from "react";
+import { useLocation } from "react-router-dom";
+
+interface TopProduct {
+ productId: string;
+ name: string;
+ totalRevenue: number;
+ image: string;
+}
+
+
+const SalesPreview: React.FC = () => {
+ const location = useLocation()
+ const { state } = location;
+
+ if (!state || !state.datas) {
+ return
+
+
+
+ + Orders Table +
+
+
+
+
+
+ | + ID + | ++ name + | ++ Address + | ++ Payment + | ++ products + | ++ status + | ++ Amount + | ++ Date + | ++ Time + | +
|---|---|---|---|---|---|---|---|---|
| + {id++} + | ++ {data?.client} + | ++ {data?.deliveryAddress.city} , {data.deliveryAddress.street} + | ++ {data?.paymentMethod} + | + ++ {data?.products.map((item) => item.productName)} + | ++ {data?.status} + | ++ {data?.totalAmount} + | ++ {data?.createdAt.slice(0, 10)} + | ++ {data?.createdAt.slice(11, 16)} + | +
+
+
+ Showing {currentPage == 0 ? 1 : currentPage * rowsLimit + 1} to{" "}
+ {currentPage == totalPage - 1
+ ? productList?.length
+ : (currentPage + 1) * rowsLimit}{" "}
+ of {productList?.length} entries
+
+
+
+ -
+
-
+
+
+ {customPagination?.map((data, index) => (
+ - changePage(index)} + key={index} + > + {index + 1} + + ))} +
-
+
+
+
No data available
;
+ }
+
+ const { datas } = state as { datas: TopProduct[] };
+ console.log(datas)
+
+ let id = 1;
+ return (
+
+
+ );
+};
+
+export default SalesPreview;
diff --git a/src/Components/Analytics/SellerAnalytics/SalesTable.tsx b/src/Components/Analytics/SellerAnalytics/SalesTable.tsx
new file mode 100644
index 00000000..6fb1871e
--- /dev/null
+++ b/src/Components/Analytics/SellerAnalytics/SalesTable.tsx
@@ -0,0 +1,254 @@
+import React from "react";
+import { useState, useMemo } from "react";
+import { useLocation } from "react-router-dom";
+
+interface Sale {
+ name: string;
+ quantity: number;
+ price: number;
+ total: number;
+ date: string;
+}
+
+
+
+const SalesTable: React.FC = () => {
+ const location = useLocation();
+ const { state } = location;
+
+ if (!state || !state.datas) {
+ return
+
+
+
+ + Top Products +
+ + View all + +
+
+ -
+ {datas.map((product) => (
+
-
+ ++++
+
+++ {/* { id++} */} +
++ {product.name} +
++ {product.totalRevenue} ++
+ ))}
+
No data available
;
+ }
+
+ const { datas } = state as { datas: Sale[] };
+
+ const [productList] = useState(datas);
+ const [rowsLimit] = useState(5);
+
+ const [rowsToShow, setRowsToShow] = useState(productList.slice(0, rowsLimit));
+ const [customPagination, setCustomPagination] = useState
+
+ );
+};
+
+export default SalesTable;
diff --git a/src/Components/Analytics/SellerAnalytics/SellerOrderStatus.tsx b/src/Components/Analytics/SellerAnalytics/SellerOrderStatus.tsx
new file mode 100644
index 00000000..1037bd95
--- /dev/null
+++ b/src/Components/Analytics/SellerAnalytics/SellerOrderStatus.tsx
@@ -0,0 +1,114 @@
+import React, { useEffect, useState } from "react";
+import {
+ PieChart,
+ Pie,
+ Sector,
+ Cell,
+ ResponsiveContainer,
+ Tooltip,
+} from "recharts";
+import { AppDispatch, RootState } from "../../../Redux/store";
+import { useDispatch, useSelector } from "react-redux";
+import { fetchSellerOrderStatus } from "../../../Redux/Analytic/SellerAnalytics/OrderStatusSlice";
+import OrderTable from "./OrderTable";
+import { useNavigate } from "react-router-dom";
+// import OrderTable from "./OrderTable";
+
+const SellerOrderStatus = () => {
+ const dispatch: AppDispatch = useDispatch();
+ const navigate = useNavigate();
+ const { isLoading, data, error } = useSelector(
+ (state: RootState) => state.SellerOrderStatus
+ );
+ const [statusCounts, setStatusCounts] = useState<{ [key: string]: number }>(
+ {}
+ );
+ const [showSales, setShowSales] = useState(false);
+
+ useEffect(() => {
+ dispatch(fetchSellerOrderStatus());
+ }, [dispatch]);
+
+ useEffect(() => {
+ if (data) {
+ const counts: { [key: string]: number } = {};
+ data.forEach((order) => {
+ counts[order.status] = (counts[order.status] || 0) + 1;
+ });
+ setStatusCounts(counts);
+ }
+ }, [data]);
+
+ if (isLoading) {
+ return
+
+
+
+ + Sales Table +
+
+
+
+
+
+ | + ID + | ++ Product + | ++ Quantity + | ++ Price + | ++ Total Price + | ++ Date + | + {/*+ Time + | */} +
|---|---|---|---|---|---|---|
| + {id++} + | ++ {data?.name} + | ++ {data?.quantity} + | ++ {data?.price} + | + ++ {data?.price * data.quantity} + | ++ {data?.date.slice(0, 10)} + | + {/*+ {data?.date.slice(11,16)} + | */} +
+
+
+ Showing {currentPage == 0 ? 1 : currentPage * rowsLimit + 1} to{" "}
+ {currentPage == totalPage - 1
+ ? productList?.length
+ : (currentPage + 1) * rowsLimit}{" "}
+ of {productList?.length} entries
+
+
+
+ -
+
-
+
+
+ {customPagination?.map((data, index) => (
+
- changePage(index)} + key={index} + > + {index + 1} + + ))} +
-
+
+
+
Loading...
;
+ }
+
+ if (error) {
+ return Error fetching orders
;
+ }
+
+ const colors = ["#FFC632", "#17BF6B", "#ED3333"];
+
+ const datas = Object.entries(statusCounts).map(([status, value], index) => ({
+ name: status,
+ value,
+ color: colors[index % colors.length],
+ }));
+
+ const handelRedirect = ()=>{
+ navigate('/vendor/order-details', {state:{datas:data}})
+
+ }
+
+
+ return (
+
+
+ );
+};
+
+export default SellerOrderStatus;
diff --git a/src/Components/Analytics/SellerAnalytics/TopProducts.tsx b/src/Components/Analytics/SellerAnalytics/TopProducts.tsx
new file mode 100644
index 00000000..d9332357
--- /dev/null
+++ b/src/Components/Analytics/SellerAnalytics/TopProducts.tsx
@@ -0,0 +1,141 @@
+import React, { useEffect, useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { AppDispatch, RootState } from "../../../Redux/store";
+import { fetchSellerSellingReport } from "../../../Redux/Analytic/SellerAnalytics/SellingReportSlice";
+import SalesPreview from "./SalesPreview";
+import { useNavigate } from "react-router-dom";
+
+const SellerTopProduct: React.FC = () => {
+ const navigate = useNavigate()
+ const dispatch = useDispatch
+
+
+
+ Order status
+Total Earnings of the Month
+
+
+
+ setShowSales(!showSales)}
+ // onClick={() => navigate("/orderStatus")}
+ >
+ {datas.map((item) => (
+ |
+ ))}
+
+
+
+
+
+
+
+
+ Delivered
+
+
+
+ Pending
+
+
+
+ cancelled
+
+
+ Loading...
; + } + + if (error) { + returnError: {error}
; + } + + interface TopProduct { + productId: string; + name: string; + TotalSales: number; + image: string; + } + interface TopProductProps { + data: TopProduct[]; + } + + const data = topProducts.map((product) => ({ + productId: product.productId, + name: product.name, + image:product.image, + TotalSales: product.totalRevenue, + })); + console.log(data); + + const totalRevenueSum = topProducts.reduce((acc, product) => { + return acc + product.totalRevenue; + }, 0); + + let num = 1; + let progressColors = ["#FCB859", "#61A3BA", "#28AEF3", "#F2C8ED"]; + console.log(data); + + const handelRedirect = ()=>{ + navigate("/vendor/top-product" , {state: {datas: topProducts}}) + } + + return ( +
+ {/*
+ );
+};
+
+export default SellerTopProduct;
diff --git a/src/Components/Analytics/SellerAnalytics/WeeklySellingReport.tsx b/src/Components/Analytics/SellerAnalytics/WeeklySellingReport.tsx
new file mode 100644
index 00000000..db36b35d
--- /dev/null
+++ b/src/Components/Analytics/SellerAnalytics/WeeklySellingReport.tsx
@@ -0,0 +1,154 @@
+import React, { useEffect, useState } from "react";
+import {
+ Bar,
+ BarChart,
+ CartesianGrid,
+ Legend,
+ ResponsiveContainer,
+ Tooltip,
+ XAxis,
+ YAxis,
+} from "recharts";
+
+import { useDispatch, useSelector } from "react-redux";
+
+import { AppDispatch, RootState } from "../../../Redux/store";
+import { fetchSellerWeeklyReport } from "../../../Redux/Analytic/SellerAnalytics/WeekSellingSlice";
+import SalesTable from "./SalesTable";
+import { Circles } from "react-loader-spinner";
+import { useNavigate } from "react-router-dom";
+
+const SellerWeeklyReport = () => {
+ const navigate = useNavigate()
+ const dispatch: AppDispatch = useDispatch();
+ const { SellerWeeklySales,isLoading,data,error } = useSelector(
+ (state: RootState) => state.SellerWeeklySales
+ );
+ const [showSales, setShowSales] = useState(false);
+ const handelRedirect = ()=>{
+ navigate('/vendor/weekly-details', {state:{datas:data}})
+
+ }
+
+
+
+ useEffect(() => {
+ dispatch(fetchSellerWeeklyReport());
+ }, [dispatch]);
+
+ if (isLoading) {
+ return (
+
+
*/}
+
+
+
+
+
+
+ + Top product +
+ View All +
+
+
+
+
+ | + # + | ++ Name + | ++ Popularity + | ++ Sales + | +
|---|---|---|---|
| + {num++} + | +setShowTopProduct(!showTopProduct)}> {item.name} | +
+
+
+
+ |
+ + ${item.TotalSales} + | +
+
+ );
+ }
+
+ if (error) {
+ return (
+
+
+ );
+ }
+
+ const WeekSalesData = SellerWeeklySales.map((day) => ({
+ name: day.day,
+ TotalSales: day.totalSales,
+ }));
+
+ interface Sale {
+ product: string;
+ quantity: number;
+ price: number;
+ total: number;
+ date: string;
+ }
+
+ const datas: Sale[] = data.map(
+ (totalSale: {
+ product: any;
+ quantity: any;
+ price: any;
+ Total: any;
+ date: any;
+ }) => ({
+ product: totalSale.product,
+ quantity: totalSale.quantity,
+ price: totalSale.price,
+ total: totalSale.quantity * totalSale.price,
+ date: totalSale.date,
+ })
+ );
+
+
+
+ return (
+
+
+ + An error occurred. Please try again +
+ +
+ {/*
+ );
+};
+
+export default SellerWeeklyReport;
diff --git a/src/Components/Analytics/SellingReport.tsx b/src/Components/Analytics/SellingReport.tsx
new file mode 100644
index 00000000..b3fb918f
--- /dev/null
+++ b/src/Components/Analytics/SellingReport.tsx
@@ -0,0 +1,88 @@
+import React, { useEffect } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import {
+ Bar,
+ BarChart,
+ CartesianGrid,
+ Legend,
+ ResponsiveContainer,
+ Tooltip,
+ XAxis,
+ YAxis,
+} from "recharts";
+import { AppDispatch, RootState } from "../../Redux/store";
+import { fetchSellingReport } from "../../Redux/Analytic/SellingReportSlice";
+
+const SellingReport = () => {
+ const dispatch: AppDispatch = useDispatch();
+ const { monthlySales, isLoading, error } = useSelector(
+ (state: RootState) => state.sellingReport
+ );
+
+ useEffect(() => {
+ dispatch(fetchSellingReport());
+ }, [dispatch]);
+
+ if (isLoading) {
+ return
+
*/}
+
+
+
+
+
+
+
+
+
+
+ Reports
+ + + Weekly report +
+
+ Loading...
;
+ }
+
+ if (error) {
+ return Error: {error}
;
+ }
+
+ const chartData = monthlySales.map((month) => ({
+ name: month.month,
+ TotalSales: month.totalSales,
+ Income: month.income,
+ }));
+
+ return (
+
+
+
+
+
+
+ );
+};
+
+export default SellingReport;
diff --git a/src/Components/Analytics/TopProduct.tsx b/src/Components/Analytics/TopProduct.tsx
new file mode 100644
index 00000000..76f0202f
--- /dev/null
+++ b/src/Components/Analytics/TopProduct.tsx
@@ -0,0 +1,109 @@
+import React, { useEffect } from "react";
+import { AppDispatch, RootState } from "../../Redux/store";
+import { useDispatch, useSelector } from "react-redux";
+import { fetchSellingReport } from "../../Redux/Analytic/SellingReportSlice";
+
+const TopProduct: React.FC = () => {
+ const dispatch = useDispatch
+
+ Reports
+
+
+
+
+
+ Year selling Analytics
+
+ Loading...
; + } + + if (error) { + returnError: {error}
; + } + + const data = topProducts.map((product) => ({ + productId:product.productId, + name: product.name, + TotalSales: product.totalRevenue, + })); + console.log(data); + + const totalRevenueSum = topProducts.reduce((acc, product) => { + return acc + product.totalRevenue; + }, 0); + + let num = 1; + let progressColors = ["#FCB859", "#61A3BA", "#28AEF3", "#F2C8ED"]; + + return ( +
+
+ );
+};
+
+export default TopProduct;
diff --git a/src/Components/Analytics/WeeklyReport.tsx b/src/Components/Analytics/WeeklyReport.tsx
new file mode 100644
index 00000000..9d1b8f3e
--- /dev/null
+++ b/src/Components/Analytics/WeeklyReport.tsx
@@ -0,0 +1,83 @@
+import React, { useEffect } from "react";
+import {
+ Bar,
+ BarChart,
+ CartesianGrid,
+ Legend,
+ ResponsiveContainer,
+ Tooltip,
+ XAxis,
+ YAxis,
+} from "recharts";
+
+import { AppDispatch, RootState } from "../../Redux/store";
+import { useDispatch } from "react-redux";
+import { useSelector } from "react-redux";
+import { fetchWeeklyReport } from "../../Redux/Analytic/WeeklySellingSlice";
+import { useNavigate } from "react-router-dom";
+
+
+const WeeklyReport = () => {
+
+ const navigate = useNavigate()
+ const dispatch: AppDispatch = useDispatch();
+ const { weeklySales, isLoading, error,data } = useSelector(
+ (state: RootState) => state.weeklyReport
+ );
+
+
+ useEffect(() => {
+ dispatch(fetchWeeklyReport())
+ }, [dispatch])
+
+ const datas = weeklySales.map((day) => ({
+ name: day.day,
+ TotalSales:day.totalSales
+ }))
+
+ const handelRedirect = ()=>{
+ navigate('/vendor/weekly-details', {state:{datas:data}})
+
+ }
+
+ return (
+ + Top product +
+ +
+
+
+
+
+ | + # + | ++ Name + | ++ Popularity + | ++ Sales + | +
|---|---|---|---|
| + {"0" + num++} + | +{item.name} | +
+
+
+
+ |
+ + ${item.TotalSales} + | +
+
+
+
+
+
+ );
+};
+
+export default WeeklyReport;
diff --git a/src/Components/Modal/EmailSent.tsx b/src/Components/Modal/EmailSents.tsx
similarity index 86%
rename from src/Components/Modal/EmailSent.tsx
rename to src/Components/Modal/EmailSents.tsx
index 7de941d0..6b4a9425 100644
--- a/src/Components/Modal/EmailSent.tsx
+++ b/src/Components/Modal/EmailSents.tsx
@@ -4,7 +4,7 @@ interface emailProps {
email?: string
}
-const EmailSent: React.FC
+
+
+
+ Reports
+ + + Weekly report +
+
+
@@ -18,4 +18,4 @@ const EmailSent: React.FC = ({ email }) => (
);
-export default EmailSent;
+export default EmailSents;
\ No newline at end of file
diff --git a/src/Components/ProductsPage/productCard.tsx b/src/Components/ProductsPage/productCard.tsx
index 1727ea1c..fdfcc2dd 100644
--- a/src/Components/ProductsPage/productCard.tsx
+++ b/src/Components/ProductsPage/productCard.tsx
@@ -5,7 +5,7 @@ interface Product {
productId: string;
name: string;
price: number;
- image: string;
+ image: string | string[];
category: string;
}
@@ -20,6 +20,12 @@ const ProductCard: React.FC = ({ product }) => {
navigate(`/product/${product.productId}`);
};
+
+ const images = typeof product.image === 'string' ? JSON.parse(product.image) : product.image;
+
+
+ const imageUrl = Array.isArray(images) ? images[0] : images;
+
return (
= ({ product }) => {
>
@@ -36,7 +42,7 @@ const ProductCard: React.FC = ({ product }) => {
{product.category}
-
+
{product.name}
@@ -60,38 +66,37 @@ const ProductCard: React.FC = ({ product }) => {
xmlns="http://www.w3.org/2000/svg"
>
-
diff --git a/src/Components/SingleProduct/Sproduct.tsx b/src/Components/SingleProduct/Sproduct.tsx
index 49306f96..4e4825f8 100644
--- a/src/Components/SingleProduct/Sproduct.tsx
+++ b/src/Components/SingleProduct/Sproduct.tsx
@@ -13,7 +13,6 @@ import {jwtDecode} from "jwt-decode";
import { toast } from "react-toastify";
import useAuthUser from "react-auth-kit/hooks/useAuthUser";
-
interface DecodedToken {
Id: string | null;
userId: string;
@@ -34,6 +33,7 @@ const Sproduct: React.FC<{ productId: string }> = ({ productId }) => {
const userData: any = useAuthUser();
const [isLoading, setLoading] = useState(false);
const userId = userData ? userData.userId : "";
+
const [showFullDescription, setShowFullDescription] = useState(false);
const getUserIdFromToken = (): string | null => {
const token = localStorage.getItem('token');
@@ -337,4 +337,4 @@ const Sproduct: React.FC<{ productId: string }> = ({ productId }) => {
);
};
-export default Sproduct;
\ No newline at end of file
+export default Sproduct;
diff --git a/src/Components/SingleProduct/product.css b/src/Components/SingleProduct/product.css
index 61f01efd..bb7a1f6a 100644
--- a/src/Components/SingleProduct/product.css
+++ b/src/Components/SingleProduct/product.css
@@ -2,4 +2,11 @@
.flex-container {
flex-wrap: wrap;
}
+}
+.filter-red {
+ filter: invert(21%) sepia(100%) saturate(7414%) hue-rotate(359deg) brightness(94%) contrast(118%);
+}
+
+.filter-white {
+ filter: invert(100%) sepia(0%) saturate(0%) hue-rotate(93deg) brightness(103%) contrast(103%);
}
\ No newline at end of file
diff --git a/src/Components/SingleProduct/similaryProduct.tsx b/src/Components/SingleProduct/similaryProduct.tsx
index f840e899..f6267fe8 100644
--- a/src/Components/SingleProduct/similaryProduct.tsx
+++ b/src/Components/SingleProduct/similaryProduct.tsx
@@ -1,4 +1,3 @@
-
import React, { useEffect } from "react";
import { useDispatch, useSelector } from "react-redux";
import { RootState } from "../../Redux/store";
@@ -19,8 +18,7 @@ const SimilarProduct: React.FC = ({ productId }) => {
useEffect(() => {
if (productId) {
- // @ts-ignore
- dispatch(fetchSimilarProducts(productId));
+ dispatch(fetchSimilarProducts(productId) as any);
}
}, [dispatch, productId]);
diff --git a/src/Components/dashboard/Sidebar.tsx b/src/Components/dashboard/Sidebar.tsx
index 313cd624..2c2e8969 100644
--- a/src/Components/dashboard/Sidebar.tsx
+++ b/src/Components/dashboard/Sidebar.tsx
@@ -1,7 +1,8 @@
-import React, { useState } from "react";
+import React, { useState } from 'react'
+
+import { useLocation, useNavigate } from 'react-router-dom'
+import Logout from '../../services/Logout'
-import { useLocation, useNavigate } from "react-router-dom";
-import Logout from "../../services/Logout";
const Sidebar = () => {
const location = useLocation();
@@ -271,11 +272,13 @@ const Sidebar = () => {
},
];
- const handleNavigate = (data: any) => {
- setActive(data.id);
- navigate(data.location);
- };
- const handelLogout = Logout();
+ const handleNavigate = (data: any) => {
+ setActive(data.id);
+ navigate(data.location);
+ };
+ const handelLogout = Logout()
+
+
return (
@@ -350,13 +353,12 @@ const Sidebar = () => {
/>
-
- Sign Out
-
+ Sign Out
+
+
+
= ({ product }) => {
>
@@ -36,7 +42,7 @@ const ProductCard: React.FC = ({ product }) => {
{product.category}
-
diff --git a/src/Components/SingleProduct/Sproduct.tsx b/src/Components/SingleProduct/Sproduct.tsx
index 49306f96..4e4825f8 100644
--- a/src/Components/SingleProduct/Sproduct.tsx
+++ b/src/Components/SingleProduct/Sproduct.tsx
@@ -13,7 +13,6 @@ import {jwtDecode} from "jwt-decode";
import { toast } from "react-toastify";
import useAuthUser from "react-auth-kit/hooks/useAuthUser";
-
interface DecodedToken {
Id: string | null;
userId: string;
@@ -34,6 +33,7 @@ const Sproduct: React.FC<{ productId: string }> = ({ productId }) => {
const userData: any = useAuthUser();
const [isLoading, setLoading] = useState(false);
const userId = userData ? userData.userId : "";
+
const [showFullDescription, setShowFullDescription] = useState(false);
const getUserIdFromToken = (): string | null => {
const token = localStorage.getItem('token');
@@ -337,4 +337,4 @@ const Sproduct: React.FC<{ productId: string }> = ({ productId }) => {
);
};
-export default Sproduct;
\ No newline at end of file
+export default Sproduct;
diff --git a/src/Components/SingleProduct/product.css b/src/Components/SingleProduct/product.css
index 61f01efd..bb7a1f6a 100644
--- a/src/Components/SingleProduct/product.css
+++ b/src/Components/SingleProduct/product.css
@@ -2,4 +2,11 @@
.flex-container {
flex-wrap: wrap;
}
+}
+.filter-red {
+ filter: invert(21%) sepia(100%) saturate(7414%) hue-rotate(359deg) brightness(94%) contrast(118%);
+}
+
+.filter-white {
+ filter: invert(100%) sepia(0%) saturate(0%) hue-rotate(93deg) brightness(103%) contrast(103%);
}
\ No newline at end of file
diff --git a/src/Components/SingleProduct/similaryProduct.tsx b/src/Components/SingleProduct/similaryProduct.tsx
index f840e899..f6267fe8 100644
--- a/src/Components/SingleProduct/similaryProduct.tsx
+++ b/src/Components/SingleProduct/similaryProduct.tsx
@@ -1,4 +1,3 @@
-
import React, { useEffect } from "react";
import { useDispatch, useSelector } from "react-redux";
import { RootState } from "../../Redux/store";
@@ -19,8 +18,7 @@ const SimilarProduct: React.FC = ({ productId }) => {
useEffect(() => {
if (productId) {
- // @ts-ignore
- dispatch(fetchSimilarProducts(productId));
+ dispatch(fetchSimilarProducts(productId) as any);
}
}, [dispatch, productId]);
diff --git a/src/Components/dashboard/Sidebar.tsx b/src/Components/dashboard/Sidebar.tsx
index 313cd624..2c2e8969 100644
--- a/src/Components/dashboard/Sidebar.tsx
+++ b/src/Components/dashboard/Sidebar.tsx
@@ -1,7 +1,8 @@
-import React, { useState } from "react";
+import React, { useState } from 'react'
+
+import { useLocation, useNavigate } from 'react-router-dom'
+import Logout from '../../services/Logout'
-import { useLocation, useNavigate } from "react-router-dom";
-import Logout from "../../services/Logout";
const Sidebar = () => {
const location = useLocation();
@@ -271,11 +272,13 @@ const Sidebar = () => {
},
];
- const handleNavigate = (data: any) => {
- setActive(data.id);
- navigate(data.location);
- };
- const handelLogout = Logout();
+ const handleNavigate = (data: any) => {
+ setActive(data.id);
+ navigate(data.location);
+ };
+ const handelLogout = Logout()
+
+
return (
+
{product.name}
@@ -60,38 +66,37 @@ const ProductCard: React.FC
-
{product.name}
@@ -60,38 +66,37 @@ const ProductCard: React.FC = ({ product }) => {
xmlns="http://www.w3.org/2000/svg"
>
@@ -350,13 +353,12 @@ const Sidebar = () => {
/>
-
- Sign Out
-
+ Sign Out
+
+
+
@@ -57,6 +63,30 @@ const SellingReport = () => {
Income: month.income,
}));
+ interface Sale {
+ product: string;
+ quantity: number;
+ price: number;
+ total: number;
+ date: string;
+ }
+
+ const datas: Sale[] = data.map(
+ (totalSale: {
+ name: any;
+ quantity: any;
+ price: any;
+ Total: any;
+ date: any;
+ }) => ({
+ product: totalSale.name,
+ quantity: totalSale.quantity,
+ price: totalSale.price,
+ total: totalSale.quantity * totalSale.price,
+ date: totalSale.date,
+ })
+ );
+
return (
{
{
+ const navigate=useNavigate()
const dispatch = useDispatch();
const { topProducts, isLoading, error } = useSelector(
(state: RootState) => state.sellingReport
@@ -14,6 +16,10 @@ const TopProduct: React.FC = () => {
dispatch(fetchSellingReport());
}, [dispatch]);
+ const handleTopProducts = () => {
+ navigate("/admin/topProduct",{state:{datas:topProducts}})
+ }
+
if (isLoading) {
return (
@@ -88,7 +94,7 @@ const TopProduct: React.FC = () => {
>
{"0" + num++}
- {item.name}
+ {item.name}
{
- const dispatch: AppDispatch = useDispatch();
- const { weeklySales, isLoading, error } = useSelector(
- (state: RootState) => state.weeklyReport
- );
-
- useEffect(() => {
- dispatch(fetchWeeklyReport());
- }, [dispatch]);
+ const navigate = useNavigate();
+ const dispatch: AppDispatch = useDispatch();
+ const { weeklySales,data,isLoading, error } = useSelector(
+ (state: RootState) => state.weeklyReport
+ );
+
- const data = weeklySales.map((day) => ({
- name: day.day,
- TotalSales: day.totalSales,
- }));
+ useEffect(() => {
+ dispatch(fetchWeeklyReport());
+ }, [dispatch]);
+
+ const handleBarClick = () => {
+ console.log(data)
+ navigate("/admin/annualSales", { state: { datas: data } });
+ };
+ const chartData = weeklySales.map((day) => ({
+ name: day.day,
+ TotalSales: day.totalSales,
+ }));
+
return (
("")
+ const [description, setDescription] = useState("")
+ const [discount, setDiscount] = useState()
+ const [price, setPrice] = useState("")
+ const [image, setImage] = useState([]);
+ const [category, setCategory] = useState("")
+ const [quantity, setQuantity] = useState(1)
+ const [expiringDate, setExpiringDate] = useState("")
+ const [error, setError] = useState(false)
+ const [loading, setLoading] = useState(false)
+
+ const token = useAuthHeader()
+
+
+ const [createProduct, {isLoading:uploadLoading,isError}] = useCreateProductMutation()
+
+ const handleImages = (value: FileList): void => {
+ const newImages = Array.from(value)
+ if ((newImages.length + image.length) > 5) {
+ return;
+ } else {
+ setImage([...image, ...newImages]);
+ }
+ };
+ const handleFileChange = (event: React.ChangeEvent): void => {
+ if (event.target.files) {
+ handleImages(event.target.files);
+ }
+ };
+ const handelRemove = (index:any)=>{
+ console.log(index)
+ const newImages = [...image]
+ newImages.splice(index,1)
+ setImage(newImages)
+ }
+
+ const validateForm = (): boolean => {
+ setLoading(true)
+ if (!name || !description || !discount || !price) {
+ setError(true);
+ return false;
+ }
+ if (image.length === 0) {
+ setError(true);
+ return false;
+ }
+ return true;
+ };
+
+ const handleSubmit = async (e: FormEvent) => {
+ e.preventDefault();
+ if (!validateForm()) return;
+
+ try {
+ const uploadPromises = image.map(img => {
+ const formData = new FormData();
+ formData.append('file', img);
+ formData.append('upload_preset', 'e-commerce');
+ return axios.post('https://api.cloudinary.com/v1_1/dnefzcfv6/image/upload', formData);
+ });
+
+ const responses = await Promise.all(uploadPromises);
+ const imageUrls = responses.map(response => response.data.secure_url);
+
+ const vendor = JSON.parse(localStorage.getItem('vendorData') as string);
+ const data = {name,quantity,description,price,discount,expiringDate,category,image: imageUrls, id: vendor.vendorId };
+
+ const response = await createProduct({data,token}).unwrap();
+ if (response.message && response.message === "Product Created") {
+ console.log(response)
+ setLoading(false)
+ property.setModal(false)
+ property.setIsComplete(true)
+ }
+ } catch (error) {
+ console.log(error)
+ setLoading(false)
+ setError(true);
+ }
+ };
+
+
+
+ return (
+ (property.productData.name)
+ const [description, setDescription] = useState(property.productData.description)
+ const [discount, setDiscount] = useState(property.productData.discount)
+ const [price, setPrice] = useState(property.productData.price)
+ const [image, setImage] = useState(property.productData.image);
+ const [category, setCategory] = useState(property.productData.category)
+ const [quantity, setQuantity] = useState(property.productData.quantity)
+ const [expiringDate, setExpiringDate] = useState(property.productData.expiringDate)
+ const [error, setError] = useState(false)
+ const [loading, setLoading] = useState(false)
+
+ const token = useAuthHeader()
+
+
+
+ const [updateProduct, {isLoading:uploadLoading,isError}] = useUpdateProductMutation()
+
+ const handleImages = (value: FileList): void => {
+ const newImages = Array.from(value)
+ if ((newImages.length + image.length) > 5) {
+ return;
+ } else {
+ setImage([...image, ...newImages]);
+ }
+ };
+ const handleFileChange = (event: React.ChangeEvent): void => {
+ if (event.target.files) {
+ handleImages(event.target.files);
+ }
+ };
+ const handelRemove = (index:any)=>{
+ console.log(index)
+ const newImages = [...image]
+ newImages.splice(index,1)
+ setImage(newImages)
+ }
+
+ const validateForm = (): boolean => {
+ setLoading(true)
+ if (!name || !description || !discount || !price) {
+ setError(true);
+ return false;
+ }
+ if (image.length === 0) {
+ setError(true);
+ return false;
+ }
+ return true;
+ };
+
+ const handleSubmit = async (e: FormEvent) => {
+ e.preventDefault();
+ if (!validateForm()) return;
+
+ try {
+ const uploadPromises = image.map((img:any) => {
+ const formData = new FormData();
+ formData.append('file', img);
+ formData.append('upload_preset', 'e-commerce');
+ return axios.post('https://api.cloudinary.com/v1_1/dnefzcfv6/image/upload', formData);
+ });
+
+ const responses = await Promise.all(uploadPromises);
+ const imageUrls = responses.map(response => response.data.secure_url);
+
+ const vendor = JSON.parse(localStorage.getItem('vendorData') as string);
+ const data = {name,quantity,description,price,discount,expiringDate,category,image: imageUrls, vendorId: vendor.vendorId,id: property.productData.productId };
+
+ const response = await updateProduct({data,token}).unwrap();
+ if (response.message && response.message === "Product updated successfully") {
+ console.log(response)
+ setLoading(false)
+ property.setModal(false)
+ property.setIsComplete(true)
+ }
+ } catch (error) {
+ setLoading(false)
+ setError(true);
+ }
+ };
+
+
+
+ return (
+ (0);
+ const [minutes, setMinutes] = useState(0);
+ const [period, setPeriod] = useState('');
+
+ useEffect(() => {
+ const interval = setInterval(() => {
+ const date = new Date();
+ const hours = date.getHours();
+ const minutes = date.getMinutes();
+ const period = hours >= 12 ? 'PM' : 'AM';
+
+ setHourss(hours);
+ setMinutes(minutes);
+ setPeriod(period);
+ }, 1000);
+
+ return () => clearInterval(interval);
+ }, []);
+
+
+ const date = new Date();
+ const day = date.getDay();
+ const month = date.getMonth();
+ const year = date.getFullYear();
+
+ const monthLabel = [
+ 'January',
+ 'February',
+ 'March',
+ 'April',
+ 'May',
+ 'June',
+ 'July',
+ 'August',
+ 'September',
+ 'October',
+ 'November',
+ 'December',
+ ];
+
+ return (
+ = ({ label, isLoading }) => (
-
-);
+const AuthButton: React.FC = ({ label, isLoading }) => {
+ return (
+
+ )
+}
-export default AuthButton;
+export default AuthButton
\ No newline at end of file
diff --git a/src/Constants/Input.tsx b/src/Constants/Input.tsx
index 69e6e19a..607bb298 100644
--- a/src/Constants/Input.tsx
+++ b/src/Constants/Input.tsx
@@ -1,56 +1,25 @@
-import React, { useState } from 'react';
+import React from 'react'
interface InputProps {
label: string,
type: string,
- value: string,
+ value: any,
placeholder: string,
error?: boolean,
- onChange: (value: string) => void
+ onChange: (value: any) => void
}
-const Input: React.FC = ({
- label, type, value, placeholder, onChange, error,
-}) => {
- const handelChange = (e: React.ChangeEvent) => {
- onChange(e.target.value);
- };
- const [passType, setPassType] = useState("password")
- const handleToggle = () => {
- if (passType === "password") {
- setPassType("text")
+const Input: React.FC = ({label,type,value,placeholder,onChange,error}) => {
+ const handelChange = (e: React.ChangeEvent)=>{
+ onChange(e.target.value)
}
- else {
- setPassType("password")
- }
- }
- return (
-
@@ -46,7 +54,7 @@ const WeeklyReport = () => {
{
diff --git a/src/Components/vendor/NewProduct.tsx b/src/Components/vendor/NewProduct.tsx
new file mode 100644
index 00000000..8d527686
--- /dev/null
+++ b/src/Components/vendor/NewProduct.tsx
@@ -0,0 +1,150 @@
+import React, { FormEvent, useEffect, useState } from 'react'
+import Input from '../../Constants/Input'
+import AuthButton from '../../Constants/AuthButton'
+import axios from 'axios'
+import { useCreateProductMutation } from '../../Redux/features/sellerSlice'
+import useAuthHeader from 'react-auth-kit/hooks/useAuthHeader'
+
+
+interface productProps {
+ setIsComplete: any,
+ setModal: any,
+}
+
+const NewProduct = (property: productProps) => {
+ const [name, setName] = useState
+
+ )
+}
+
+export default NewProduct
\ No newline at end of file
diff --git a/src/Components/vendor/ReviewTable.tsx b/src/Components/vendor/ReviewTable.tsx
new file mode 100644
index 00000000..e69de29b
diff --git a/src/Components/vendor/UpdateProduct.tsx b/src/Components/vendor/UpdateProduct.tsx
new file mode 100644
index 00000000..b625e21b
--- /dev/null
+++ b/src/Components/vendor/UpdateProduct.tsx
@@ -0,0 +1,151 @@
+import React, { FormEvent, useEffect, useState } from 'react'
+import Input from '../../Constants/Input'
+import AuthButton from '../../Constants/AuthButton'
+import axios from 'axios'
+import {useUpdateProductMutation } from '../../Redux/features/sellerSlice'
+import useAuthHeader from 'react-auth-kit/hooks/useAuthHeader'
+
+
+interface productProps {
+ setIsComplete: any,
+ setModal: any,
+ productData: any
+}
+
+const UpdateProduct = (property: productProps) => {
+ const [name, setName] = useState
+
+
+
+
+
+ New Products
+X
+
+ {image.map((photo,index)=>{
+ return(
+
+
+
+ })
+
+ )
+ })}
+ handelRemove(index)} className='text-red-600 absolute right-0 top-0 font-[800] cursor-pointer'>X
+
+
+ )
+}
+
+export default UpdateProduct
\ No newline at end of file
diff --git a/src/Components/vendor/VendorHeader.tsx b/src/Components/vendor/VendorHeader.tsx
new file mode 100644
index 00000000..a193d1ce
--- /dev/null
+++ b/src/Components/vendor/VendorHeader.tsx
@@ -0,0 +1,90 @@
+import React, { useEffect, useState } from 'react';
+import useAuthUser from 'react-auth-kit/hooks/useAuthUser';
+
+interface AuthDataProps {
+ name: string;
+ role: string
+}
+
+const VendorHeader = () => {
+ const authData: AuthDataProps | null = useAuthUser();
+ const [stringMonth, setStringMonth] = useState('');
+ const [hourss, setHourss] = useState
+
+
+
+
+
+ Update Product
+ property.setModal(false)}>X
+
+ {image.map((photo:any,index:number)=>{
+ return(
+
+
+
+ 
+
+ )
+ })}
+ handelRemove(index)} className='text-red-600 absolute right-0 top-0 font-[800] cursor-pointer'>X
+
+
+ );
+};
+
+export default VendorHeader;
diff --git a/src/Components/vendor/VendorSidebar.tsx b/src/Components/vendor/VendorSidebar.tsx
new file mode 100644
index 00000000..3195950c
--- /dev/null
+++ b/src/Components/vendor/VendorSidebar.tsx
@@ -0,0 +1,213 @@
+import React from "react";
+import { useLocation } from "react-router-dom";
+
+const VendorSidebar = () => {
+ const location = useLocation();
+ const pathName = location.pathname;
+
+ const navbarLink = [
+ {
+ label: "Dashboard",
+ icon: (
+
+ ),
+ url: "/vendor",
+ },
+ {
+ label: "My Products",
+ icon: (
+
+ ),
+ url: "/vendor/my-products",
+ },
+ {
+ label: "chat",
+ icon: (
+
+ ),
+
+ url: "/chat",
+ },
+ {
+ label: "Analytics",
+ icon: (
+
+ ),
+
+ url: "/vendor/analytics",
+ },
+ ];
+ return (
+
+
+ Welcome back! {authData?.name}
+
+ {day}
+ {monthLabel[month]}
+ {year}
+
+
+
+ {hourss} :
+ {minutes}
+ {period}
+
+
+
+
+
+
+ {authData?.name.slice(0, 1)}{authData?.name.split(" ")[1]?.slice(0, 1)}
+
+
+ {authData?.name}
+ {authData?.role}
+
+
+
+
+
+
+
+
+ );
+};
+
+export default VendorSidebar;
diff --git a/src/Constants/AuthButton.tsx b/src/Constants/AuthButton.tsx
index 2d782796..45c907c0 100644
--- a/src/Constants/AuthButton.tsx
+++ b/src/Constants/AuthButton.tsx
@@ -1,28 +1,20 @@
-import React from 'react';
-import { ThreeDots } from 'react-loader-spinner';
+import React from 'react'
interface AuthButtonProps {
label: string,
isLoading: boolean
}
-const AuthButton: React.FC
+
+
+
+
+ {navbarLink.map((item, index) => {
+ return (
+
+
+ {item.icon}
+ {item.label}
+
+ );
+ })}
+
- {label}
-
- );
-};
+ return (
+
-
- {type === 'password' ? (
-
- {passType === "password" ? (
-
-
-
- ) : (
-
-
-
- )}
-
- ) : ""}
-
-
-
+ {label}
+
+
+ )
+}
-export default Input;
+export default Input
\ No newline at end of file
diff --git a/src/Lib/AuthKitStore.tsx b/src/Lib/AuthKitStore.tsx
index 6373c933..4c165d1a 100644
--- a/src/Lib/AuthKitStore.tsx
+++ b/src/Lib/AuthKitStore.tsx
@@ -1,11 +1,12 @@
-import React from 'react';
-import createStore from 'react-auth-kit/createStore';
+import React from "react";
+import createStore from "react-auth-kit/createStore"
+
const store = createStore({
- authName: '_auth',
- authType: 'cookie',
- cookieDomain: window.location.hostname,
- cookieSecure: window.location.protocol === 'https:',
-});
+ authName:'_auth',
+ authType:'cookie',
+ cookieDomain: window.location.hostname,
+ cookieSecure: window.location.protocol === 'https:',
+ });
-export default store;
+export default store
\ No newline at end of file
diff --git a/src/Lib/VerifyEmail.tsx b/src/Lib/VerifyEmail.tsx
index 93913fab..7daa7fff 100644
--- a/src/Lib/VerifyEmail.tsx
+++ b/src/Lib/VerifyEmail.tsx
@@ -1,81 +1,33 @@
import React, { useEffect } from 'react';
import { useLocation } from 'react-router-dom';
-import { Puff } from 'react-loader-spinner';
import { useVerifyEmailQuery } from '../Redux/features/AuthSlice';
-
-function VerifyEmail() {
- const location = useLocation();
- const getQueryParams = (search: string) => new URLSearchParams(search);
- const queryParams = getQueryParams(location.search);
- const token = queryParams.get('token');
- const {data, isLoading, isError, error,} = useVerifyEmailQuery(token || '');
- if (isLoading) {
- return (
-
-
- );
- }
- if (isError || !data || !data.message) {
- return (
-
-
+const VerifyEmail = () => {
+ const location = useLocation();
+ const getQueryParams = (search: string) => {
+ return new URLSearchParams(search);
+ };
+ const queryParams = getQueryParams(location.search);
+ const token = queryParams.get('token');
+ const { data, isLoading, isError, error } = useVerifyEmailQuery(token || '');
+ if (isLoading) {
+ return
Loading...
;
+ }
+ if (isError || !data || !data.message) {
+ return (
+
+
+ );
+ }
+ if (data.message === "Email verified successfully") {
+ window.location.href = "/login";
+ return null;
+ }
+ return (
+ Verification Link has expired or invalid token
+
+
-
- );
- }
- if (data.message === 'Email verified successfully') {
- return (
- Verification Link has expired or invalid token
-
-
- );
- }
- return (
-
-
-
-
-
-
-
-
- Continue To Login
- Success!
- - Your email has been successfully verified. Welcome to - Crafters online shop - -
-
- );
-}
+ );
+};
export default VerifyEmail;
diff --git a/src/Lib/getToken.tsx b/src/Lib/getToken.tsx
new file mode 100644
index 00000000..6e02629d
--- /dev/null
+++ b/src/Lib/getToken.tsx
@@ -0,0 +1,6 @@
+import useAuthHeader from "react-auth-kit/hooks/useAuthHeader";
+
+export const getToken = () => {
+ const authHeader:any = useAuthHeader();
+ return authHeader();
+};
diff --git a/src/Lib/navlinks.tsx b/src/Lib/navlinks.tsx
index fea09669..20e44819 100644
--- a/src/Lib/navlinks.tsx
+++ b/src/Lib/navlinks.tsx
@@ -1,58 +1,59 @@
-import React from 'react';
-import useAuthUser from 'react-auth-kit/hooks/useAuthUser';
+import React from 'react'
+import useAuthUser from 'react-auth-kit/hooks/useAuthUser'
-const userData:any = useAuthUser();
+const userData:any = useAuthUser()
export const Navlinks = [
- {
- id: '001',
- label: 'dashboard',
- icon: ,
- location: '/admin',
+ {
+ id: '001',
+ label: "dashboard",
+ icon: ,
+ location: "/admin"
- },
- {
- id: '002',
- label: userData.role === 'admin' ? 'Users' : 'My Products',
- icon: ,
- location: '/admin/users',
+ },
+ {
+ id: '002',
+ label: userData.role === "admin" ? "Users" : "My Products",
+ icon:
+ ,
+ location: "/admin/users"
- },
- {
- id: '003',
- label: 'Sellers',
- icon: ,
- location: '/admin/sellers',
+ },
+ {
+ id: '003',
+ label: "Sellers",
+ icon: ,
+ location: "/admin/sellers"
- },
- {
- id: '004',
- label: 'Analytics',
- icon: ,
- location: '/admin/analytics',
+ },
+ {
+ id: '004',
+ label: "Analytics",
+ icon: ,
+ location: "/admin/analytics"
- },
- {
- id: '005',
- label: 'dashboard',
- icon: ,
- location: '/admin',
+ },
+ {
+ id: '005',
+ label: "dashboard",
+ icon: ,
+ location: "/admin"
- },
-];
+ },
+]
\ No newline at end of file
diff --git a/src/Lib/pusher.tsx b/src/Lib/pusher.tsx
index f13b1ef2..2f7ffab2 100644
--- a/src/Lib/pusher.tsx
+++ b/src/Lib/pusher.tsx
@@ -1,6 +1,5 @@
import Pusher from "pusher-js";
-
const pusher = new Pusher(process.env.PUSHER_KEY as string, {
cluster: process.env.PUSHER_CLUSTER as string,
});
diff --git a/src/Portal/Buyer.tsx b/src/Portal/Buyer.tsx
index 2e67b7a9..e5fb5cdb 100644
--- a/src/Portal/Buyer.tsx
+++ b/src/Portal/Buyer.tsx
@@ -1,14 +1,18 @@
-import React, { useEffect } from 'react';
+import React, { useEffect } from 'react'
+import useSignOut from 'react-auth-kit/hooks/useSignOut';
import Logout from '../services/Logout';
+import useAuthUser from 'react-auth-kit/hooks/useAuthUser';
+import { useNavigate } from 'react-router-dom';
+;
-function Buyer() {
- const handelLogout = Logout();
+const Buyer = () => {
+ const handelLogout = Logout()
return (
- Verification Link has expired or invalid token
-
-
- );
+ Buyer Dashboard
- -
+
+ )
}
-export default Buyer;
+export default Buyer
\ No newline at end of file
diff --git a/src/Portal/Seller.tsx b/src/Portal/Seller.tsx
index 7dc0a7e3..32b96b60 100644
--- a/src/Portal/Seller.tsx
+++ b/src/Portal/Seller.tsx
@@ -1,24 +1,48 @@
import React, { useEffect } from 'react';
import useSignOut from 'react-auth-kit/hooks/useSignOut';
import useAuthUser from 'react-auth-kit/hooks/useAuthUser';
-import { useNavigate } from 'react-router-dom';
+import { Outlet, useNavigate } from 'react-router-dom';
import Logout from '../services/Logout';
+import VendorSidebar from '../Components/vendor/VendorSidebar';
+import VendorHeader from '../Components/vendor/VendorHeader';
+import { useSelectVendorQuery } from '../Redux/features/sellerSlice';
function Seller() {
+
const navigate = useNavigate();
const userData: any = useAuthUser();
+ const { data: vendors, error, isLoading } = useSelectVendorQuery(userData.userId)
useEffect(() => {
- if (!userData || userData.role !== 'vendor') {
+ if (userData.role !== 'vendor') {
navigate(`/${userData.role}`);
+ } else {
+
+
+
}
}, [navigate]);
+
+ useEffect(() => {
+ if (vendors) {
+ console.log(vendors)
+ localStorage.setItem("vendorData", JSON.stringify({ storeName: vendors.vendor.storeName, vendorId: vendors.vendor.vendorId }))
+ }
+ }, [vendors])
const handelLogout = Logout();
return (
- Buyer Dashboard
+ +
-
Seller Dashboard
- +
+
);
}
-export default Seller;
+export default Seller
\ No newline at end of file
diff --git a/src/Portal/admin.tsx b/src/Portal/admin.tsx
index 1160af20..6601c547 100644
--- a/src/Portal/admin.tsx
+++ b/src/Portal/admin.tsx
@@ -3,17 +3,18 @@ import Logout from '../services/Logout'
import useAuthUser from "react-auth-kit/hooks/useAuthUser"
import { Outlet, useNavigate } from 'react-router-dom'
import Sidebar from '../Components/dashboard/Sidebar'
-import DashHeader from '../Components/dashboard/AdminHeader'
import DashFooter from '../Components/dashboard/DashFooter'
+import DashHeader from "../Components/dashboard/AdminHeader";
const Admin = () => {
const navigate = useNavigate()
const userData: any = useAuthUser()
useEffect(() => {
- if (userData.role !== 'admin') {
- navigate(`/${userData.role}`);
+ if (userData.role !== "admin") {
+ navigate(`/${userData.role}`)
+ return
}
- }, [navigate]);
+ }, [navigate])
return (
+
+
+
+
+
+
@@ -31,4 +32,4 @@ const Admin = () => {
)
}
-export default Admin;
+export default Admin
diff --git a/src/Redux/Action/wishlist.tsx b/src/Redux/Action/wishlist.tsx
index 01009688..ba9f53ff 100644
--- a/src/Redux/Action/wishlist.tsx
+++ b/src/Redux/Action/wishlist.tsx
@@ -8,33 +8,23 @@ export const addToWishlist = createAsyncThunk(
async (wishlistItem: { userId: string; productId: string; price: number }, { rejectWithValue }) => {
try {
const response = await axios.post(API_URL, wishlistItem);
- return response.data;
+ return response.data;
} catch (error: any) {
return rejectWithValue(error.response.data);
}
}
);
-export const removeFromWishlist = createAsyncThunk(
- 'wishlist/removeFromWishlist',
- async (wishlistItem: { userId: string; productId: string }, { rejectWithValue }) => {
- try {
- const response = await axios.delete(API_URL, { data: wishlistItem });
- return response.data;
- } catch (error: any) {
- return rejectWithValue(error.response.data);
- }
- }
-);
+
export const fetchWishlist = createAsyncThunk(
'wishlist/fetchWishlist',
async (userId: string, { rejectWithValue }) => {
try {
const response = await axios.get(`${API_URL}/${userId}`);
- return response.data;
+ return response.data;
} catch (error: any) {
- return rejectWithValue(error.response.data);
+ return rejectWithValue(error.response.data);
}
}
);
\ No newline at end of file
diff --git a/src/Redux/Analytic/SellerAnalytics/OrderStatusSlice.tsx b/src/Redux/Analytic/SellerAnalytics/OrderStatusSlice.tsx
new file mode 100644
index 00000000..69d0f175
--- /dev/null
+++ b/src/Redux/Analytic/SellerAnalytics/OrderStatusSlice.tsx
@@ -0,0 +1,100 @@
+import { createSlice, createAsyncThunk, PayloadAction } from "@reduxjs/toolkit";
+import axios from "axios";
+import Cookies from "js-cookie";
+import { jwtDecode } from "jwt-decode";
+import { Key } from "react";
+
+interface TokenPayload {
+ role: string;
+ email: string;
+ vendor: string;
+ id: string;
+ password: string;
+ iat: number;
+ exp: number;
+}
+
+interface DeliveryAddress {
+ city: string;
+ street: string;
+}
+
+interface Product {
+ productId: string;
+ name: string;
+ quantity: number;
+ price: number;
+}
+
+interface Order {
+ color: string | undefined;
+ name: Key | null | undefined;
+ createdAt: string;
+ deliveryAddress: DeliveryAddress;
+ expectedDeliveryDate: string | null;
+ orderId: string;
+ paymentMethod: string;
+ products: Product[];
+ status: string;
+ totalAmount: number | null;
+ updatedAt: string;
+ userId: string;
+}
+
+interface OrderState {
+ isLoading: boolean;
+ data: Order[];
+ error: boolean;
+}
+
+const initialState: OrderState = {
+ isLoading: false,
+ data: [],
+ error: false,
+};
+
+
+export const fetchSellerOrderStatus = createAsyncThunk(
+ "/seller/getOrderStatus",
+ async () => {
+ try {
+ const token: any = Cookies.get("_auth");
+
+ const decodedToken = jwtDecode(token);
+ const vendorId = decodedToken.vendor;
+ const response = await axios.get(
+ `http://localhost:5000/order/getSellerOrder/${vendorId}`
+ );
+ return response.data;
+ } catch (error) {
+ throw new Error("Failed to fetch orderStatus");
+ }
+ }
+);
+
+const SellerOrderStatusSlice = createSlice({
+ name: "SellerOrders",
+ initialState,
+ reducers: {},
+ extraReducers: (builder) => {
+ builder
+ .addCase(fetchSellerOrderStatus.pending, (state) => {
+ state.isLoading = true;
+ state.error = false;
+ })
+ .addCase(
+ fetchSellerOrderStatus.fulfilled,
+ (state, action: PayloadAction) => {
+ state.isLoading = false;
+ state.data = action.payload;
+ state.error = false;
+ }
+ )
+ .addCase(fetchSellerOrderStatus.rejected, (state) => {
+ state.isLoading = false;
+ state.error = true;
+ });
+ },
+});
+
+export default SellerOrderStatusSlice.reducer;
diff --git a/src/Redux/Analytic/SellerAnalytics/SellingReportSlice.tsx b/src/Redux/Analytic/SellerAnalytics/SellingReportSlice.tsx
new file mode 100644
index 00000000..6c1baa00
--- /dev/null
+++ b/src/Redux/Analytic/SellerAnalytics/SellingReportSlice.tsx
@@ -0,0 +1,93 @@
+import { createSlice, createAsyncThunk, PayloadAction } from "@reduxjs/toolkit";
+import axios from "axios";
+import Cookies from "js-cookie";
+import { jwtDecode } from "jwt-decode";
+
+interface MonthlySale {
+ month: string;
+ totalSales: number;
+ income: number;
+}
+
+interface TopProduct {
+ productId: string;
+ name: string;
+ totalRevenue: number;
+}
+
+interface SellingReportState {
+ data: any[];
+ monthlySales: MonthlySale[];
+ topProducts: TopProduct[];
+ isLoading: boolean;
+ error: boolean;
+}
+
+const initialState: SellingReportState = {
+ data: [],
+ monthlySales: [],
+ topProducts: [],
+ isLoading: false,
+ error: false,
+};
+
+interface TokenPayload {
+ role: string;
+ email: string;
+ vendor: string;
+ id: string;
+ password: string;
+ iat: number;
+ exp: number;
+}
+
+export const fetchSellerSellingReport = createAsyncThunk(
+ "sellingReport/fetchSellingReport",
+ async () => {
+ const token: any = Cookies.get("_auth");
+
+ const decodedToken = jwtDecode(token);
+ const vendorId = decodedToken.vendor;
+
+ const response = await axios.get(
+ `http://localhost:5000/annualSellingReport/${vendorId}`
+ );
+ return response.data;
+ }
+);
+
+const sellingReportSlice = createSlice({
+ name: "sellingReports",
+ initialState,
+ reducers: {},
+ extraReducers: (builder) => {
+ builder
+ .addCase(fetchSellerSellingReport.pending, (state) => {
+ state.isLoading = true;
+ state.error = false;
+ })
+ .addCase(
+ fetchSellerSellingReport.fulfilled,
+ (
+ state,
+ action: PayloadAction<{
+ topProducts: any;
+ data: any[];
+ monthlySales: MonthlySale[];
+ }>
+ ) => {
+ state.isLoading = false;
+ state.data = action.payload.data;
+ state.monthlySales = action.payload.monthlySales;
+ state.topProducts = action.payload.topProducts;
+ state.error = false;
+ }
+ )
+ .addCase(fetchSellerSellingReport.rejected, (state) => {
+ state.isLoading = false;
+ state.error = true;
+ });
+ },
+});
+
+export default sellingReportSlice.reducer;
diff --git a/src/Redux/Analytic/SellerAnalytics/TopProductSlice.tsx b/src/Redux/Analytic/SellerAnalytics/TopProductSlice.tsx
new file mode 100644
index 00000000..4889555b
--- /dev/null
+++ b/src/Redux/Analytic/SellerAnalytics/TopProductSlice.tsx
@@ -0,0 +1,76 @@
+import { PayloadAction, createAsyncThunk, createSlice } from "@reduxjs/toolkit";
+import axios from "axios";
+
+export const fetchingSellerPopularProduct = createAsyncThunk(
+ "/product/popularity",
+ async () => {
+ const response = await axios.get("http://localhost:5000/popular-product");
+ return response.data;
+ }
+);
+
+interface CartItem {
+ cartitemsid: string;
+ cartId: string;
+ productId: string;
+ quantity: number;
+ price: number;
+ createAt: string;
+ updatedAt: string;
+}
+
+interface Product {
+ productId: string;
+ vendorId: string;
+ name: string;
+ description: string;
+ image: string;
+ discount: string;
+ price: number;
+ quantity: number;
+ category: string;
+ expiringDate: string | null;
+ expired: boolean;
+ available: boolean;
+ createAt: string;
+ updatedAt: string;
+ CartItem: CartItem[];
+}
+
+interface TopProduct {
+ data: Product[];
+ isLoading: boolean;
+ error: boolean;
+}
+
+const initialState: TopProduct = {
+ data: [],
+ isLoading: false,
+ error: false,
+};
+
+const SellerTopProductSlice = createSlice({
+ name: "TopProduct",
+ initialState,
+ reducers: {},
+ extraReducers: (builder) => {
+ builder
+ .addCase(fetchingSellerPopularProduct.pending, (state) => {
+ state.isLoading = true;
+ state.error = false;
+ })
+ .addCase(
+ fetchingSellerPopularProduct.fulfilled,
+ (state, action: PayloadAction<{ data: any[] }>) => {
+ state.isLoading = false;
+ state.data = action.payload.data;
+ state.error = false;
+ }
+ )
+ .addCase(fetchingSellerPopularProduct.rejected, (state) => {
+ (state.isLoading = false), (state.error = true);
+ });
+ },
+});
+
+export default SellerTopProductSlice.reducer;
diff --git a/src/Redux/Analytic/SellerAnalytics/WeekSellingSlice.tsx b/src/Redux/Analytic/SellerAnalytics/WeekSellingSlice.tsx
new file mode 100644
index 00000000..7b0cb409
--- /dev/null
+++ b/src/Redux/Analytic/SellerAnalytics/WeekSellingSlice.tsx
@@ -0,0 +1,83 @@
+import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit";
+import axios from "axios";
+import Cookies from "js-cookie";
+import { jwtDecode } from "jwt-decode";
+
+interface SellerWeeklySales {
+ day: string;
+ totalSales: number;
+}
+
+interface WeeklySellingReport {
+ data: any[];
+ SellerWeeklySales: SellerWeeklySales[];
+ isLoading: boolean;
+ error: boolean;
+}
+
+const initialState: WeeklySellingReport = {
+ data: [],
+ SellerWeeklySales: [],
+ isLoading: false,
+ error: false,
+};
+
+interface TokenPayload {
+ role: string;
+ email: string;
+ vendor: string;
+ id: string;
+ password: string;
+ iat: number;
+ exp: number;
+}
+
+export const fetchSellerWeeklyReport = createAsyncThunk(
+ "analytics/fetchWeeklyReport",
+ async () => {
+ const token: any = Cookies.get("_auth");
+
+ const decodedToken = jwtDecode(token);
+ const vendorId = decodedToken.vendor;
+ console.log(vendorId);
+ const response = await axios.get(
+ `http://localhost:5000/WeeklySellingReport/${vendorId}`
+ );
+
+ return response.data;
+ }
+);
+
+const SellerWeekSalesSlice = createSlice({
+ name: "weekSales",
+ initialState,
+ reducers: {},
+ extraReducers: (builder) => {
+ builder
+ .addCase(fetchSellerWeeklyReport.pending, (state) => {
+ state.isLoading = true;
+ state.error = false;
+ })
+ .addCase(
+ fetchSellerWeeklyReport.fulfilled,
+ (
+ state,
+ action: PayloadAction<{
+ data: any[];
+ weeklySales: SellerWeeklySales[];
+ }>
+ ) => {
+ state.isLoading = false;
+ state.data = action.payload.data;
+ state.SellerWeeklySales = action.payload.weeklySales;
+ state.error = false;
+ }
+ )
+ .addCase(fetchSellerWeeklyReport.rejected, (state, action) => {
+ state.isLoading = false;
+ state.error = true;
+ });
+ },
+});
+
+export default SellerWeekSalesSlice.reducer;
diff --git a/src/Redux/Analytic/SellingReportSlice.tsx b/src/Redux/Analytic/SellingReportSlice.tsx
index 6a603f0a..b4704a0e 100644
--- a/src/Redux/Analytic/SellingReportSlice.tsx
+++ b/src/Redux/Analytic/SellingReportSlice.tsx
@@ -8,6 +8,7 @@ interface MonthlySale {
}
interface TopProduct {
+ image: any;
productId: string;
name: string;
totalRevenue: number;
@@ -54,10 +55,8 @@ const sellingReportSlice = createSlice({
(
state,
action: PayloadAction<{
- topProducts: any;
- data: any[];
- monthlySales: MonthlySale[];
- }>
+ topProducts: any; data: any[]; monthlySales: MonthlySale[]
+}>
) => {
state.isLoading = false;
state.data = action.payload.data;
diff --git a/src/Redux/Analytic/ToProductSlice.tsx b/src/Redux/Analytic/ToProductSlice.tsx
index fffcca60..75436c7c 100644
--- a/src/Redux/Analytic/ToProductSlice.tsx
+++ b/src/Redux/Analytic/ToProductSlice.tsx
@@ -1,76 +1,75 @@
import { PayloadAction, createAsyncThunk, createSlice } from "@reduxjs/toolkit";
import axios from "axios";
-export const fetchingPopularProduct = createAsyncThunk(
- "/product/popularity",
- async () => {
+export const fetchingPopularProduct = createAsyncThunk("/product/popularity", async () => {
const response = await axios.get("http://localhost:5000/popular-product");
return response.data;
- }
-);
+});
+
+interface CartItem{
+ cartitemsid: string,
+ cartId: string,
+ productId: string,
+ quantity: number,
+ price: number,
+ createAt: string,
+ updatedAt:string
-interface CartItem {
- cartitemsid: string;
- cartId: string;
- productId: string;
- quantity: number;
- price: number;
- createAt: string;
- updatedAt: string;
}
-interface Product {
- productId: string;
- vendorId: string;
- name: string;
- description: string;
- image: string;
- discount: string;
- price: number;
- quantity: number;
- category: string;
- expiringDate: string | null;
- expired: boolean;
- available: boolean;
- createAt: string;
- updatedAt: string;
- CartItem: CartItem[];
+interface Product{
+ productId: string,
+ vendorId: string,
+ name: string,
+ description: string,
+ image: string,
+ discount: string,
+ price: number,
+ quantity: number,
+ category: string,
+ expiringDate: string | null;
+ expired: boolean,
+ available: boolean,
+ createAt: string,
+ updatedAt: string,
+ CartItem:CartItem[]
}
-interface TopProduct {
- data: Product[];
- isLoading: boolean;
- error: boolean;
+
+interface TopProduct{
+ data: Product[],
+ isLoading: boolean,
+ error:boolean
}
-const initialState: TopProduct = {
- data: [],
- isLoading: false,
- error: false,
-};
+
+const initialState:TopProduct = {
+ data: [],
+ isLoading: false,
+ error:false
+}
+
+
const TopProductSlice = createSlice({
- name: "TopProduct",
- initialState,
- reducers: {},
- extraReducers: (builder) => {
- builder
- .addCase(fetchingPopularProduct.pending, (state) => {
- state.isLoading = true;
- state.error = false;
- })
- .addCase(
- fetchingPopularProduct.fulfilled,
- (state, action: PayloadAction<{ data: any[] }>) => {
- state.isLoading = false;
- state.data = action.payload.data;
- state.error = false;
- }
- )
- .addCase(fetchingPopularProduct.rejected, (state) => {
- (state.isLoading = false), (state.error = true);
- });
- },
-});
+ name: "TopProduct",
+ initialState,
+ reducers: {},
+ extraReducers: (builder) => {
+ builder.addCase(fetchingPopularProduct.pending, (state) => {
+ state.isLoading = true;
+ state.error = false;
+ }).addCase(fetchingPopularProduct.fulfilled, (state, action: PayloadAction<{ data: any[] }>) => {
+ state.isLoading = false;
+ state.data = action.payload.data;
+ state.error=false
+
+ }).addCase(fetchingPopularProduct.rejected, (state) => {
+ state.isLoading = false,
+ state.error=true
+ })
+ }
+})
export default TopProductSlice.reducer;
+
diff --git a/src/Redux/Analytic/WeeklySellingSlice.tsx b/src/Redux/Analytic/WeeklySellingSlice.tsx
index 9de03158..7da381d6 100644
--- a/src/Redux/Analytic/WeeklySellingSlice.tsx
+++ b/src/Redux/Analytic/WeeklySellingSlice.tsx
@@ -1,4 +1,4 @@
-import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit";
+import { createAsyncThunk, createSlice,PayloadAction } from "@reduxjs/toolkit";
import axios from "axios";
interface WeeklySales {
@@ -26,7 +26,9 @@ export const fetchWeeklyReport = createAsyncThunk(
"http://localhost:5000/OverallWeeklySellingReport/"
);
- return response.data;
+
+ return response.data;
+
}
);
@@ -35,28 +37,20 @@ const weekSalesSlice = createSlice({
initialState,
reducers: {},
extraReducers: (builder) => {
- builder
- .addCase(fetchWeeklyReport.pending, (state) => {
+ builder.addCase(fetchWeeklyReport.pending, (state) => {
state.isLoading = true;
- state.error = false;
- })
- .addCase(
- fetchWeeklyReport.fulfilled,
- (
- state,
- action: PayloadAction<{ data: any[]; weeklySales: WeeklySales[] }>
- ) => {
- state.isLoading = false;
- state.data = action.payload.data;
- state.weeklySales = action.payload.weeklySales;
- state.error = false;
- }
- )
- .addCase(fetchWeeklyReport.rejected, (state, action) => {
+ state.error=false
+ }).addCase(fetchWeeklyReport.fulfilled, (state, action: PayloadAction<{ data: any[]; weeklySales: WeeklySales[] }>) => {
+ state.isLoading = false;
+ state.data = action.payload.data;
+ state.weeklySales = action.payload.weeklySales;
+ state.error=false
+ }).addCase(fetchWeeklyReport.rejected, (state, action) => {
state.isLoading = false;
state.error = true;
- });
+ })
},
});
+
export default weekSalesSlice.reducer;
diff --git a/src/Redux/Reducer/wishlistslice.tsx b/src/Redux/Reducer/wishlistslice.tsx
index 24b5f894..8626d87a 100644
--- a/src/Redux/Reducer/wishlistslice.tsx
+++ b/src/Redux/Reducer/wishlistslice.tsx
@@ -1,58 +1,31 @@
-import { createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { addToWishlist, removeFromWishlist, fetchWishlist } from '../Action/wishlist';
-
-interface WishlistItem {
- userId: string;
- productId: string;
- price: number;
-}
-
-interface WishlistState {
- items: WishlistItem[];
- status: 'idle' | 'loading' | 'succeeded' | 'failed';
- error: string | null;
-}
-
-const initialState: WishlistState = {
- items: [],
- status: 'idle',
- error: null,
-};
+import { createSlice } from '@reduxjs/toolkit';
+import { addToWishlist, fetchWishlist } from '../Action/wishlist';
const wishlistSlice = createSlice({
name: 'wishlist',
- initialState,
+ initialState: {
+ items: [],
+ status: 'idle',
+ error: null,
+ },
reducers: {},
extraReducers: (builder) => {
builder
- .addCase(addToWishlist.fulfilled, (state, action: PayloadAction) => {
- state.items.push(action.payload);
- state.status = 'succeeded';
+ .addCase(addToWishlist.fulfilled, (state, action) => {
+
})
- .addCase(removeFromWishlist.fulfilled, (state, action: PayloadAction<{ productId: string }>) => {
- state.items = state.items.filter((item) => item.productId !== action.payload.productId);
+ .addCase(fetchWishlist.fulfilled, (state, action) => {
+ state.items = action.payload;
state.status = 'succeeded';
})
.addCase(fetchWishlist.pending, (state) => {
state.status = 'loading';
})
- .addCase(fetchWishlist.fulfilled, (state, action: PayloadAction) => {
- state.items = action.payload;
- state.status = 'succeeded';
- })
- .addCase(fetchWishlist.rejected, (state, action: PayloadAction) => {
- state.error = action.payload;
- state.status = 'failed';
- })
- .addCase(addToWishlist.rejected, (state, action: PayloadAction) => {
- state.error = action.payload;
- state.status = 'failed';
- })
- .addCase(removeFromWishlist.rejected, (state, action: PayloadAction) => {
- state.error = action.payload;
+ .addCase(fetchWishlist.rejected, (state, action) => {
state.status = 'failed';
+ state.error = action.error.message;
});
},
});
-export default wishlistSlice.reducer;
+export default wishlistSlice.reducer;
\ No newline at end of file
diff --git a/src/Redux/features/AuthSlice.tsx b/src/Redux/features/AuthSlice.tsx
index 59965a5c..a98efd09 100644
--- a/src/Redux/features/AuthSlice.tsx
+++ b/src/Redux/features/AuthSlice.tsx
@@ -7,7 +7,7 @@ const AuthApiSlice = apiSlice.injectEndpoints({
url: "/login",
method: "POST",
body: credentials,
- }),
+ })
}),
verifyCode: builder.mutation({
query: (credentials) => ({
@@ -21,7 +21,7 @@ const AuthApiSlice = apiSlice.injectEndpoints({
url: "/register",
method: "POST",
body: credentials,
- }),
+ })
}),
verifyEmail: builder.query({
query: (token) => ({
diff --git a/src/Redux/features/analyticSlice.tsx b/src/Redux/features/analyticSlice.tsx
new file mode 100644
index 00000000..434426f3
--- /dev/null
+++ b/src/Redux/features/analyticSlice.tsx
@@ -0,0 +1,75 @@
+import { createSlice, createAsyncThunk, PayloadAction } from "@reduxjs/toolkit";
+
+interface DeliveryAddress {
+ city: string;
+ street: string;
+}
+
+interface Product {
+ productId: string;
+ name: string;
+ quantity: number;
+ price: number;
+}
+
+interface Order {
+ createdAt: string;
+ deliveryAddress: DeliveryAddress;
+ expectedDeliveryDate: string | null;
+ orderId: string;
+ paymentMethod: string;
+ products: Product[];
+ status: string;
+ totalAmount: number | null;
+ updatedAt: string;
+ userId: string;
+}
+
+interface OrderState {
+ isLoading: boolean;
+ data: Order[];
+ error: boolean;
+}
+
+const initialState: OrderState = {
+ isLoading: false,
+ data: [],
+ error: false,
+};
+
+export const fetchOrders = createAsyncThunk("orders/fetchOrders", async () => {
+ const response = await fetch("http://localhost:5000/order/getAllOrder");
+ if (!response.ok) {
+ throw new Error("Failed to fetch orders");
+ }
+
+ const data: Order[] = await response.json();
+ return data;
+});
+
+const OrderSlice = createSlice({
+ name: "orders",
+ initialState,
+ reducers: {},
+ extraReducers: (builder) => {
+ builder
+ .addCase(fetchOrders.pending, (state) => {
+ state.isLoading = true;
+ state.error = false;
+ })
+ .addCase(
+ fetchOrders.fulfilled,
+ (state, action: PayloadAction) => {
+ state.isLoading = false;
+ state.data = action.payload;
+ state.error = false;
+ }
+ )
+ .addCase(fetchOrders.rejected, (state) => {
+ state.isLoading = false;
+ state.error = true;
+ });
+ },
+});
+
+export default OrderSlice.reducer;
diff --git a/src/Redux/features/sellerSlice.tsx b/src/Redux/features/sellerSlice.tsx
new file mode 100644
index 00000000..97b8fdd8
--- /dev/null
+++ b/src/Redux/features/sellerSlice.tsx
@@ -0,0 +1,69 @@
+import { getToken } from "../../Lib/getToken";
+import { apiSlice } from "./ApiSlice";
+
+const SellerSlice = apiSlice.injectEndpoints({
+ endpoints: (builder) => ({
+ selectFeddback: builder.query({
+ query: () => ({
+ url: `/select-vendorFeedback`
+ })
+ }),
+ selectProducts: builder.query({
+ query: ({id,token}) => {
+ return {
+ url: `/vendorProducts/${id}`,
+ headers: {
+ Authorization: token
+ }
+ };
+ }
+ }),
+ selectVendor: builder.query({
+ query: (id) => ({
+ url: `/select-vendor/${id}`
+ })
+ }),
+ createProduct: builder.mutation({
+ query: ({data,token}) => {
+ return{
+ url: `/create/product/${data.id}`,
+ method: "POST",
+ body: data,
+ headers:{
+ Authorization: token
+ }
+ }
+ }
+ }),
+ updateProduct: builder.mutation({
+ query: ({data,token}) => {
+ return{
+ url: `/updateProduct/${data.id}`,
+ method: "PUT",
+ body: data,
+ headers:{
+ Authorization: token
+ }
+ }
+ }
+ }),
+ selectSingleProduct: builder.query({
+ query: (id)=> `/readProduct/${id}`
+ }),
+ deleteProduct: builder.mutation({
+ query: ({id,token,data})=>{
+ return{
+ url: `/deleteProduct/${id}`,
+ method: "DELETE",
+ body: data,
+ headers: {
+ Authorization: token
+ }
+ }
+ }
+ })
+ })
+});
+
+export const { useSelectFeddbackQuery, useSelectProductsQuery,useSelectVendorQuery,useCreateProductMutation,useSelectSingleProductQuery,useDeleteProductMutation,useUpdateProductMutation } = SellerSlice;
+export default SellerSlice;
diff --git a/src/Redux/store.tsx b/src/Redux/store.tsx
index 451d566d..ea552032 100644
--- a/src/Redux/store.tsx
+++ b/src/Redux/store.tsx
@@ -1,3 +1,6 @@
+import AuthSlice from "./features/AuthSlice";
+import SellerOrderStatusSliceReducer from "../Redux/Analytic/SellerAnalytics/OrderStatusSlice"
+import SellerWeekSalesSliceReducer from "../Redux/Analytic/SellerAnalytics/WeekSellingSlice";
import { configureStore, Action } from "@reduxjs/toolkit";
import { ThunkAction } from "redux-thunk";
import productsImagesReducer from "./features/ProductsImagesSlice";
@@ -30,10 +33,18 @@ export const store = configureStore({
search: searchReducer,
popularProducts: popularProductsReducer,
contact: contactReducer,
- cart: cartReducer,
+
orderStatus: OrderStatusSlice,
sellingReport: sellingReportReducer,
weeklyReport: WeeklySellingReducer,
+ sellerSellingReport: sellingReportReducer,
+ SellerOrderStatus: SellerOrderStatusSliceReducer,
+ SellerWeeklySales: SellerWeekSalesSliceReducer,
+ cart: cartReducer,
+ // orderStatus: OrderStatusSlice,
+ // sellingReport: sellingReportReducer,
+ // weeklyReport: WeeklySellingReducer,
+ productsImages: productsImagesReducer,
similarProducts: similarScile,
},
middleware: (getDefaultMiddelware) =>
diff --git a/src/Routes/index.tsx b/src/Routes/index.tsx
index f6de723c..527ee3ef 100644
--- a/src/Routes/index.tsx
+++ b/src/Routes/index.tsx
@@ -1,7 +1,10 @@
+
+import VendorHome from '../pages/vendor/vendorHome';
+import MyProducts from '../pages/vendor/MyProducts';
+import VendorSingleProduct from '../pages/vendor/VendorSingleProduct';
+
import React from "react";
import { Route, Routes } from "react-router-dom";
-import AuthOutlet from "@auth-kit/react-router/AuthOutlet";
-import Signin from "../pages/Signin";
import SignUp from "../pages/SignUp";
import Admin from "../Portal/admin";
import Buyer from "../Portal/Buyer";
@@ -10,7 +13,8 @@ import VerifyCode from "../pages/VerifyCode";
import VerifyEmail from "../Lib/VerifyEmail";
import AuthGoogle from "../Lib/authgoogle";
import Users from "../pages/Users";
-import Sellers from "../pages/Sellers";
+import AuthOutlet from "@auth-kit/react-router/AuthOutlet";
+import Test from "../pages/Check";
import Analytics from "../pages/Analytics";
import AdminHome from "../pages/Admin/AdminHome";
import Homepage from "../pages/Homepage";
@@ -22,13 +26,20 @@ import Singlepage from "../pages/singlePage";
import Requests from "../pages/Requests";
import AdminSettings from "../Components/dashboard/AdminSettings";
import Forgotpassword from "../Lib/ForgotPassword";
+import User from "../pages/User";
+import Sellers from "../pages/Sellers";
+import Signin from "../pages/Signin";
+import SalesTable from "../Components/Analytics/SellerAnalytics/SalesTable";
+import OrderStatusTable from "../Components/Analytics/SellerAnalytics/OrderTable";
+import SalesPreview from "../Components/Analytics/SellerAnalytics/SalesPreview";
+import VendorAnalytics from '../pages/vendor/VendorAnalytics';
import Chat from "../pages/chat/Chat";
import OrderComponent from "../Components/orders";
+
const AppRoutes: React.FC = () => (
-
diff --git a/src/asset/images/Products/529d198d51183b1643323dd26b8db71d (1).jpg b/src/asset/images/Products/529d198d51183b1643323dd26b8db71d (1).jpg
deleted file mode 100644
index b6f44af9..00000000
Binary files a/src/asset/images/Products/529d198d51183b1643323dd26b8db71d (1).jpg and /dev/null differ
diff --git a/src/asset/images/Products/529d198d51183b1643323dd26b8db71d.jpg b/src/asset/images/Products/529d198d51183b1643323dd26b8db71d.jpg
deleted file mode 100644
index b6f44af9..00000000
Binary files a/src/asset/images/Products/529d198d51183b1643323dd26b8db71d.jpg and /dev/null differ
diff --git a/src/asset/images/Products/906065671b27036677551e1a225eb026.jpg b/src/asset/images/Products/906065671b27036677551e1a225eb026.jpg
deleted file mode 100644
index 13bd23d1..00000000
Binary files a/src/asset/images/Products/906065671b27036677551e1a225eb026.jpg and /dev/null differ
diff --git a/src/asset/images/Products/SignUp.tsx b/src/asset/images/Products/SignUp.tsx
new file mode 100644
index 00000000..696665af
--- /dev/null
+++ b/src/asset/images/Products/SignUp.tsx
@@ -0,0 +1,355 @@
+import axios from "axios";
+import React, { useEffect, useState } from "react";
+import AuthButton from "../Constants/AuthButton";
+import Input from "../Constants/Input";
+import {
+ useRegisterMutation,
+ useVerifyEmailQuery,
+} from "../Redux/features/AuthSlice";
+import EmailSent from "../Components/Modal/EmailSents";
+import { useLocation } from "react-router-dom";
+import { Puff } from "react-loader-spinner";
+import { useTranslation } from "react-i18next";
+
+const SignUp: React.FC = () => {
+ const [name, setName] = useState("");
+ const [email, setEmail] = useState("");
+ const [password, setPassword] = useState("");
+ const [errorr, setError] = useState("");
+ const [isEmpty, setIsEmpty] = useState("");
+ const [err, setErr] = useState(false);
+ const [modal, setModal] = useState(false);
+ const [verifySuccess, setVerifySuccess] = useState(false);
+ const [verificationAttempted, setVerificationAttempted] = useState(false);
+
+ const [register, { isLoading }] = useRegisterMutation();
+ const validationFunc = (e: any) => {
+ e.preventDefault();
+ if (name.trim() === "") {
+ setError("Name Are required");
+ setIsEmpty("name");
+ return;
+ }
+ if (email.trim() === "") {
+ setError("Email Are required");
+ setIsEmpty("email");
+ return;
+ }
+ if (password.trim() === "") {
+ setError("Password Are required");
+ setIsEmpty("password");
+ return;
+ }
+ AuthLogin();
+ };
+
+ const AuthLogin = async () => {
+ try {
+ const credentials: any = {
+ name,
+ email,
+ password,
+ };
+ const response = await register(credentials).unwrap();
+ if (response.message === "Email Verfication Sent") {
+ setModal(true);
+ console.log(response);
+ return;
+ }
+ console.log(response);
+ } catch (error: any) {
+ if (error.data && error.data.Message === "Email already exists") {
+ setError("Email has been taken");
+ setIsEmpty("email");
+ } else {
+ setError("Something get wrong, Try again later");
+ }
+ console.log(error);
+ }
+ };
+
+ const loginWithGoogle = () => {
+ const googleAuthUrl = `${process.env.GOOGLE_AUTH_URL}`;
+ window.open(googleAuthUrl, "_self");
+ };
+
+ const location = useLocation();
+ const getQueryParams = (search: string) => new URLSearchParams(search);
+ const queryParams = getQueryParams(location.search);
+ const token = queryParams.get("token");
+ const {
+ data,
+ isLoading: isVerifying,
+ isError,
+ isSuccess,
+ } = useVerifyEmailQuery(token || "", {
+ skip: !token || verificationAttempted,
+ });
+
+ useEffect(() => {
+ if (token && !verificationAttempted && isSuccess) {
+ setVerificationAttempted(true);
+
+ if (data && data.message === "Email verified successfully") {
+ setVerifySuccess(true);
+ } else {
+ alert("Sorry, verification failed");
+ }
+ }
+ }, [token, data, isSuccess, verificationAttempted]);
+ const { t } = useTranslation();
+ return (
+ Crafters Online Shop
+ React App
-
+ {modal ?
+ );
+};
+
+export default SignUp;
diff --git a/src/asset/images/Products/f8c69bc0404ff0b6158cab028ac8e632.jpg b/src/asset/images/Products/f8c69bc0404ff0b6158cab028ac8e632.jpg
deleted file mode 100644
index b3b5b724..00000000
Binary files a/src/asset/images/Products/f8c69bc0404ff0b6158cab028ac8e632.jpg and /dev/null differ
diff --git a/src/asset/images/Products/heart_.png b/src/asset/images/Products/heart_.png
index f2a111dc..9da450e0 100644
Binary files a/src/asset/images/Products/heart_.png and b/src/asset/images/Products/heart_.png differ
diff --git a/src/asset/images/Products/star.png b/src/asset/images/Products/star.png
deleted file mode 100644
index 6c9cfba9..00000000
Binary files a/src/asset/images/Products/star.png and /dev/null differ
diff --git a/src/asset/images/img_favorite.svg b/src/asset/images/img_favorite.svg
new file mode 100644
index 00000000..18ba5681
--- /dev/null
+++ b/src/asset/images/img_favorite.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/asset/images/products/0ce8299f7b1c845d575f949b244ea238.jpg b/src/asset/images/products/0ce8299f7b1c845d575f949b244ea238.jpg
deleted file mode 100644
index 9da450e0..00000000
Binary files a/src/asset/images/products/0ce8299f7b1c845d575f949b244ea238.jpg and /dev/null differ
diff --git a/src/asset/images/products/529d198d51183b1643323dd26b8db71d (1).jpg b/src/asset/images/products/529d198d51183b1643323dd26b8db71d (1).jpg
deleted file mode 100644
index b6f44af9..00000000
Binary files a/src/asset/images/products/529d198d51183b1643323dd26b8db71d (1).jpg and /dev/null differ
diff --git a/src/asset/images/products/529d198d51183b1643323dd26b8db71d.jpg b/src/asset/images/products/529d198d51183b1643323dd26b8db71d.jpg
deleted file mode 100644
index b6f44af9..00000000
Binary files a/src/asset/images/products/529d198d51183b1643323dd26b8db71d.jpg and /dev/null differ
diff --git a/src/asset/images/products/906065671b27036677551e1a225eb026.jpg b/src/asset/images/products/906065671b27036677551e1a225eb026.jpg
deleted file mode 100644
index 13bd23d1..00000000
Binary files a/src/asset/images/products/906065671b27036677551e1a225eb026.jpg and /dev/null differ
diff --git a/src/asset/images/products/f8c69bc0404ff0b6158cab028ac8e632.jpg b/src/asset/images/products/f8c69bc0404ff0b6158cab028ac8e632.jpg
deleted file mode 100644
index b3b5b724..00000000
Binary files a/src/asset/images/products/f8c69bc0404ff0b6158cab028ac8e632.jpg and /dev/null differ
diff --git a/src/asset/images/products/heart_.png b/src/asset/images/products/heart_.png
deleted file mode 100644
index f2a111dc..00000000
Binary files a/src/asset/images/products/heart_.png and /dev/null differ
diff --git a/src/asset/images/products/star.png b/src/asset/images/products/star.png
deleted file mode 100644
index 6c9cfba9..00000000
Binary files a/src/asset/images/products/star.png and /dev/null differ
diff --git a/src/index.html b/src/index.html
index c46ec523..c64060d7 100644
--- a/src/index.html
+++ b/src/index.html
@@ -20,11 +20,10 @@
href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap"
rel="stylesheet"
/>
-
-
+
+ ) : (
+ ""
+ )}
+
+
+
+ {token && isVerifying && !verificationAttempted && (
+
+
+
+ )}
+ {token && !isVerifying && !verifySuccess && (
+
+
+
+
+
+ Continue To login
+
+
+
+ Your email has been successfully verified.
+
+
+
+
+ )}
+
+
+
+
+
+ Back To Sign Up
+
+
+
+ Verification Link has expired or invalid token
+
+
+
+
+ @2024 crafters, all right reserved
+
+
+