diff --git a/src/App.js b/src/App.js index de3ba18..d3efc65 100644 --- a/src/App.js +++ b/src/App.js @@ -39,7 +39,7 @@ const App = () => { const [locale, setLocale] = useState( localStorage.getItem("userLanguage") ? localStorage.getItem("userLanguage") - : "TUK" + : "TKM" ); const [loaderActive, setLoaderActive] = useState(false); const providerValue = useMemo(() => ({ user, setUser }), [user, setUser]); diff --git a/src/backend/sendMessage.js b/src/backend/sendMessage.js index 54ba762..db466db 100644 --- a/src/backend/sendMessage.js +++ b/src/backend/sendMessage.js @@ -11,15 +11,12 @@ export const sendMessage = ( ) => { axios .post(`${url}?token=${token}`, data) - .then((res) => { + .then(() => { stateSetter(false); loader(); }) .catch(() => { stateSetter(false); setError(true); - setTimeout(() => { - setError(false); - }, 2000); }); }; diff --git a/src/backend/sendRequest.js b/src/backend/sendRequest.js index 22b5c61..5fcb9e3 100644 --- a/src/backend/sendRequest.js +++ b/src/backend/sendRequest.js @@ -44,14 +44,10 @@ export const sendRequest = ( setLoader(false); } }) - .catch((err) => { + .catch(() => { if (setLoader) { setLoader(false); } - setError(true); - setTimeout(() => { - setError(false); - }, 2000); }); }; diff --git a/src/components/CardStages/CardStage1.js b/src/components/CardStages/CardStage1.js index 6a889b5..9c4c8cf 100644 --- a/src/components/CardStages/CardStage1.js +++ b/src/components/CardStages/CardStage1.js @@ -30,7 +30,7 @@ const CardStage1 = ({ setStage, data, setData, cardData, req, setReq }) => { setPrice(el.card_cost); setReq({ ...req, - tuk: el.documents, + TKM: el.documents, rus: JSON.parse(el.translations[0].attribute_data).documents, }); } @@ -52,14 +52,14 @@ const CardStage1 = ({ setStage, data, setData, cardData, req, setReq }) => {
JSON.parse(el.translations[0].attribute_data).name ) @@ -74,7 +74,7 @@ const CardStage1 = ({ setStage, data, setData, cardData, req, setReq }) => { setInputValid(e); }} eTarget={true} - placeholder={locale === "TUK" ? "Kartyň görnüşi" : "Вид карты"} + placeholder={locale === "TKM" ? "Kartyň görnüşi" : "Вид карты"} defaultValue={inputValid} />
@@ -87,27 +87,27 @@ const CardStage1 = ({ setStage, data, setData, cardData, req, setReq }) => {

HalkBank -{" "} {cardData - ? locale !== "TUK" + ? locale !== "TKM" ? cardData.data.map((el) => el.id === id ? JSON.parse(el.translations[0].attribute_data).name : "" ) : cardData.data.map((el) => (el.id === id ? el.name : "")) - : locale === "TUK" + : locale === "TKM" ? "Aýlyk karty" : "Зарплатная карта"}

{cardData - ? locale !== "TUK" + ? locale !== "TKM" ? cardData.data.map((el) => el.id === id ? JSON.parse(el.translations[0].attribute_data).text : "" ) : cardData.data.map((el) => (el.id === id ? el.text : "")) - : locale === "TUK" + : locale === "TKM" ? "Müşderiniň bankymyzdan alan karz pul serişdeleri “Karz kartyna geçirilýär . Müşderi “Karz karty” bank karty üsti bilen ähli nagt däl hasaplaşyk töleglerini amala aşyrýar." : "Банковская карта, на которую зачисляется заработная плата клиента. Открывается на основании договора между банком и предприятием. Эта карта предоставляет полный перечень услуг по безналичному платежу в терминалах, перевод денежных средств с одной зарплатной карты на другую, а также получению наличных денежных средств в банкоматах на территории Туркменистана."}

@@ -116,17 +116,39 @@ const CardStage1 = ({ setStage, data, setData, cardData, req, setReq }) => {

- {locale === "TUK" ? "Kartyň möhleti" : "Срок действия карты"} + {locale === "TKM" ? "Kartyň möhleti" : "Срок действия карты"}

{cardData - ? cardData.data.map((el) => (el.id === id ? el.term : "")) - : "30"}{" "} - {locale === "TUK" ? "ýyl" : "лет"} + ? cardData.data.map((el) => { + if (el.id === id) { + if (el.term === 1 || el.term === "1") { + return `${el.term} ${ + locale === "TKM" ? "ýyl" : "год" + }`; + } else if ( + el.term === 2 || + el.term === "2" || + el.term === 3 || + el.term === "3" || + el.term === 4 || + el.term === "4" + ) { + return `${el.term} ${ + locale === "TKM" ? "ýyl" : "года" + }`; + } else { + return `${el.term} ${ + locale === "TKM" ? "ýyl" : "лет" + }`; + } + } + }) + : "30"}

-

{locale === "TUK" ? "Göterim" : "Процентная ставка"}

+

{locale === "TKM" ? "Göterim" : "Процентная ставка"}

{" "} {cardData @@ -138,7 +160,7 @@ const CardStage1 = ({ setStage, data, setData, cardData, req, setReq }) => {

-

{locale === "TUK" ? "Kartyň bahasy" : "Стоимость карты"}

+

{locale === "TKM" ? "Kartyň bahasy" : "Стоимость карты"}

{" "} {cardData @@ -146,7 +168,7 @@ const CardStage1 = ({ setStage, data, setData, cardData, req, setReq }) => { el.id === id ? el.card_cost : "" ) : "23"}{" "} - {locale === "TUK" ? "manat" : "маната"} + {locale === "TKM" ? "manat" : "маната"}

@@ -162,7 +184,7 @@ const CardStage1 = ({ setStage, data, setData, cardData, req, setReq }) => { }} >
-

{locale === "TUK" ? "Dowam et" : "Продолжить"}

+

{locale === "TKM" ? "Dowam et" : "Продолжить"}

logout
diff --git a/src/components/CardStages/CardStage2.js b/src/components/CardStages/CardStage2.js index 0ea63f2..ec1e1eb 100644 --- a/src/components/CardStages/CardStage2.js +++ b/src/components/CardStages/CardStage2.js @@ -73,7 +73,7 @@ const CardStage2 = ({ setStage, data, setData }) => {
{
{
{
{
{
{
{
{
{ setStage(1); }} > - {locale === "TUK" ? "Yza" : "Назад"} + {locale === "TKM" ? "Yza" : "Назад"}
@@ -239,7 +239,7 @@ const CardStage2 = ({ setStage, data, setData }) => { }} >
-

{locale === "TUK" ? "Dowam et" : "Продолжить"}

+

{locale === "TKM" ? "Dowam et" : "Продолжить"}

logout
diff --git a/src/components/CardStages/CardStage3.js b/src/components/CardStages/CardStage3.js index 1cf0cc4..509b88a 100644 --- a/src/components/CardStages/CardStage3.js +++ b/src/components/CardStages/CardStage3.js @@ -47,17 +47,17 @@ const CardStage3 = ({ setStage, data, setData }) => {
{ setInputValid({ ...inputValid, region: state }); @@ -68,40 +68,40 @@ const CardStage3 = ({ setStage, data, setData }) => {
{ elName={"card-3-select-el"} name={"affiliate"} placeholder={ - locale === "TUK" ? "Şahamçany saýlaň" : "Выберите филиал" + locale === "TKM" ? "Şahamçany saýlaň" : "Выберите филиал" } stateSetter={(state) => setInputValid({ ...inputValid, affiliate: state }) @@ -121,7 +121,7 @@ const CardStage3 = ({ setStage, data, setData }) => {
{ }} />
- {locale === "TUK" ? ( + {locale === "TKM" ? ( inputValid.sms ? (

Nomeriňize SMS iberiler

) : ( @@ -229,7 +229,7 @@ const CardStage3 = ({ setStage, data, setData }) => { setStage(2); }} > - {locale === "TUK" ? "Yza" : "Назад"} + {locale === "TKM" ? "Yza" : "Назад"}
@@ -252,7 +252,7 @@ const CardStage3 = ({ setStage, data, setData }) => { }} >
-

{locale === "TUK" ? "Dowam et" : "Продолжить"}

+

{locale === "TKM" ? "Dowam et" : "Продолжить"}

logout
diff --git a/src/components/CardStages/CardStage4.js b/src/components/CardStages/CardStage4.js index b4684e9..5165ee6 100644 --- a/src/components/CardStages/CardStage4.js +++ b/src/components/CardStages/CardStage4.js @@ -28,7 +28,7 @@ const CardStage4 = ({ setStage, data, setData, req, setReq }) => {

- {locale === "TUK" + {locale === "TKM" ? "Karz almak üçin ýüzlenmäni resmileşdirmek üçin talap edilýän resminamalary ýükläň" : "Для оформления заявки на получения кредита загрузите требуемые документы."}

@@ -40,7 +40,7 @@ const CardStage4 = ({ setStage, data, setData, req, setReq }) => { >

- {locale === "TUK" + {locale === "TKM" ? "Talaplar we resminamalar" : "Требования и документы"}

@@ -56,7 +56,7 @@ const CardStage4 = ({ setStage, data, setData, req, setReq }) => {
@@ -65,7 +65,7 @@ const CardStage4 = ({ setStage, data, setData, req, setReq }) => {
{ setStage(3); }} > - {locale === "TUK" ? "Yza" : "Назад"} + {locale === "TKM" ? "Yza" : "Назад"}
@@ -133,7 +133,7 @@ const CardStage4 = ({ setStage, data, setData, req, setReq }) => { }} >
-

{locale === "TUK" ? "Dowam et" : "Продолжить"}

+

{locale === "TKM" ? "Dowam et" : "Продолжить"}

logout
diff --git a/src/components/CardStages/CardStage6.js b/src/components/CardStages/CardStage6.js index 3c8ce3e..ec52af2 100644 --- a/src/components/CardStages/CardStage6.js +++ b/src/components/CardStages/CardStage6.js @@ -34,37 +34,37 @@ const CardStage6 = ({
  • -

    {locale === "TUK" ? "Familiýasy" : "Фамилия"}:

    +

    {locale === "TKM" ? "Familiýasy" : "Фамилия"}:

    {data.surname ? data.surname : "-"}

  • -

    {locale === "TUK" ? "Ady" : "Имя"}:

    +

    {locale === "TKM" ? "Ady" : "Имя"}:

    {data.name ? data.name : "-"}

  • -

    {locale === "TUK" ? "Atasynyň ady" : "Отчество"}:

    +

    {locale === "TKM" ? "Atasynyň ady" : "Отчество"}:

    {data.middlename ? data.middlename : "-"}

  • -

    {locale === "TUK" ? "Doglan senesi" : "Дата рождения"}:

    +

    {locale === "TKM" ? "Doglan senesi" : "Дата рождения"}:

    {data.birthdate ? reformatDate(data.birthdate) : "-"}

  • -

    {locale === "TUK" ? "Mobil telefon" : "Мобильный телефон"}:

    +

    {locale === "TKM" ? "Mobil telefon" : "Мобильный телефон"}:

    {data.phone_number ? data.phone_number : "-"}

  • -

    {locale === "TUK" ? "Öý telefon" : "Домашний телефон"}:

    +

    {locale === "TKM" ? "Öý telefon" : "Домашний телефон"}:

    {data.home_phone_number ? data.home_phone_number : "-"}

  • -

    {locale === "TUK" ? "Email" : "Эл. адрес"}:

    +

    {locale === "TKM" ? "Email" : "Эл. адрес"}:

    {data.email ? data.email : "-"}

  • -

    {locale === "TUK" ? "SMS-birikdirme" : "SMS - подключение"}:

    +

    {locale === "TKM" ? "SMS-birikdirme" : "SMS - подключение"}:

    - {locale === "TUK" + {locale === "TKM" ? data.sms_notification ? "Hawa" : "Ýok" @@ -74,12 +74,12 @@ const CardStage6 = ({

  • -

    {locale === "TUK" ? "Pasportyň seriýasy" : "Серия паспорта"}:

    +

    {locale === "TKM" ? "Pasportyň seriýasy" : "Серия паспорта"}:

    {data.passport_series ? data.passport_series : "-"}

  • - {locale === "TUK" + {locale === "TKM" ? "Pasport kim tarapyndan berildi" : "Кем выдан паспорт"} : @@ -87,20 +87,20 @@ const CardStage6 = ({

    {data.passport_by ? data.passport_by : "-"}

  • -

    {locale === "TUK" ? "Ýaşaýan salgysy" : "Адрес прописки"}:

    +

    {locale === "TKM" ? "Ýaşaýan salgysy" : "Адрес прописки"}:

    {data.place_of_residence ? data.place_of_residence : "-"}

  • -

    {locale === "TUK" ? "Welaýat" : "Регион"}:

    +

    {locale === "TKM" ? "Welaýat" : "Регион"}:

    {data.region ? data.region : "-"}

  • -

    {locale === "TUK" ? "Filial" : "Филиал"}:

    +

    {locale === "TKM" ? "Filial" : "Филиал"}:

    {data.branch ? data.branch : "-"}

  • - {locale === "TUK" + {locale === "TKM" ? "Banka gelmek gününi saýlaň " : "Дата прихода в банк"} : @@ -112,11 +112,11 @@ const CardStage6 = ({

  • -

    {locale === "TUK" ? "Saýlanan wagt" : "Выбранное время"}:

    +

    {locale === "TKM" ? "Saýlanan wagt" : "Выбранное время"}:

    {data.selected_time ? data.selected_time : "-"}

  • -

    {locale === "TUK" ? "Gizlin söz" : "Кодовое слово"}:

    +

    {locale === "TKM" ? "Gizlin söz" : "Кодовое слово"}:

    {data.the_codeword ? data.the_codeword : "-"}

@@ -138,7 +138,7 @@ const CardStage6 = ({ setStage(4); }} > - {locale === "TUK" ? "Redaktirlemek" : "Редактировать"} + {locale === "TKM" ? "Redaktirlemek" : "Редактировать"}
@@ -152,7 +152,7 @@ const CardStage6 = ({ }} >
-

{locale === "TUK" ? "Tassyklaýaryn" : "Подтверждаю"}

+

{locale === "TKM" ? "Tassyklaýaryn" : "Подтверждаю"}

logout
diff --git a/src/components/CreditStages/CreditStage1.js b/src/components/CreditStages/CreditStage1.js index bb5135f..af570a9 100644 --- a/src/components/CreditStages/CreditStage1.js +++ b/src/components/CreditStages/CreditStage1.js @@ -13,7 +13,7 @@ const CreditStage1 = ({ setStage, data, setData, creditData, id, setId }) => { const { locale } = useContext(LanguageContext); const [req, setReq] = useState({ rus: "", - tuk: "", + TKM: "", }); const [input, setInput] = useState(data.type ? data.type : null); const [dropdown, setDropdown] = useState({ @@ -35,7 +35,7 @@ const CreditStage1 = ({ setStage, data, setData, creditData, id, setId }) => { setId(el.id); setReq({ ...req, - tuk: el.documents, + TKM: el.documents, rus: JSON.parse(el.translations[0].attribute_data).documents, }); } @@ -47,14 +47,14 @@ const CreditStage1 = ({ setStage, data, setData, creditData, id, setId }) => {
JSON.parse( @@ -71,7 +71,7 @@ const CreditStage1 = ({ setStage, data, setData, creditData, id, setId }) => { blockName={"cs-1-top-block"} elName={"cs-1-top-input"} eTarget={true} - placeholder={locale === "TUK" ? "Karzyň görnüşi" : "Вид кредита"} + placeholder={locale === "TKM" ? "Karzyň görnüşi" : "Вид кредита"} stateSetter={(e) => { setInput(e); }} @@ -87,9 +87,9 @@ const CreditStage1 = ({ setStage, data, setData, creditData, id, setId }) => { >

- {locale === "TUK" - ? "Karzyň möhleti barada maglumat" - : "Информация о сроке кредита"} + {locale === "TKM" + ? "Karz barada maglumat" + : "Информация о кредите"}

arrow @@ -103,17 +103,17 @@ const CreditStage1 = ({ setStage, data, setData, creditData, id, setId }) => { } >
-
{locale === "TUK" ? "Karzyň möhleti " : "Срок кредита"}
+
{locale === "TKM" ? "Karzyň möhleti " : "Срок кредита"}

- {locale === "TUK" ? "" : "до"}{" "} + {locale === "TKM" ? "" : "до"}{" "} {creditData ? creditData.data.map((el) => (el.id === id ? el.term : "")) : ""}{" "} - {locale === "TUK" ? "ýyla çenli" : "лет"} + {locale === "TKM" ? "ýyla çenli" : "лет"}

-
{locale === "TUK" ? "Karzyň möçberi" : "Сумма кредита"}
+
{locale === "TKM" ? "Karzyň möçberi" : "Сумма кредита"}

{creditData ? creditData.data.map((el) => (el.id === id ? el.sum : "")) @@ -121,7 +121,7 @@ const CreditStage1 = ({ setStage, data, setData, creditData, id, setId }) => {

-
{locale === "TUK" ? "Göterim" : "Ставка"}
+
{locale === "TKM" ? "Göterim" : "Ставка"}

{creditData ? creditData.data.map((el) => (el.id === id ? el.bet : "")) @@ -131,13 +131,13 @@ const CreditStage1 = ({ setStage, data, setData, creditData, id, setId }) => {

- {locale === "TUK" + {locale === "TKM" ? "Karzyň üzülmegini üpjün etmek" : "Обеспечение возврата кредита"}

{creditData - ? locale !== "TUK" + ? locale !== "TKM" ? creditData.data.map((el) => el.id === id ? JSON.parse( @@ -155,13 +155,13 @@ const CreditStage1 = ({ setStage, data, setData, creditData, id, setId }) => {

- {locale === "TUK" + {locale === "TKM" ? "Karzy üzmegiň çeşmesi" : "Источник погашения кредита"}

{creditData - ? locale !== "TUK" + ? locale !== "TKM" ? creditData.data.map((el) => el.id === id ? JSON.parse( @@ -179,14 +179,14 @@ const CreditStage1 = ({ setStage, data, setData, creditData, id, setId }) => {

- {locale === "TUK" + {locale === "TKM" ? "Karzy üzmegiň usuly" : "Способ погашения"}

{" "} {creditData - ? locale !== "TUK" + ? locale !== "TKM" ? creditData.data.map((el) => el.id === id ? JSON.parse( @@ -204,37 +204,6 @@ const CreditStage1 = ({ setStage, data, setData, creditData, id, setId }) => {

-
{ - setDropdown({ ...dropdown, two: !dropdown.two }); - }} - > -
-

- {locale === "TUK" - ? "Talaplar we resminamalar" - : "Требования и документы"} -

-
- arrow -
-
-
-
-
-
@@ -175,7 +175,7 @@ const CreditStage2 = ({ setStage, data, setData, creditData, id }) => { }} >
-

{locale === "TUK" ? "Dowam et" : "Продолжить"}

+

{locale === "TKM" ? "Dowam et" : "Продолжить"}

logout
@@ -190,7 +190,7 @@ const CreditStage2 = ({ setStage, data, setData, creditData, id }) => {
- {locale === "TUK" ? "Her aý tölegi" : "Ежемесячный платеж"} + {locale === "TKM" ? "Her aý tölegi" : "Ежемесячный платеж"}
{/*
{
- {locale === "TUK" ? "Göterim töleg" : "Процентная ставка"} + {locale === "TKM" ? "Göterim töleg" : "Процентная ставка"}
{bet} %
-
{locale === "TUK" ? "Pul ýygymy" : "Процентный платеж"}
+
{locale === "TKM" ? "Pul ýygymy" : "Процентный платеж"}
{(((inputValue * (bet / 100)) / 365) * 30).toFixed(2)} TMT
- {locale === "TUK" + {locale === "TKM" ? "Karzyň esasy bergisiniň töleg möçberi:" : "Платеж для погашения основной суммы"} : @@ -275,7 +275,7 @@ const CreditStage2 = ({ setStage, data, setData, creditData, id }) => {
- {locale === "TUK" + {locale === "TKM" ? "Karz almak üçin bolmaly aýlyk zähmet haky" : "Необходимая заработная плата для кредита"} : diff --git a/src/components/CreditStages/CreditStage3.js b/src/components/CreditStages/CreditStage3.js index f023abf..0ba27c2 100644 --- a/src/components/CreditStages/CreditStage3.js +++ b/src/components/CreditStages/CreditStage3.js @@ -57,7 +57,7 @@ const CreditStage3 = ({ setStage, data, setData }) => {
{
{
{
{
{
{
{
{
{ setStage(2); }} > - {locale === "TUK" ? "Yza" : "Назад"} + {locale === "TKM" ? "Yza" : "Назад"}
@@ -223,7 +223,7 @@ const CreditStage3 = ({ setStage, data, setData }) => { }} >
-

{locale === "TUK" ? "Dowam et" : "Продолжить"}

+

{locale === "TKM" ? "Dowam et" : "Продолжить"}

logout
diff --git a/src/components/CreditStages/CreditStage4.js b/src/components/CreditStages/CreditStage4.js index a0c7f6b..44f987a 100644 --- a/src/components/CreditStages/CreditStage4.js +++ b/src/components/CreditStages/CreditStage4.js @@ -45,7 +45,7 @@ const CreditStage4 = ({ setStage, data, setData }) => {
{
{
{
setInputValid({ ...inputValid, region: state }) @@ -131,40 +131,40 @@ const CreditStage4 = ({ setStage, data, setData }) => {
{ elName={"card-3-select-el"} name={"affiliate"} placeholder={ - locale === "TUK" ? "Filialy saýlaň" : "Выберите филиал" + locale === "TKM" ? "Filialy saýlaň" : "Выберите филиал" } stateSetter={(state) => setInputValid({ ...inputValid, affiliate: state }) @@ -200,7 +200,7 @@ const CreditStage4 = ({ setStage, data, setData }) => { setStage(3); }} > - {locale === "TUK" ? "Yza" : "Назад"} + {locale === "TKM" ? "Yza" : "Назад"}
@@ -222,7 +222,7 @@ const CreditStage4 = ({ setStage, data, setData }) => { }} >
-

{locale === "TUK" ? "Dowam et" : "Продолжить"}

+

{locale === "TKM" ? "Dowam et" : "Продолжить"}

logout
diff --git a/src/components/CreditStages/CreditStage5.js b/src/components/CreditStages/CreditStage5.js index be32fe9..f9d5f16 100644 --- a/src/components/CreditStages/CreditStage5.js +++ b/src/components/CreditStages/CreditStage5.js @@ -8,12 +8,15 @@ import next from "../../icons/next.svg"; import arrow from "../../icons/arrow.svg"; import next_reverse from "../../icons/next-reverse.svg"; -const CreditStage5 = ({ setStage, data, setData }) => { +const CreditStage5 = ({ setStage, data, setData, creditData, id }) => { const [files, setFiles] = useState(data.file ? data.file : []); const { locale } = useContext(LanguageContext); const [btnEnabled, setBtnEnabled] = useState(false); const [dropdown, setDropdown] = useState(false); - + const [req, setReq] = useState({ + rus: "", + TKM: "", + }); useEffect(() => { if (files.length > 0) { setBtnEnabled(true); @@ -21,12 +24,26 @@ const CreditStage5 = ({ setStage, data, setData }) => { setBtnEnabled(false); } }, [files]); + + useEffect(() => { + if (creditData) { + creditData.data.map((el) => { + if (el.id === id) { + setReq({ + ...req, + TKM: el.documents, + rus: JSON.parse(el.translations[0].attribute_data).documents, + }); + } + }); + } + }, [creditData, id]); return (

- {locale === "TUK" + {locale === "TKM" ? "Karz almak üçin ýüzlenmäni resmileşdirmek üçin talap edilýän resminamalary ýükläň" : "Для оформления заявки на получения кредита загрузите требуемые документы."}

@@ -38,7 +55,7 @@ const CreditStage5 = ({ setStage, data, setData }) => { >

- {locale === "TUK" + {locale === "TKM" ? "Talaplar we resminamalar" : "Требования и документы"}

@@ -51,16 +68,19 @@ const CreditStage5 = ({ setStage, data, setData }) => { dropdown ? "data-dropdown docs active" : "data-dropdown docs" } > -
Lorem ipsum dolor sit.
-
Lorem ipsum dolor sit.
-
Lorem ipsum dolor sit.
+
{ : null}

- {locale === "TUK" + {locale === "TKM" ? "Hemme faýllar diňe görkezilen formatda bolmaly: " : "Все файлы должны быть следующих форматов: "} .jpg, .jpeg, .doc, .docx, .pdf, .png @@ -121,7 +141,7 @@ const CreditStage5 = ({ setStage, data, setData }) => { setStage(4); }} > - {locale === "TUK" ? "Yza" : "Назад"} + {locale === "TKM" ? "Yza" : "Назад"}

@@ -135,7 +155,7 @@ const CreditStage5 = ({ setStage, data, setData }) => { }} >
-

{locale === "TUK" ? "Dowam et" : "Продолжить"}

+

{locale === "TKM" ? "Dowam et" : "Продолжить"}

logout
diff --git a/src/components/CreditStages/CreditStage6.js b/src/components/CreditStages/CreditStage6.js index 24f0cb7..697e9f9 100644 --- a/src/components/CreditStages/CreditStage6.js +++ b/src/components/CreditStages/CreditStage6.js @@ -33,71 +33,71 @@ const CreditStage6 = ({
  • -

    {locale === "TUK" ? "Familiýasy" : "Фамилия"}:

    +

    {locale === "TKM" ? "Familiýasy" : "Фамилия"}:

    {data.surname ? data.surname : "-"}

  • -

    {locale === "TUK" ? "Ady" : "Имя"}:

    +

    {locale === "TKM" ? "Ady" : "Имя"}:

    {data.name ? data.name : "-"}

  • -

    {locale === "TUK" ? "Atasynyň ady" : "Отчество"}:

    +

    {locale === "TKM" ? "Atasynyň ady" : "Отчество"}:

    {data.fathers ? data.fathers : "-"}

  • -

    {locale === "TUK" ? "Doglan senesi" : "Дата рождения"}:

    +

    {locale === "TKM" ? "Doglan senesi" : "Дата рождения"}:

    {data.birth ? reformatDate(data.birth) : "-"}

  • -

    {locale === "TUK" ? "Mobil telefon" : "Мобильный телефон"}:

    +

    {locale === "TKM" ? "Mobil telefon" : "Мобильный телефон"}:

    {data.mobile ? data.mobile : "-"}

  • -

    {locale === "TUK" ? "Öý telefon" : "Домашний телефон"}:

    +

    {locale === "TKM" ? "Öý telefon" : "Домашний телефон"}:

    {data.home ? data.home : "-"}

  • -

    {locale === "TUK" ? "Email" : "Эл. адрес"}:

    +

    {locale === "TKM" ? "Email" : "Эл. адрес"}:

    {data.email ? data.email : "-"}

  • -

    {locale === "TUK" ? "Pasportyň seriýasy" : "Серия паспорта"}:

    +

    {locale === "TKM" ? "Pasportyň seriýasy" : "Серия паспорта"}:

    {data.passport ? data.passport : "-"}

  • - {locale === "TUK" ? "Кем выдан паспорт" : "Pasportyň berlen ýeri"} + {locale === "TKM" ? "Кем выдан паспорт" : "Pasportyň berlen ýeri"} :

    {data.p_address ? data.p_address : "-"}

  • -

    {locale === "TUK" ? "Ýaşaýan salgysy" : "Адрес прописки"}:

    +

    {locale === "TKM" ? "Ýaşaýan salgysy" : "Адрес прописки"}:

    {data.address ? data.address : "-"}

  • -

    {locale === "TUK" ? "Welaýat" : "Регион"}:

    +

    {locale === "TKM" ? "Welaýat" : "Регион"}:

    {data.region ? data.region : "-"}

  • -

    {locale === "TUK" ? "Filial" : "Филиал"}:

    +

    {locale === "TKM" ? "Filial" : "Филиал"}:

    {data.branch ? data.branch : "-"}

  • -

    {locale === "TUK" ? "Iş ýeri" : "Место работы"}:

    +

    {locale === "TKM" ? "Iş ýeri" : "Место работы"}:

    {data.workplace ? data.workplace : "-"}

  • -

    {locale === "TUK" ? "Aýlyk haky" : "Сумма зарплаты"}:

    +

    {locale === "TKM" ? "Aýlyk haky" : "Сумма зарплаты"}:

    {data.salary ? data.salary : "-"}

  • -

    {locale === "TUK" ? "Wezipesi" : "Должность"}:

    +

    {locale === "TKM" ? "Wezipesi" : "Должность"}:

    {data.position ? data.position : "-"}

  • - {locale === "TUK" + {locale === "TKM" ? "Soňky iş ýeri boýunça tejribe" : "Стаж с последнего места работы"} : @@ -122,7 +122,7 @@ const CreditStage6 = ({ setStage(5); }} > - {locale === "TUK" ? "Redaktirlemek" : "Редактировать"} + {locale === "TKM" ? "Redaktirlemek" : "Редактировать"}

@@ -139,7 +139,6 @@ const CreditStage6 = ({ () => { setSuccess(true); setTimeout(() => { - setSuccess(false); getUserInfo(getUrl, token, setUser, () => null); }, 2000); }, @@ -149,7 +148,7 @@ const CreditStage6 = ({ }} >
-

{locale === "TUK" ? "Tassyklaýaryn" : "Подтверждаю"}

+

{locale === "TKM" ? "Tassyklaýaryn" : "Подтверждаю"}

logout
diff --git a/src/components/cards/ModalForm.js b/src/components/cards/ModalForm.js index f8e85ff..2380b73 100644 --- a/src/components/cards/ModalForm.js +++ b/src/components/cards/ModalForm.js @@ -37,7 +37,7 @@ const ModalForm = ({ const [data, setData] = useState({}); const [req, setReq] = useState({ rus: "", - tuk: "", + TKM: "", }); const [cardData, setCardData] = useState(); @@ -64,7 +64,7 @@ const ModalForm = ({

- {locale === "TUK" + {locale === "TKM" ? "Kart almak üçin onlaýn-ýüzlenme" : "Онлайн-заявка для получения карты"}

@@ -84,7 +84,7 @@ const ModalForm = ({

- {locale === "TUK" + {locale === "TKM" ? "Kartyň görnüşini saýlaň" : "Выберите вид карты"}

@@ -96,7 +96,7 @@ const ModalForm = ({
1 ? "icon-block active" : "icon-block"}>

- {locale === "TUK" ? "Şahsy maglumatlar" : "Личные данные"} + {locale === "TKM" ? "Şahsy maglumatlar" : "Личные данные"}

2 ? "line-block active" : "line-block"}> @@ -106,7 +106,7 @@ const ModalForm = ({
2 ? "icon-block active" : "icon-block"}>

- {locale === "TUK" + {locale === "TKM" ? "Kart üçin maglumatlar" : "Данные для карты"}

@@ -118,7 +118,7 @@ const ModalForm = ({
3 ? "icon-block active" : "icon-block"}>

- {locale === "TUK" + {locale === "TKM" ? "Talaplar we resminamalar" : "Требования и документы"}

@@ -130,7 +130,7 @@ const ModalForm = ({
4 ? "icon-block active" : "icon-block"}>

- {locale === "TUK" ? "Ugratmak" : "Отправка"} + {locale === "TKM" ? "Ugratmak" : "Отправка"}

5 ? "line-block active" : "line-block"}> @@ -140,7 +140,7 @@ const ModalForm = ({
5 ? "icon-block active" : "icon-block"}>

- {locale === "TUK" ? "Töleg" : "Оплата"} + {locale === "TKM" ? "Töleg" : "Оплата"}

@@ -149,7 +149,7 @@ const ModalForm = ({

- {locale === "TUK" + {locale === "TKM" ? "Kartyň görnüşini saýlaň" : "Выберите вид карты"}

@@ -158,14 +158,14 @@ const ModalForm = ({

- {locale === "TUK" ? "Şahsy maglumatlar" : "Личные данные"} + {locale === "TKM" ? "Şahsy maglumatlar" : "Личные данные"}

) : stage === 3 ? (

- {locale === "TUK" + {locale === "TKM" ? "Kart üçin maglumatlar" : "Данные для карты"}

@@ -174,7 +174,7 @@ const ModalForm = ({

- {locale === "TUK" + {locale === "TKM" ? "Talaplar we resminamalar" : "Требования и документы"}

@@ -183,14 +183,14 @@ const ModalForm = ({

- {locale === "TUK" ? "Ugratmak" : "Отправка"} + {locale === "TKM" ? "Ugratmak" : "Отправка"}

) : stage === 6 ? (

- {locale === "TUK" ? "Töleg" : "Оплата"} + {locale === "TKM" ? "Töleg" : "Оплата"}

) : ( diff --git a/src/components/credits/CreditModal.js b/src/components/credits/CreditModal.js index 4f4674f..2c5dca1 100644 --- a/src/components/credits/CreditModal.js +++ b/src/components/credits/CreditModal.js @@ -44,7 +44,7 @@ const CreditModal = ({

- {locale === "TUK" + {locale === "TKM" ? "Karz almak üçin onlaýn-ýüzlenme" : "Онлайн-заявка для получения кредита"}

@@ -64,7 +64,7 @@ const CreditModal = ({

- {locale === "TUK" + {locale === "TKM" ? "Karzyň görnüşini saýlaň" : "Выберите вид кредита"}

@@ -76,7 +76,7 @@ const CreditModal = ({
1 ? "icon-block active" : "icon-block"}>

- {locale === "TUK" + {locale === "TKM" ? "Karzyň kalkulýatory" : "Калькулятор кредита"}

@@ -88,7 +88,7 @@ const CreditModal = ({
2 ? "icon-block active" : "icon-block"}>

- {locale === "TUK" ? "Şahsy maglumatlar" : "Личные данные"} + {locale === "TKM" ? "Şahsy maglumatlar" : "Личные данные"}

3 ? "line-block active" : "line-block"}> @@ -98,7 +98,7 @@ const CreditModal = ({
3 ? "icon-block active" : "icon-block"}>

- {locale === "TUK" + {locale === "TKM" ? "Karz üçin maglumat" : "Данные для кредита"}

@@ -110,7 +110,7 @@ const CreditModal = ({
4 ? "icon-block active" : "icon-block"}>

- {locale === "TUK" + {locale === "TKM" ? "Talaplar we resminamalar" : "Требования и документы"}

@@ -122,7 +122,7 @@ const CreditModal = ({
5 ? "icon-block active" : "icon-block"}>

- {locale === "TUK" ? "Ugratmak" : "Отправка"} + {locale === "TKM" ? "Ugratmak" : "Отправка"}

@@ -131,7 +131,7 @@ const CreditModal = ({

- {locale === "TUK" + {locale === "TKM" ? "Karzyň görnüşini saýlaň" : "Выберите вид кредита"}

@@ -140,7 +140,7 @@ const CreditModal = ({

- {locale === "TUK" + {locale === "TKM" ? "Karzyň kalkulýatory" : "Калькулятор кредита"}

@@ -149,14 +149,14 @@ const CreditModal = ({

- {locale === "TUK" ? "Şahsy maglumatlar" : "Личные данные"} + {locale === "TKM" ? "Şahsy maglumatlar" : "Личные данные"}

) : stage === 4 ? (

- {locale === "TUK" + {locale === "TKM" ? "Karz üçin maglumat" : "Данные для кредита"}

@@ -165,7 +165,7 @@ const CreditModal = ({

- {locale === "TUK" + {locale === "TKM" ? "Talaplar we resminamalar" : "Требования и документы"}

@@ -174,7 +174,7 @@ const CreditModal = ({

- {locale === "TUK" ? "Ugratmak" : "Отправка"} + {locale === "TKM" ? "Ugratmak" : "Отправка"}

) : ( @@ -216,6 +216,8 @@ const CreditModal = ({ setStage={setStage} data={data} setData={setData} + creditData={creditData} + id={id} /> ) : stage === 6 ? ( {
home
- {locale === "TUK" ? "Baş sahypa" : "Главная"} + {locale === "TKM" ? "Baş sahypa" : "Главная"} {image ?
/
: ""} {link ? ( diff --git a/src/components/global/Error.js b/src/components/global/Error.js index 590d424..e48f5e1 100644 --- a/src/components/global/Error.js +++ b/src/components/global/Error.js @@ -1,16 +1,28 @@ // IMPORT MODULES -import React from "react"; +import React, { useContext } from "react"; +import { Link } from "react-router-dom"; +import { LanguageContext } from "../../backend/LanguageContext"; // IMPORT IMAGES import error from "../../images/error-cross.png"; -const Error = ({ message }) => { +const Error = ({ message, setError }) => { + const { locale } = useContext(LanguageContext); return (
error

{message}

+ {setError ? ( +
setError(false)} id="back"> + {locale === "TKM" ? "Saýta geç" : "Вернуться на сайт"} +
+ ) : ( + + {locale === "TKM" ? "Saýta geç" : "Вернуться на сайт"} + + )}
); }; diff --git a/src/components/global/LoggedNav.js b/src/components/global/LoggedNav.js index 9c1e898..e803505 100644 --- a/src/components/global/LoggedNav.js +++ b/src/components/global/LoggedNav.js @@ -51,6 +51,10 @@ const LoggedNav = ({ sideOpen, setSideOpen }) => {
+
+
+
+
@@ -104,7 +108,7 @@ const LoggedNav = ({ sideOpen, setSideOpen }) => { localStorage.setItem("userLanguage", e.target.innerText); }} > - TUK + TKM @@ -120,18 +124,18 @@ const LoggedNav = ({ sideOpen, setSideOpen }) => {
  • - {locale === "TUK" + {locale === "TKM" ? "Profiliň maglumaty" : "Данные профиля"}
  • - {/*
  • +
  • - {locale === "TUK" + {locale === "TKM" ? "Açar sözüni çalyşmak" : "Смена пароля"} -
  • */} +
diff --git a/src/components/global/Nav.js b/src/components/global/Nav.js index f2db167..7c690a7 100644 --- a/src/components/global/Nav.js +++ b/src/components/global/Nav.js @@ -71,7 +71,7 @@ const Nav = () => { localStorage.setItem("userLanguage", e.target.innerText); }} > - TUK + TKM diff --git a/src/components/global/Side.js b/src/components/global/Side.js index 816c248..8bdca56 100644 --- a/src/components/global/Side.js +++ b/src/components/global/Side.js @@ -61,7 +61,7 @@ const Side = ({ sideOpen, setSideOpen }) => {
  • - {locale === "TUK" ? "Bölümler" : "Разделы"} + {locale === "TKM" ? "Bölümler" : "Разделы"}

    { link
    - {locale === "TUK" ? "Plastik kartlar" : "Пластиковые карты"} + {locale === "TKM" ? "Plastik kartlar" : "Пластиковые карты"}
  • @@ -111,7 +111,7 @@ const Side = ({ sideOpen, setSideOpen }) => {
    link
    - {locale === "TUK" ? "Karzlar" : "Кредиты"} + {locale === "TKM" ? "Karzlar" : "Кредиты"}
  • { link
- {locale === "TUK" ? "Hat ýazmak" : "Написать письмо"} + {locale === "TKM" ? "Hat ýazmak" : "Написать письмо"} @@ -140,7 +140,7 @@ const Side = ({ sideOpen, setSideOpen }) => {
  • - {locale === "TUK" ? "Profil" : "Профиль"} + {locale === "TKM" ? "Profil" : "Профиль"}

  • { link
- {locale === "TUK" ? "Profiliň maglumaty" : "Данные профиля"} + {locale === "TKM" ? "Profiliň maglumaty" : "Данные профиля"} @@ -183,7 +183,7 @@ const Side = ({ sideOpen, setSideOpen }) => { link
- {locale === "TUK" ? "Açar sözüni çalyşmak" : "Смена пароля"} + {locale === "TKM" ? "Açar sözüni çalyşmak" : "Смена пароля"} @@ -198,7 +198,7 @@ const Side = ({ sideOpen, setSideOpen }) => {
link
- {locale === "TUK" ? "Çykmak" : "Выход"} + {locale === "TKM" ? "Çykmak" : "Выход"} @@ -216,7 +216,7 @@ const Side = ({ sideOpen, setSideOpen }) => { arrow
- {locale === "TUK" + {locale === "TKM" ? "Baş sahypa dolanmak" : "Вернутся на главный сайт"} diff --git a/src/components/global/Success.js b/src/components/global/Success.js index 63bc6e5..ffda125 100644 --- a/src/components/global/Success.js +++ b/src/components/global/Success.js @@ -1,16 +1,28 @@ // IMPORT MODULES -import React from "react"; +import React, { useContext } from "react"; +import { Link } from "react-router-dom"; +import { LanguageContext } from "../../backend/LanguageContext"; // IMPORT IMAGES import { ReactComponent as Check } from "../../icons/check.svg"; -const Success = ({ message }) => { +const Success = ({ message, setError }) => { + const { locale } = useContext(LanguageContext); return (

{message}

+ {setError ? ( +
setError(false)} id="back"> + {locale === "TKM" ? "Saýta geç" : "Вернуться на сайт"} +
+ ) : ( + + {locale === "TKM" ? "Saýta geç" : "Вернуться на сайт"} + + )}
); }; diff --git a/src/components/main/TitleGrid.js b/src/components/main/TitleGrid.js index 733a718..6a40b15 100644 --- a/src/components/main/TitleGrid.js +++ b/src/components/main/TitleGrid.js @@ -21,7 +21,7 @@ const TitleGrid = () => {

- {locale === "TUK" ? translation.tuk.title : translation.rus.title} + {locale === "TKM" ? translation.TKM.title : translation.rus.title}

  • @@ -32,7 +32,7 @@ const TitleGrid = () => {

    {locale === "РУС" ? translation.rus.rules[0] - : translation.tuk.rules[0]} + : translation.TKM.rules[0]}

@@ -44,7 +44,7 @@ const TitleGrid = () => {

{locale === "РУС" ? translation.rus.rules[1] - : translation.tuk.rules[1]} + : translation.TKM.rules[1]}

@@ -56,7 +56,7 @@ const TitleGrid = () => {

{locale === "РУС" ? translation.rus.rules[2] - : translation.tuk.rules[2]} + : translation.TKM.rules[2]}

@@ -68,7 +68,7 @@ const TitleGrid = () => {

{locale === "РУС" ? translation.rus.rules[3] - : translation.tuk.rules[3]} + : translation.TKM.rules[3]}

@@ -80,7 +80,7 @@ const TitleGrid = () => {

{locale === "РУС" ? translation.rus.rules[4] - : translation.tuk.rules[4]} + : translation.TKM.rules[4]}

@@ -92,7 +92,7 @@ const TitleGrid = () => {

{locale === "РУС" ? translation.rus.rules[5] - : translation.tuk.rules[5]} + : translation.TKM.rules[5]}

diff --git a/src/components/passwordRec/Stage1.js b/src/components/passwordRec/Stage1.js index 1bfd5ca..991b896 100644 --- a/src/components/passwordRec/Stage1.js +++ b/src/components/passwordRec/Stage1.js @@ -30,11 +30,11 @@ const Stage1 = ({ setRecStage }) => { }} >

- {locale === "TUK" ? "Açar sözüni dikeltmek" : "Восстановление пароля"} + {locale === "TKM" ? "Açar sözüni dikeltmek" : "Восстановление пароля"}

{ /> {validate || error ? ( - {locale === "TUK" + {locale === "TKM" ? "Nädogry email girizildi" : "Введен неверный email"} @@ -83,7 +83,7 @@ const Stage1 = ({ setRecStage }) => { }} >
-

{locale === "TUK" ? "Ugratmak" : "Отправить"}

+

{locale === "TKM" ? "Ugratmak" : "Отправить"}

next
diff --git a/src/components/passwordRec/Stage2.js b/src/components/passwordRec/Stage2.js index cf03a90..e0a0299 100644 --- a/src/components/passwordRec/Stage2.js +++ b/src/components/passwordRec/Stage2.js @@ -41,15 +41,15 @@ const Stage2 = ({ setRecoveryOpen, setRecStage, setLoader, setSuccess }) => { }} >

- {locale === "TUK" ? "Täze açar sözi" : "Новый пароль"} + {locale === "TKM" ? "Täze açar sözi" : "Новый пароль"}

{ /> {error ? ( - {locale === "TUK" + {locale === "TKM" ? "Nädogry kod girizildi" : "Введен неверный код"} @@ -71,11 +71,11 @@ const Stage2 = ({ setRecoveryOpen, setRecStage, setLoader, setSuccess }) => {
{ inputValid.newPassword ? "pass-check" : "pass-check active" } > - {locale === "TUK" + {locale === "TKM" ? "Açar sözi 8 belgiden az bolmadyk we 15 belgiden kän bolmadyk we iň azyndan 1 san, 1 baş harp we 1 setir harp, 1 ýörite bellikden ybarat bolmalydyr. " : "Пароль должен содержать не менее 1 цифры, 1 заглавной и 1 прописной буквы, 1 особого знака, и быть не менее 8 и не более 15 символов в длину."} @@ -111,11 +111,11 @@ const Stage2 = ({ setRecoveryOpen, setRecStage, setLoader, setSuccess }) => {
{ : "pass-check active" } > - {locale === "TUK" + {locale === "TKM" ? "Açar sözler gabat gelmeli" : "Пароли должны совпадать"} @@ -162,7 +162,7 @@ const Stage2 = ({ setRecoveryOpen, setRecStage, setLoader, setSuccess }) => { }} >
-

{locale === "TUK" ? "Üýtget" : "Изменить"}

+

{locale === "TKM" ? "Üýtget" : "Изменить"}

next
diff --git a/src/components/sign/RegForm.js b/src/components/sign/RegForm.js index 03d0bc7..c4247a2 100644 --- a/src/components/sign/RegForm.js +++ b/src/components/sign/RegForm.js @@ -130,16 +130,16 @@ const RegForm = () => { {isLoading ? : ""}

- {locale === "TUK" ? "Hasaba almak" : "Регистрация"} + {locale === "TKM" ? "Hasaba almak" : "Регистрация"}

{
{
{
{
{
{
{
{
{ inputValid.email ? "pass-check" : "pass-check active" } > - {locale === "TUK" + {locale === "TKM" ? "Nädogry email girizildi" : "Введен неверный email"} @@ -363,11 +363,11 @@ const RegForm = () => {
{ inputValid.mobileTel ? "pass-check" : "pass-check active" } > - {locale === "TUK" + {locale === "TKM" ? "Nädogry belgi girizildi" : "Введен неверный номер"} @@ -398,11 +398,11 @@ const RegForm = () => {
{ inputValid.homeTel ? "pass-check" : "pass-check active" } > - {locale === "TUK" + {locale === "TKM" ? "Nädogry belgi girizildi" : "Введен неверный номер"} @@ -435,18 +435,18 @@ const RegForm = () => {

- {locale === "TUK" + {locale === "TKM" ? "Ulanyjynyň maglumatlary" : "Данные пользователя"}

{ inputValid.user ? "pass-check" : "pass-check active" } > - {locale === "TUK" + {locale === "TKM" ? 'Ulanyjy adynda "_" -dan başga ýörite belgiler bolup bilmez.' : `Имя пользователя не может содержать особых знаков, кроме "_"`} @@ -486,11 +486,11 @@ const RegForm = () => { eye
{ e.preventDefault(); @@ -518,7 +518,7 @@ const RegForm = () => { inputValid.password ? "pass-check" : "pass-check active" } > - {locale === "TUK" + {locale === "TKM" ? "Açar sözi 8 belgiden az bolmadyk we 15 belgiden kän bolmadyk we iň azyndan 1 san, 1 baş harp we 1 setir harp, 1 ýörite bellikden ybarat bolmalydyr. " : "Пароль должен содержать не менее 1 цифры, 1 заглавной и 1 прописной буквы, 1 особого знака, и быть не менее 8 и не более 15 символов в длину."} @@ -528,14 +528,14 @@ const RegForm = () => {
{ e.preventDefault(); }} - autoComplete="false" + autoComplete="true" type="password" name="repeat-pass" id="repeat-pass" @@ -551,7 +551,7 @@ const RegForm = () => { inputValid.match ? "pass-check" : "pass-check active" } > - {locale === "TUK" + {locale === "TKM" ? "Açar sözler gabat gelmeli" : "Пароли должны совпадать"} @@ -564,13 +564,13 @@ const RegForm = () => { {error ? ( error === "The email has already been taken." ? (

- {locale === "TUK" + {locale === "TKM" ? "Bu email salgysy eýýäm ulanylýar" : "Этот адресс электронной почты уже используется"}

) : error === "The username has already been taken." ? (

- {locale === "TUK" + {locale === "TKM" ? "Bu ulanyjy ady eýýäm ulanylýar" : "Это имя пользователя уже используется"}

@@ -590,7 +590,7 @@ const RegForm = () => { }} />
- {locale === "TUK" ? ( + {locale === "TKM" ? (

( * ) belgili ähli meýdançalar hökman doldurylmalydyrlar. Ähli meýdançalar latin harplary bilen @@ -629,7 +629,7 @@ const RegForm = () => { >

- {locale === "TUK" ? "Hasaba almak" : "Зарегистрироваться"} + {locale === "TKM" ? "Hasaba almak" : "Зарегистрироваться"}

logout diff --git a/src/components/sign/SignForm.js b/src/components/sign/SignForm.js index 5a87abb..ec9056d 100644 --- a/src/components/sign/SignForm.js +++ b/src/components/sign/SignForm.js @@ -58,7 +58,7 @@ const SignForm = ({ }} >
-

{locale === "TUK" ? "Hasaba gir" : "Вход"}

+

{locale === "TKM" ? "Hasaba gir" : "Вход"}

@@ -149,7 +149,7 @@ const SignForm = ({ setRecoveryOpen(true); }} > - {locale === "TUK" ? "Açar sözüni unutdym" : "Забыли пароль?"} + {locale === "TKM" ? "Açar sözüni unutdym" : "Забыли пароль?"}

diff --git a/src/data/timeSheet.js b/src/data/timeSheet.js index 49b0b5a..5fec4de 100644 --- a/src/data/timeSheet.js +++ b/src/data/timeSheet.js @@ -6,6 +6,4 @@ export const timeSheet = [ "14:00", "15:00", "16:00", - "17:00", - "18:00", ]; diff --git a/src/icons/logo-transp.svg b/src/icons/logo-transp.svg index d6a7f69..6c30173 100644 --- a/src/icons/logo-transp.svg +++ b/src/icons/logo-transp.svg @@ -4,6 +4,6 @@ - + diff --git a/src/localization/branchData.js b/src/localization/branchData.js index dd64aa4..269447a 100644 --- a/src/localization/branchData.js +++ b/src/localization/branchData.js @@ -1,7 +1,7 @@ export const branchData = () => { return { regions: { - TUK: ["Aşgabat şäheri", "Ahal", "Balkan", "Daşoguz", "Lebap", "Mary"], + TKM: ["Aşgabat şäheri", "Ahal", "Balkan", "Daşoguz", "Lebap", "Mary"], RUS: [ "Город Ашхабад", "Ахалский регион", @@ -12,7 +12,7 @@ export const branchData = () => { ], }, Ashgabat: { - TUK: [ + TKM: [ "Merkezi diwan", "Bagtyýarlyk şahamça", "Berkararlyk şahamça", @@ -32,7 +32,7 @@ export const branchData = () => { ], }, Ahal: { - TUK: [ + TKM: [ "Ak bugdaý şahamça", "Bäherden şahamça", "Gökdepe şahamça", @@ -46,11 +46,11 @@ export const branchData = () => { ], }, Balkan: { - TUK: ["Balkan şahamça", "Türkmenbaşy şahamça", "Esenguly şahamça"], + TKM: ["Balkan şahamça", "Türkmenbaşy şahamça", "Esenguly şahamça"], RUS: ["Филиал Балкан", "Филиал Туркменбаши", "Филиал Эсенгулы"], }, Dashoguz: { - TUK: [ + TKM: [ "Daşoguz şahamça", "Köneurgenç şahamça", "Ruhubelent şahamça", @@ -64,7 +64,7 @@ export const branchData = () => { ], }, Lebap: { - TUK: [ + TKM: [ "Lebap şahamça", "Dostluk şahamça", "Galkynyş şahamça", @@ -84,7 +84,7 @@ export const branchData = () => { ], }, Mary: { - TUK: [ + TKM: [ "Mary şahamça", "Ýöleten şahamça", "Murgap şahamça", diff --git a/src/localization/main.js b/src/localization/main.js index 60b1e11..5231a0b 100644 --- a/src/localization/main.js +++ b/src/localization/main.js @@ -12,7 +12,7 @@ export const main = () => { "Не принимайте различные соглашения без тщательного ознакомления", ], }, - tuk: { + TKM: { title: "Internet çeşmeleri ulanylanda aşakdaky howpsuzlyk düzgünlerini berk berjaý etmeklik kompýuteriňizi ýa-da ykjam enjamyňyzy zyýanly programma üpjünçiliginden we gizlin şahsy maglumatlaryň aýan bolmagyndan goranmaga ýardam berer.", rules: [ diff --git a/src/pages/Base.js b/src/pages/Base.js index 0a50f77..7219033 100644 --- a/src/pages/Base.js +++ b/src/pages/Base.js @@ -20,7 +20,7 @@ const Base = () => {

- {locale === "TUK" ? "Hoş geldiňiz" : "Добро пожаловать"},{" "} + {locale === "TKM" ? "Hoş geldiňiz" : "Добро пожаловать"},{" "} {user ? ( user.name ? ( @@ -38,10 +38,10 @@ const Base = () => { ID - {locale === "TUK" ? "Görnüşi" : "Тип"} - {locale === "TUK" ? "Senesi" : "Дата"} - {locale === "TUK" ? "Ýagdaýy" : "Статус"} - {locale === "TUK" ? "Amal" : "Действие"} + {locale === "TKM" ? "Görnüşi" : "Тип"} + {locale === "TKM" ? "Senesi" : "Дата"} + {locale === "TKM" ? "Ýagdaýy" : "Статус"} + {locale === "TKM" ? "Amal" : "Действие"} {user ? ( @@ -62,23 +62,23 @@ const Base = () => { } > {el.status === "1" - ? locale === "TUK" + ? locale === "TKM" ? "Ugradyldy" : "Отправлено" : el.status === "2" - ? locale === "TUK" + ? locale === "TKM" ? "Kabul edildi" : "Принята" : el.status === "3" - ? locale === "TUK" + ? locale === "TKM" ? "Görülyar" : "На стадии рассмотрения" : el.status === "4" - ? locale === "TUK" + ? locale === "TKM" ? "Tassyklandy" : "Утверждено" : el.status === "5" - ? locale === "TUK" + ? locale === "TKM" ? "Ret edildi" : "Отказано" : ""} @@ -108,7 +108,7 @@ const Base = () => { ) : ( - {locale === "TUK" + {locale === "TKM" ? "Tabşyrlan ýüzlenme ýok" : "Заявок нет"} @@ -125,7 +125,7 @@ const Base = () => { ) : ( - {locale === "TUK" + {locale === "TKM" ? "Tabşyrlan ýüzlenme ýok" : "Заявок на карты нет"} @@ -155,23 +155,23 @@ const Base = () => { } > {el.status === "1" - ? locale === "TUK" + ? locale === "TKM" ? "Ugradyldy" : "Отправлено" : el.status === "2" - ? locale === "TUK" + ? locale === "TKM" ? "Kabul edildi" : "Принята" : el.status === "3" - ? locale === "TUK" + ? locale === "TKM" ? "Görülyar" : "На стадии рассмотрения" : el.status === "4" - ? locale === "TUK" + ? locale === "TKM" ? "Kart çykaryldy" : "Карта выпущена" : el.status === "5" - ? locale === "TUK" + ? locale === "TKM" ? "Ret edildi" : "Отказано" : ""} diff --git a/src/pages/Cards.js b/src/pages/Cards.js index d96af77..fec0681 100644 --- a/src/pages/Cards.js +++ b/src/pages/Cards.js @@ -24,7 +24,6 @@ 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"; @@ -37,25 +36,27 @@ const Cards = () => { {error ? ( ) : null} {success ? ( ) : null} {

- {locale === "TUK" + {locale === "TKM" ? "Kart almak üçin onlaýn-ýüzlenme" : "Онлайн-заявка для получения карты"}

@@ -88,7 +89,7 @@ const Cards = () => { add

- {locale === "TUK" ? "Ýüzlenme doldurmak" : "Заполнить заявку"} + {locale === "TKM" ? "Ýüzlenme doldurmak" : "Заполнить заявку"}

@@ -97,10 +98,10 @@ const Cards = () => { ID - {locale === "TUK" ? "Görnüşi" : "Тип"} - {locale === "TUK" ? "Senesi" : "Дата"} - {locale === "TUK" ? "Ýagdaýy" : "Статус"} - {locale === "TUK" ? "Amal" : "Действие"} + {locale === "TKM" ? "Görnüşi" : "Тип"} + {locale === "TKM" ? "Senesi" : "Дата"} + {locale === "TKM" ? "Ýagdaýy" : "Статус"} + {locale === "TKM" ? "Amal" : "Действие"} {user ? ( user.online_card.length !== 0 ? ( @@ -121,23 +122,23 @@ const Cards = () => { } > {el.status === "1" - ? locale === "TUK" + ? locale === "TKM" ? "Ugradyldy" : "Отправлено" : el.status === "2" - ? locale === "TUK" + ? locale === "TKM" ? "Kabul edildi" : "Принята" : el.status === "3" - ? locale === "TUK" + ? locale === "TKM" ? "Görülyar" : "На стадии рассмотрения" : el.status === "4" - ? locale === "TUK" + ? locale === "TKM" ? "Kart çykaryldy" : "Карта выпущена" : el.status === "5" - ? locale === "TUK" + ? locale === "TKM" ? "Ret edildi" : "Отказано" : ""} @@ -165,7 +166,7 @@ const Cards = () => { ) : ( - {locale === "TUK" + {locale === "TKM" ? "Tabşyrlan ýüzlenme ýok" : "Заявок на карты нет"} @@ -178,7 +179,7 @@ const Cards = () => { ) : ( - {locale === "TUK" + {locale === "TKM" ? "Tabşyrlan ýüzlenme ýok" : "Заявок на карты нет"} diff --git a/src/pages/ContactUs.js b/src/pages/ContactUs.js index 6023e77..65cc39f 100644 --- a/src/pages/ContactUs.js +++ b/src/pages/ContactUs.js @@ -50,30 +50,32 @@ const ContactUs = () => { {error ? ( ) : null} {success ? ( ) : null}

- {locale === "TUK" ? "Hat ýazmak" : "Написать письмо"} + {locale === "TKM" ? "Hat ýazmak" : "Написать письмо"}

{ @@ -86,17 +88,17 @@ const ContactUs = () => {
{