From ef86deb222cd431220b750cdd4e424dc4c05c180 Mon Sep 17 00:00:00 2001 From: Huffle Date: Thu, 15 May 2025 10:56:04 +0200 Subject: [PATCH] Redirect to tabs when user is selected --- frontend/allowance-planner-v2/src/app/app.component.ts | 2 +- .../src/app/pages/allowance/allowance-routing.module.ts | 2 +- .../src/app/pages/user-login/user-login.page.scss | 5 +++-- .../src/app/pages/user-login/user-login.page.ts | 8 +++++++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/frontend/allowance-planner-v2/src/app/app.component.ts b/frontend/allowance-planner-v2/src/app/app.component.ts index ea48f32..a6c0025 100644 --- a/frontend/allowance-planner-v2/src/app/app.component.ts +++ b/frontend/allowance-planner-v2/src/app/app.component.ts @@ -14,7 +14,7 @@ export class AppComponent { this.storageService.getCurrentUserId().then((userId) => { if (userId !== undefined && userId !== null) { console.log('userId: ', userId); - this.router.navigate(['/tabs'], userId); + this.router.navigate(['/tabs/allowance', userId]); } }); }) diff --git a/frontend/allowance-planner-v2/src/app/pages/allowance/allowance-routing.module.ts b/frontend/allowance-planner-v2/src/app/pages/allowance/allowance-routing.module.ts index 0376e70..607bbf1 100644 --- a/frontend/allowance-planner-v2/src/app/pages/allowance/allowance-routing.module.ts +++ b/frontend/allowance-planner-v2/src/app/pages/allowance/allowance-routing.module.ts @@ -4,7 +4,7 @@ import { AllowancePage } from './allowance.page'; const routes: Routes = [ { - path: '', + path: ':id', component: AllowancePage, } ]; diff --git a/frontend/allowance-planner-v2/src/app/pages/user-login/user-login.page.scss b/frontend/allowance-planner-v2/src/app/pages/user-login/user-login.page.scss index 9c28a41..e7e5b4e 100644 --- a/frontend/allowance-planner-v2/src/app/pages/user-login/user-login.page.scss +++ b/frontend/allowance-planner-v2/src/app/pages/user-login/user-login.page.scss @@ -6,14 +6,14 @@ } .title { - margin-top: 40%; + margin-top: 150px; color: var(--ion-color-primary); font-size: 40px; } .selection { gap: 10%; - margin-top: 20%; + margin-top: 100px; color: var(--ion-color-primary); } @@ -27,4 +27,5 @@ height: 130px; border: 1px solid var(--ion-color-primary); border-radius: 10px; + background-color: var(--ion-color-secondary); } \ No newline at end of file diff --git a/frontend/allowance-planner-v2/src/app/pages/user-login/user-login.page.ts b/frontend/allowance-planner-v2/src/app/pages/user-login/user-login.page.ts index 6fb3b56..ea8fcaf 100644 --- a/frontend/allowance-planner-v2/src/app/pages/user-login/user-login.page.ts +++ b/frontend/allowance-planner-v2/src/app/pages/user-login/user-login.page.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; import { User } from 'src/app/models/user'; import { StorageService } from 'src/app/services/storage.service'; import { UserService } from 'src/app/services/user.service'; @@ -12,7 +13,11 @@ import { UserService } from 'src/app/services/user.service'; export class UserLoginPage implements OnInit { public users: Array = []; - constructor(private userService: UserService, private storageService: StorageService) { } + constructor( + private userService: UserService, + private storageService: StorageService, + private router: Router + ) { } ngOnInit() { this.userService.getUserList().subscribe(users => { @@ -22,5 +27,6 @@ export class UserLoginPage implements OnInit { selectUser(id: number) { this.storageService.set('user-id', id); + this.router.navigate(['/tabs/allowance', id]); } }