fkranjec/TFTPaths
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop'

Browse source
This commit is contained in:
Daniel Rodriguez 2021-08-05 19:24:27 +02:00
commit 9fb13409d1
12 changed files with 50 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/app/app-routing.module.ts
View file

@ -1,11 +1,17 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router'; import { Routes, RouterModule } from '@angular/router';
import { LayoutComponent } from 'src/components/layout/layout.component';
const routes: Routes = [ 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({ @NgModule({

11
src/app/app.module.ts
View file

@ -3,23 +3,16 @@ import { NgModule } from '@angular/core';
import { AppRoutingModule } from './app-routing.module'; import { AppRoutingModule } from './app-routing.module';
import { AppComponent } from './app.component'; 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({ @NgModule({
declarations: [ declarations: [
AppComponent, AppComponent,
HomeComponent,
LayoutComponent
], ],
imports: [ imports: [
BrowserModule, BrowserModule,
AppRoutingModule, AppRoutingModule
ReactiveFormsModule
], ],
providers: [PoolService], providers: [],
bootstrap: [AppComponent] bootstrap: [AppComponent]
}) })
export class AppModule { } export class AppModule { }

9
src/index.html
View file

@ -7,15 +7,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico"> <link rel="icon" type="image/x-icon" href="favicon.ico">
<!-- Global site tag (gtag.js) - Google Analytics -->
<script async src="https://www.googletagmanager.com/gtag/js?id=UA-66417033-2"></script>
<script>
window.dataLayer = window.dataLayer || [];
function gtag(){dataLayer.push(arguments);}
gtag('js', new Date());
gtag('config', 'UA-66417033-2');
</script>
</head> </head>
<body style="background-color: #000000;"> <body style="background-color: #000000;">
<app-root></app-root> <app-root></app-root>

0
src/components/home/home.component.html → src/modules/pool/components/home/home.component.html
View file

0
src/components/home/home.component.scss → src/modules/pool/components/home/home.component.scss
View file

2
src/components/home/home.component.ts → src/modules/pool/components/home/home.component.ts
View file

@ -3,7 +3,7 @@ import { FormBuilder, FormGroup } from '@angular/forms';
import { Champion } from 'src/models/champion'; import { Champion } from 'src/models/champion';
import { Bonus } from 'src/models/bonus'; 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 { DomSanitizer } from '@angular/platform-browser';
import * as _ from 'lodash'; import * as _ from 'lodash';

0
src/components/layout/layout.component.html → src/modules/pool/components/layout/layout.component.html
View file

0
src/components/layout/layout.component.scss → src/modules/pool/components/layout/layout.component.scss
View file

0
src/components/layout/layout.component.ts → src/modules/pool/components/layout/layout.component.ts
View file

15
src/modules/pool/pool-routing.module.ts Normal file
View file

@ -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 { }

22
src/modules/pool/pool.module.ts Normal file
View file

@ -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 { }

1
src/shared/pool.service.ts → src/modules/pool/services/pool.service.ts
View file

@ -211,6 +211,7 @@ export class PoolService {
champion.isSelected = false; champion.isSelected = false;
return champion; return champion;
}); });
this.setChampions();
this.updateDataToShare(); this.updateDataToShare();
} }