diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 7fbdf98..998d06b 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,11 +1,17 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; -import { LayoutComponent } from 'src/components/layout/layout.component'; + const routes: Routes = [ - { path: '', component: LayoutComponent, pathMatch: 'full' }, - { path: '**', component: LayoutComponent, pathMatch: 'full' } + { + path: '', + loadChildren: () => import('../modules/pool/pool.module').then(m => m.PoolModule) + }, + { + path: '**', + loadChildren: () => import('../modules/pool/pool.module').then(m => m.PoolModule) + } ]; @NgModule({ diff --git a/src/app/app.module.ts b/src/app/app.module.ts index c668095..9db90f0 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,23 +3,16 @@ import { NgModule } from '@angular/core'; import { AppRoutingModule } from './app-routing.module'; import { AppComponent } from './app.component'; -import { HomeComponent } from '../components/home/home.component'; -import { ReactiveFormsModule } from '@angular/forms'; -import { LayoutComponent } from '../components/layout/layout.component'; -import { PoolService } from 'src/shared/pool.service'; @NgModule({ declarations: [ AppComponent, - HomeComponent, - LayoutComponent ], imports: [ BrowserModule, - AppRoutingModule, - ReactiveFormsModule + AppRoutingModule ], - providers: [PoolService], + providers: [], bootstrap: [AppComponent] }) export class AppModule { } diff --git a/src/index.html b/src/index.html index 78a9e14..2d8162e 100644 --- a/src/index.html +++ b/src/index.html @@ -7,15 +7,6 @@ - - - diff --git a/src/components/home/home.component.html b/src/modules/pool/components/home/home.component.html similarity index 100% rename from src/components/home/home.component.html rename to src/modules/pool/components/home/home.component.html diff --git a/src/components/home/home.component.scss b/src/modules/pool/components/home/home.component.scss similarity index 100% rename from src/components/home/home.component.scss rename to src/modules/pool/components/home/home.component.scss diff --git a/src/components/home/home.component.ts b/src/modules/pool/components/home/home.component.ts similarity index 97% rename from src/components/home/home.component.ts rename to src/modules/pool/components/home/home.component.ts index 08f2fd1..7f00d0f 100644 --- a/src/components/home/home.component.ts +++ b/src/modules/pool/components/home/home.component.ts @@ -3,7 +3,7 @@ import { FormBuilder, FormGroup } from '@angular/forms'; import { Champion } from 'src/models/champion'; import { Bonus } from 'src/models/bonus'; -import { PoolService } from 'src/shared/pool.service'; +import { PoolService } from 'src/modules/pool/services/pool.service'; import { DomSanitizer } from '@angular/platform-browser'; import * as _ from 'lodash'; diff --git a/src/components/layout/layout.component.html b/src/modules/pool/components/layout/layout.component.html similarity index 100% rename from src/components/layout/layout.component.html rename to src/modules/pool/components/layout/layout.component.html diff --git a/src/components/layout/layout.component.scss b/src/modules/pool/components/layout/layout.component.scss similarity index 100% rename from src/components/layout/layout.component.scss rename to src/modules/pool/components/layout/layout.component.scss diff --git a/src/components/layout/layout.component.ts b/src/modules/pool/components/layout/layout.component.ts similarity index 100% rename from src/components/layout/layout.component.ts rename to src/modules/pool/components/layout/layout.component.ts diff --git a/src/modules/pool/pool-routing.module.ts b/src/modules/pool/pool-routing.module.ts new file mode 100644 index 0000000..6984d14 --- /dev/null +++ b/src/modules/pool/pool-routing.module.ts @@ -0,0 +1,15 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; +import { LayoutComponent } from 'src/modules/pool/components/layout/layout.component'; + + +const routes: Routes = [ + { path: '', component: LayoutComponent, pathMatch: 'full' }, + { path: '**', component: LayoutComponent, pathMatch: 'full' } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class PoolRoutingModule { } diff --git a/src/modules/pool/pool.module.ts b/src/modules/pool/pool.module.ts new file mode 100644 index 0000000..0db1085 --- /dev/null +++ b/src/modules/pool/pool.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; + +import { PoolRoutingModule } from './pool-routing.module'; +import { ReactiveFormsModule } from '@angular/forms'; +import { PoolService } from 'src/modules/pool/services/pool.service'; +import { LayoutComponent } from './components/layout/layout.component'; +import { HomeComponent } from './components/home/home.component'; +import { CommonModule } from '@angular/common'; + +@NgModule({ + declarations: [ + LayoutComponent, + HomeComponent + ], + imports: [ + CommonModule, + PoolRoutingModule, + ReactiveFormsModule + ], + providers: [PoolService] +}) +export class PoolModule { } diff --git a/src/shared/pool.service.ts b/src/modules/pool/services/pool.service.ts similarity index 99% rename from src/shared/pool.service.ts rename to src/modules/pool/services/pool.service.ts index d4d81da..455fb5c 100644 --- a/src/shared/pool.service.ts +++ b/src/modules/pool/services/pool.service.ts @@ -211,6 +211,7 @@ export class PoolService { champion.isSelected = false; return champion; }); + this.setChampions(); this.updateDataToShare(); }