From 5bc0e9220a09c6fdd5f36e6c63b396aecdf38a02 Mon Sep 17 00:00:00 2001 From: evgeniywas Date: Sun, 27 Aug 2023 15:42:07 +0100 Subject: [PATCH 1/4] RC-10: create configs/consts and moved auth roles to that file --- src/app/main/authPages/forgot-password/ForgotPasswordConfig.js | 2 +- src/app/main/authPages/sign-in/SignInConfig.js | 2 +- src/app/main/authPages/sign-up/SignUpConfig.js | 2 +- src/app/main/navigationPages/dashboard/DashboardConfig.js | 2 +- src/app/main/navigationPages/favorites/FavoritesConfig.js | 2 +- src/app/main/navigationPages/history/HistoryConfig.js | 2 +- src/app/main/navigationPages/profile/ProfileConfig.js | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/main/authPages/forgot-password/ForgotPasswordConfig.js b/src/app/main/authPages/forgot-password/ForgotPasswordConfig.js index 7afb9f9..917fb69 100644 --- a/src/app/main/authPages/forgot-password/ForgotPasswordConfig.js +++ b/src/app/main/authPages/forgot-password/ForgotPasswordConfig.js @@ -1,7 +1,7 @@ import i18next from 'i18next'; import ForgotPasswordPage from './ForgotPasswordPage'; -import authRoles from '../../../configs/consts'; +import { authRoles } from '../../../configs/consts'; import en from './i18n/en'; i18next.addResourceBundle('en', 'forgotPasswordPage', en); diff --git a/src/app/main/authPages/sign-in/SignInConfig.js b/src/app/main/authPages/sign-in/SignInConfig.js index 9eb269a..6cfe600 100644 --- a/src/app/main/authPages/sign-in/SignInConfig.js +++ b/src/app/main/authPages/sign-in/SignInConfig.js @@ -1,7 +1,7 @@ import i18next from 'i18next'; import SignInPage from './SignInPage'; -import authRoles from '../../../configs/consts'; +import { authRoles } from '../../../configs/consts'; import en from './i18n/en'; i18next.addResourceBundle('en', 'signInPage', en); diff --git a/src/app/main/authPages/sign-up/SignUpConfig.js b/src/app/main/authPages/sign-up/SignUpConfig.js index 052a66a..aceefcf 100644 --- a/src/app/main/authPages/sign-up/SignUpConfig.js +++ b/src/app/main/authPages/sign-up/SignUpConfig.js @@ -1,7 +1,7 @@ import i18next from 'i18next'; import SignUpPage from './SignUpPage'; -import authRoles from '../../../configs/consts'; +import { authRoles } from '../../../configs/consts'; import en from './i18n/en'; i18next.addResourceBundle('en', 'signUpPage', en); diff --git a/src/app/main/navigationPages/dashboard/DashboardConfig.js b/src/app/main/navigationPages/dashboard/DashboardConfig.js index f55be05..517f5fe 100644 --- a/src/app/main/navigationPages/dashboard/DashboardConfig.js +++ b/src/app/main/navigationPages/dashboard/DashboardConfig.js @@ -1,6 +1,6 @@ import i18next from 'i18next'; -import authRoles from '../../../configs/consts'; +import { authRoles } from '../../../configs/consts'; import Dashboard from './Dashboard'; import en from './i18n/en'; diff --git a/src/app/main/navigationPages/favorites/FavoritesConfig.js b/src/app/main/navigationPages/favorites/FavoritesConfig.js index 9b24b83..0d52ed8 100644 --- a/src/app/main/navigationPages/favorites/FavoritesConfig.js +++ b/src/app/main/navigationPages/favorites/FavoritesConfig.js @@ -1,7 +1,7 @@ import { lazy } from 'react'; import i18next from 'i18next'; -import authRoles from '../../../configs/consts'; +import { authRoles } from '../../../configs/consts'; import en from './i18n/en'; i18next.addResourceBundle('en', 'favoritesPage', en); diff --git a/src/app/main/navigationPages/history/HistoryConfig.js b/src/app/main/navigationPages/history/HistoryConfig.js index c6c5573..ebd32b4 100644 --- a/src/app/main/navigationPages/history/HistoryConfig.js +++ b/src/app/main/navigationPages/history/HistoryConfig.js @@ -1,7 +1,7 @@ import { lazy } from 'react'; import i18next from 'i18next'; -import authRoles from '../../../configs/consts'; +import { authRoles } from '../../../configs/consts'; import en from './i18n/en'; i18next.addResourceBundle('en', 'historyPage', en); diff --git a/src/app/main/navigationPages/profile/ProfileConfig.js b/src/app/main/navigationPages/profile/ProfileConfig.js index 065762f..9e31976 100644 --- a/src/app/main/navigationPages/profile/ProfileConfig.js +++ b/src/app/main/navigationPages/profile/ProfileConfig.js @@ -1,7 +1,7 @@ import { lazy } from 'react'; import i18next from 'i18next'; -import authRoles from '../../../configs/consts'; +import { authRoles } from '../../../configs/consts'; import en from './i18n/en'; i18next.addResourceBundle('en', 'profilePage', en); -- 2.20.1 From 8795de6c7d8816957c9fd9e129a32e4e98e7eb51 Mon Sep 17 00:00:00 2001 From: evgeniywas Date: Sun, 27 Aug 2023 15:43:04 +0100 Subject: [PATCH 2/4] RC-12: update layout2 --- src/app/theme-layouts/layout2/components/FooterLayout2.js | 2 +- src/app/theme-layouts/layout2/components/HeaderLayout2.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/theme-layouts/layout2/components/FooterLayout2.js b/src/app/theme-layouts/layout2/components/FooterLayout2.js index a5c6ca3..df75a7f 100644 --- a/src/app/theme-layouts/layout2/components/FooterLayout2.js +++ b/src/app/theme-layouts/layout2/components/FooterLayout2.js @@ -7,7 +7,7 @@ function FooterLayout2() { const { t } = useTranslation('layout2'); return ( -