Merge pull request #542 from Cafnanc/release-3.0.1

Release 3.0.1
ELEVATE-Project · Aug 6, 2024 · a1b3041 · a1b3041
2 parents 35afe38 + 76b243e
commit a1b3041
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/app/core/services/user/user.service.ts b/src/app/core/services/user/user.service.ts
@@ -16,7 +16,7 @@ export class UserService {
   userEventEmitted$ = this.userEvent.asObservable();
   constructor(
     private localStorage: LocalStorageService,
-    ) { }
+    ) {}
 
   async getUserValue() {
     return this.localStorage

diff --git a/src/app/modules/auth/login/login.page.ts b/src/app/modules/auth/login/login.page.ts
@@ -8,6 +8,7 @@ import { CommonRoutes } from 'src/global.routes';
 import { ProfileService } from 'src/app/core/services/profile/profile.service';
 import { localKeys } from 'src/app/core/constants/localStorage.keys';
 import { RecaptchaComponent } from 'ng-recaptcha';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-login',
@@ -51,7 +52,7 @@ export class LoginPage implements OnInit {
       },
     ],
   };
-  siteKey = window['env']?.recaptchaSiteKey ? window['env']?.recaptchaSiteKey.recaptchaSiteKey  :""
+  siteKey = environment?.recaptchaSiteKey ? environment?.recaptchaSiteKey  :""
   id: any;
   userDetails: any;
   recaptchaResolved: boolean = this.siteKey ? false : true;
@@ -66,9 +67,9 @@ export class LoginPage implements OnInit {
   captchaToken:any="";
   labels = ["LOGIN_TO_MENTOR_ED"];
   mentorId: any;
-  supportEmail: any = window['env'].supportEmail;
-  privacyPolicyUrl = window['env'].privacyPolicyUrl;
-  termsOfServiceUrl = window['env'].termsOfServiceUrl;
+  supportEmail: any = environment.supportEmail;
+  privacyPolicyUrl = environment.privacyPolicyUrl;
+  termsOfServiceUrl = environment.termsOfServiceUrl;
   constructor(private authService: AuthService, private router: Router,private utilService: UtilService,
               private menuCtrl: MenuController, private activatedRoute: ActivatedRoute,private profileService: ProfileService,
               private translateService: TranslateService, private localStorage: LocalStorageService, private userService: UserService) {