From 4d10eba0e7dcededb044cc0865581865eedd66a2 Mon Sep 17 00:00:00 2001 From: evgeniywas Date: Fri, 2 Jun 2023 22:32:23 +0100 Subject: [PATCH] refactor: move sign up, sign in and sign out pages to main/authPages folder and create locales for everyone --- src/app/main/authPages/authPagesConfig.js | 7 +++++++ src/app/main/{ => authPages}/sign-in/SignInConfig.js | 7 ++++++- src/app/main/{ => authPages}/sign-in/SignInPage.js | 2 +- src/app/main/authPages/sign-in/i18n/en.js | 3 +++ src/app/main/{ => authPages}/sign-out/SignOutConfig.js | 5 +++++ src/app/main/{ => authPages}/sign-out/SignOutPage.js | 2 +- src/app/main/authPages/sign-out/i18n/en.js | 3 +++ src/app/main/{ => authPages}/sign-up/SignUpConfig.js | 7 ++++++- src/app/main/{ => authPages}/sign-up/SignUpPage.js | 2 +- src/app/main/authPages/sign-up/i18n/en.js | 3 +++ 10 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 src/app/main/authPages/authPagesConfig.js rename src/app/main/{ => authPages}/sign-in/SignInConfig.js (77%) rename src/app/main/{ => authPages}/sign-in/SignInPage.js (99%) create mode 100644 src/app/main/authPages/sign-in/i18n/en.js rename src/app/main/{ => authPages}/sign-out/SignOutConfig.js (83%) rename src/app/main/{ => authPages}/sign-out/SignOutPage.js (93%) create mode 100644 src/app/main/authPages/sign-out/i18n/en.js rename src/app/main/{ => authPages}/sign-up/SignUpConfig.js (77%) rename src/app/main/{ => authPages}/sign-up/SignUpPage.js (99%) create mode 100644 src/app/main/authPages/sign-up/i18n/en.js diff --git a/src/app/main/authPages/authPagesConfig.js b/src/app/main/authPages/authPagesConfig.js new file mode 100644 index 0000000..025e888 --- /dev/null +++ b/src/app/main/authPages/authPagesConfig.js @@ -0,0 +1,7 @@ +import SignInConfig from './sign-in/SignInConfig'; +import SignOutConfig from './sign-out/SignOutConfig'; +import SignUpConfig from './sign-up/SignUpConfig'; + +const authPagesConfig = [SignInConfig, SignOutConfig, SignUpConfig]; + +export default authPagesConfig; diff --git a/src/app/main/sign-in/SignInConfig.js b/src/app/main/authPages/sign-in/SignInConfig.js similarity index 77% rename from src/app/main/sign-in/SignInConfig.js rename to src/app/main/authPages/sign-in/SignInConfig.js index 0219874..f5ab5bd 100644 --- a/src/app/main/sign-in/SignInConfig.js +++ b/src/app/main/authPages/sign-in/SignInConfig.js @@ -1,5 +1,10 @@ +import i18next from 'i18next'; + import SignInPage from './SignInPage'; -import authRoles from '../../auth/authRoles'; +import authRoles from '../../../auth/authRoles'; +import en from './i18n/en'; + +i18next.addResourceBundle('en', 'signInPage', en); const SignInConfig = { settings: { diff --git a/src/app/main/sign-in/SignInPage.js b/src/app/main/authPages/sign-in/SignInPage.js similarity index 99% rename from src/app/main/sign-in/SignInPage.js rename to src/app/main/authPages/sign-in/SignInPage.js index 1a51d6e..09eb949 100644 --- a/src/app/main/sign-in/SignInPage.js +++ b/src/app/main/authPages/sign-in/SignInPage.js @@ -15,7 +15,7 @@ import Avatar from '@mui/material/Avatar'; import Box from '@mui/material/Box'; import Paper from '@mui/material/Paper'; import { useEffect } from 'react'; -import jwtService from '../../auth/services/jwtService'; +import jwtService from '../../../auth/services/jwtService'; /** * Form Validation Schema diff --git a/src/app/main/authPages/sign-in/i18n/en.js b/src/app/main/authPages/sign-in/i18n/en.js new file mode 100644 index 0000000..2d905d1 --- /dev/null +++ b/src/app/main/authPages/sign-in/i18n/en.js @@ -0,0 +1,3 @@ +const locale = {}; + +export default locale; diff --git a/src/app/main/sign-out/SignOutConfig.js b/src/app/main/authPages/sign-out/SignOutConfig.js similarity index 83% rename from src/app/main/sign-out/SignOutConfig.js rename to src/app/main/authPages/sign-out/SignOutConfig.js index e146800..44f227e 100644 --- a/src/app/main/sign-out/SignOutConfig.js +++ b/src/app/main/authPages/sign-out/SignOutConfig.js @@ -1,4 +1,9 @@ +import i18next from 'i18next'; + import SignOutPage from './SignOutPage'; +import en from './i18n/en'; + +i18next.addResourceBundle('en', 'signOutPage', en); const SignOutConfig = { settings: { diff --git a/src/app/main/sign-out/SignOutPage.js b/src/app/main/authPages/sign-out/SignOutPage.js similarity index 93% rename from src/app/main/sign-out/SignOutPage.js rename to src/app/main/authPages/sign-out/SignOutPage.js index 421b6f2..8cb6be9 100644 --- a/src/app/main/sign-out/SignOutPage.js +++ b/src/app/main/authPages/sign-out/SignOutPage.js @@ -1,7 +1,7 @@ import Typography from '@mui/material/Typography'; import Paper from '@mui/material/Paper'; import { useEffect } from 'react'; -import JwtService from '../../auth/services/jwtService'; +import JwtService from '../../../auth/services/jwtService'; function SignOutPage() { useEffect(() => { diff --git a/src/app/main/authPages/sign-out/i18n/en.js b/src/app/main/authPages/sign-out/i18n/en.js new file mode 100644 index 0000000..2d905d1 --- /dev/null +++ b/src/app/main/authPages/sign-out/i18n/en.js @@ -0,0 +1,3 @@ +const locale = {}; + +export default locale; diff --git a/src/app/main/sign-up/SignUpConfig.js b/src/app/main/authPages/sign-up/SignUpConfig.js similarity index 77% rename from src/app/main/sign-up/SignUpConfig.js rename to src/app/main/authPages/sign-up/SignUpConfig.js index a3df048..d737744 100644 --- a/src/app/main/sign-up/SignUpConfig.js +++ b/src/app/main/authPages/sign-up/SignUpConfig.js @@ -1,5 +1,10 @@ +import i18next from 'i18next'; + import SignUpPage from './SignUpPage'; -import authRoles from '../../auth/authRoles'; +import authRoles from '../../../auth/authRoles'; +import en from './i18n/en'; + +i18next.addResourceBundle('en', 'signUpPage', en); const SignUpConfig = { settings: { diff --git a/src/app/main/sign-up/SignUpPage.js b/src/app/main/authPages/sign-up/SignUpPage.js similarity index 99% rename from src/app/main/sign-up/SignUpPage.js rename to src/app/main/authPages/sign-up/SignUpPage.js index 317a33f..9985f73 100644 --- a/src/app/main/sign-up/SignUpPage.js +++ b/src/app/main/authPages/sign-up/SignUpPage.js @@ -14,7 +14,7 @@ import Avatar from '@mui/material/Avatar'; import Box from '@mui/material/Box'; import Paper from '@mui/material/Paper'; import FormHelperText from '@mui/material/FormHelperText'; -import jwtService from '../../auth/services/jwtService'; +import jwtService from '../../../auth/services/jwtService'; /** * Form Validation Schema diff --git a/src/app/main/authPages/sign-up/i18n/en.js b/src/app/main/authPages/sign-up/i18n/en.js new file mode 100644 index 0000000..2d905d1 --- /dev/null +++ b/src/app/main/authPages/sign-up/i18n/en.js @@ -0,0 +1,3 @@ +const locale = {}; + +export default locale;