+
+
+
+
+
+
+
+
+
diff --git a/src/views/Dashboard/layouts/SidebarMenu/favorites.svg b/src/views/Dashboard/layouts/SidebarMenu/favorites.svg
new file mode 100644
index 0000000..49037b2
--- /dev/null
+++ b/src/views/Dashboard/layouts/SidebarMenu/favorites.svg
@@ -0,0 +1,6 @@
+
diff --git a/src/views/Dashboard/layouts/SidebarMenu/index.js b/src/views/Dashboard/layouts/SidebarMenu/index.js
index 506758f..57d4fac 100644
--- a/src/views/Dashboard/layouts/SidebarMenu/index.js
+++ b/src/views/Dashboard/layouts/SidebarMenu/index.js
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react";
import Avatar from "../../../../components/Avatar";
import { connect } from "react-redux";
import {useNavigate} from "react-router-dom";
-import { publicApi, user } from "../../../../redux/actions";
+import { publicApi, user, dialog } from "../../../../redux/actions";
import "./index.scss";
@@ -12,6 +12,11 @@ import moon from "./moon.svg";
import sms from "./sms.svg";
import userEdit from "./user-edit.svg";
import dropdownIcon from "../../../../assets/icons/dropdown-blue.svg";
+import myVideosIcon from "./myVideos.svg";
+import myBooksIcon from "./myBooks.svg";
+import ordersIcon from "./orders.svg";
+import favoritesIcon from "./favorites.svg";
+import addressIcon from "./address.svg";
const SidebarMenu = ({
profile,
@@ -23,8 +28,7 @@ const SidebarMenu = ({
setPage,
logout,
setDialog,
- dialog,
- isLogin
+ isLogin,
}) => {
const navigate = useNavigate();
const [toggleList, setToggleList] = useState({
@@ -86,23 +90,35 @@ const SidebarMenu = ({
const buttons = [
{
- icon: null,
+ icon: myBooksIcon,
title: "کتاب های من",
onClick: () => setPage("mybooks"),
name: "mybooks",
},
{
- icon: null,
+ icon: myVideosIcon,
title: "ویدئوهای من",
onClick: () => setPage("myvideos"),
name: "myvideos",
},
{
- icon: null,
+ icon: ordersIcon,
title: "سفارشات",
onClick: () => setPage("orders"),
name: "orders",
},
+ {
+ icon: favoritesIcon,
+ title: "علاقمندی ها",
+ onClick: () => setPage("favorites"),
+ name: "favorites",
+ },
+ {
+ icon: addressIcon,
+ title: "آدرس ها",
+ onClick: () => setPage("addresses"),
+ name: "addresses",
+ },
{ icon: moon, title: "حالت شب", onClick: () => {}, name: "dark" },
{
icon: logoutIcon,
@@ -112,10 +128,7 @@ const SidebarMenu = ({
setDialog({
text: "میخوای تنهامون بذاری؟",
type: "confirm",
- setOpen: (val) => setDialog({ ...dialog, open: val }),
accept: () => logout(),
- bg: "bg-white bg-opacity-10",
- color: "text-green4F",
open: true,
}),
name: "logout",
@@ -129,10 +142,10 @@ const SidebarMenu = ({
},[isLogin]);
return (
{/* profile */}
@@ -146,7 +159,6 @@ const SidebarMenu = ({
list={support.list}
title={support.title}
name={support.name}
- active={true}
icon={support.icon}
active={dashboardOptions.support}
/>
@@ -154,7 +166,6 @@ const SidebarMenu = ({
list={profile.list}
title={profile.title}
name={profile.name}
- active={true}
icon={profile.icon}
active={dashboardOptions.profile}
/>
@@ -193,6 +204,7 @@ const mapStateToProps = (state) => ({
const mapDispatchToProps = {
setDashboardOptions: publicApi.setDashboardOptions,
logout: user.logout,
+ setDialog : dialog.set,
};
export default connect(mapStateToProps, mapDispatchToProps)(SidebarMenu);
@@ -211,7 +223,7 @@ SidebarMenu.defaultProps = {
title: "پشتیبانی",
notification: null,
list: [
- { title: "تیکت ها", value: "tickets" },
+ { title: "ثبت نظر", value: "setTicket" },
],
},
};
diff --git a/src/views/Dashboard/layouts/SidebarMenu/myBooks.svg b/src/views/Dashboard/layouts/SidebarMenu/myBooks.svg
new file mode 100644
index 0000000..eab305b
--- /dev/null
+++ b/src/views/Dashboard/layouts/SidebarMenu/myBooks.svg
@@ -0,0 +1,7 @@
+
diff --git a/src/views/Dashboard/layouts/SidebarMenu/myVideos.svg b/src/views/Dashboard/layouts/SidebarMenu/myVideos.svg
new file mode 100644
index 0000000..51c1ea6
--- /dev/null
+++ b/src/views/Dashboard/layouts/SidebarMenu/myVideos.svg
@@ -0,0 +1,10 @@
+
diff --git a/src/views/Dashboard/layouts/SidebarMenu/orders.svg b/src/views/Dashboard/layouts/SidebarMenu/orders.svg
new file mode 100644
index 0000000..85aec57
--- /dev/null
+++ b/src/views/Dashboard/layouts/SidebarMenu/orders.svg
@@ -0,0 +1,7 @@
+
diff --git a/src/views/Favorites/book.svg b/src/views/Favorites/book.svg
new file mode 100644
index 0000000..0a7636c
--- /dev/null
+++ b/src/views/Favorites/book.svg
@@ -0,0 +1,8 @@
+
diff --git a/src/views/Favorites/bookmark.svg b/src/views/Favorites/bookmark.svg
new file mode 100644
index 0000000..267a56e
--- /dev/null
+++ b/src/views/Favorites/bookmark.svg
@@ -0,0 +1,7 @@
+
diff --git a/src/views/Favorites/index.js b/src/views/Favorites/index.js
new file mode 100644
index 0000000..845d1b3
--- /dev/null
+++ b/src/views/Favorites/index.js
@@ -0,0 +1,63 @@
+import React from "react";
+import { connect } from "react-redux";
+//assets
+import bookImage from "./book.svg";
+import bookmarkIcon from "./bookmark.svg";
+
+const Favorites = ({ bookmarkList, isMobile }) => {
+ const Bookmark = ({ bookmark }) => {
+ return (
+
+
+
+
+
+ {bookmark.name}
+ {bookmark.grade}
+
+
+
+
+
+ );
+ };
+
+ return (
+
+ {bookmarkList.map((bookmark, index) => (
+
+ ))}
+
+ );
+};
+
+const mapStateToProps = (state) => ({
+ loading: state.userFactor.loading,
+ isMobile: state.publicApi.isMobile,
+});
+
+const mapDispatchToProps = {};
+
+export default connect(mapStateToProps, mapDispatchToProps)(Favorites);
+
+Favorites.defaultProps = {
+ bookmarkList: [
+ {
+ name: "کتاب آموزشی علوم تجربی",
+ grade: "پایه ششم ابتدایی",
+ image: bookImage,
+ },
+ {
+ name: "کتاب آموزشی علوم تجربی",
+ grade: "پایه ششم ابتدایی",
+ image: bookImage,
+ },
+ {
+ name: "کتاب آموزشی علوم تجربی",
+ grade: "پایه ششم ابتدایی",
+ image: bookImage,
+ },
+ ],
+};
diff --git a/src/views/Product/Desktop/ProductOverAll/index.js b/src/views/Product/Desktop/ProductOverAll/index.js
index a5c133c..10dda72 100644
--- a/src/views/Product/Desktop/ProductOverAll/index.js
+++ b/src/views/Product/Desktop/ProductOverAll/index.js
@@ -6,6 +6,8 @@ import Button from "../../../../components/Button";
import StarRating from "../../../../components/StarRating";
import ProductImages from "../../../../components/ProductImage";
import ProductStatusCard from "../../../../components/ProductStatusCard";
+import ProductTab from "../../../../components/ProductTab";
+import Table from "../../../Video/components/Desktop/Table";
//assets
import arrow from "../../../../assets/icons/dropdown-blue.svg";
@@ -13,7 +15,7 @@ import arrow from "../../../../assets/icons/dropdown-blue.svg";
export const ProductOverAll = ({ book, grades, isDark, loading }) => {
const [type, setType] = useState("1");
return (
-
+
@@ -29,7 +31,8 @@ export const ProductOverAll = ({ book, grades, isDark, loading }) => {
- بیش از {book?.product[type]?.suggestedCounter} نفر امتیاز داده اند
+ بیش از {book?.product[type]?.suggestedCounter} نفر امتیاز داده
+ اند
@@ -96,7 +99,11 @@ export const ProductOverAll = ({ book, grades, isDark, loading }) => {
className="bg-blueC0 text-green7B bg-opacity-5 font-semibold text-tiny rounded-md border border-solid border-blueC0 w-2/3 py-4 text-center flex flex-row items-center justify-center"
>
مشاهده دوره ویدیویی این محصول
-
+
@@ -113,6 +120,34 @@ export const ProductOverAll = ({ book, grades, isDark, loading }) => {
/>