From cca9cf6e5eb661592983682b5d384f4e72c8fd25 Mon Sep 17 00:00:00 2001 From: masaaki Date: Tue, 5 Dec 2023 02:40:09 +0000 Subject: [PATCH] =?UTF-8?q?Merged=20PR=20601:=20=E3=83=98=E3=83=AB?= =?UTF-8?q?=E3=83=97=E3=83=9A=E3=83=BC=E3=82=B8=E7=94=BB=E9=9D=A2=E5=AE=9F?= =?UTF-8?q?=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 概要 [Task3204: ヘッダ修正対応](https://paruru.nds-tyo.co.jp:8443/tfs/ReciproCollection/fa4924a4-d079-4fab-9fb5-a9a11eb205f0/_workitems/edit/3204) - ヘルプページを追加して、ヘッダのタブに表示されるようにしました。 - ヘッダのタブはロールの制限なく見えるようにしています。 - ヘルプページからさらに個別のヘルプへのリンクは仮のURLにしています。 - 動作としては別タブで開くようにしています。 ## レビューポイント - パスをタブ名に合わせて`/support`としましたが不自然な点はないでしょうか？ - 仮のURLがxxxとなっているため、別タブで開かれたページがNot Foundとなってしまっていますが問題ないでしょうか？ ## UIの変更 - [Task3204](https://ndstokyo.sharepoint.com/:f:/r/sites/Piranha/Shared%20Documents/General/OMDS/%E3%82%B9%E3%82%AF%E3%83%AA%E3%83%BC%E3%83%B3%E3%82%B7%E3%83%A7%E3%83%83%E3%83%88/Task3204?csf=1&web=1&e=N9yn0D) ## 動作確認状況 - ローカルで確認 --- dictation_client/src/AppRouter.tsx | 5 ++ .../src/components/header/constants.ts | 6 ++ .../src/components/header/types.ts | 6 +- .../src/components/header/utils.ts | 1 + .../src/pages/SupportPage/index.tsx | 90 +++++++++++++++++++ dictation_client/src/styles/app.module.scss | 4 +- dictation_client/src/translation/de.json | 16 +++- dictation_client/src/translation/en.json | 16 +++- dictation_client/src/translation/es.json | 16 +++- dictation_client/src/translation/fr.json | 16 +++- 10 files changed, 168 insertions(+), 8 deletions(-) create mode 100644 dictation_client/src/pages/SupportPage/index.tsx diff --git a/dictation_client/src/AppRouter.tsx b/dictation_client/src/AppRouter.tsx index 68d22ed..802e008 100644 --- a/dictation_client/src/AppRouter.tsx +++ b/dictation_client/src/AppRouter.tsx @@ -23,6 +23,7 @@ import AccountPage from "pages/AccountPage"; import AcceptToUsePage from "pages/TermsPage"; import { TemplateFilePage } from "pages/TemplateFilePage"; import { AccountDeleteSuccess } from "pages/AccountPage/accountDeleteSuccess"; +import SupportPage from "pages/SupportPage"; const AppRouter: React.FC = () => ( @@ -81,6 +82,10 @@ const AppRouter: React.FC = () => ( element={} />} /> } /> + } />} + /> } /> diff --git a/dictation_client/src/components/header/constants.ts b/dictation_client/src/components/header/constants.ts index 7dc14fe..f3e4f53 100644 --- a/dictation_client/src/components/header/constants.ts +++ b/dictation_client/src/components/header/constants.ts @@ -7,6 +7,7 @@ export const HEADER_MENUS_LICENSE = "License"; export const HEADER_MENUS_DICTATIONS = "Dictations"; export const HEADER_MENUS_WORKFLOW = "Workflow"; export const HEADER_MENUS_PARTNER = "Partners"; +export const HEADER_MENUS_SUPPORT = "Support"; export const HEADER_MENUS: { key: HeaderMenus; @@ -43,6 +44,11 @@ export const HEADER_MENUS: { label: getTranslationID("common.label.headerPartners"), path: "/partners", }, + { + key: HEADER_MENUS_SUPPORT, + label: getTranslationID("common.label.headerSupport"), + path: "/support", + }, ]; export const HEADER_NAME = getTranslationID("common.label.headerName"); diff --git a/dictation_client/src/components/header/types.ts b/dictation_client/src/components/header/types.ts index 622b15b..4170c3a 100644 --- a/dictation_client/src/components/header/types.ts +++ b/dictation_client/src/components/header/types.ts @@ -8,7 +8,8 @@ export type HeaderMenus = | "License" | "Dictations" | "Workflow" - | "Partners"; + | "Partners" + | "Support"; // ログイン後に遷移しうるパス export type LoginedPaths = @@ -17,4 +18,5 @@ export type LoginedPaths = | "/license" | "/dictations" | "/workflow" - | "/partners"; + | "/partners" + | "/support"; diff --git a/dictation_client/src/components/header/utils.ts b/dictation_client/src/components/header/utils.ts index 10aa168..a515b5b 100644 --- a/dictation_client/src/components/header/utils.ts +++ b/dictation_client/src/components/header/utils.ts @@ -20,6 +20,7 @@ export const isLoginPaths = (d: string): d is LoginedPaths => { case "/dictations": case "/workflow": case "/partners": + case "/support": return true; default: { // eslint-disable-next-line @typescript-eslint/no-unused-vars diff --git a/dictation_client/src/pages/SupportPage/index.tsx b/dictation_client/src/pages/SupportPage/index.tsx new file mode 100644 index 0000000..b5d2cc8 --- /dev/null +++ b/dictation_client/src/pages/SupportPage/index.tsx @@ -0,0 +1,90 @@ +import React from "react"; +import Header from "components/header"; +import { UpdateTokenTimer } from "components/auth/updateTokenTimer"; +import { useTranslation } from "react-i18next"; +import { getTranslationID } from "translation"; +import styles from "styles/app.module.scss"; + +const SupportPage: React.FC = () => { + const { t } = useTranslation(); + + return ( +
+
+ +
+
+
+

+ {t(getTranslationID("supportPage.label.title"))} +

+
+ +
+ +
+
+
+
+ ); +}; +export default SupportPage; diff --git a/dictation_client/src/styles/app.module.scss b/dictation_client/src/styles/app.module.scss index a1ff500..a629977 100644 --- a/dictation_client/src/styles/app.module.scss +++ b/dictation_client/src/styles/app.module.scss @@ -2484,8 +2484,8 @@ tr.isSelected .menuInTable li a.isDisable { } .formChange ul.chooseMember li input:checked + label:hover, .formChange ul.holdMember li input:checked + label:hover { - background: #e6e6e6 url(../images/arrow_circle_right.svg) no-repeat right - center; + background: #e6e6e6 url(../assets/images/arrow_circle_right.svg) no-repeat + right center; background-size: 1.3rem; } .formChange > p { diff --git a/dictation_client/src/translation/de.json b/dictation_client/src/translation/de.json index 50957fc..fc8ab14 100644 --- a/dictation_client/src/translation/de.json +++ b/dictation_client/src/translation/de.json @@ -25,6 +25,7 @@ "headerDictations": "(de)Dictations", "headerWorkflow": "(de)Workflow", "headerPartners": "(de)Partners", + "headerSupport": "(de)Support", "tier1": "(de)Admin", "tier2": "(de)BC", "tier3": "(de)Distributor", @@ -531,5 +532,18 @@ "forOdds": "(de)for ODDS.", "button": "(de)Continue" } + }, + "supportPage": { + "label": { + "title": "(de)Support", + "howToUse": "(de)How to use the system", + "supportPageEnglish": "OMDS Cloud User Guide", + "supportPageGerman": "OMDS Cloud Benutzerhandbuch", + "supportPageFrench": "OMDS Cloud Mode d'emploi", + "supportPageSpanish": "OMDS Cloud Guía del usuario" + }, + "text": { + "notResolved": "(de)If the problem persists even after referring to the user guide, please contact a higher-level person in charge." + } } -} +} \ No newline at end of file diff --git a/dictation_client/src/translation/en.json b/dictation_client/src/translation/en.json index 0bde925..7ab63f4 100644 --- a/dictation_client/src/translation/en.json +++ b/dictation_client/src/translation/en.json @@ -25,6 +25,7 @@ "headerDictations": "Dictations", "headerWorkflow": "Workflow", "headerPartners": "Partners", + "headerSupport": "Support", "tier1": "Admin", "tier2": "BC", "tier3": "Distributor", @@ -531,5 +532,18 @@ "forOdds": "for ODDS.", "button": "Continue" } + }, + "supportPage": { + "label": { + "title": "Support", + "howToUse": "How to use the system", + "supportPageEnglish": "OMDS Cloud User Guide", + "supportPageGerman": "OMDS Cloud Benutzerhandbuch", + "supportPageFrench": "OMDS Cloud Mode d'emploi", + "supportPageSpanish": "OMDS Cloud Guía del usuario" + }, + "text": { + "notResolved": "If the problem persists even after referring to the user guide, please contact a higher-level person in charge." + } } -} +} \ No newline at end of file diff --git a/dictation_client/src/translation/es.json b/dictation_client/src/translation/es.json index 481c79d..f495bcb 100644 --- a/dictation_client/src/translation/es.json +++ b/dictation_client/src/translation/es.json @@ -25,6 +25,7 @@ "headerDictations": "(es)Dictations", "headerWorkflow": "(es)Workflow", "headerPartners": "(es)Partners", + "headerSupport": "(es)Support", "tier1": "(es)Admin", "tier2": "(es)BC", "tier3": "(es)Distributor", @@ -531,5 +532,18 @@ "forOdds": "(es)for ODDS.", "button": "(es)Continue" } + }, + "supportPage": { + "label": { + "title": "(es)Support", + "howToUse": "(es)How to use the system", + "supportPageEnglish": "OMDS Cloud User Guide", + "supportPageGerman": "OMDS Cloud Benutzerhandbuch", + "supportPageFrench": "OMDS Cloud Mode d'emploi", + "supportPageSpanish": "OMDS Cloud Guía del usuario" + }, + "text": { + "notResolved": "(es)If the problem persists even after referring to the user guide, please contact a higher-level person in charge." + } } -} +} \ No newline at end of file diff --git a/dictation_client/src/translation/fr.json b/dictation_client/src/translation/fr.json index 6ffc1bd..ca66c3f 100644 --- a/dictation_client/src/translation/fr.json +++ b/dictation_client/src/translation/fr.json @@ -25,6 +25,7 @@ "headerDictations": "(fr)Dictations", "headerWorkflow": "(fr)Workflow", "headerPartners": "(fr)Partners", + "headerSupport": "(fr)Support", "tier1": "(fr)Admin", "tier2": "(fr)BC", "tier3": "(fr)Distributor", @@ -531,5 +532,18 @@ "forOdds": "(fr)for ODDS.", "button": "(fr)Continue" } + }, + "supportPage": { + "label": { + "title": "(fr)Support", + "howToUse": "(fr)How to use the system", + "supportPageEnglish": "OMDS Cloud User Guide", + "supportPageGerman": "OMDS Cloud Benutzerhandbuch", + "supportPageFrench": "OMDS Cloud Mode d'emploi", + "supportPageSpanish": "OMDS Cloud Guía del usuario" + }, + "text": { + "notResolved": "(fr)If the problem persists even after referring to the user guide, please contact a higher-level person in charge." + } } -} +} \ No newline at end of file