Skip to content

Commit

Permalink
feat: use angular 2 modules
Browse files Browse the repository at this point in the history
  • Loading branch information
SteveVanOpstal committed Sep 21, 2016
1 parent addd1d1 commit dba8ce9
Show file tree
Hide file tree
Showing 43 changed files with 307 additions and 113 deletions.
32 changes: 32 additions & 0 deletions 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 {
}
21 changes: 21 additions & 0 deletions 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 {
}
102 changes: 2 additions & 100 deletions src/client/boot.ts
Expand Up @@ -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));
19 changes: 19 additions & 0 deletions 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 {
}
@@ -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]',
Expand Down
17 changes: 17 additions & 0 deletions 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 {
}
@@ -1,6 +1,6 @@
import {Component, Input} from '@angular/core';

import {Path} from './graph.component';
import {Path} from '../graph.component';

@Component({
selector: 'legend',
Expand Down
17 changes: 17 additions & 0 deletions 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 {
}
8 changes: 4 additions & 4 deletions src/client/build/masteries/masteries.component.spec.ts
Expand Up @@ -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';
Expand Down
20 changes: 20 additions & 0 deletions 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 {
}
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/client/build/masteries/mastery-tier.component.spec.ts
Expand Up @@ -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';
Expand Down
2 changes: 1 addition & 1 deletion src/client/build/masteries/mastery.component.spec.ts
Expand Up @@ -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';
Expand Down
18 changes: 18 additions & 0 deletions 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 {
}
2 changes: 1 addition & 1 deletion 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',
Expand Down
28 changes: 28 additions & 0 deletions 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 {
}
2 changes: 1 addition & 1 deletion 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';
Expand Down
21 changes: 21 additions & 0 deletions 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 {
}

0 comments on commit dba8ce9

Please sign in to comment.