From f1e8167629138986975a43afb4fc9a647fe3dbdf Mon Sep 17 00:00:00 2001 From: "Georgi Ganchev @7DIGIT" Date: Thu, 4 Jan 2024 13:14:42 +0200 Subject: [PATCH 1/4] Add: user guide button to AdminProfile block --- src/blocks/AdminProfile/AdminProfile.jsx | 10 ++++++++++ src/blocks/AdminProfile/locales/en.json | 3 ++- src/blocks/AdminProfile/locales/kk.json | 3 ++- src/blocks/AdminProfile/locales/ru.json | 3 ++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/blocks/AdminProfile/AdminProfile.jsx b/src/blocks/AdminProfile/AdminProfile.jsx index 7abdcfe..1f5e97c 100644 --- a/src/blocks/AdminProfile/AdminProfile.jsx +++ b/src/blocks/AdminProfile/AdminProfile.jsx @@ -51,6 +51,16 @@ export const AdminProfile = () => { classes="admin-profile__grid__item__button " onClick={() => handleRedirect("profile/details/edit")} /> + + window.open( + "https://7digit-1.gitbook.io/usupport/y0yJCW2nZ6Sb52p4arjv", + "_blank" + ) + } + /> {/*

{t("other")}

diff --git a/src/blocks/AdminProfile/locales/en.json b/src/blocks/AdminProfile/locales/en.json index 0a93ddd..772e6c1 100644 --- a/src/blocks/AdminProfile/locales/en.json +++ b/src/blocks/AdminProfile/locales/en.json @@ -7,5 +7,6 @@ "notifications_settings_button_label": "Notification settings", "contact_us_button_label": "Contact us", "privacy_policy_button_label": "Privacy Policy", - "FAQ_button_label": "FAQ" + "FAQ_button_label": "FAQ", + "user_guide": "Platform usage" } diff --git a/src/blocks/AdminProfile/locales/kk.json b/src/blocks/AdminProfile/locales/kk.json index 46d66e2..b6236ed 100644 --- a/src/blocks/AdminProfile/locales/kk.json +++ b/src/blocks/AdminProfile/locales/kk.json @@ -7,5 +7,6 @@ "notifications_settings_button_label": "Хабарландыру баптаулары", "contact_us_button_label": "Бізге хабарласыңыз", "privacy_policy_button_label": "Құпиялық саясаты", - "FAQ_button_label": "Жиі қойылатын сұрақтар" + "FAQ_button_label": "Жиі қойылатын сұрақтар", + "user_guide": "Платформа Нұсқаулығы" } diff --git a/src/blocks/AdminProfile/locales/ru.json b/src/blocks/AdminProfile/locales/ru.json index 985e352..7fffdd0 100644 --- a/src/blocks/AdminProfile/locales/ru.json +++ b/src/blocks/AdminProfile/locales/ru.json @@ -7,5 +7,6 @@ "notifications_settings_button_label": "Настройки уведомлений", "contact_us_button_label": "Свяжитесь с нами", "privacy_policy_button_label": "Политика конфиденциальности", - "FAQ_button_label": "Часто задаваемые вопросы" + "FAQ_button_label": "Часто задаваемые вопросы", + "user_guide": "Руководство по платформе" } From fd84373dcef3ae98870cea7f9757c30fa1fb83b3 Mon Sep 17 00:00:00 2001 From: "Georgi Ganchev @7DIGIT" Date: Thu, 4 Jan 2024 13:15:07 +0200 Subject: [PATCH 2/4] Refactor: submodule commit hash --- USupport-components-library | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/USupport-components-library b/USupport-components-library index 9758428..edf2815 160000 --- a/USupport-components-library +++ b/USupport-components-library @@ -1 +1 @@ -Subproject commit 9758428c12d36669a1b0db4c071418d8688aef03 +Subproject commit edf2815e0c76b45658d3a01428e29dae3f01475f From 672d1d40c975fe90a886aa54a8a9e6d134e8eabc Mon Sep 17 00:00:00 2001 From: "Georgi Ganchev @7DIGIT" Date: Mon, 8 Jan 2024 17:18:19 +0200 Subject: [PATCH 3/4] Add: git book url to the environment variables --- .env.development | 5 +++-- .env.production | 5 ++++- .env.staging | 3 ++- src/blocks/AdminProfile/AdminProfile.jsx | 11 ++++------- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.env.development b/.env.development index fd48cf5..c15cfb6 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,5 @@ -VITE_API_ENDPOINT=https://staging.usupport.online/api +VITE_API_ENDPOINT=http://localhost:3000/api VITE_CMS_API_URL=https://staging.usupport.online/cms/api VITE_AMAZON_S3_BUCKET=https://usupport-staging.s3.eu-central-1.amazonaws.com -VITE_WEBSITE_URL=http://localhost:5175 \ No newline at end of file +VITE_WEBSITE_URL=http://localhost:5175 +VITE_GIT_BOOK_URL="https://7digit-1.gitbook.io/usupport/y0yJCW2nZ6Sb52p4arjv" \ No newline at end of file diff --git a/.env.production b/.env.production index f1c8087..3d1ecd3 100644 --- a/.env.production +++ b/.env.production @@ -1,2 +1,5 @@ VITE_API_ENDPOINT= -VITE_CMS_API_URL= \ No newline at end of file +VITE_CMS_API_URL= +VITE_AMAZON_S3_BUCKET= +VITE_WEBSITE_URL= +VITE_GIT_BOOK_URL="https://7digit-1.gitbook.io/usupport/y0yJCW2nZ6Sb52p4arjv" \ No newline at end of file diff --git a/.env.staging b/.env.staging index e7b57ce..633bb68 100644 --- a/.env.staging +++ b/.env.staging @@ -1,4 +1,5 @@ VITE_API_ENDPOINT=https://staging.usupport.online/api VITE_CMS_API_URL=https://staging.usupport.online/cms/api VITE_AMAZON_S3_BUCKET=https://usupport-staging.s3.eu-central-1.amazonaws.com -VITE_WEBSITE_URL=https://staging.usupport.online \ No newline at end of file +VITE_WEBSITE_URL=https://staging.usupport.online +VITE_GIT_BOOK_URL="https://7digit-1.gitbook.io/usupport/y0yJCW2nZ6Sb52p4arjv" \ No newline at end of file diff --git a/src/blocks/AdminProfile/AdminProfile.jsx b/src/blocks/AdminProfile/AdminProfile.jsx index 1f5e97c..630b8e1 100644 --- a/src/blocks/AdminProfile/AdminProfile.jsx +++ b/src/blocks/AdminProfile/AdminProfile.jsx @@ -8,8 +8,10 @@ import { ButtonSelector, } from "@USupport-components-library/src"; -import "./admin-profile.scss"; import { useGetAdminData } from "#hooks"; +import "./admin-profile.scss"; + +const GIT_BOOK_URL = `${import.meta.env.VITE_GIT_BOOK_URL}`; /** * AdminProfile @@ -54,12 +56,7 @@ export const AdminProfile = () => { - window.open( - "https://7digit-1.gitbook.io/usupport/y0yJCW2nZ6Sb52p4arjv", - "_blank" - ) - } + onClick={() => window.open(GIT_BOOK_URL, "_blank")} /> {/* From 5b69a179e6d63197a5d0f4d53b7801f04edd186b Mon Sep 17 00:00:00 2001 From: "Georgi Ganchev @7DIGIT" Date: Fri, 12 Jan 2024 14:44:33 +0200 Subject: [PATCH 4/4] Refactor: Git Book URL in environment files --- .env.development | 2 +- .env.production | 2 +- .env.staging | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.env.development b/.env.development index c15cfb6..d32f517 100644 --- a/.env.development +++ b/.env.development @@ -2,4 +2,4 @@ VITE_API_ENDPOINT=http://localhost:3000/api VITE_CMS_API_URL=https://staging.usupport.online/cms/api VITE_AMAZON_S3_BUCKET=https://usupport-staging.s3.eu-central-1.amazonaws.com VITE_WEBSITE_URL=http://localhost:5175 -VITE_GIT_BOOK_URL="https://7digit-1.gitbook.io/usupport/y0yJCW2nZ6Sb52p4arjv" \ No newline at end of file +VITE_GIT_BOOK_URL=https://7digit-1.gitbook.io/usupport/y0yJCW2nZ6Sb52p4arjv \ No newline at end of file diff --git a/.env.production b/.env.production index 3d1ecd3..42e16c0 100644 --- a/.env.production +++ b/.env.production @@ -2,4 +2,4 @@ VITE_API_ENDPOINT= VITE_CMS_API_URL= VITE_AMAZON_S3_BUCKET= VITE_WEBSITE_URL= -VITE_GIT_BOOK_URL="https://7digit-1.gitbook.io/usupport/y0yJCW2nZ6Sb52p4arjv" \ No newline at end of file +VITE_GIT_BOOK_URL=https://7digit-1.gitbook.io/usupport/y0yJCW2nZ6Sb52p4arjv \ No newline at end of file diff --git a/.env.staging b/.env.staging index 633bb68..57585b6 100644 --- a/.env.staging +++ b/.env.staging @@ -2,4 +2,4 @@ VITE_API_ENDPOINT=https://staging.usupport.online/api VITE_CMS_API_URL=https://staging.usupport.online/cms/api VITE_AMAZON_S3_BUCKET=https://usupport-staging.s3.eu-central-1.amazonaws.com VITE_WEBSITE_URL=https://staging.usupport.online -VITE_GIT_BOOK_URL="https://7digit-1.gitbook.io/usupport/y0yJCW2nZ6Sb52p4arjv" \ No newline at end of file +VITE_GIT_BOOK_URL=https://7digit-1.gitbook.io/usupport/y0yJCW2nZ6Sb52p4arjv \ No newline at end of file