From cfe9c9993179f833dcc275c29821575ae964fd72 Mon Sep 17 00:00:00 2001 From: amir hosein gorji Date: Wed, 1 Jun 2022 19:11:47 +0430 Subject: [PATCH 1/4] update AppRouter.js --- src/AppRouter.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/AppRouter.js b/src/AppRouter.js index ddf5b31..6bfb2c0 100644 --- a/src/AppRouter.js +++ b/src/AppRouter.js @@ -146,7 +146,8 @@ class AppRouter extends Component { )} - {mobile ? ( + + {/* {mobile ? ( status ? ( ) : ( @@ -158,7 +159,7 @@ class AppRouter extends Component { ) ) : ( - )} + )} */} From 1d1fa3e99c8c08cd230f852eb66cfa16522e8c32 Mon Sep 17 00:00:00 2001 From: amir hosein gorji Date: Wed, 1 Jun 2022 19:41:13 +0430 Subject: [PATCH 2/4] update 42 files --- dictionary.js | 2 +- src/Redux/reducers/book.js | 8 +- src/Redux/reducers/public.js | 7 +- src/views/Auth/Login/Cellphone/index.js | 6 +- src/views/Auth/Login/Code/index.js | 11 +- src/views/Auth/Profile/Birthdate/index.js | 12 +-- src/views/Auth/Profile/index.js | 22 ++-- src/views/Auth/Splash/index.js | 8 +- src/views/ChatList/Search/index.js | 4 +- src/views/ChatRoom/Body/Input/index.js | 2 +- .../ChatRoom/Body/Message/Comment/index.js | 2 +- .../ChatRoom/Body/Message/Normal/index.js | 2 +- src/views/ChatRoom/Info/index.js | 8 +- src/views/Checkout/index.js | 4 +- src/views/Contact/index.js | 24 +++-- src/views/Download/index.js | 2 +- src/views/Faq/index.js | 4 +- src/views/Home/Footer/index.js | 32 ++++-- src/views/Home/HomeHeader/index.js | 41 ++++--- src/views/Home/HomeScroll/index.js | 2 +- src/views/Home/HomeSearch/Select/index.js | 4 +- src/views/Home/HomeSearch/index.js | 8 +- src/views/Home/HomeSlider/Blog/index.js | 2 +- src/views/Home/HomeSlider/index.js | 8 +- src/views/Home/HomeStatic/index.js | 6 +- src/views/Home/Membership/index.js | 4 +- src/views/Home/Navbar/Laptop/index.js | 4 +- .../Mobile/NavbarDrawer/NavbarDrawer.js | 38 +++---- src/views/Home/Navbar/Mobile/index.js | 16 +-- src/views/NewProfile/index.js | 42 +++++--- src/views/Orders/index.js | 9 +- src/views/Product/Gallery/Modal/index.js | 100 +++++++++--------- src/views/Product/MaterialModal/index.js | 4 +- src/views/Product/index.js | 20 ++-- src/views/Products/Filters/index.js | 4 +- src/views/Products/Select/index.js | 2 +- src/views/Products/index.js | 4 +- src/views/QR/SubjectsDropdown/index.js | 2 +- src/views/QR/index.js | 2 +- src/views/QRScan/Modal/index.js | 4 +- src/views/Sample/index.js | 2 +- src/views/Support/index.js | 13 ++- 42 files changed, 288 insertions(+), 213 deletions(-) diff --git a/dictionary.js b/dictionary.js index a73d591..fd29ea3 100644 --- a/dictionary.js +++ b/dictionary.js @@ -335,4 +335,4 @@ const items = [ "درخواست شما با موفقیت انجام شد.", ]; -module.exports = items; \ No newline at end of file +module.exports = items; diff --git a/src/Redux/reducers/book.js b/src/Redux/reducers/book.js index a901796..6e48838 100644 --- a/src/Redux/reducers/book.js +++ b/src/Redux/reducers/book.js @@ -9,7 +9,11 @@ const initialState = { filterResult: [], subjects: [], levels: [], - sortFilters: [window.t("مرتب سازی"), window.t("محبوب ترین"), window.t("جدیدترین")], + sortFilters: [ + window.t("مرتب سازی"), + window.t("محبوب ترین"), + window.t("جدیدترین"), + ], }; const grades = [ @@ -42,7 +46,7 @@ export default function book(state = initialState, action) { .sort((a, b) => a - b) .map((e) => grades[e]); if (window.innerWidth < 1000) { - itemsLevel.unshift(window.t(window.t("پایه تحصیلی"))); + itemsLevel.unshift(window.t("پایه تحصیلی")); } return { ...state, diff --git a/src/Redux/reducers/public.js b/src/Redux/reducers/public.js index da9bda6..3b317e6 100644 --- a/src/Redux/reducers/public.js +++ b/src/Redux/reducers/public.js @@ -52,7 +52,7 @@ export default function publicApi(state = initialState, action) { .sort((a, b) => a - b) .map((e) => grades[e]) : []; - itemsLevel.unshift(window.t(window.t("پایه تحصیلی"))); + itemsLevel.unshift(window.t("پایه تحصیلی")); // } return { @@ -69,8 +69,9 @@ export default function publicApi(state = initialState, action) { case "public/filter": const realList = state.newProducts.length === 0 - ? state.homeData.filter((item) => item.title === window.t("کتاب‌های دانوین"))[0] - .data + ? state.homeData.filter( + (item) => item.title === window.t("کتاب‌های دانوین") + )[0].data : state.newProducts; if (state.newProducts.length === 0) { state = { diff --git a/src/views/Auth/Login/Cellphone/index.js b/src/views/Auth/Login/Cellphone/index.js index d0cf3e4..b9733dd 100644 --- a/src/views/Auth/Login/Cellphone/index.js +++ b/src/views/Auth/Login/Cellphone/index.js @@ -48,7 +48,7 @@ export default class Cellphone extends Component { } > 09 - window.t("پرچم") + {window.t("پرچم")} window.t("عکس") @@ -119,7 +119,7 @@ export default class Cellphone extends Component { } > 09 - window.t("پرچم") + {window.t("پرچم")} -
- {/* window.t("عکس") */} -
+
) : null} diff --git a/src/views/Auth/Profile/Birthdate/index.js b/src/views/Auth/Profile/Birthdate/index.js index 5c0731c..bd830ba 100644 --- a/src/views/Auth/Profile/Birthdate/index.js +++ b/src/views/Auth/Profile/Birthdate/index.js @@ -31,7 +31,7 @@ export default function Birthdate(props) { @@ -284,7 +284,7 @@ class Profile extends Component { parent={this} options={grades} name="gradeIds" - label={window.t(window.t("پایه تحصیلی"))} + label={window.t("پایه تحصیلی")} selectedOptions={this.state.gradeIds} /> @@ -418,7 +418,7 @@ class Profile extends Component { ) : null} @@ -481,7 +481,7 @@ class Profile extends Component { parent={this} options={grades} name="gradeIds" - label={window.t(window.t("پایه تحصیلی"))} + label={window.t("پایه تحصیلی")} selectedOptions={this.state.gradeIds} /> ) : null} diff --git a/src/views/Auth/Splash/index.js b/src/views/Auth/Splash/index.js index 12c8831..a330135 100644 --- a/src/views/Auth/Splash/index.js +++ b/src/views/Auth/Splash/index.js @@ -9,16 +9,18 @@ export default function Splash(props) { <> {window.innerWidth > 1000 ? (
- window.t("لوگو") + {window.t("لوگو")} در حال بارگیری اطلاعات از سرور
) : null} {window.innerWidth < 1000 ? (
- window.t("لوگو") + {window.t("لوگو")} - در حال بارگیری اطلاعات از سرور + + در حال بارگیری اطلاعات از سرور +
) : null} diff --git a/src/views/ChatList/Search/index.js b/src/views/ChatList/Search/index.js index 0c1b5f1..c3a582e 100644 --- a/src/views/ChatList/Search/index.js +++ b/src/views/ChatList/Search/index.js @@ -17,9 +17,9 @@ export default function Search(props) { - window.t(window.t("جستجو")) + {window.t("جستجو")} ); } diff --git a/src/views/ChatRoom/Body/Input/index.js b/src/views/ChatRoom/Body/Input/index.js index ce54594..64fcd93 100644 --- a/src/views/ChatRoom/Body/Input/index.js +++ b/src/views/ChatRoom/Body/Input/index.js @@ -145,7 +145,7 @@ export default class ChatInputs extends Component { id="standard-textarea" label="" value={message} - placeholder=window.t("یک پیام بنویسید...") + placeholder={window.t("یک پیام بنویسید...")} rowsMax={4} onChange={(e) => typeText("text", e.target.value)} multiline diff --git a/src/views/ChatRoom/Body/Message/Comment/index.js b/src/views/ChatRoom/Body/Message/Comment/index.js index 491837a..c4cd2b4 100644 --- a/src/views/ChatRoom/Body/Message/Comment/index.js +++ b/src/views/ChatRoom/Body/Message/Comment/index.js @@ -19,7 +19,7 @@ const menu = [ const selfMenu = [ { text: window.t("باز ارسال"), icon: ForwardIcon, onClick: () => {} }, { text: window.t("ویرایش"), icon: EditIcon, onClick: () => {} }, - { text: window.t(window.t("حذف")), icon: DeleteIcon, onClick: () => {} }, + { text: window.t("حذف")), icon: DeleteIcon, onClick: () => {} }, ]; export default class Comment extends Component { state = { messageMenu: null }; diff --git a/src/views/ChatRoom/Body/Message/Normal/index.js b/src/views/ChatRoom/Body/Message/Normal/index.js index 62b3085..af74ebd 100644 --- a/src/views/ChatRoom/Body/Message/Normal/index.js +++ b/src/views/ChatRoom/Body/Message/Normal/index.js @@ -27,7 +27,7 @@ const menu = [ const selfMenu = [ { text: window.t("باز ارسال"), icon: ForwardIcon, onClick: () => {} }, { text: window.t("ویرایش"), icon: EditIcon, onClick: () => {} }, - { text: window.t(window.t("حذف")), icon: DeleteIcon, onClick: () => {} }, + { text: window.t("حذف"), icon: DeleteIcon, onClick: () => {} }, ]; export default class NormalMessage extends Component { state = { messageMenu: null }; diff --git a/src/views/ChatRoom/Info/index.js b/src/views/ChatRoom/Info/index.js index 1cc3cf5..728bf43 100644 --- a/src/views/ChatRoom/Info/index.js +++ b/src/views/ChatRoom/Info/index.js @@ -80,7 +80,9 @@ export default class ChatInfo extends Component { ], name: window.t("محسن محمدی"), lastAct: window.t("2 دقیقه پیش آنلاین بوده"), - bio: window.t("لورم ایپسوم متن ساختگی با تولید سادگی نامفهوم از صنعت چاپ و با استفاده از طراحان گرافیک است. چاپگرها و متون بلکه روزنام"), + bio: window.t( + "لورم ایپسوم متن ساختگی با تولید سادگی نامفهوم از صنعت چاپ و با استفاده از طراحان گرافیک است. چاپگرها و متون بلکه روزنام" + ), }, }; } @@ -136,7 +138,7 @@ export default class ChatInfo extends Component { window.t("عکس

{user.name}

@@ -243,7 +245,7 @@ export default class ChatInfo extends Component { window.t("عکس

{user.name}

diff --git a/src/views/Checkout/index.js b/src/views/Checkout/index.js index 0719875..ee1ed87 100644 --- a/src/views/Checkout/index.js +++ b/src/views/Checkout/index.js @@ -230,7 +230,7 @@ class Cart extends Component {
- window.t("آدرس") + {window.t("آدرس")}

{contactData?.address || ""}

@@ -71,13 +75,21 @@ class Contact extends Component { {contactData?.cellphone || ""} - window.t("تماس") + {window.t("تماس")}
{contactData?.email || ""} - window.t(window.t(window.t("خانه"))) + {window.t("خانه")}
@@ -106,7 +118,7 @@ class Contact extends Component {
- window.t("آدرس") + {window.t("آدرس")}

{contactData?.address || ""}{" "}

@@ -119,13 +131,13 @@ class Contact extends Component { {contactData?.cellphone || ""}{" "} - window.t("تماس") + {window.t("تماس")}
{contactData?.email || ""} - window.t(window.t(window.t("خانه"))) + {window.t("خانه")}
diff --git a/src/views/Download/index.js b/src/views/Download/index.js index 21127a6..b8cdd1b 100644 --- a/src/views/Download/index.js +++ b/src/views/Download/index.js @@ -45,7 +45,7 @@ class AR extends Component { > window.t(window.t("واقعیت
diff --git a/src/views/Faq/index.js b/src/views/Faq/index.js index 4854c41..02d975e 100644 --- a/src/views/Faq/index.js +++ b/src/views/Faq/index.js @@ -99,7 +99,7 @@ class Faq extends Component {
this.handleSearch(e.target.value)} /> diff --git a/src/views/Home/Footer/index.js b/src/views/Home/Footer/index.js index f6ebc4c..aba6346 100644 --- a/src/views/Home/Footer/index.js +++ b/src/views/Home/Footer/index.js @@ -22,7 +22,11 @@ export default class Footer extends Component { آموزش و پرورش کشور ایجاد کنیم.

- window.t("آدرس") + {window.t("آدرس")}

آدرس: تهران، میدان فردوسی، خیابان موسوی، پلاک ۳۰

- window.t("تماس") + {window.t("تماس")}
{/*
021-88814673 - window.t("تماس") + {window.t("تماس")
*/}
Info@Danovin.ir - window.t(window.t(window.t("خانه"))) + {window.t("خانه")}
@@ -103,7 +111,11 @@ export default class Footer extends Component { کاربردی می باشد، کتابهای زیادی در شصت و سه{" "}

- window.t("آدرس") + {window.t("آدرس")}

تهران خیابان انقلاب اسلامی بن بست سروش پلاک 2 طبقه چهار

@@ -114,16 +126,20 @@ export default class Footer extends Component { >
02163462405 - window.t("تماس") + {window.t("تماس")}
Info@Danovin.ir - window.t(window.t(window.t("خانه"))) + {window.t("خانه")}
-

دسترسی سریع

+

{window.t("دسترسی سریع")}

    {fastAccess.map((item) => (
  • diff --git a/src/views/Home/HomeHeader/index.js b/src/views/Home/HomeHeader/index.js index c6dd7c1..e6014ef 100644 --- a/src/views/Home/HomeHeader/index.js +++ b/src/views/Home/HomeHeader/index.js @@ -1,6 +1,6 @@ import React, { Component } from "react"; import ChevronLeftIcon from "@material-ui/icons/ChevronLeft"; -import {Link} from 'react-router-dom'; +import { Link } from "react-router-dom"; import "./index.scss"; export default class HomeHeader extends Component { @@ -12,23 +12,27 @@ export default class HomeHeader extends Component { height ? "home-header d-flex flex-column" : "home-header d-flex" } > - { - title ?
    -

    {title}

    -
    - موارد بیشتر - + {title ? ( +
    +

    {title}

    +
    + {window.t("موارد بیشتر")} + +
    -
    : null - } + ) : null}
    {data.map((item, i) => ( ))}
    - ); } @@ -36,13 +40,16 @@ export default class HomeHeader extends Component { const Item = (props) => { return ( - + window.t("عکس")
    {moreText} - window.t("فلش") + {window.t("فلش")}
    diff --git a/src/views/Home/HomeSearch/Select/index.js b/src/views/Home/HomeSearch/Select/index.js index d5ad865..48061b8 100644 --- a/src/views/Home/HomeSearch/Select/index.js +++ b/src/views/Home/HomeSearch/Select/index.js @@ -56,7 +56,9 @@ export default function CustomizedSelects(props) { filters: { ...parent.state.filters, [name]: - e.target.value === window.t(window.t("پایه تحصیلی")) ? [] : [e.target.value], + e.target.value === window.t("پایه تحصیلی") + ? [] + : [e.target.value], }, }) } diff --git a/src/views/Home/HomeSearch/index.js b/src/views/Home/HomeSearch/index.js index 3ca6261..459fab0 100644 --- a/src/views/Home/HomeSearch/index.js +++ b/src/views/Home/HomeSearch/index.js @@ -28,7 +28,7 @@ class HomeSearch extends Component { return window.innerWidth > 1000 ? (
    - window.t("فلش") + {window.t("فلش")}
    - {data.buttonText || window.t(window.t("ادامه مطلب"))} + {data.buttonText || window.t("ادامه مطلب")}
    { className="home-scroll__header--more d-flex align-items-center" > بیشتر - window.t("فلش") + {window.t("فلش")} ) : null}
@@ -51,7 +51,7 @@ const SimpleHeader = (props) => { className="mobile-home-scroll__header--more d-flex align-items-center" > بیشتر - window.t("فلش") + {window.t("فلش")} ) : null} */}
@@ -74,7 +74,7 @@ const TabHeader = (props) => { className="home-scroll__header--more d-flex align-items-center" > بیشتر - window.t("فلش") + {window.t("فلش")} */} ) : null} @@ -86,7 +86,7 @@ const TabHeader = (props) => { {/*
بیشتر - window.t("فلش") + {window.t("فلش")}
*/} ) : null} diff --git a/src/views/Home/HomeStatic/index.js b/src/views/Home/HomeStatic/index.js index f246cae..b525895 100644 --- a/src/views/Home/HomeStatic/index.js +++ b/src/views/Home/HomeStatic/index.js @@ -28,7 +28,7 @@ export default class HomeStatic extends Component {

{title}

- موارد بیشتر + {window.t("موارد بیشتر")} {
window.t("عکس")
) : ( @@ -100,7 +100,7 @@ const Item = (props) => { > window.t("عکس")
diff --git a/src/views/Home/Membership/index.js b/src/views/Home/Membership/index.js index f5f0e8c..b31d516 100644 --- a/src/views/Home/Membership/index.js +++ b/src/views/Home/Membership/index.js @@ -17,7 +17,7 @@ class Membership extends Component {
- +
@@ -35,7 +35,7 @@ class Membership extends Component {
- +
diff --git a/src/views/Home/Navbar/Laptop/index.js b/src/views/Home/Navbar/Laptop/index.js index 963272c..cb1c60c 100644 --- a/src/views/Home/Navbar/Laptop/index.js +++ b/src/views/Home/Navbar/Laptop/index.js @@ -36,7 +36,7 @@ class LaptopNavbar extends Component {