From 57a37ff5214b444612e936bde13c20a6327c26f9 Mon Sep 17 00:00:00 2001 From: everoddandeven Date: Tue, 24 Sep 2024 00:46:50 +0200 Subject: [PATCH] Move to pages directory --- src/app/app-routing.module.ts | 10 +++++----- src/app/app.module.ts | 15 +++++++-------- src/app/{ => pages}/bans/bans-routing.module.ts | 0 src/app/{ => pages}/bans/bans.component.html | 0 src/app/{ => pages}/bans/bans.component.scss | 0 src/app/{ => pages}/bans/bans.component.spec.ts | 0 src/app/{ => pages}/bans/bans.component.ts | 4 ++-- src/app/{ => pages}/bans/bans.module.ts | 2 +- .../{ => pages}/detail/detail-routing.module.ts | 0 src/app/{ => pages}/detail/detail.component.html | 0 src/app/{ => pages}/detail/detail.component.scss | 0 .../{ => pages}/detail/detail.component.spec.ts | 0 src/app/{ => pages}/detail/detail.component.ts | 12 ++++++------ src/app/{ => pages}/detail/detail.module.ts | 4 ++-- .../hard-fork-info-routing.module.ts | 0 .../hard-fork-info/hard-fork-info.component.html | 0 .../hard-fork-info/hard-fork-info.component.scss | 0 .../hard-fork-info.component.spec.ts | 0 .../hard-fork-info/hard-fork-info.component.ts | 4 ++-- .../hard-fork-info/hard-fork-info.module.ts | 0 src/app/{ => pages}/home/home-routing.module.ts | 0 src/app/{ => pages}/home/home.component.html | 0 src/app/{ => pages}/home/home.component.scss | 0 src/app/{ => pages}/home/home.component.spec.ts | 0 src/app/{ => pages}/home/home.component.ts | 0 src/app/{ => pages}/home/home.module.ts | 2 +- .../{ => pages}/mining/mining-routing.module.ts | 0 src/app/{ => pages}/mining/mining.component.html | 0 src/app/{ => pages}/mining/mining.component.scss | 0 .../{ => pages}/mining/mining.component.spec.ts | 0 src/app/{ => pages}/mining/mining.component.ts | 14 +++++++------- src/app/{ => pages}/mining/mining.module.ts | 4 ++-- .../{ => pages}/outputs/outputs-routing.module.ts | 0 .../{ => pages}/outputs/outputs.component.html | 0 .../{ => pages}/outputs/outputs.component.scss | 0 .../{ => pages}/outputs/outputs.component.spec.ts | 0 src/app/{ => pages}/outputs/outputs.component.ts | 6 +++--- src/app/{ => pages}/outputs/outputs.module.ts | 2 +- .../settings/settings-routing.module.ts | 0 .../{ => pages}/settings/settings.component.html | 0 .../{ => pages}/settings/settings.component.scss | 0 .../settings/settings.component.spec.ts | 0 .../{ => pages}/settings/settings.component.ts | 4 ++-- src/app/{ => pages}/settings/settings.module.ts | 0 .../transactions/transactions-routing.module.ts | 0 .../transactions/transactions.component.html | 0 .../transactions/transactions.component.scss | 0 .../transactions/transactions.component.spec.ts | 0 .../transactions/transactions.component.ts | 6 +++--- .../transactions/transactions.module.ts | 2 +- src/app/shared/components/index.ts | 1 + .../components}/sidebar/sidebar.component.html | 0 .../components}/sidebar/sidebar.component.scss | 0 .../components}/sidebar/sidebar.component.spec.ts | 0 .../components}/sidebar/sidebar.component.ts | 4 +--- src/app/shared/shared.module.ts | 9 +++++---- 56 files changed, 52 insertions(+), 53 deletions(-) rename src/app/{ => pages}/bans/bans-routing.module.ts (100%) rename src/app/{ => pages}/bans/bans.component.html (100%) rename src/app/{ => pages}/bans/bans.component.scss (100%) rename src/app/{ => pages}/bans/bans.component.spec.ts (100%) rename src/app/{ => pages}/bans/bans.component.ts (91%) rename src/app/{ => pages}/bans/bans.module.ts (85%) rename src/app/{ => pages}/detail/detail-routing.module.ts (100%) rename src/app/{ => pages}/detail/detail.component.html (100%) rename src/app/{ => pages}/detail/detail.component.scss (100%) rename src/app/{ => pages}/detail/detail.component.spec.ts (100%) rename src/app/{ => pages}/detail/detail.component.ts (95%) rename src/app/{ => pages}/detail/detail.module.ts (75%) rename src/app/{ => pages}/hard-fork-info/hard-fork-info-routing.module.ts (100%) rename src/app/{ => pages}/hard-fork-info/hard-fork-info.component.html (100%) rename src/app/{ => pages}/hard-fork-info/hard-fork-info.component.scss (100%) rename src/app/{ => pages}/hard-fork-info/hard-fork-info.component.spec.ts (100%) rename src/app/{ => pages}/hard-fork-info/hard-fork-info.component.ts (94%) rename src/app/{ => pages}/hard-fork-info/hard-fork-info.module.ts (100%) rename src/app/{ => pages}/home/home-routing.module.ts (100%) rename src/app/{ => pages}/home/home.component.html (100%) rename src/app/{ => pages}/home/home.component.scss (100%) rename src/app/{ => pages}/home/home.component.spec.ts (100%) rename src/app/{ => pages}/home/home.component.ts (100%) rename src/app/{ => pages}/home/home.module.ts (85%) rename src/app/{ => pages}/mining/mining-routing.module.ts (100%) rename src/app/{ => pages}/mining/mining.component.html (100%) rename src/app/{ => pages}/mining/mining.component.scss (100%) rename src/app/{ => pages}/mining/mining.component.spec.ts (100%) rename src/app/{ => pages}/mining/mining.component.ts (91%) rename src/app/{ => pages}/mining/mining.module.ts (75%) rename src/app/{ => pages}/outputs/outputs-routing.module.ts (100%) rename src/app/{ => pages}/outputs/outputs.component.html (100%) rename src/app/{ => pages}/outputs/outputs.component.scss (100%) rename src/app/{ => pages}/outputs/outputs.component.spec.ts (100%) rename src/app/{ => pages}/outputs/outputs.component.ts (82%) rename src/app/{ => pages}/outputs/outputs.module.ts (86%) rename src/app/{ => pages}/settings/settings-routing.module.ts (100%) rename src/app/{ => pages}/settings/settings.component.html (100%) rename src/app/{ => pages}/settings/settings.component.scss (100%) rename src/app/{ => pages}/settings/settings.component.spec.ts (100%) rename src/app/{ => pages}/settings/settings.component.ts (99%) rename src/app/{ => pages}/settings/settings.module.ts (100%) rename src/app/{ => pages}/transactions/transactions-routing.module.ts (100%) rename src/app/{ => pages}/transactions/transactions.component.html (100%) rename src/app/{ => pages}/transactions/transactions.component.scss (100%) rename src/app/{ => pages}/transactions/transactions.component.spec.ts (100%) rename src/app/{ => pages}/transactions/transactions.component.ts (84%) rename src/app/{ => pages}/transactions/transactions.module.ts (87%) rename src/app/{ => shared/components}/sidebar/sidebar.component.html (100%) rename src/app/{ => shared/components}/sidebar/sidebar.component.scss (100%) rename src/app/{ => shared/components}/sidebar/sidebar.component.spec.ts (100%) rename src/app/{ => shared/components}/sidebar/sidebar.component.ts (94%) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 559fd95..a16d40c 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -2,11 +2,11 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { PageNotFoundComponent } from './shared/components'; -import { HomeRoutingModule } from './home/home-routing.module'; -import { DetailRoutingModule } from './detail/detail-routing.module'; -import { HardForkInfoRoutingModule } from './hard-fork-info/hard-fork-info-routing.module'; -import { SettingsModule } from './settings/settings.module'; -import { TransactionsModule } from './transactions/transactions.module'; +import { HomeRoutingModule } from './pages/home/home-routing.module'; +import { DetailRoutingModule } from './pages/detail/detail-routing.module'; +import { HardForkInfoRoutingModule } from './pages/hard-fork-info/hard-fork-info-routing.module'; +import { SettingsModule } from './pages/settings/settings.module'; +import { TransactionsModule } from './pages/transactions/transactions.module'; const routes: Routes = [ { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 8ad3137..7133cc3 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -11,17 +11,17 @@ import { AppRoutingModule } from './app-routing.module'; import { TranslateModule, TranslateLoader } from '@ngx-translate/core'; import { TranslateHttpLoader } from '@ngx-translate/http-loader'; -import { HomeModule } from './home/home.module'; -import { DetailModule } from './detail/detail.module'; +import { HomeModule } from './pages/home/home.module'; +import { DetailModule } from './pages/detail/detail.module'; import { AppComponent } from './app.component'; -import { SidebarComponent } from "./sidebar/sidebar.component"; import { LoadComponent } from "./load/load.component"; -import { BansModule } from './bans/bans.module'; +import { BansModule } from './pages/bans/bans.module'; import { NavbarComponent } from "./navbar/navbar.component"; -import { MiningModule } from './mining/mining.module'; -import { TransactionsModule } from './transactions/transactions.module'; -import { OutputsModule } from './outputs/outputs.module'; +import { MiningModule } from './pages/mining/mining.module'; +import { TransactionsModule } from './pages/transactions/transactions.module'; +import { OutputsModule } from './pages/outputs/outputs.module'; +import { SidebarComponent } from './shared/components'; // AoT requires an exported function for factories const httpLoaderFactory = (http: HttpClient): TranslateHttpLoader => new TranslateHttpLoader(http, './assets/i18n/', '.json'); @@ -49,7 +49,6 @@ const httpLoaderFactory = (http: HttpClient): TranslateHttpLoader => new Transl deps: [HttpClient] } }), - SidebarComponent, NavbarComponent, LoadComponent ], diff --git a/src/app/bans/bans-routing.module.ts b/src/app/pages/bans/bans-routing.module.ts similarity index 100% rename from src/app/bans/bans-routing.module.ts rename to src/app/pages/bans/bans-routing.module.ts diff --git a/src/app/bans/bans.component.html b/src/app/pages/bans/bans.component.html similarity index 100% rename from src/app/bans/bans.component.html rename to src/app/pages/bans/bans.component.html diff --git a/src/app/bans/bans.component.scss b/src/app/pages/bans/bans.component.scss similarity index 100% rename from src/app/bans/bans.component.scss rename to src/app/pages/bans/bans.component.scss diff --git a/src/app/bans/bans.component.spec.ts b/src/app/pages/bans/bans.component.spec.ts similarity index 100% rename from src/app/bans/bans.component.spec.ts rename to src/app/pages/bans/bans.component.spec.ts diff --git a/src/app/bans/bans.component.ts b/src/app/pages/bans/bans.component.ts similarity index 91% rename from src/app/bans/bans.component.ts rename to src/app/pages/bans/bans.component.ts index f2b4a77..a95bdb0 100644 --- a/src/app/bans/bans.component.ts +++ b/src/app/pages/bans/bans.component.ts @@ -1,7 +1,7 @@ import { AfterViewInit, Component } from '@angular/core'; import { NavigationEnd, Router } from '@angular/router'; -import { NavbarService } from '../navbar/navbar.service'; -import { DaemonService } from '../core/services/daemon/daemon.service'; +import { NavbarService } from '../../navbar/navbar.service'; +import { DaemonService } from '../../core/services/daemon/daemon.service'; @Component({ selector: 'app-bans', diff --git a/src/app/bans/bans.module.ts b/src/app/pages/bans/bans.module.ts similarity index 85% rename from src/app/bans/bans.module.ts rename to src/app/pages/bans/bans.module.ts index d42971f..5fb2965 100644 --- a/src/app/bans/bans.module.ts +++ b/src/app/pages/bans/bans.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'; import { BansRoutingModule } from './bans-routing.module'; import { BansComponent } from './bans.component'; -import { SharedModule } from '../shared/shared.module'; +import { SharedModule } from '../../shared/shared.module'; @NgModule({ diff --git a/src/app/detail/detail-routing.module.ts b/src/app/pages/detail/detail-routing.module.ts similarity index 100% rename from src/app/detail/detail-routing.module.ts rename to src/app/pages/detail/detail-routing.module.ts diff --git a/src/app/detail/detail.component.html b/src/app/pages/detail/detail.component.html similarity index 100% rename from src/app/detail/detail.component.html rename to src/app/pages/detail/detail.component.html diff --git a/src/app/detail/detail.component.scss b/src/app/pages/detail/detail.component.scss similarity index 100% rename from src/app/detail/detail.component.scss rename to src/app/pages/detail/detail.component.scss diff --git a/src/app/detail/detail.component.spec.ts b/src/app/pages/detail/detail.component.spec.ts similarity index 100% rename from src/app/detail/detail.component.spec.ts rename to src/app/pages/detail/detail.component.spec.ts diff --git a/src/app/detail/detail.component.ts b/src/app/pages/detail/detail.component.ts similarity index 95% rename from src/app/detail/detail.component.ts rename to src/app/pages/detail/detail.component.ts index f556c14..409d827 100644 --- a/src/app/detail/detail.component.ts +++ b/src/app/pages/detail/detail.component.ts @@ -1,11 +1,11 @@ import { Component, OnInit, AfterViewInit, NgZone, OnDestroy } from '@angular/core'; -import { DaemonService } from '../core/services/daemon/daemon.service'; -import { SyncInfo } from '../../common/SyncInfo'; -import { Peer } from '../../common/Peer'; -import { NavbarLink } from '../navbar/navbar.model'; -import { NavbarService } from '../navbar/navbar.service'; +import { DaemonService } from '../../core/services/daemon/daemon.service'; +import { SyncInfo } from '../../../common/SyncInfo'; +import { Peer } from '../../../common/Peer'; +import { NavbarLink } from '../../navbar/navbar.model'; +import { NavbarService } from '../../navbar/navbar.service'; import { NavigationEnd, Router } from '@angular/router'; -import { DaemonInfo } from '../../common/DaemonInfo'; +import { DaemonInfo } from '../../../common/DaemonInfo'; @Component({ selector: 'app-detail', diff --git a/src/app/detail/detail.module.ts b/src/app/pages/detail/detail.module.ts similarity index 75% rename from src/app/detail/detail.module.ts rename to src/app/pages/detail/detail.module.ts index 88369dc..f683aca 100644 --- a/src/app/detail/detail.module.ts +++ b/src/app/pages/detail/detail.module.ts @@ -4,8 +4,8 @@ import { CommonModule } from '@angular/common'; import { DetailRoutingModule } from './detail-routing.module'; import { DetailComponent } from './detail.component'; -import { SharedModule } from '../shared/shared.module'; -import { LoadComponent } from "../load/load.component"; +import { SharedModule } from '../../shared/shared.module'; +import { LoadComponent } from "../../load/load.component"; @NgModule({ declarations: [DetailComponent], diff --git a/src/app/hard-fork-info/hard-fork-info-routing.module.ts b/src/app/pages/hard-fork-info/hard-fork-info-routing.module.ts similarity index 100% rename from src/app/hard-fork-info/hard-fork-info-routing.module.ts rename to src/app/pages/hard-fork-info/hard-fork-info-routing.module.ts diff --git a/src/app/hard-fork-info/hard-fork-info.component.html b/src/app/pages/hard-fork-info/hard-fork-info.component.html similarity index 100% rename from src/app/hard-fork-info/hard-fork-info.component.html rename to src/app/pages/hard-fork-info/hard-fork-info.component.html diff --git a/src/app/hard-fork-info/hard-fork-info.component.scss b/src/app/pages/hard-fork-info/hard-fork-info.component.scss similarity index 100% rename from src/app/hard-fork-info/hard-fork-info.component.scss rename to src/app/pages/hard-fork-info/hard-fork-info.component.scss diff --git a/src/app/hard-fork-info/hard-fork-info.component.spec.ts b/src/app/pages/hard-fork-info/hard-fork-info.component.spec.ts similarity index 100% rename from src/app/hard-fork-info/hard-fork-info.component.spec.ts rename to src/app/pages/hard-fork-info/hard-fork-info.component.spec.ts diff --git a/src/app/hard-fork-info/hard-fork-info.component.ts b/src/app/pages/hard-fork-info/hard-fork-info.component.ts similarity index 94% rename from src/app/hard-fork-info/hard-fork-info.component.ts rename to src/app/pages/hard-fork-info/hard-fork-info.component.ts index e03980e..07a7837 100644 --- a/src/app/hard-fork-info/hard-fork-info.component.ts +++ b/src/app/pages/hard-fork-info/hard-fork-info.component.ts @@ -1,7 +1,7 @@ import { AfterViewInit, Component } from '@angular/core'; -import { DaemonService } from '../core/services/daemon/daemon.service'; +import { DaemonService } from '../../core/services/daemon/daemon.service'; import { NavigationEnd, Router } from '@angular/router'; -import { NavbarService } from '../navbar/navbar.service'; +import { NavbarService } from '../../navbar/navbar.service'; @Component({ selector: 'app-hard-fork-info', diff --git a/src/app/hard-fork-info/hard-fork-info.module.ts b/src/app/pages/hard-fork-info/hard-fork-info.module.ts similarity index 100% rename from src/app/hard-fork-info/hard-fork-info.module.ts rename to src/app/pages/hard-fork-info/hard-fork-info.module.ts diff --git a/src/app/home/home-routing.module.ts b/src/app/pages/home/home-routing.module.ts similarity index 100% rename from src/app/home/home-routing.module.ts rename to src/app/pages/home/home-routing.module.ts diff --git a/src/app/home/home.component.html b/src/app/pages/home/home.component.html similarity index 100% rename from src/app/home/home.component.html rename to src/app/pages/home/home.component.html diff --git a/src/app/home/home.component.scss b/src/app/pages/home/home.component.scss similarity index 100% rename from src/app/home/home.component.scss rename to src/app/pages/home/home.component.scss diff --git a/src/app/home/home.component.spec.ts b/src/app/pages/home/home.component.spec.ts similarity index 100% rename from src/app/home/home.component.spec.ts rename to src/app/pages/home/home.component.spec.ts diff --git a/src/app/home/home.component.ts b/src/app/pages/home/home.component.ts similarity index 100% rename from src/app/home/home.component.ts rename to src/app/pages/home/home.component.ts diff --git a/src/app/home/home.module.ts b/src/app/pages/home/home.module.ts similarity index 85% rename from src/app/home/home.module.ts rename to src/app/pages/home/home.module.ts index 3bd43bc..08697f1 100644 --- a/src/app/home/home.module.ts +++ b/src/app/pages/home/home.module.ts @@ -4,7 +4,7 @@ import { CommonModule } from '@angular/common'; import { HomeRoutingModule } from './home-routing.module'; import { HomeComponent } from './home.component'; -import { SharedModule } from '../shared/shared.module'; +import { SharedModule } from '../../shared/shared.module'; @NgModule({ declarations: [HomeComponent], diff --git a/src/app/mining/mining-routing.module.ts b/src/app/pages/mining/mining-routing.module.ts similarity index 100% rename from src/app/mining/mining-routing.module.ts rename to src/app/pages/mining/mining-routing.module.ts diff --git a/src/app/mining/mining.component.html b/src/app/pages/mining/mining.component.html similarity index 100% rename from src/app/mining/mining.component.html rename to src/app/pages/mining/mining.component.html diff --git a/src/app/mining/mining.component.scss b/src/app/pages/mining/mining.component.scss similarity index 100% rename from src/app/mining/mining.component.scss rename to src/app/pages/mining/mining.component.scss diff --git a/src/app/mining/mining.component.spec.ts b/src/app/pages/mining/mining.component.spec.ts similarity index 100% rename from src/app/mining/mining.component.spec.ts rename to src/app/pages/mining/mining.component.spec.ts diff --git a/src/app/mining/mining.component.ts b/src/app/pages/mining/mining.component.ts similarity index 91% rename from src/app/mining/mining.component.ts rename to src/app/pages/mining/mining.component.ts index 0a61712..3701fcb 100644 --- a/src/app/mining/mining.component.ts +++ b/src/app/pages/mining/mining.component.ts @@ -1,12 +1,12 @@ import { AfterViewInit, Component } from '@angular/core'; -import { DaemonService } from '../core/services/daemon/daemon.service'; -import { NavbarService } from '../navbar/navbar.service'; -import { MinerData } from '../../common/MinerData'; +import { DaemonService } from '../../core/services/daemon/daemon.service'; +import { NavbarService } from '../../navbar/navbar.service'; +import { MinerData } from '../../../common/MinerData'; import { NavigationEnd, Router } from '@angular/router'; -import { NavbarLink } from '../navbar/navbar.model'; -import { MineableTxBacklog } from '../../common/MineableTxBacklog'; -import { Chain } from '../../common/Chain'; -import { CoreIsBusyError } from '../../common/error'; +import { NavbarLink } from '../../navbar/navbar.model'; +import { MineableTxBacklog } from '../../../common/MineableTxBacklog'; +import { Chain } from '../../../common/Chain'; +import { CoreIsBusyError } from '../../../common/error'; import { CommonModule, NgIf } from '@angular/common'; @Component({ diff --git a/src/app/mining/mining.module.ts b/src/app/pages/mining/mining.module.ts similarity index 75% rename from src/app/mining/mining.module.ts rename to src/app/pages/mining/mining.module.ts index 80726a5..5694f5a 100644 --- a/src/app/mining/mining.module.ts +++ b/src/app/pages/mining/mining.module.ts @@ -2,8 +2,8 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { MiningRoutingModule } from './mining-routing.module'; -import { SharedModule } from '../shared/shared.module'; -import { LoadComponent } from '../load/load.component'; +import { SharedModule } from '../../shared/shared.module'; +import { LoadComponent } from '../../load/load.component'; import { MiningComponent } from './mining.component'; diff --git a/src/app/outputs/outputs-routing.module.ts b/src/app/pages/outputs/outputs-routing.module.ts similarity index 100% rename from src/app/outputs/outputs-routing.module.ts rename to src/app/pages/outputs/outputs-routing.module.ts diff --git a/src/app/outputs/outputs.component.html b/src/app/pages/outputs/outputs.component.html similarity index 100% rename from src/app/outputs/outputs.component.html rename to src/app/pages/outputs/outputs.component.html diff --git a/src/app/outputs/outputs.component.scss b/src/app/pages/outputs/outputs.component.scss similarity index 100% rename from src/app/outputs/outputs.component.scss rename to src/app/pages/outputs/outputs.component.scss diff --git a/src/app/outputs/outputs.component.spec.ts b/src/app/pages/outputs/outputs.component.spec.ts similarity index 100% rename from src/app/outputs/outputs.component.spec.ts rename to src/app/pages/outputs/outputs.component.spec.ts diff --git a/src/app/outputs/outputs.component.ts b/src/app/pages/outputs/outputs.component.ts similarity index 82% rename from src/app/outputs/outputs.component.ts rename to src/app/pages/outputs/outputs.component.ts index 2c97cd1..1d6d9eb 100644 --- a/src/app/outputs/outputs.component.ts +++ b/src/app/pages/outputs/outputs.component.ts @@ -1,7 +1,7 @@ import { AfterViewInit, Component } from '@angular/core'; -import { NavbarLink } from '../navbar/navbar.model'; -import { DaemonService } from '../core/services/daemon/daemon.service'; -import { NavbarService } from '../navbar/navbar.service'; +import { NavbarLink } from '../../navbar/navbar.model'; +import { DaemonService } from '../../core/services/daemon/daemon.service'; +import { NavbarService } from '../../navbar/navbar.service'; @Component({ selector: 'app-outputs', diff --git a/src/app/outputs/outputs.module.ts b/src/app/pages/outputs/outputs.module.ts similarity index 86% rename from src/app/outputs/outputs.module.ts rename to src/app/pages/outputs/outputs.module.ts index bf12a0a..7f88705 100644 --- a/src/app/outputs/outputs.module.ts +++ b/src/app/pages/outputs/outputs.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { OutputsRoutingModule } from './outputs-routing.module'; -import { SharedModule } from '../shared/shared.module'; +import { SharedModule } from '../../shared/shared.module'; import { OutputsComponent } from './outputs.component'; diff --git a/src/app/settings/settings-routing.module.ts b/src/app/pages/settings/settings-routing.module.ts similarity index 100% rename from src/app/settings/settings-routing.module.ts rename to src/app/pages/settings/settings-routing.module.ts diff --git a/src/app/settings/settings.component.html b/src/app/pages/settings/settings.component.html similarity index 100% rename from src/app/settings/settings.component.html rename to src/app/pages/settings/settings.component.html diff --git a/src/app/settings/settings.component.scss b/src/app/pages/settings/settings.component.scss similarity index 100% rename from src/app/settings/settings.component.scss rename to src/app/pages/settings/settings.component.scss diff --git a/src/app/settings/settings.component.spec.ts b/src/app/pages/settings/settings.component.spec.ts similarity index 100% rename from src/app/settings/settings.component.spec.ts rename to src/app/pages/settings/settings.component.spec.ts diff --git a/src/app/settings/settings.component.ts b/src/app/pages/settings/settings.component.ts similarity index 99% rename from src/app/settings/settings.component.ts rename to src/app/pages/settings/settings.component.ts index 3321f8a..c8e4d35 100644 --- a/src/app/settings/settings.component.ts +++ b/src/app/pages/settings/settings.component.ts @@ -1,7 +1,7 @@ import { AfterViewInit, Component } from '@angular/core'; -import { NavbarService } from '../navbar/navbar.service'; +import { NavbarService } from '../../navbar/navbar.service'; import { NavigationEnd, NavigationStart, Router } from '@angular/router'; -import { NavbarLink } from '../navbar/navbar.model'; +import { NavbarLink } from '../../navbar/navbar.model'; @Component({ selector: 'app-settings', diff --git a/src/app/settings/settings.module.ts b/src/app/pages/settings/settings.module.ts similarity index 100% rename from src/app/settings/settings.module.ts rename to src/app/pages/settings/settings.module.ts diff --git a/src/app/transactions/transactions-routing.module.ts b/src/app/pages/transactions/transactions-routing.module.ts similarity index 100% rename from src/app/transactions/transactions-routing.module.ts rename to src/app/pages/transactions/transactions-routing.module.ts diff --git a/src/app/transactions/transactions.component.html b/src/app/pages/transactions/transactions.component.html similarity index 100% rename from src/app/transactions/transactions.component.html rename to src/app/pages/transactions/transactions.component.html diff --git a/src/app/transactions/transactions.component.scss b/src/app/pages/transactions/transactions.component.scss similarity index 100% rename from src/app/transactions/transactions.component.scss rename to src/app/pages/transactions/transactions.component.scss diff --git a/src/app/transactions/transactions.component.spec.ts b/src/app/pages/transactions/transactions.component.spec.ts similarity index 100% rename from src/app/transactions/transactions.component.spec.ts rename to src/app/pages/transactions/transactions.component.spec.ts diff --git a/src/app/transactions/transactions.component.ts b/src/app/pages/transactions/transactions.component.ts similarity index 84% rename from src/app/transactions/transactions.component.ts rename to src/app/pages/transactions/transactions.component.ts index b983582..ce166da 100644 --- a/src/app/transactions/transactions.component.ts +++ b/src/app/pages/transactions/transactions.component.ts @@ -1,7 +1,7 @@ import { AfterViewInit, Component } from '@angular/core'; -import { DaemonService } from '../core/services/daemon/daemon.service'; -import { NavbarService } from '../navbar/navbar.service'; -import { NavbarLink } from '../navbar/navbar.model'; +import { DaemonService } from '../../core/services/daemon/daemon.service'; +import { NavbarService } from '../../navbar/navbar.service'; +import { NavbarLink } from '../../navbar/navbar.model'; @Component({ selector: 'app-transactions', diff --git a/src/app/transactions/transactions.module.ts b/src/app/pages/transactions/transactions.module.ts similarity index 87% rename from src/app/transactions/transactions.module.ts rename to src/app/pages/transactions/transactions.module.ts index 08ac0b5..a0c4b10 100644 --- a/src/app/transactions/transactions.module.ts +++ b/src/app/pages/transactions/transactions.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'; import { TransactionsRoutingModule } from './transactions-routing.module'; import { TransactionsComponent } from './transactions.component'; -import { SharedModule } from '../shared/shared.module'; +import { SharedModule } from '../../shared/shared.module'; @NgModule({ diff --git a/src/app/shared/components/index.ts b/src/app/shared/components/index.ts index 88746a9..2352732 100644 --- a/src/app/shared/components/index.ts +++ b/src/app/shared/components/index.ts @@ -1 +1,2 @@ export * from './page-not-found/page-not-found.component'; +export * from './sidebar/sidebar.component'; diff --git a/src/app/sidebar/sidebar.component.html b/src/app/shared/components/sidebar/sidebar.component.html similarity index 100% rename from src/app/sidebar/sidebar.component.html rename to src/app/shared/components/sidebar/sidebar.component.html diff --git a/src/app/sidebar/sidebar.component.scss b/src/app/shared/components/sidebar/sidebar.component.scss similarity index 100% rename from src/app/sidebar/sidebar.component.scss rename to src/app/shared/components/sidebar/sidebar.component.scss diff --git a/src/app/sidebar/sidebar.component.spec.ts b/src/app/shared/components/sidebar/sidebar.component.spec.ts similarity index 100% rename from src/app/sidebar/sidebar.component.spec.ts rename to src/app/shared/components/sidebar/sidebar.component.spec.ts diff --git a/src/app/sidebar/sidebar.component.ts b/src/app/shared/components/sidebar/sidebar.component.ts similarity index 94% rename from src/app/sidebar/sidebar.component.ts rename to src/app/shared/components/sidebar/sidebar.component.ts index f9b9118..1dddf92 100644 --- a/src/app/sidebar/sidebar.component.ts +++ b/src/app/shared/components/sidebar/sidebar.component.ts @@ -4,10 +4,8 @@ import { ChildActivationEnd, ChildActivationStart, NavigationCancel, NavigationE @Component({ selector: 'app-sidebar', - standalone: true, templateUrl: './sidebar.component.html', - styleUrl: './sidebar.component.scss', - imports: [RouterModule, NgClass] + styleUrl: './sidebar.component.scss' }) export class SidebarComponent { public readonly navLinks: NavLink[]; diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 9a66283..8d4409b 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -3,13 +3,14 @@ import { CommonModule } from '@angular/common'; import { TranslateModule } from '@ngx-translate/core'; -import { PageNotFoundComponent } from './components/'; +import { PageNotFoundComponent, SidebarComponent } from './components/'; import { WebviewDirective } from './directives/'; import { FormsModule } from '@angular/forms'; +import { RouterModule } from '@angular/router'; @NgModule({ - declarations: [PageNotFoundComponent, WebviewDirective], - imports: [CommonModule, TranslateModule, FormsModule], - exports: [TranslateModule, WebviewDirective, FormsModule] + declarations: [PageNotFoundComponent, SidebarComponent, WebviewDirective], + imports: [CommonModule, TranslateModule, FormsModule, RouterModule], + exports: [TranslateModule, WebviewDirective, FormsModule, SidebarComponent] }) export class SharedModule {}