From 1c6390b7263d3ad88dd6ef0c8d3183bf2e336d78 Mon Sep 17 00:00:00 2001 From: Joao Leonardo Pereira Date: Mon, 21 Oct 2024 19:02:09 -0300 Subject: [PATCH] Reorganize components to reside in its page's folders - Refactor home page code to remove unused event listeners --- .../account-detail.component.html | 0 .../account-detail.component.scss | 0 .../account-detail.component.ts | 0 .../account-list/account-list.component.html | 0 .../account-list/account-list.component.scss | 0 .../account-list/account-list.component.ts | 0 .../account-modal.component.html | 3 +++ .../account-modal.component.scss} | 0 .../account-modal.component.spec.ts | 24 +++++++++++++++++++ .../account-modal/account-modal.component.ts | 14 +++++++++++ .../account-select-modal.component.html | 0 .../account-select-modal.component.scss | 0 .../account-select-modal.component.ts | 0 .../countdown-timer.component.html | 0 .../countdown-timer.component.scss | 0 .../countdown-timer.component.ts | 0 src/app/home/home.module.ts | 8 +++---- src/app/home/home.page.ts | 2 +- 18 files changed, 46 insertions(+), 5 deletions(-) rename src/app/{ => home}/components/account-detail/account-detail.component.html (100%) rename src/app/{ => home}/components/account-detail/account-detail.component.scss (100%) rename src/app/{ => home}/components/account-detail/account-detail.component.ts (100%) rename src/app/{ => home}/components/account-list/account-list.component.html (100%) rename src/app/{ => home}/components/account-list/account-list.component.scss (100%) rename src/app/{ => home}/components/account-list/account-list.component.ts (100%) create mode 100644 src/app/home/components/account-modal/account-modal.component.html rename src/app/{components/countdown-timer/countdown-timer.component.scss => home/components/account-modal/account-modal.component.scss} (100%) create mode 100644 src/app/home/components/account-modal/account-modal.component.spec.ts create mode 100644 src/app/home/components/account-modal/account-modal.component.ts rename src/app/{ => home}/components/account-select-modal/account-select-modal.component.html (100%) rename src/app/{ => home}/components/account-select-modal/account-select-modal.component.scss (100%) rename src/app/{ => home}/components/account-select-modal/account-select-modal.component.ts (100%) rename src/app/{ => home}/components/countdown-timer/countdown-timer.component.html (100%) create mode 100644 src/app/home/components/countdown-timer/countdown-timer.component.scss rename src/app/{ => home}/components/countdown-timer/countdown-timer.component.ts (100%) diff --git a/src/app/components/account-detail/account-detail.component.html b/src/app/home/components/account-detail/account-detail.component.html similarity index 100% rename from src/app/components/account-detail/account-detail.component.html rename to src/app/home/components/account-detail/account-detail.component.html diff --git a/src/app/components/account-detail/account-detail.component.scss b/src/app/home/components/account-detail/account-detail.component.scss similarity index 100% rename from src/app/components/account-detail/account-detail.component.scss rename to src/app/home/components/account-detail/account-detail.component.scss diff --git a/src/app/components/account-detail/account-detail.component.ts b/src/app/home/components/account-detail/account-detail.component.ts similarity index 100% rename from src/app/components/account-detail/account-detail.component.ts rename to src/app/home/components/account-detail/account-detail.component.ts diff --git a/src/app/components/account-list/account-list.component.html b/src/app/home/components/account-list/account-list.component.html similarity index 100% rename from src/app/components/account-list/account-list.component.html rename to src/app/home/components/account-list/account-list.component.html diff --git a/src/app/components/account-list/account-list.component.scss b/src/app/home/components/account-list/account-list.component.scss similarity index 100% rename from src/app/components/account-list/account-list.component.scss rename to src/app/home/components/account-list/account-list.component.scss diff --git a/src/app/components/account-list/account-list.component.ts b/src/app/home/components/account-list/account-list.component.ts similarity index 100% rename from src/app/components/account-list/account-list.component.ts rename to src/app/home/components/account-list/account-list.component.ts diff --git a/src/app/home/components/account-modal/account-modal.component.html b/src/app/home/components/account-modal/account-modal.component.html new file mode 100644 index 0000000..5342639 --- /dev/null +++ b/src/app/home/components/account-modal/account-modal.component.html @@ -0,0 +1,3 @@ +

+ account-modal works! +

diff --git a/src/app/components/countdown-timer/countdown-timer.component.scss b/src/app/home/components/account-modal/account-modal.component.scss similarity index 100% rename from src/app/components/countdown-timer/countdown-timer.component.scss rename to src/app/home/components/account-modal/account-modal.component.scss diff --git a/src/app/home/components/account-modal/account-modal.component.spec.ts b/src/app/home/components/account-modal/account-modal.component.spec.ts new file mode 100644 index 0000000..88c94cc --- /dev/null +++ b/src/app/home/components/account-modal/account-modal.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { AccountModalComponent } from './account-modal.component'; + +describe('AccountModalComponent', () => { + let component: AccountModalComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ AccountModalComponent ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(AccountModalComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/home/components/account-modal/account-modal.component.ts b/src/app/home/components/account-modal/account-modal.component.ts new file mode 100644 index 0000000..c27d23c --- /dev/null +++ b/src/app/home/components/account-modal/account-modal.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-account-modal', + templateUrl: './account-modal.component.html', + styleUrls: ['./account-modal.component.scss'], +}) +export class AccountModalComponent implements OnInit { + + constructor() { } + + ngOnInit() {} + +} diff --git a/src/app/components/account-select-modal/account-select-modal.component.html b/src/app/home/components/account-select-modal/account-select-modal.component.html similarity index 100% rename from src/app/components/account-select-modal/account-select-modal.component.html rename to src/app/home/components/account-select-modal/account-select-modal.component.html diff --git a/src/app/components/account-select-modal/account-select-modal.component.scss b/src/app/home/components/account-select-modal/account-select-modal.component.scss similarity index 100% rename from src/app/components/account-select-modal/account-select-modal.component.scss rename to src/app/home/components/account-select-modal/account-select-modal.component.scss diff --git a/src/app/components/account-select-modal/account-select-modal.component.ts b/src/app/home/components/account-select-modal/account-select-modal.component.ts similarity index 100% rename from src/app/components/account-select-modal/account-select-modal.component.ts rename to src/app/home/components/account-select-modal/account-select-modal.component.ts diff --git a/src/app/components/countdown-timer/countdown-timer.component.html b/src/app/home/components/countdown-timer/countdown-timer.component.html similarity index 100% rename from src/app/components/countdown-timer/countdown-timer.component.html rename to src/app/home/components/countdown-timer/countdown-timer.component.html diff --git a/src/app/home/components/countdown-timer/countdown-timer.component.scss b/src/app/home/components/countdown-timer/countdown-timer.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/components/countdown-timer/countdown-timer.component.ts b/src/app/home/components/countdown-timer/countdown-timer.component.ts similarity index 100% rename from src/app/components/countdown-timer/countdown-timer.component.ts rename to src/app/home/components/countdown-timer/countdown-timer.component.ts diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index f460463..ed9d10e 100644 --- a/src/app/home/home.module.ts +++ b/src/app/home/home.module.ts @@ -7,11 +7,11 @@ import { HomePage } from './home.page'; import { HomePageRoutingModule } from './home-routing.module'; import { AccountFilterPipe } from '../pipes/account-filter.pipe'; import { NgxScannerQrcodeModule } from 'ngx-scanner-qrcode'; -import { AccountListComponent } from '../components/account-list/account-list.component'; -import { AccountDetailComponent } from '../components/account-detail/account-detail.component'; -import { CountdownTimerComponent } from '../components/countdown-timer/countdown-timer.component'; +import { AccountListComponent } from './components/account-list/account-list.component'; +import { AccountDetailComponent } from './components/account-detail/account-detail.component'; +import { CountdownTimerComponent } from './components/countdown-timer/countdown-timer.component'; import { TranslateModule } from '@ngx-translate/core' -import { AccountSelectModalComponent } from '../components/account-select-modal/account-select-modal.component'; +import { AccountSelectModalComponent } from './components/account-select-modal/account-select-modal.component'; @NgModule({ imports: [ diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 7698e25..8f09f25 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -10,7 +10,7 @@ import { NgxScannerQrcodeComponent, ScannerQRCodeConfig, ScannerQRCodeResult } f import { LocalStorageService } from '../services/local-storage.service'; import { TranslateService } from '@ngx-translate/core'; import { GlobalUtils } from '../utils/global-utils'; -import { AccountSelectModalComponent } from '../components/account-select-modal/account-select-modal.component'; +import { AccountSelectModalComponent } from './components/account-select-modal/account-select-modal.component'; import { AppConfigService } from '../services/app-config.service'; import { ENCRYPTION_OPTIONS_DEFAULT, EncryptionOptions } from '../models/encryption-options.model'; import { MigrationService } from '../services/migration.service';