Skip to content

Commit

Permalink
Refactoring modules (issue #7)
Browse files Browse the repository at this point in the history
  • Loading branch information
danmgs committed Jan 1, 2019
1 parent fa28dce commit 8d3387b
Show file tree
Hide file tree
Showing 8 changed files with 1,016 additions and 837 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,3 +44,4 @@ Thumbs.db

# Output log
log
server/package-lock.json
40 changes: 15 additions & 25 deletions public/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,52 +4,42 @@ import { HttpModule } from '@angular/http';
import { FormsModule } from '@angular/forms';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';

/** Modules by feature **/
import { WeatherModule } from './views/weather/weather.module';
import { NewsModule } from './views/news/news.module';
import { QuoteModule } from './views/quote-list/quote.module';
import { PrimeNgModule } from './primeng.module';
import { CustomFiltersModule } from './customfilters.module';

import { AppComponent } from './app.component';
import { HeaderComponent } from './views/header/header.component';
import { FooterComponent } from './views/footer/footer.component';
import { WeatherListComponent } from './views/weather/weather-list/weather-list.component';
import { WeatherFavAddressListComponent } from './views/weather/weather-fav-address-list/weather-fav-address-list.component';
import { QuoteListComponent } from './views/quote-list/quote-list.component';
import { NewsSourcesListComponent } from './views/news/news-sources-list/news-sources-list.component';
import { NewsArticlesListComponent } from './views/news/news-articles-list/news-articles-list.component';

import { ExponentialStrengthPipe } from './filters/exponential-strength-pipe';
import { ConvertToDegrePipe } from './filters/convert-degre-pipe';
import { TruncatePipe } from './filters/truncate-pipe';

/** Services **/
import { WeatherService } from './services/weather.service';
import { GeoService } from './services/geo.service';
import { QuoteService } from './services/quote.service';
import { NewsService } from './services/news.service';

import { AppRoutingModule } from './app-routing.module';

import { ButtonModule, CheckboxModule, ChartModule, GrowlModule, CalendarModule } from 'primeng/primeng';

@NgModule({
declarations: [
AppComponent,
HeaderComponent,
FooterComponent,
WeatherListComponent,
WeatherFavAddressListComponent,
QuoteListComponent,
NewsSourcesListComponent,
NewsArticlesListComponent,
ExponentialStrengthPipe,
ConvertToDegrePipe,
TruncatePipe],
FooterComponent
],
imports: [
BrowserModule,
AppRoutingModule,
HttpModule,
FormsModule,
BrowserAnimationsModule,
ButtonModule,
CheckboxModule,
ChartModule,
GrowlModule,
CalendarModule
CustomFiltersModule,
PrimeNgModule,
WeatherModule,
NewsModule,
QuoteModule
],
providers: [WeatherService, GeoService, QuoteService, NewsService],
bootstrap: [AppComponent]
Expand Down
20 changes: 20 additions & 0 deletions public/src/app/customfilters.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { NgModule } from "@angular/core";

import { ExponentialStrengthPipe } from './filters/exponential-strength-pipe';
import { ConvertToDegrePipe } from './filters/convert-degre-pipe';
import { TruncatePipe } from './filters/truncate-pipe';

@NgModule({
declarations: [
ExponentialStrengthPipe,
ConvertToDegrePipe,
TruncatePipe
],
imports: [],
exports: [
ExponentialStrengthPipe,
ConvertToDegrePipe,
TruncatePipe
]
})
export class CustomFiltersModule { }
23 changes: 23 additions & 0 deletions public/src/app/primeng.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { NgModule } from "@angular/core";
import { CommonModule } from "@angular/common";

import { ButtonModule, CheckboxModule, ChartModule, GrowlModule, CalendarModule } from 'primeng/primeng';

@NgModule({
imports: [
CommonModule,
ButtonModule,
CheckboxModule,
ChartModule,
GrowlModule,
CalendarModule
],
exports: [
ButtonModule,
CheckboxModule,
ChartModule,
GrowlModule,
CalendarModule
],
})
export class PrimeNgModule { }
15 changes: 15 additions & 0 deletions public/src/app/views/news/news.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { NgModule } from "@angular/core";
import { CommonModule } from "@angular/common";

import { NewsSourcesListComponent } from './news-sources-list/news-sources-list.component';
import { NewsArticlesListComponent } from './news-articles-list/news-articles-list.component';

@NgModule({
declarations: [
NewsSourcesListComponent,
NewsArticlesListComponent
],
imports: [CommonModule],
exports: []
})
export class NewsModule {}
22 changes: 22 additions & 0 deletions public/src/app/views/quote-list/quote.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { NgModule } from "@angular/core";
import { CommonModule } from "@angular/common";
import { FormsModule } from '@angular/forms';

import { CustomFiltersModule } from '../../customfilters.module';
import { PrimeNgModule } from '../../primeng.module';

import { QuoteListComponent } from './quote-list.component';

@NgModule({
declarations: [
QuoteListComponent
],
imports: [
CommonModule,
FormsModule,
CustomFiltersModule,
PrimeNgModule
],
exports: []
})
export class QuoteModule {}
23 changes: 23 additions & 0 deletions public/src/app/views/weather/weather.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import { NgModule } from "@angular/core";
import { CommonModule } from "@angular/common";
import { FormsModule } from '@angular/forms';
import { CustomFiltersModule } from '../../customfilters.module';
import { PrimeNgModule } from '../../primeng.module';

import { WeatherListComponent } from './weather-list/weather-list.component';
import { WeatherFavAddressListComponent } from './weather-fav-address-list/weather-fav-address-list.component';

@NgModule({
declarations: [
WeatherListComponent,
WeatherFavAddressListComponent
],
imports: [
CommonModule,
FormsModule,
CustomFiltersModule,
PrimeNgModule
],
exports: []
})
export class WeatherModule { }
Loading

0 comments on commit 8d3387b

Please sign in to comment.