feat: react to current language changes

RefuAPP · Nov 9, 2023 · 21bd57a · 21bd57a
1 parent ef3245a
commit 21bd57a
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 20 deletions.
diff --git a/app/src/app/pages/profile/profile.page.html b/app/src/app/pages/profile/profile.page.html
@@ -40,6 +40,7 @@
       <ion-item>
         <ion-label>{{ 'SETTINGS.LANGUAGE' | translate }}</ion-label>
         <ion-select
+          value="{{ currentLanguage$ | async }}"
           placeholder="{{ 'SETTINGS.SELECT' | translate }}"
           (ionChange)="changeLanguage($event)"
         >

diff --git a/app/src/app/pages/profile/profile.page.ts b/app/src/app/pages/profile/profile.page.ts
@@ -6,6 +6,10 @@ import { UserCreated } from 'src/app/schemas/user/user';
 import { Store } from '@ngrx/store';
 import { AppState } from '../../state/app.state';
 import { changeLanguageRequest } from '../../state/language/language.actions';
+import {
+  getCurrentLanguage,
+  selectLanguage,
+} from '../../state/language/language.selectors';
 
 @Component({
   selector: 'app-profile',
@@ -16,6 +20,8 @@ export class ProfilePage implements OnInit {
   user?: UserCreated;
   avatarNumber: number = 1;
 
+  currentLanguage$ = this.store.select(getCurrentLanguage);
+
   constructor(
     private authService: AuthService,
     private http: HttpClient,

diff --git a/app/src/app/state/auth/auth.selectors.ts b/app/src/app/state/auth/auth.selectors.ts
@@ -8,27 +8,30 @@ export const selectAuth = (state: AppState) => state.auth;
 
 export const getLoginFormErrorMessages = createSelector(selectAuth, (auth) => {
   return match(auth.loginFormError)
-    .with(UserFormErrors.USER_NOT_FOUND, () => 'STRING_OF_USER_NOT_FOUND')
+    .with(
+      UserFormErrors.USER_NOT_FOUND,
+      () => 'LOGIN.USERNAME.ERROR_DOESNT_EXIST',
+    )
     .with(
       UserFormErrors.INCORRECT_PASSWORD,
-      () => 'STRING_OF_INCORRECT_PASSWORD',
+      () => 'LOGIN.PASSWORD.ERROR_INCORRECT_PASSWORD',
     )
     .with(
       CredentialsError.INCORRECT_PHONE_NUMBER,
-      () => 'STRING_OF_INVALID_PHONE_NUMBER',
+      () => 'LOGIN.USERNAME.ERROR_FORMATTED',
     )
     .with(undefined, () => null)
     .exhaustive();
 });
 
-// export const getLoginDeviceErrors = createSelector(selectAuth, (auth) => {
-//   if (auth.deviceError) return auth.deviceError;
-//   return null;
-// });
-//
-// export const isAuthenticated = createSelector(selectAuth, (auth) => {
-//   return auth.isAuthenticated;
-// });
+export const getLoginDeviceErrors = createSelector(selectAuth, (auth) => {
+  if (auth.deviceError) return auth.deviceError;
+  return null;
+});
+
+export const isAuthenticated = createSelector(selectAuth, (auth) => {
+  return auth.isAuthenticated;
+});
 
 export const getCurrentCredentials = createSelector(selectAuth, (auth) => {
   if (auth.userCredentials) {

diff --git a/app/src/app/state/create-user/create-user.selectors.ts b/app/src/app/state/create-user/create-user.selectors.ts
@@ -1,12 +1,30 @@
 import { createSelector } from '@ngrx/store';
 import { AppState } from '../app.state';
+import { match } from 'ts-pattern';
+import { UserFormError } from '../../schemas/user/validate/form';
 
 export const selectCreateUser = (state: AppState) => state.createUser;
 
 export const getCreateUserFormErrors = createSelector(
   selectCreateUser,
   (createUser) => {
-    if (createUser.error) return createUser.error;
+    if (createUser.error)
+      return match(createUser.error)
+        .with('PHONE_ALREADY_EXISTS', () => 'SIGNUP.ALREADY_EXISTING_USER')
+        .with({ type: 'INVALID_USER_DATA' }, (value) => value.message)
+        .with(
+          UserFormError.PASSWORDS_DO_NOT_MATCH,
+          () => 'SIGNUP.PASSWORDS_DONT_MATCH',
+        )
+        .with(
+          UserFormError.INCORRECT_PHONE_NUMBER,
+          () => 'SIGNUP.PHONE_NUMBER.INCORRECT_PHONE_NUMBER',
+        )
+        .with(
+          UserFormError.INCORRECT_EMERGENCY_NUMBER,
+          () => 'SIGNUP.EMERGENCY_NUMBER.INCORRECT_PHONE_NUMBER',
+        )
+        .exhaustive();
     return null;
   },
 );

diff --git a/app/src/app/state/loading/loading.selector.ts b/app/src/app/state/loading/loading.selector.ts
@@ -12,11 +12,11 @@ export const isLoading = createSelector(
   selectCreateUser,
   (auth, create) => {
     if (auth.isLoading)
-      return { isLoading: true, keyMessage: 'LOADING_AUTH' } as LoadingState;
+      return { isLoading: true, keyMessage: 'LOGIN.LOADING' } as LoadingState;
     if (create.isLoading)
       return {
         isLoading: true,
-        keyMessage: 'LOADING_CREATE_USER',
+        keyMessage: 'SIGNUP.LOADING',
       } as LoadingState;
     return { isLoading: false } as LoadingState;
   },

diff --git a/app/src/app/state/menu/menu.selector.ts b/app/src/app/state/menu/menu.selector.ts
@@ -15,20 +15,20 @@ export const getTopItems = createSelector(
     if (auth.isAuthenticated) {
       return [
         {
-          titleTranslateKey: 'Home',
+          titleTranslateKey: 'MENU.HOME',
           url: '/home',
           icon: 'home',
         },
         {
-          titleTranslateKey: 'Reservations',
+          titleTranslateKey: 'MENU.RESERVATIONS',
           url: '/reservations',
           icon: 'folder',
         },
       ] as MenuItem[];
     }
     return [
       {
-        titleTranslateKey: 'Home',
+        titleTranslateKey: 'MENU.HOME',
         url: '/home',
         icon: 'home',
       },
@@ -40,19 +40,19 @@ export const getBottomItems = createSelector(selectAuth, (auth) => {
   if (auth.isAuthenticated)
     return [
       {
-        titleTranslateKey: 'Profile',
+        titleTranslateKey: 'MENU.PROFILE',
         url: '/profile',
         icon: 'person',
       },
       {
-        titleTranslateKey: 'Logout',
+        titleTranslateKey: 'MENU.LOGOUT',
         url: '/logout',
         icon: 'log-out',
       },
     ] as MenuItem[];
   return [
     {
-      titleTranslateKey: 'Login',
+      titleTranslateKey: 'MENU.LOGIN',
       url: '/login',
       icon: 'log-in',
     },