refactoring

VladimirHumeniuk · Sep 6, 2017 · f43c1a7 · f43c1a7
1 parent 7c40187
commit f43c1a7
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 29 deletions.
diff --git a/.babelrc b/.babelrc
@@ -0,0 +1,4 @@
+{
+  "presets": ["es2015"],
+  "retainLines": true
+}
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
 /node_modules
 /.tmp
+.DS_Store
+/dist
diff --git a/app/index.html b/app/index.html
@@ -23,6 +23,10 @@
 	<meta name="msapplication-TileColor" content="#2F3BA2">
 	<!-- Color the status bar on mobile devices-->
 	<meta name="theme-color" content="#2F3BA2">
+	<!-- Styles-->
+	<!-- build:css styles/main.min.css-->
+	<link href="/styles/main.min.css" rel="stylesheet">
+	<!-- endbuild-->
 </head>
 <body>
 	<!-- Site content goes here-->

diff --git a/app/pug/core/head.pug b/app/pug/core/head.pug
@@ -30,3 +30,8 @@ head
 
   // Color the status bar on mobile devices
   meta(name='theme-color', content='#2F3BA2')
+
+  // Styles
+  // build:css styles/main.min.css
+  link(href='/styles/main.min.css', rel='stylesheet')
+  // endbuild
diff --git a/app/scripts/main.js b/app/scripts/main.js
@@ -1,7 +1,5 @@
-(function() {
-  'use strict';
-
-  var isLocalhost = Boolean(window.location.hostname === 'localhost' ||
+((() => {
+  const isLocalhost = Boolean(window.location.hostname === 'localhost' ||
       window.location.hostname === '[::1]' ||
       window.location.hostname.match(
         /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/
@@ -11,15 +9,15 @@
   if ('serviceWorker' in navigator &&
       (window.location.protocol === 'https:' || isLocalhost)) {
     navigator.serviceWorker.register('service-worker.js')
-    .then(function(registration) {
-      registration.onupdatefound = function() {
+    .then(registration => {
+      registration.onupdatefound = () => {
         if (navigator.serviceWorker.controller) {
-          var installingWorker = registration.installing;
+          const installingWorker = registration.installing;
 
-          installingWorker.onstatechange = function() {
+          installingWorker.onstatechange = () => {
             switch (installingWorker.state) {
               case 'installed':
-              break;
+                break;
 
               case 'redundant':
                 throw new Error('The installing ' +
@@ -31,10 +29,10 @@
           };
         }
       };
-    }).catch(function(e) {
+    }).catch(e => {
       console.error('Error during service worker registration:', e);
     });
   }
 
   // JavaScript goes here
-})();
+}))();
diff --git a/app/styles/test.scss b/app/styles/test.scss
@@ -0,0 +1,7 @@
+body {
+  color: red;
+}
+
+h1 {
+  font-size: 3px;
+}
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
@@ -1,5 +1,3 @@
-'use strict';
-
 import path from 'path';
 import gulp from 'gulp';
 import del from 'del';
@@ -33,6 +31,8 @@ gulp.task('images', () =>
 gulp.task('copy', () =>
   gulp.src([
     'fonts/*',
+    '!app/pug',
+    '!app/libs',
     'app/*',
     '!app/*.html',
     'node_modules/apache-server-configs/dist/.htaccess'
@@ -67,6 +67,7 @@ gulp.task('styles', () => {
     .pipe($.autoprefixer(AUTOPREFIXER_BROWSERS))
     .pipe(gulp.dest('.tmp/styles'))
     .pipe($.concat('main.min.css'))
+
     .pipe($.if('*.css', $.cssnano()))
     .pipe($.size({title: 'styles'}))
     .pipe($.sourcemaps.write('./'))
@@ -78,26 +79,26 @@ gulp.task('scripts', () =>
     gulp.src([
       './app/scripts/main.js'
     ])
-      .pipe($.newer('.tmp/scripts'))
-      .pipe($.sourcemaps.init())
-      .pipe($.babel())
-      .pipe($.sourcemaps.write())
-      .pipe(gulp.dest('.tmp/scripts'))
-      .pipe($.concat('main.min.js'))
-      .pipe($.uglify({preserveComments: 'some'}))
-
-      .pipe($.size({title: 'scripts'}))
-      .pipe($.sourcemaps.write('.'))
-      .pipe(gulp.dest('dist/scripts'))
-      .pipe(gulp.dest('.tmp/scripts'))
+    .pipe($.newer('.tmp/scripts/**/*.js'))
+    .pipe($.sourcemaps.init())
+    .pipe($.babel())
+    .pipe($.sourcemaps.write())
+    .pipe(gulp.dest('.tmp/scripts'))
+    .pipe($.concat('main.min.js'))
+    .pipe($.uglify({preserveComments: 'some'}))
+
+    .pipe($.size({title: 'scripts'}))
+    .pipe($.sourcemaps.write('.'))
+    .pipe(gulp.dest('dist/scripts'))
+    .pipe(gulp.dest('.tmp/scripts'))
 );
 
 gulp.task('pug', () =>
   gulp.src('app/pug/*.pug')
-      .pipe($.pug({
-          pretty: '\t'
-      }))
-      .pipe(gulp.dest('app/'))
+    .pipe($.pug({
+        pretty: '\t'
+    }))
+    .pipe(gulp.dest('app/'))
 );
 
 gulp.task('html', () => {