Merge branch 'hotfix/minor-fixes'

Author: xidedix

Angular4_CLI_Full_Project/package-lock.json

@@ -16,41 +16,41 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/common": "4.3.4",
-    "@angular/compiler": "4.3.4",
-    "@angular/core": "4.3.4",
-    "@angular/forms": "4.3.4",
-    "@angular/http": "4.3.4",
-    "@angular/platform-browser": "4.3.4",
-    "@angular/platform-browser-dynamic": "4.3.4",
-    "@angular/router": "4.3.4",
-    "@angular/upgrade": "4.3.4",
+    "@angular/common": "4.3.6",
+    "@angular/compiler": "4.3.6",
+    "@angular/core": "4.3.6",
+    "@angular/forms": "4.3.6",
+    "@angular/http": "4.3.6",
+    "@angular/platform-browser": "4.3.6",
+    "@angular/platform-browser-dynamic": "4.3.6",
+    "@angular/router": "4.3.6",
+    "@angular/upgrade": "4.3.6",
     "core-js": "2.5.0",
     "rxjs": "5.4.3",
     "ts-helpers": "1.1.2",
-    "zone.js": "0.8.16",
+    "zone.js": "0.8.17",
     "chart.js": "2.6.0",
-    "ngx-bootstrap": "1.8.1",
+    "ngx-bootstrap": "1.9.1",
     "ng2-charts": "1.6.0",
     "moment": "2.18.1"
   },
   "devDependencies": {
-    "@angular/cli": "1.3.0",
-    "@angular/compiler-cli": "4.3.4",
-    "@types/jasmine": "2.5.53",
-    "@types/node": "8.0.20",
+    "@angular/cli": "1.3.2",
+    "@angular/compiler-cli": "4.3.6",
+    "@types/jasmine": "2.5.54",
+    "@types/node": "8.0.26",
     "codelyzer": "3.1.2",
-    "jasmine-core": "2.7.0",
-    "jasmine-spec-reporter": "4.2.0",
-    "karma": "1.7.0",
+    "jasmine-core": "2.8.0",
+    "jasmine-spec-reporter": "4.2.1",
+    "karma": "1.7.1",
     "karma-chrome-launcher": "2.2.0",
     "karma-cli": "1.0.1",
     "karma-jasmine": "1.1.0",
     "karma-jasmine-html-reporter": "0.2.2",
     "karma-coverage-istanbul-reporter": "1.3.0",
     "protractor": "5.1.2",
     "ts-node": "3.3.0",
-    "tslint": "5.6.0",
+    "tslint": "5.7.0",
     "typescript": "2.4.2"
   },
   "engines": {

Angular4_CLI_Full_Project/package.json

@@ -3,21 +3,55 @@ import { NgModule } from '@angular/core';
 import { LocationStrategy, HashLocationStrategy } from '@angular/common';
 
 import { AppComponent } from './app.component';
-import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
-import { TabsModule } from 'ngx-bootstrap/tabs';
-import { NAV_DROPDOWN_DIRECTIVES } from './shared/nav-dropdown.directive';
 
-import { ChartsModule } from 'ng2-charts/ng2-charts';
-import { SIDEBAR_TOGGLE_DIRECTIVES } from './shared/sidebar.directive';
-import { AsideToggleDirective } from './shared/aside.directive';
-import { BreadcrumbsComponent } from './shared/breadcrumb.component';
+// Import containers
+import {
+  FullLayout,
+  SimpleLayout
+} from './containers';
+
+const APP_CONTAINERS = [
+  FullLayout,
+  SimpleLayout
+]
+
+// Import components
+import {
+  AppAside,
+  AppBreadcrumbs,
+  AppFooter,
+  AppHeader,
+  AppSidebar
+} from './components';
+
+const APP_COMPONENTS = [
+  AppAside,
+  AppBreadcrumbs,
+  AppFooter,
+  AppHeader,
+  AppSidebar
+]
 
-// Routing Module
+// Import directives
+import {
+  AsideToggleDirective,
+  NAV_DROPDOWN_DIRECTIVES,
+  SIDEBAR_TOGGLE_DIRECTIVES
+} from './directives';
+
+const APP_DIRECTIVES = [
+  AsideToggleDirective,
+  NAV_DROPDOWN_DIRECTIVES,
+  SIDEBAR_TOGGLE_DIRECTIVES
+]
+
+// Import routing module
 import { AppRoutingModule } from './app.routing';
 
-// Layouts
-import { FullLayoutComponent } from './layouts/full-layout.component';
-import { SimpleLayoutComponent } from './layouts/simple-layout.component';
+// Import 3rd party components
+import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
+import { TabsModule } from 'ngx-bootstrap/tabs';
+import { ChartsModule } from 'ng2-charts/ng2-charts';
 
 @NgModule({
   imports: [
@@ -29,12 +63,9 @@ import { SimpleLayoutComponent } from './layouts/simple-layout.component';
   ],
   declarations: [
     AppComponent,
-    FullLayoutComponent,
-    SimpleLayoutComponent,
-    NAV_DROPDOWN_DIRECTIVES,
-    BreadcrumbsComponent,
-    SIDEBAR_TOGGLE_DIRECTIVES,
-    AsideToggleDirective,
+    ...APP_CONTAINERS,
+    ...APP_COMPONENTS,
+    ...APP_DIRECTIVES
   ],
   providers: [{
     provide: LocationStrategy,

Angular4_CLI_Full_Project/src/app/app.module.ts

@@ -1,9 +1,11 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 
-// Layouts
-import { FullLayoutComponent } from './layouts/full-layout.component';
-import { SimpleLayoutComponent } from './layouts/simple-layout.component';
+// Import Containers
+import {
+  FullLayout,
+  SimpleLayout
+} from './containers';
 
 export const routes: Routes = [
   {
@@ -13,43 +15,43 @@ export const routes: Routes = [
   },
   {
     path: '',
-    component: FullLayoutComponent,
+    component: FullLayout,
     data: {
       title: 'Home'
     },
     children: [
       {
         path: 'dashboard',
-        loadChildren: './dashboard/dashboard.module#DashboardModule'
+        loadChildren: './views/dashboard/dashboard.module#DashboardModule'
       },
       {
         path: 'components',
-        loadChildren: './components/components.module#ComponentsModule'
+        loadChildren: './views/components/components.module#ComponentsModule'
       },
       {
         path: 'icons',
-        loadChildren: './icons/icons.module#IconsModule'
+        loadChildren: './views/icons/icons.module#IconsModule'
       },
       {
         path: 'widgets',
-        loadChildren: './widgets/widgets.module#WidgetsModule'
+        loadChildren: './views/widgets/widgets.module#WidgetsModule'
       },
       {
         path: 'charts',
-        loadChildren: './chartjs/chartjs.module#ChartJSModule'
+        loadChildren: './views/chartjs/chartjs.module#ChartJSModule'
       }
     ]
   },
   {
     path: 'pages',
-    component: SimpleLayoutComponent,
+    component: SimpleLayout,
     data: {
       title: 'Pages'
     },
     children: [
       {
         path: '',
-        loadChildren: './pages/pages.module#PagesModule',
+        loadChildren: './views/pages/pages.module#PagesModule',
       }
     ]
   }