src/components/GradeFilter/index.scss

@@ -8,15 +8,6 @@
   &__box{
     display: none !important;
   }
-  &__light{
-    color: black;
-    background-color: white;
-    border: 1px solid black;
-    .grade-filter__list{
-      background-color: white;
-      border: 1px solid black;
-    }
-  }
   h1{
     margin: 0px;
     padding: 0px 15px;

src/components/GradeFilter/index.tsx

@@ -1,11 +1,11 @@
 import React, { useState, useEffect, useRef } from "react";
 import { connect } from "react-redux";
 import { book } from "../../redux/actions";
-import _ from 'lodash';
+
 import dropdown from "../../assets/icons/dropdown.png";
 
 
-function GradeFilter({selectedGrade, gradeFilter, grades, gradeDropdown, setGradeDropdown, theme}: any) {
+function GradeFilter({selectedGrade, gradeFilter, grades, gradeDropdown, setGradeDropdown}: any) {
   const [arrowTop, setArrowTop] = useState(false);
 
   useEffect(() => {
@@ -20,13 +20,13 @@ function GradeFilter({selectedGrade, gradeFilter, grades, gradeDropdown, setGrad
   }
 
   return (
-    <section className={_.join(["grade-filter d-flex align-items-center", theme === 'light' ? 'grade-filter__light' : 'grade-filter__dark']," ")}>
+    <section className="grade-filter d-flex align-items-center">
       <h1 className="d-flex align-items-center">
         پایه تحصیلی
         <span className="desktop"></span>
       </h1>
       <div
-        className="grade-filter__box mobile"
+        className="grade-filter__box d-flex"
         onClick={(e : any) => setDropdown(e)}
       >
         {selectedGrade ? (
@@ -75,7 +75,6 @@ function GradeFilter({selectedGrade, gradeFilter, grades, gradeDropdown, setGrad
 export default connect(
   (state: any) => ({
     selectedGrade: state.book.selectedGrade,
-    theme : state.publicApi.theme,
   }),
   { gradeFilter: book.gradeFilter }
 )(GradeFilter);

src/components/HomeSearchBox/index.scss

@@ -5,56 +5,24 @@
   * {
     transition: all 0.5s;
   }
-  &__dark{
   form {
     button {
       background-color: $gray1;
-        
-      }
-      input {
-        background-color: $gray5;
-        border: 0px;
-        color: $gray6;
-        &::placeholder {
-          color: $gray6;
-        }
-        &:focus {
-          outline: 2px solid $green !important;
-        }
-      }
-    }
-  }
-  &__light{
-    form {
-      button {
-        background-color: $gray1;
-        border: none;
-      }
-      input {
-        border: 1px solid $gray5 !important;
-        color: black;
-        background-color: white !important;
-        &::placeholder {
-          color: black !important;
-        }
-        &:focus {
-          outline: 2px solid $green !important;
-        }
-      }
-    }
-  }
-  form {
-    button {
       margin-right: 3px;
       border-top-left-radius: 9px;
       border-bottom-left-radius: 9px;
+      border: 0px;
     }
     input {
       width: 100%;
+      background-color: $gray5;
+      border: 0px;
       border-top-right-radius: 9px;
       border-bottom-right-radius: 9px;
+      color: $gray6;
       &::placeholder {
         padding-right: 0px;
+        color: $gray6;
         opacity: 0.4;
       }
       &:focus {
@@ -227,7 +195,7 @@
         background: $gray1;
         &::placeholder {
           font-size: calc(100vw / 34);
-          color: white;
+          color: white !important;
         }
       }
       button {

src/components/HomeSearchBox/index.tsx

@@ -1,6 +1,5 @@
 import React, { useState } from "react";
 import { connect } from "react-redux";
-import _ from "lodash";
 import { book } from "../../redux/actions";
 import search from "../../assets/icons/search.png";
 import voice from "../../assets/icons/voice.png";
@@ -12,7 +11,6 @@ function HomeSearchBox({
   setInputValue,
   sortFilter,
   selectedSort,
-  theme,
 }: any) {
   const submitInput = (value: any) => {
     setInputValue(value);
@@ -23,17 +21,7 @@ function HomeSearchBox({
     sortFilter({ search: inputValue, sort: value });
   };
   return (
-    <section
+    <section className="home-search-box d-flex flex-column align-items-center">
-      className={_.join(
-        [
-          "home-search-box d-flex flex-column align-items-center",
-          theme === "light"
-            ? "home-search-box__light"
-            : "home-search-box__dark",
-        ],
-        " "
-      )}
-    >
       <form className="d-flex" onSubmit={(e) => e.preventDefault()}>
         <input
           type="search"
@@ -85,7 +73,6 @@ function HomeSearchBox({
 export default connect(
   (state: any) => ({
     selectedSort: state.book.selectedSort,
-    theme: state.publicApi.theme,
   }),
   { sortFilter: book.sortFilter }
 )(HomeSearchBox);

src/components/Navbar/index.scss

@@ -1,24 +1,13 @@
 .nav{
   width: 100%;
+  background-color: black;
   height: 60px;
   padding: 0px 10px;
   position: fixed !important;
   top: 0px !important;
   left: 0px;
   z-index: 150;
-  &__light{
+  
-    background-color: white;
-    .nav___share{
-      background-color: $gray1 !important;
-      border: none !important;
-    }
-    .MuiButton-root{
-      color: black !important;
-    }
-  }
-  &__dark{
-    background-color: black;
-  }
   &__container{
     width: 100%;
     font-family: numeralLight;
@@ -126,6 +115,7 @@
 
 @media screen and (min-width: 641px) and (max-width: 1007px){
   .nav{
+    background-color: black;
     &__container{
       max-width: 900px;
       &--buttons{
@@ -147,6 +137,7 @@
 
 @media screen and (max-width: 640px){
   .nav{
+    background-color: black;
     &__container{
       max-width: 500px;
       &--buttons{

src/components/Navbar/index.tsx

@@ -6,10 +6,8 @@ import NavbarDrawer from "../NavbarDrawer/NavbarDrawer";
 import clsx from "clsx";
 import proxy from "../../redux/proxy";
 import { makeStyles } from "@mui/styles";
-import Menu from "../Menu/index";
+import Menu from '../Menu/index';
-import logoIcon from "../../assets/icons/logo.png";
+import logoIcon from '../../assets/icons/logo.png';
-import { connect } from "react-redux";
-import _ from "lodash";
 
 const useStyles = makeStyles({
   list: {
@@ -22,7 +20,7 @@ const useStyles = makeStyles({
   },
 });
 
-function Navbar(props: any) {
+export default function Navbar(props: any) {
   const status = proxy.status();
   const classes = useStyles();
   const [state, setState] = useState({
@@ -32,7 +30,7 @@ function Navbar(props: any) {
     right: false,
     searchFlag: false,
   });
-  const { page, theme } = props;
+  const { page } = props;
 
   const toggleDrawer = (anchor: any, open: any) => (event: any) => {
     console.log("on");
@@ -65,18 +63,11 @@ function Navbar(props: any) {
 
   const userStatus = proxy.status();
   return (
-    <nav
+    <nav className="nav align-items-center justify-content-center">
-      className={_.join([
-        "nav align-items-center justify-content-center",
-        theme === "light" ? "nav__light" : "nav__dark",
-      ], " ")}
-    >
       <div className="nav__container d-flex align-items-center justify-content-between">
         <ul className="nav__container--links desktop align-items-center">
           <li className="nav___logo d-flex align-items-center">
-            <Link to="/">
+            <Link to="/"><img src={logoIcon} alt="" /></Link>
-              <img src={logoIcon} alt="" />
-            </Link>
             <span></span>
           </li>
           <li>
@@ -85,7 +76,7 @@ function Navbar(props: any) {
         </ul>
         <MenuRoundedIcon
           className="mobile"
-          style={{ color: theme === "dark" ? "white" : "black", fontSize: 40 }}
+          style={{ color: "white", fontSize: 40 }}
           onClick={toggleDrawer("right", true)}
         />
         <ul className="nav__container--buttons d-flex align-items-center">
@@ -111,10 +102,6 @@ function Navbar(props: any) {
   );
 }
 
-export default connect((state: any) => ({
-  theme: state.publicApi.theme,
-}))(Navbar);
-
 Navbar.defaultProps = {
   grades: [
     {
@@ -166,4 +153,4 @@ Navbar.defaultProps = {
       value: 12,
     },
   ],
-};
+}

src/views/About/index.tsx

@@ -14,8 +14,9 @@ function About({ fury, advantages, keywords, keywords2, first, theme, setTheme }
     <div
       className={_.join([
         "about main d-flex flex-column",
-        theme === "dark" ? "main__dark" : "main__light",
+        theme === "dark" ? "main__light" : "main__dark",
       ], " ")}
+      onClick={() => setTheme('dark')}
     >
       <Navbar />
       <main className="d-flex flex-column align-items-center">

src/views/Auth/Login/index.scss

@@ -3,30 +3,6 @@
   height: 100vh;
   position: relative;
   font-family: numeralLight;
-  &__light {
-    .MuiFormControl-root label{
-      background-color: white !important;
-    }
-    b{
-      color: black !important;
-    }
-    .login {
-      &__back {
-        a {
-          color: black !important;
-        }
-      }
-      &__options {
-        color: black;
-        a {
-          color: $green4;
-        }
-      }
-    }
-  }
-  &__dark {
-    background-color: black;
-  }
   &__options {
     color: #b5b5b5;
     a {
@@ -47,6 +23,7 @@
   .MuiButtonBase-root {
     padding: 0px !important;
   }
+  background: black;
   .footer {
     position: fixed;
     bottom: 0px;
@@ -152,6 +129,7 @@
 
 @media screen and (min-width: 641px) and (max-width: 1007px) {
   .login {
+    background: black;
     .footer {
       display: none !important;
     }
@@ -212,6 +190,7 @@
 
 @media screen and (max-width: 640px) {
   .login {
+    background: black;
     section {
       // background-color: red;
       width: 90%;

src/views/Auth/Login/index.tsx

@@ -12,14 +12,14 @@ import arrow from "../../../assets/icons/dropdown.png";
 import onInput from "../../../util/onInput";
 import { connect } from "react-redux";
 import { user } from "../../../redux/actions";
-import _ from "lodash";
+
 
 interface LoginFields {
   username?: string;
   password?: string;
 }
 
-function Login({ login, theme, ...props }: any) {
+function Login({login, ...props}: any) {
   const [loginFields, setSignUpFiels] = useState<LoginFields | undefined>(
     undefined
   );
@@ -29,17 +29,11 @@ function Login({ login, theme, ...props }: any) {
   // const usernameInput = useRef<any>();
   // const passwordInput = useRef<any>();
 
-  useEffect(() => {}, []);
+  useEffect(() => {
+    
+  }, []);
   return (
-    <div
+    <div className="login d-flex flex-column align-items-center justify-content-center">
-      className={_.join(
-        [
-          "login d-flex flex-column align-items-center justify-content-center",
-          theme === "light" ? "login__light" : "login__dark",
-        ],
-        " "
-      )}
-    >
       <Navbar />
       <section className="d-flex flex-column">
         <div className="login__back d-flex justify-content-end">

src/views/Auth/SignUp/index.scss

@@ -3,18 +3,10 @@
   height: 100vh;
   position: relative;
   font-family: numeralLight;
-  &__light{
-    background-color: white;
-    b{
-      color: black !important;
-    }
-    input{
-      background-color: white !important;
-    }
-  }
   img {
     // transform: rotate(-90deg);
   }
+  background: black;
   .footer {
     position: fixed;
     bottom: 0px;

src/views/Auth/SignUp/index.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useRef, useEffect } from "react";
-import { useHistory } from "react-router-dom";
+import {useHistory} from 'react-router-dom';
 import Navbar from "../../../components/Navbar";
 import Footer from "../../Home/Footer";
 import Timer from "../../../components/Timer";
@@ -8,16 +8,16 @@ import { Link } from "react-router-dom";
 import arrow from "../../../assets/icons/dropdown.png";
 import arrowLeft from "../../../assets/icons/arrow-left.png";
 
+
 import { connect } from "react-redux";
 import { user } from "../../../redux/actions";
-import _ from "lodash";
 
 interface SignUpFields {
   cellphone?: String;
   otp?: String;
 }
 
-function SignUp({ sendOtp, sendPhoneNumber, loginFlag, theme }: any) {
+function SignUp({ sendOtp, sendPhoneNumber, loginFlag }: any) {
   const [level, setLevel] = useState("phonenumber");
   const [signUpFields, setSignUpFiels] = useState<SignUpFields | undefined>(
     undefined
@@ -86,20 +86,12 @@ function SignUp({ sendOtp, sendPhoneNumber, loginFlag, theme }: any) {
 
   useEffect(() => {
     if(loginFlag){
-      history.push("/");
+          history.push('/');
     }
   },[loginFlag]);
-  const light = theme === "light";
+
   return (
-    <div
+    <div className="signup d-flex flex-column align-items-center justify-content-center">
-      className={_.join(
-        [
-          "signup d-flex flex-column align-items-center justify-content-center",
-          light ? "signup__light" : "signup__dark",
-        ],
-        " "
-      )}
-    >
       <Navbar />
       {level === "phonenumber" && (
         <section className="d-flex flex-column">
@@ -175,10 +167,7 @@ function SignUp({ sendOtp, sendPhoneNumber, loginFlag, theme }: any) {
               ارسال مجدد کد در <Timer seconds={60} refresh={setResend} /> دیگر
             </p>
           ) : (
-            <p
+            <p className="signup__info d-flex justify-content-center" onClick={() => checkPhoneNumber()}>
-              className="signup__info d-flex justify-content-center"
-              onClick={() => checkPhoneNumber()}
-            >
               دوباره ارسال کنید
             </p>
           )}
@@ -189,12 +178,9 @@ function SignUp({ sendOtp, sendPhoneNumber, loginFlag, theme }: any) {
   );
 }
 
-export default connect(
+export default connect((state : any) => ({
-  (state: any) => ({
   loginFlag : state.user.setLogin,
-  }),
+}), {
-  {
   sendOtp: user.otp_login,
   sendPhoneNumber: user.otp,
-  }
+})(SignUp);
-)(SignUp);

src/views/Auth/index.tsx

@@ -2,23 +2,17 @@ import React, {useState, useEffect} from 'react';
 import SignUp from './SignUp/index';
 import Profile from './Profile/index';
 import Login from './Login/index';
-import {connect} from 'react-redux';
 
-
+export default function Auth(props : any) {
-function Auth(props : any) {
   const [page, setPage] = useState(props.page);
   useEffect(() => {
     setPage(() => props.page);
   },[props.page]);
   return (
     <>
-      { page === 'signup' && <SignUp theme={props.theme} /> }
+      { page === 'signup' && <SignUp /> }
-      { page === 'login' && <Login theme={props.theme} setPage={setPage} /> }
+      { page === 'login' && <Login setPage={setPage} /> }
-      { page === 'profile' && <Profile theme={props.theme} /> }
+      { page === 'profile' && <Profile /> }
     </>
   )
 }
-
-export default connect((state : any) => ({
-  theme : state.publicApi.theme,
-}))(Auth);

src/views/Course/Lesson/index.scss

@@ -2,16 +2,6 @@
   transition: all 0.3s;
   overflow : hidden;
   border-bottom: 1px solid $gray9;
-  &__light{
-    header{
-      background-color : white !important;
-      border: 1px solid $gray9;
-      
-    }
-    .lesson__files *{
-      color: black !important;
-    }
-  }
   &__active{
     border-bottom-left-radius: 10px;
     border-bottom-right-radius: 10px;

src/views/Course/Lesson/index.tsx

@@ -6,7 +6,6 @@ import document from "../../../assets/icons/document.png";
 import { connect } from "react-redux";
 import { book, publicApi } from "../../../redux/actions";
 import location from "../../../util/location";
-import _ from "lodash";
 
 function Lesson({
   toggle,
@@ -14,7 +13,6 @@ function Lesson({
   activeCategory,
   realCategories,
   vodDuration,
-  theme,
 }: any) {
   const [selectedLesson, setSelectedLesson] = useState(null);
   const duration = (value: number) => {
@@ -24,20 +22,10 @@ function Lesson({
   };
   const setCategory = (catId: any, videoId: any) => {
     localStorage.removeItem("bookId");
-    localStorage.setItem(
+    localStorage.setItem("category", location.getId() + "," + catId + "," + videoId);
-      "category",
-      location.getId() + "," + catId + "," + videoId
-    );
   };
-
-  const light = theme === "light";
   return (
-    <div
+    <div className="lesson d-flex flex-column">
-      className={_.join([
-        "lesson d-flex flex-column",
-        light ? "lesson__light" : "lesson__dark",
-      ], " ")}
-    >
       <header
         className="desktop justify-content-between align-items-center"
         onClick={() => toggle(lesson[0].categoryId)}
@@ -122,20 +110,13 @@ function Lesson({
               </div>
               <ul className="d-flex">
                 <li>{data.type !== "pdf" && duration(data.duration)}</li>
-                <Link
+                <Link to={"/video/"+ data.id} onClick={() => setCategory(lesson[0].categoryId, data.name)}>
-                  to={"/video/" + data.id}
-                  onClick={() => setCategory(lesson[0].categoryId, data.name)}
-                >
                   <li>{"مشاهده"}</li>
                 </Link>
                 {/* <li>{data.download ? "دانلود" : <img src={lock} alt="" />}</li> */}
               </ul>
             </li>
-            {selectedLesson === data.id && (
+            {selectedLesson === data.id && <p style={{ fontSize: 11, padding: "10px 60px 10px 20px" }}>توضیحات مرتبط با این درس</p>}
-              <p style={{ fontSize: 11, padding: "10px 60px 10px 20px" }}>
-                توضیحات مرتبط با این درس
-              </p>
-            )}
           </div>
         ))}
       </ul>

src/views/Course/index.scss

@@ -1,15 +1,6 @@
-@import "./Lesson/index.scss";
+@import './Lesson/index.scss';
 
 .course{
-  &__light {
-    .course__options--rate {
-      color: black;
-    }
-    .course__options--button {
-      background-color: white !important;
-      color: black;
-    }
-  }
   &__header{
     padding: 30px 0px 45px;
     border-bottom:2px solid $gray5;
@@ -87,6 +78,7 @@
   }
 }
 
+
 @media screen and (min-width: 1441px) {
   .course{
     main {
@@ -157,6 +149,7 @@
           margin-top: 15px;
           font-size: 20px;
         }
+        
       }
      &--button{
        width: 315px;
@@ -198,7 +191,7 @@
           font-size: calc(100vw / 50);
         }
         p{
-          font-size: calc(100vw / 100);
+          font-size: calc(100vw / 100);;
         }
         .course-info-items{
           width: 45%;
@@ -242,6 +235,7 @@
           margin-top: 5px;
           font-size: calc(100vw / 80);
         }
+        
       }
      &--button{
        width: 70%;
@@ -332,6 +326,7 @@
           margin-top: 5px;
           font-size: calc(100vw / 40);
         }
+        
       }
      &--button{
        width: 48%;
@@ -431,6 +426,7 @@
           margin-top: 5px;
           font-size: calc(100vw / 40);
         }
+        
       }
      &--button{
        width: 48%;

src/views/Course/index.tsx

@@ -14,9 +14,8 @@ import { connect } from "react-redux";
 import { publicApi } from "../../redux/actions";
 import scroll from "../../util/scroll";
 import Loader from "../../components/Loader";
-import _ from "lodash";
 
-function Course({ getInfo, info, categories, loading, theme }: any) {
+function Course({ getInfo, info, categories, loading }: any) {
   const [links, setLinks] = useState([
     { link: "/", name: "صفحه اصلی" },
     { link: "/courses", name: "دوره‌ها" },
@@ -26,7 +25,7 @@ function Course({ getInfo, info, categories, loading, theme }: any) {
   useEffect(() => {
     scroll.goToTop();
     getInfo({
-      bookId: location.getId(),
+      bookId: location.getId()
     });
   }, []);
 
@@ -37,16 +36,9 @@ function Course({ getInfo, info, categories, loading, theme }: any) {
     localStorage.setItem("bookId", location.getId());
     localStorage.removeItem("category");
   };
-  const light = theme === "light";
   return (
     <div
-      className={_.join(
+      className="course main d-flex flex-column"
-        [
-          "course main d-flex flex-column",
-          light ? "course__light" : "course__dark",
-        ],
-        " "
-      )}
       style={{ filter: loading ? "blur(8px)" : "" }}
     >
       <Navbar />
@@ -67,10 +59,7 @@ function Course({ getInfo, info, categories, loading, theme }: any) {
                 <i>{info?.vodTeacher}</i>
               </div>
               <div className="d-flex " style={{ minWidth: 150 }}>
-                <div
+                <div className="course-info-items d-flex align-items-center justify-content-around" style={{ minWidth: 150 }}>
-                  className="course-info-items d-flex align-items-center justify-content-around"
-                  style={{ minWidth: 150 }}
-                >
                   <img src={slide} alt="" />
                   <div className="d-flex flex-column" style={{ minWidth: 100 }}>
                     <i>{info?.vodDuration} ساعت درس </i>
@@ -167,7 +156,7 @@ function Course({ getInfo, info, categories, loading, theme }: any) {
             {/* <p>در این قسمت شاید یک متن جهت زیباسازی قرار بگیرد </p> */}
           </header>
           {categories?.map((lesson: any, i: any) => (
-            <Lesson key={i} lesson={lesson} theme={theme} />
+            <Lesson key={i} lesson={lesson} />
           ))}
         </section>
       </main>
@@ -186,7 +175,6 @@ export default connect(
     info: state.publicApi.bookInfo,
     categories: state.publicApi.categories,
     loading: state.publicApi.loading,
-    theme: state.publicApi.theme,
   }),
   { getInfo: publicApi.bookInfo }
 )(Course);

src/views/Faq/index.scss

@@ -1,17 +1,4 @@
 .faq {
-  &__light{
-    .faq{
-      &__list{
-        li{
-          background-color: white !important;
-          border: 1px solid black !important;
-          p{
-            color: black !important;
-          }
-        }
-      }
-    }
-  }
   header {
     width: 100%;
     margin: 0px auto;

src/views/Faq/index.tsx

@@ -7,7 +7,6 @@ import whiteDropdown from "../../assets/icons/white-dropdown.png";
 import { connect } from "react-redux";
 import { faq } from "../../redux/actions";
 import scroll from "../../util/scroll.js";
-import _ from "lodash";
 
 function Faq({
   list,
@@ -16,21 +15,13 @@ function Faq({
   searchFaq,
   searchResult,
   search,
-  theme,
 }: any) {
   useEffect(() => {
     getList();
     scroll.goToTop();
   }, []);
-
-  const light = theme === "light";
   return (
-    <div
+    <div className="faq main d-flex flex-column">
-      className={_.join([
-        "faq main d-flex flex-column",
-        light ? "faq__light" : "faq__dark",
-      ], " ")}
-    >
       <Navbar />
       <main className="d-flex flex-column">
         <header className="d-flex flex-column">
@@ -106,7 +97,6 @@ export default connect(
     list: state.faq.list,
     searchResult: state.faq.searchResult,
     search: state.faq.search,
-    theme: state.publicApi.theme,
   }),
   { getList: faq.list, selectFaq: faq.selectFaq, searchFaq: faq.searchFaq }
 )(Faq);

src/views/Home/AppDownload/index.scss

@@ -9,12 +9,6 @@
   h1{
     font-family: numeralBold;
   }
-  &__light {
-      h1 {
-        color: black !important;
-      }
-    
-  }
   &__figure{
     &--screen{
       width: 220px;
@@ -31,8 +25,7 @@
       padding: 10px;
       background-color: black;
       border-radius: 10px;
-      h2,
+      h2,p{
-      p {
         margin: 0px;
         margin-right: 5px;
       }
@@ -78,8 +71,7 @@
         padding: 10px;
         background-color: black;
         border-radius: 10px;
-        h2,
+        h2,p{
-        p {
           margin: 0px;
           margin-right: 5px;
         }
@@ -118,4 +110,5 @@
       }
     }
   }
+  
 }

src/views/Home/AppDownload/index.tsx

@@ -1,21 +1,13 @@
 import React from "react";
 import ar from "../../../assets/icons/ar.png";
 import download from "../../../assets/icons/download.png";
-import _ from "lodash";
 
-export default function AppDownload(props: any) {
+export default function AppDownload() {
-  const { theme } = props;
   return (
-    <section
+    <section className="app-download desktop justify-content-between align-items-center">
-      className={_.join(
+      <h1>
-        [
+        دریافت اپلیکیشن دانوین
-          "app-download desktop justify-content-between align-items-center",
+      </h1>
-          theme === "light" ? "app-download__light" : "app-download__dark",
-        ],
-        " "
-      )}
-    >
-      <h1>دریافت اپلیکیشن دانوین</h1>
       <figure className="app-download__figure d-flex flex-column align-items-center">
         <div className="app-download__figure--screen"></div>
         <div className="app-download__figure--details d-flex justify-content-between align-items-center">

src/views/Home/Books/Book/index.scss

@@ -4,12 +4,6 @@
   border: 1px solid black;
   padding: 10px;
   border-radius: 10px;
-  &__light{
-    border: none;
-    h2{
-      color: black !important;
-    }
-  }
   img{
     border-radius: 8px;
   }

src/views/Home/Books/Book/index.tsx

@@ -1,36 +1,18 @@
 import React from "react";
-import { Link } from "react-router-dom";
+import { Link } from 'react-router-dom';
-import { connect } from "react-redux";
-import _ from "lodash";
 
-function Book(props: any) {
+export default function Book(props: any) {
-  const { data, theme } = props;
+  const { data } = props;
   const desc: any = {
-    ریاضی: "ریاضی از ریاضت میاد ولی دانوین آسون و لذت بخشش کرده",
+    "ریاضی": 'ریاضی از ریاضت میاد ولی دانوین آسون و لذت بخشش کرده',
-    "علوم تجربی": "علوم تجربی تو دانوین واقعا تجربی و محسوس میشه",
+    'علوم تجربی': "علوم تجربی تو دانوین واقعا تجربی و محسوس میشه",
-    "زیست شناسی": "زیست را در دانوین باید زیست",
+    'زیست شناسی': "زیست را در دانوین باید زیست",
-    شیمی: "شیمی اینجا می فهمه کیمیا یعنی چی",
+    'شیمی': 'شیمی اینجا می فهمه کیمیا یعنی چی',
-    فیزیک: "با دانوین فیزیکو با یه لنز جدید ببنید",
+    'فیزیک': "با دانوین فیزیکو با یه لنز جدید ببنید"
-  };
+  }
   return (
-    <Link
+    <Link to={`/courses/${data.id}`} className="home-books-book d-flex flex-column" draggable={'false'}>
-      to={`/courses/${data.id}`}
+      <img src={`https://dnvn.ir/api/v1/file/${data.fileIds}`} alt={data.name} draggable={'false'} />
-      className={_.join(
-        [
-          "home-books-book d-flex flex-column",
-          theme === "light"
-            ? "home-books-book__light"
-            : "home-books-book__dark",
-        ],
-        " "
-      )}
-      draggable={"false"}
-    >
-      <img
-        src={`https://dnvn.ir/api/v1/file/${data.fileIds}`}
-        alt={data.name}
-        draggable={"false"}
-      />
       <footer className="d-flex">
         <div className="home-books-book__info d-flex flex-column">
           <h2>{data.name}</h2>
@@ -40,7 +22,3 @@ function Book(props: any) {
     </Link>
   );
 }
-
-export default connect((state: any) => ({
-  theme: state.publicApi.theme,
-}))(Book);

src/views/Home/Books/index.tsx

@@ -30,13 +30,13 @@ function Books({list, number}: any) {
           showArrows={true}
           pagination={false}
         >
-          {list?.map((item: Object, i: any) => (
+          {list?.map((item: Object, i: Number) => (
             <Book data={item} key={i} />
           ))}
         </Carousel>
       ) : (
         <div className="home-books__list d-flex">
-          {list?.map((item: Object, i: any) => (
+          {list?.map((item: Object, i: Number) => (
             <Book data={item} key={i} />
           ))}
         </div>

src/views/Home/Courses/Course/index.scss

@@ -4,12 +4,6 @@
   transition: all 0.5s;
   border: 1px solid black;
   border-radius: 10px;
-  &__light{
-    border: none;
-    h2{
-      color: black !important;
-    }
-  }
   img{
     border-radius: 8px;
     margin: 0px auto;

src/views/Home/Courses/Course/index.tsx

@@ -1,35 +1,15 @@
 import React from "react";
 import Avatar from "@mui/material/Avatar";
-import { Link } from "react-router-dom";
+import {Link} from 'react-router-dom';
-import { connect } from "react-redux";
-import _ from "lodash";
 
-function Course(props: any) {
+
-  const { data, theme } = props;
+export default function Course(props: any) {
+  const { data } = props;
   return (
-    <Link
+    <Link to={`/courses/${data.id}`} className="home-courses-course d-flex flex-column" draggable={'false'}>
-      to={`/courses/${data.id}`}
+      <img src={`https://dnvn.ir/api/v1/file/${data.fileIds}`} alt={data.name} draggable={'false'} />
-      className={_.join(
-        [
-          "home-courses-course d-flex flex-column",
-          theme === "light"
-            ? "home-courses-course__light"
-            : "home-courses-course__dark",
-        ],
-        " "
-      )}
-      draggable={"false"}
-    >
-      <img
-        src={`https://dnvn.ir/api/v1/file/${data.fileIds}`}
-        alt={data.name}
-        draggable={"false"}
-      />
       <footer className="d-flex">
-        <Avatar
+        <Avatar src={`https://dnvn.ir/api/v1/file/${data.fileIds}`} style={{ width: 40, height: 40 }} />
-          src={`https://dnvn.ir/api/v1/file/${data.fileIds}`}
-          style={{ width: 40, height: 40 }}
-        />
         <div className="home-courses-course__info d-flex flex-column">
           <h2>{data.name}</h2>
           {/* {window.innerWidth > 1007 ? (
@@ -55,7 +35,3 @@ function Course(props: any) {
     </Link>
   );
 }
-
-export default connect((state: any) => ({
-  theme: state.publicApi.theme,
-}))(Course);

src/views/Home/Courses/index.tsx

@@ -36,13 +36,13 @@ function Courses({ number, courses, selectedSort }: any) {
           showArrows={true}
           pagination={false}
         >
-          {courses?.map((item: Object, i:any) => (
+          {courses?.map((item: Object, i: Number) => (
             <Course data={item} key={i} />
           ))}
         </Carousel>
       ) : (
         <div className="home-courses__list d-flex">
-          {courses?.map((item: Object, i: any) => (
+          {courses?.map((item: Object, i: Number) => (
             <Course data={item} key={i} />
           ))}
         </div>

src/views/Home/Footer/index.scss

@@ -2,16 +2,9 @@
   width: 100%;
   font-family: numeralLight;
   background-color: #1a1a1a;
-  &__light{
-    background-color: white;
-    p,a{
-      color: black !important;
-    }
-  }
   &__container{
     width: 100%;
     margin : 0px auto;
-    padding: 0px 10px;
     p{
       margin: 0px;
       color: $gray;

src/views/Home/Footer/index.tsx

@@ -1,16 +1,15 @@
 import React, { useEffect } from "react";
 import { Link } from "react-router-dom";
 import scroll from "../../../util/scroll";
-import {connect} from 'react-redux';
-import _ from 'lodash';
 
-function Footer(props: any) {
+
-  const { links, theme } = props;
+export default function Footer(props: any) {
+  const { links } = props;
   useEffect(() => {
     scroll.goToTop()
   }, []);
   return (
-    <footer className={_.join(["footer desktop", theme === 'light' ? 'footer__light' : 'footer__dark'], " ")}>
+    <footer className="footer desktop">
       <div className="footer__container d-flex justify-content-between align-items-center">
         <ul className="d-flex">
           {links.map((item: any, i: any) =>
@@ -31,10 +30,6 @@ function Footer(props: any) {
   );
 }
 
-export default connect((state : any) => ({
-  theme : state.publicApi.theme,
-}))(Footer)
-
 Footer.defaultProps = {
   links: [
     { name: "تعرفه‌ها", link: "/subscribe" },

src/views/Home/index.tsx

@@ -13,7 +13,6 @@ import scroll from "../../util/scroll";
 import Loader from "../../components/Loader";
 import { connect } from "react-redux";
 import { book, publicApi } from "../../redux/actions";
-import _ from 'lodash';
 
 function Home({
   courseList,
@@ -28,7 +27,6 @@ function Home({
   getHeader,
   bookLoading,
   publicLoading,
-  theme
 }: any) {
   const [grade, setGrade] = useState(null);
   const [vocal, setVocal] = useState(false);
@@ -49,7 +47,7 @@ function Home({
   return (
     <>
       <div
-        className={_.join(["home main d-flex flex-column", theme === 'dark' ? 'main__dark' : 'main__light'], " ")}
+        className="home main d-flex flex-column"
         style={{
           filter: vocal || bookLoading || publicLoading ? "blur(8px)" : "",
         }}
@@ -63,7 +61,6 @@ function Home({
           setVocal={setVocal}
           inputValue={inputValue}
           setInputValue={setInputValue}
-          theme={theme}
         />
         <Courses courses={sortFilterCourse ? sortFilterCourse : courseList} />
         <GradeFilter
@@ -72,11 +69,10 @@ function Home({
           setGrade={setGrade}
           gradeDropdown={gradeDropdown}
           setGradeDropdown={setGradeDropdown}
-          theme={theme}
         />
-        <Books list={gradeFilterBooks ? gradeFilterBooks : courseList} theme={theme} />
+        <Books list={gradeFilterBooks ? gradeFilterBooks : courseList} />
-        <Blogs theme={theme} />
+        <Blogs />
-        <AppDownload theme={theme} />
+        <AppDownload />
         <Footer />
       </div>
       {vocal ? (
@@ -100,7 +96,6 @@ export default connect(
     headerData: state.publicApi.header,
     bookLoading: state.book.loading,
     publicLoading: state.publicApi.loading,
-    theme : state.publicApi.theme,
   }),
   {
     getCourseList: book.list,

src/views/Subscription/SubscribeRadio/index.scss

@@ -5,15 +5,13 @@
   border-radius: 10px;
   cursor: pointer;
   transition: all 0.5s;
-  
   &__name{
     border-top-right-radius: 10px;
     border-bottom-right-radius: 10px;
     h2{
-      color: white;
+      color: white !important;
       margin-bottom: 0px;
     }
-    
   }
   &__factor{
     border-top-left-radius: 10px;
@@ -64,18 +62,6 @@
       background-color: rgba(255, 255, 255, 0.18);
     }
   }
-  &__light{
-    h2{
-      color: black !important;
-    }
-    .subscribe-radio{
-      &-active{
-        h2{
-          color: white !important;
-        }
-      }
-    }
-  }
 }
 
 @media screen and (min-width: 1441px) {

src/views/Subscription/SubscribeRadio/index.tsx

@@ -4,28 +4,25 @@ import CircleRoundedIcon from "@mui/icons-material/CircleRounded";
 import RadioButtonUncheckedRoundedIcon from "@mui/icons-material/RadioButtonUncheckedRounded";
 import { connect } from "react-redux";
 import { product, userProduct } from "../../../redux/actions";
-import _ from "lodash";
 
-function SubscribeRadio({ data, selectedVOD, selectVOD, theme }: any) {
+function SubscribeRadio({ data, selectedVOD, selectVOD }: any) {
   const submitVOD = (value : any) => {
     if(selectedVOD?.id === data.id){
       selectVOD(null);
     }else{
-      selectVOD(data);
+      selectVOD(data)
+    }
   }
-  };
-  const light = theme === "light";
   return (
     <div
-      className={_.join(
+      className={
-        [
+        "subscribe-radio d-flex" +
-          "subscribe-radio d-flex",
+        " " +
-          selectedVOD?.id === data.id ? "subscribe-radio-active" : "",
+        (selectedVOD?.id === data.id ? "subscribe-radio-active" : "")
-          light ? "subscribe-radio__light" : "subscribe-radio__dark",
+      }
-        ],
+      onClick={() =>
-        " "
+         submitVOD(data)
-      )}
+      }
-      onClick={() => submitVOD(data)}
     >
       <div className="subscribe-radio__name d-flex align-items-center">
         <CustomCheckbox

src/views/Subscription/index.tsx

@@ -7,50 +7,26 @@ import { connect } from "react-redux";
 import { product, userFactor } from "../../redux/actions";
 import scroll from "../../util/scroll";
 import Loader from "../../components/Loader";
-import _ from "lodash";
 
-function Subscription({
+function Subscription({ listVOD, getList, loading, selectedVOD, payment, verify }: any) {
-  listVOD,
-  getList,
-  loading,
-  selectedVOD,
-  payment,
-  verify,
-  theme,
-}: any) {
   useEffect(() => {
     getList();
     scroll.goToTop();
   }, []);
-  const light = theme === "light";
   return (
-    <div
+    <div className={"subscription main d-flex flex-column"}>
-      className={_.join(
-        [
-          "subscription main d-flex flex-column",
-        ],
-        " "
-      )}
-    >
       <Navbar />
       <main className={"d-flex flex-column" + " " + (loading && "blur")}>
         <h1>خرید اشتراک دانوین</h1>
         <p>
-          اینجا هم برای هر کتاب امکان خرید اشتراک جداگانه هست و هم اشتراک های
+          اینجا هم برای هر کتاب امکان خرید اشتراک جداگانه هست و هم اشتراک های مدت دار. با خرید اشتراک های مدت دار دانوین می تونید در هزینه هاتون صرفه جویی کنید.
-          مدت دار. با خرید اشتراک های مدت دار دانوین می تونید در هزینه هاتون
-          صرفه جویی کنید.
         </p>
         {listVOD?.map((subscribe: any, i: any) => (
-          <SubscribeRadio theme={theme} data={subscribe} key={i} />
+          <SubscribeRadio data={subscribe} key={i} />
         ))}
         <DiscountCode />
         <div className="d-flex justify-content-end py-4">
-          <button
+          <button className="submit submit-large" onClick={() => payment({ productId: selectedVOD.id })}>تایید و پرداخت</button>
-            className="submit submit-large"
-            onClick={() => payment({ productId: selectedVOD.id })}
-          >
-            تایید و پرداخت
-          </button>
         </div>
       </main>
       <Footer />
@@ -67,8 +43,7 @@ export default connect(
   (state: any) => ({
     listVOD: state.product.listVOD,
     loading: state.product.loading,
-    selectedVOD: state.product.selectedVOD,
+    selectedVOD: state.product.selectedVOD
-    theme: state.publicApi.theme,
   }),
   {
     getList: product.listVOD,

src/views/VideoTube/AddComment/index.tsx

@@ -2,8 +2,7 @@ import React from "react";
 import Avatar from "@mui/material/Avatar";
 import user3 from "../../../assets/images/user3.png";
 
-export default function AddComment(props : any) {
+export default function AddComment() {
-  const { theme } = props;
   return (
     <>
       <Avatar style={{ width: 60, height: 60, marginLeft: 10 }} />

src/views/VideoTube/LessonPlayList/index.scss

@@ -1,20 +1,6 @@
 .lesson-playlist{
   width: 100%;
   padding-bottom : 10px;
-  &__light{
-    .lesson-playlist{
-      h3{
-        background-color : inherit !important;
-        border: 1px solid $gray9 !important;
-      }
-      &__item{
-        *{
-          color: black !important;
-        }
-      }
-    }
-    
-  }
   header{
     background-color: inherit !important;
     margin-bottom: 5px;

src/views/VideoTube/LessonPlayList/index.tsx

@@ -2,7 +2,6 @@ import React, { useEffect } from "react";
 import { connect } from "react-redux";
 import { publicApi } from "../../../redux/actions";
 import { Link } from "react-router-dom";
-import _ from "lodash";
 
 function LessonPlayList({
   category,
@@ -11,7 +10,6 @@ function LessonPlayList({
   catergories,
   realCategories,
   vods,
-  theme,
 }: any) {
   const bookId = localStorage.getItem("bookId");
   useEffect(() => {
@@ -22,32 +20,23 @@ function LessonPlayList({
       ) as HTMLElement;
       const elementHeight: any = (listItem as any)?.offsetHeight;
       const listHeight: any = (list as any).offsetHeight;
-      const index = vods?.findIndex(
+      const index = vods?.findIndex((
         (item: any) => item?.name === selectedVideo?.name
-      );
+      ));
       console.log(index);
       console.log(listHeight,elementHeight * (Number(index) + 1));
 
       if( elementHeight * (Number(index) + 1) > listHeight){
-        list.scrollTo(0, elementHeight * (Number(index) + 1) + elementHeight);
+        list.scrollTo(0, (elementHeight * (Number(index) + 1)) + elementHeight);
       }
       localStorage.removeItem("scroll-list");
     }
   }, [vods]);
 
-  const light = theme === "light";
   return (
     <>
       {
-        <div
+        <div className="lesson-playlist d-flex flex-column">
-          className={_.join(
-            [
-              "lesson-playlist d-flex flex-column",
-              light ? "lesson-playlist__light" : "lesson-playlist__dark",
-            ],
-            " "
-          )}
-        >
           {bookId && (
             <header>
               <h3>

src/views/VideoTube/index.scss

@@ -1,36 +1,9 @@
-@import "./Attachments/index.scss";
+@import './Attachments/index.scss';
-@import "./Book/index.scss";
+@import './Book/index.scss';
-@import "./Comment/index.scss";
+@import './Comment/index.scss';
-@import "./LessonPlayList/index.scss";
+@import './LessonPlayList/index.scss';
 
-.video-tube {
-  &__light {
-    h1,
-    p {
-      color: black !important;
-    }
 .video-tube {
-      &__content {
-        &--comments {
-          color: black !important;
-        }
-        &--addComment {
-          textarea {
-            background-color: white !important;
-            color: black !important;
-          }
-        }
-      }
-      &__sidebar{
-        header{
-          background-color: white !important;
-          *{
-            color: black !important;
-          }
-        }
-      }
-    }
-  }
   &__content {
     margin-left: 15px;
     
@@ -577,3 +550,4 @@
     }
   }
 }
+

src/views/VideoTube/index.tsx

@@ -10,7 +10,6 @@ import Video from "../../components/JolPlayer";
 
 import listIcon from "../../assets/icons/list.png";
 import { connect } from "react-redux";
-import _ from "lodash";
 import scroll from "../../util/scroll.js";
 import location from "../../util/location.js";
 import { book, publicApi } from "../../redux/actions";
@@ -25,7 +24,6 @@ function VodTube({
   categories,
   setVideoActive,
   allBooks,
-  theme,
 }: any) {
   const videoListTag = useRef(null);
   useEffect(() => {
@@ -45,17 +43,10 @@ function VodTube({
     }
   }, [allBooks]);
 
-  const light = theme === "light";
   return (
     <>
       <div
-        className={_.join(
+        className="video-tube main d-flex flex-column"
-          [
-            "video-tube main d-flex flex-column",
-            light ? "video-tube__light" : "video-tube__dark",
-          ],
-          " "
-        )}
         style={{ filter: loading ? "blur(8px)" : "" }}
       >
         <Navbar />
@@ -85,7 +76,7 @@ function VodTube({
               </div>
             </section>
             <section className="desktop video-tube__content--addComment">
-              <AddComment theme={theme} />
+              <AddComment />
             </section>
           </div>
           <div className="video-tube__sidebar d-flex flex-column">
@@ -107,10 +98,10 @@ function VodTube({
               >
                 {localStorage.getItem("bookId")
                   ? categories?.map((video: any, i: any) => (
-                      <LessonPlayList theme={theme} category={video} key={i} />
+                    <LessonPlayList category={video} key={i} />
                   ))
                   : info?.vods.map((video: any, i: any) => (
-                      <LessonPlayList theme={theme} category={video} key={i} />
+                    <LessonPlayList category={video} key={i} />
                   ))}
               </div>
             </section>
@@ -174,7 +165,6 @@ export default connect(
     loading: state.publicApi.loading,
     categories: state.publicApi.categories,
     allBooks: state.publicApi.bookInfo?.vods,
-    theme: state.publicApi.theme,
   }),
   {
     getInfo: publicApi.bookInfo,