diff --git a/src/app/core/components/sidebar/sidebar.component.ts b/src/app/core/components/sidebar/sidebar.component.ts index 106814f..9448ca7 100644 --- a/src/app/core/components/sidebar/sidebar.component.ts +++ b/src/app/core/components/sidebar/sidebar.component.ts @@ -24,7 +24,7 @@ export class SidebarComponent implements OnInit, AfterViewInit, OnDestroy { private authService: AuthService, private router: Router ) { - this.userActive = authService.getUserActive; + this.userActive = authService.getUserActive(); } ngOnDestroy(): void { @@ -50,7 +50,7 @@ export class SidebarComponent implements OnInit, AfterViewInit, OnDestroy { } setUserInfoActive(): void { - this.userActive = this.authService.getUserActive; + this.userActive = this.authService.getUserActive(); } get getName(): string { diff --git a/src/app/core/services/website.service.ts b/src/app/core/services/website.service.ts index 5d60ba9..9d9da72 100644 --- a/src/app/core/services/website.service.ts +++ b/src/app/core/services/website.service.ts @@ -24,7 +24,7 @@ export class WebsiteService { const url = `${base_url}/website?all=${all}&limit=${limit}&skip=${skip}`; return this.http.get(url).pipe(map(resp => { const { websites } = resp; - const userActive = this.authService.getUserActive; + const userActive = this.authService.getUserActive(); if(userActive) { const { subscriptions } = userActive; websites.map(website => website.inUser = subscriptions?.includes(website._id)); diff --git a/src/app/features/features.component.ts b/src/app/features/features.component.ts index 18b2a2a..e911a16 100644 --- a/src/app/features/features.component.ts +++ b/src/app/features/features.component.ts @@ -19,7 +19,7 @@ export class FeaturesComponent { private settingService: SettingService ) { authService.validateToken().subscribe(() => { this.isLoading = false; - const userActive: User = authService.getUserActive; + const userActive: User = authService.getUserActive(); if(userActive) { settingService.setTheme(userActive.darkMode ? 'dark' : 'light'); } diff --git a/src/app/features/settings/components/user-form/user-form.component.ts b/src/app/features/settings/components/user-form/user-form.component.ts index d5435ca..ecb4251 100644 --- a/src/app/features/settings/components/user-form/user-form.component.ts +++ b/src/app/features/settings/components/user-form/user-form.component.ts @@ -28,7 +28,7 @@ export class UserFormComponent implements OnInit { ) { } ngOnInit(): void { - this.userActive = this.authService.getUserActive; + this.userActive = this.authService.getUserActive(); this.loadForm(); } diff --git a/src/app/shared/toggle-theme/toggle-theme.component.html b/src/app/shared/toggle-theme/toggle-theme.component.html index 63aa109..1f08342 100644 --- a/src/app/shared/toggle-theme/toggle-theme.component.html +++ b/src/app/shared/toggle-theme/toggle-theme.component.html @@ -1,8 +1,8 @@ - + \ No newline at end of file + diff --git a/src/app/shared/toggle-theme/toggle-theme.component.ts b/src/app/shared/toggle-theme/toggle-theme.component.ts index 5ca4df7..a6a9cc1 100644 --- a/src/app/shared/toggle-theme/toggle-theme.component.ts +++ b/src/app/shared/toggle-theme/toggle-theme.component.ts @@ -22,8 +22,8 @@ export class ToggleThemeComponent { .subscribe(checked => this.userService.setTheme(checked)); } - changeTheme(event: HTMLInputElement) { - const checked = event.checked; + changeTheme(event: Event): void { + const checked = (event.target as HTMLInputElement)?.checked; if(this.authService.isAuthenticated()) { this.themeChanged.next(checked); } diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 89130e0..3535d8d 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -1,4 +1,4 @@ export const environment = { production: false, - base_url: 'http://localhost:5000/api', + base_url: 'http://localhost:5000/api/v1', };