Updates to the new skeleton version

commit 118cc2f9787fe504d401d720fe290c6339aad8ed
Merge: 178e603 3710847
Author: lejoe <ciao@lejoe.com>
Date:   Thu Dec 17 17:01:22 2015 +0100

    Merge branch 'master' of github.com:ginetta/skeleton into update-skeleton

    # Conflicts:
    #	bower.json
    #	gulp/config.js
    #	src/pages/index.jade
    #	src/styles/_3.base.scss

commit 3710847
Merge: 1226bb2 a09b9a6
Author: João Figueiredo <lucalanca2@hotmail.com>
Date:   Thu Dec 3 15:47:14 2015 +0100

    Merge pull request #101 from ginetta/webpack

    Webpack

commit a09b9a6
Author: lejoe <ciao@lejoe.com>
Date:   Thu Dec 3 10:32:53 2015 +0100

    Removes jquery as default

    Adds sensible/mediaquery as the default example.
    Which also contains jquery but it you remove it, jquery will also be removed

commit 249e79d
Author: lejoe <ciao@lejoe.com>
Date:   Wed Dec 2 19:17:54 2015 +0100

    Corrects the vendor path

commit 229419e
Author: lejoe <ciao@lejoe.com>
Date:   Wed Dec 2 15:34:30 2015 +0100

    Moves vendors bundling for the gulp task to a file

    1. @lucalanca is this what you meant?
    2. Do I need to require vendor.js in my main.js or will webpack take care of this?

    Will take care of the jquery question in another commit

commit ddb8650
Author: lejoe <ciao@lejoe.com>
Date:   Wed Dec 2 15:15:16 2015 +0100

    Makes the JS examples better

commit 2abf10d
Author: lejoe <ciao@lejoe.com>
Date:   Wed Nov 25 11:01:41 2015 +0100

    Adds webpack for the js

commit 9c61ea8
Author: lejoe <ciao@lejoe.com>
Date:   Wed Nov 25 11:00:17 2015 +0100

    Adds an exemple of js in a component

commit 1226bb2
Merge: 19311c9 bbcc47f
Author: lejoe <ciao@lejoe.com>
Date:   Tue Nov 24 17:57:54 2015 +0100

    Merge pull request #99 from ginetta/gulp4-migration

    Gulp4 migration

commit bbcc47f
Author: lejoe <ciao@lejoe.com>
Date:   Mon Nov 23 17:25:48 2015 +0100

    Corrects the readme with the new commands

commit b6844ee
Author: lejoe <ciao@lejoe.com>
Date:   Mon Nov 23 17:25:02 2015 +0100

    Adds the gulp-cli to the package

    This will also avoid problem of switching project with gulp version 3.

    Also now you need to ```use npm start ``` instead of ```gulp```

commit 9b0e25b
Author: lejoe <ciao@lejoe.com>
Date:   Mon Nov 23 16:52:05 2015 +0100

    Adds the node_modules to the sass include paths

commit 332ae13
Author: lejoe <ciao@lejoe.com>
Date:   Mon Nov 23 15:46:38 2015 +0100

    Adds npm scripts for our tasks

    Fixes #100

commit d63e172
Merge: e62d22c 19311c9
Author: lejoe <ciao@lejoe.com>
Date:   Mon Nov 23 15:44:38 2015 +0100

    Merge branch 'master' into gulp4-migration

commit 19311c9
Merge: 684b4aa 874ee0d
Author: lejoe <ciao@lejoe.com>
Date:   Fri Nov 13 14:50:34 2015 +0100

    Merge pull request #92 from ginetta/81-remove-bower

    Remove bower

commit 874ee0d
Merge: 6524e21 684b4aa
Author: lejoe <ciao@lejoe.com>
Date:   Fri Nov 13 14:49:24 2015 +0100

    Merge branch 'master' into 81-remove-bower

    Conflicts:
    	package.json

commit 6524e21
Author: Peter Braden <peterbraden@peterbraden.co.uk>
Date:   Wed Nov 11 14:02:59 2015 +0000

    Update re the comment.

commit e62d22c
Author: lejoe <ciao@lejoe.com>
Date:   Wed Nov 11 13:13:30 2015 +0100

    Removes console logs

commit c84dd63
Author: lejoe <ciao@lejoe.com>
Date:   Wed Nov 11 13:02:28 2015 +0100

    Simplifies the gulp taskhelper

    Moves the config setting to the helper file

commit 15c715d
Author: lejoe <ciao@lejoe.com>
Date:   Wed Nov 11 12:18:12 2015 +0100

    Uses gulp.series & gulp.parallel

commit bbe7fea
Author: lejoe <ciao@lejoe.com>
Date:   Wed Nov 11 12:17:30 2015 +0100

    Corrects a bug with watching favicon files

commit 807bfaa
Author: lejoe <ciao@lejoe.com>
Date:   Wed Nov 11 12:16:13 2015 +0100

    Replaces gulp help with the new task descriptions

commit d3916f8
Author: lejoe <ciao@lejoe.com>
Date:   Tue Nov 10 15:28:29 2015 +0100

    Uses the new gulp version

    You will need to replace your local cli too:
    ```
    npm uninstall gulp
    npm install -g gulpjs/gulp-cli#4.0
    ```

commit 684b4aa
Merge: 5a05956 68af114
Author: lejoe <ciao@lejoe.com>
Date:   Tue Nov 10 12:38:10 2015 +0100

    Merge pull request #97 from ginetta/revert-new-file-watch

    Revert "Makes sure the new files are watched"

commit 68af114
Author: lejoe <ciao@lejoe.com>
Date:   Fri Nov 6 10:45:04 2015 +0100

    Revert "Makes sure the new files are watched"

    This reverts commit 67fd2bc.

commit 5a05956
Merge: a30613a 67fd2bc
Author: David Aerne <meodai@gmail.com>
Date:   Wed Nov 4 18:05:26 2015 +0100

    Merge pull request #96 from ginetta/watch-new-files

    Makes sure the new files are watched

commit 67fd2bc
Author: lejoe <ciao@lejoe.com>
Date:   Wed Nov 4 17:40:51 2015 +0100

    Makes sure the new files are watched

    By moving the var settings inside the returned function, the globs will be reset each time the tasks run

commit a30613a
Merge: 38fbcba 5169f94
Author: Peter Braden <peterbraden@peterbraden.co.uk>
Date:   Wed Nov 4 15:18:31 2015 +0100

    Merge pull request #95 from ginetta/#76-watch-layouts

    Watch layouts files

commit 5169f94
Author: lejoe <ciao@lejoe.com>
Date:   Wed Nov 4 15:11:23 2015 +0100

    Watches the layouts files

commit 53caee7
Author: lejoe <ciao@lejoe.com>
Date:   Wed Nov 4 15:10:52 2015 +0100

    Adds the path to layouts in the config

commit 38fbcba
Merge: 7cd99d3 8cfbce7
Author: Peter Braden <peterbraden@peterbraden.co.uk>
Date:   Tue Oct 27 11:07:37 2015 +0100

    Merge pull request #94 from ginetta/jade-inline-helper

    Jade inline helper

commit 8cfbce7
Author: David Aerne <meodai@gmail.com>
Date:   Thu Oct 22 11:26:05 2015 +0200

    adds jadeInlineFile to helpers

commit ed34f75
Author: David Aerne <meodai@gmail.com>
Date:   Thu Oct 22 11:25:42 2015 +0200

    adds jade-inline-file NPM package

commit 7cd99d3
Author: lejoe <ciao@lejoe.com>
Date:   Mon Oct 12 11:20:19 2015 +0200

    Sets the right project path for skeleton

    Keeps the reference so that it's found when you search for project-name

commit 2bf0dd5
Author: Peter Braden <peterbraden@peterbraden.co.uk>
Date:   Mon Oct 12 11:14:50 2015 +0200

    Remove bower

commit e5719b7
Merge: bd65d9b cd696f0
Author: lejoe <ciao@lejoe.com>
Date:   Mon Oct 5 14:31:16 2015 +0200

    Merge pull request #55 from ginetta/v2/new-deploy

    Deploy paths for the new server

commit bd65d9b
Merge: f0a1c6b 6b0b94c
Author: lejoe <ciao@lejoe.com>
Date:   Mon Sep 28 23:03:28 2015 +0200

    Merge pull request #75 from ginetta/v2/accessibility

    Adds accessibility audit task.

commit 6b0b94c
Author: Joao Figueiredo <lucalanca2@hotmail.com>
Date:   Wed Sep 23 15:30:27 2015 +0200

    Removes console.log.

commit 8cdbca0
Author: Joao Figueiredo <lucalanca2@hotmail.com>
Date:   Wed Sep 23 15:29:43 2015 +0200

    Removes duplicated <p> on example page.

commit 93f0566
Author: Joao Figueiredo <lucalanca2@hotmail.com>
Date:   Wed Sep 23 15:21:07 2015 +0200

    Changes build:accessibility to test:accessibility and creates a main 'test' task.

commit 62aa371
Author: Joao Figueiredo <lucalanca2@hotmail.com>
Date:   Wed Sep 23 15:20:45 2015 +0200

    Removes build html files from config paths.

commit 22fce1e
Author: Joao Figueiredo <lucalanca2@hotmail.com>
Date:   Wed Sep 23 15:20:24 2015 +0200

    Changes index page title to project-name

commit 140fbe6
Author: Joao Figueiredo <lucalanca2@hotmail.com>
Date:   Wed Sep 23 13:15:27 2015 +0200

    Doesn't ouput NOTICE messages from AccessSniff.

commit 10c804b
Author: Joao Figueiredo <lucalanca2@hotmail.com>
Date:   Wed Sep 23 12:09:31 2015 +0200

    Changes default link style so it passes a11y minimum contrast.

commit c7f46ec
Author: Joao Figueiredo <lucalanca2@hotmail.com>
Date:   Wed Sep 23 12:05:26 2015 +0200

    Adds title to the index example page (so we don't forget to add it)

commit 020afe8
Author: Joao Figueiredo <lucalanca2@hotmail.com>
Date:   Wed Sep 23 12:05:05 2015 +0200

    Adds language to layout by exposing the current language as a jade global.

commit 8f459c7
Author: Joao Figueiredo <lucalanca2@hotmail.com>
Date:   Wed Sep 23 11:56:56 2015 +0200

    Removes a11y import from pages.js

commit da386ec
Author: Joao Figueiredo <lucalanca2@hotmail.com>
Date:   Wed Sep 23 11:42:53 2015 +0200

    Adds accessibility task.

commit f0a1c6b
Merge: 7d52acc 40fdb13
Author: João Figueiredo <lucalanca2@hotmail.com>
Date:   Tue Sep 22 15:55:06 2015 +0200

    Merge pull request #65 from ginetta/v2/update-linter

    V2/update linter

commit 40fdb13
Author: lejoe <ciao@lejoe.com>
Date:   Tue Sep 1 16:51:04 2015 +0200

    Removes a deprecated rule

commit 37cbe56
Author: lejoe <ciao@lejoe.com>
Date:   Tue Sep 1 16:50:50 2015 +0200

    Updates the js linter

commit cd696f0
Author: lejoe <ciao@lejoe.com>
Date:   Sat Jul 25 22:51:41 2015 +0200

    Corrects the deploy paths for the new server

Author: lejoe

.eslintrc

@@ -5,10 +5,6 @@ rules:
   # controls location of Use Strict Directives
   strict: [2, "global"]
 
-  # (deprecated) require or disallow the "use strict" pragma in the global
-  # scope (off by default in the node environment)
-  global-strict: [2, "always"]
-
   # disallow use of multiple spaces
   no-multi-spaces: [0]
 

.gitignore

@@ -3,5 +3,4 @@ node_modules
 .sass-cache
 .DS_Store
 *.orig
-bower_components
 .tmp

bower.json

@@ -1,15 +1,16 @@
 'use strict';
 var argv = require('yargs').argv;
+var path = require('path');
 
 module.exports = function () {
 
   var basePaths = {
+    root:    path.join(__dirname, '..'),
     src:     'src/',
     content: 'content/',
     assets:  'assets/',
     dest:    'build/',
-    tmp:     '.tmp/',
-    bower:   'bower_components/'
+    tmp:     '.tmp/'
   };
 
   var languages = ['en'];
@@ -31,6 +32,9 @@ module.exports = function () {
       src:  basePaths.src + 'pages/',
       dest: basePaths.dest
     },
+    layouts: {
+      src:  basePaths.src + 'layouts/'
+    },
     images: {
       src:  basePaths.content + 'images/',
       dest: basePaths.dest + 'content/images/'
@@ -50,14 +54,15 @@ module.exports = function () {
   };
 
   var appFiles = {
-    scripts:  paths.scripts.src + '**/*.js',
-    styles:   paths.styles.src + '**/*.scss',
-    content:  paths.content.src + '**/*.yml',
-    pages:    paths.pages.src + '**/*.jade',
-    images:   paths.images.src + '**/*',
-    logos:    paths.logos.src + '**/*',
-    favicons: paths.favicons.src + '**/*',
-    fonts:    paths.fonts.src + '**/*'
+    scripts:   paths.scripts.src + '**/*.js',
+    styles:    paths.styles.src + '**/*.scss',
+    content:   paths.content.src + '**/*.yml',
+    pages:     paths.pages.src + '**/*.jade',
+    layouts:   paths.layouts.src + '**/*.jade',
+    images:    paths.images.src + '**/*',
+    logos:     paths.logos.src + '**/*',
+    favicons:  paths.favicons.src + '**/*',
+    fonts:     paths.fonts.src + '**/*'
   };
 
   var components = [
@@ -80,8 +85,6 @@ module.exports = function () {
     }
   };
 
-
-
   return {
     basePaths:    basePaths,
     languages:    languages,

gulp/config.js

@@ -0,0 +1,20 @@
+'use strict';
+
+module.exports = function (gulp, $, config) {
+
+  var srcFiles = config.paths.pages.dest + '**/*.html';
+
+  var task = function () {
+    return gulp.src(srcFiles)
+      .pipe($.a11y())
+      .pipe($.a11y.reporter())
+      .pipe($.accessibility({
+        reportLevels: {
+          notice: false
+        }
+      }));
+  };
+
+  task.description = 'Tests the built project in terms of accessibility.';
+  return task;
+};

gulp/tasks/accessibility.js

@@ -11,7 +11,7 @@ module.exports = function (gulp, $, config) {
   var fontsSrc     = config.appFiles.fonts;
   var fontsDest    = config.paths.fonts.dest;
 
-  return function () {
+  var task =  function () {
     var imagesSt = gulp.src(imagesSrc)
       .pipe($.changed(imagesDest))
       .pipe(gulp.dest(imagesDest));
@@ -30,4 +30,7 @@ module.exports = function (gulp, $, config) {
 
     return merge(imagesSt, logosSt, faviconsSt, fontsSt);
   };
+
+  task.description = 'Moves all the assets to the build';
+  return task;
 };

gulp/tasks/assets.js

@@ -4,7 +4,11 @@ var del = require('del');
 module.exports = function (gulp, $, config) {
   var destFolder  = config.basePaths.dest + '*';
 
-  return function (cb) {
+  var task = function (cb) {
     del([destFolder], cb);
   };
+
+  task.description = 'Cleans the build folder';
+  return task;
 };
+

gulp/tasks/clean.js

@@ -6,7 +6,7 @@ module.exports = function (gulp, $, config) {
   var languages = config.languages;
   var destFiles = config.paths.content.dest;
 
-  return function () {
+  var task = function () {
     // Generate the language file for each language
     var contentStreams = languages.map(function(language) {
       return gulp.src(srcFiles + language + '/**/*.yml')
@@ -17,4 +17,7 @@ module.exports = function (gulp, $, config) {
 
     return merge(contentStreams);
   };
+
+  task.description = 'Concatenates all the content files';
+  return task;
 };

gulp/tasks/content.js

@@ -11,7 +11,7 @@ module.exports = function (gulp, $, config) {
   var deployDest = serverPath + ':' + defaultPath + environment.projectPath + environment.releasePath;
 
 
-  return function (done) {
+  var task = function (done) {
     var rsyncOptions = {
       ssh: true,
       src: deploySrc,
@@ -61,6 +61,9 @@ module.exports = function (gulp, $, config) {
         done();
     });
   };
+
+  task.description = 'Deploys to testing';
+  return task;
 };
 
 

gulp/tasks/deploy.js

@@ -6,6 +6,7 @@ var path          = require('path');
 var pageshelpers  = require('../utils/pagesHelpers');
 var handleError   = require('../utils/handleError');
 
+
 module.exports = function (gulp, $, config) {
   var srcFiles           = config.appFiles.pages;
   var destFiles          = config.paths.pages.dest;
@@ -33,7 +34,7 @@ module.exports = function (gulp, $, config) {
     return (path.relative(destPath, filePath) || '.') + '/';
   };
 
-  return function () {
+  var task = function () {
 
     // Load the content for the page
     function loadContent(language) {
@@ -57,7 +58,8 @@ module.exports = function (gulp, $, config) {
                 return {
                   data:         loadContent(language),
                   relativePath: getRelativePath(file, language),
-                  helpers:      moduleHelpers
+                  helpers:      moduleHelpers,
+                  language:     language
                 };
               }))
               .pipe($.jade({
@@ -74,4 +76,7 @@ module.exports = function (gulp, $, config) {
 
     return merge(pagesStreams);
   };
+
+  task.description = 'Generate all pages from the jade files';
+  return task;
 };