Refactoring

src/app/components/shared/card-container/card-container.component.html

@@ -0,0 +1,16 @@
+<mat-card class="my-3">
+    <mat-card-header class="{{ colors.background }} {{ colors.text }} d-flex rounded-top py-2 px-3">
+        <div class="flex-fill">
+            <mat-card-title>
+                {{ title }}
+            </mat-card-title>
+        </div>
+        <span class="flex-spacer"></span>
+        <div class="align-self-center text-end">
+            <span class="fs-5 font-light">{{ subtitle }}</span>
+        </div>
+    </mat-card-header>
+    <mat-card-content class="table-responsive p-0">
+        <ng-content></ng-content>
+    </mat-card-content>
+</mat-card>

src/app/components/shared/card-container/card-container.component.ts

@@ -0,0 +1,18 @@
+import { Component, Input } from '@angular/core';
+import { NgForOf, NgIf } from "@angular/common";
+import { MatCardModule } from '@angular/material/card';
+
+import { CardColors } from 'src/app/core';
+
+@Component({
+    selector: 'app-card-container',
+    templateUrl: './card-container.component.html',
+    standalone: true,
+    imports: [NgIf, NgForOf, MatCardModule]
+})
+export class CardContainerComponent {
+    errorList: string[] = [];
+    @Input() colors: CardColors = { background: 'bg-megna', text: 'text-bg-primary' };
+    @Input() title: string = 'Title';
+    @Input() subtitle: string = 'Subtitle';
+}

src/app/components/shared/dashboard-components/aeronefs-bar/aeronefs-bar.component.ts

@@ -8,11 +8,11 @@ import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
 import { Observable, Subscription } from 'rxjs';
 
-import { MenuItems } from 'src/app/components/shared';
-import { BarHorizontalChartComponent } from 'src/app/components/shared/helpers-chart';
-import { HistoryTableComponent } from 'src/app/components/shared/helpers-jump';
-import { UtilitiesService, AeronefsService } from 'src/app/core/services';
-import { AeronefByImat, AeronefByYear } from 'src/app/core/models';
+import { MenuItems } from '@components/shared';
+import { BarHorizontalChartComponent } from '@components/shared/helpers-chart';
+import { HistoryTableComponent } from '@components/shared/helpers-jump';
+import { UtilitiesService, AeronefsService } from '@services';
+import { AeronefByImat, AeronefByYear } from '@models';
 
 @Component({
     selector: 'app-aeronefs-bar',

src/app/components/shared/dashboard-components/aeronefs-pie/aeronefs-pie.component.ts

@@ -9,11 +9,11 @@ import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
 import { Observable, Subscription } from 'rxjs';
 
-import { MenuItems } from 'src/app/components/shared';
-import { HistoryTableComponent } from 'src/app/components/shared/helpers-jump';
-import { PieChartComponent } from 'src/app/components/shared/helpers-chart';
-import { UtilitiesService, AeronefsService } from 'src/app/core/services';
-import { AeronefByImat, AeronefByYear } from 'src/app/core/models';
+import { MenuItems } from '@components/shared';
+import { HistoryTableComponent } from '@components/shared/helpers-jump';
+import { PieChartComponent } from '@components/shared/helpers-chart';
+import { UtilitiesService, AeronefsService } from '@services';
+import { AeronefByImat, AeronefByYear } from '@models';
 
 @Component({
     selector: 'app-aeronefs-pie',

src/app/components/shared/dashboard-components/canopies-models/canopies-models.component.ts

@@ -8,11 +8,11 @@ import { MatIconModule } from '@angular/material/icon';
 import { MatMenuModule } from '@angular/material/menu';
 import { Observable, Subscription } from 'rxjs';
 
-import { MenuItems } from 'src/app/components/shared';
-import { PieChartComponent } from 'src/app/components/shared/helpers-chart';
-import { HistoryTableComponent } from 'src/app/components/shared/helpers-jump';
-import { UtilitiesService, CanopiesService } from 'src/app/core/services';
-import { CanopyModelBySize, CanopyModelByYear } from 'src/app/core/models';
+import { MenuItems } from '@components/shared';
+import { PieChartComponent } from '@components/shared/helpers-chart';
+import { HistoryTableComponent } from '@components/shared/helpers-jump';
+import { UtilitiesService, CanopiesService } from '@services';
+import { CanopyModelBySize, CanopyModelByYear } from '@models';
 
 @Component({
     selector: 'app-canopies-models',

src/app/components/shared/dashboard-components/canopies-sizes/canopies-sizes.component.ts

@@ -9,11 +9,11 @@ import { MatMenuModule } from '@angular/material/menu';
 
 import { Observable, Subscription } from 'rxjs';
 
-import { MenuItems } from 'src/app/components/shared';
-import { PieChartComponent } from 'src/app/components/shared/helpers-chart';
-import { HistoryTableComponent } from 'src/app/components/shared/helpers-jump';
-import { UtilitiesService, CanopiesService } from 'src/app/core/services';
-import { CanopyBySize, CanopyByYear } from 'src/app/core/models';
+import { MenuItems } from '@components/shared';
+import { PieChartComponent } from '@components/shared/helpers-chart';
+import { HistoryTableComponent } from '@components/shared/helpers-jump';
+import { UtilitiesService, CanopiesService } from '@services';
+import { CanopyBySize, CanopyByYear } from '@models';
 
 @Component({
     selector: 'app-canopies-sizes',

src/app/components/shared/dashboard-components/dropzones-bar/dropzones-bar.component.ts

@@ -11,10 +11,10 @@ import { ChartistModule, Configuration } from 'ng-chartist';
 import { AxisOptions, Label } from 'chartist';
 import { Observable, Subscription } from 'rxjs';
 
-import { MenuItems } from 'src/app/components/shared';
-import { HistoryTableComponent } from 'src/app/components/shared/helpers-jump';
-import { UtilitiesService, DropZonesService } from 'src/app/core/services';
-import { DropZoneByOaci, DropZoneByYear } from 'src/app/core/models';
+import { MenuItems } from '@components/shared';
+import { HistoryTableComponent } from '@components/shared/helpers-jump';
+import { UtilitiesService, DropZonesService } from '@services';
+import { DropZoneByOaci, DropZoneByYear } from '@models';
 
 @Component({
     selector: 'app-dropzones-bar',

src/app/components/shared/dashboard-components/dropzones-pie/dropzones-pie.component.ts

@@ -9,11 +9,11 @@ import { MatMenuModule } from '@angular/material/menu';
 //import { ChartConfiguration } from 'chart.js';
 import { Observable, Subscription } from 'rxjs';
 
-import { MenuItems } from 'src/app/components/shared';
-import { PieChartComponent } from 'src/app/components/shared/helpers-chart';
-import { HistoryTableComponent } from 'src/app/components/shared/helpers-jump';
-import { UtilitiesService, DropZonesService } from 'src/app/core/services';
-import { DropZoneByOaci, DropZoneByYear } from 'src/app/core/models';
+import { MenuItems } from '@components/shared';
+import { PieChartComponent } from '@components/shared/helpers-chart';
+import { HistoryTableComponent } from '@components/shared/helpers-jump';
+import { UtilitiesService, DropZonesService } from '@services';
+import { DropZoneByOaci, DropZoneByYear } from '@models';
 
 @Component({
     selector: 'app-dropzones-pie',

src/app/components/shared/dashboard-components/jumps-by-month/jumps-by-month.component.ts

@@ -12,9 +12,9 @@ import { AxisOptions, Label } from 'chartist';
 
 import { Observable, Subscription } from 'rxjs';
 
-import { MenuItems } from 'src/app/components/shared';
-import { UtilitiesService, JumpsService } from 'src/app/core/services';
-import { JumpByDate } from 'src/app/core/models';
+import { MenuItems } from '@components/shared';
+import { UtilitiesService, JumpsService } from '@services';
+import { JumpByDate } from '@models';
 
 @Component({
     selector: 'app-jumps-by-month',

src/app/components/shared/helpers-chart/bar-chart.component.ts

@@ -2,8 +2,8 @@ import { Component, Input, OnChanges } from '@angular/core';
 import { ChartDataset } from 'chart.js';
 import { BaseChartDirective } from 'ng2-charts';
 
-import { UtilitiesService } from 'src/app/core/services';
-import { BarConfig } from 'src/app/core/models';
+import { UtilitiesService } from '@services';
+import { BarConfig } from '@models';
 
 @Component({
     selector: 'app-bar-chart',

src/app/components/shared/helpers-chart/bar-horizontal-chart.component.ts

@@ -2,8 +2,8 @@ import { Component, Input, OnChanges } from '@angular/core';
 import { ChartDataset } from 'chart.js';
 import { BaseChartDirective } from 'ng2-charts';
 
-import { UtilitiesService } from 'src/app/core/services';
-import { BarConfig } from 'src/app/core/models';
+import { UtilitiesService } from '@services';
+import { BarConfig } from '@models';
 
 @Component({
     selector: 'app-bar-horizontal-chart',

src/app/components/shared/helpers-chart/bars-chart.component.ts

@@ -2,8 +2,8 @@ import { Component, Input, OnChanges, AfterContentChecked } from '@angular/core'
 import { ChartDataset } from 'chart.js';
 import { BaseChartDirective } from 'ng2-charts';
 
-import { UtilitiesService } from 'src/app/core/services';
-import { BarConfig } from 'src/app/core/models';
+import { UtilitiesService } from '@services';
+import { BarConfig } from '@models';
 
 @Component({
     selector: 'app-bars-chart',

src/app/components/shared/helpers-chart/circle-chart.component.ts

@@ -2,8 +2,8 @@ import { Component, Input, OnChanges } from '@angular/core';
 //import { ChartDataset } from 'chart.js';
 import { BaseChartDirective } from 'ng2-charts';
 
-import { UtilitiesService } from 'src/app/core/services';
-import { CircleConfig } from 'src/app/core/models';
+import { UtilitiesService } from '@services';
+import { CircleConfig } from '@models';
 
 @Component({
     selector: 'app-circle-chart',

src/app/components/shared/helpers-chart/line-chart.component.ts

@@ -2,8 +2,8 @@ import { Component, Input, OnChanges } from '@angular/core';
 import { ChartDataset, Point } from 'chart.js';
 import { BaseChartDirective } from 'ng2-charts';
 
-import { UtilitiesService } from 'src/app/core/services';
-import { LineConfig } from 'src/app/core/models';
+import { UtilitiesService } from '@services';
+import { LineConfig } from '@models';
 
 @Component({
     selector: 'app-line-chart',

src/app/components/shared/helpers-chart/linearea-chart.component.ts

@@ -2,8 +2,8 @@ import { Component, Input, OnChanges } from '@angular/core';
 import { ChartDataset } from 'chart.js';
 import { BaseChartDirective } from 'ng2-charts';
 
-import { UtilitiesService } from 'src/app/core/services';
-import { LineConfig } from 'src/app/core/models';
+import { UtilitiesService } from '@services';
+import { LineConfig } from '@models';
 
 @Component({
     selector: 'app-linearea-chart',

src/app/components/shared/helpers-chart/pie-chart.component.ts

@@ -2,8 +2,8 @@ import { Component, Input, OnChanges } from '@angular/core';
 //import { ChartDataset } from 'chart.js';
 import { BaseChartDirective } from 'ng2-charts';
 
-import { UtilitiesService } from 'src/app/core/services';
-import { DoughnutConfig } from 'src/app/core/models';
+import { UtilitiesService } from '@services';
+import { DoughnutConfig } from '@models';
 
 @Component({
     selector: 'app-pie-chart',

src/app/components/shared/helpers-jump/jump-list.component.ts

@@ -6,8 +6,8 @@ import { MatIconModule } from '@angular/material/icon';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { Observable, Subscription } from 'rxjs';
 
-import { Errors, Jump, JumpList, JumpListConfig } from 'src/app/core/models';
-import { JumpsService } from 'src/app/core/services';
+import { Errors, Jump, JumpList, JumpListConfig } from '@models';
+import { JumpsService } from '@services';
 import { JumpPreviewComponent } from './jump-preview.component';
 
 @Component({

src/app/components/shared/helpers-jump/jump-meta.component.ts

@@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core';
 import { DatePipe } from '@angular/common';
 import { RouterLink } from '@angular/router';
 
-import { Jump } from 'src/app/core/models';
+import { Jump } from '@models';
 
 @Component({
     selector: 'app-jump-meta',

src/app/components/shared/helpers-jump/jump-preview.component.ts

@@ -7,8 +7,8 @@ import { MatDividerModule } from '@angular/material/divider';
 import { Observable, Subscription } from 'rxjs';
 
 import { JumpMetaComponent } from './jump-meta.component';
-import { Jump } from 'src/app/core/models';
-import { JumpsService } from 'src/app/core/services';
+import { Jump } from '@models';
+import { JumpsService } from '@services';
 
 @Component({
     selector: 'app-jump-preview',

src/app/components/shared/helpers-jump/jump-table.component.ts

@@ -20,10 +20,10 @@ import { Observable, Subscription } from 'rxjs';
 import { take } from 'rxjs/operators';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
-import { FrenchPaginator } from 'src/app/components/shared/french-paginator.component';
-import { ColumnDefinition, Errors, Jump, JumpByDay, JumpFile, JumpFileType, JumpList, JumpListConfig, jumpColumns } from 'src/app/core/models';
-import { JumpsService, JumpTableService } from 'src/app/core/services';
-import { JumpAddDialogComponent, JumpDeleteDialogComponent, JumpEditDialogComponent, JumpViewDialogComponent } from 'src/app/components/logbook/dialogs'
+import { FrenchPaginator } from '@components/shared/french-paginator.component';
+import { ColumnDefinition, Errors, Jump, JumpByDay, JumpFile, JumpFileType, JumpList, JumpListConfig, jumpColumns } from '@models';
+import { JumpsService, JumpTableService } from '@services';
+import { JumpAddDialogComponent, JumpDeleteDialogComponent, JumpEditDialogComponent, JumpViewDialogComponent } from '@components/logbook/dialogs'
 
 @Component({
     standalone: true,

src/app/components/shared/herowars-components/fortification-card-content/fortification-card-content.component.ts

@@ -4,9 +4,9 @@ import { MatCardModule } from '@angular/material/card';
 import { MatChipsModule } from '@angular/material/chips';
 import { MatIconModule } from '@angular/material/icon';
 
-//import { Errors } from 'src/app/core/models';
-//import { HWMember, HWGuildWarFortification, HWGuildWarHeroTeam, HWGuildWarTitanTeam } from 'src/app/core/models';
-import { HWGuildWarFortification, HWMember } from 'src/app/core/models';
+//import { Errors } from '@models';
+//import { HWMember, HWGuildWarFortification, HWGuildWarHeroTeam, HWGuildWarTitanTeam } from '@models';
+import { HWGuildWarFortification, HWMember } from '@models';
 
 @Component({
     selector: 'app-fortification-card-content',

src/app/components/shared/herowars-components/guild-card/guild-card.component.ts

@@ -4,7 +4,7 @@ import { MatCardModule } from '@angular/material/card';
 import { MatDividerModule } from '@angular/material/divider';
 import { MatIconModule } from '@angular/material/icon';
 
-import { HWGuildData, HWGuildClan, HWGuildStat } from 'src/app/core/models';
+import { HWGuildData, HWGuildClan, HWGuildStat } from '@models';
 
 import guildData from 'src/files-data/hw-guild-data.json'; // page Membres
 

src/app/components/shared/herowars-components/guildraids-log/guildraids-log.component.ts

@@ -12,7 +12,7 @@ import { MatInputModule } from '@angular/material/input';
 import { MatStepperIntl, MatStepperModule } from '@angular/material/stepper';
 import { MatTooltipModule } from '@angular/material/tooltip';
 
-import { HWGuildRaid, HWGuildRaidAttacker, HWGuildRaidAttackers, HWGuildRaidStage, HWMember } from 'src/app/core/models';
+import { HWGuildRaid, HWGuildRaidAttacker, HWGuildRaidAttackers, HWGuildRaidStage, HWMember } from '@models';
 
 import guildRaids from 'src/files-data/hw-guild-raids.json'; // page Asgard -> Guild Raid -> Log
 

src/app/components/shared/herowars-components/guildwar-attack/guildwar-attack.component.ts

@@ -4,11 +4,11 @@ import { MatCardModule } from '@angular/material/card';
 import { MatDividerModule } from '@angular/material/divider';
 import { MatIconModule } from '@angular/material/icon';
 
-import { FortificationCardContentComponent } from 'src/app/components/shared';
+import { FortificationCardContentComponent } from '@components/shared';
 import {
     HWGuildWarEnemySlot, HWGuildWarEnemyTeam, HWGuildWarFortification,
     HWGuildWarHeroTeam, HWGuildWarTitanTeam, HWGuildWarSlots, HWMember
-} from 'src/app/core/models';
+} from '@models';
 
 /* JSON data */
 import guildWarData from 'src/files-data/hw-guild-war.json';        // page Overview -> Statistics | page Guild War -> Guild War

src/app/components/shared/herowars-components/guildwar-champions/guildwar-champions.component.ts

@@ -4,8 +4,8 @@ import { MatCardModule } from '@angular/material/card';
 import { MatDividerModule } from '@angular/material/divider';
 import { MatIconModule } from '@angular/material/icon';
 
-import { HWMember } from 'src/app/core/models';
-//import { HWGuildWarFortification, HWMember } from 'src/app/core/models';
+import { HWMember } from '@models';
+//import { HWGuildWarFortification, HWMember } from '@models';
 
 @Component({
     selector: 'app-guildwar-champions',

src/app/components/shared/herowars-components/guildwar-defence/guildwar-defence.component.ts

@@ -4,9 +4,9 @@ import { MatCardModule } from '@angular/material/card';
 import { MatDividerModule } from '@angular/material/divider';
 import { MatIconModule } from '@angular/material/icon';
 
-import { FortificationCardContentComponent } from 'src/app/components/shared';
-//import { HWMember } from 'src/app/core/models';
-import { HWGuildWarFortification, HWGuildWarHeroTeam, HWGuildWarSlots, HWGuildWarTitanTeam, HWMember } from 'src/app/core/models';
+import { FortificationCardContentComponent } from '@components/shared';
+//import { HWMember } from '@models';
+import { HWGuildWarFortification, HWGuildWarHeroTeam, HWGuildWarSlots, HWGuildWarTitanTeam, HWMember } from '@models';
 
 /* JSON data */
 import guildWarData from 'src/files-data/hw-guild-war.json';        // page Overview -> Statistics | page Guild War -> Guild War
@@ -170,17 +170,17 @@ export class GuildwarDefenceComponent implements OnInit {
     }
 
     getGatesOfNature(): HWGuildWarFortification {
-        const indexes: number[] = [4, 9, 14, 19];
+        const indexes: number[] = [5, 10, 15, 16];
         return this._getFortification(indexes, 'titans', 'Gates Of Nature');
     }
 
     getBastionOfFire(): HWGuildWarFortification {
-        const indexes: number[] = [5, 10, 15, 16];
+        const indexes: number[] = [6, 11, 12, 17];
         return this._getFortification(indexes, 'titans', 'Bastion Of Fire');
     }
 
     getBastionOfIce(): HWGuildWarFortification {
-        const indexes: number[] = [6, 11, 12, 17];
+        const indexes: number[] = [4, 9, 14, 19];
         return this._getFortification(indexes, 'titans', 'Bastion Of Ice');
     }
 

src/app/components/shared/herowars-components/guildwar-teams/guildwar-teams.component.ts

@@ -4,7 +4,7 @@ import { MatCardModule } from '@angular/material/card';
 import { MatDividerModule } from '@angular/material/divider';
 import { MatIconModule } from '@angular/material/icon';
 
-import { HWGuildWarHeroTeam, HWGuildWarTitanTeam, HWMember } from 'src/app/core/models';
+import { HWGuildWarHeroTeam, HWGuildWarTitanTeam, HWMember } from '@models';
 
 import guildWarData from 'src/files-data/hw-guild-war.json'; // page Overview -> Statistics | page Guild War -> Guild War
 

src/app/components/shared/herowars-components/members-statistics/members-statistics.component.ts

@@ -4,8 +4,8 @@ import { MatCardModule } from '@angular/material/card';
 import { MatDividerModule } from '@angular/material/divider';
 import { MatIconModule } from '@angular/material/icon';
 
-import { HWActivityStat, HWGuildClan, HWGuildData, HWMember, HWMemberStat, HWWeekStat } from 'src/app/core/models/herowars';
-import { UtilitiesService } from 'src/app/core/services';
+import { HWActivityStat, HWGuildClan, HWGuildData, HWMember, HWMemberStat, HWWeekStat } from '@models/herowars';
+import { UtilitiesService } from '@services';
 
 import guildData from 'src/files-data/hw-guild-data.json';             // page Membres
 import guildStatistics from 'src/files-data/hw-guild-statistics.json'; // page Overview -> Statistics

src/app/components/shared/index.ts

@@ -1,4 +1,5 @@
 export * from './accordion';
+export * from './card-container/card-container.component';
 export * from './dashboard-components';
 export * from './helpers-chart';
 export * from './helpers-jump';

src/app/components/shared/layout/full.component.ts

@@ -11,12 +11,12 @@ import { MatToolbarModule } from '@angular/material/toolbar';
 import { MatMenuModule } from '@angular/material/menu';
 import { Observable, Subscription } from 'rxjs';
 
-import { Menu, User } from 'src/app/core/models';
-import { UserService } from 'src/app/core/services';
-import { MenuItems, ShowAuthedDirective, AccordionAnchorDirective, AccordionLinkDirective, AccordionDirective } from 'src/app/components/shared';
-//import { SpinnerComponent } from 'src/app/components/shared';
-//import { HeaderComponent, FooterComponent } from 'src/app/components/shared/layout';
-import { FooterComponent } from 'src/app/components/shared/layout';
+import { Menu, User } from '@models';
+import { UserService } from '@services';
+import { MenuItems, ShowAuthedDirective, AccordionAnchorDirective, AccordionLinkDirective, AccordionDirective } from '@components/shared';
+//import { SpinnerComponent } from '@components/shared';
+//import { HeaderComponent, FooterComponent } from '@components/shared/layout';
+import { FooterComponent } from '@components/shared/layout';
 
 
 /** @title Responsive sidenav */

src/app/components/shared/layout/header.component.ts

@@ -9,8 +9,8 @@ import { MatToolbarModule } from '@angular/material/toolbar';
 import { takeUntilDestroyed } from "@angular/core/rxjs-interop";
 import { Observable, Subscription } from 'rxjs';
 
-import { User } from 'src/app/core/models';
-import { UserService } from 'src/app/core/services';
+import { User } from '@models';
+import { UserService } from '@services';
 
 @Component({
     selector: 'app-layout-header',

src/app/components/shared/menu-items.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 
-import { Menu } from 'src/app/core/models/menu.model';
+import { Menu } from '@models/menu.model';
 
 const MENUAUTH: Menu[] = [
     { state: 'home', type: 'link', name: 'Accueil', icon: 'home', icontype: 'mat', desc: '' },

src/app/components/shared/show-authed.directive.ts

@@ -1,7 +1,7 @@
 import { Directive, Input, OnInit, OnDestroy, TemplateRef, ViewContainerRef } from '@angular/core';
 import { Observable, Subscription } from 'rxjs';
 
-import { UserService } from 'src/app/core/services';
+import { UserService } from '@services';
 
 @Directive({
     selector: '[appShowAuthed]',