From eddf8cd81a6774013f7ccdc78c16c07bef989249 Mon Sep 17 00:00:00 2001 From: Komek Hayytnazarov Date: Tue, 13 Dec 2022 13:55:02 +0500 Subject: [PATCH] faqs added --- src/i18n/en.js | 2 + src/i18n/ru.js | 2 + src/i18n/tm.js | 11 ++- src/router/index.js | 21 +----- src/stores/top-menu.js | 5 ++ src/views/contracts/Main.vue | 2 +- src/views/contracts/yedek.vue | 126 ---------------------------------- src/views/faq/Main.vue | 67 ++++++++++++++++++ src/views/user/list/Main.vue | 8 +-- 9 files changed, 88 insertions(+), 156 deletions(-) delete mode 100644 src/views/contracts/yedek.vue create mode 100644 src/views/faq/Main.vue diff --git a/src/i18n/en.js b/src/i18n/en.js index 5035b76..02668ae 100644 --- a/src/i18n/en.js +++ b/src/i18n/en.js @@ -192,4 +192,6 @@ export const locale = { INFO_STEP_1: "ШАГ 1. Заполните профиль. Чтобы открыть форму, нажмите кнопку «Редактировать».", INFO_STEP_2: "ШАГ 2. Подайте документы онлайн, нажав кнопку «Подать заявку».", + + FAQ: "Frequently asked questions", }; diff --git a/src/i18n/ru.js b/src/i18n/ru.js index b4f4aab..4b06b45 100644 --- a/src/i18n/ru.js +++ b/src/i18n/ru.js @@ -191,4 +191,6 @@ export const locale = { INFO_STEP_2: "ШАГ 2. Подайте документы онлайн, нажав кнопку «Подать заявку».", INFO_FORM: `Заполните все поля. Проверьте правильность внесенной информации, поскольку все данные из этого раздела автоматически отобразятся в «Вопроснике», необходимого для регистрации. Обратите внимание, что Вы сможете подать документы онлайн только когда заполнены все поля в этом разделе.`, + + FAQ: "Часто задаваемые вопросы", }; diff --git a/src/i18n/tm.js b/src/i18n/tm.js index d29f15c..1e52b2c 100644 --- a/src/i18n/tm.js +++ b/src/i18n/tm.js @@ -164,14 +164,11 @@ export const locale = { REGISTER_DATE: "Hasaba alyş senesi", STATUS: "Ýagdaýy", REMARK: "Bellik", - APPLICATION_ACCEPTED_BY: - "Arza admin: {accepted_by} tarapyndan kabul edildi.", + APPLICATION_ACCEPTED_BY: "Arza admin: {accepted_by} tarapyndan kabul edildi.", APPLICATION_ACCEPTED_DATE: "Kabul edilen senesi: {accepted_date}.", - APPLICATION_APPROVED_BY: - "Arza admin: {approved_by} tarapyndan tassyklandy.", + APPLICATION_APPROVED_BY: "Arza admin: {approved_by} tarapyndan tassyklandy.", APPLICATION_APPROVED_DATE: "Tassyklanan senesi: {approved_date}.", - APPLICATION_NEEDS_TO_BE_IMPROVED_TEXT_INTRO: - "Siziň arzaňyzda düzedilmeli kemçilikler bar.", + APPLICATION_NEEDS_TO_BE_IMPROVED_TEXT_INTRO: "Siziň arzaňyzda düzedilmeli kemçilikler bar.", LEG_BTN_DRAFT: "Arza geç", LEG_BTN_REFINE: "Arza geç", @@ -191,4 +188,6 @@ export const locale = { INFO_STEP_2: `Ädim 2. "Arza tabşyrmak" düwmesine basyp, resminamalary onlaýn tabşyryň.`, INFO_FORM: `Ähli meýdançalary dolduryň. Girizilen maglumatlaryň dogrulygyny barlaň, sebäbi bu bölümdäki maglumatlar awtomatiki usulda hasaba alynmak üçin zerur bolan "Sowalnama" geçer. Üns beriň, şu bölümde ähli meýdançalary dolduranyňyzdan soň resminamalary onlaýn tabşyrmaga mümkinçilik dörär.`, + + FAQ: "Sorag-jogap", }; diff --git a/src/router/index.js b/src/router/index.js index 9a180b5..9128659 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -36,26 +36,11 @@ const routes = [ name: "profile-form", component: () => import("../views/profile-forms/ProfileForm.vue"), }, - /* { - path: "contacts-form", - name: "contacts", - component: () => import("../views/profile-forms/Contacts.vue"), - }, { - path: "bank-form", - name: "bank-account", - component: () => import("../views/profile-forms/BankAccount.vue"), + path: "faq", + name: "faq", + component: () => import("../views/faq/Main.vue"), }, - { - path: "business-form", - name: "business", - component: () => import("../views/profile-forms/ProfileForm.vue"), - }, - { - path: "company-form", - name: "company", - component: () => import("../views/profile-forms/Company.vue"), - }, */ { path: "contracts", name: "contracts", diff --git a/src/stores/top-menu.js b/src/stores/top-menu.js index e43525c..a64acba 100644 --- a/src/stores/top-menu.js +++ b/src/stores/top-menu.js @@ -23,6 +23,11 @@ export const useTopMenuStore = defineStore("topMenu", { pageName: "create-ticket", title: "NEW_TICKET", }, + { + icon: "FolderIcon", + pageName: "faq", + title: "FAQ", + }, ], }, { diff --git a/src/views/contracts/Main.vue b/src/views/contracts/Main.vue index fd718d0..7298822 100644 --- a/src/views/contracts/Main.vue +++ b/src/views/contracts/Main.vue @@ -12,7 +12,7 @@
- {{ $t('LOADING') }} .. + {{ $t('LOADING') }} ...
diff --git a/src/views/contracts/yedek.vue b/src/views/contracts/yedek.vue deleted file mode 100644 index 27c4cac..0000000 --- a/src/views/contracts/yedek.vue +++ /dev/null @@ -1,126 +0,0 @@ - - - - diff --git a/src/views/faq/Main.vue b/src/views/faq/Main.vue new file mode 100644 index 0000000..108dd6d --- /dev/null +++ b/src/views/faq/Main.vue @@ -0,0 +1,67 @@ + + + + \ No newline at end of file diff --git a/src/views/user/list/Main.vue b/src/views/user/list/Main.vue index 92c4478..89ab462 100644 --- a/src/views/user/list/Main.vue +++ b/src/views/user/list/Main.vue @@ -90,6 +90,7 @@ const onAddNewUser = () => { const fetchUsers = async () => { try { + isLoading.value = true; // clear array users.value.splice(0); @@ -97,18 +98,15 @@ const fetchUsers = async () => { users.value = [...response['data']]; - console.log("response fetchUsers: ", users.value); - + isLoading.value = false; } catch (e) { console.log("error fetchUsers: ", e); + isLoading.value = false; } } onBeforeMount(async () => { - isLoading.value = true; await fetchUsers(); - - isLoading.value = false; }); \ No newline at end of file