Merge branch 'master' into Josh-Db

Author: Joshua Baert

gulpfile.js

@@ -0,0 +1,65 @@
+
+  //1. Make gulpfile
+//2. npm i all dependencies
+//3. check all folder paths used in gulpfile
+//4. Update index.html
+//5. Run gulp watch
+
+var gulp = require('gulp'),
+    del = require('del'),
+    sass = require('gulp-sass'),
+    sourcemaps = require('gulp-sourcemaps'),
+    uglify = require('gulp-uglify'),
+    concat = require('gulp-concat'),
+    print = require('gulp-print'),
+    babel = require('gulp-babel');
+    //babel-preset-es2015
+
+
+var CacheBuster = require('gulp-cachebust');
+var cachebust = new CacheBuster();
+
+const paths = {
+  jsSource: ['./src/components/**/*.js', './src/components/*.js'],
+  cssFiles: './src/assets/scss/*.scss',
+  index: './src/index.html',
+  htmlFiles: './src/**/*.html',
+  dist: './dist',
+};
+
+gulp.task('build-css', function(){
+    return gulp.src(paths.cssFiles)
+        .pipe(sourcemaps.init())
+        .pipe(sass())
+        .pipe(cachebust.resources())
+        .pipe(concat('styles.css'))
+        .pipe(gulp.dest(paths.dist));
+});
+
+gulp.task('clean', function (cb) {
+    del([
+        'dist'
+    ], cb);
+});
+
+gulp.task('build-html', function(){
+    return gulp.src([paths.htmlFiles, paths.index])
+    .pipe(gulp.dest(paths.dist))
+});
+
+gulp.task('build-js', function() {
+  return gulp.src(paths.jsSource)
+      .pipe(sourcemaps.init())
+      .pipe(print())
+      .pipe(babel({ presets: ['es2015'] }))
+      .pipe(concat('bundle.js'))
+    //   .pipe(uglify())
+      .pipe(sourcemaps.write('./'))
+      .pipe(gulp.dest(paths.dist));
+});
+
+gulp.task('watch', function() {
+    return gulp.watch([paths.jsSource, paths.cssFiles, paths.index, paths.htmlFiles],['clean', 'build-css', 'build-js', 'build-html']);
+});
+
+gulp.task('default', ['clean', 'build-css', 'build-js', 'build-html', 'watch']);

package.json

@@ -20,8 +20,17 @@
   "dependencies": {
     "body-parser": "^1.15.2",
     "cors": "^2.8.1",
+    "del": "^2.2.2",
     "express": "^4.14.0",
     "express-session": "^1.14.2",
+    "gulp": "^3.9.1",
+    "gulp-babel": "^6.1.2",
+    "gulp-cachebust": "0.0.6",
+    "gulp-concat": "^2.6.1",
+    "gulp-print": "^2.0.1",
+    "gulp-sass": "^3.0.0",
+    "gulp-sourcemaps": "^1.9.1",
+    "gulp-uglify": "^2.0.0",
     "massive": "^2.5.0"
   }
 }

src/assets/scss/styles.scss

@@ -0,0 +1,3 @@
+body {
+    background-color: red;
+}

src/components/app.js

@@ -0,0 +1,39 @@
+angular.module('app', ['ui.router'])
+
+
+.config(function($stateProvider, $urlRouterProvider){
+$stateProvider
+.state('home',{
+    url: '/',
+    templateUrl:'./home/home.html',
+    controller: 'homeCtrl'
+})
+.state('kata_list',{
+    url: '/kata_list',
+    templateUrl:'./kata_list/kata_list.html',
+    controller: 'kata_listCtrl'
+})
+.state('login',{
+    url: '/login',
+    templateUrl:'./login/login.html',
+    controller: 'loginCtrl'
+})
+.state('profile',{
+    url: '/profile',
+    templateUrl:'./profile/profile.html',
+    controller: 'profileCtrl'
+})
+.state('solutions',{
+    url: '/solutions',
+    templateUrl:'./solutions/solutions.html',
+    controller: 'solutionsCtrl'
+})
+.state('training',{
+    url: '/training',
+    templateUrl:'./training/training.html',
+    controller: 'trainingCtrl'
+});
+
+$urlRouterProvider.otherwise('/');
+});
+