From 7f555306a6c81af3284644befbdcfbfe94fd1080 Mon Sep 17 00:00:00 2001 From: Algirdas Date: Thu, 23 Jul 2026 20:48:57 +0300 Subject: [PATCH 1/2] fix: styling fixes --- .../components/login/login.component.html | 1 + ...w-cell-desktop-expense-item.component.scss | 4 -- .../calendar-grid.component.scss | 0 .../calendar-grid/calendar-grid.component.ts | 1 - .../expense-report.component.html | 4 +- .../sidebar/actions/actions.component.scss | 0 .../sidebar/actions/actions.component.ts | 5 +- .../calendar-edit.component.scss | 0 .../calendar-edit/calendar-edit.component.ts | 3 - .../calendar-list.component.html | 2 +- .../calendar-list.component.scss | 0 .../calendar-list/calendar-list.component.ts | 1 - .../calendars-dialog.component.scss | 0 .../calendars-dialog.component.ts | 1 - .../categories-dialog.component.scss | 0 .../categories-dialog.component.ts | 1 - .../category-edit.component.scss | 6 -- .../category-list.component.scss | 6 -- .../confirm-dialog.component.html | 10 +-- .../confirm-dialog.component.scss | 0 .../confirm-dialog.component.ts | 3 +- .../datepicker-dialog.component.html | 8 +-- .../expense-list-dialog.component.scss | 0 .../expense-list-dialog.component.ts | 4 +- .../expense-list-items.component.ts | 5 +- .../input-dialog/input-dialog.component.html | 63 ++++++++++--------- .../profile-dialog.component.scss | 0 .../profile-dialog.component.ts | 1 - .../statement-review-dialog.component.html | 6 +- frontend/src/styles.scss | 23 ------- frontend/src/styles/animation.scss | 2 - frontend/src/styles/helpers.scss | 11 ---- frontend/src/styles/layout.scss | 10 +-- 33 files changed, 57 insertions(+), 124 deletions(-) delete mode 100644 frontend/src/app/modules/main/calendar/calendar-grid/calendar-grid.component.scss delete mode 100644 frontend/src/app/modules/main/components/sidebar/actions/actions.component.scss delete mode 100644 frontend/src/app/modules/main/dialogs/calendars-dialog/calendar-edit/calendar-edit.component.scss delete mode 100644 frontend/src/app/modules/main/dialogs/calendars-dialog/calendar-list/calendar-list.component.scss delete mode 100644 frontend/src/app/modules/main/dialogs/calendars-dialog/calendars-dialog.component.scss delete mode 100644 frontend/src/app/modules/main/dialogs/categories-dialog/categories-dialog.component.scss delete mode 100644 frontend/src/app/modules/main/dialogs/confirm-dialog/confirm-dialog.component.scss delete mode 100644 frontend/src/app/modules/main/dialogs/expense-list-dialog/expense-list-dialog.component.scss delete mode 100644 frontend/src/app/modules/main/dialogs/profile-dialog/profile-dialog.component.scss diff --git a/frontend/src/app/modules/auth/components/login/login.component.html b/frontend/src/app/modules/auth/components/login/login.component.html index e28ab5e0..bde1dd64 100644 --- a/frontend/src/app/modules/auth/components/login/login.component.html +++ b/frontend/src/app/modules/auth/components/login/login.component.html @@ -104,6 +104,7 @@

Welcome to Expensave!

size="large" [disabled]="submitted || !form.valid" [class.btn-pulse]="submitted"> + Log In diff --git a/frontend/src/app/modules/main/calendar/calendar-grid-row-cell-desktop/calendar-grid-row-cell-desktop-expense-item/calendar-grid-row-cell-desktop-expense-item.component.scss b/frontend/src/app/modules/main/calendar/calendar-grid-row-cell-desktop/calendar-grid-row-cell-desktop-expense-item/calendar-grid-row-cell-desktop-expense-item.component.scss index b572e74c..2b57dd65 100644 --- a/frontend/src/app/modules/main/calendar/calendar-grid-row-cell-desktop/calendar-grid-row-cell-desktop-expense-item/calendar-grid-row-cell-desktop-expense-item.component.scss +++ b/frontend/src/app/modules/main/calendar/calendar-grid-row-cell-desktop/calendar-grid-row-cell-desktop-expense-item/calendar-grid-row-cell-desktop-expense-item.component.scss @@ -42,10 +42,6 @@ font-size: 12px; } -.expense-amount { - // font-size: nb-theme(text-subtitle-2-font-size); -} - .repeat-icon { height: 12px; width: 12px; diff --git a/frontend/src/app/modules/main/calendar/calendar-grid/calendar-grid.component.scss b/frontend/src/app/modules/main/calendar/calendar-grid/calendar-grid.component.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/frontend/src/app/modules/main/calendar/calendar-grid/calendar-grid.component.ts b/frontend/src/app/modules/main/calendar/calendar-grid/calendar-grid.component.ts index 1cc61b7f..4013f3f5 100644 --- a/frontend/src/app/modules/main/calendar/calendar-grid/calendar-grid.component.ts +++ b/frontend/src/app/modules/main/calendar/calendar-grid/calendar-grid.component.ts @@ -8,7 +8,6 @@ import { CalendarGridRowComponent } from '../calendar-grid-row/calendar-grid-row @Component({ selector: 'app-calendar-grid', - styleUrls: ['calendar-grid.component.scss'], templateUrl: 'calendar-grid.component.html', imports: [CalendarGridRowComponent], }) diff --git a/frontend/src/app/modules/main/components/expense-report/expense-report.component.html b/frontend/src/app/modules/main/components/expense-report/expense-report.component.html index 3648db3a..1b876558 100644 --- a/frontend/src/app/modules/main/components/expense-report/expense-report.component.html +++ b/frontend/src/app/modules/main/components/expense-report/expense-report.component.html @@ -1,5 +1,5 @@ - + {{ dateFrom | date: 'mediumDate' }} {{ dateTo | date: 'mediumDate' }} @@ -21,7 +21,7 @@
INCOME
diff --git a/frontend/src/app/modules/main/components/sidebar/actions/actions.component.scss b/frontend/src/app/modules/main/components/sidebar/actions/actions.component.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/frontend/src/app/modules/main/components/sidebar/actions/actions.component.ts b/frontend/src/app/modules/main/components/sidebar/actions/actions.component.ts index 9037681a..40e331e5 100644 --- a/frontend/src/app/modules/main/components/sidebar/actions/actions.component.ts +++ b/frontend/src/app/modules/main/components/sidebar/actions/actions.component.ts @@ -6,14 +6,13 @@ import { CategoriesDialogComponent } from '../../../dialogs/categories-dialog/ca import { AdminUsersDialogComponent } from '../../../dialogs/admin-users-dialog/admin-users-dialog.component'; import { ProfileDialogComponent } from '../../../dialogs/profile-dialog/profile-dialog.component'; import { StatementImportService } from '../../../services/statement-import.service'; -import { Router, RouterLink } from '@angular/router'; +import { Router } from '@angular/router'; import { ConfirmDialogComponent } from '../../../dialogs/confirm-dialog/confirm-dialog.component'; @Component({ selector: 'app-sidebar-actions', templateUrl: 'actions.component.html', - styleUrl: 'actions.component.scss', - imports: [NbActionsModule, RouterLink, NbTooltipModule, NbButtonModule, NbIconModule], + imports: [NbActionsModule, NbTooltipModule, NbButtonModule, NbIconModule], }) export class ActionsComponent { @Input() diff --git a/frontend/src/app/modules/main/dialogs/calendars-dialog/calendar-edit/calendar-edit.component.scss b/frontend/src/app/modules/main/dialogs/calendars-dialog/calendar-edit/calendar-edit.component.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/frontend/src/app/modules/main/dialogs/calendars-dialog/calendar-edit/calendar-edit.component.ts b/frontend/src/app/modules/main/dialogs/calendars-dialog/calendar-edit/calendar-edit.component.ts index c398ff72..839258af 100644 --- a/frontend/src/app/modules/main/dialogs/calendars-dialog/calendar-edit/calendar-edit.component.ts +++ b/frontend/src/app/modules/main/dialogs/calendars-dialog/calendar-edit/calendar-edit.component.ts @@ -16,13 +16,11 @@ import { NbTooltipModule, NbUserModule, } from '@nebular/theme'; -import { AsyncPipe } from '@angular/common'; import { UserQueries } from '../../../../../queries/user.queries'; import { injectQuery } from '@tanstack/angular-query-experimental'; @Component({ templateUrl: 'calendar-edit.component.html', - styleUrl: 'calendar-edit.component.scss', selector: 'app-calendar-edit', imports: [ FormsModule, @@ -36,7 +34,6 @@ import { injectQuery } from '@tanstack/angular-query-experimental'; NbAutocompleteModule, NbOptionModule, NbTooltipModule, - AsyncPipe, ], }) export class CalendarEditComponent { diff --git a/frontend/src/app/modules/main/dialogs/calendars-dialog/calendar-list/calendar-list.component.html b/frontend/src/app/modules/main/dialogs/calendars-dialog/calendar-list/calendar-list.component.html index 9e5cbe3d..2f1c9457 100644 --- a/frontend/src/app/modules/main/dialogs/calendars-dialog/calendar-list/calendar-list.component.html +++ b/frontend/src/app/modules/main/dialogs/calendars-dialog/calendar-list/calendar-list.component.html @@ -1,4 +1,4 @@ - + - diff --git a/frontend/src/app/modules/main/dialogs/confirm-dialog/confirm-dialog.component.scss b/frontend/src/app/modules/main/dialogs/confirm-dialog/confirm-dialog.component.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/frontend/src/app/modules/main/dialogs/confirm-dialog/confirm-dialog.component.ts b/frontend/src/app/modules/main/dialogs/confirm-dialog/confirm-dialog.component.ts index c086d3f2..90a5e031 100644 --- a/frontend/src/app/modules/main/dialogs/confirm-dialog/confirm-dialog.component.ts +++ b/frontend/src/app/modules/main/dialogs/confirm-dialog/confirm-dialog.component.ts @@ -1,9 +1,8 @@ import { Component, inject } from '@angular/core'; -import { NbDialogRef, NbCardModule, NbButtonModule, NbIconModule } from '@nebular/theme'; +import { NbButtonModule, NbCardModule, NbDialogRef, NbIconModule } from '@nebular/theme'; @Component({ templateUrl: 'confirm-dialog.component.html', - styleUrls: ['confirm-dialog.component.scss'], imports: [NbCardModule, NbButtonModule, NbIconModule], }) export class ConfirmDialogComponent { diff --git a/frontend/src/app/modules/main/dialogs/datepicker-dialog/datepicker-dialog.component.html b/frontend/src/app/modules/main/dialogs/datepicker-dialog/datepicker-dialog.component.html index 32197188..be77ec50 100644 --- a/frontend/src/app/modules/main/dialogs/datepicker-dialog/datepicker-dialog.component.html +++ b/frontend/src/app/modules/main/dialogs/datepicker-dialog/datepicker-dialog.component.html @@ -1,16 +1,16 @@ + Pick a date - Pick a date diff --git a/frontend/src/app/modules/main/dialogs/expense-list-dialog/expense-list-dialog.component.scss b/frontend/src/app/modules/main/dialogs/expense-list-dialog/expense-list-dialog.component.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/frontend/src/app/modules/main/dialogs/expense-list-dialog/expense-list-dialog.component.ts b/frontend/src/app/modules/main/dialogs/expense-list-dialog/expense-list-dialog.component.ts index 8659b67c..22cfa790 100644 --- a/frontend/src/app/modules/main/dialogs/expense-list-dialog/expense-list-dialog.component.ts +++ b/frontend/src/app/modules/main/dialogs/expense-list-dialog/expense-list-dialog.component.ts @@ -3,14 +3,12 @@ import { NbButtonModule, NbCardModule, NbDialogRef, NbIconModule } from '@nebula import { Calendar } from '../../../../api/objects/calendar'; import { Expense } from '../../../../api/objects/expense'; import { CalendarService } from '../../calendar/calendar.service'; -import { DatePipe } from '@angular/common'; import { ExpenseListItemsComponent } from './expense-list-items.component'; import { ShortNumberPipe } from '../../../../pipes/shortnumber.pipe'; @Component({ templateUrl: 'expense-list-dialog.component.html', - styleUrls: ['expense-list-dialog.component.scss'], - imports: [NbCardModule, ExpenseListItemsComponent, NbButtonModule, NbIconModule, DatePipe, ShortNumberPipe], + imports: [NbCardModule, ExpenseListItemsComponent, NbButtonModule, NbIconModule, ShortNumberPipe], }) export class ExpenseListDialogComponent implements OnInit { public visibleDate: Date; diff --git a/frontend/src/app/modules/main/dialogs/expense-list-dialog/expense-list-items.component.ts b/frontend/src/app/modules/main/dialogs/expense-list-dialog/expense-list-items.component.ts index 0cea7455..b0a03219 100644 --- a/frontend/src/app/modules/main/dialogs/expense-list-dialog/expense-list-items.component.ts +++ b/frontend/src/app/modules/main/dialogs/expense-list-dialog/expense-list-items.component.ts @@ -2,13 +2,12 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { slideAnimation } from '../../../../animations/slide.animation'; import { Expense } from '../../../../api/objects/expense'; import { NbIconModule, NbListModule } from '@nebular/theme'; -import { NgStyle } from '@angular/common'; import { ShortNumberPipe } from '../../../../pipes/shortnumber.pipe'; @Component({ selector: 'app-expense-list-items', template: ` - + {{ header }} {{ totalExpensesAmount | shortNumber }} @@ -29,7 +28,7 @@ import { ShortNumberPipe } from '../../../../pipes/shortnumber.pipe'; } `, animations: slideAnimation, - imports: [NbListModule, NbIconModule, NgStyle, ShortNumberPipe], + imports: [NbListModule, NbIconModule, ShortNumberPipe], }) export class ExpenseListItemsComponent implements OnInit { @Input({ required: true }) diff --git a/frontend/src/app/modules/main/dialogs/input-dialog/input-dialog.component.html b/frontend/src/app/modules/main/dialogs/input-dialog/input-dialog.component.html index 1b09bd07..2ec3904d 100644 --- a/frontend/src/app/modules/main/dialogs/input-dialog/input-dialog.component.html +++ b/frontend/src/app/modules/main/dialogs/input-dialog/input-dialog.component.html @@ -1,32 +1,35 @@ - - - {{ title }} - - +
+ + + {{ title }} + + - - - + + + - - - - + + + + +
diff --git a/frontend/src/app/modules/main/dialogs/profile-dialog/profile-dialog.component.scss b/frontend/src/app/modules/main/dialogs/profile-dialog/profile-dialog.component.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/frontend/src/app/modules/main/dialogs/profile-dialog/profile-dialog.component.ts b/frontend/src/app/modules/main/dialogs/profile-dialog/profile-dialog.component.ts index 05667404..f9757450 100644 --- a/frontend/src/app/modules/main/dialogs/profile-dialog/profile-dialog.component.ts +++ b/frontend/src/app/modules/main/dialogs/profile-dialog/profile-dialog.component.ts @@ -20,7 +20,6 @@ import { UserQueries } from '../../../../queries/user.queries'; @Component({ templateUrl: 'profile-dialog.component.html', - styleUrls: ['profile-dialog.component.scss'], imports: [ FormsModule, NbCardModule, diff --git a/frontend/src/app/modules/main/dialogs/statement-review-dialog/statement-review-dialog.component.html b/frontend/src/app/modules/main/dialogs/statement-review-dialog/statement-review-dialog.component.html index a2ebf867..d37db43b 100644 --- a/frontend/src/app/modules/main/dialogs/statement-review-dialog/statement-review-dialog.component.html +++ b/frontend/src/app/modules/main/dialogs/statement-review-dialog/statement-review-dialog.component.html @@ -12,14 +12,14 @@ - + TRANSACTIONS - {{ expensesCount }} {{ totalExpensesAmount | shortNumber }} @for (date of groupedDates; track date) { - +
{{ date }}
{{ totalExpensesAmountByDates[date] | shortNumber }} @@ -51,7 +51,7 @@ } - +