From fd42d20574e3234ca15af8d58450307bb12fd267 Mon Sep 17 00:00:00 2001 From: VividTruthKeeper Date: Tue, 12 Apr 2022 15:49:43 +0500 Subject: [PATCH] minor changes --- src/components/CardStages/CardStage4.js | 19 ++-- src/components/CreditStages/CreditStage1.js | 26 ++--- src/components/CreditStages/CreditStage5.js | 9 +- src/components/credits/CreditModal.js | 28 +++-- src/components/global/LoggedNav.js | 4 +- src/components/global/Side.js | 67 ++++++++++-- src/components/sign/RegForm.js | 2 +- src/hooks/useMediaQuery.js | 19 ++++ src/pages/Base.js | 108 +++++++++---------- src/pages/Cards.js | 109 ++++++++++---------- src/scss/_credit-modal.scss | 9 +- src/scss/_custom-select.scss | 3 + src/scss/_modal-form.scss | 8 ++ 13 files changed, 244 insertions(+), 167 deletions(-) create mode 100644 src/hooks/useMediaQuery.js diff --git a/src/components/CardStages/CardStage4.js b/src/components/CardStages/CardStage4.js index 6eee967..b4684e9 100644 --- a/src/components/CardStages/CardStage4.js +++ b/src/components/CardStages/CardStage4.js @@ -53,19 +53,12 @@ const CardStage4 = ({ setStage, data, setData, req, setReq }) => { dropdown ? "data-dropdown docs active" : "data-dropdown docs" } > -
- {locale === "TUK" - ? parser - .parseFromString(req.tuk, "text/html") - .getElementsByTagName("p")[0] - .innerText.split(". ") - .map((el, i) =>

- {el}

) - : parser - .parseFromString(req.rus, "text/html") - .getElementsByTagName("p")[0] - .innerText.split(". ") - .map((el, i) =>

- {el}

)} -
+
diff --git a/src/components/CreditStages/CreditStage1.js b/src/components/CreditStages/CreditStage1.js index d80e584..bb5135f 100644 --- a/src/components/CreditStages/CreditStage1.js +++ b/src/components/CreditStages/CreditStage1.js @@ -20,7 +20,6 @@ const CreditStage1 = ({ setStage, data, setData, creditData, id, setId }) => { one: false, two: false, }); - const parser = new DOMParser(); useEffect(() => { if (input !== "" && creditData) { @@ -98,7 +97,9 @@ const CreditStage1 = ({ setStage, data, setData, creditData, id, setId }) => {
@@ -226,21 +227,12 @@ const CreditStage1 = ({ setStage, data, setData, creditData, id, setId }) => { : "data-dropdown docs" } > -
- { - locale === "TUK" - ? parser - .parseFromString(req.tuk, "text/html") - .getElementsByTagName("p")[0] - : // .innerText.split(". ") - // .map((el, i) =>

- {el}

) - parser - .parseFromString(req.rus, "text/html") - .getElementsByTagName("p")[0] - // .innerText.split(". ") - // .map((el, i) =>

- {el}

) - } -
+
diff --git a/src/components/CreditStages/CreditStage5.js b/src/components/CreditStages/CreditStage5.js index d9e6b35..be32fe9 100644 --- a/src/components/CreditStages/CreditStage5.js +++ b/src/components/CreditStages/CreditStage5.js @@ -65,6 +65,7 @@ const CreditStage5 = ({ setStage, data, setData }) => { { setFiles([...files, e.target.files[0]]); e.target.value = ""; @@ -97,6 +98,12 @@ const CreditStage5 = ({ setStage, data, setData }) => { }) : null} +

+ {locale === "TUK" + ? "Hemme faýllar diňe görkezilen formatda bolmaly: " + : "Все файлы должны быть следующих форматов: "} + .jpg, .jpeg, .doc, .docx, .pdf, .png +

) : stage === 6 ? ( diff --git a/src/components/global/LoggedNav.js b/src/components/global/LoggedNav.js index dfb4b72..9c1e898 100644 --- a/src/components/global/LoggedNav.js +++ b/src/components/global/LoggedNav.js @@ -125,13 +125,13 @@ const LoggedNav = ({ sideOpen, setSideOpen }) => { : "Данные профиля"} -
  • + {/*
  • {locale === "TUK" ? "Açar sözüni çalyşmak" : "Смена пароля"} -
    • + */}
    • - + { + if (closeOnInteract) { + setSideOpen(true); + } + }} + >
    arrow
    diff --git a/src/components/sign/RegForm.js b/src/components/sign/RegForm.js index e9eaa3b..03d0bc7 100644 --- a/src/components/sign/RegForm.js +++ b/src/components/sign/RegForm.js @@ -230,7 +230,7 @@ const RegForm = () => { * { + const [matches, setMatches] = useState(false); + + useEffect(() => { + const media = window.matchMedia(query); + if (media.matches !== matches) { + setMatches(media.matches); + } + const listener = () => setMatches(media.matches); + window.addEventListener("resize", listener); + return () => window.removeEventListener("resize", listener); + }, [matches, query]); + + return matches; +}; + +export default useMediaQuery; diff --git a/src/pages/Base.js b/src/pages/Base.js index f3161b2..0a50f77 100644 --- a/src/pages/Base.js +++ b/src/pages/Base.js @@ -139,60 +139,62 @@ const Base = () => { {user ? user.online_card.length !== 0 ? user.online_card.map((el, i) => { - return ( - - #{el.id} - {el.selected_card} - {el.date} - - {el.status === "1" - ? locale === "TUK" - ? "Ugradyldy" - : "Отправлено" - : el.status === "2" - ? locale === "TUK" - ? "Kabul edildi" - : "Принята" - : el.status === "3" - ? locale === "TUK" - ? "Görülyar" - : "На стадии рассмотрения" - : el.status === "4" - ? locale === "TUK" - ? "Kart çykaryldy" - : "Карта выпущена" - : el.status === "5" - ? locale === "TUK" - ? "Ret edildi" - : "Отказано" - : ""} - - - {el.status === "5" ? ( -
    -
    -

    {el.action}

    + if (el.payed) { + return ( + + #{el.id} + {el.selected_card} + {el.date} + + {el.status === "1" + ? locale === "TUK" + ? "Ugradyldy" + : "Отправлено" + : el.status === "2" + ? locale === "TUK" + ? "Kabul edildi" + : "Принята" + : el.status === "3" + ? locale === "TUK" + ? "Görülyar" + : "На стадии рассмотрения" + : el.status === "4" + ? locale === "TUK" + ? "Kart çykaryldy" + : "Карта выпущена" + : el.status === "5" + ? locale === "TUK" + ? "Ret edildi" + : "Отказано" + : ""} + + + {el.status === "5" ? ( +
    +
    +

    {el.action}

    +
    + reject
    - reject -
    - ) : el.status !== "4" && el.status !== "2" ? ( -
    - null -
    - ) : ( - "" - )} - - - ); + ) : el.status !== "4" && el.status !== "2" ? ( +
    + null +
    + ) : ( + "" + )} + + + ); + } }) : null : null} diff --git a/src/pages/Cards.js b/src/pages/Cards.js index 133322c..d96af77 100644 --- a/src/pages/Cards.js +++ b/src/pages/Cards.js @@ -24,6 +24,7 @@ const Cards = () => { const [loader, setLoader] = useState(false); const [modalOpen, setModalOpen] = useState(false); const [stage, setStage] = useState(1); + console.log(user); useEffect(() => { if (modalOpen) { document.body.style.overflowY = "hidden"; @@ -104,60 +105,62 @@ const Cards = () => { {user ? ( user.online_card.length !== 0 ? ( user.online_card.map((el, i) => { - return ( - - #{el.id} - {el.selected_card} - {el.date} - - {el.status === "1" - ? locale === "TUK" - ? "Ugradyldy" - : "Отправлено" - : el.status === "2" - ? locale === "TUK" - ? "Kabul edildi" - : "Принята" - : el.status === "3" - ? locale === "TUK" - ? "Görülyar" - : "На стадии рассмотрения" - : el.status === "4" - ? locale === "TUK" - ? "Kart çykaryldy" - : "Карта выпущена" - : el.status === "5" - ? locale === "TUK" - ? "Ret edildi" - : "Отказано" - : ""} - - - {el.status === "5" ? ( -
    -
    -

    {el.action}

    + if (el.payed) { + return ( + + #{el.id} + {el.selected_card} + {el.date} + + {el.status === "1" + ? locale === "TUK" + ? "Ugradyldy" + : "Отправлено" + : el.status === "2" + ? locale === "TUK" + ? "Kabul edildi" + : "Принята" + : el.status === "3" + ? locale === "TUK" + ? "Görülyar" + : "На стадии рассмотрения" + : el.status === "4" + ? locale === "TUK" + ? "Kart çykaryldy" + : "Карта выпущена" + : el.status === "5" + ? locale === "TUK" + ? "Ret edildi" + : "Отказано" + : ""} + + + {el.status === "5" ? ( +
    +
    +

    {el.action}

    +
    + reject
    - reject -
    - ) : el.status !== "4" && el.status !== "2" ? ( -
    - null -
    - ) : ( - "" - )} - - - ); + ) : el.status !== "4" && el.status !== "2" ? ( +
    + null +
    + ) : ( + "" + )} + + + ); + } }) ) : ( diff --git a/src/scss/_credit-modal.scss b/src/scss/_credit-modal.scss index cba44fc..4f254cb 100644 --- a/src/scss/_credit-modal.scss +++ b/src/scss/_credit-modal.scss @@ -3,7 +3,6 @@ flex-direction: column; justify-content: flex-start; gap: 1.4rem; - max-width: 42rem; width: 100%; label { @@ -11,7 +10,6 @@ } .cs-1-top-block { - max-width: 42rem; width: 100%; } } @@ -46,6 +44,10 @@ } .data-dropdown { + &.grid { + display: grid; + grid-template-columns: 1fr 1fr 1fr; + } .text-block { padding: 4rem 2rem; } @@ -294,7 +296,8 @@ .cs-1-middle { gap: 1rem; } - .data-dropdown { + .data-dropdown, + .data-dropdown.grid { display: grid; grid-template-columns: 1fr; diff --git a/src/scss/_custom-select.scss b/src/scss/_custom-select.scss index 0c8d2ee..b029bc0 100644 --- a/src/scss/_custom-select.scss +++ b/src/scss/_custom-select.scss @@ -3,6 +3,9 @@ display: inline-block; input { + &:read-only { + background-color: #fff !important; + } width: 100%; padding: 2rem; border-radius: 0.5rem; diff --git a/src/scss/_modal-form.scss b/src/scss/_modal-form.scss index 796df59..46bbc1c 100644 --- a/src/scss/_modal-form.scss +++ b/src/scss/_modal-form.scss @@ -3,6 +3,10 @@ margin: auto 0; } +.alert { + font-size: 1.2rem; +} + .modal { display: flex; justify-content: center; @@ -19,6 +23,10 @@ overflow-y: auto; z-index: 10000; + input:read-only { + background: #f2f2f2; + } + &.active { opacity: 1; pointer-events: all;