CreativeIT · ByPort · Nov 10, 2017 · Nov 10, 2017 · Nov 14, 2017 · Nov 15, 2017
diff --git a/config/webpack.common.js b/config/webpack.common.js
@@ -81,7 +81,7 @@ module.exports = function (options) {
       extensions: ['.ts', '.js', '.json', '.css', '.scss'],
 
       // An array of directory names to be resolved to the current directory
-      modules: [helpers.root('src'), helpers.root('node_modules')],
+      modules: [helpers.root('src/app'), helpers.root('node_modules'), helpers.root('bower_components')],
 
     },
 
@@ -163,38 +163,10 @@ module.exports = function (options) {
          * Returns compiled css content as string
          *
          */
-        /*     {
-         test: /\.scss$/,
-         use: ['raw-loader', 'sass-loader']
-         },*/
-
-        /*     {
-         test: /app\.scss$/,
-         use: ExtractTextPlugin.extract({
-         fallback: 'style-loader',
-         use: 'css-loader!sass-loader?sourceMap'
-         })
-         },*/
-
         {
           test: /\.scss$/,
-          use: ExtractTextPlugin.extract({
-            fallback: 'style-loader',
-            use: "css-loader!autoprefixer-loader!sass-loader"
-          })
+          use: ['raw-loader', 'sass-loader']
         },
-        /*
-         {
-         test: /\.scss$/,
-         loader: extractCSS.extract(['css-loader','sass?sourceMap'])
-         },
-         {
-         test: /\.css$/,
-         include: helpers.root('src/app'),
-         loader: 'raw-loader'
-         },
-         */
-
 
         /* Raw loader support for *.html
          * Returns file content as string

diff --git a/config/webpack.dev.js b/config/webpack.dev.js
@@ -101,28 +101,6 @@ module.exports = function (options) {
          exclude: [/\.(spec|e2e)\.ts$/]
        },
 
-        /*
-         * css loader support for *.css files (styles directory only)
-         * Loads external css styles into the DOM, supports HMR
-         *
-         */
-        {
-          test: /\.css$/,
-          use: ['style-loader', 'css-loader'],
-          include: [helpers.root('src', 'styles')]
-        },
-
-        /*
-         * sass loader support for *.scss files (styles directory only)
-         * Loads external sass styles into the DOM, supports HMR
-         *
-         */
-        {
-          test: /\.scss$/,
-          use: ['style-loader', 'css-loader', 'sass-loader'],
-          include: [helpers.root('src', 'styles')]
-        },
-
       ]
 
     },

diff --git a/css/application.min.css b/css/application.min.css
diff --git a/css/lib/getmdl-select.min.css b/css/lib/getmdl-select.min.css
diff --git a/css/lib/nv.d3.min.css b/css/lib/nv.d3.min.css
diff --git a/dist/images/DB_16х16.png b/dist/images/DB_16х16.png
diff --git a/dist/images/cloudy_and_snow.svg b/dist/images/cloudy_and_snow.svg
diff --git a/dist/images/cotoneaster.jpg b/dist/images/cotoneaster.jpg
diff --git a/dist/images/robot.png b/dist/images/robot.png
diff --git a/dist/images/tick-mask.svg b/dist/images/tick-mask.svg
diff --git a/dist/images/tick.svg b/dist/images/tick.svg
diff --git a/dist/images/weather_bck.png b/dist/images/weather_bck.png
diff --git a/images/Bobby.PNG b/images/Bobby.PNG
diff --git a/images/Dark_background_1920x1080.png b/images/Dark_background_1920x1080.png
diff --git a/images/buffer.svg b/images/buffer.svg
diff --git a/images/card.jpg b/images/card.jpg
diff --git a/images/imgo.png b/images/imgo.png
diff --git a/images/istanbul.jpg b/images/istanbul.jpg
diff --git a/images/sao_paulo.jpg b/images/sao_paulo.jpg
diff --git a/images/skype.svg b/images/skype.svg
diff --git a/images/tokyo.jpg b/images/tokyo.jpg
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
@@ -0,0 +1,12 @@
+import { RouterModule } from '@angular/router';
+import { NgModule } from '@angular/core';
+
+@NgModule({
+  imports: [RouterModule.forRoot([
+    { path: '', loadChildren: 'layout/layout.module#LayoutModule' },
+    { path: 'pages', loadChildren: 'pages/pages.module#PagesModule' },
+    { path: '**', redirectTo: 'pages/404' },
+  ], { useHash: true, enableTracing: true })],
+  exports: [RouterModule],
+})
+export class AppRoutingModule {}