+
-
);
diff --git a/dictation_client/src/styles/GlobalStyle.css b/dictation_client/src/styles/GlobalStyle.css
new file mode 100644
index 0000000..4262f2a
--- /dev/null
+++ b/dictation_client/src/styles/GlobalStyle.css
@@ -0,0 +1,194 @@
+html,
+body,
+div,
+span,
+applet,
+object,
+iframe,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+blockquote,
+pre,
+a,
+abbr,
+acronym,
+address,
+big,
+cite,
+code,
+del,
+dfn,
+em,
+img,
+ins,
+kbd,
+q,
+s,
+samp,
+small,
+strike,
+strong,
+sub,
+sup,
+tt,
+var,
+b,
+u,
+i,
+center,
+dl,
+dt,
+dd,
+ol,
+ul,
+li,
+fieldset,
+form,
+label,
+legend,
+table,
+caption,
+tbody,
+tfoot,
+thead,
+tr,
+th,
+td,
+article,
+aside,
+canvas,
+details,
+embed,
+figure,
+figcaption,
+footer,
+header,
+hgroup,
+main,
+menu,
+nav,
+output,
+ruby,
+section,
+summary,
+time,
+mark,
+audio,
+video {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-size: 100%;
+ font: inherit;
+ vertical-align: baseline;
+}
+
+/* HTML5 display-role reset for older browsers */
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+menu,
+nav,
+section {
+ display: block;
+}
+
+/* HTML5 hidden-attribute fix for newer browsers */
+*[hidden] {
+ display: none;
+}
+
+body {
+ line-height: 1;
+}
+
+ol,
+ul {
+ list-style: none;
+}
+
+blockquote,
+q {
+ quotes: none;
+}
+
+blockquote:before,
+blockquote:after,
+q:before,
+q:after {
+ content: "";
+ content: none;
+}
+
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
+
+button {
+ appearance: none;
+ padding: 0;
+ border: none;
+ outline: none;
+ background-color: transparent;
+ cursor: pointer;
+}
+
+html {
+ color: #333333;
+ font-size: 16px;
+ line-height: 1.7;
+ letter-spacing: 0;
+ font-weight: normal;
+}
+
+body {
+ font-family: Helvetica Neue, Helvetica, Arial, sans-serif;
+ position: relative;
+}
+
+h1 {
+ font-size: 2.4rem;
+ line-height: 3.14rem;
+ letter-spacing: 0.07rem;
+ font-weight: normal;
+}
+
+h2 {
+ font-size: 2rem;
+ line-height: 2.57rem;
+ letter-spacing: 0.07rem;
+ font-weight: normal;
+}
+
+h3 {
+ font-size: 1.6rem;
+ line-height: 2rem;
+ letter-spacing: 0.07rem;
+ font-weight: normal;
+}
+
+h4 {
+ font-size: 1.2rem;
+ line-height: 1.57rem;
+ letter-spacing: 0.07rem;
+ font-weight: normal;
+}
+
+h5 {
+ font-size: 1.1rem;
+ line-height: 1.57rem;
+ letter-spacing: 0.06rem;
+ font-weight: normal;
+}
diff --git a/dictation_client/src/styles/GlobalStyle.ts b/dictation_client/src/styles/GlobalStyle.ts
deleted file mode 100644
index 71774c9..0000000
--- a/dictation_client/src/styles/GlobalStyle.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { createGlobalStyle } from "styled-components";
-
-/* eslint-disable-next-line @typescript-eslint/naming-convention */
-export const GlobalStyle = createGlobalStyle`
-`;
diff --git a/dictation_client/src/translation/de.json b/dictation_client/src/translation/de.json
index d4181bb..a571087 100644
--- a/dictation_client/src/translation/de.json
+++ b/dictation_client/src/translation/de.json
@@ -1,11 +1,21 @@
{
+ "common": {
+ "label": {
+ "headerTitle": "(de)ODMS Cloud",
+ "copyRight": "(de)OM Digital Solutions 2023"
+ }
+ },
"topPage": {
"label": {
- "displayLanguage": "(de)Display Language",
+ "displayLanguage": "(de)Display language",
"languageEnglish": "(de)English",
"languageGerman": "(de)German",
+ "languageSpanish": "(de)Spanish",
"languageFrench": "(de)French",
- "languageSpanish": "(de)Spanish"
+ "alreadyHaveAccount": "(de)Already have an account?",
+ "signInButton": "(de)Sign in",
+ "newUser": "(de)New user?",
+ "signUpButton": "(de)Create a new account"
}
}
}
diff --git a/dictation_client/src/translation/en.json b/dictation_client/src/translation/en.json
index 35145ba..26c0536 100644
--- a/dictation_client/src/translation/en.json
+++ b/dictation_client/src/translation/en.json
@@ -1,11 +1,21 @@
{
+ "common": {
+ "label": {
+ "headerTitle": "ODMS Cloud",
+ "copyRight": "OM Digital Solutions 2023"
+ }
+ },
"topPage": {
"label": {
- "displayLanguage": "Display Language",
+ "displayLanguage": "Display language",
"languageEnglish": "English",
"languageGerman": "German",
+ "languageSpanish": "Spanish",
"languageFrench": "French",
- "languageSpanish": "Spanish"
+ "alreadyHaveAccount": "Already have an account?",
+ "signInButton": "Sign in",
+ "newUser": "New user?",
+ "signUpButton": "Create a new account"
}
}
}
diff --git a/dictation_client/src/translation/es.json b/dictation_client/src/translation/es.json
index 86db79c..5d23fd1 100644
--- a/dictation_client/src/translation/es.json
+++ b/dictation_client/src/translation/es.json
@@ -1,11 +1,21 @@
{
+ "common": {
+ "label": {
+ "headerTitle": "(es)ODMS Cloud",
+ "copyRight": "(es)OM Digital Solutions 2023"
+ }
+ },
"topPage": {
"label": {
- "displayLanguage": "(es)Display Language",
+ "displayLanguage": "(es)Display language",
"languageEnglish": "(es)English",
"languageGerman": "(es)German",
+ "languageSpanish": "(es)Spanish",
"languageFrench": "(es)French",
- "languageSpanish": "(es)Spanish"
+ "alreadyHaveAccount": "(es)Already have an account?",
+ "signInButton": "(es)Sign in",
+ "newUser": "(es)New user?",
+ "signUpButton": "(es)Create a new account"
}
}
}
diff --git a/dictation_client/src/translation/fr.json b/dictation_client/src/translation/fr.json
index e9ed930..d4ee9e9 100644
--- a/dictation_client/src/translation/fr.json
+++ b/dictation_client/src/translation/fr.json
@@ -1,11 +1,21 @@
{
+ "common": {
+ "label": {
+ "headerTitle": "(fr)ODMS Cloud",
+ "copyRight": "(fr)OM Digital Solutions 2023"
+ }
+ },
"topPage": {
"label": {
- "displayLanguage": "(fr)Display Language",
+ "displayLanguage": "(fr)Display language",
"languageEnglish": "(fr)English",
"languageGerman": "(fr)German",
+ "languageSpanish": "(fr)Spanish",
"languageFrench": "(fr)French",
- "languageSpanish": "(fr)Spanish"
+ "alreadyHaveAccount": "(fr)Already have an account?",
+ "signInButton": "(fr)Sign in",
+ "newUser": "(fr)New user?",
+ "signUpButton": "(fr)Create a new account"
}
}
}
diff --git a/dictation_client/vite.config.ts b/dictation_client/vite.config.ts
index 3918d41..89e0575 100644
--- a/dictation_client/vite.config.ts
+++ b/dictation_client/vite.config.ts
@@ -2,6 +2,7 @@ import { defineConfig } from "vite";
import react from "@vitejs/plugin-react";
import tsconfigPaths from "vite-tsconfig-paths";
import env from "vite-plugin-env-compatible";
+import sassDts from "vite-plugin-sass-dts";
export default defineConfig({
server: {
@@ -14,5 +15,5 @@ export default defineConfig({
sourcemap: true,
minify: false,
},
- plugins: [env(), tsconfigPaths(), react()],
+ plugins: [env(), tsconfigPaths(), react(), sassDts()],
});
-
-
- {t(getTranslationID("topPage.label.displayLanguage"))} -
-
+
-
+
- + {`${t(getTranslationID("topPage.label.displayLanguage"))} :`} + +
- -
- Already have an account? -
- +
- {t(getTranslationID("topPage.label.alreadyHaveAccount"))} +
-
{/* eslint-disable */}
{
// AADB2Cのサインイン画面に言語選択情報を渡す追加のクエリパラメータを設定
loginRequest.extraQueryParameters = {
@@ -53,17 +64,22 @@ const TopPage: React.FC = (): JSX.Element => {
instance.loginRedirect(loginRequest);
}}
>
- Sign in
-
+ {t(getTranslationID("topPage.label.signInButton"))}
+
- - New user? -
-
-
- Create a new account
+
- {t(getTranslationID("topPage.label.newUser"))}
+- + + {t(getTranslationID("topPage.label.signUpButton"))}
@@ -72,8 +88,8 @@ const TopPage: React.FC = (): JSX.Element => { -