From dba8ce9020d820e216e7c4c29993c0feab4e1b96 Mon Sep 17 00:00:00 2001 From: SteveVanOpstal Date: Thu, 22 Sep 2016 00:13:18 +0200 Subject: [PATCH] feat: use angular 2 modules --- src/client/app.module.ts | 32 ++++++ src/client/assets/assets.module.ts | 21 ++++ src/client/boot.ts | 102 +----------------- src/client/build/build.module.ts | 19 ++++ .../ability-sequence.component.spec.ts | 0 .../ability-sequence.component.ts | 4 +- src/client/build/graph/graph.module.ts | 17 +++ .../{ => legend}/legend.component.spec.ts | 0 .../graph/{ => legend}/legend.component.ts | 2 +- src/client/build/items/items.module.ts | 17 +++ .../masteries/masteries.component.spec.ts | 8 +- .../build/masteries/masteries.module.ts | 20 ++++ .../mastery-category.component.spec.ts | 2 +- .../masteries/mastery-tier.component.spec.ts | 2 +- .../build/masteries/mastery.component.spec.ts | 2 +- .../build/shop/preview/preview.module.ts | 18 ++++ src/client/build/shop/shop.component.ts | 2 +- src/client/build/shop/shop.module.ts | 28 +++++ src/client/champion/champion.component.ts | 2 +- src/client/champion/champion.module.ts | 21 ++++ src/client/login/login.module.ts | 15 +++ src/client/main/main.module.ts | 14 +++ src/client/region/region.module.ts | 16 +++ .../{misc => shared}/capitalize.pipe.spec.ts | 0 .../{misc => shared}/capitalize.pipe.ts | 0 .../ddragon.directive.spec.ts | 0 .../{misc => shared}/ddragon.directive.ts | 0 .../{misc => shared}/error.component.spec.ts | 0 .../{misc => shared}/error.component.ts | 0 .../{misc => shared}/help.component.spec.ts | 0 src/client/{misc => shared}/help.component.ts | 0 .../loading.component.spec.ts | 0 .../{misc => shared}/loading.component.ts | 0 .../{misc => shared}/retry.component.spec.ts | 0 .../{misc => shared}/retry.component.ts | 0 src/client/shared/shared.module.ts | 26 +++++ src/client/{misc => shared}/tim.spec.ts | 0 src/client/{misc => shared}/tim.ts | 0 .../{misc => shared}/to-iterable.pipe.spec.ts | 0 .../{misc => shared}/to-iterable.pipe.ts | 0 src/client/signup/signup.module.ts | 15 +++ src/client/summoner/summoner.module.ts | 13 +++ src/server/console.ts | 2 +- 43 files changed, 307 insertions(+), 113 deletions(-) create mode 100644 src/client/app.module.ts create mode 100644 src/client/assets/assets.module.ts create mode 100644 src/client/build/build.module.ts rename src/client/build/graph/{ => ability-sequence}/ability-sequence.component.spec.ts (100%) rename src/client/build/graph/{ => ability-sequence}/ability-sequence.component.ts (94%) create mode 100644 src/client/build/graph/graph.module.ts rename src/client/build/graph/{ => legend}/legend.component.spec.ts (100%) rename src/client/build/graph/{ => legend}/legend.component.ts (96%) create mode 100644 src/client/build/items/items.module.ts create mode 100644 src/client/build/masteries/masteries.module.ts create mode 100644 src/client/build/shop/preview/preview.module.ts create mode 100644 src/client/build/shop/shop.module.ts create mode 100644 src/client/champion/champion.module.ts create mode 100644 src/client/login/login.module.ts create mode 100644 src/client/main/main.module.ts create mode 100644 src/client/region/region.module.ts rename src/client/{misc => shared}/capitalize.pipe.spec.ts (100%) rename src/client/{misc => shared}/capitalize.pipe.ts (100%) rename src/client/{misc => shared}/ddragon.directive.spec.ts (100%) rename src/client/{misc => shared}/ddragon.directive.ts (100%) rename src/client/{misc => shared}/error.component.spec.ts (100%) rename src/client/{misc => shared}/error.component.ts (100%) rename src/client/{misc => shared}/help.component.spec.ts (100%) rename src/client/{misc => shared}/help.component.ts (100%) rename src/client/{misc => shared}/loading.component.spec.ts (100%) rename src/client/{misc => shared}/loading.component.ts (100%) rename src/client/{misc => shared}/retry.component.spec.ts (100%) rename src/client/{misc => shared}/retry.component.ts (100%) create mode 100644 src/client/shared/shared.module.ts rename src/client/{misc => shared}/tim.spec.ts (100%) rename src/client/{misc => shared}/tim.ts (100%) rename src/client/{misc => shared}/to-iterable.pipe.spec.ts (100%) rename src/client/{misc => shared}/to-iterable.pipe.ts (100%) create mode 100644 src/client/signup/signup.module.ts create mode 100644 src/client/summoner/summoner.module.ts diff --git a/src/client/app.module.ts b/src/client/app.module.ts new file mode 100644 index 0000000..b91473e --- /dev/null +++ b/src/client/app.module.ts @@ -0,0 +1,32 @@ +import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; +import {HttpModule} from '@angular/http'; +import {BrowserModule} from '@angular/platform-browser'; +import {RouterModule} from '@angular/router'; + +import {AccountModule} from './account/account.module'; +import {ActionsComponent} from './actions.component'; +import {AppComponent} from './app.component'; +import {ROUTES} from './app.routes'; +import {AssetsModule} from './assets/assets.module'; +import {AuthModule} from './auth/auth.module'; +import {BuildModule} from './build/build.module'; +import {ChampionModule} from './champion/champion.module'; +import {LoginModule} from './login/login.module'; +import {MainModule} from './main/main.module'; +import {RegionModule} from './region/region.module'; +import {SharedModule} from './shared/shared.module'; +import {SignupModule} from './signup/signup.module'; +import {SummonerModule} from './summoner/summoner.module'; + +@NgModule({ + imports: [ + BrowserModule, CommonModule, RouterModule.forRoot(ROUTES), HttpModule, AssetsModule, + SharedModule, AccountModule, AuthModule, BuildModule, ChampionModule, LoginModule, MainModule, + RegionModule, SignupModule, SummonerModule + ], + declarations: [AppComponent, ActionsComponent], + bootstrap: [AppComponent, ActionsComponent] +}) +export class AppModule { +} diff --git a/src/client/assets/assets.module.ts b/src/client/assets/assets.module.ts new file mode 100644 index 0000000..792e0f0 --- /dev/null +++ b/src/client/assets/assets.module.ts @@ -0,0 +1,21 @@ +import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; + +import {IconErrorComponent} from './icon-error.component'; +import {IconEyeComponent} from './icon-eye.component'; +import {IconLoadComponent} from './icon-load.component'; +import {IconRankComponent} from './icon-rank.component'; +import {IconRefreshComponent} from './icon-refresh.component'; + +@NgModule({ + imports: [CommonModule], + declarations: [ + IconErrorComponent, IconEyeComponent, IconLoadComponent, IconRankComponent, IconRefreshComponent + ], + exports: [ + IconErrorComponent, IconEyeComponent, IconLoadComponent, IconRankComponent, IconRefreshComponent + ], + providers: [] +}) +export class AssetsModule { +} diff --git a/src/client/boot.ts b/src/client/boot.ts index 363689d..68f9604 100644 --- a/src/client/boot.ts +++ b/src/client/boot.ts @@ -18,110 +18,12 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -import {CommonModule} from '@angular/common'; -import {enableProdMode, NgModule} from '@angular/core'; -import {HttpModule} from '@angular/http'; -import {BrowserModule} from '@angular/platform-browser'; +import {enableProdMode} from '@angular/core'; import {platformBrowserDynamic} from '@angular/platform-browser-dynamic'; -import {RouterModule} from '@angular/router'; - -import {ActionsComponent} from './actions.component'; -import {AppComponent} from './app.component'; -import {ROUTES} from './app.routes'; -import {IconErrorComponent} from './assets/icon-error.component'; -import {IconEyeComponent} from './assets/icon-eye.component'; -import {IconLoadComponent} from './assets/icon-load.component'; -import {IconRankComponent} from './assets/icon-rank.component'; -import {IconRefreshComponent} from './assets/icon-refresh.component'; -import {BuildComponent} from './build/build.component'; -import {AbilitySequenceComponent} from './build/graph/ability-sequence.component'; -import {GraphComponent} from './build/graph/graph.component'; -import {LegendComponent} from './build/graph/legend.component'; -import {ItemSlotComponent} from './build/items/item-slot.component'; -import {ItemComponent} from './build/items/item.component'; -import {ItemsComponent} from './build/items/items.component'; -import {MasteriesComponent} from './build/masteries/masteries.component'; -import {MasteryCategoryComponent} from './build/masteries/mastery-category.component'; -import {MasteryTierComponent} from './build/masteries/mastery-tier.component'; -import {MasteryComponent} from './build/masteries/mastery.component'; -import {ChampionPipe} from './build/shop/pipes/champion.pipe'; -import {HidePipe} from './build/shop/pipes/hide.pipe'; -import {MapPipe} from './build/shop/pipes/map.pipe'; -import {TranslatePipe} from './build/shop/pipes/translate.pipe'; -import {ItemsFromComponent} from './build/shop/preview/items-from.component'; -import {PreviewComponent} from './build/shop/preview/preview.component'; -import {ShopComponent} from './build/shop/shop.component'; -import {BarComponent} from './champion/bar/bar.component'; -import {ChampionComponent} from './champion/champion.component'; -import {FiltersComponent} from './champion/filters/filters.component'; -import {NamePipe} from './champion/pipes/name.pipe'; -import {SortPipe} from './champion/pipes/sort.pipe'; -import {TagsPipe} from './champion/pipes/tags.pipe'; -import {LoginComponent} from './login/login.component'; -import {MainComponent} from './main/main.component'; -import {CapitalizePipe} from './misc/capitalize.pipe'; -import {DDragonDirective} from './misc/ddragon.directive'; -import {ErrorComponent} from './misc/error.component'; -import {LoadingComponent} from './misc/loading.component'; -import {RetryComponent} from './misc/retry.component'; -import {ToIterablePipe} from './misc/to-iterable.pipe'; -import {RegionComponent} from './region/region.component'; -import {SignupComponent} from './signup/signup.component'; -import {SummonerComponent} from './summoner/summoner.component'; +import {AppModule} from './app.module.ts'; if (ENV === 'production') { enableProdMode(); } -@NgModule({ - declarations: [ - AppComponent, - ActionsComponent, - BuildComponent, - ChampionComponent, - RegionComponent, - SummonerComponent, - MainComponent, - LoginComponent, - SignupComponent, - DDragonDirective, - GraphComponent, - MasteriesComponent, - ItemsComponent, - ShopComponent, - LoadingComponent, - RetryComponent, - FiltersComponent, - TagsPipe, - SortPipe, - NamePipe, - CapitalizePipe, - ToIterablePipe, - BarComponent, - ErrorComponent, - LegendComponent, - AbilitySequenceComponent, - MasteryCategoryComponent, - MasteryTierComponent, - ItemComponent, - MasteryComponent, - ItemSlotComponent, - IconErrorComponent, - IconEyeComponent, - IconLoadComponent, - IconRankComponent, - IconRefreshComponent, - ChampionPipe, - HidePipe, - MapPipe, - TranslatePipe, - PreviewComponent, - ItemsFromComponent - ], - imports: [BrowserModule, CommonModule, RouterModule.forRoot(ROUTES), HttpModule], - bootstrap: [AppComponent, ActionsComponent] -}) -class AppModule { -} - platformBrowserDynamic().bootstrapModule(AppModule).catch(err => console.error(err)); diff --git a/src/client/build/build.module.ts b/src/client/build/build.module.ts new file mode 100644 index 0000000..0ef7b1c --- /dev/null +++ b/src/client/build/build.module.ts @@ -0,0 +1,19 @@ +import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; + +import {SharedModule} from '../shared/shared.module'; + +import {BuildComponent} from './build.component'; +import {GraphModule} from './graph/graph.module'; +import {ItemsModule} from './items/items.module'; +import {MasteriesModule} from './masteries/masteries.module'; +import {ShopModule} from './shop/shop.module'; + +@NgModule({ + imports: [CommonModule, SharedModule, GraphModule, ItemsModule, MasteriesModule, ShopModule], + declarations: [BuildComponent], + exports: [BuildComponent], + providers: [] +}) +export class BuildModule { +} diff --git a/src/client/build/graph/ability-sequence.component.spec.ts b/src/client/build/graph/ability-sequence/ability-sequence.component.spec.ts similarity index 100% rename from src/client/build/graph/ability-sequence.component.spec.ts rename to src/client/build/graph/ability-sequence/ability-sequence.component.spec.ts diff --git a/src/client/build/graph/ability-sequence.component.ts b/src/client/build/graph/ability-sequence/ability-sequence.component.ts similarity index 94% rename from src/client/build/graph/ability-sequence.component.ts rename to src/client/build/graph/ability-sequence/ability-sequence.component.ts index cc84055..1b5141d 100644 --- a/src/client/build/graph/ability-sequence.component.ts +++ b/src/client/build/graph/ability-sequence/ability-sequence.component.ts @@ -1,7 +1,7 @@ import {Component, OnInit} from '@angular/core'; -import {tim} from '../../misc/tim'; -import {BuildService} from '../services/build.service'; +import {tim} from '../../../shared/tim'; +import {BuildService} from '../../services/build.service'; @Component({ selector: 'g[ability-sequence]', diff --git a/src/client/build/graph/graph.module.ts b/src/client/build/graph/graph.module.ts new file mode 100644 index 0000000..cb10172 --- /dev/null +++ b/src/client/build/graph/graph.module.ts @@ -0,0 +1,17 @@ +import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; + +import {SharedModule} from '../../shared/shared.module'; + +import {AbilitySequenceComponent} from './ability-sequence/ability-sequence.component'; +import {GraphComponent} from './graph.component'; +import {LegendComponent} from './legend/legend.component'; + +@NgModule({ + imports: [CommonModule, SharedModule], + declarations: [GraphComponent, AbilitySequenceComponent, LegendComponent], + exports: [GraphComponent], + providers: [] +}) +export class GraphModule { +} diff --git a/src/client/build/graph/legend.component.spec.ts b/src/client/build/graph/legend/legend.component.spec.ts similarity index 100% rename from src/client/build/graph/legend.component.spec.ts rename to src/client/build/graph/legend/legend.component.spec.ts diff --git a/src/client/build/graph/legend.component.ts b/src/client/build/graph/legend/legend.component.ts similarity index 96% rename from src/client/build/graph/legend.component.ts rename to src/client/build/graph/legend/legend.component.ts index 3589e34..d0c6550 100644 --- a/src/client/build/graph/legend.component.ts +++ b/src/client/build/graph/legend/legend.component.ts @@ -1,6 +1,6 @@ import {Component, Input} from '@angular/core'; -import {Path} from './graph.component'; +import {Path} from '../graph.component'; @Component({ selector: 'legend', diff --git a/src/client/build/items/items.module.ts b/src/client/build/items/items.module.ts new file mode 100644 index 0000000..385ca6e --- /dev/null +++ b/src/client/build/items/items.module.ts @@ -0,0 +1,17 @@ +import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; + +import {SharedModule} from '../../shared/shared.module'; + +import {ItemSlotComponent} from './item-slot.component'; +import {ItemComponent} from './item.component'; +import {ItemsComponent} from './items.component'; + +@NgModule({ + imports: [CommonModule, SharedModule], + declarations: [ItemsComponent, ItemComponent, ItemSlotComponent], + exports: [ItemsComponent], + providers: [] +}) +export class ItemsModule { +} diff --git a/src/client/build/masteries/masteries.component.spec.ts b/src/client/build/masteries/masteries.component.spec.ts index 1b691ee..6bbd40c 100644 --- a/src/client/build/masteries/masteries.component.spec.ts +++ b/src/client/build/masteries/masteries.component.spec.ts @@ -7,11 +7,11 @@ import {IconErrorComponent} from '../../assets/icon-error.component'; import {IconLoadComponent} from '../../assets/icon-load.component'; import {IconRankComponent} from '../../assets/icon-rank.component'; import {IconRefreshComponent} from '../../assets/icon-refresh.component'; -import {DDragonDirective} from '../../misc/ddragon.directive'; -import {ErrorComponent} from '../../misc/error.component'; -import {LoadingComponent} from '../../misc/loading.component'; -import {RetryComponent} from '../../misc/retry.component'; import {LolApiService} from '../../services/lolapi.service'; +import {DDragonDirective} from '../../shared/ddragon.directive'; +import {ErrorComponent} from '../../shared/error.component'; +import {LoadingComponent} from '../../shared/loading.component'; +import {RetryComponent} from '../../shared/retry.component'; import {MockActivatedRoute, MockMockBackend} from '../../testing'; import {MasteriesComponent} from './masteries.component'; diff --git a/src/client/build/masteries/masteries.module.ts b/src/client/build/masteries/masteries.module.ts new file mode 100644 index 0000000..0db432e --- /dev/null +++ b/src/client/build/masteries/masteries.module.ts @@ -0,0 +1,20 @@ +import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; + +import {AssetsModule} from '../../assets/assets.module'; +import {SharedModule} from '../../shared/shared.module'; + +import {MasteriesComponent} from './masteries.component'; +import {MasteryCategoryComponent} from './mastery-category.component'; +import {MasteryTierComponent} from './mastery-tier.component'; +import {MasteryComponent} from './mastery.component'; + +@NgModule({ + imports: [CommonModule, AssetsModule, SharedModule], + declarations: + [MasteriesComponent, MasteryCategoryComponent, MasteryTierComponent, MasteryComponent], + exports: [MasteriesComponent], + providers: [] +}) +export class MasteriesModule { +} diff --git a/src/client/build/masteries/mastery-category.component.spec.ts b/src/client/build/masteries/mastery-category.component.spec.ts index 8b46346..8bedc1a 100644 --- a/src/client/build/masteries/mastery-category.component.spec.ts +++ b/src/client/build/masteries/mastery-category.component.spec.ts @@ -4,8 +4,8 @@ import {MockBackend} from '@angular/http/testing'; import {ActivatedRoute} from '@angular/router'; import {IconRankComponent} from '../../assets/icon-rank.component'; -import {DDragonDirective} from '../../misc/ddragon.directive'; import {LolApiService} from '../../services/lolapi.service'; +import {DDragonDirective} from '../../shared/ddragon.directive'; import {MockActivatedRoute} from '../../testing'; import {MasteryCategoryComponent} from './mastery-category.component'; diff --git a/src/client/build/masteries/mastery-tier.component.spec.ts b/src/client/build/masteries/mastery-tier.component.spec.ts index c1ba7f0..a8aa2e7 100644 --- a/src/client/build/masteries/mastery-tier.component.spec.ts +++ b/src/client/build/masteries/mastery-tier.component.spec.ts @@ -4,8 +4,8 @@ import {MockBackend} from '@angular/http/testing'; import {ActivatedRoute} from '@angular/router'; import {IconRankComponent} from '../../assets/icon-rank.component'; -import {DDragonDirective} from '../../misc/ddragon.directive'; import {LolApiService} from '../../services/lolapi.service'; +import {DDragonDirective} from '../../shared/ddragon.directive'; import {MockActivatedRoute} from '../../testing'; import {MasteryTierComponent} from './mastery-tier.component'; diff --git a/src/client/build/masteries/mastery.component.spec.ts b/src/client/build/masteries/mastery.component.spec.ts index baf591d..2c0c528 100644 --- a/src/client/build/masteries/mastery.component.spec.ts +++ b/src/client/build/masteries/mastery.component.spec.ts @@ -5,8 +5,8 @@ import {ActivatedRoute} from '@angular/router'; import {Colors} from '../../assets/icon-rank.component'; import {IconRankComponent} from '../../assets/icon-rank.component'; -import {DDragonDirective} from '../../misc/ddragon.directive'; import {LolApiService} from '../../services/lolapi.service'; +import {DDragonDirective} from '../../shared/ddragon.directive'; import {MockActivatedRoute} from '../../testing'; import {MasteryComponent} from './mastery.component'; diff --git a/src/client/build/shop/preview/preview.module.ts b/src/client/build/shop/preview/preview.module.ts new file mode 100644 index 0000000..3536ce8 --- /dev/null +++ b/src/client/build/shop/preview/preview.module.ts @@ -0,0 +1,18 @@ +import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; + +import {SharedModule} from '../../../shared/shared.module'; + +import {ItemComponent} from './item.component'; +import {ItemsFromComponent} from './items-from.component'; +import {PreviewComponent} from './preview.component'; + + +@NgModule({ + imports: [CommonModule, SharedModule], + declarations: [PreviewComponent, ItemsFromComponent, ItemComponent], + exports: [PreviewComponent], + providers: [] +}) +export class PreviewModule { +} diff --git a/src/client/build/shop/shop.component.ts b/src/client/build/shop/shop.component.ts index 31095b1..c594be4 100644 --- a/src/client/build/shop/shop.component.ts +++ b/src/client/build/shop/shop.component.ts @@ -1,7 +1,7 @@ import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; -import {ToIterablePipe} from '../../misc/to-iterable.pipe'; import {LolApiService} from '../../services/lolapi.service'; +import {ToIterablePipe} from '../../shared/to-iterable.pipe'; @Component({ selector: 'shop', diff --git a/src/client/build/shop/shop.module.ts b/src/client/build/shop/shop.module.ts new file mode 100644 index 0000000..87c416b --- /dev/null +++ b/src/client/build/shop/shop.module.ts @@ -0,0 +1,28 @@ +import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; + +import {AssetsModule} from '../../assets/assets.module'; +import {SharedModule} from '../../shared/shared.module'; + +import {ItemComponent} from './item.component'; +import {ChampionPipe} from './pipes/champion.pipe'; +import {HidePipe} from './pipes/hide.pipe'; +import {MapPipe} from './pipes/map.pipe'; +import {NamePipe} from './pipes/name.pipe'; +import {SortPipe} from './pipes/sort.pipe'; +import {TagsPipe} from './pipes/tags.pipe'; +import {TranslatePipe} from './pipes/translate.pipe'; +import {PreviewModule} from './preview/preview.module'; +import {ShopComponent} from './shop.component'; + +@NgModule({ + imports: [CommonModule, AssetsModule, SharedModule, PreviewModule], + declarations: [ + ShopComponent, ItemComponent, ChampionPipe, HidePipe, MapPipe, NamePipe, SortPipe, TagsPipe, + TranslatePipe + ], + exports: [ShopComponent], + providers: [] +}) +export class ShopModule { +} diff --git a/src/client/champion/champion.component.ts b/src/client/champion/champion.component.ts index aabd2ec..5f804ea 100644 --- a/src/client/champion/champion.component.ts +++ b/src/client/champion/champion.component.ts @@ -1,8 +1,8 @@ import {Component, OnInit, ViewEncapsulation} from '@angular/core'; import {ActivatedRoute, Router} from '@angular/router'; -import {ToIterablePipe} from '../misc/to-iterable.pipe'; import {LolApiService} from '../services/lolapi.service'; +import {ToIterablePipe} from '../shared/to-iterable.pipe'; import {NamePipe} from './pipes/name.pipe'; import {SortPipe} from './pipes/sort.pipe'; diff --git a/src/client/champion/champion.module.ts b/src/client/champion/champion.module.ts new file mode 100644 index 0000000..f93c3f3 --- /dev/null +++ b/src/client/champion/champion.module.ts @@ -0,0 +1,21 @@ +import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; + +import {SharedModule} from '../shared/shared.module'; + +import {BarComponent} from './bar/bar.component'; +import {ChampionComponent} from './champion.component'; +import {FiltersComponent} from './filters/filters.component'; +import {NamePipe} from './pipes/name.pipe'; +import {SortPipe} from './pipes/sort.pipe'; +import {TagsPipe} from './pipes/tags.pipe'; + +@NgModule({ + imports: [CommonModule, RouterModule, SharedModule], + declarations: [ChampionComponent, FiltersComponent, BarComponent, NamePipe, SortPipe, TagsPipe], + exports: [ChampionComponent], + providers: [] +}) +export class ChampionModule { +} diff --git a/src/client/login/login.module.ts b/src/client/login/login.module.ts new file mode 100644 index 0000000..b718584 --- /dev/null +++ b/src/client/login/login.module.ts @@ -0,0 +1,15 @@ +import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; + +import {SharedModule} from '../shared/shared.module'; + +import {LoginComponent} from './login.component'; + +@NgModule({ + imports: [CommonModule, SharedModule], + declarations: [LoginComponent], + exports: [LoginComponent], + providers: [] +}) +export class LoginModule { +} diff --git a/src/client/main/main.module.ts b/src/client/main/main.module.ts new file mode 100644 index 0000000..8b210b6 --- /dev/null +++ b/src/client/main/main.module.ts @@ -0,0 +1,14 @@ +import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; + +import {MainComponent} from './main.component'; + +@NgModule({ + imports: [CommonModule, RouterModule], + declarations: [MainComponent], + exports: [MainComponent], + providers: [] +}) +export class MainModule { +} diff --git a/src/client/region/region.module.ts b/src/client/region/region.module.ts new file mode 100644 index 0000000..4507cd4 --- /dev/null +++ b/src/client/region/region.module.ts @@ -0,0 +1,16 @@ +import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; + +import {SharedModule} from '../shared/shared.module'; + +import {RegionComponent} from './region.component'; + +@NgModule({ + imports: [CommonModule, RouterModule, SharedModule], + declarations: [RegionComponent], + exports: [RegionComponent], + providers: [] +}) +export class RegionModule { +} diff --git a/src/client/misc/capitalize.pipe.spec.ts b/src/client/shared/capitalize.pipe.spec.ts similarity index 100% rename from src/client/misc/capitalize.pipe.spec.ts rename to src/client/shared/capitalize.pipe.spec.ts diff --git a/src/client/misc/capitalize.pipe.ts b/src/client/shared/capitalize.pipe.ts similarity index 100% rename from src/client/misc/capitalize.pipe.ts rename to src/client/shared/capitalize.pipe.ts diff --git a/src/client/misc/ddragon.directive.spec.ts b/src/client/shared/ddragon.directive.spec.ts similarity index 100% rename from src/client/misc/ddragon.directive.spec.ts rename to src/client/shared/ddragon.directive.spec.ts diff --git a/src/client/misc/ddragon.directive.ts b/src/client/shared/ddragon.directive.ts similarity index 100% rename from src/client/misc/ddragon.directive.ts rename to src/client/shared/ddragon.directive.ts diff --git a/src/client/misc/error.component.spec.ts b/src/client/shared/error.component.spec.ts similarity index 100% rename from src/client/misc/error.component.spec.ts rename to src/client/shared/error.component.spec.ts diff --git a/src/client/misc/error.component.ts b/src/client/shared/error.component.ts similarity index 100% rename from src/client/misc/error.component.ts rename to src/client/shared/error.component.ts diff --git a/src/client/misc/help.component.spec.ts b/src/client/shared/help.component.spec.ts similarity index 100% rename from src/client/misc/help.component.spec.ts rename to src/client/shared/help.component.spec.ts diff --git a/src/client/misc/help.component.ts b/src/client/shared/help.component.ts similarity index 100% rename from src/client/misc/help.component.ts rename to src/client/shared/help.component.ts diff --git a/src/client/misc/loading.component.spec.ts b/src/client/shared/loading.component.spec.ts similarity index 100% rename from src/client/misc/loading.component.spec.ts rename to src/client/shared/loading.component.spec.ts diff --git a/src/client/misc/loading.component.ts b/src/client/shared/loading.component.ts similarity index 100% rename from src/client/misc/loading.component.ts rename to src/client/shared/loading.component.ts diff --git a/src/client/misc/retry.component.spec.ts b/src/client/shared/retry.component.spec.ts similarity index 100% rename from src/client/misc/retry.component.spec.ts rename to src/client/shared/retry.component.spec.ts diff --git a/src/client/misc/retry.component.ts b/src/client/shared/retry.component.ts similarity index 100% rename from src/client/misc/retry.component.ts rename to src/client/shared/retry.component.ts diff --git a/src/client/shared/shared.module.ts b/src/client/shared/shared.module.ts new file mode 100644 index 0000000..7d50b38 --- /dev/null +++ b/src/client/shared/shared.module.ts @@ -0,0 +1,26 @@ +import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; + +import {AssetsModule} from '../assets/assets.module'; + +import {CapitalizePipe} from './capitalize.pipe'; +import {DDragonDirective} from './ddragon.directive'; +import {ErrorComponent} from './error.component'; +import {HelpComponent} from './help.component'; +import {LoadingComponent} from './loading.component'; +import {RetryComponent} from './retry.component'; +import {ToIterablePipe} from './to-iterable.pipe'; + +@NgModule({ + imports: [CommonModule, AssetsModule], + declarations: [ + CapitalizePipe, DDragonDirective, ErrorComponent, HelpComponent, LoadingComponent, + RetryComponent, ToIterablePipe + ], + exports: [ + CapitalizePipe, DDragonDirective, ErrorComponent, HelpComponent, LoadingComponent, + RetryComponent, ToIterablePipe + ] +}) +export class SharedModule { +} diff --git a/src/client/misc/tim.spec.ts b/src/client/shared/tim.spec.ts similarity index 100% rename from src/client/misc/tim.spec.ts rename to src/client/shared/tim.spec.ts diff --git a/src/client/misc/tim.ts b/src/client/shared/tim.ts similarity index 100% rename from src/client/misc/tim.ts rename to src/client/shared/tim.ts diff --git a/src/client/misc/to-iterable.pipe.spec.ts b/src/client/shared/to-iterable.pipe.spec.ts similarity index 100% rename from src/client/misc/to-iterable.pipe.spec.ts rename to src/client/shared/to-iterable.pipe.spec.ts diff --git a/src/client/misc/to-iterable.pipe.ts b/src/client/shared/to-iterable.pipe.ts similarity index 100% rename from src/client/misc/to-iterable.pipe.ts rename to src/client/shared/to-iterable.pipe.ts diff --git a/src/client/signup/signup.module.ts b/src/client/signup/signup.module.ts new file mode 100644 index 0000000..2f8117b --- /dev/null +++ b/src/client/signup/signup.module.ts @@ -0,0 +1,15 @@ +import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; + +import {SharedModule} from '../shared/shared.module'; + +import {SignupComponent} from './signup.component'; + +@NgModule({ + imports: [CommonModule, SharedModule], + declarations: [SignupComponent], + exports: [SignupComponent], + providers: [] +}) +export class SignupModule { +} diff --git a/src/client/summoner/summoner.module.ts b/src/client/summoner/summoner.module.ts new file mode 100644 index 0000000..1963caa --- /dev/null +++ b/src/client/summoner/summoner.module.ts @@ -0,0 +1,13 @@ +import {CommonModule} from '@angular/common'; +import {NgModule} from '@angular/core'; + +import {SummonerComponent} from './summoner.component'; + +@NgModule({ + imports: [CommonModule], + declarations: [SummonerComponent], + exports: [SummonerComponent], + providers: [] +}) +export class SummonerModule { +} diff --git a/src/server/console.ts b/src/server/console.ts index 8418890..8176838 100644 --- a/src/server/console.ts +++ b/src/server/console.ts @@ -1,7 +1,7 @@ let chalk = require('chalk'); let dateFormat = require('dateformat'); -import {tim} from '../client/misc/tim'; +import {tim} from '../client/shared/tim'; export class ColorConsole { private timeStart = process.hrtime();