From 751c614a2bcaa2113c1a0d5bdce8385b1c9caf35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20Nagy?= Date: Sun, 11 Jan 2026 17:01:12 +0100 Subject: [PATCH 1/3] #EX-230: Submit forms via enter key --- .../create-category-dialog.component.html | 123 ++++++------ .../create-category-dialog.component.ts | 1 + .../create-transaction-dialog.component.html | 183 +++++++++--------- .../forgot-password.component.html | 52 ++--- .../src/app/public/login/login.component.html | 83 ++++---- .../src/app/public/login/login.component.ts | 1 + .../registration/registration.component.html | 82 ++++---- .../registration/registration.component.scss | 4 - .../input-clear-button.component.ts | 1 + 9 files changed, 270 insertions(+), 260 deletions(-) diff --git a/frontend/Exence/src/app/private/transactions-and-categories/create-category-dialog/create-category-dialog.component.html b/frontend/Exence/src/app/private/transactions-and-categories/create-category-dialog/create-category-dialog.component.html index 60b8f22..91126c3 100644 --- a/frontend/Exence/src/app/private/transactions-and-categories/create-category-dialog/create-category-dialog.component.html +++ b/frontend/Exence/src/app/private/transactions-and-categories/create-category-dialog/create-category-dialog.component.html @@ -3,71 +3,74 @@

New category

- - @let nameControl = form.controls.name; - - Name - - - - - - +
+ + @let nameControl = form.controls.name; + + Name + + + + + + -
-
- - Select emoji - -
-
- @if (form.value.emoji) { - {{ form.value.emoji }} - } @else { - do_not_disturb_none - } -
-
- close +
+
+ + Select emoji + +
+
+ @if (form.value.emoji) { + {{ form.value.emoji }} + } @else { + do_not_disturb_none + } +
+
+ close +
-
- - @if (emojiInvalid) { -
- Emoji is required! + + @if (emojiInvalid) { +
+ Emoji is required! +
+ }
- } -
- + - - - Cancel - - - Create - - + + + Cancel + + + Create + + + { + console.log('create') const formValue = this.form.getRawValue(); const request: Category = { name: formValue.name, diff --git a/frontend/Exence/src/app/private/transactions-and-categories/create-transaction-dialog/create-transaction-dialog.component.html b/frontend/Exence/src/app/private/transactions-and-categories/create-transaction-dialog/create-transaction-dialog.component.html index c32befe..7a111c1 100644 --- a/frontend/Exence/src/app/private/transactions-and-categories/create-transaction-dialog/create-transaction-dialog.component.html +++ b/frontend/Exence/src/app/private/transactions-and-categories/create-transaction-dialog/create-transaction-dialog.component.html @@ -3,110 +3,113 @@

New transaction

- - @let titleControl = form.controls.title; - - Title - - - - - - - -
- @let amountControl = form.controls.amount; +
+ + @let titleControl = form.controls.title; - Amount + Title - + - + - @let dateControl = form.controls.date; - - Date - - - - - - - -
+
+ @let amountControl = form.controls.amount; + + Amount + + + + + + -
- @let categoryControl = form.controls.category; - - Category - - @for (category of categories; track category.id) { - {{ `${category.name} - ${category.emoji}` }} - } - - - - - + @let dateControl = form.controls.date; + + Date + + + + + + + +
- @let typeControl = form.controls.type; +
+ @let categoryControl = form.controls.category; + + Category + + @for (category of categories; track category.id) { + {{ `${category.name} - ${category.emoji}` }} + } + + + + + + + @let typeControl = form.controls.type; + + Type + + @for (type of transactionTypes; track type) { + {{ type }} + } + + + + + +
+ + @let noteControl = form.controls.note; - Type - - @for (type of transactionTypes; track type) { - {{ type }} - } - + Note + - + -
- - @let noteControl = form.controls.note; - - Note - - - - - - - @let recurringControl = form.controls.recurring; - Automatically recurring? - + + @let recurringControl = form.controls.recurring; + Automatically recurring? + - - - Cancel - - - Create - - + + + Cancel + + + Create + + + diff --git a/frontend/Exence/src/app/public/forgot-password/forgot-password.component.html b/frontend/Exence/src/app/public/forgot-password/forgot-password.component.html index af73be0..d387abe 100644 --- a/frontend/Exence/src/app/public/forgot-password/forgot-password.component.html +++ b/frontend/Exence/src/app/public/forgot-password/forgot-password.component.html @@ -13,32 +13,34 @@

Forgot password?

- - - Email - - - - - - - - - - - Send email - +
+ + + Email + + + + + + + + + + + Send email + - - + + +
} @else { diff --git a/frontend/Exence/src/app/public/login/login.component.html b/frontend/Exence/src/app/public/login/login.component.html index c0c0d8a..5e72ed4 100644 --- a/frontend/Exence/src/app/public/login/login.component.html +++ b/frontend/Exence/src/app/public/login/login.component.html @@ -12,45 +12,46 @@

Log in to your account

- - @let emailControl = loginForm.controls.email; - - Email - - - - - - - @let pwdControl = loginForm.controls.password; - - Password - - - - - - - - - Forgot password? - - Log in - - +
+ + @let emailControl = loginForm.controls.email; + + Email + + + + + + + @let pwdControl = loginForm.controls.password; + + Password + + + + + + + + + Forgot password? + + Log in + + +
diff --git a/frontend/Exence/src/app/public/login/login.component.ts b/frontend/Exence/src/app/public/login/login.component.ts index 43bb72e..61392f5 100644 --- a/frontend/Exence/src/app/public/login/login.component.ts +++ b/frontend/Exence/src/app/public/login/login.component.ts @@ -47,6 +47,7 @@ export class LoginComponent extends BaseComponent { async login(): Promise { const formValue = this.loginForm.getRawValue(); + console.log('login', formValue) const request: LoginRequest = { email: formValue.email, password: formValue.password, diff --git a/frontend/Exence/src/app/public/registration/registration.component.html b/frontend/Exence/src/app/public/registration/registration.component.html index ac7eaa3..f792452 100644 --- a/frontend/Exence/src/app/public/registration/registration.component.html +++ b/frontend/Exence/src/app/public/registration/registration.component.html @@ -7,58 +7,60 @@ />

Create an Account

-

Already have an account? Log In

+ +
+ +
+ @let nameControl = form.controls.username; + + Username + + + + + + + @let emailControl = form.controls.email; + + Email + + + + + + +
- -
- @let nameControl = form.controls.username; - - Username - - + @let pwdControl = form.controls.password; + + Password + + - + - @let emailControl = form.controls.email; + @let confirmControl = form.controls.confirmPassword; - Email - - + Confirm password + + - + -
- - @let pwdControl = form.controls.password; - - Password - - - - - - - @let confirmControl = form.controls.confirmPassword; - - Confirm password - - - - - - - + - - - Create Account - - + + + Create Account + + +
\ No newline at end of file diff --git a/frontend/Exence/src/app/public/registration/registration.component.scss b/frontend/Exence/src/app/public/registration/registration.component.scss index e6edd34..95e6d18 100644 --- a/frontend/Exence/src/app/public/registration/registration.component.scss +++ b/frontend/Exence/src/app/public/registration/registration.component.scss @@ -5,8 +5,4 @@ a { &:hover { color: var(--hover-color); } -} - -.login { - color: var(--accent-text-color); } \ No newline at end of file diff --git a/frontend/Exence/src/app/shared/input-clear-button/input-clear-button.component.ts b/frontend/Exence/src/app/shared/input-clear-button/input-clear-button.component.ts index 0561217..47a2168 100644 --- a/frontend/Exence/src/app/shared/input-clear-button/input-clear-button.component.ts +++ b/frontend/Exence/src/app/shared/input-clear-button/input-clear-button.component.ts @@ -9,6 +9,7 @@ import { MatIconModule } from '@angular/material/icon'; @if (control().value) {
diff --git a/frontend/Exence/src/app/private/transactions-and-categories/create-category-dialog/create-category-dialog.component.html b/frontend/Exence/src/app/private/transactions-and-categories/create-category-dialog/create-category-dialog.component.html index 91126c3..03a5d3a 100644 --- a/frontend/Exence/src/app/private/transactions-and-categories/create-category-dialog/create-category-dialog.component.html +++ b/frontend/Exence/src/app/private/transactions-and-categories/create-category-dialog/create-category-dialog.component.html @@ -19,7 +19,7 @@

New category

-
+
New category Emoji is required!
} -
+
From caec018c14ba0b5379aa92776ce7fac04e0ce56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20Nagy?= Date: Sat, 17 Jan 2026 14:42:11 +0100 Subject: [PATCH 3/3] Remove unnecessary logs --- .../create-category-dialog/create-category-dialog.component.ts | 1 - frontend/Exence/src/app/public/login/login.component.ts | 1 - frontend/Exence/src/app/shared/auth/guard/logged-in.guard.ts | 1 - 3 files changed, 3 deletions(-) diff --git a/frontend/Exence/src/app/private/transactions-and-categories/create-category-dialog/create-category-dialog.component.ts b/frontend/Exence/src/app/private/transactions-and-categories/create-category-dialog/create-category-dialog.component.ts index 088cdde..73ed26d 100644 --- a/frontend/Exence/src/app/private/transactions-and-categories/create-category-dialog/create-category-dialog.component.ts +++ b/frontend/Exence/src/app/private/transactions-and-categories/create-category-dialog/create-category-dialog.component.ts @@ -62,7 +62,6 @@ export class CreateCategoryDialogComponent { } async create(): Promise { - console.log('create') const formValue = this.form.getRawValue(); const request: Category = { name: formValue.name, diff --git a/frontend/Exence/src/app/public/login/login.component.ts b/frontend/Exence/src/app/public/login/login.component.ts index 61392f5..43bb72e 100644 --- a/frontend/Exence/src/app/public/login/login.component.ts +++ b/frontend/Exence/src/app/public/login/login.component.ts @@ -47,7 +47,6 @@ export class LoginComponent extends BaseComponent { async login(): Promise { const formValue = this.loginForm.getRawValue(); - console.log('login', formValue) const request: LoginRequest = { email: formValue.email, password: formValue.password, diff --git a/frontend/Exence/src/app/shared/auth/guard/logged-in.guard.ts b/frontend/Exence/src/app/shared/auth/guard/logged-in.guard.ts index 67b4d30..2ae794e 100644 --- a/frontend/Exence/src/app/shared/auth/guard/logged-in.guard.ts +++ b/frontend/Exence/src/app/shared/auth/guard/logged-in.guard.ts @@ -17,7 +17,6 @@ export const loggedInGuard: CanActivateFn = ( filter(user => user !== null), take(1), map((user) => { - console.log(user) if (user && currentUserService.isAuthenticated()) { return true; } else {