(final) meant-stack 2 // Benton/Mark

.gitignore

@@ -7,6 +7,11 @@ pids
 *.pid
 *.seed
 
+### OSX ###
+.DS_Store
+.AppleDouble
+.LSOverride
+
 # Directory for instrumented libs generated by jscoverage/JSCover
 lib-cov
 
@@ -26,3 +31,5 @@ build/Release
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
 build
+public
+

gulp/config.js

@@ -1,39 +1,38 @@
-var dest = "./build";
+var dest = './public';
 var src = './src';
 
 module.exports = {
   javascript: {
-    src: src + '/js/**/*.js',
+    src: src + '/app/**/*.js',
     dest: dest + '/js/',
-    entry: src + '/js/app.js',
-    outputFilename: 'app.js'
-  },
-  assets: {
-    src: src + "/assets/**/*",
-    dest: dest + '/assets/'
+    entryPoint: src + '/webpack-entry.js',
+    packedFile: 'packed.js'
   },
   sass: {
-    src: src + "/css/**/*.{sass,scss}",
+    src: src + "/sass/**/*.{sass,scss}",
     dest: dest + '/css/',
     settings: {
-      indentedSyntax: true, // Enable .sass syntax!
+      indentedSyntax: true,
     }
   },
-  html: {
-    src: src + '/**/*.html',
-    dest: dest
-  },
   server: {
-    src: dest,
+    serverFile: '.server.js',
     livereload: true,
-    directoryListing: false,
-    open: false,
-    port: 9000
+  },
+  index: {
+    src: src + '/app/index.html',
+    dest: dest + '/',
+  },
+  partials: {
+    src: [src + '/app/**/*.html', '!' + src + '/app/index.html'],
+    dest: dest + '/partials/'
   },
   production: {
     cssSrc: dest + '/css/*.css',
-    jsSrc: dest + '/js/*.js',
-    cssDest: dest + '/css/',
-    jsDest: dest + '/js/',
+    jsSrc: dest + '/*.js',
+    dest: dest
+  },
+  ngConfig: {
+    dest: dest + '/js',
   }
 };

gulp/tasks/default.js

@@ -1,4 +1,5 @@
-var gulp = require('gulp');
 
-gulp.task('default', ['sass', 'markup', 'webpack', 'watch', 'serve']);
+var gulp = require('gulp');
 
+gulp.task('serve', ['sass', 'ngConfig', 'webpack', 'watch', 'server', 'index', 'partials']);
+gulp.task('default', ['sass', 'ngConfig', 'webpack', 'watch', 'server', 'index', 'partials']);

gulp/tasks/index.js

@@ -0,0 +1,7 @@
+var gulp = require("gulp");
+var config = require("../config").index;
+
+gulp.task("index", function() {
+  return gulp.src(config.src)
+  .pipe(gulp.dest(config.dest));
+})

gulp/tasks/ngConfig.js

@@ -0,0 +1,18 @@
+var gulp = require("gulp");
+var ngConfig = require("gulp-ng-config");
+var config = require("../config").ngConfig;
+var fs = require("fs");
+
+gulp.task("ngConfig", function() {
+  var tokenFile = config.dest  + "/token.txt";  // !!! .txt?
+
+  // Create a temp file with the token stored in it
+  fs.writeFileSync(tokenFile, '{"token": "' + process.env.GITHUBTOKEN + '"}');
+  //fs.writeFileSync(tokenFile, '{"token": "' + "" + '"}');
+
+  // Generate the token config file
+  gulp.src(tokenFile)
+    .pipe(ngConfig("gisty.config"))
+    .pipe(gulp.dest(config.dest));
+
+});

gulp/tasks/partials.js

@@ -0,0 +1,7 @@
+var gulp = require("gulp");
+var config = require("../config").partials;
+
+gulp.task("partials", function() {
+  return gulp.src(config.src)
+  .pipe(gulp.dest(config.dest));
+})

gulp/tasks/sass.js

@@ -1,17 +1,16 @@
-var gulp         = require('gulp');
-var sass         = require('gulp-sass');
-var sourcemaps   = require('gulp-sourcemaps');
-var handleErrors = require('../util/handleErrors');
-var autoprefixer = require('gulp-autoprefixer');
-var config = require('../config').sass;
 
-gulp.task('sass', function () {
+var gulp = require("gulp");
+var sass = require("gulp-sass");
+var sourcemaps = require("gulp-sourcemaps");
+var handleErrors = require("../util/handleErrors");
+var config = require("../config").sass;
+
+gulp.task("sass", function() {
   return gulp.src(config.src)
     .pipe(sourcemaps.init())
     .pipe(sass(config.settings))
-    .on('error', handleErrors)
+    .on("error", handleErrors)
     .pipe(sourcemaps.write())
-    .pipe(autoprefixer({ browsers: ['last 2 version'] }))
+    // .pipe(autoprefixer({ browsers: ["last 2 version"] }))
     .pipe(gulp.dest(config.dest));
 });
-

gulp/tasks/server.js

@@ -0,0 +1,10 @@
+var gulp = require("gulp");
+var config = require("../config").server;
+var server = require("gulp-express");
+
+gulp.task("server", function() {
+  server.run(["server.js"]);
+
+  // restart the server when it changes
+  gulp.watch(["server.js"], [server.run]);
+});

gulp/tasks/watch.js

@@ -1,9 +1,9 @@
-var gulp     = require('gulp');
-var config   = require('../config');
 
-gulp.task('watch', function() {
-  gulp.watch(config.javascript.src, ['webpack']);
-  gulp.watch(config.sass.src,   ['sass']);
-  gulp.watch(config.markup.src, ['markup']);
-  // Watchify will watch and recompile our JS, so no need to gulp.watch it
+var gulp = require("gulp");
+var config = require("../config");
+
+gulp.task("watch", function() {
+  gulp.watch(config.javascript.src, ["webpack"]);
+  gulp.watch(config.sass.src, ["sass"]);
+  gulp.watch(config.partials.src, ["partials"]);
 });

gulp/tasks/webpack.js

@@ -1,14 +1,14 @@
-var gulp = require('gulp');
-var config = require('../config').javascript;
-var webpack = require('webpack-stream');
 
-gulp.task('webpack', function(callback) {
-  return gulp.src(config.entry)
-  .pipe(webpack({
-    output: {
-      filename: config.outputFilename
-    }
-  }))
-  .pipe(gulp.dest(config.dest));
-});
+var gulp = require("gulp");
+var config = require("../config").javascript;
+var webpack = require("webpack-stream");
 
+gulp.task("webpack", function (callback) {
+  return gulp.src(config.entryPoint)
+    .pipe(webpack({
+      output: {
+        filename: "packed.js",
+      }
+    }))
+    .pipe(gulp.dest(config.dest));
+});

gulp/util/handleErrors.js

@@ -1,3 +1,4 @@
+
 var notify = require("gulp-notify");
 
 module.exports = function() {
@@ -11,5 +12,5 @@ module.exports = function() {
   }).apply(this, args);
 
   // Keep gulp from hanging on this task
-  this.emit('end');
-};
+  this.emit("end");
+};

gulpfile.js

@@ -1,18 +1,3 @@
-/*
-  gulpfile.js
-  ===========
-  Rather than manage one giant configuration file responsible
-  for creating multiple tasks, each task has been broken out into
-  its own file in gulp/tasks. Any files in that directory get
-  automatically required below.
-
-  To add a new task, simply add a new task file that directory.
-  gulp/tasks/default.js specifies the default set of tasks to run
-  when you run `gulp`.
-*/
 
 var requireDir = require('require-dir');
-
-// Require all tasks in gulp/tasks, including subfolders
 requireDir('./gulp/tasks', { recurse: true });
-

models/blog.js

@@ -0,0 +1,14 @@
+// Load required packages
+var mongoose = require("mongoose");
+
+// Define our teams schema
+var BlogSchema = new mongoose.Schema({
+  title: String,
+  content: String,
+  author: String,
+  date: { type: Date, default: Date.now },
+  comments: Number
+});
+
+// Export the Mongoose model
+module.exports = mongoose.model("Blog", BlogSchema);

package.json

@@ -1,25 +1,41 @@
 {
-  "name": "",
+  "name": "mean-stack-2",
   "version": "1.0.0",
-  "description": "",
+  "description": "Last week we focussed on JavaScript basics. This week we're going to build up a function web application. You'll be expected to build on knowledge you've already learned (semantic HTML, Sass instead of CSS, in addition to all of the Angular work we'll be doing) and produce a \"production-ready\" blog for your assignment this week.",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/mbuchthal/mean-stack-2.git"
+  },
+  "author": "Mark Buchthal",
+  "license": "ISC",
+  "bugs": {
+    "url": "https://github.com/mbuchthal/mean-stack-2/issues"
+  },
+  "homepage": "https://github.com/mbuchthal/mean-stack-1#readme",
   "dependencies": {
-    "gulp": "^3.8.11",
-    "gulp-autoprefixer": "^2.1.0",
-    "gulp-changed": "^1.1.1",
-    "gulp-filesize": "0.0.6",
-    "gulp-minify-css": "~0.5.1",
+    "angular": "^1.4.7",
+    "angular-cookies": "^1.4.7",
+    "angular-route": "^1.4.7",
+    "body-parser": "^1.14.1",
+    "connect-livereload": "^0.5.3",
+    "express": "^4.13.3",
+    "gulp": "^3.9.0",
+    "gulp-autoprefixer": "^3.0.2",
+    "gulp-express": "^0.3.5",
+    "gulp-jshint": "^1.11.2",
+    "gulp-livereload": "^3.8.1",
+    "gulp-ng-config": "^1.2.1",
     "gulp-notify": "^2.2.0",
-    "gulp-rename": "^1.2.2",
-    "gulp-sass": "~1.3.3",
-    "gulp-sourcemaps": "^1.5.0",
-    "gulp-uglify": "^1.1.0",
-    "gulp-util": "^3.0.4",
-    "gulp-webserver": "^0.9.0",
-    "lodash": "^3.3.1",
-    "merge-stream": "^0.1.7",
-    "pretty-hrtime": "~1.0.0",
-    "require-dir": "^0.1.0",
-    "vinyl-source-stream": "~1.0.0",
+    "gulp-sass": "^2.0.4",
+    "gulp-sourcemaps": "^1.6.0",
+    "gulp-uglify": "^1.4.1",
+    "mongoose": "^4.1.10",
+    "require-dir": "^0.3.0",
+    "webpack": "^1.12.2",
     "webpack-stream": "^2.1.1"
   }
 }