From 1503892a3c408e58b2941e08a7cb28d3ecea40b9 Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Tue, 28 Mar 2017 17:05:06 -0700
Subject: [PATCH 01/23] signup form and auth services complete, all components,
 and configs set and loaded

---
 lab-zachary/.babelrc                          |   3 +
 lab-zachary/.eslintrc                         |  21 +++
 lab-zachary/.gitignore                        | 130 ++++++++++++++++++
 lab-zachary/app/component/login/_login.scss   |   0
 lab-zachary/app/component/login/login.html    |   0
 lab-zachary/app/component/login/login.js      |  14 ++
 lab-zachary/app/component/signup/_signup.scss |   0
 lab-zachary/app/component/signup/signup.html  |  26 ++++
 lab-zachary/app/component/signup/signup.js    |  28 ++++
 lab-zachary/app/config/router-config.js       |  31 +++++
 lab-zachary/app/entry.js                      |  43 ++++++
 lab-zachary/app/index.html                    |   9 ++
 lab-zachary/app/scss/main.scss                |   0
 lab-zachary/app/service/auth-service.js       |  79 +++++++++++
 lab-zachary/app/view/home/_home.scss          |   0
 lab-zachary/app/view/home/home-controller.js  |   9 ++
 lab-zachary/app/view/home/home.html           |   3 +
 lab-zachary/app/view/landing/_landing.scss    |   0
 .../app/view/landing/landing-controller.js    |  12 ++
 lab-zachary/app/view/landing/landing.html     |   0
 lab-zachary/package.json                      |  44 ++++++
 lab-zachary/webpack.config.js                 |  42 ++++++
 22 files changed, 494 insertions(+)
 create mode 100644 lab-zachary/.babelrc
 create mode 100644 lab-zachary/.eslintrc
 create mode 100644 lab-zachary/.gitignore
 create mode 100644 lab-zachary/app/component/login/_login.scss
 create mode 100644 lab-zachary/app/component/login/login.html
 create mode 100644 lab-zachary/app/component/login/login.js
 create mode 100644 lab-zachary/app/component/signup/_signup.scss
 create mode 100644 lab-zachary/app/component/signup/signup.html
 create mode 100644 lab-zachary/app/component/signup/signup.js
 create mode 100644 lab-zachary/app/config/router-config.js
 create mode 100644 lab-zachary/app/entry.js
 create mode 100644 lab-zachary/app/index.html
 create mode 100644 lab-zachary/app/scss/main.scss
 create mode 100644 lab-zachary/app/service/auth-service.js
 create mode 100644 lab-zachary/app/view/home/_home.scss
 create mode 100644 lab-zachary/app/view/home/home-controller.js
 create mode 100644 lab-zachary/app/view/home/home.html
 create mode 100644 lab-zachary/app/view/landing/_landing.scss
 create mode 100644 lab-zachary/app/view/landing/landing-controller.js
 create mode 100644 lab-zachary/app/view/landing/landing.html
 create mode 100644 lab-zachary/package.json
 create mode 100644 lab-zachary/webpack.config.js

diff --git a/lab-zachary/.babelrc b/lab-zachary/.babelrc
new file mode 100644
index 00000000..af0f0c3d
--- /dev/null
+++ b/lab-zachary/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["es2015"]
+}
\ No newline at end of file
diff --git a/lab-zachary/.eslintrc b/lab-zachary/.eslintrc
new file mode 100644
index 00000000..8dc68078
--- /dev/null
+++ b/lab-zachary/.eslintrc
@@ -0,0 +1,21 @@
+{
+  "rules": {
+    "no-console": "off",
+    "indent": [ "error", 2 ],
+    "quotes": [ "error", "single" ],
+    "semi": ["error", "always"],
+    "linebreak-style": [ "error", "unix" ]
+  },
+  "env": {
+    "es6": true,
+    "node": true,
+    "mocha": true,
+    "jasmine": true
+  },
+  "ecmaFeatures": {
+    "modules": true,
+    "experimentalObjectRestSpread": true,
+    "impliedStrict": true
+  },
+  "extends": "eslint:recommended"
+}
diff --git a/lab-zachary/.gitignore b/lab-zachary/.gitignore
new file mode 100644
index 00000000..59c0d065
--- /dev/null
+++ b/lab-zachary/.gitignore
@@ -0,0 +1,130 @@
+/build
+
+# Created by https://www.gitignore.io/api/node,osx,windows,linux
+
+### Linux ###
+*~
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+# .nfs files are created when an open file is removed but is still being accessed
+.nfs*
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Typescript v1 declaration files
+typings/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
+
+### OSX ###
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+### Windows ###
+# Windows thumbnail cache files
+Thumbs.db
+ehthumbs.db
+ehthumbs_vista.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+# End of https://www.gitignore.io/api/node,osx,windows,linux
\ No newline at end of file
diff --git a/lab-zachary/app/component/login/_login.scss b/lab-zachary/app/component/login/_login.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/component/login/login.html b/lab-zachary/app/component/login/login.html
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/component/login/login.js b/lab-zachary/app/component/login/login.js
new file mode 100644
index 00000000..fd9f2868
--- /dev/null
+++ b/lab-zachary/app/component/login/login.js
@@ -0,0 +1,14 @@
+'use strict';
+
+require('./_login.scss');
+
+module.exports = {
+  template: require('./login.html'),
+  controller: ['$log', LoginController],
+  controllerAs: 'loginCtrl'
+};
+
+function LoginController($log) {
+  $log.debug('LoginController');
+
+}
diff --git a/lab-zachary/app/component/signup/_signup.scss b/lab-zachary/app/component/signup/_signup.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/component/signup/signup.html b/lab-zachary/app/component/signup/signup.html
new file mode 100644
index 00000000..8de50557
--- /dev/null
+++ b/lab-zachary/app/component/signup/signup.html
@@ -0,0 +1,26 @@
+<section class="signup">
+  <form class="signup-form"
+    ng-submit="signupCtrl.signup(signupCtrl.user)"
+    novalidate>
+
+    <input class="input-std"
+      type="text"
+      placeholder="name"
+      ng-minlength="4"
+      ng-model="signupCtrl.user.username" required>
+
+    <input class="input-std"
+      type="email"
+      placeholder="email"
+      ng-model="signupCtrl.user.email">
+
+    <input class="input-std"
+      type="password"
+      placeholder="password"
+      ng-minlength="8"
+      ng-model="signupCtrl.user.password" required>
+
+    <input  class="btn-std" type="submit" value="sign up">
+
+  </form>
+</section>
\ No newline at end of file
diff --git a/lab-zachary/app/component/signup/signup.js b/lab-zachary/app/component/signup/signup.js
new file mode 100644
index 00000000..fa6e5161
--- /dev/null
+++ b/lab-zachary/app/component/signup/signup.js
@@ -0,0 +1,28 @@
+'use strict';
+
+require('./_signup.scss');
+
+module.exports = {
+  template: require('./signup.html'),
+  controller: ['$log', '$location', 'authService', SignupController],
+  controllerAs: 'signupCtrl'
+};
+
+function SignupController($log, $location, authService) {
+  $log.debug('SignupController');
+
+  authService.getToken()
+  .then( token => {
+    $log.debug('authService: ', token);
+    $location.url('/home');
+  });
+
+  this.signup = function(user) {
+    $log.debug('SignupController.signup');
+
+    authService.signup(user)
+    .then( () => {
+      $location.url('/home');
+    });
+  };
+}
\ No newline at end of file
diff --git a/lab-zachary/app/config/router-config.js b/lab-zachary/app/config/router-config.js
new file mode 100644
index 00000000..66ca4da5
--- /dev/null
+++ b/lab-zachary/app/config/router-config.js
@@ -0,0 +1,31 @@
+'use strict';
+
+module.exports = ['$stateProvider', '$urlRouterProvider', routerConfig];
+
+function routerConfig($stateProvider, $urlRouterProvider) {
+  $urlRouterProvider.when('', '/join#signup');
+  $urlRouterProvider.when('/', '/join#signup');
+  $urlRouterProvider.when('/signup', '/join#signup');
+  $urlRouterProvider.when('/login', '/join#login');
+
+  let states = [
+    {
+      name: 'home',
+      url: '/home',
+      template: require('../view/home/home.html'),
+      controller: 'HomeController',
+      controllerAs: 'homeCtrl'
+    },
+    {
+      name: 'landing',
+      url: '/join',
+      template: require('../view/landing/landing.html'),
+      controller: 'LandingController',
+      controllerAs: 'landingCtrl'
+    }
+  ];
+
+  states.forEach( state => {
+    $stateProvider.state(state);
+  });
+}
\ No newline at end of file
diff --git a/lab-zachary/app/entry.js b/lab-zachary/app/entry.js
new file mode 100644
index 00000000..8f6281c2
--- /dev/null
+++ b/lab-zachary/app/entry.js
@@ -0,0 +1,43 @@
+'use strict';
+
+const angular = require('angular');
+const camelcase = require('camelcase');
+const pascalcase = require('pascalcase');
+const path = require('path');
+const uiRouter = require('angular-ui-router');
+const ngTouch = require('angular-touch');
+const ngAnimate = require('angular-animate');
+
+require('./scss/main.scss');
+
+const cfgram = angular.module('cfgram', [ngTouch, ngAnimate, uiRouter]);
+
+let context = require.context('./config/', true, /\.js$/);
+context.keys().forEach( key => {
+  cfgram.config(context(key));
+});
+
+context = require.context('./view/', true, /\.js$/);
+context.keys().forEach( key => {
+  let name = pascalcase(path.basename(key, '.js'));
+  let module = context(key);
+  console.log('view:', key, name, module);
+  cfgram.controller(name, module);
+});
+
+context = require.context('./service/', true, /\.js$/);
+context.keys().forEach( key => {
+  console.log('service:', key);
+  let name = camelcase(path.basename(key, '.js'));
+  let module = context(key);
+  console.log('service', key, name, module);
+  cfgram.service(name, module);
+});
+
+context = require.context('./component/', true, /\.js$/);
+context.keys().forEach( key => {
+  let name = camelcase(path.basename(key, '.js'));
+  let module = context(key);
+  console.log('component:', key, name, module);
+  cfgram.component(name, module);
+});
diff --git a/lab-zachary/app/index.html b/lab-zachary/app/index.html
new file mode 100644
index 00000000..3340dd1d
--- /dev/null
+++ b/lab-zachary/app/index.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html ng-app="cfgram">
+<head>
+  <title></title>
+</head>
+<body>
+<ui-view></ui-view>
+</body>
+</html>
\ No newline at end of file
diff --git a/lab-zachary/app/scss/main.scss b/lab-zachary/app/scss/main.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/service/auth-service.js b/lab-zachary/app/service/auth-service.js
new file mode 100644
index 00000000..38ecd4e4
--- /dev/null
+++ b/lab-zachary/app/service/auth-service.js
@@ -0,0 +1,79 @@
+'use strict';
+
+module.exports = ['$q', '$log', '$http', '$window', authService];
+
+function authService($q, $log, $http, $window) {
+  $log.debug('authService');
+
+  let service = {};
+  let token = null;
+
+  function setToken(_token){
+    $log.debug('setToken', _token);
+
+    if(!_token) return $q.reject(new Error('need a token'));
+
+    $window.localStorage.setItem('token', _token);
+    token = _token;
+    return $q.resolve(token);
+  }
+
+  service.getToken = function() {
+    $log.debug('authService.getToken');
+    if (token) {
+      return $q.resolve(token);
+    }
+
+    token = $window.localStorage.getItem('token');
+    if (token) return $q.resolve(token);
+    return $q.reject(new Error('token not found'));
+  };
+
+  service.signup = function(user) {
+    $log.debug('authService.signup');
+
+    let url = `${__API_URL__}/api/signup`;
+    let config = {
+      headers: {
+        'Content-Type' : 'application/json',
+        'Accept': 'application/json'
+      }
+    };
+    return $http.post(url, user, config)
+    .then( res => {
+      $log.log('success:', res.data);
+      return setToken(res.data);
+    });
+
+  };
+
+  service.login = function(user) {
+    $log.debug('authService.login');
+
+    let url = `${__API_URL__}/api/login`;
+    let base64 = $window.btoa(`${user.username}:${user.password}`);
+    let config = {
+      headers: {
+        Accept: 'application/json',
+        Authorization: `Basic ${base64}`
+      }
+    };
+    return $http.get(url, config)
+    .then( res => {
+      $log.debug('success: ', res.data);
+      return setToken(res.data);
+    });
+
+  };
+
+  service.logout = function() {
+    $log.debug('authService.logout');
+
+    $window.localStorage.removeItem('token');
+    token = null;
+    return $q.resolve();
+  };
+
+
+  return service;
+}
\ No newline at end of file
diff --git a/lab-zachary/app/view/home/_home.scss b/lab-zachary/app/view/home/_home.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/view/home/home-controller.js b/lab-zachary/app/view/home/home-controller.js
new file mode 100644
index 00000000..e4c19f59
--- /dev/null
+++ b/lab-zachary/app/view/home/home-controller.js
@@ -0,0 +1,9 @@
+'use strict';
+
+require('./_home.scss');
+
+module.exports = ['$log', HomeController];
+
+function HomeController($log){
+  $log.debug('HomeController');
+}
\ No newline at end of file
diff --git a/lab-zachary/app/view/home/home.html b/lab-zachary/app/view/home/home.html
new file mode 100644
index 00000000..2b4db79c
--- /dev/null
+++ b/lab-zachary/app/view/home/home.html
@@ -0,0 +1,3 @@
+<section class="home-content">
+  <h2>Welcome Home</h2>
+</section>
\ No newline at end of file
diff --git a/lab-zachary/app/view/landing/_landing.scss b/lab-zachary/app/view/landing/_landing.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/view/landing/landing-controller.js b/lab-zachary/app/view/landing/landing-controller.js
new file mode 100644
index 00000000..14fe085b
--- /dev/null
+++ b/lab-zachary/app/view/landing/landing-controller.js
@@ -0,0 +1,12 @@
+'use strict';
+
+require('./_landing.scss');
+
+module.exports = ['$log', '$location', '$rootScope', 'authService', LandingController];
+
+function LandingController($log, $location, authService) {
+  $log.debug('LandingController');
+
+  let url = $location.url();
+  this.showSignup = url === '/join#signup' || url === '/join';
+}
\ No newline at end of file
diff --git a/lab-zachary/app/view/landing/landing.html b/lab-zachary/app/view/landing/landing.html
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/package.json b/lab-zachary/package.json
new file mode 100644
index 00000000..1ac6ef3e
--- /dev/null
+++ b/lab-zachary/package.json
@@ -0,0 +1,44 @@
+{
+  "name": "lab-zachary",
+  "version": "1.0.0",
+  "description": "",
+  "main": "webpack.config.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "watch": "./node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot",
+    "build": "./node_modules/webpack/bin/webpack.js",
+    "lint": "eslint ."
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "angular": "^1.6.3",
+    "angular-animate": "^1.6.3",
+    "angular-route": "^1.6.3",
+    "angular-touch": "^1.6.3",
+    "angular-ui-router": "^0.4.2",
+    "babel-core": "^6.24.0",
+    "babel-loader": "^6.4.1",
+    "babel-preset-es2015": "^6.24.0",
+    "camelcase": "^4.0.0",
+    "clean-webpack-plugin": "^0.1.16",
+    "css-loader": "^0.27.3",
+    "dotenv": "^4.0.0",
+    "extract-text-webpack-plugin": "^2.1.0",
+    "file-loader": "^0.10.1",
+    "html-loader": "^0.4.5",
+    "html-webpack-plugin": "^2.28.0",
+    "node-sass": "^4.5.1",
+    "pascalcase": "^0.1.1",
+    "resolve-url-loader": "^2.0.2",
+    "sass-loader": "^6.0.3",
+    "style-loader": "^0.16.1",
+    "ui-router": "^1.0.0-alpha.3",
+    "url-loader": "^0.5.8",
+    "webpack": "^2.3.2"
+  },
+  "devDependencies": {
+    "webpack-dev-server": "^2.4.2"
+  }
+}
diff --git a/lab-zachary/webpack.config.js b/lab-zachary/webpack.config.js
new file mode 100644
index 00000000..e0fa6527
--- /dev/null
+++ b/lab-zachary/webpack.config.js
@@ -0,0 +1,42 @@
+'use strict';
+
+require('dotenv').load();
+
+const HTMLPlugin = require('html-webpack-plugin');
+const ExtractTextPlugin = require('extract-text-webpack-plugin');
+const webpack = require('webpack');
+
+module.exports = {
+  devtool: 'eval',
+  entry: `${__dirname}/app/entry.js`,
+  output: {
+    filename: 'bundle.js',
+    path: `${__dirname}/build`
+  },
+  plugins: [
+    new HTMLPlugin({
+      template: `${__dirname}/app/index.html`
+    }),
+    new ExtractTextPlugin('bundle.css'),
+    new webpack.DefinePlugin({
+      __API_URL__: JSON.stringify(process.env.API_URL)
+    })
+  ],
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        exclude: /node_modules/,
+        loader: 'babel-loader'
+      },
+      {
+        test: /\.html$/,
+        loader: 'html-loader'
+      },
+      {
+        test: /\.scss$/,
+        loader: ExtractTextPlugin.extract(['css-loader', 'sass-loader'])
+      }
+    ]
+  }
+};
\ No newline at end of file

From 6abc4b5998224771d04ff06a34cab6983d0cacd0 Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Tue, 28 Mar 2017 20:37:43 -0700
Subject: [PATCH 02/23] functionality complete

---
 lab-zachary/app/component/login/login.html    |  30 +++++++++++
 lab-zachary/app/component/login/login.js      |  19 +++++--
 lab-zachary/app/index.html                    |  13 +++--
 lab-zachary/app/scss/lib/base/_base.scss      |   0
 .../app/scss/lib/base/_global-vars.scss       |   0
 lab-zachary/app/scss/lib/reset/_reset.scss    |  48 ++++++++++++++++++
 lab-zachary/app/scss/main.scss                |   3 ++
 lab-zachary/app/view/home/home-controller.js  |  13 ++++-
 .../app/view/landing/landing-controller.js    |   2 +
 lab-zachary/app/view/landing/landing.html     |  27 ++++++++++
 lab-zachary/assets/cf-logo.png                | Bin 0 -> 6821 bytes
 11 files changed, 146 insertions(+), 9 deletions(-)
 create mode 100644 lab-zachary/app/scss/lib/base/_base.scss
 create mode 100644 lab-zachary/app/scss/lib/base/_global-vars.scss
 create mode 100644 lab-zachary/app/scss/lib/reset/_reset.scss
 create mode 100644 lab-zachary/assets/cf-logo.png

diff --git a/lab-zachary/app/component/login/login.html b/lab-zachary/app/component/login/login.html
index e69de29b..78ad31cf 100644
--- a/lab-zachary/app/component/login/login.html
+++ b/lab-zachary/app/component/login/login.html
@@ -0,0 +1,30 @@
+<section class="login-form">
+  <form
+  name="loginForm" ng-submit="loginCtrl.login()" novalidate>
+  <div
+    ng-class="{
+    'error': loginForm.username.$invalid,
+    'success': loginForm.username.$valid}">
+
+    <input type="text"
+     name="username"
+     placeholder="username"
+     ng-minlength="4",
+     ng-model="loginCtrl.user.username" required>
+    </div>
+    <div ng-class="{
+    'error': loginForm.password.$invalid && loginForm.$submitted,
+    'success': loginForm.password.$valid
+    }">
+
+     <input type="password"
+      name="password"
+      placeholder="password"
+      ng-model="loginCtrl.user.password" required>
+
+      </div>
+
+      <button class="btn-std">sign in</button>
+      </form>
+
+</section>
\ No newline at end of file
diff --git a/lab-zachary/app/component/login/login.js b/lab-zachary/app/component/login/login.js
index fd9f2868..5451929e 100644
--- a/lab-zachary/app/component/login/login.js
+++ b/lab-zachary/app/component/login/login.js
@@ -4,11 +4,24 @@ require('./_login.scss');
 
 module.exports = {
   template: require('./login.html'),
-  controller: ['$log', LoginController],
+  controller: ['$log', '$location', 'authService', LoginController],
   controllerAs: 'loginCtrl'
 };
 
-function LoginController($log) {
+function LoginController($log, $location, authService) {
   $log.debug('LoginController');
 
-}
+  authService.getToken()
+  .then( () => {
+    $location.url('/home');
+  });
+
+  this.login = function() {
+    $log.debug('loginCtrl.login');
+
+    authService.login(this.user)
+    .then( () => {
+      $location.url('/home');
+    });
+  };
+};
\ No newline at end of file
diff --git a/lab-zachary/app/index.html b/lab-zachary/app/index.html
index 3340dd1d..17dd47bf 100644
--- a/lab-zachary/app/index.html
+++ b/lab-zachary/app/index.html
@@ -1,9 +1,14 @@
 <!DOCTYPE html>
 <html ng-app="cfgram">
 <head>
-  <title></title>
+<meta charset="utf-8">
+<meta name="viewport" content="Width=device-width, initial-scale=1">
+  <title>CFgram</title>
 </head>
-<body>
-<ui-view></ui-view>
-</body>
+  <body>
+  <nav>
+      <img src="">
+  </nav>
+    <ui-view></ui-view>
+  </body>
 </html>
\ No newline at end of file
diff --git a/lab-zachary/app/scss/lib/base/_base.scss b/lab-zachary/app/scss/lib/base/_base.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/scss/lib/base/_global-vars.scss b/lab-zachary/app/scss/lib/base/_global-vars.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/scss/lib/reset/_reset.scss b/lab-zachary/app/scss/lib/reset/_reset.scss
new file mode 100644
index 00000000..d9f27b5a
--- /dev/null
+++ b/lab-zachary/app/scss/lib/reset/_reset.scss
@@ -0,0 +1,48 @@
+/* http://meyerweb.com/eric/tools/css/reset/
+   v2.0 | 20110126
+   License: none (public domain)
+*/
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  font-size: 100%;
+  font: inherit;
+  vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+  display: block;
+}
+body {
+  line-height: 1;
+}
+ol, ul {
+  list-style: none;
+}
+blockquote, q {
+  quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+  content: '';
+  content: none;
+}
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
diff --git a/lab-zachary/app/scss/main.scss b/lab-zachary/app/scss/main.scss
index e69de29b..76187b60 100644
--- a/lab-zachary/app/scss/main.scss
+++ b/lab-zachary/app/scss/main.scss
@@ -0,0 +1,3 @@
+@import 'lib/reset/reset';
+@import 'lib/base/global-vars';
+@import 'lib/base/base';
\ No newline at end of file
diff --git a/lab-zachary/app/view/home/home-controller.js b/lab-zachary/app/view/home/home-controller.js
index e4c19f59..2f0cc6ce 100644
--- a/lab-zachary/app/view/home/home-controller.js
+++ b/lab-zachary/app/view/home/home-controller.js
@@ -2,8 +2,17 @@
 
 require('./_home.scss');
 
-module.exports = ['$log', HomeController];
+module.exports = ['$log','$location', 'authService', HomeController];
 
-function HomeController($log){
+function HomeController($log, $location, authService) {
   $log.debug('HomeController');
+
+
+  authService.getToken()
+  .then( () => {
+  })
+  .catch( err => {
+    $log.error('HomeController: ', err);
+    $location.url('');
+  });
 }
\ No newline at end of file
diff --git a/lab-zachary/app/view/landing/landing-controller.js b/lab-zachary/app/view/landing/landing-controller.js
index 14fe085b..c490d13a 100644
--- a/lab-zachary/app/view/landing/landing-controller.js
+++ b/lab-zachary/app/view/landing/landing-controller.js
@@ -8,5 +8,7 @@ function LandingController($log, $location, authService) {
   $log.debug('LandingController');
 
   let url = $location.url();
+  $log.debug('/join#signup:',url === '/join#signup', '/join:', url === '/join');
+
   this.showSignup = url === '/join#signup' || url === '/join';
 }
\ No newline at end of file
diff --git a/lab-zachary/app/view/landing/landing.html b/lab-zachary/app/view/landing/landing.html
index e69de29b..4e4ab584 100644
--- a/lab-zachary/app/view/landing/landing.html
+++ b/lab-zachary/app/view/landing/landing.html
@@ -0,0 +1,27 @@
+<section class="landing-content">
+  <h2>Show signup:{{ landingCtrl.showSignup }}</h2>
+
+    <div class="join-container"
+    ng-if="landingCtrl.showSignup">
+    <div class="join-inner">
+      <signup></signup>
+      <p>already a member?</p> <!-- look at ng routes at # and #! conventions -->
+      <a href="/#/join#login"
+        ng-click = "landingCtrl.showSignup=false">
+        login here
+      </a>
+    </div>
+  </div>
+
+    <div class="join-container"
+    ng-if="!landingCtrl.showSignup">
+    <div class="join-inner">
+    <login></login>
+      <p>want to sign up?</p>
+      <a href="/#/join#login"
+        ng-click = "landingCtrl.showSignup=true">
+        sign up here
+      </a>
+    </div>
+  </div>
+</section>
\ No newline at end of file
diff --git a/lab-zachary/assets/cf-logo.png b/lab-zachary/assets/cf-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..38a23b2d1d0dc6944768b2f98fae55197b0155b7
GIT binary patch
literal 6821
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

literal 0
HcmV?d00001


From f27063d0c92fbd4e84bce7ed58fc35614e2274a8 Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Tue, 28 Mar 2017 21:54:54 -0700
Subject: [PATCH 03/23] initial styling complete

---
 lab-zachary/app/component/login/_login.scss   |  2 +
 lab-zachary/app/component/login/login.html    |  3 +-
 lab-zachary/app/component/signup/_signup.scss |  6 ++
 lab-zachary/app/component/signup/signup.html  |  3 +-
 lab-zachary/app/index.html                    |  8 ++-
 lab-zachary/app/scss/lib/base/_base.scss      | 67 +++++++++++++++++++
 .../app/scss/lib/base/_global-vars.scss       | 18 +++++
 lab-zachary/app/view/landing/_landing.scss    |  9 +++
 lab-zachary/app/view/landing/landing.html     |  6 +-
 9 files changed, 116 insertions(+), 6 deletions(-)

diff --git a/lab-zachary/app/component/login/_login.scss b/lab-zachary/app/component/login/_login.scss
index e69de29b..69efa187 100644
--- a/lab-zachary/app/component/login/_login.scss
+++ b/lab-zachary/app/component/login/_login.scss
@@ -0,0 +1,2 @@
+.login-form{
+}
\ No newline at end of file
diff --git a/lab-zachary/app/component/login/login.html b/lab-zachary/app/component/login/login.html
index 78ad31cf..aadabe3e 100644
--- a/lab-zachary/app/component/login/login.html
+++ b/lab-zachary/app/component/login/login.html
@@ -27,4 +27,5 @@
       <button class="btn-std">sign in</button>
       </form>
 
-</section>
\ No newline at end of file
+</section>
+<div class="clearfix"></div>
\ No newline at end of file
diff --git a/lab-zachary/app/component/signup/_signup.scss b/lab-zachary/app/component/signup/_signup.scss
index e69de29b..b1c41d43 100644
--- a/lab-zachary/app/component/signup/_signup.scss
+++ b/lab-zachary/app/component/signup/_signup.scss
@@ -0,0 +1,6 @@
+.signup-form {
+  background-color:orange
+  button {
+    float:right;
+  }
+}
\ No newline at end of file
diff --git a/lab-zachary/app/component/signup/signup.html b/lab-zachary/app/component/signup/signup.html
index 8de50557..92988969 100644
--- a/lab-zachary/app/component/signup/signup.html
+++ b/lab-zachary/app/component/signup/signup.html
@@ -23,4 +23,5 @@
     <input  class="btn-std" type="submit" value="sign up">
 
   </form>
-</section>
\ No newline at end of file
+</section>
+<div class="clearfix"></div>
\ No newline at end of file
diff --git a/lab-zachary/app/index.html b/lab-zachary/app/index.html
index 17dd47bf..12a8fd46 100644
--- a/lab-zachary/app/index.html
+++ b/lab-zachary/app/index.html
@@ -3,12 +3,16 @@
 <head>
 <meta charset="utf-8">
 <meta name="viewport" content="Width=device-width, initial-scale=1">
-  <title>CFgram</title>
+  <title>cfgram</title>
 </head>
   <body>
   <nav>
-      <img src="">
+      <img src="https://github.com/zcrumbo/25-angular_auth/blob/lab-zachary/lab-zachary/assets/cf-logo.png?raw=true">
+      <h1>cfgram</h1>
   </nav>
+  <main>
     <ui-view></ui-view>
+  </main>
+  <footer></footer>
   </body>
 </html>
\ No newline at end of file
diff --git a/lab-zachary/app/scss/lib/base/_base.scss b/lab-zachary/app/scss/lib/base/_base.scss
index e69de29b..ffb58a10 100644
--- a/lab-zachary/app/scss/lib/base/_base.scss
+++ b/lab-zachary/app/scss/lib/base/_base.scss
@@ -0,0 +1,67 @@
+
+body{
+  background-color: $primaryColor;
+  font-family: $fontStack;
+  display: relative;
+
+  a{
+    text-decoration: none;
+    font-weight: bold;
+    color: $secondaryColor;
+  }
+  .clearfix{
+    clear: both;
+  }
+  nav {
+    background-color: $secondaryColor;
+    color: $white;
+    height:90px;
+    img{
+      max-height: 70%;
+      width: auto;
+      margin: $gutter/2 $gutter;
+      display: inline-block;
+      vertical-align: middle;
+    }
+    h1{
+      display: inline-block;
+      font-size: $primaryTextSize;
+      vertical-align: middle;
+    }
+  }
+  main {
+    margin:$gutter;
+  }
+  form{
+    width:100%;
+  }
+  input{
+    width: 100%;
+    box-sizing:border-box;
+    border: 1px solid $tertiaryColor;
+    margin: $gutter 0;
+    font-size: 16px;
+    height: 40px;
+    padding:5px;
+    @include rounded(3px);
+  }
+
+  .btn-std{
+    @extend input;
+    width: unset;
+    padding: $gutter/2 $gutter*2.5;
+    background-color: $secondaryColor;
+    color: $white;
+    font-weight: 300;
+    float:right;
+  }
+
+  footer{
+    background-color: $tertiaryColor;
+    height:70px;
+    width: 100%;
+    position: absolute;
+    bottom: 0px;
+  }
+}
+
diff --git a/lab-zachary/app/scss/lib/base/_global-vars.scss b/lab-zachary/app/scss/lib/base/_global-vars.scss
index e69de29b..b6dbdd49 100644
--- a/lab-zachary/app/scss/lib/base/_global-vars.scss
+++ b/lab-zachary/app/scss/lib/base/_global-vars.scss
@@ -0,0 +1,18 @@
+@import url('https://fonts.googleapis.com/css?family=Open+Sans:300,700');
+
+$primaryColor: #D8D8D8;
+$secondaryColor: #4A4A4A;
+$tertiaryColor: #9B9B9B;
+$white: #fff;
+$black: #000;
+
+$gutter: 3%;
+
+$fontStack: 'Open Sans', Helvetica, sans-serif;
+$primaryTextSize: 4.4vw;
+
+@mixin rounded($radius: 0.5em) {
+  -webkit-border-radius: $radius;
+  -moz-border-radius: $radius;
+  border-radius: $radius;
+}
\ No newline at end of file
diff --git a/lab-zachary/app/view/landing/_landing.scss b/lab-zachary/app/view/landing/_landing.scss
index e69de29b..be212af7 100644
--- a/lab-zachary/app/view/landing/_landing.scss
+++ b/lab-zachary/app/view/landing/_landing.scss
@@ -0,0 +1,9 @@
+.join-container{
+  text-align:right;
+  h2{
+    text-align: left
+  }
+  p {
+    display: inline-block;
+  }
+}
\ No newline at end of file
diff --git a/lab-zachary/app/view/landing/landing.html b/lab-zachary/app/view/landing/landing.html
index 4e4ab584..88a258a3 100644
--- a/lab-zachary/app/view/landing/landing.html
+++ b/lab-zachary/app/view/landing/landing.html
@@ -1,20 +1,22 @@
 <section class="landing-content">
-  <h2>Show signup:{{ landingCtrl.showSignup }}</h2>
 
     <div class="join-container"
     ng-if="landingCtrl.showSignup">
+    <h2>sign up.</h2>
     <div class="join-inner">
       <signup></signup>
       <p>already a member?</p> <!-- look at ng routes at # and #! conventions -->
       <a href="/#/join#login"
         ng-click = "landingCtrl.showSignup=false">
-        login here
+        sign in here.
       </a>
     </div>
   </div>
 
     <div class="join-container"
     ng-if="!landingCtrl.showSignup">
+    <h2>sign in.</h2>
+
     <div class="join-inner">
     <login></login>
       <p>want to sign up?</p>

From f2cc2349d694bf9a4ce9cce5fd46d5f1c13811c4 Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Wed, 29 Mar 2017 09:07:20 -0700
Subject: [PATCH 04/23] updated styles

---
 lab-zachary/app/scss/lib/base/_base.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lab-zachary/app/scss/lib/base/_base.scss b/lab-zachary/app/scss/lib/base/_base.scss
index ffb58a10..7c27dc9c 100644
--- a/lab-zachary/app/scss/lib/base/_base.scss
+++ b/lab-zachary/app/scss/lib/base/_base.scss
@@ -17,7 +17,7 @@ body{
     color: $white;
     height:90px;
     img{
-      max-height: 70%;
+      height: 70px;
       width: auto;
       margin: $gutter/2 $gutter;
       display: inline-block;
@@ -49,7 +49,7 @@ body{
   .btn-std{
     @extend input;
     width: unset;
-    padding: $gutter/2 $gutter*2.5;
+    padding: 0 $gutter*2.5;
     background-color: $secondaryColor;
     color: $white;
     font-weight: 300;

From 6da2a3737158ea6bb1b0b4991456453e0d2e916f Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Wed, 29 Mar 2017 10:08:45 -0700
Subject: [PATCH 05/23] tweaked styles and changed img src to ng-src

---
 lab-zachary/app/index.html               | 5 ++++-
 lab-zachary/app/scss/lib/base/_base.scss | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lab-zachary/app/index.html b/lab-zachary/app/index.html
index 12a8fd46..dfe28051 100644
--- a/lab-zachary/app/index.html
+++ b/lab-zachary/app/index.html
@@ -7,7 +7,10 @@
 </head>
   <body>
   <nav>
-      <img src="https://github.com/zcrumbo/25-angular_auth/blob/lab-zachary/lab-zachary/assets/cf-logo.png?raw=true">
+<!--       <img src="https://github.com/zcrumbo/25-angular_auth/blob/lab-zachary/lab-zachary/assets/cf-logo.png?raw=true">
+ -->
+    <img ng-src="../assets/cf-logo.png">
+
       <h1>cfgram</h1>
   </nav>
   <main>
diff --git a/lab-zachary/app/scss/lib/base/_base.scss b/lab-zachary/app/scss/lib/base/_base.scss
index 7c27dc9c..905421ae 100644
--- a/lab-zachary/app/scss/lib/base/_base.scss
+++ b/lab-zachary/app/scss/lib/base/_base.scss
@@ -60,8 +60,8 @@ body{
     background-color: $tertiaryColor;
     height:70px;
     width: 100%;
-    position: absolute;
-    bottom: 0px;
+    // position: absolute;
+    // bottom: 0px;
   }
 }
 

From 7e6327b10fa263a772735fc0b5a931fffcb46d65 Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Wed, 29 Mar 2017 13:06:05 -0700
Subject: [PATCH 06/23] added a few straggler files. karma etc.

---
 lab-zachary/app/config/log-config.js |  7 +++++++
 lab-zachary/karma.config.js          | 26 ++++++++++++++++++++++++++
 lab-zachary/package.json             |  3 ++-
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 lab-zachary/app/config/log-config.js
 create mode 100644 lab-zachary/karma.config.js

diff --git a/lab-zachary/app/config/log-config.js b/lab-zachary/app/config/log-config.js
new file mode 100644
index 00000000..c3e44011
--- /dev/null
+++ b/lab-zachary/app/config/log-config.js
@@ -0,0 +1,7 @@
+'use strict';
+
+module.exports = ['$logProvider', logConfig];
+
+function logConfig($logProvider) {
+  $logProvider.debugEnabled(__DEBUG__);
+}
\ No newline at end of file
diff --git a/lab-zachary/karma.config.js b/lab-zachary/karma.config.js
new file mode 100644
index 00000000..dfbc6e34
--- /dev/null
+++ b/lab-zachary/karma.config.js
@@ -0,0 +1,26 @@
+const webpackConfig = require('./webpack.config.js');
+
+module.exports = function(config) {
+  config.set({
+    webpack: webpackConfig,
+    basePath: '',
+    frameworks: ['jasmine'],
+    files: [
+      'test/**/*-test.js'
+    ],
+    exclude: [
+    ],
+    preprocessors: {
+      'test/**/*-test.js': ['webpack']
+    },
+
+    reporters: ['mocha'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['PhantomJS'],
+    singleRun: false,
+    concurrency: Infinity
+  });
+};
\ No newline at end of file
diff --git a/lab-zachary/package.json b/lab-zachary/package.json
index 1ac6ef3e..ad674db1 100644
--- a/lab-zachary/package.json
+++ b/lab-zachary/package.json
@@ -4,7 +4,8 @@
   "description": "",
   "main": "webpack.config.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "./node_modules/karma/bin/karma start --single-run",
+    "test-watch": "./node_modules/karma/bin/karma start",
     "watch": "./node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot",
     "build": "./node_modules/webpack/bin/webpack.js",
     "lint": "eslint ."

From fd5f06110baadd65b50cdcfc68735954616949bd Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Wed, 29 Mar 2017 13:22:33 -0700
Subject: [PATCH 07/23] setup directory and fix env issues

---
 .../gallery/create-gallery/_create-gallery.scss        |  0
 .../gallery/create-gallery/create-gallery.html         |  0
 .../component/gallery/create-gallery/create-gallery.js |  0
 .../app/component/{ => landing}/login/_login.scss      |  0
 .../app/component/{ => landing}/login/login.html       |  0
 lab-zachary/app/component/{ => landing}/login/login.js |  0
 .../app/component/{ => landing}/signup/_signup.scss    |  0
 .../app/component/{ => landing}/signup/signup.html     |  0
 .../app/component/{ => landing}/signup/signup.js       |  0
 lab-zachary/app/component/navbar/_navbar.scss          |  0
 lab-zachary/app/component/navbar/navbar.html           |  0
 lab-zachary/app/component/navbar/navbar.js             |  0
 lab-zachary/webpack.config.js                          | 10 +++++++---
 13 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 lab-zachary/app/component/gallery/create-gallery/_create-gallery.scss
 create mode 100644 lab-zachary/app/component/gallery/create-gallery/create-gallery.html
 create mode 100644 lab-zachary/app/component/gallery/create-gallery/create-gallery.js
 rename lab-zachary/app/component/{ => landing}/login/_login.scss (100%)
 rename lab-zachary/app/component/{ => landing}/login/login.html (100%)
 rename lab-zachary/app/component/{ => landing}/login/login.js (100%)
 rename lab-zachary/app/component/{ => landing}/signup/_signup.scss (100%)
 rename lab-zachary/app/component/{ => landing}/signup/signup.html (100%)
 rename lab-zachary/app/component/{ => landing}/signup/signup.js (100%)
 create mode 100644 lab-zachary/app/component/navbar/_navbar.scss
 create mode 100644 lab-zachary/app/component/navbar/navbar.html
 create mode 100644 lab-zachary/app/component/navbar/navbar.js

diff --git a/lab-zachary/app/component/gallery/create-gallery/_create-gallery.scss b/lab-zachary/app/component/gallery/create-gallery/_create-gallery.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/component/gallery/create-gallery/create-gallery.html b/lab-zachary/app/component/gallery/create-gallery/create-gallery.html
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/component/gallery/create-gallery/create-gallery.js b/lab-zachary/app/component/gallery/create-gallery/create-gallery.js
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/component/login/_login.scss b/lab-zachary/app/component/landing/login/_login.scss
similarity index 100%
rename from lab-zachary/app/component/login/_login.scss
rename to lab-zachary/app/component/landing/login/_login.scss
diff --git a/lab-zachary/app/component/login/login.html b/lab-zachary/app/component/landing/login/login.html
similarity index 100%
rename from lab-zachary/app/component/login/login.html
rename to lab-zachary/app/component/landing/login/login.html
diff --git a/lab-zachary/app/component/login/login.js b/lab-zachary/app/component/landing/login/login.js
similarity index 100%
rename from lab-zachary/app/component/login/login.js
rename to lab-zachary/app/component/landing/login/login.js
diff --git a/lab-zachary/app/component/signup/_signup.scss b/lab-zachary/app/component/landing/signup/_signup.scss
similarity index 100%
rename from lab-zachary/app/component/signup/_signup.scss
rename to lab-zachary/app/component/landing/signup/_signup.scss
diff --git a/lab-zachary/app/component/signup/signup.html b/lab-zachary/app/component/landing/signup/signup.html
similarity index 100%
rename from lab-zachary/app/component/signup/signup.html
rename to lab-zachary/app/component/landing/signup/signup.html
diff --git a/lab-zachary/app/component/signup/signup.js b/lab-zachary/app/component/landing/signup/signup.js
similarity index 100%
rename from lab-zachary/app/component/signup/signup.js
rename to lab-zachary/app/component/landing/signup/signup.js
diff --git a/lab-zachary/app/component/navbar/_navbar.scss b/lab-zachary/app/component/navbar/_navbar.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/component/navbar/navbar.html b/lab-zachary/app/component/navbar/navbar.html
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/component/navbar/navbar.js b/lab-zachary/app/component/navbar/navbar.js
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/webpack.config.js b/lab-zachary/webpack.config.js
index e0fa6527..ada37bf7 100644
--- a/lab-zachary/webpack.config.js
+++ b/lab-zachary/webpack.config.js
@@ -1,11 +1,14 @@
 'use strict';
 
-require('dotenv').load();
-
+const dotenv = require('dotenv');
 const HTMLPlugin = require('html-webpack-plugin');
 const ExtractTextPlugin = require('extract-text-webpack-plugin');
 const webpack = require('webpack');
 
+const production = process.env.NODE_ENV === 'production';
+
+dotenv.load();
+
 module.exports = {
   devtool: 'eval',
   entry: `${__dirname}/app/entry.js`,
@@ -19,7 +22,8 @@ module.exports = {
     }),
     new ExtractTextPlugin('bundle.css'),
     new webpack.DefinePlugin({
-      __API_URL__: JSON.stringify(process.env.API_URL)
+      __API_URL__: JSON.stringify(process.env.API_URL),
+      __DEBUG__: JSON.stringify(!production)
     })
   ],
   module: {

From ae6514497bf7d8ede80f80411eac1d39332b5827 Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Wed, 29 Mar 2017 18:57:45 -0700
Subject: [PATCH 08/23] base functionality completed

---
 .../create-gallery/create-gallery.html        | 23 ++++++
 .../gallery/create-gallery/create-gallery.js  | 21 ++++++
 .../app/component/landing/login/_login.scss   |  1 +
 .../app/component/landing/signup/_signup.scss |  1 -
 lab-zachary/app/component/navbar/_navbar.scss | 30 ++++++++
 lab-zachary/app/component/navbar/navbar.html  | 11 +++
 lab-zachary/app/component/navbar/navbar.js    | 44 +++++++++++
 lab-zachary/app/index.html                    | 10 +--
 lab-zachary/app/scss/lib/base/_base.scss      | 18 +----
 .../app/scss/lib/base/_global-vars.scss       |  2 +-
 lab-zachary/app/service/gallery-service.js    | 74 +++++++++++++++++++
 lab-zachary/app/view/home/_home.scss          | 26 +++++++
 lab-zachary/app/view/home/home-controller.js  | 25 ++++---
 lab-zachary/app/view/home/home.html           | 10 ++-
 14 files changed, 260 insertions(+), 36 deletions(-)
 create mode 100644 lab-zachary/app/service/gallery-service.js

diff --git a/lab-zachary/app/component/gallery/create-gallery/create-gallery.html b/lab-zachary/app/component/gallery/create-gallery/create-gallery.html
index e69de29b..a4a1806b 100644
--- a/lab-zachary/app/component/gallery/create-gallery/create-gallery.html
+++ b/lab-zachary/app/component/gallery/create-gallery/create-gallery.html
@@ -0,0 +1,23 @@
+<section class="create-gallery">
+  <form name="createGalleryForm"
+    class="gallery-form"
+    ng-submit="createGalleryCtrl.createGallery()">
+      <fieldset>
+      <input type="text"
+       name="name"
+       placeholder="gallery name"
+       ng-model="createGalleryCtrl.gallery.name" required>
+      </fieldset>
+
+      <fieldset>
+        <input type="text"
+        name="desc"
+        placeholder="gallery description"
+        ng-model="createGalleryCtrl.gallery.desc" required>
+      </fieldset>
+
+      <button class="btn-std" type="submit">create gallery</button>
+      <div class="clearfix"></div>
+
+    </form>
+</section>
\ No newline at end of file
diff --git a/lab-zachary/app/component/gallery/create-gallery/create-gallery.js b/lab-zachary/app/component/gallery/create-gallery/create-gallery.js
index e69de29b..5800024e 100644
--- a/lab-zachary/app/component/gallery/create-gallery/create-gallery.js
+++ b/lab-zachary/app/component/gallery/create-gallery/create-gallery.js
@@ -0,0 +1,21 @@
+'use strict';
+
+module.exports = {
+  template: require('./create-gallery.html'),
+  controller: ['$log', 'galleryService', CreateGalleryController],
+  controllerAs: 'createGalleryCtrl'
+};
+
+function CreateGalleryController($log, galleryService) {
+  $log.debug('CreateGalleryController');
+
+  this.gallery = {};
+
+  this.createGallery = function() {
+    galleryService.createGallery(this.gallery)
+    .then( () => {
+      this.gallery.name = null;
+      this.gallery.desc = null;
+    });
+  };
+}
\ No newline at end of file
diff --git a/lab-zachary/app/component/landing/login/_login.scss b/lab-zachary/app/component/landing/login/_login.scss
index 69efa187..a1c18930 100644
--- a/lab-zachary/app/component/landing/login/_login.scss
+++ b/lab-zachary/app/component/landing/login/_login.scss
@@ -1,2 +1,3 @@
 .login-form{
+  //background-color: $white;
 }
\ No newline at end of file
diff --git a/lab-zachary/app/component/landing/signup/_signup.scss b/lab-zachary/app/component/landing/signup/_signup.scss
index b1c41d43..bdef2cb9 100644
--- a/lab-zachary/app/component/landing/signup/_signup.scss
+++ b/lab-zachary/app/component/landing/signup/_signup.scss
@@ -1,5 +1,4 @@
 .signup-form {
-  background-color:orange
   button {
     float:right;
   }
diff --git a/lab-zachary/app/component/navbar/_navbar.scss b/lab-zachary/app/component/navbar/_navbar.scss
index e69de29b..aae7a78a 100644
--- a/lab-zachary/app/component/navbar/_navbar.scss
+++ b/lab-zachary/app/component/navbar/_navbar.scss
@@ -0,0 +1,30 @@
+@import '../../scss/lib/base/global-vars';
+
+nav {
+    background-color: $secondaryColor;
+    color: $white;
+    img{
+      height: 70px;
+      width: auto;
+      margin: $gutter/2 $gutter;
+      display: inline-block;
+      vertical-align: middle;
+    }
+    h1{
+      display: inline-block;
+      font-size: $primaryTextSize;
+      vertical-align: middle;
+    }
+    div{
+      float: right;
+      margin: $gutter;
+      min-width: 150px;
+
+    .btn-std {
+      background-color: $primaryColor;
+      color: $secondaryColor;
+      padding: 0 $gutter*5;
+      //min-width: 85px;
+     }
+    }
+  }
\ No newline at end of file
diff --git a/lab-zachary/app/component/navbar/navbar.html b/lab-zachary/app/component/navbar/navbar.html
index e69de29b..bdef69fa 100644
--- a/lab-zachary/app/component/navbar/navbar.html
+++ b/lab-zachary/app/component/navbar/navbar.html
@@ -0,0 +1,11 @@
+<nav>
+  <img ng-src="../assets/cf-logo.png">
+  <h1>cfgram</h1>
+    <div>
+      <button ng-hide="navbarCtrl.hideButtons"
+       class="btn-std"
+       ng-click="navbarCtrl.logout()">
+       sign out
+       </button>
+    </div>
+</nav>
\ No newline at end of file
diff --git a/lab-zachary/app/component/navbar/navbar.js b/lab-zachary/app/component/navbar/navbar.js
index e69de29b..69dcb7fb 100644
--- a/lab-zachary/app/component/navbar/navbar.js
+++ b/lab-zachary/app/component/navbar/navbar.js
@@ -0,0 +1,44 @@
+'use strict';
+
+require('./_navbar.scss');
+module.exports = {
+  template: require('./navbar.html'),
+  controller: ['$log', '$location', '$rootScope', 'authService', NavbarController],
+  controllerAs: 'navbarCtrl'
+};
+
+function NavbarController($log, $location, $rootScope, authService) {
+  $log.debug('NavbarController');
+
+  this.checkPath = function() {
+    let path = ($location.path() === '/join')
+
+    //$log.debug($location.path);
+
+    if(path) this.hideButtons = true;
+
+    if (!path) {
+      this.hideButtons = false;
+      authService.getToken()
+      .catch( () => {
+        $location.url('/join#login');
+      });
+    }
+  };
+
+  this.checkPath();
+
+  $rootScope.$on('$locationChangeSuccess', () => {
+    this.checkPath();
+  });
+
+  this.logout = function() {
+    $log.log('authService.logout');
+
+    this.hideButtons = true;
+    authService.logout()
+    .then( () => {
+      $location.url('/');
+    });
+  };
+}
\ No newline at end of file
diff --git a/lab-zachary/app/index.html b/lab-zachary/app/index.html
index dfe28051..ee6143d5 100644
--- a/lab-zachary/app/index.html
+++ b/lab-zachary/app/index.html
@@ -6,13 +6,9 @@
   <title>cfgram</title>
 </head>
   <body>
-  <nav>
-<!--       <img src="https://github.com/zcrumbo/25-angular_auth/blob/lab-zachary/lab-zachary/assets/cf-logo.png?raw=true">
- -->
-    <img ng-src="../assets/cf-logo.png">
-
-      <h1>cfgram</h1>
-  </nav>
+  <header>
+    <navbar></navbar>
+  </header>
   <main>
     <ui-view></ui-view>
   </main>
diff --git a/lab-zachary/app/scss/lib/base/_base.scss b/lab-zachary/app/scss/lib/base/_base.scss
index 905421ae..7a4e02ce 100644
--- a/lab-zachary/app/scss/lib/base/_base.scss
+++ b/lab-zachary/app/scss/lib/base/_base.scss
@@ -12,23 +12,7 @@ body{
   .clearfix{
     clear: both;
   }
-  nav {
-    background-color: $secondaryColor;
-    color: $white;
-    height:90px;
-    img{
-      height: 70px;
-      width: auto;
-      margin: $gutter/2 $gutter;
-      display: inline-block;
-      vertical-align: middle;
-    }
-    h1{
-      display: inline-block;
-      font-size: $primaryTextSize;
-      vertical-align: middle;
-    }
-  }
+
   main {
     margin:$gutter;
   }
diff --git a/lab-zachary/app/scss/lib/base/_global-vars.scss b/lab-zachary/app/scss/lib/base/_global-vars.scss
index b6dbdd49..f4241a7d 100644
--- a/lab-zachary/app/scss/lib/base/_global-vars.scss
+++ b/lab-zachary/app/scss/lib/base/_global-vars.scss
@@ -14,5 +14,5 @@ $primaryTextSize: 4.4vw;
 @mixin rounded($radius: 0.5em) {
   -webkit-border-radius: $radius;
   -moz-border-radius: $radius;
-  border-radius: $radius;
+  border-radius: $radius*2;
 }
\ No newline at end of file
diff --git a/lab-zachary/app/service/gallery-service.js b/lab-zachary/app/service/gallery-service.js
new file mode 100644
index 00000000..417d1a15
--- /dev/null
+++ b/lab-zachary/app/service/gallery-service.js
@@ -0,0 +1,74 @@
+'use strict';
+
+module.exports = ['$log', '$q', '$http', 'authService', galleryService];
+
+function galleryService($log, $q, $http, authService) {
+  $log.debug('galleryService');
+
+  let service = {};
+  service.galleries = [];
+  let url = `${__API_URL__}`;
+
+  service.fetchGalleries = function(){
+    $log.debug('authService.fetchGallery');
+
+    return authService.getToken()
+    .then( token => {
+      let config = {
+        headers: {
+          Authorization: `Bearer ${token}`,
+          'Content-Type': 'application/json',
+          Accept: 'application/json'
+        }
+      };
+      return $http.get(`${url}/api/gallery`, config)
+      .then( res => {
+        $log.debug('galleries retrieved', res.data);
+
+        service.galleries = res.data;
+        return service.galleries;
+      })
+      .catch( err => {
+        return $q.reject(err);
+      });
+    });
+
+
+  };
+
+  service.createGallery = function(gallery) {
+    $log.debug('authService.createGallery');
+
+    authService.getToken()
+    .then( token => {
+      let config = {
+        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+          Authorization: `Bearer ${token}`,
+        }
+      };
+      return $http.post(`${url}/api/gallery`, gallery, config);
+    })
+    .then( res => {
+      $log.debug('gallery created');
+
+      service.galleries.unshift(res.data);
+      return res.data;
+    })
+    .catch( err => {
+      $log.error(err);
+      return $q.reject(err);
+    });
+  };
+
+  service.deleteGallery = function() {
+
+  };
+
+  service.updateGallery = function() {
+
+  };
+
+  return service;
+}
\ No newline at end of file
diff --git a/lab-zachary/app/view/home/_home.scss b/lab-zachary/app/view/home/_home.scss
index e69de29b..1e239ecc 100644
--- a/lab-zachary/app/view/home/_home.scss
+++ b/lab-zachary/app/view/home/_home.scss
@@ -0,0 +1,26 @@
+@import '../../scss/lib/base/global-vars';
+
+.home-content {
+  h2 {
+    font-size: $primaryTextSize * .6;
+    margin-bottom: $gutter;
+  }
+  li {
+    background-color: $tertiaryColor;
+    color: $secondaryColor;
+    padding: $gutter;
+    @include rounded;
+    div {
+      margin-bottom: $gutter ;
+
+      span:first-child {
+      font-weight: bold;
+      }
+      span:last-child {
+      }
+    }
+    div:last-child {
+      margin-bottom:0;
+    }
+  }
+}
\ No newline at end of file
diff --git a/lab-zachary/app/view/home/home-controller.js b/lab-zachary/app/view/home/home-controller.js
index 2f0cc6ce..66495a44 100644
--- a/lab-zachary/app/view/home/home-controller.js
+++ b/lab-zachary/app/view/home/home-controller.js
@@ -2,17 +2,24 @@
 
 require('./_home.scss');
 
-module.exports = ['$log','$location', 'authService', HomeController];
+module.exports = ['$log','$rootScope', 'galleryService', HomeController];
 
-function HomeController($log, $location, authService) {
-  $log.debug('HomeController');
+function HomeController($log, $rootScope, galleryService) {
+  $log.debug('HomeController', galleryService.fetchGalleries);
 
+  this.galleries = [];
 
-  authService.getToken()
-  .then( () => {
-  })
-  .catch( err => {
-    $log.error('HomeController: ', err);
-    $location.url('');
+  this.fetchGalleries = function() {
+    galleryService.fetchGalleries()
+    .then( galleries => {
+      this.galleries = galleries;
+      console.log('test',galleries)
+    });
+  };
+
+  this.fetchGalleries();
+
+  $rootScope.$on('$locationChangeSuccess', () => {
+    this.fetchGalleries();
   });
 }
\ No newline at end of file
diff --git a/lab-zachary/app/view/home/home.html b/lab-zachary/app/view/home/home.html
index 2b4db79c..b2b8931e 100644
--- a/lab-zachary/app/view/home/home.html
+++ b/lab-zachary/app/view/home/home.html
@@ -1,3 +1,11 @@
 <section class="home-content">
-  <h2>Welcome Home</h2>
+  <create-gallery></create-gallery>
+  <h2 ng-if="homeCtrl.galleries.length">Galleries</h2>
+  <ul>
+    <li ng-repeat="gallery in homeCtrl.galleries" >
+      <div><span>name: </span><span>{{ gallery.name }}</span></div>
+      <div><span>description: </span><span>{{ gallery.desc }}</span></div>
+      <div><span>id: </span><span>{{ gallery._id }}</span></div>
+    </li>
+  </ul>
 </section>
\ No newline at end of file

From 9b7df961d41f5641f9487946f4f436d9a094afd0 Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Wed, 29 Mar 2017 20:53:28 -0700
Subject: [PATCH 09/23] completed delete route and styled delete buttons

---
 .../gallery/create-gallery/create-gallery.js  |  1 +
 lab-zachary/app/scss/lib/base/_base.scss      |  3 ++
 lab-zachary/app/service/gallery-service.js    | 35 +++++++++++++++----
 lab-zachary/app/view/home/_home.scss          | 10 +++++-
 lab-zachary/app/view/home/home-controller.js  | 13 +++++--
 lab-zachary/app/view/home/home.html           |  1 +
 6 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/lab-zachary/app/component/gallery/create-gallery/create-gallery.js b/lab-zachary/app/component/gallery/create-gallery/create-gallery.js
index 5800024e..4e235a4b 100644
--- a/lab-zachary/app/component/gallery/create-gallery/create-gallery.js
+++ b/lab-zachary/app/component/gallery/create-gallery/create-gallery.js
@@ -12,6 +12,7 @@ function CreateGalleryController($log, galleryService) {
   this.gallery = {};
 
   this.createGallery = function() {
+    $log.debug('test', this.gallery);
     galleryService.createGallery(this.gallery)
     .then( () => {
       this.gallery.name = null;
diff --git a/lab-zachary/app/scss/lib/base/_base.scss b/lab-zachary/app/scss/lib/base/_base.scss
index 7a4e02ce..ee621020 100644
--- a/lab-zachary/app/scss/lib/base/_base.scss
+++ b/lab-zachary/app/scss/lib/base/_base.scss
@@ -15,6 +15,9 @@ body{
 
   main {
     margin:$gutter;
+
+    min-height: calc(100vh - 70px);
+
   }
   form{
     width:100%;
diff --git a/lab-zachary/app/service/gallery-service.js b/lab-zachary/app/service/gallery-service.js
index 417d1a15..39a3a41f 100644
--- a/lab-zachary/app/service/gallery-service.js
+++ b/lab-zachary/app/service/gallery-service.js
@@ -39,7 +39,7 @@ function galleryService($log, $q, $http, authService) {
   service.createGallery = function(gallery) {
     $log.debug('authService.createGallery');
 
-    authService.getToken()
+    return authService.getToken()
     .then( token => {
       let config = {
         headers: {
@@ -51,10 +51,10 @@ function galleryService($log, $q, $http, authService) {
       return $http.post(`${url}/api/gallery`, gallery, config);
     })
     .then( res => {
-      $log.debug('gallery created');
-
-      service.galleries.unshift(res.data);
-      return res.data;
+      $log.log('gallery created');
+      let gallery = res.data;
+      service.galleries.unshift(gallery);
+      return gallery;
     })
     .catch( err => {
       $log.error(err);
@@ -62,8 +62,31 @@ function galleryService($log, $q, $http, authService) {
     });
   };
 
-  service.deleteGallery = function() {
+  service.deleteGallery = function(gallery) {
+    $log.debug('authService.deleteGallery');
 
+    return authService.getToken()
+    .then( token => {
+      let config = {
+        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+          Authorization: `Bearer ${token}`,
+        }
+      };
+      return $http.delete(`${url}/api/gallery/${gallery}`, config);
+    })
+    .then( res => {
+      $log.debug('gallery deleted');
+      service.galleries.forEach( (_gallery, index) => {
+        if (_gallery._id === gallery) service.galleries.splice(index,1);
+      });
+      return res.data;
+    })
+    .catch( err => {
+      $log.error(err);
+      return $q.reject(err);
+    });
   };
 
   service.updateGallery = function() {
diff --git a/lab-zachary/app/view/home/_home.scss b/lab-zachary/app/view/home/_home.scss
index 1e239ecc..5258fced 100644
--- a/lab-zachary/app/view/home/_home.scss
+++ b/lab-zachary/app/view/home/_home.scss
@@ -2,13 +2,14 @@
 
 .home-content {
   h2 {
-    font-size: $primaryTextSize * .6;
+    font-size: $primaryTextSize * .9;
     margin-bottom: $gutter;
   }
   li {
     background-color: $tertiaryColor;
     color: $secondaryColor;
     padding: $gutter;
+    margin-bottom: $gutter;
     @include rounded;
     div {
       margin-bottom: $gutter ;
@@ -22,5 +23,12 @@
     div:last-child {
       margin-bottom:0;
     }
+    .btn-del{
+      float: right;
+      margin-top: 0;
+      padding: $gutter/3;
+      background-color:$secondaryColor;
+      color:$primaryColor;
+    }
   }
 }
\ No newline at end of file
diff --git a/lab-zachary/app/view/home/home-controller.js b/lab-zachary/app/view/home/home-controller.js
index 66495a44..fd6ae45b 100644
--- a/lab-zachary/app/view/home/home-controller.js
+++ b/lab-zachary/app/view/home/home-controller.js
@@ -5,7 +5,7 @@ require('./_home.scss');
 module.exports = ['$log','$rootScope', 'galleryService', HomeController];
 
 function HomeController($log, $rootScope, galleryService) {
-  $log.debug('HomeController', galleryService.fetchGalleries);
+  $log.debug('HomeController');
 
   this.galleries = [];
 
@@ -13,7 +13,16 @@ function HomeController($log, $rootScope, galleryService) {
     galleryService.fetchGalleries()
     .then( galleries => {
       this.galleries = galleries;
-      console.log('test',galleries)
+    });
+  };
+
+  this.deleteGallery = function(gallery) {
+    galleryService.deleteGallery(gallery)
+    .then( _gallery => {
+      $log.debug('gallery deleted:', _gallery );
+    })
+    .catch( err => {
+      $log.error( err);
     });
   };
 
diff --git a/lab-zachary/app/view/home/home.html b/lab-zachary/app/view/home/home.html
index b2b8931e..b520824c 100644
--- a/lab-zachary/app/view/home/home.html
+++ b/lab-zachary/app/view/home/home.html
@@ -3,6 +3,7 @@
   <h2 ng-if="homeCtrl.galleries.length">Galleries</h2>
   <ul>
     <li ng-repeat="gallery in homeCtrl.galleries" >
+    <button class="btn-std btn-del" ng-click="homeCtrl.deleteGallery(gallery._id)">delete</button>
       <div><span>name: </span><span>{{ gallery.name }}</span></div>
       <div><span>description: </span><span>{{ gallery.desc }}</span></div>
       <div><span>id: </span><span>{{ gallery._id }}</span></div>

From 930c6fdc203a75aabf6b96852f9bc3e798229602 Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Thu, 30 Mar 2017 11:09:48 -0700
Subject: [PATCH 10/23] initial put route work

---
 lab-zachary/app/service/gallery-service.js   | 28 +++++++++++++++++---
 lab-zachary/app/view/home/home-controller.js | 15 +++++++++++
 lab-zachary/app/view/home/home.html          | 17 +++++++++---
 3 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/lab-zachary/app/service/gallery-service.js b/lab-zachary/app/service/gallery-service.js
index 39a3a41f..6ecdb039 100644
--- a/lab-zachary/app/service/gallery-service.js
+++ b/lab-zachary/app/service/gallery-service.js
@@ -62,6 +62,30 @@ function galleryService($log, $q, $http, authService) {
     });
   };
 
+  service.updateGallery = function(gallery) {
+    $log.debug('galleryService.updateGallery', gallery);
+
+    return authService.getToken()
+    .then( token => {
+      let config = {
+        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+          Authorization: `Bearer ${token}`,
+        }
+      };
+      return $http.put(`${url}/api/gallery/${gallery._id}`, gallery, config);
+    })
+    .then( res => {
+      $log.log('gallery updated:', res.data);
+      return res.data;
+    })
+    .catch( err => {
+      $log.error(err);
+      return $q.reject(err);
+    });
+  };
+
   service.deleteGallery = function(gallery) {
     $log.debug('authService.deleteGallery');
 
@@ -89,9 +113,5 @@ function galleryService($log, $q, $http, authService) {
     });
   };
 
-  service.updateGallery = function() {
-
-  };
-
   return service;
 }
\ No newline at end of file
diff --git a/lab-zachary/app/view/home/home-controller.js b/lab-zachary/app/view/home/home-controller.js
index fd6ae45b..93584dc8 100644
--- a/lab-zachary/app/view/home/home-controller.js
+++ b/lab-zachary/app/view/home/home-controller.js
@@ -8,6 +8,7 @@ function HomeController($log, $rootScope, galleryService) {
   $log.debug('HomeController');
 
   this.galleries = [];
+  this.editor = false;
 
   this.fetchGalleries = function() {
     galleryService.fetchGalleries()
@@ -26,6 +27,20 @@ function HomeController($log, $rootScope, galleryService) {
     });
   };
 
+  this.updateGallery = function(gallery) {
+    galleryService.updateGallery(gallery)
+    .then( _gallery => {
+      $log.debug('gallery updated',_gallery);
+    })
+    .catch( err => {
+      $log.error( err );
+    });
+  };
+
+  this.edit = () => {
+    this.editor = true;
+  };
+
   this.fetchGalleries();
 
   $rootScope.$on('$locationChangeSuccess', () => {
diff --git a/lab-zachary/app/view/home/home.html b/lab-zachary/app/view/home/home.html
index b520824c..20de65a3 100644
--- a/lab-zachary/app/view/home/home.html
+++ b/lab-zachary/app/view/home/home.html
@@ -1,11 +1,20 @@
-<section class="home-content">
+<section class="home-content">{{ homeCtrl.editor }}
   <create-gallery></create-gallery>
   <h2 ng-if="homeCtrl.galleries.length">Galleries</h2>
   <ul>
     <li ng-repeat="gallery in homeCtrl.galleries" >
-    <button class="btn-std btn-del" ng-click="homeCtrl.deleteGallery(gallery._id)">delete</button>
-      <div><span>name: </span><span>{{ gallery.name }}</span></div>
-      <div><span>description: </span><span>{{ gallery.desc }}</span></div>
+    <button class="btn-std btn-del" ng-show="!homeCtrl.editor" ng-click="homeCtrl.edit()">edit</button>
+
+    <button class="btn-std btn-del" ng-show="homeCtrl.editor" ng-click="homeCtrl.deleteGallery(gallery._id)">delete</button>
+    <button class="btn-std btn-del" ng-show="homeCtrl.editor" ng-click="homeCtrl.updateGallery(gallery._id)">update</button>
+      <div><span>name: </span>
+      <span ng-show="!homeCtrl.editor">{{ gallery.name }}</span>
+      <input ng-show="homeCtrl.editor" ng-model="gallery.name" type="text">
+      </div>
+      <div><span>description: </span>
+      <span ng-show="!homeCtrl.editor">{{ gallery.desc }}</span>
+      <input ng-show="homeCtrl.editor" ng-model="gallery.desc" type="text">
+      </div>
       <div><span>id: </span><span>{{ gallery._id }}</span></div>
     </li>
   </ul>

From 8b22599140a7d75db5c9c30884ece0ff8cffabe7 Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Thu, 30 Mar 2017 18:42:20 -0700
Subject: [PATCH 11/23] added full put functionality and updated styles to
 scale better

---
 .../create-gallery/create-gallery.html        |  1 +
 .../gallery/gallery-edit/_gallery-edit.scss   | 15 +++++++
 .../gallery/gallery-edit/gallery-edit.html    | 20 +++++++++
 .../gallery/gallery-edit/gallery-edit.js      | 27 +++++++++++
 .../gallery/gallery-item/_gallery-item.scss   | 45 +++++++++++++++++++
 .../gallery/gallery-item/gallery-item.html    | 21 +++++++++
 .../gallery/gallery-item/gallery-item.js      | 30 +++++++++++++
 .../app/component/landing/login/login.js      |  2 +-
 lab-zachary/app/component/navbar/_navbar.scss | 15 +++----
 lab-zachary/app/component/navbar/navbar.html  |  3 +-
 lab-zachary/app/component/navbar/navbar.js    |  2 +-
 lab-zachary/app/scss/lib/base/_base.scss      |  9 ++--
 .../app/scss/lib/base/_global-vars.scss       |  3 +-
 lab-zachary/app/service/gallery-service.js    |  9 ++--
 lab-zachary/app/view/home/_home.scss          | 26 -----------
 lab-zachary/app/view/home/home-controller.js  | 15 +------
 lab-zachary/app/view/home/home.html           | 20 ++-------
 17 files changed, 186 insertions(+), 77 deletions(-)
 create mode 100644 lab-zachary/app/component/gallery/gallery-edit/_gallery-edit.scss
 create mode 100644 lab-zachary/app/component/gallery/gallery-edit/gallery-edit.html
 create mode 100644 lab-zachary/app/component/gallery/gallery-edit/gallery-edit.js
 create mode 100644 lab-zachary/app/component/gallery/gallery-item/_gallery-item.scss
 create mode 100644 lab-zachary/app/component/gallery/gallery-item/gallery-item.html
 create mode 100644 lab-zachary/app/component/gallery/gallery-item/gallery-item.js

diff --git a/lab-zachary/app/component/gallery/create-gallery/create-gallery.html b/lab-zachary/app/component/gallery/create-gallery/create-gallery.html
index a4a1806b..90e811f8 100644
--- a/lab-zachary/app/component/gallery/create-gallery/create-gallery.html
+++ b/lab-zachary/app/component/gallery/create-gallery/create-gallery.html
@@ -1,4 +1,5 @@
 <section class="create-gallery">
+<h2>Create a new gallery.</h2>
   <form name="createGalleryForm"
     class="gallery-form"
     ng-submit="createGalleryCtrl.createGallery()">
diff --git a/lab-zachary/app/component/gallery/gallery-edit/_gallery-edit.scss b/lab-zachary/app/component/gallery/gallery-edit/_gallery-edit.scss
new file mode 100644
index 00000000..2d563ba6
--- /dev/null
+++ b/lab-zachary/app/component/gallery/gallery-edit/_gallery-edit.scss
@@ -0,0 +1,15 @@
+@import '../../../scss/lib/base/global-vars';
+
+form.gallery-edit{
+  .current-item{
+    input {
+      display:inline-block;
+      width: 50%;
+      height: unset;
+      margin: 0;
+      padding: .1vw;
+      background-color: $tertiaryColor*1.2;
+      border:none;
+    }
+  }
+}
\ No newline at end of file
diff --git a/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.html b/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.html
new file mode 100644
index 00000000..926c1f64
--- /dev/null
+++ b/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.html
@@ -0,0 +1,20 @@
+  <form ng-submit="galleryEditCtrl.updateGallery()" class="gallery-edit">
+    <div class="current-item">
+    <div>
+    <span>name: </span>
+      <input type="text" name="name"
+        ng-model="galleryEditCtrl.gallery.name"
+        placeholder="{{ galleryEditCtrl.gallery.name }}">
+    </div>
+    <div>
+    <span>description: </span>
+      <input type="text" name="desc"
+      ng-model="galleryEditCtrl.gallery.desc"
+      placeholder="{{ galleryEditCtrl.gallery.desc}}">
+    </div>
+  </div>
+  <div class="edit-buttons">
+  <button class="btn-std"
+  type="submit">
+  update</button>
+</form>
diff --git a/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.js b/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.js
new file mode 100644
index 00000000..a2f979a6
--- /dev/null
+++ b/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.js
@@ -0,0 +1,27 @@
+'use strict';
+
+require('./_gallery-edit.scss');
+
+module.exports = {
+  template: require('./gallery-edit.html'),
+  controller: ['$log', 'galleryService', GalleryEditController],
+  controllerAs: 'galleryEditCtrl',
+  bindings: {
+    gallery: '<'
+  }
+};
+
+function GalleryEditController($log, galleryService) {
+  $log.debug('GalleryEditController');
+
+  this.updateGallery = function() {
+    $log.debug('GalleryEditController.updateGallery');
+    galleryService.updateGallery(this.gallery._id, this.gallery)
+    .then( _gallery => {
+      $log.debug('gallery updated', _gallery);
+    })
+    .catch( err => {
+      $log.error(err);
+    });
+  };
+}
diff --git a/lab-zachary/app/component/gallery/gallery-item/_gallery-item.scss b/lab-zachary/app/component/gallery/gallery-item/_gallery-item.scss
new file mode 100644
index 00000000..f4f1eec8
--- /dev/null
+++ b/lab-zachary/app/component/gallery/gallery-item/_gallery-item.scss
@@ -0,0 +1,45 @@
+@import '../../../scss/lib/base/global-vars';
+
+.gallery-item {
+    .current-item{
+      background-color: $tertiaryColor;
+      color: $secondaryColor;
+      padding: $gutter/2 $gutter;
+      margin: $gutter 0 ;
+      @include rounded;
+      div {
+        margin-bottom: $gutter/2 ;
+        padding: 1.1% 0;
+
+        span:first-child {
+        font-weight: bold;
+        }
+        span:last-child {
+        }
+      }
+      div:last-child {
+        margin-bottom:0;
+      }
+      }
+  }
+  div.edit-buttons{
+    float:right;
+    text-align: right;
+    width:100%;
+    margin:0vw 0 2vw 0;
+
+    button.btn-std{
+      margin: 0;
+      background-color:$secondaryColor;
+      color:$primaryColor;
+      float:none;
+
+      &.del{
+        margin-left: $gutter;
+        padding-left:$gutter*2;
+        padding-right:$gutter*2;
+        color: $secondaryColor;
+        background-color: $primaryColor/1.2;
+      }
+  }
+}
\ No newline at end of file
diff --git a/lab-zachary/app/component/gallery/gallery-item/gallery-item.html b/lab-zachary/app/component/gallery/gallery-item/gallery-item.html
new file mode 100644
index 00000000..38c0d0aa
--- /dev/null
+++ b/lab-zachary/app/component/gallery/gallery-item/gallery-item.html
@@ -0,0 +1,21 @@
+<li class="gallery-item">
+  <div ng-if="!galleryItemCtrl.showEditGallery" class="current-item">
+    <div><span>name: </span>
+    <span>{{ galleryItemCtrl.gallery.name }}</span>
+    </div>
+    <div><span>description: </span>
+    <span>{{ galleryItemCtrl.gallery.desc }}</span>
+    </div>
+  </div>
+    <gallery-edit gallery="galleryItemCtrl.gallery"
+      ng-if="galleryItemCtrl.showEditGallery">
+    </gallery-edit>
+ </li>
+<div class="edit-buttons" ng-if="!galleryItemCtrl.showEditGallery">
+  <button class="btn-std"
+  ng-click="galleryItemCtrl.showEditGallery = !galleryItemCtrl.showEditGallery">
+  edit</button>
+  <button class="btn-std del"
+  ng-click="galleryItemCtrl.deleteGallery()">delete</button>
+</div>
+<div class="clearfix"></div>
\ No newline at end of file
diff --git a/lab-zachary/app/component/gallery/gallery-item/gallery-item.js b/lab-zachary/app/component/gallery/gallery-item/gallery-item.js
new file mode 100644
index 00000000..d091204e
--- /dev/null
+++ b/lab-zachary/app/component/gallery/gallery-item/gallery-item.js
@@ -0,0 +1,30 @@
+'use strict';
+
+require('./_gallery-item.scss');
+
+module.exports = {
+  template: require('./gallery-item.html'),
+  controller: ['$log', 'galleryService', GalleryItemController],
+  controllerAs: 'galleryItemCtrl',
+  bindings: {
+    gallery: '<'
+  }
+};
+
+function GalleryItemController($log, galleryService) {
+  $log.debug('GalleryItemController');
+
+  this.showEditGallery = false;
+
+  this.deleteGallery = function() {
+    galleryService.deleteGallery(this.gallery._id)
+    .then( _gallery => {
+      $log.debug('gallery deleted:', _gallery );
+    })
+    .catch( err => {
+      $log.error( err);
+    });
+  };
+
+
+}
\ No newline at end of file
diff --git a/lab-zachary/app/component/landing/login/login.js b/lab-zachary/app/component/landing/login/login.js
index 5451929e..006ecc9e 100644
--- a/lab-zachary/app/component/landing/login/login.js
+++ b/lab-zachary/app/component/landing/login/login.js
@@ -24,4 +24,4 @@ function LoginController($log, $location, authService) {
       $location.url('/home');
     });
   };
-};
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lab-zachary/app/component/navbar/_navbar.scss b/lab-zachary/app/component/navbar/_navbar.scss
index aae7a78a..a1f5919c 100644
--- a/lab-zachary/app/component/navbar/_navbar.scss
+++ b/lab-zachary/app/component/navbar/_navbar.scss
@@ -4,7 +4,7 @@ nav {
     background-color: $secondaryColor;
     color: $white;
     img{
-      height: 70px;
+      height: 10vw;
       width: auto;
       margin: $gutter/2 $gutter;
       display: inline-block;
@@ -12,19 +12,18 @@ nav {
     }
     h1{
       display: inline-block;
-      font-size: $primaryTextSize;
+      font-size: $primaryTextSize*1.2;
       vertical-align: middle;
     }
-    div{
-      float: right;
-      margin: $gutter;
-      min-width: 150px;
+
 
     .btn-std {
       background-color: $primaryColor;
       color: $secondaryColor;
-      padding: 0 $gutter*5;
+      padding: $gutter/3.2 $gutter;
+      margin: $gutter*1.3 $gutter
+
       //min-width: 85px;
-     }
+
     }
   }
\ No newline at end of file
diff --git a/lab-zachary/app/component/navbar/navbar.html b/lab-zachary/app/component/navbar/navbar.html
index bdef69fa..5433dcc6 100644
--- a/lab-zachary/app/component/navbar/navbar.html
+++ b/lab-zachary/app/component/navbar/navbar.html
@@ -1,11 +1,10 @@
 <nav>
   <img ng-src="../assets/cf-logo.png">
   <h1>cfgram</h1>
-    <div>
       <button ng-hide="navbarCtrl.hideButtons"
        class="btn-std"
        ng-click="navbarCtrl.logout()">
        sign out
        </button>
-    </div>
+
 </nav>
\ No newline at end of file
diff --git a/lab-zachary/app/component/navbar/navbar.js b/lab-zachary/app/component/navbar/navbar.js
index 69dcb7fb..90ad01d8 100644
--- a/lab-zachary/app/component/navbar/navbar.js
+++ b/lab-zachary/app/component/navbar/navbar.js
@@ -11,7 +11,7 @@ function NavbarController($log, $location, $rootScope, authService) {
   $log.debug('NavbarController');
 
   this.checkPath = function() {
-    let path = ($location.path() === '/join')
+    let path = ($location.path() === '/join');
 
     //$log.debug($location.path);
 
diff --git a/lab-zachary/app/scss/lib/base/_base.scss b/lab-zachary/app/scss/lib/base/_base.scss
index ee621020..46846a59 100644
--- a/lab-zachary/app/scss/lib/base/_base.scss
+++ b/lab-zachary/app/scss/lib/base/_base.scss
@@ -3,6 +3,7 @@ body{
   background-color: $primaryColor;
   font-family: $fontStack;
   display: relative;
+  font-size: $secondaryTextSize;
 
   a{
     text-decoration: none;
@@ -15,7 +16,6 @@ body{
 
   main {
     margin:$gutter;
-
     min-height: calc(100vh - 70px);
 
   }
@@ -27,16 +27,15 @@ body{
     box-sizing:border-box;
     border: 1px solid $tertiaryColor;
     margin: $gutter 0;
-    font-size: 16px;
-    height: 40px;
-    padding:5px;
+    font-size: $secondaryTextSize;
+    padding:1%;
     @include rounded(3px);
   }
 
   .btn-std{
     @extend input;
     width: unset;
-    padding: 0 $gutter*2.5;
+    padding: 1% $gutter*2.5;
     background-color: $secondaryColor;
     color: $white;
     font-weight: 300;
diff --git a/lab-zachary/app/scss/lib/base/_global-vars.scss b/lab-zachary/app/scss/lib/base/_global-vars.scss
index f4241a7d..85759028 100644
--- a/lab-zachary/app/scss/lib/base/_global-vars.scss
+++ b/lab-zachary/app/scss/lib/base/_global-vars.scss
@@ -9,7 +9,8 @@ $black: #000;
 $gutter: 3%;
 
 $fontStack: 'Open Sans', Helvetica, sans-serif;
-$primaryTextSize: 4.4vw;
+$primaryTextSize: 5.4vw;
+$secondaryTextSize: 3vw;
 
 @mixin rounded($radius: 0.5em) {
   -webkit-border-radius: $radius;
diff --git a/lab-zachary/app/service/gallery-service.js b/lab-zachary/app/service/gallery-service.js
index 6ecdb039..911b3c16 100644
--- a/lab-zachary/app/service/gallery-service.js
+++ b/lab-zachary/app/service/gallery-service.js
@@ -62,8 +62,8 @@ function galleryService($log, $q, $http, authService) {
     });
   };
 
-  service.updateGallery = function(gallery) {
-    $log.debug('galleryService.updateGallery', gallery);
+  service.updateGallery = function(galleryID, galleryData) {
+    $log.debug('galleryService.updateGallery');
 
     return authService.getToken()
     .then( token => {
@@ -74,10 +74,13 @@ function galleryService($log, $q, $http, authService) {
           Authorization: `Bearer ${token}`,
         }
       };
-      return $http.put(`${url}/api/gallery/${gallery._id}`, gallery, config);
+      return $http.put(`${url}/api/gallery/${galleryID}`, galleryData, config);
     })
     .then( res => {
       $log.log('gallery updated:', res.data);
+      service.galleries.forEach( (_gallery, index) => {
+        if (_gallery._id === galleryID) service.galleries[index] = res.data;
+      });
       return res.data;
     })
     .catch( err => {
diff --git a/lab-zachary/app/view/home/_home.scss b/lab-zachary/app/view/home/_home.scss
index 5258fced..a5864187 100644
--- a/lab-zachary/app/view/home/_home.scss
+++ b/lab-zachary/app/view/home/_home.scss
@@ -5,30 +5,4 @@
     font-size: $primaryTextSize * .9;
     margin-bottom: $gutter;
   }
-  li {
-    background-color: $tertiaryColor;
-    color: $secondaryColor;
-    padding: $gutter;
-    margin-bottom: $gutter;
-    @include rounded;
-    div {
-      margin-bottom: $gutter ;
-
-      span:first-child {
-      font-weight: bold;
-      }
-      span:last-child {
-      }
-    }
-    div:last-child {
-      margin-bottom:0;
-    }
-    .btn-del{
-      float: right;
-      margin-top: 0;
-      padding: $gutter/3;
-      background-color:$secondaryColor;
-      color:$primaryColor;
-    }
-  }
 }
\ No newline at end of file
diff --git a/lab-zachary/app/view/home/home-controller.js b/lab-zachary/app/view/home/home-controller.js
index 93584dc8..85d88892 100644
--- a/lab-zachary/app/view/home/home-controller.js
+++ b/lab-zachary/app/view/home/home-controller.js
@@ -8,7 +8,6 @@ function HomeController($log, $rootScope, galleryService) {
   $log.debug('HomeController');
 
   this.galleries = [];
-  this.editor = false;
 
   this.fetchGalleries = function() {
     galleryService.fetchGalleries()
@@ -17,15 +16,7 @@ function HomeController($log, $rootScope, galleryService) {
     });
   };
 
-  this.deleteGallery = function(gallery) {
-    galleryService.deleteGallery(gallery)
-    .then( _gallery => {
-      $log.debug('gallery deleted:', _gallery );
-    })
-    .catch( err => {
-      $log.error( err);
-    });
-  };
+
 
   this.updateGallery = function(gallery) {
     galleryService.updateGallery(gallery)
@@ -37,9 +28,7 @@ function HomeController($log, $rootScope, galleryService) {
     });
   };
 
-  this.edit = () => {
-    this.editor = true;
-  };
+
 
   this.fetchGalleries();
 
diff --git a/lab-zachary/app/view/home/home.html b/lab-zachary/app/view/home/home.html
index 20de65a3..fb6c89f7 100644
--- a/lab-zachary/app/view/home/home.html
+++ b/lab-zachary/app/view/home/home.html
@@ -1,21 +1,7 @@
-<section class="home-content">{{ homeCtrl.editor }}
+<section class="home-content">
   <create-gallery></create-gallery>
-  <h2 ng-if="homeCtrl.galleries.length">Galleries</h2>
+  <h2 ng-if="homeCtrl.galleries">Galleries</h2>
   <ul>
-    <li ng-repeat="gallery in homeCtrl.galleries" >
-    <button class="btn-std btn-del" ng-show="!homeCtrl.editor" ng-click="homeCtrl.edit()">edit</button>
-
-    <button class="btn-std btn-del" ng-show="homeCtrl.editor" ng-click="homeCtrl.deleteGallery(gallery._id)">delete</button>
-    <button class="btn-std btn-del" ng-show="homeCtrl.editor" ng-click="homeCtrl.updateGallery(gallery._id)">update</button>
-      <div><span>name: </span>
-      <span ng-show="!homeCtrl.editor">{{ gallery.name }}</span>
-      <input ng-show="homeCtrl.editor" ng-model="gallery.name" type="text">
-      </div>
-      <div><span>description: </span>
-      <span ng-show="!homeCtrl.editor">{{ gallery.desc }}</span>
-      <input ng-show="homeCtrl.editor" ng-model="gallery.desc" type="text">
-      </div>
-      <div><span>id: </span><span>{{ gallery._id }}</span></div>
-    </li>
+    <gallery-item ng-repeat="gallery in homeCtrl.galleries" gallery="gallery"></gallery-item>
   </ul>
 </section>
\ No newline at end of file

From 2d8f77bdf37e5c28490190e66661e197eba6b7af Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Sun, 2 Apr 2017 14:18:50 -0700
Subject: [PATCH 12/23] added cancel functionality - scoping issues still
 present

---
 .../gallery/gallery-edit/gallery-edit.html    |  5 +++++
 .../gallery/gallery-edit/gallery-edit.js      | 21 +++++++++++++++----
 .../gallery/gallery-item/_gallery-item.scss   |  3 ++-
 .../gallery/gallery-item/gallery-item.html    |  2 ++
 .../gallery/gallery-item/gallery-item.js      |  2 +-
 lab-zachary/app/scss/lib/base/_base.scss      |  5 +++++
 lab-zachary/app/service/gallery-service.js    |  8 +++----
 lab-zachary/app/view/home/home-controller.js  | 10 ---------
 lab-zachary/app/view/home/home.html           |  2 +-
 9 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.html b/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.html
index 926c1f64..7f4cfabc 100644
--- a/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.html
+++ b/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.html
@@ -17,4 +17,9 @@
   <button class="btn-std"
   type="submit">
   update</button>
+    <button class="btn-std cancel"
+    type="button"
+    ng-click="galleryEditCtrl.cancelUpdate()">
+  cancel</button>
+
 </form>
diff --git a/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.js b/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.js
index a2f979a6..b88b7b17 100644
--- a/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.js
+++ b/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.js
@@ -7,18 +7,31 @@ module.exports = {
   controller: ['$log', 'galleryService', GalleryEditController],
   controllerAs: 'galleryEditCtrl',
   bindings: {
-    gallery: '<'
+    gallery: '<',
+    showEditGallery: '='
   }
 };
 
 function GalleryEditController($log, galleryService) {
   $log.debug('GalleryEditController');
-
+  this.galleries = galleryService.galleries;
+  this.cancelUpdate = function() {
+    this.showEditGallery = false;
+    galleryService.fetchGalleries()
+    .then( oGalleries => {
+      oGalleries.forEach( (_gallery, index) => {
+        if (_gallery._id === this.gallery._id) this.galleries[index] = _gallery;
+      });
+    })
+    .catch( err => {
+      $log.error(err);
+    });
+  };
   this.updateGallery = function() {
     $log.debug('GalleryEditController.updateGallery');
     galleryService.updateGallery(this.gallery._id, this.gallery)
-    .then( _gallery => {
-      $log.debug('gallery updated', _gallery);
+    .then( () => {
+      this.showEditGallery = false;
     })
     .catch( err => {
       $log.error(err);
diff --git a/lab-zachary/app/component/gallery/gallery-item/_gallery-item.scss b/lab-zachary/app/component/gallery/gallery-item/_gallery-item.scss
index f4f1eec8..6e484aa3 100644
--- a/lab-zachary/app/component/gallery/gallery-item/_gallery-item.scss
+++ b/lab-zachary/app/component/gallery/gallery-item/_gallery-item.scss
@@ -28,7 +28,7 @@
     width:100%;
     margin:0vw 0 2vw 0;
 
-    button.btn-std{
+    .btn-std{
       margin: 0;
       background-color:$secondaryColor;
       color:$primaryColor;
@@ -41,5 +41,6 @@
         color: $secondaryColor;
         background-color: $primaryColor/1.2;
       }
+
   }
 }
\ No newline at end of file
diff --git a/lab-zachary/app/component/gallery/gallery-item/gallery-item.html b/lab-zachary/app/component/gallery/gallery-item/gallery-item.html
index 38c0d0aa..026c0153 100644
--- a/lab-zachary/app/component/gallery/gallery-item/gallery-item.html
+++ b/lab-zachary/app/component/gallery/gallery-item/gallery-item.html
@@ -8,6 +8,7 @@
     </div>
   </div>
     <gallery-edit gallery="galleryItemCtrl.gallery"
+    show-edit-gallery="galleryItemCtrl.showEditGallery"
       ng-if="galleryItemCtrl.showEditGallery">
     </gallery-edit>
  </li>
@@ -18,4 +19,5 @@
   <button class="btn-std del"
   ng-click="galleryItemCtrl.deleteGallery()">delete</button>
 </div>
+
 <div class="clearfix"></div>
\ No newline at end of file
diff --git a/lab-zachary/app/component/gallery/gallery-item/gallery-item.js b/lab-zachary/app/component/gallery/gallery-item/gallery-item.js
index d091204e..6a5b299f 100644
--- a/lab-zachary/app/component/gallery/gallery-item/gallery-item.js
+++ b/lab-zachary/app/component/gallery/gallery-item/gallery-item.js
@@ -7,7 +7,7 @@ module.exports = {
   controller: ['$log', 'galleryService', GalleryItemController],
   controllerAs: 'galleryItemCtrl',
   bindings: {
-    gallery: '<'
+    gallery: '<',
   }
 };
 
diff --git a/lab-zachary/app/scss/lib/base/_base.scss b/lab-zachary/app/scss/lib/base/_base.scss
index 46846a59..e6c7a7c0 100644
--- a/lab-zachary/app/scss/lib/base/_base.scss
+++ b/lab-zachary/app/scss/lib/base/_base.scss
@@ -49,5 +49,10 @@ body{
     // position: absolute;
     // bottom: 0px;
   }
+  pre{
+    max-width:100%;
+    font-style: monospace;
+    overflow: auto;
+  }
 }
 
diff --git a/lab-zachary/app/service/gallery-service.js b/lab-zachary/app/service/gallery-service.js
index 911b3c16..e4212f7c 100644
--- a/lab-zachary/app/service/gallery-service.js
+++ b/lab-zachary/app/service/gallery-service.js
@@ -77,10 +77,10 @@ function galleryService($log, $q, $http, authService) {
       return $http.put(`${url}/api/gallery/${galleryID}`, galleryData, config);
     })
     .then( res => {
-      $log.log('gallery updated:', res.data);
-      service.galleries.forEach( (_gallery, index) => {
-        if (_gallery._id === galleryID) service.galleries[index] = res.data;
-      });
+      $log.log('gallery updated:');
+      // service.galleries.forEach( (_gallery, index) => {
+      //  if (_gallery._id === galleryID) service.galleries[index] = res.data;
+      // });
       return res.data;
     })
     .catch( err => {
diff --git a/lab-zachary/app/view/home/home-controller.js b/lab-zachary/app/view/home/home-controller.js
index 85d88892..bcc10d2d 100644
--- a/lab-zachary/app/view/home/home-controller.js
+++ b/lab-zachary/app/view/home/home-controller.js
@@ -18,16 +18,6 @@ function HomeController($log, $rootScope, galleryService) {
 
 
 
-  this.updateGallery = function(gallery) {
-    galleryService.updateGallery(gallery)
-    .then( _gallery => {
-      $log.debug('gallery updated',_gallery);
-    })
-    .catch( err => {
-      $log.error( err );
-    });
-  };
-
 
 
   this.fetchGalleries();
diff --git a/lab-zachary/app/view/home/home.html b/lab-zachary/app/view/home/home.html
index fb6c89f7..adb3259a 100644
--- a/lab-zachary/app/view/home/home.html
+++ b/lab-zachary/app/view/home/home.html
@@ -2,6 +2,6 @@
   <create-gallery></create-gallery>
   <h2 ng-if="homeCtrl.galleries">Galleries</h2>
   <ul>
-    <gallery-item ng-repeat="gallery in homeCtrl.galleries" gallery="gallery"></gallery-item>
+    <gallery-item ng-repeat="gallerys in homeCtrl.galleries" gallery="gallerys"></gallery-item>
   </ul>
 </section>
\ No newline at end of file

From 2e9336cabd12a23461fda36244c4b32ac0ceb3dd Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Mon, 3 Apr 2017 11:00:43 -0700
Subject: [PATCH 13/23] finally got cancel functioning correctl

---
 .../gallery/gallery-edit/gallery-edit.js      | 23 +++++++++----------
 .../gallery/gallery-item/gallery-item.html    |  3 ++-
 .../gallery/gallery-item/gallery-item.js      |  7 +++++-
 lab-zachary/app/service/gallery-service.js    |  5 ++--
 lab-zachary/app/view/home/home.html           |  4 ++--
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.js b/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.js
index b88b7b17..5d231dc8 100644
--- a/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.js
+++ b/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.js
@@ -7,26 +7,25 @@ module.exports = {
   controller: ['$log', 'galleryService', GalleryEditController],
   controllerAs: 'galleryEditCtrl',
   bindings: {
-    gallery: '<',
-    showEditGallery: '='
+    gallery: '=',
+    showEditGallery: '=',
+    oldData: '<'
   }
 };
 
 function GalleryEditController($log, galleryService) {
   $log.debug('GalleryEditController');
-  this.galleries = galleryService.galleries;
+  //this.galleries = galleryService.galleries;
+  $log.debug(this.oldData, this);
   this.cancelUpdate = function() {
+    $log.debug(this.gallery);
+    this.gallery = this.oldData;
     this.showEditGallery = false;
-    galleryService.fetchGalleries()
-    .then( oGalleries => {
-      oGalleries.forEach( (_gallery, index) => {
-        if (_gallery._id === this.gallery._id) this.galleries[index] = _gallery;
-      });
-    })
-    .catch( err => {
-      $log.error(err);
-    });
+
+
+
   };
+
   this.updateGallery = function() {
     $log.debug('GalleryEditController.updateGallery');
     galleryService.updateGallery(this.gallery._id, this.gallery)
diff --git a/lab-zachary/app/component/gallery/gallery-item/gallery-item.html b/lab-zachary/app/component/gallery/gallery-item/gallery-item.html
index 026c0153..e764e43c 100644
--- a/lab-zachary/app/component/gallery/gallery-item/gallery-item.html
+++ b/lab-zachary/app/component/gallery/gallery-item/gallery-item.html
@@ -9,12 +9,13 @@
   </div>
     <gallery-edit gallery="galleryItemCtrl.gallery"
     show-edit-gallery="galleryItemCtrl.showEditGallery"
+    old-data="galleryItemCtrl.oldData"
       ng-if="galleryItemCtrl.showEditGallery">
     </gallery-edit>
  </li>
 <div class="edit-buttons" ng-if="!galleryItemCtrl.showEditGallery">
   <button class="btn-std"
-  ng-click="galleryItemCtrl.showEditGallery = !galleryItemCtrl.showEditGallery">
+  ng-click="galleryItemCtrl.editGallery()">
   edit</button>
   <button class="btn-std del"
   ng-click="galleryItemCtrl.deleteGallery()">delete</button>
diff --git a/lab-zachary/app/component/gallery/gallery-item/gallery-item.js b/lab-zachary/app/component/gallery/gallery-item/gallery-item.js
index 6a5b299f..b3a30b39 100644
--- a/lab-zachary/app/component/gallery/gallery-item/gallery-item.js
+++ b/lab-zachary/app/component/gallery/gallery-item/gallery-item.js
@@ -8,14 +8,19 @@ module.exports = {
   controllerAs: 'galleryItemCtrl',
   bindings: {
     gallery: '<',
+    oldData: '<',
   }
 };
 
 function GalleryItemController($log, galleryService) {
   $log.debug('GalleryItemController');
-
   this.showEditGallery = false;
 
+  this.editGallery = function() {
+    this.oldData = angular.copy(this.gallery);
+    this.showEditGallery = true;
+  };
+
   this.deleteGallery = function() {
     galleryService.deleteGallery(this.gallery._id)
     .then( _gallery => {
diff --git a/lab-zachary/app/service/gallery-service.js b/lab-zachary/app/service/gallery-service.js
index e4212f7c..e5969c24 100644
--- a/lab-zachary/app/service/gallery-service.js
+++ b/lab-zachary/app/service/gallery-service.js
@@ -32,8 +32,9 @@ function galleryService($log, $q, $http, authService) {
         return $q.reject(err);
       });
     });
-
-
+  };
+  service.cancelUpdate = function() {
+    service.fetchGalleries();
   };
 
   service.createGallery = function(gallery) {
diff --git a/lab-zachary/app/view/home/home.html b/lab-zachary/app/view/home/home.html
index adb3259a..391fa6f5 100644
--- a/lab-zachary/app/view/home/home.html
+++ b/lab-zachary/app/view/home/home.html
@@ -2,6 +2,6 @@
   <create-gallery></create-gallery>
   <h2 ng-if="homeCtrl.galleries">Galleries</h2>
   <ul>
-    <gallery-item ng-repeat="gallerys in homeCtrl.galleries" gallery="gallerys"></gallery-item>
+    <gallery-item ng-repeat="gallery in homeCtrl.galleries" gallery="gallery"></gallery-item>
   </ul>
-</section>
\ No newline at end of file
+</section>

From 8e993cb9d1a4fbe31e7f55715d025564c611e548 Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Mon, 3 Apr 2017 12:32:43 -0700
Subject: [PATCH 14/23] added .env

---
 lab-zachary/.env | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 lab-zachary/.env

diff --git a/lab-zachary/.env b/lab-zachary/.env
new file mode 100644
index 00000000..3a2fb159
--- /dev/null
+++ b/lab-zachary/.env
@@ -0,0 +1 @@
+API_URL='http://localhost:8000'
\ No newline at end of file

From 8cc28d339098ed27343b86e856d85d0aa9d68b71 Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Mon, 3 Apr 2017 16:40:49 -0700
Subject: [PATCH 15/23] day 4 framework

---
 .../gallery/thumbnail-container/_thumbnail-container.scss         | 0
 .../gallery/thumbnail-container/thumbnail-container.html          | 0
 .../component/gallery/thumbnail-container/thumbnail-container.js  | 0
 lab-zachary/app/component/gallery/thumbnail/_thumbnail.scss       | 0
 lab-zachary/app/component/gallery/thumbnail/thumbnail.html        | 0
 lab-zachary/app/component/gallery/thumbnail/thumbnail.js          | 0
 lab-zachary/app/component/gallery/upload-pic/_upload-pic.scss     | 0
 lab-zachary/app/component/gallery/upload-pic/upload-pic.html      | 0
 lab-zachary/app/component/gallery/upload-pic/upload-pic.js        | 0
 9 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 lab-zachary/app/component/gallery/thumbnail-container/_thumbnail-container.scss
 create mode 100644 lab-zachary/app/component/gallery/thumbnail-container/thumbnail-container.html
 create mode 100644 lab-zachary/app/component/gallery/thumbnail-container/thumbnail-container.js
 create mode 100644 lab-zachary/app/component/gallery/thumbnail/_thumbnail.scss
 create mode 100644 lab-zachary/app/component/gallery/thumbnail/thumbnail.html
 create mode 100644 lab-zachary/app/component/gallery/thumbnail/thumbnail.js
 create mode 100644 lab-zachary/app/component/gallery/upload-pic/_upload-pic.scss
 create mode 100644 lab-zachary/app/component/gallery/upload-pic/upload-pic.html
 create mode 100644 lab-zachary/app/component/gallery/upload-pic/upload-pic.js

diff --git a/lab-zachary/app/component/gallery/thumbnail-container/_thumbnail-container.scss b/lab-zachary/app/component/gallery/thumbnail-container/_thumbnail-container.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/component/gallery/thumbnail-container/thumbnail-container.html b/lab-zachary/app/component/gallery/thumbnail-container/thumbnail-container.html
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/component/gallery/thumbnail-container/thumbnail-container.js b/lab-zachary/app/component/gallery/thumbnail-container/thumbnail-container.js
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/component/gallery/thumbnail/_thumbnail.scss b/lab-zachary/app/component/gallery/thumbnail/_thumbnail.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/component/gallery/thumbnail/thumbnail.html b/lab-zachary/app/component/gallery/thumbnail/thumbnail.html
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/component/gallery/thumbnail/thumbnail.js b/lab-zachary/app/component/gallery/thumbnail/thumbnail.js
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/component/gallery/upload-pic/_upload-pic.scss b/lab-zachary/app/component/gallery/upload-pic/_upload-pic.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/component/gallery/upload-pic/upload-pic.html b/lab-zachary/app/component/gallery/upload-pic/upload-pic.html
new file mode 100644
index 00000000..e69de29b
diff --git a/lab-zachary/app/component/gallery/upload-pic/upload-pic.js b/lab-zachary/app/component/gallery/upload-pic/upload-pic.js
new file mode 100644
index 00000000..e69de29b

From ff7960c8bfc15af45dd684137437c79935c9aeb7 Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Mon, 3 Apr 2017 22:02:16 -0700
Subject: [PATCH 16/23] added pic upload and delete functionality

---
 .../gallery/gallery-edit/gallery-edit.html    |  1 +
 .../_thumbnail-container.scss                 |  9 +++
 .../thumbnail-container.html                  |  8 +++
 .../thumbnail-container.js                    | 10 +++
 .../gallery/thumbnail/_thumbnail.scss         | 15 ++++
 .../gallery/thumbnail/thumbnail.html          |  5 ++
 .../component/gallery/thumbnail/thumbnail.js  | 24 +++++++
 .../gallery/upload-pic/_upload-pic.scss       | 30 ++++++++
 .../gallery/upload-pic/upload-pic.html        | 27 ++++++++
 .../gallery/upload-pic/upload-pic.js          | 27 ++++++++
 lab-zachary/app/entry.js                      |  4 +-
 .../app/scss/lib/base/_global-vars.scss       |  9 ++-
 lab-zachary/app/service/pic-service.js        | 69 +++++++++++++++++++
 lab-zachary/app/view/home/home-controller.js  |  1 +
 lab-zachary/app/view/home/home.html           |  7 +-
 lab-zachary/package.json                      |  2 +
 16 files changed, 245 insertions(+), 3 deletions(-)
 create mode 100644 lab-zachary/app/service/pic-service.js

diff --git a/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.html b/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.html
index 7f4cfabc..1e05f1b0 100644
--- a/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.html
+++ b/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.html
@@ -23,3 +23,4 @@
   cancel</button>
 
 </form>
+
diff --git a/lab-zachary/app/component/gallery/thumbnail-container/_thumbnail-container.scss b/lab-zachary/app/component/gallery/thumbnail-container/_thumbnail-container.scss
index e69de29b..88fc121a 100644
--- a/lab-zachary/app/component/gallery/thumbnail-container/_thumbnail-container.scss
+++ b/lab-zachary/app/component/gallery/thumbnail-container/_thumbnail-container.scss
@@ -0,0 +1,9 @@
+@import '../../../scss/lib/base/global-vars';
+
+
+.thumbnail-container{
+  margin: $gutter*3 0;
+    h3 {
+    margin-bottom: $gutter*2;
+  }
+}
\ No newline at end of file
diff --git a/lab-zachary/app/component/gallery/thumbnail-container/thumbnail-container.html b/lab-zachary/app/component/gallery/thumbnail-container/thumbnail-container.html
index e69de29b..13be8e12 100644
--- a/lab-zachary/app/component/gallery/thumbnail-container/thumbnail-container.html
+++ b/lab-zachary/app/component/gallery/thumbnail-container/thumbnail-container.html
@@ -0,0 +1,8 @@
+<div class="thumbnail-container">
+  <h3>{{ thumbnailContainerCtrl.gallery.name }}</h3>
+  <upload-pic gallery="thumbnailContainerCtrl.gallery"></upload-pic>
+  <div class="thumbs">
+    <thumbnail ng-repeat="item in thumbnailContainerCtrl.gallery.pics" pic="item" gallery="thumbnailContainerCtrl.gallery"></thumbnail>
+  </div>
+  <div class="clearfix"></div>
+</div>
\ No newline at end of file
diff --git a/lab-zachary/app/component/gallery/thumbnail-container/thumbnail-container.js b/lab-zachary/app/component/gallery/thumbnail-container/thumbnail-container.js
index e69de29b..bde02c97 100644
--- a/lab-zachary/app/component/gallery/thumbnail-container/thumbnail-container.js
+++ b/lab-zachary/app/component/gallery/thumbnail-container/thumbnail-container.js
@@ -0,0 +1,10 @@
+'use strict';
+
+require('./_thumbnail-container.scss');
+module.exports = {
+  template: require('./thumbnail-container.html'),
+  controllerAs: 'thumbnailContainerCtrl',
+  bindings: {
+    gallery: '<'
+  }
+};
\ No newline at end of file
diff --git a/lab-zachary/app/component/gallery/thumbnail/_thumbnail.scss b/lab-zachary/app/component/gallery/thumbnail/_thumbnail.scss
index e69de29b..0c15e9e6 100644
--- a/lab-zachary/app/component/gallery/thumbnail/_thumbnail.scss
+++ b/lab-zachary/app/component/gallery/thumbnail/_thumbnail.scss
@@ -0,0 +1,15 @@
+@import '../../../scss/lib/base/global-vars';
+
+.thumbnail{
+  width:100%;
+  margin-bottom: $gutter*2;
+
+  img{
+    max-width: 100%;
+    margin:0 auto;
+    display: block;
+    clear:both;
+  }
+
+
+}
\ No newline at end of file
diff --git a/lab-zachary/app/component/gallery/thumbnail/thumbnail.html b/lab-zachary/app/component/gallery/thumbnail/thumbnail.html
index e69de29b..29daf6b2 100644
--- a/lab-zachary/app/component/gallery/thumbnail/thumbnail.html
+++ b/lab-zachary/app/component/gallery/thumbnail/thumbnail.html
@@ -0,0 +1,5 @@
+<div class="thumbnail">
+  <img ng-src="{{ thumbnailCtrl.pic.imageURI }}" alt="{{ thumbnailCtrl.pic.desc }}">
+    <span class="btn-std" ng-click="thumbnailCtrl.deleteGalleryPic()">delete</span>
+  <div class="clearfix"></div>
+</div>
\ No newline at end of file
diff --git a/lab-zachary/app/component/gallery/thumbnail/thumbnail.js b/lab-zachary/app/component/gallery/thumbnail/thumbnail.js
index e69de29b..e6e6511a 100644
--- a/lab-zachary/app/component/gallery/thumbnail/thumbnail.js
+++ b/lab-zachary/app/component/gallery/thumbnail/thumbnail.js
@@ -0,0 +1,24 @@
+'use strict';
+
+require('./_thumbnail.scss');
+
+module.exports = {
+  template: require('./thumbnail.html'),
+  controller: ['$log', 'picService', thumbnailController],
+  controllerAs: 'thumbnailCtrl',
+  bindings: {
+    pic: '<',
+    gallery: '<'
+  }
+};
+
+function thumbnailController($log, picService){
+  $log.debug('thumbnailController');
+
+  this.deleteGalleryPic = function(){
+    console.log('deletePic');
+
+    picService.deleteGalleryPic(this.gallery, this.pic);
+  };
+
+}
\ No newline at end of file
diff --git a/lab-zachary/app/component/gallery/upload-pic/_upload-pic.scss b/lab-zachary/app/component/gallery/upload-pic/_upload-pic.scss
index e69de29b..864c208f 100644
--- a/lab-zachary/app/component/gallery/upload-pic/_upload-pic.scss
+++ b/lab-zachary/app/component/gallery/upload-pic/_upload-pic.scss
@@ -0,0 +1,30 @@
+@import '../../../scss/lib/base/global-vars';
+
+.upload-pic{
+  h3 {
+    margin-bottom: $gutter/2;
+    text-decoration: underline;
+  }
+  form{
+    input {
+      background-color: $tertiaryColor;
+      color:$white;
+      @include placeholder {
+      color: white;
+      font-weight:100;
+      }
+    }
+    div{
+      text-align: right;
+      margin-bottom: $gutter;
+        p{
+          text-decoration: underline;
+          display: inline-block;
+          margin-right: $gutter;
+        }
+        button{
+          float:none;
+        }
+    }
+  }
+}
\ No newline at end of file
diff --git a/lab-zachary/app/component/gallery/upload-pic/upload-pic.html b/lab-zachary/app/component/gallery/upload-pic/upload-pic.html
index e69de29b..c5efe64a 100644
--- a/lab-zachary/app/component/gallery/upload-pic/upload-pic.html
+++ b/lab-zachary/app/component/gallery/upload-pic/upload-pic.html
@@ -0,0 +1,27 @@
+<section class="upload-pic">
+  <form
+    ng-submit="uploadPicCtrl.uploadPic()"
+    novalidate>
+
+    <h3>upload new pic</h3>
+
+    <fieldset>
+      <input type="text" class="input-std"
+      ng-model="uploadPicCtrl.pic.name" placeholder="pic name" >
+
+      <input type="text" class="input-std"
+      ng-model="uploadPicCtrl.pic.desc" placeholder="pic description" >
+    </fieldset>
+
+    <div>
+      <p class="gram-img"
+      ngf-select
+      ng-model="uploadPicCtrl.pic.file">
+        select an image to upload
+      </p>
+
+      <button class="btn-std">upload</button>
+    </div>
+  </form>
+</section>
+<div class="clearfix"></div>
\ No newline at end of file
diff --git a/lab-zachary/app/component/gallery/upload-pic/upload-pic.js b/lab-zachary/app/component/gallery/upload-pic/upload-pic.js
index e69de29b..0321d3fe 100644
--- a/lab-zachary/app/component/gallery/upload-pic/upload-pic.js
+++ b/lab-zachary/app/component/gallery/upload-pic/upload-pic.js
@@ -0,0 +1,27 @@
+'use strict';
+
+require('./_upload-pic.scss');
+
+module.exports = {
+  template: require('./upload-pic.html'),
+  controller: ['$log', 'picService', UploadPicController],
+  controllerAs: 'uploadPicCtrl',
+  bindings: {
+    gallery: '<'
+  }
+};
+
+function UploadPicController($log, picService) {
+  $log.debug('UploadPicController');
+
+  this.pic = {};
+
+  this.uploadPic = function() {
+    picService.uploadGalleryPic(this.gallery, this.pic)
+    .then( () => {
+      this.pic.name = null;
+      this.pic.desc = null;
+      this.pic.file = null;
+    });
+  };
+};
\ No newline at end of file
diff --git a/lab-zachary/app/entry.js b/lab-zachary/app/entry.js
index 8f6281c2..37113887 100644
--- a/lab-zachary/app/entry.js
+++ b/lab-zachary/app/entry.js
@@ -7,10 +7,12 @@ const path = require('path');
 const uiRouter = require('angular-ui-router');
 const ngTouch = require('angular-touch');
 const ngAnimate = require('angular-animate');
+const ngFileUpload = require('ng-file-upload');
+
 
 require('./scss/main.scss');
 
-const cfgram = angular.module('cfgram', [ngTouch, ngAnimate, uiRouter]);
+const cfgram = angular.module('cfgram', [ngTouch, ngAnimate, uiRouter, ngFileUpload]);
 
 let context = require.context('./config/', true, /\.js$/);
 context.keys().forEach( key => {
diff --git a/lab-zachary/app/scss/lib/base/_global-vars.scss b/lab-zachary/app/scss/lib/base/_global-vars.scss
index 85759028..a63c56b1 100644
--- a/lab-zachary/app/scss/lib/base/_global-vars.scss
+++ b/lab-zachary/app/scss/lib/base/_global-vars.scss
@@ -16,4 +16,11 @@ $secondaryTextSize: 3vw;
   -webkit-border-radius: $radius;
   -moz-border-radius: $radius;
   border-radius: $radius*2;
-}
\ No newline at end of file
+}
+
+@mixin placeholder {
+  &::-webkit-input-placeholder {@content}
+  &:-moz-placeholder           {@content}
+  &::-moz-placeholder          {@content}
+  &:-ms-input-placeholder      {@content}
+}
diff --git a/lab-zachary/app/service/pic-service.js b/lab-zachary/app/service/pic-service.js
new file mode 100644
index 00000000..f549536d
--- /dev/null
+++ b/lab-zachary/app/service/pic-service.js
@@ -0,0 +1,69 @@
+'use strict';
+
+module.exports = ['$log', '$q', '$http', 'Upload', 'authService', picService];
+
+function picService($log, $q, $http, Upload, authService){
+  $log.debug('picService');
+
+  let service = {};
+
+  service.uploadGalleryPic = function(galleryData, picData) {
+    $log.debug('picService.uploadGalleryPic');
+
+    return authService.getToken()
+    .then( token => {
+      let url = `${__API_URL__}/api/gallery/${galleryData._id}/pic`;
+      let headers = {
+        Authorization: `Bearer ${token}`,
+        Accept: 'applciation/json'
+      };
+
+      return Upload.upload({
+        url,
+        headers,
+        method: 'POST',
+        data: {
+          name: picData.name,
+          desc: picData.desc,
+          file: picData.file
+        }
+      })
+      .then( res => {
+        galleryData.pics.unshift(res.data);
+        return res.data;
+      })
+      .catch( err => {
+        console.error(err);
+        return $q.reject(err);
+      });
+    });
+  };
+  service.deleteGalleryPic = function(galleryData, picData) {
+    $log.debug('picService.deleteGalleryPic');
+
+    authService.getToken()
+    .then( token => {
+      let url = `${__API_URL__}/api/gallery/${galleryData._id}/pic/${picData._id}`;
+      let config ={
+        headers : {
+          Authorization: `Bearer ${token}`,
+          Accept: 'application/json',
+        }
+      };
+      $http.delete(url, config)
+      .then( res => {
+        $log.debug(galleryData.pics);
+        galleryData.pics.forEach((pic, index) => {
+          if (pic._id === picData._id) galleryData.pics.splice(index,1);
+        });
+
+      })
+      .catch( err => {
+        console.error(err);
+        return $q.reject(err);
+      });
+    });
+  };
+  return service;
+}
+
diff --git a/lab-zachary/app/view/home/home-controller.js b/lab-zachary/app/view/home/home-controller.js
index bcc10d2d..5c8fe4d1 100644
--- a/lab-zachary/app/view/home/home-controller.js
+++ b/lab-zachary/app/view/home/home-controller.js
@@ -13,6 +13,7 @@ function HomeController($log, $rootScope, galleryService) {
     galleryService.fetchGalleries()
     .then( galleries => {
       this.galleries = galleries;
+      this.currentGallery = galleries[0];
     });
   };
 
diff --git a/lab-zachary/app/view/home/home.html b/lab-zachary/app/view/home/home.html
index 391fa6f5..d9e0531d 100644
--- a/lab-zachary/app/view/home/home.html
+++ b/lab-zachary/app/view/home/home.html
@@ -2,6 +2,11 @@
   <create-gallery></create-gallery>
   <h2 ng-if="homeCtrl.galleries">Galleries</h2>
   <ul>
-    <gallery-item ng-repeat="gallery in homeCtrl.galleries" gallery="gallery"></gallery-item>
+    <gallery-item ng-repeat="gallery in homeCtrl.galleries"
+    gallery="gallery"
+    delete-done="homeCtrl.galleryDeleteDone(galleryData)"
+    ng-click="homeCtrl.currentGallery = gallery"></gallery-item>
   </ul>
+
+  <thumbnail-container ng-if="homeCtrl.currentGallery" gallery="homeCtrl.currentGallery"></thumbnail-container>
 </section>
diff --git a/lab-zachary/package.json b/lab-zachary/package.json
index ad674db1..66ed1cfb 100644
--- a/lab-zachary/package.json
+++ b/lab-zachary/package.json
@@ -30,6 +30,7 @@
     "file-loader": "^0.10.1",
     "html-loader": "^0.4.5",
     "html-webpack-plugin": "^2.28.0",
+    "ng-file-upload": "^12.2.13",
     "node-sass": "^4.5.1",
     "pascalcase": "^0.1.1",
     "resolve-url-loader": "^2.0.2",
@@ -40,6 +41,7 @@
     "webpack": "^2.3.2"
   },
   "devDependencies": {
+    "ng-file-upload": "^12.2.13",
     "webpack-dev-server": "^2.4.2"
   }
 }

From 98f957b85fa58080a2662dcb4304f3b0ef56a69b Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Tue, 4 Apr 2017 21:27:50 -0700
Subject: [PATCH 17/23] added test, worked on delete-done function

---
 .../gallery/gallery-item/gallery-item.html    |  2 +-
 .../gallery/gallery-item/gallery-item.js      | 14 +--
 .../gallery/upload-pic/upload-pic.js          |  2 +-
 lab-zachary/app/view/home/home-controller.js  |  6 +-
 lab-zachary/app/view/home/home.html           |  6 +-
 .../{karma.config.js => karma.conf.js}        | 14 +--
 lab-zachary/package.json                      |  7 ++
 lab-zachary/test/auth-service-test.js         | 31 +++++++
 lab-zachary/test/example-test.js              |  7 ++
 lab-zachary/test/gallery-service-test.js      | 88 +++++++++++++++++++
 10 files changed, 160 insertions(+), 17 deletions(-)
 rename lab-zachary/{karma.config.js => karma.conf.js} (54%)
 create mode 100644 lab-zachary/test/auth-service-test.js
 create mode 100644 lab-zachary/test/example-test.js
 create mode 100644 lab-zachary/test/gallery-service-test.js

diff --git a/lab-zachary/app/component/gallery/gallery-item/gallery-item.html b/lab-zachary/app/component/gallery/gallery-item/gallery-item.html
index e764e43c..6c9fd462 100644
--- a/lab-zachary/app/component/gallery/gallery-item/gallery-item.html
+++ b/lab-zachary/app/component/gallery/gallery-item/gallery-item.html
@@ -21,4 +21,4 @@
   ng-click="galleryItemCtrl.deleteGallery()">delete</button>
 </div>
 
-<div class="clearfix"></div>
\ No newline at end of file
+<div class="clearfix"></div>
diff --git a/lab-zachary/app/component/gallery/gallery-item/gallery-item.js b/lab-zachary/app/component/gallery/gallery-item/gallery-item.js
index b3a30b39..caf11829 100644
--- a/lab-zachary/app/component/gallery/gallery-item/gallery-item.js
+++ b/lab-zachary/app/component/gallery/gallery-item/gallery-item.js
@@ -4,32 +4,34 @@ require('./_gallery-item.scss');
 
 module.exports = {
   template: require('./gallery-item.html'),
-  controller: ['$log', 'galleryService', GalleryItemController],
+  controller: ['$log',  'galleryService', GalleryItemController],
   controllerAs: 'galleryItemCtrl',
   bindings: {
     gallery: '<',
-    oldData: '<',
+    currentGallery: '=',
+    deleteDone: '&'
   }
 };
 
 function GalleryItemController($log, galleryService) {
   $log.debug('GalleryItemController');
   this.showEditGallery = false;
+  this.currentGallery = 'test';
 
   this.editGallery = function() {
     this.oldData = angular.copy(this.gallery);
     this.showEditGallery = true;
   };
 
-  this.deleteGallery = function() {
+  this.deleteGallery = () => {
     galleryService.deleteGallery(this.gallery._id)
-    .then( _gallery => {
-      $log.debug('gallery deleted:', _gallery );
+    .then( () => {
+      $log.debug('gallery deleted:', this.currentGallery );
+      this.deleteDone();
     })
     .catch( err => {
       $log.error( err);
     });
   };
 
-
 }
\ No newline at end of file
diff --git a/lab-zachary/app/component/gallery/upload-pic/upload-pic.js b/lab-zachary/app/component/gallery/upload-pic/upload-pic.js
index 0321d3fe..9765551d 100644
--- a/lab-zachary/app/component/gallery/upload-pic/upload-pic.js
+++ b/lab-zachary/app/component/gallery/upload-pic/upload-pic.js
@@ -24,4 +24,4 @@ function UploadPicController($log, picService) {
       this.pic.file = null;
     });
   };
-};
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/lab-zachary/app/view/home/home-controller.js b/lab-zachary/app/view/home/home-controller.js
index 5c8fe4d1..2b19a39f 100644
--- a/lab-zachary/app/view/home/home-controller.js
+++ b/lab-zachary/app/view/home/home-controller.js
@@ -17,7 +17,11 @@ function HomeController($log, $rootScope, galleryService) {
     });
   };
 
-
+  this.galleryDeleteDone = function(gallery) {
+    if (this.currentGallery._id === gallery._id) {
+      this.currentGallery = null;
+    }
+  };
 
 
 
diff --git a/lab-zachary/app/view/home/home.html b/lab-zachary/app/view/home/home.html
index d9e0531d..4b12072e 100644
--- a/lab-zachary/app/view/home/home.html
+++ b/lab-zachary/app/view/home/home.html
@@ -4,9 +4,9 @@ <h2 ng-if="homeCtrl.galleries">Galleries</h2>
   <ul>
     <gallery-item ng-repeat="gallery in homeCtrl.galleries"
     gallery="gallery"
-    delete-done="homeCtrl.galleryDeleteDone(galleryData)"
-    ng-click="homeCtrl.currentGallery = gallery"></gallery-item>
+    current-gallery="homeCtrl.currentGallery"
+    delete-done="homeCtrl.galleryDeleteDone(homeCtrl.currentGallery)"
+    ng-click="homeCtrl.currentGallery=gallery"></gallery-item>
   </ul>
-
   <thumbnail-container ng-if="homeCtrl.currentGallery" gallery="homeCtrl.currentGallery"></thumbnail-container>
 </section>
diff --git a/lab-zachary/karma.config.js b/lab-zachary/karma.conf.js
similarity index 54%
rename from lab-zachary/karma.config.js
rename to lab-zachary/karma.conf.js
index dfbc6e34..68281bae 100644
--- a/lab-zachary/karma.config.js
+++ b/lab-zachary/karma.conf.js
@@ -1,17 +1,21 @@
-const webpackConfig = require('./webpack.config.js');
+const webpack = require('./webpack.config.js');
+delete webpack.entry;
 
 module.exports = function(config) {
   config.set({
-    webpack: webpackConfig,
+    webpack,
     basePath: '',
     frameworks: ['jasmine'],
     files: [
-      'test/**/*-test.js'
+      'app/entry.js',
+      'test/**/*-test.js',
+      'node_modules/angular-mocks/angular-mocks.js'
     ],
     exclude: [
     ],
     preprocessors: {
-      'test/**/*-test.js': ['webpack']
+      'test/**/*-test.js': ['webpack'],
+      'app/entry.js':['webpack']
     },
 
     reporters: ['mocha'],
@@ -19,7 +23,7 @@ module.exports = function(config) {
     colors: true,
     logLevel: config.LOG_INFO,
     autoWatch: true,
-    browsers: ['PhantomJS'],
+    browsers: ['Chrome'],
     singleRun: false,
     concurrency: Infinity
   });
diff --git a/lab-zachary/package.json b/lab-zachary/package.json
index 66ed1cfb..19eb8884 100644
--- a/lab-zachary/package.json
+++ b/lab-zachary/package.json
@@ -41,6 +41,13 @@
     "webpack": "^2.3.2"
   },
   "devDependencies": {
+    "angular-mocks": "^1.6.4",
+    "jasmine-core": "^2.5.2",
+    "karma": "^1.5.0",
+    "karma-chrome-launcher": "^2.0.0",
+    "karma-jasmine": "^1.1.0",
+    "karma-mocha-reporter": "^2.2.3",
+    "karma-webpack": "^2.0.3",
     "ng-file-upload": "^12.2.13",
     "webpack-dev-server": "^2.4.2"
   }
diff --git a/lab-zachary/test/auth-service-test.js b/lab-zachary/test/auth-service-test.js
new file mode 100644
index 00000000..e7e3a3b8
--- /dev/null
+++ b/lab-zachary/test/auth-service-test.js
@@ -0,0 +1,31 @@
+'use strict';
+
+describe('Auth Service', function() {
+
+  beforeEach(() => {
+    angular.mock.module('cfgram');
+    angular.mock.inject(($rootScope, authService, $window, $httpBackend) => {
+      this.$window = $window;
+      this.$rootScope = $rootScope;
+      this.authService = authService;
+      this.$httpBackend = $httpBackend;
+    });
+  });
+
+  describe('authService.getToken', () => {
+    it('should return a token', () => {
+      this.authService.token = null;
+      this.$window.localStorage.setItem('token', 'test token');
+
+      this.authService.getToken()
+      .then( token => {
+        expect(token).toEqual('test token');
+      })
+      .catch( err => {
+        expect(err).toEqual(null);
+      });
+
+      this.$rootScope.$apply();
+    });
+  });
+});
\ No newline at end of file
diff --git a/lab-zachary/test/example-test.js b/lab-zachary/test/example-test.js
new file mode 100644
index 00000000..f4fcce7c
--- /dev/null
+++ b/lab-zachary/test/example-test.js
@@ -0,0 +1,7 @@
+'use strict';
+
+describe('Example Test', function() {
+  it('should pass this test test', () => {
+    expect(true).toEqual(true);
+  });
+});
\ No newline at end of file
diff --git a/lab-zachary/test/gallery-service-test.js b/lab-zachary/test/gallery-service-test.js
new file mode 100644
index 00000000..f176b871
--- /dev/null
+++ b/lab-zachary/test/gallery-service-test.js
@@ -0,0 +1,88 @@
+'use strict';
+
+describe('Gallery Service Test', function() {
+
+  beforeEach(() => {
+    angular.mock.module('cfgram');
+    angular.mock.inject(($rootScope, authService, galleryService, $window, $httpBackend) => {
+      this.$rootScope = $rootScope;
+      this.authService = authService;
+      this.galleryService = galleryService;
+      this.$window = $window;
+      this.$httpBackend = $httpBackend;
+    });
+  });
+
+  describe('galleryService.createGallery()', () => {
+    it('should create a new gallery', () => {
+      let galleryData = {
+        name: 'example gallery',
+        desc: 'example description'
+      };
+
+      let headers = {
+        Authorization: 'Bearer test token',
+        Accept: 'application/json',
+        'Content-Type': 'application/json'
+      };
+
+      this.$httpBackend.expectPOST('http://localhost:8000/api/gallery', galleryData, headers)
+      .respond(200, {
+        _id: '1234',
+        username: 'testuser',
+        name: galleryData.name,
+        desc: galleryData.desc,
+        pics: []
+      });
+
+      this.galleryService.createGallery(galleryData);
+      this.$httpBackend.flush();
+      this.$rootScope.$apply();
+    });
+  });
+
+  describe('galleryService.updateGallery()', () => {
+    it('should update an existing gallery', () => {
+      let galleryData = {
+        name: 'example updated gallery',
+        desc: 'example updated description',
+        _id: '12345'
+      };
+
+      let headers = {
+        Authorization: 'Bearer test token',
+        Accept: 'application/json',
+        'Content-Type': 'application/json'
+      };
+
+      this.$httpBackend.expectPUT('http://localhost:8000/api/gallery/12345', galleryData, headers)
+      .respond(200, {
+        _id: '12345',
+        username: 'testuser',
+        name: galleryData.name,
+        desc: galleryData.desc,
+        pics: []
+      });
+
+      this.galleryService.updateGallery(galleryData._id, galleryData);
+      this.$httpBackend.flush();
+      this.$rootScope.$apply();
+    });
+  });
+
+  describe('galleryService.deleteGallery()', () => {
+    it('should delete a gallery', () => {
+      let headers = {
+        Authorization: 'Bearer test token',
+        Accept: 'application/json',
+      };
+
+      this.$httpBackend.expectDELETE('http://localhost:8000/api/gallery/1234', headers)
+      .respond(204);
+
+      this.galleryService.deleteGallery('1234');
+      this.$httpBackend.flush();
+      this.$rootScope.$apply();
+    });
+  });
+});
\ No newline at end of file

From a41598d0b4d203cef5132379bd1d11a2c30aa112 Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Wed, 5 Apr 2017 22:03:04 -0700
Subject: [PATCH 18/23] added tests for gallery-edit and gallery-item
 components

---
 .../gallery/gallery-edit/gallery-edit.js      | 14 +---
 .../gallery/gallery-item/gallery-item.js      |  7 +-
 lab-zachary/app/service/gallery-service.js    |  4 +-
 lab-zachary/app/view/home/home.html           |  2 +-
 .../test/gallery-edit-component-test.js       | 75 +++++++++++++++++
 .../test/gallery-item-component-test.js       | 82 +++++++++++++++++++
 6 files changed, 165 insertions(+), 19 deletions(-)
 create mode 100644 lab-zachary/test/gallery-edit-component-test.js
 create mode 100644 lab-zachary/test/gallery-item-component-test.js

diff --git a/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.js b/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.js
index 5d231dc8..339723f9 100644
--- a/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.js
+++ b/lab-zachary/app/component/gallery/gallery-edit/gallery-edit.js
@@ -15,25 +15,17 @@ module.exports = {
 
 function GalleryEditController($log, galleryService) {
   $log.debug('GalleryEditController');
-  //this.galleries = galleryService.galleries;
   $log.debug(this.oldData, this);
+
   this.cancelUpdate = function() {
     $log.debug(this.gallery);
     this.gallery = this.oldData;
     this.showEditGallery = false;
-
-
-
   };
 
   this.updateGallery = function() {
     $log.debug('GalleryEditController.updateGallery');
-    galleryService.updateGallery(this.gallery._id, this.gallery)
-    .then( () => {
-      this.showEditGallery = false;
-    })
-    .catch( err => {
-      $log.error(err);
-    });
+    galleryService.updateGallery(this.gallery._id, this.gallery);
+    this.showEditGallery = false;
   };
 }
diff --git a/lab-zachary/app/component/gallery/gallery-item/gallery-item.js b/lab-zachary/app/component/gallery/gallery-item/gallery-item.js
index caf11829..8b10b682 100644
--- a/lab-zachary/app/component/gallery/gallery-item/gallery-item.js
+++ b/lab-zachary/app/component/gallery/gallery-item/gallery-item.js
@@ -8,7 +8,6 @@ module.exports = {
   controllerAs: 'galleryItemCtrl',
   bindings: {
     gallery: '<',
-    currentGallery: '=',
     deleteDone: '&'
   }
 };
@@ -16,22 +15,22 @@ module.exports = {
 function GalleryItemController($log, galleryService) {
   $log.debug('GalleryItemController');
   this.showEditGallery = false;
-  this.currentGallery = 'test';
 
   this.editGallery = function() {
     this.oldData = angular.copy(this.gallery);
     this.showEditGallery = true;
   };
 
-  this.deleteGallery = () => {
+  this.deleteGallery = function() {
     galleryService.deleteGallery(this.gallery._id)
     .then( () => {
       $log.debug('gallery deleted:', this.currentGallery );
-      this.deleteDone();
+      this.deleteDone(this.gallery);
     })
     .catch( err => {
       $log.error( err);
     });
+    return(this.gallery);
   };
 
 }
\ No newline at end of file
diff --git a/lab-zachary/app/service/gallery-service.js b/lab-zachary/app/service/gallery-service.js
index e5969c24..9952048b 100644
--- a/lab-zachary/app/service/gallery-service.js
+++ b/lab-zachary/app/service/gallery-service.js
@@ -79,9 +79,7 @@ function galleryService($log, $q, $http, authService) {
     })
     .then( res => {
       $log.log('gallery updated:');
-      // service.galleries.forEach( (_gallery, index) => {
-      //  if (_gallery._id === galleryID) service.galleries[index] = res.data;
-      // });
+
       return res.data;
     })
     .catch( err => {
diff --git a/lab-zachary/app/view/home/home.html b/lab-zachary/app/view/home/home.html
index 4b12072e..cb9a4c89 100644
--- a/lab-zachary/app/view/home/home.html
+++ b/lab-zachary/app/view/home/home.html
@@ -5,7 +5,7 @@ <h2 ng-if="homeCtrl.galleries">Galleries</h2>
     <gallery-item ng-repeat="gallery in homeCtrl.galleries"
     gallery="gallery"
     current-gallery="homeCtrl.currentGallery"
-    delete-done="homeCtrl.galleryDeleteDone(homeCtrl.currentGallery)"
+    delete-done="homeCtrl.galleryDeleteDone(gallery)"
     ng-click="homeCtrl.currentGallery=gallery"></gallery-item>
   </ul>
   <thumbnail-container ng-if="homeCtrl.currentGallery" gallery="homeCtrl.currentGallery"></thumbnail-container>
diff --git a/lab-zachary/test/gallery-edit-component-test.js b/lab-zachary/test/gallery-edit-component-test.js
new file mode 100644
index 00000000..36e26631
--- /dev/null
+++ b/lab-zachary/test/gallery-edit-component-test.js
@@ -0,0 +1,75 @@
+'use strict';
+
+describe('Gallery Edit Controller', function() {
+  beforeEach( () => {
+    angular.mock.module('cfgram');
+    angular.mock.inject(($rootScope, $componentController, $httpBackend) => {
+      this.$rootScope = $rootScope;
+      this.$componentController = $componentController;
+      this.$httpBackend = $httpBackend;
+    });
+  });
+  describe('galleryEditCtrl.cancelUpdate', () => {
+    it('should cancel a pending update and restore existing data',()  => {
+      let mockBindings = {
+        gallery: {},
+        oldData: {
+          _id: '12345',
+          name: 'test name',
+          desc: 'test description',
+          pics: [],
+        },
+        showEditGallery: true
+      };
+      let galleryEditCtrl = this.$componentController('galleryEdit', null, mockBindings);
+
+      galleryEditCtrl.cancelUpdate();
+
+      expect(galleryEditCtrl.showEditGallery).toEqual(false);
+      expect(galleryEditCtrl.gallery).toEqual(mockBindings.oldData);
+
+      this.$rootScope.$apply();
+    });
+  });
+  describe('galleryEditCtrl.updateGallery', () => {
+    it('should update a gallery', () => {
+      let mockBindings = {
+        gallery: {
+          _id: '12345',
+          name: 'updated name',
+          desc: 'updated desc',
+          pics: []
+        },
+        showEditGallery: true
+      };
+
+      let url = 'http://localhost:8000/api/gallery/12345';
+      let headers = {
+        'Content-Type': 'application/json',
+        Accept: 'application/json',
+        Authorization: 'Bearer test token',
+      };
+
+      let galleryEditCtrl = this.$componentController('galleryEdit', null, mockBindings);
+
+      this.$httpBackend.expectPUT(url, galleryEditCtrl.gallery, headers)
+      .respond(200, {
+        _id: '12345',
+        username: 'testuser',
+        name: mockBindings.gallery.name,
+        desc: mockBindings.gallery.desc,
+        pics: []
+      });
+
+      galleryEditCtrl.updateGallery();
+      expect(galleryEditCtrl.showEditGallery).toEqual(false);
+
+      this.$httpBackend.flush();
+      this.$rootScope.$apply();
+
+    });
+  });
+});
+
+
+
diff --git a/lab-zachary/test/gallery-item-component-test.js b/lab-zachary/test/gallery-item-component-test.js
new file mode 100644
index 00000000..199b84fc
--- /dev/null
+++ b/lab-zachary/test/gallery-item-component-test.js
@@ -0,0 +1,82 @@
+'use strict';
+
+describe('Gallery Item Component', function(){
+  beforeEach(() => {
+    angular.mock.module('cfgram');
+    angular.mock.inject(($rootScope, $componentController, $httpBackend, authService) => {
+      this.$rootScope = $rootScope;
+      this.$componentController = $componentController;
+      this.$httpBackend = $httpBackend;
+      this.authService = authService;
+    });
+  });
+
+  describe('galleryItemCtrl.delete()', () => {
+    it('should  call deleteDone', () => {
+      let mockBindings = {
+        gallery: {
+          _id: '12345',
+          name: 'test name',
+          desc: 'test description',
+          pics: [],
+        },
+        deleteDone: function(data){
+          expect(data.galleryData._id).toEqual('12345');
+        }
+      };
+
+      let galleryItemCtrl = this.$componentController('galleryItem', null, mockBindings);
+      galleryItemCtrl.deleteDone({galleryData: galleryItemCtrl.gallery});
+
+      this.$rootScope.$apply();
+    });
+
+    it('should call deleteDone with gallery after galleryDelete', () => {
+      let url = 'http://localhost:8000/api/gallery/12345';
+      let headers = {
+        Authorization: 'Bearer test token',
+        Accept: 'application/json'
+      };
+      this.deleteDoneFired = false;
+      let mockBindings = {
+        gallery: {
+          _id: '12345',
+          name: 'test name',
+          desc: 'test description',
+          pics: []
+        },
+        deleteDone: function(data){
+          expect(data._id).toEqual(mockBindings.gallery._id);
+        }
+      };
+
+      this.$httpBackend.expectDELETE(url, headers).respond(204);
+
+      let galleryItemCtrl = this.$componentController('galleryItem', null, mockBindings);
+
+      expect(galleryItemCtrl.deleteGallery()._id).toEqual(mockBindings.gallery._id);
+
+      this.$httpBackend.flush();
+      this.$rootScope.$apply();
+    });
+  });
+  describe('galleryItemCtrl.editGallery', () => {
+    it('should trigger the edit state', () => {
+      let mockBindings = {
+        gallery: {
+          _id: '12345',
+          name: 'test name',
+          desc: 'test description',
+          pics: []
+        }
+      };
+      let galleryItemCtrl = this.$componentController('galleryItem', null, mockBindings);
+
+      galleryItemCtrl.editGallery();
+
+      expect(galleryItemCtrl.showEditGallery).toEqual(true);
+      expect(galleryItemCtrl.oldData).toEqual(mockBindings.gallery);
+    });
+  });
+
+});

From 0f3448211c279fa87be7c8027880b7788ab85ae0 Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Wed, 5 Apr 2017 22:04:37 -0700
Subject: [PATCH 19/23] tweaked test

---
 lab-zachary/test/gallery-item-component-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lab-zachary/test/gallery-item-component-test.js b/lab-zachary/test/gallery-item-component-test.js
index 199b84fc..8af026cd 100644
--- a/lab-zachary/test/gallery-item-component-test.js
+++ b/lab-zachary/test/gallery-item-component-test.js
@@ -76,7 +76,7 @@ describe('Gallery Item Component', function(){
 
       expect(galleryItemCtrl.showEditGallery).toEqual(true);
       expect(galleryItemCtrl.oldData).toEqual(mockBindings.gallery);
+      this.$rootScope.$apply();
     });
   });
-
 });

From 30036434d35cef0527f8a25600e427884ab9cd65 Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Thu, 6 Apr 2017 12:44:02 -0700
Subject: [PATCH 20/23] one commit too many

---
 lab-zachary/app/entry.js                 |   2 ++
 lab-zachary/app/scss/lib/base/_base.scss |   9 +++++++++
 lab-zachary/assets/sprite.png            | Bin 0 -> 9480 bytes
 3 files changed, 11 insertions(+)
 create mode 100644 lab-zachary/assets/sprite.png

diff --git a/lab-zachary/app/entry.js b/lab-zachary/app/entry.js
index 37113887..fdd1d4a8 100644
--- a/lab-zachary/app/entry.js
+++ b/lab-zachary/app/entry.js
@@ -43,3 +43,5 @@ context.keys().forEach( key => {
   console.log('component:', key, name, module);
   cfgram.component(name, module);
 });
+
+
diff --git a/lab-zachary/app/scss/lib/base/_base.scss b/lab-zachary/app/scss/lib/base/_base.scss
index e6c7a7c0..d00f6433 100644
--- a/lab-zachary/app/scss/lib/base/_base.scss
+++ b/lab-zachary/app/scss/lib/base/_base.scss
@@ -48,6 +48,15 @@ body{
     width: 100%;
     // position: absolute;
     // bottom: 0px;
+    .social-icons{
+      background: url('../../assets/sprite.png');
+      .facebook{
+      }
+      .twitter{
+      }
+      .instagram{
+      }
+    }
   }
   pre{
     max-width:100%;
diff --git a/lab-zachary/assets/sprite.png b/lab-zachary/assets/sprite.png
new file mode 100644
index 0000000000000000000000000000000000000000..da52623ba581d494ad2ae22afb257840cfb77fd1
GIT binary patch
literal 9480
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

literal 0
HcmV?d00001


From 9be839bf91572741b9e5896b9c4ed701e8ac02c2 Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Thu, 6 Apr 2017 19:54:18 -0700
Subject: [PATCH 21/23] added fuzzy search directive, title case filter and
 orderby toggle

---
 .../gallery/gallery-item/gallery-item.html    |   2 +-
 lab-zachary/app/directive/social-icons.html   |  10 ++++++
 lab-zachary/app/directive/social-icons.js     |  31 ++++++++++++++++
 lab-zachary/app/entry.js                      |  14 ++++++++
 lab-zachary/app/filter/format/title-case.js   |  12 +++++++
 .../filter/gallery-search/gallery-search.js   |  18 ++++++++++
 lab-zachary/app/index.html                    |   7 ++--
 lab-zachary/app/scss/lib/base/_base.scss      |  33 +++++++++++++-----
 .../app/scss/lib/base/_global-vars.scss       |   2 ++
 lab-zachary/app/view/home/home-controller.js  |  18 +++++++++-
 lab-zachary/app/view/home/home.html           |   6 +++-
 lab-zachary/assets/sprite.png                 | Bin 9480 -> 8835 bytes
 lab-zachary/package.json                      |   1 +
 lab-zachary/webpack.config.js                 |   7 ++++
 14 files changed, 147 insertions(+), 14 deletions(-)
 create mode 100644 lab-zachary/app/directive/social-icons.html
 create mode 100644 lab-zachary/app/directive/social-icons.js
 create mode 100644 lab-zachary/app/filter/format/title-case.js
 create mode 100644 lab-zachary/app/filter/gallery-search/gallery-search.js

diff --git a/lab-zachary/app/component/gallery/gallery-item/gallery-item.html b/lab-zachary/app/component/gallery/gallery-item/gallery-item.html
index 6c9fd462..51830559 100644
--- a/lab-zachary/app/component/gallery/gallery-item/gallery-item.html
+++ b/lab-zachary/app/component/gallery/gallery-item/gallery-item.html
@@ -1,7 +1,7 @@
 <li class="gallery-item">
   <div ng-if="!galleryItemCtrl.showEditGallery" class="current-item">
     <div><span>name: </span>
-    <span>{{ galleryItemCtrl.gallery.name }}</span>
+    <span>{{ galleryItemCtrl.gallery.name | titleCase }}</span>
     </div>
     <div><span>description: </span>
     <span>{{ galleryItemCtrl.gallery.desc }}</span>
diff --git a/lab-zachary/app/directive/social-icons.html b/lab-zachary/app/directive/social-icons.html
new file mode 100644
index 00000000..eb883a12
--- /dev/null
+++ b/lab-zachary/app/directive/social-icons.html
@@ -0,0 +1,10 @@
+<nav class="social-icon"> <span>{{ socialIconCtrl.tagTitle }}</span>
+
+  <ul>
+  <li ng-repeat="icon in socialIconCtrl.icons" class="{{ icon.val }}">
+  <a href="{{ icon.url }}">
+  </a>
+  </li>
+  </ul>
+
+</nav>
\ No newline at end of file
diff --git a/lab-zachary/app/directive/social-icons.js b/lab-zachary/app/directive/social-icons.js
new file mode 100644
index 00000000..d593d0db
--- /dev/null
+++ b/lab-zachary/app/directive/social-icons.js
@@ -0,0 +1,31 @@
+'use strict';
+
+module.exports = function (){
+  return {
+    restrict: 'EAC',
+    template: require('./social-icons.html'),
+    controller: ['$log', SocialIconController],
+    bindToController: true,
+    controllerAs: 'socialIconCtrl',
+    scope: {
+      tagTitle: '@'
+    }
+  };
+};
+
+function SocialIconController() {
+  this.icons = [
+    {
+      val:'facebook',
+      url: 'http://www.facebook.com'
+    },
+    {
+      val: 'twitter',
+      url:'http://www.twitter.com'
+    },
+    {
+      val:'instagram',
+      url: 'http://www.instagram.com'
+    }
+  ];
+}
\ No newline at end of file
diff --git a/lab-zachary/app/entry.js b/lab-zachary/app/entry.js
index fdd1d4a8..365a3a78 100644
--- a/lab-zachary/app/entry.js
+++ b/lab-zachary/app/entry.js
@@ -44,4 +44,18 @@ context.keys().forEach( key => {
   cfgram.component(name, module);
 });
 
+context = require.context('./directive/', true, /\.js$/);
+context.keys().forEach( key => {
+  let name = camelcase(path.basename(key, '.js'));
+  let module = context(key);
+  console.log('directive:', key, name, module);
+  cfgram.directive(name, module);
+});
 
+context = require.context('./filter/', true, /\.js$/);
+context.keys().forEach( key => {
+  let name = camelcase(path.basename(key, '.js'));
+  let module = context(key);
+  console.log('filter:', key, name, module);
+  cfgram.filter(name, module);
+});
diff --git a/lab-zachary/app/filter/format/title-case.js b/lab-zachary/app/filter/format/title-case.js
new file mode 100644
index 00000000..72e80968
--- /dev/null
+++ b/lab-zachary/app/filter/format/title-case.js
@@ -0,0 +1,12 @@
+'use strict';
+
+module.exports = function () {
+
+  return function titleCase(input) {
+    function embiggenFirstChar(match, offset, string) {
+      console.log(string);
+      return match.toUpperCase();
+    }
+    return input.replace(/\b\w(?=\w{2,})/g, embiggenFirstChar);
+  };
+};
diff --git a/lab-zachary/app/filter/gallery-search/gallery-search.js b/lab-zachary/app/filter/gallery-search/gallery-search.js
new file mode 100644
index 00000000..e4a3f0c9
--- /dev/null
+++ b/lab-zachary/app/filter/gallery-search/gallery-search.js
@@ -0,0 +1,18 @@
+'use strict';
+
+module.exports = function() {
+  return function(galleries, searchTerm){
+    let fuzzyRegex = generateFuzzyString(searchTerm);
+
+    return galleries.filter(gallery => {
+      return fuzzyRegex.test(gallery.name.toUpperCase());
+    });
+  };
+};
+
+function generateFuzzyString(input) {
+  if (!input) return /.*/;
+  let fuzzyString = '.*' + input.toUpperCase().split('').join('') + '.*';
+  console.log(fuzzyString);
+  return new RegExp(fuzzyString);
+}
\ No newline at end of file
diff --git a/lab-zachary/app/index.html b/lab-zachary/app/index.html
index ee6143d5..699ac611 100644
--- a/lab-zachary/app/index.html
+++ b/lab-zachary/app/index.html
@@ -2,7 +2,7 @@
 <html ng-app="cfgram">
 <head>
 <meta charset="utf-8">
-<meta name="viewport" content="Width=device-width, initial-scale=1">
+<meta name="viewport" content="width=device-width, initial-scale=1">
   <title>cfgram</title>
 </head>
   <body>
@@ -12,6 +12,9 @@
   <main>
     <ui-view></ui-view>
   </main>
-  <footer></footer>
+  <footer>
+    <social-icons></social-icons>
+
+  </footer>
   </body>
 </html>
\ No newline at end of file
diff --git a/lab-zachary/app/scss/lib/base/_base.scss b/lab-zachary/app/scss/lib/base/_base.scss
index d00f6433..acef9fe4 100644
--- a/lab-zachary/app/scss/lib/base/_base.scss
+++ b/lab-zachary/app/scss/lib/base/_base.scss
@@ -46,15 +46,30 @@ body{
     background-color: $tertiaryColor;
     height:70px;
     width: 100%;
-    // position: absolute;
-    // bottom: 0px;
-    .social-icons{
-      background: url('../../assets/sprite.png');
-      .facebook{
-      }
-      .twitter{
-      }
-      .instagram{
+
+    nav.social-icon{
+      background-color: $tertiaryColor;
+        li{
+          display: inline-block;
+          cursor: pointer;
+          width: $socialIconSize;
+          height: $socialIconSize;
+          background: url('../../assets/sprite.png');
+          background-size:cover;
+          margin: $gutter/2 0 0 $gutter/2;
+          &.facebook{
+            background-position-x: $socialIconSize*2;
+          }
+          &.twitter{
+          }
+          &.instagram{
+            background-position-x: $socialIconSize;
+          }
+          a{
+            width:100%;
+            height: 100%;
+            display: block;
+        }
       }
     }
   }
diff --git a/lab-zachary/app/scss/lib/base/_global-vars.scss b/lab-zachary/app/scss/lib/base/_global-vars.scss
index a63c56b1..6390fbe5 100644
--- a/lab-zachary/app/scss/lib/base/_global-vars.scss
+++ b/lab-zachary/app/scss/lib/base/_global-vars.scss
@@ -12,6 +12,8 @@ $fontStack: 'Open Sans', Helvetica, sans-serif;
 $primaryTextSize: 5.4vw;
 $secondaryTextSize: 3vw;
 
+$socialIconSize: 8vw;
+
 @mixin rounded($radius: 0.5em) {
   -webkit-border-radius: $radius;
   -moz-border-radius: $radius;
diff --git a/lab-zachary/app/view/home/home-controller.js b/lab-zachary/app/view/home/home-controller.js
index 2b19a39f..5eb84d31 100644
--- a/lab-zachary/app/view/home/home-controller.js
+++ b/lab-zachary/app/view/home/home-controller.js
@@ -8,6 +8,10 @@ function HomeController($log, $rootScope, galleryService) {
   $log.debug('HomeController');
 
   this.galleries = [];
+  this.sort = this.sort || {
+    name: 'oldest',
+    val: false
+  };
 
   this.fetchGalleries = function() {
     galleryService.fetchGalleries()
@@ -22,7 +26,19 @@ function HomeController($log, $rootScope, galleryService) {
       this.currentGallery = null;
     }
   };
-
+  this.changeSort = () => {
+    $log.log(this.sort);
+    if (this.sort.val===true) {
+      this.sort.name = 'oldest';
+      this.sort.val =false;
+      return this.sort;
+    }
+    if (this.sort.val===false) {
+      this.sort.name = 'newest';
+      this.sort.val =true;
+    }
+    return this.sort;
+  };
 
 
   this.fetchGalleries();
diff --git a/lab-zachary/app/view/home/home.html b/lab-zachary/app/view/home/home.html
index cb9a4c89..fbe602f3 100644
--- a/lab-zachary/app/view/home/home.html
+++ b/lab-zachary/app/view/home/home.html
@@ -1,8 +1,12 @@
 <section class="home-content">
   <create-gallery></create-gallery>
+  <input type="text" ng-model="homeCtrl.gallerySearchTerm" placeholder="search galleries">
+
+  <button class="btn-std" ng-click="homeCtrl.changeSort()">sorted by {{ homeCtrl.sort.name }}</button>
+  <div class="clearfix"></div>
   <h2 ng-if="homeCtrl.galleries">Galleries</h2>
   <ul>
-    <gallery-item ng-repeat="gallery in homeCtrl.galleries"
+    <gallery-item ng-repeat="gallery in homeCtrl.galleries | gallerySearch: homeCtrl.gallerySearchTerm | orderBy: homeCtrl.galleries.created : reverse= homeCtrl.sort.val"
     gallery="gallery"
     current-gallery="homeCtrl.currentGallery"
     delete-done="homeCtrl.galleryDeleteDone(gallery)"
diff --git a/lab-zachary/assets/sprite.png b/lab-zachary/assets/sprite.png
index da52623ba581d494ad2ae22afb257840cfb77fd1..54b18366e2b7d9ca142df1b05c648ea1064f5a3c 100644
GIT binary patch
delta 8112
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
RD#AZ|1J+dhCjTz*e*s-Fhpqqs

delta 8754
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
Ms_ClME8B$s58UJJ_y7O^

diff --git a/lab-zachary/package.json b/lab-zachary/package.json
index 19eb8884..c703497f 100644
--- a/lab-zachary/package.json
+++ b/lab-zachary/package.json
@@ -30,6 +30,7 @@
     "file-loader": "^0.10.1",
     "html-loader": "^0.4.5",
     "html-webpack-plugin": "^2.28.0",
+    "image-webpack-loader": "^3.3.0",
     "ng-file-upload": "^12.2.13",
     "node-sass": "^4.5.1",
     "pascalcase": "^0.1.1",
diff --git a/lab-zachary/webpack.config.js b/lab-zachary/webpack.config.js
index ada37bf7..a25d3ef5 100644
--- a/lab-zachary/webpack.config.js
+++ b/lab-zachary/webpack.config.js
@@ -40,6 +40,13 @@ module.exports = {
       {
         test: /\.scss$/,
         loader: ExtractTextPlugin.extract(['css-loader', 'sass-loader'])
+      },
+      {
+        test: /\.(gif|png|jpe?g|svg)$/i,
+        loaders: [
+          'file-loader?hash=sha512&digest=hex&name=[hash].[ext]',
+          'image-webpack-loader?bypassOnDebug'
+        ]
       }
     ]
   }

From 4292613f77278072e52ad692040a24c7c1f8ab42 Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Mon, 10 Apr 2017 12:51:37 -0700
Subject: [PATCH 22/23] started day 8

---
 lab-zachary/app/entry.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lab-zachary/app/entry.js b/lab-zachary/app/entry.js
index 365a3a78..5b7ad84a 100644
--- a/lab-zachary/app/entry.js
+++ b/lab-zachary/app/entry.js
@@ -7,12 +7,13 @@ const path = require('path');
 const uiRouter = require('angular-ui-router');
 const ngTouch = require('angular-touch');
 const ngAnimate = require('angular-animate');
+const uiBootstrap = require('angular-ui-bootstrap');
 const ngFileUpload = require('ng-file-upload');
 
 
 require('./scss/main.scss');
 
-const cfgram = angular.module('cfgram', [ngTouch, ngAnimate, uiRouter, ngFileUpload]);
+const cfgram = angular.module('cfgram', [ngTouch, ngAnimate, uiRouter, uiBootstrap, ngFileUpload]);
 
 let context = require.context('./config/', true, /\.js$/);
 context.keys().forEach( key => {

From 7b954e24e67cc1040265dc1d1de868cf6ad56ea4 Mon Sep 17 00:00:00 2001
From: Zachary Crumbo <zcrumbo@mac.com>
Date: Mon, 10 Apr 2017 19:28:02 -0700
Subject: [PATCH 23/23] added dropdown and modal popup for thumbnails

---
 .../thumbnail-modal/_thumbnail-modal.scss     |  10 +
 .../thumbnail-modal/thumbnail-modal.html      |   5 +
 .../thumbnail-modal/thumbnail-modal.js        |  17 +
 .../gallery/thumbnail/thumbnail.html          |   4 +-
 .../component/gallery/thumbnail/thumbnail.js  |  16 +-
 lab-zachary/app/scss/lib/base/_base.scss      |   1 +
 .../lib/bootstrap/_custom-bootstrap-vars.scss | 887 ++++++++++++++++++
 .../scss/lib/bootstrap/_custom-bootstrap.scss |  51 +
 lab-zachary/app/scss/main.scss                |   1 +
 lab-zachary/app/view/home/home.html           |   8 +-
 lab-zachary/package.json                      |   2 +
 lab-zachary/webpack.config.js                 |   6 +-
 12 files changed, 1002 insertions(+), 6 deletions(-)
 create mode 100644 lab-zachary/app/component/gallery/thumbnail-modal/_thumbnail-modal.scss
 create mode 100644 lab-zachary/app/component/gallery/thumbnail-modal/thumbnail-modal.html
 create mode 100644 lab-zachary/app/component/gallery/thumbnail-modal/thumbnail-modal.js
 create mode 100644 lab-zachary/app/scss/lib/bootstrap/_custom-bootstrap-vars.scss
 create mode 100644 lab-zachary/app/scss/lib/bootstrap/_custom-bootstrap.scss

diff --git a/lab-zachary/app/component/gallery/thumbnail-modal/_thumbnail-modal.scss b/lab-zachary/app/component/gallery/thumbnail-modal/_thumbnail-modal.scss
new file mode 100644
index 00000000..f05cf07a
--- /dev/null
+++ b/lab-zachary/app/component/gallery/thumbnail-modal/_thumbnail-modal.scss
@@ -0,0 +1,10 @@
+.thumbnail-modal{
+  img{
+    width: 100%;
+    height: auto;
+  }
+  span {
+    display: inline-block;
+    margin: 0 1vw;
+  }
+}
\ No newline at end of file
diff --git a/lab-zachary/app/component/gallery/thumbnail-modal/thumbnail-modal.html b/lab-zachary/app/component/gallery/thumbnail-modal/thumbnail-modal.html
new file mode 100644
index 00000000..916c0403
--- /dev/null
+++ b/lab-zachary/app/component/gallery/thumbnail-modal/thumbnail-modal.html
@@ -0,0 +1,5 @@
+  <div class="thumbnail-modal"><img  ng-src="{{ thumbnailModalCtrl.resolve.modalData.imageURI }}"
+    alt="{{ thumbnailModalCtrl.resolve.modalData.desc }}"
+    >
+    <span>name:{{ thumbnailModalCtrl.resolve.modalData.name}}</span><span>description: {{  thumbnailModalCtrl.resolve.modalData.desc }}</span>
+</div>
\ No newline at end of file
diff --git a/lab-zachary/app/component/gallery/thumbnail-modal/thumbnail-modal.js b/lab-zachary/app/component/gallery/thumbnail-modal/thumbnail-modal.js
new file mode 100644
index 00000000..9e89ede3
--- /dev/null
+++ b/lab-zachary/app/component/gallery/thumbnail-modal/thumbnail-modal.js
@@ -0,0 +1,17 @@
+'use strict';
+
+require('./_thumbnail-modal.scss');
+
+module.exports = {
+  template: require('./thumbnail-modal.html'),
+  controller: ['$log',   thumbnailModalController],
+  controllerAs: 'thumbnailModalCtrl',
+  bindings: {
+    resolve: '<',
+  }
+};
+
+function thumbnailModalController($log){
+  $log.debug('thumbnailModalController');
+
+}
\ No newline at end of file
diff --git a/lab-zachary/app/component/gallery/thumbnail/thumbnail.html b/lab-zachary/app/component/gallery/thumbnail/thumbnail.html
index 29daf6b2..b3e60ecb 100644
--- a/lab-zachary/app/component/gallery/thumbnail/thumbnail.html
+++ b/lab-zachary/app/component/gallery/thumbnail/thumbnail.html
@@ -1,5 +1,7 @@
 <div class="thumbnail">
-  <img ng-src="{{ thumbnailCtrl.pic.imageURI }}" alt="{{ thumbnailCtrl.pic.desc }}">
+  <img ng-src="{{ thumbnailCtrl.pic.imageURI }}"
+    alt="{{ thumbnailCtrl.pic.desc }}"
+    ng-click="thumbnailCtrl.open()">
     <span class="btn-std" ng-click="thumbnailCtrl.deleteGalleryPic()">delete</span>
   <div class="clearfix"></div>
 </div>
\ No newline at end of file
diff --git a/lab-zachary/app/component/gallery/thumbnail/thumbnail.js b/lab-zachary/app/component/gallery/thumbnail/thumbnail.js
index e6e6511a..604b3f0a 100644
--- a/lab-zachary/app/component/gallery/thumbnail/thumbnail.js
+++ b/lab-zachary/app/component/gallery/thumbnail/thumbnail.js
@@ -4,7 +4,7 @@ require('./_thumbnail.scss');
 
 module.exports = {
   template: require('./thumbnail.html'),
-  controller: ['$log', 'picService', thumbnailController],
+  controller: ['$log',  '$uibModal',  '$document', 'picService', thumbnailController],
   controllerAs: 'thumbnailCtrl',
   bindings: {
     pic: '<',
@@ -12,7 +12,7 @@ module.exports = {
   }
 };
 
-function thumbnailController($log, picService){
+function thumbnailController($log,$uibModal, $document, picService){
   $log.debug('thumbnailController');
 
   this.deleteGalleryPic = function(){
@@ -20,5 +20,17 @@ function thumbnailController($log, picService){
 
     picService.deleteGalleryPic(this.gallery, this.pic);
   };
+  this.open = () => {
+    $uibModal.open({
+      animation: this.animationsEnabled,
+      component: 'thumbnailModal',
+      size: 'lg',
+      resolve: {
+        modalData:  this.pic
+      }
+    }).result.then(()=>{}).catch( () => $log.log('closed'));
+
+
+  };
 
 }
\ No newline at end of file
diff --git a/lab-zachary/app/scss/lib/base/_base.scss b/lab-zachary/app/scss/lib/base/_base.scss
index acef9fe4..ff91ae8d 100644
--- a/lab-zachary/app/scss/lib/base/_base.scss
+++ b/lab-zachary/app/scss/lib/base/_base.scss
@@ -4,6 +4,7 @@ body{
   font-family: $fontStack;
   display: relative;
   font-size: $secondaryTextSize;
+  margin: 0 auto;
 
   a{
     text-decoration: none;
diff --git a/lab-zachary/app/scss/lib/bootstrap/_custom-bootstrap-vars.scss b/lab-zachary/app/scss/lib/bootstrap/_custom-bootstrap-vars.scss
new file mode 100644
index 00000000..04b79514
--- /dev/null
+++ b/lab-zachary/app/scss/lib/bootstrap/_custom-bootstrap-vars.scss
@@ -0,0 +1,887 @@
+
+$bootstrap-sass-asset-helper: true !default;
+
+$app-primary: #a7f7fa;
+$app-secondary: #7fa7af;
+$app-disabled: #abeaeb;
+$app-active: #fa7fa7;
+$app-success: #a7ff7a;
+$app-error: #ff7a7a;
+$app-warn: #ffa77a;
+$app-info: #7aa7ff;
+$app-white: #fff;
+$app-black: #000;
+
+//
+// Variables
+// --------------------------------------------------
+
+
+//== Colors
+//
+//## Gray and brand colors for use across Bootstrap.
+
+$gray-base:              #000 !default;
+$gray-darker:            lighten($gray-base, 13.5%) !default; // #222
+$gray-dark:              lighten($gray-base, 20%) !default;   // #333
+$gray:                   lighten($gray-base, 33.5%) !default; // #555
+$gray-light:             lighten($gray-base, 46.7%) !default; // #777
+$gray-lighter:           lighten($gray-base, 93.5%) !default; // #eee
+
+$brand-primary:         darken(#428bca, 6.5%) !default; // #337ab7
+$brand-success:         #5cb85c !default;
+$brand-info:            #5bc0de !default;
+$brand-warning:         #f0ad4e !default;
+$brand-danger:          #d9534f !default;
+
+
+//== Scaffolding
+//
+//## Settings for some of the most global styles.
+
+//** Background color for `<body>`.
+$body-bg:               #fff !default;
+//** Global text color on `<body>`.
+$text-color:            $gray-dark !default;
+
+//** Global textual link color.
+$link-color:            $brand-primary !default;
+//** Link hover color set via `darken()` function.
+$link-hover-color:      darken($link-color, 15%) !default;
+//** Link hover decoration.
+$link-hover-decoration: underline !default;
+
+
+//== Typography
+//
+//## Font, line-height, and color for body text, headings, and more.
+
+$font-family-sans-serif:  "Helvetica Neue", Helvetica, Arial, sans-serif !default;
+$font-family-serif:       Georgia, "Times New Roman", Times, serif !default;
+//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
+$font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace !default;
+$font-family-base:        $font-family-sans-serif !default;
+
+$font-size-base:          14px !default;
+$font-size-large:         ceil(($font-size-base * 1.25)) !default; // ~18px
+$font-size-small:         ceil(($font-size-base * 0.85)) !default; // ~12px
+
+$font-size-h1:            floor(($font-size-base * 2.6)) !default; // ~36px
+$font-size-h2:            floor(($font-size-base * 2.15)) !default; // ~30px
+$font-size-h3:            ceil(($font-size-base * 1.7)) !default; // ~24px
+$font-size-h4:            ceil(($font-size-base * 1.25)) !default; // ~18px
+$font-size-h5:            $font-size-base !default;
+$font-size-h6:            ceil(($font-size-base * 0.85)) !default; // ~12px
+
+//** Unit-less `line-height` for use in components like buttons.
+$line-height-base:        1.428571429 !default; // 20/14
+//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+$line-height-computed:    floor(($font-size-base * $line-height-base)) !default; // ~20px
+
+//** By default, this inherits from the `<body>`.
+$headings-font-family:    inherit !default;
+$headings-font-weight:    500 !default;
+$headings-line-height:    1.1 !default;
+$headings-color:          inherit !default;
+
+
+//== Iconography
+//
+//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
+
+//** Load fonts from this directory.
+
+// [converter] If $bootstrap-sass-asset-helper if used, provide path relative to the assets load path.
+// [converter] This is because some asset helpers, such as Sprockets, do not work with file-relative paths.
+$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
+
+//** File name for all font files.
+$icon-font-name:          "glyphicons-halflings-regular" !default;
+//** Element ID within SVG icon file.
+$icon-font-svg-id:        "glyphicons_halflingsregular" !default;
+
+
+//== Components
+//
+//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
+
+$padding-base-vertical:     6px !default;
+$padding-base-horizontal:   12px !default;
+
+$padding-large-vertical:    10px !default;
+$padding-large-horizontal:  16px !default;
+
+$padding-small-vertical:    5px !default;
+$padding-small-horizontal:  10px !default;
+
+$padding-xs-vertical:       1px !default;
+$padding-xs-horizontal:     5px !default;
+
+$line-height-large:         1.3333333 !default; // extra decimals for Win 8.1 Chrome
+$line-height-small:         1.5 !default;
+
+$border-radius-base:        4px !default;
+$border-radius-large:       6px !default;
+$border-radius-small:       3px !default;
+
+//** Global color for active items (e.g., navs or dropdowns).
+$component-active-color:    #fff !default;
+//** Global background color for active items (e.g., navs or dropdowns).
+$component-active-bg:       $brand-primary !default;
+
+//** Width of the `border` for generating carets that indicate dropdowns.
+$caret-width-base:          4px !default;
+//** Carets increase slightly in size for larger components.
+$caret-width-large:         5px !default;
+
+
+//== Tables
+//
+//## Customizes the `.table` component with basic values, each used across all table variations.
+
+//** Padding for `<th>`s and `<td>`s.
+$table-cell-padding:            8px !default;
+//** Padding for cells in `.table-condensed`.
+$table-condensed-cell-padding:  5px !default;
+
+//** Default background color used for all tables.
+$table-bg:                      transparent !default;
+//** Background color used for `.table-striped`.
+$table-bg-accent:               #f9f9f9 !default;
+//** Background color used for `.table-hover`.
+$table-bg-hover:                #f5f5f5 !default;
+$table-bg-active:               $table-bg-hover !default;
+
+//** Border color for table and cell borders.
+$table-border-color:            #ddd !default;
+
+
+//== Buttons
+//
+//## For each of Bootstrap's buttons, define text, background and border color.
+
+$btn-font-weight:                normal !default;
+
+$btn-default-color:              #333 !default;
+$btn-default-bg:                 #fff !default;
+$btn-default-border:             #ccc !default;
+
+$btn-primary-color:              #fff !default;
+$btn-primary-bg:                 $brand-primary !default;
+$btn-primary-border:             darken($btn-primary-bg, 5%) !default;
+
+$btn-success-color:              #fff !default;
+$btn-success-bg:                 $brand-success !default;
+$btn-success-border:             darken($btn-success-bg, 5%) !default;
+
+$btn-info-color:                 #fff !default;
+$btn-info-bg:                    $brand-info !default;
+$btn-info-border:                darken($btn-info-bg, 5%) !default;
+
+$btn-warning-color:              #fff !default;
+$btn-warning-bg:                 $brand-warning !default;
+$btn-warning-border:             darken($btn-warning-bg, 5%) !default;
+
+$btn-danger-color:               #fff !default;
+$btn-danger-bg:                  $brand-danger !default;
+$btn-danger-border:              darken($btn-danger-bg, 5%) !default;
+
+$btn-link-disabled-color:        $gray-light !default;
+
+// Allows for customizing button radius independently from global border radius
+$btn-border-radius-base:         $border-radius-base !default;
+$btn-border-radius-large:        $border-radius-large !default;
+$btn-border-radius-small:        $border-radius-small !default;
+
+
+//== Forms
+//
+//##
+
+//** `<input>` background color
+$input-bg:                       #fff !default;
+//** `<input disabled>` background color
+$input-bg-disabled:              $gray-lighter !default;
+
+//** Text color for `<input>`s
+$input-color:                    $gray !default;
+//** `<input>` border color
+$input-border:                   #ccc !default;
+
+// TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
+//** Default `.form-control` border radius
+// This has no effect on `<select>`s in some browsers, due to the limited stylability of `<select>`s in CSS.
+$input-border-radius:            $border-radius-base !default;
+//** Large `.form-control` border radius
+$input-border-radius-large:      $border-radius-large !default;
+//** Small `.form-control` border radius
+$input-border-radius-small:      $border-radius-small !default;
+
+//** Border color for inputs on focus
+$input-border-focus:             #66afe9 !default;
+
+//** Placeholder text color
+$input-color-placeholder:        #999 !default;
+
+//** Default `.form-control` height
+$input-height-base:              ($line-height-computed + ($padding-base-vertical * 2) + 2) !default;
+//** Large `.form-control` height
+$input-height-large:             (ceil($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) !default;
+//** Small `.form-control` height
+$input-height-small:             (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
+
+//** `.form-group` margin
+$form-group-margin-bottom:       15px !default;
+
+$legend-color:                   $gray-dark !default;
+$legend-border-color:            #e5e5e5 !default;
+
+//** Background color for textual input addons
+$input-group-addon-bg:           $gray-lighter !default;
+//** Border color for textual input addons
+$input-group-addon-border-color: $input-border !default;
+
+//** Disabled cursor for form controls and buttons.
+$cursor-disabled:                not-allowed !default;
+
+
+//== Dropdowns
+//
+//## Dropdown menu container and contents.
+
+//** Background for the dropdown menu.
+$dropdown-bg:                    #fff !default;
+//** Dropdown menu `border-color`.
+$dropdown-border:                rgba(0,0,0,.15) !default;
+//** Dropdown menu `border-color` **for IE8**.
+$dropdown-fallback-border:       #ccc !default;
+//** Divider color for between dropdown items.
+$dropdown-divider-bg:            #e5e5e5 !default;
+
+//** Dropdown link text color.
+$dropdown-link-color:            $gray-dark !default;
+//** Hover color for dropdown links.
+$dropdown-link-hover-color:      darken($gray-dark, 5%) !default;
+//** Hover background for dropdown links.
+$dropdown-link-hover-bg:         #f5f5f5 !default;
+
+//** Active dropdown menu item text color.
+$dropdown-link-active-color:     $component-active-color !default;
+//** Active dropdown menu item background color.
+$dropdown-link-active-bg:        $component-active-bg !default;
+
+//** Disabled dropdown menu item background color.
+$dropdown-link-disabled-color:   $gray-light !default;
+
+//** Text color for headers within dropdown menus.
+$dropdown-header-color:          $gray-light !default;
+
+//** Deprecated `$dropdown-caret-color` as of v3.1.0
+$dropdown-caret-color:           #000 !default;
+
+
+//-- Z-index master list
+//
+// Warning: Avoid customizing these values. They're used for a bird's eye view
+// of components dependent on the z-axis and are designed to all work together.
+//
+// Note: These variables are not generated into the Customizer.
+
+$zindex-navbar:            1000 !default;
+$zindex-dropdown:          1000 !default;
+$zindex-popover:           1060 !default;
+$zindex-tooltip:           1070 !default;
+$zindex-navbar-fixed:      1030 !default;
+$zindex-modal-background:  1040 !default;
+$zindex-modal:             1050 !default;
+
+
+//== Media queries breakpoints
+//
+//## Define the breakpoints at which your layout will change, adapting to different screen sizes.
+
+// Extra small screen / phone
+//** Deprecated `$screen-xs` as of v3.0.1
+$screen-xs:                  480px !default;
+//** Deprecated `$screen-xs-min` as of v3.2.0
+$screen-xs-min:              $screen-xs !default;
+//** Deprecated `$screen-phone` as of v3.0.1
+$screen-phone:               $screen-xs-min !default;
+
+// Small screen / tablet
+//** Deprecated `$screen-sm` as of v3.0.1
+$screen-sm:                  768px !default;
+$screen-sm-min:              $screen-sm !default;
+//** Deprecated `$screen-tablet` as of v3.0.1
+$screen-tablet:              $screen-sm-min !default;
+
+// Medium screen / desktop
+//** Deprecated `$screen-md` as of v3.0.1
+$screen-md:                  992px !default;
+$screen-md-min:              $screen-md !default;
+//** Deprecated `$screen-desktop` as of v3.0.1
+$screen-desktop:             $screen-md-min !default;
+
+// Large screen / wide desktop
+//** Deprecated `$screen-lg` as of v3.0.1
+$screen-lg:                  1200px !default;
+$screen-lg-min:              $screen-lg !default;
+//** Deprecated `$screen-lg-desktop` as of v3.0.1
+$screen-lg-desktop:          $screen-lg-min !default;
+
+// So media queries don't overlap when required, provide a maximum
+$screen-xs-max:              ($screen-sm-min - 1) !default;
+$screen-sm-max:              ($screen-md-min - 1) !default;
+$screen-md-max:              ($screen-lg-min - 1) !default;
+
+
+//== Grid system
+//
+//## Define your custom responsive grid.
+
+//** Number of columns in the grid.
+$grid-columns:              12 !default;
+//** Padding between columns. Gets divided in half for the left and right.
+$grid-gutter-width:         30px !default;
+// Navbar collapse
+//** Point at which the navbar becomes uncollapsed.
+$grid-float-breakpoint:     $screen-sm-min !default;
+//** Point at which the navbar begins collapsing.
+$grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
+
+
+//== Container sizes
+//
+//## Define the maximum width of `.container` for different screen sizes.
+
+// Small screen / tablet
+$container-tablet:             (720px + $grid-gutter-width) !default;
+//** For `$screen-sm-min` and up.
+$container-sm:                 $container-tablet !default;
+
+// Medium screen / desktop
+$container-desktop:            (940px + $grid-gutter-width) !default;
+//** For `$screen-md-min` and up.
+$container-md:                 $container-desktop !default;
+
+// Large screen / wide desktop
+$container-large-desktop:      (1140px + $grid-gutter-width) !default;
+//** For `$screen-lg-min` and up.
+$container-lg:                 $container-large-desktop !default;
+
+
+//== Navbar
+//
+//##
+
+// Basics of a navbar
+$navbar-height:                    50px !default;
+$navbar-margin-bottom:             $line-height-computed !default;
+$navbar-border-radius:             $border-radius-base !default;
+$navbar-padding-horizontal:        floor(($grid-gutter-width / 2)) !default;
+$navbar-padding-vertical:          (($navbar-height - $line-height-computed) / 2) !default;
+$navbar-collapse-max-height:       340px !default;
+
+$navbar-default-color:             #777 !default;
+$navbar-default-bg:                #f8f8f8 !default;
+$navbar-default-border:            darken($navbar-default-bg, 6.5%) !default;
+
+// Navbar links
+$navbar-default-link-color:                #777 !default;
+$navbar-default-link-hover-color:          #333 !default;
+$navbar-default-link-hover-bg:             transparent !default;
+$navbar-default-link-active-color:         #555 !default;
+$navbar-default-link-active-bg:            darken($navbar-default-bg, 6.5%) !default;
+$navbar-default-link-disabled-color:       #ccc !default;
+$navbar-default-link-disabled-bg:          transparent !default;
+
+// Navbar brand label
+$navbar-default-brand-color:               $navbar-default-link-color !default;
+$navbar-default-brand-hover-color:         darken($navbar-default-brand-color, 10%) !default;
+$navbar-default-brand-hover-bg:            transparent !default;
+
+// Navbar toggle
+$navbar-default-toggle-hover-bg:           #ddd !default;
+$navbar-default-toggle-icon-bar-bg:        #888 !default;
+$navbar-default-toggle-border-color:       #ddd !default;
+
+
+//=== Inverted navbar
+// Reset inverted navbar basics
+$navbar-inverse-color:                      lighten($gray-light, 15%) !default;
+$navbar-inverse-bg:                         #222 !default;
+$navbar-inverse-border:                     darken($navbar-inverse-bg, 10%) !default;
+
+// Inverted navbar links
+$navbar-inverse-link-color:                 lighten($gray-light, 15%) !default;
+$navbar-inverse-link-hover-color:           #fff !default;
+$navbar-inverse-link-hover-bg:              transparent !default;
+$navbar-inverse-link-active-color:          $navbar-inverse-link-hover-color !default;
+$navbar-inverse-link-active-bg:             darken($navbar-inverse-bg, 10%) !default;
+$navbar-inverse-link-disabled-color:        #444 !default;
+$navbar-inverse-link-disabled-bg:           transparent !default;
+
+// Inverted navbar brand label
+$navbar-inverse-brand-color:                $navbar-inverse-link-color !default;
+$navbar-inverse-brand-hover-color:          #fff !default;
+$navbar-inverse-brand-hover-bg:             transparent !default;
+
+// Inverted navbar toggle
+$navbar-inverse-toggle-hover-bg:            #333 !default;
+$navbar-inverse-toggle-icon-bar-bg:         #fff !default;
+$navbar-inverse-toggle-border-color:        #333 !default;
+
+
+//== Navs
+//
+//##
+
+//=== Shared nav styles
+$nav-link-padding:                          10px 15px !default;
+$nav-link-hover-bg:                         $gray-lighter !default;
+
+$nav-disabled-link-color:                   $gray-light !default;
+$nav-disabled-link-hover-color:             $gray-light !default;
+
+//== Tabs
+$nav-tabs-border-color:                     #ddd !default;
+
+$nav-tabs-link-hover-border-color:          $gray-lighter !default;
+
+$nav-tabs-active-link-hover-bg:             $body-bg !default;
+$nav-tabs-active-link-hover-color:          $gray !default;
+$nav-tabs-active-link-hover-border-color:   #ddd !default;
+
+$nav-tabs-justified-link-border-color:            #ddd !default;
+$nav-tabs-justified-active-link-border-color:     $body-bg !default;
+
+//== Pills
+$nav-pills-border-radius:                   $border-radius-base !default;
+$nav-pills-active-link-hover-bg:            $component-active-bg !default;
+$nav-pills-active-link-hover-color:         $component-active-color !default;
+
+
+//== Pagination
+//
+//##
+
+$pagination-color:                     $link-color !default;
+$pagination-bg:                        #fff !default;
+$pagination-border:                    #ddd !default;
+
+$pagination-hover-color:               $link-hover-color !default;
+$pagination-hover-bg:                  $gray-lighter !default;
+$pagination-hover-border:              #ddd !default;
+
+$pagination-active-color:              #fff !default;
+$pagination-active-bg:                 $brand-primary !default;
+$pagination-active-border:             $brand-primary !default;
+
+$pagination-disabled-color:            $gray-light !default;
+$pagination-disabled-bg:               #fff !default;
+$pagination-disabled-border:           #ddd !default;
+
+
+//== Pager
+//
+//##
+
+$pager-bg:                             $pagination-bg !default;
+$pager-border:                         $pagination-border !default;
+$pager-border-radius:                  15px !default;
+
+$pager-hover-bg:                       $pagination-hover-bg !default;
+
+$pager-active-bg:                      $pagination-active-bg !default;
+$pager-active-color:                   $pagination-active-color !default;
+
+$pager-disabled-color:                 $pagination-disabled-color !default;
+
+
+//== Jumbotron
+//
+//##
+
+$jumbotron-padding:              30px !default;
+$jumbotron-color:                inherit !default;
+$jumbotron-bg:                   $gray-lighter !default;
+$jumbotron-heading-color:        inherit !default;
+$jumbotron-font-size:            ceil(($font-size-base * 1.5)) !default;
+$jumbotron-heading-font-size:    ceil(($font-size-base * 4.5)) !default;
+
+
+//== Form states and alerts
+//
+//## Define colors for form feedback states and, by default, alerts.
+
+$state-success-text:             #3c763d !default;
+$state-success-bg:               #dff0d8 !default;
+$state-success-border:           darken(adjust-hue($state-success-bg, -10), 5%) !default;
+
+$state-info-text:                #31708f !default;
+$state-info-bg:                  #d9edf7 !default;
+$state-info-border:              darken(adjust-hue($state-info-bg, -10), 7%) !default;
+
+$state-warning-text:             #8a6d3b !default;
+$state-warning-bg:               #fcf8e3 !default;
+$state-warning-border:           darken(adjust-hue($state-warning-bg, -10), 5%) !default;
+
+$state-danger-text:              #a94442 !default;
+$state-danger-bg:                #f2dede !default;
+$state-danger-border:            darken(adjust-hue($state-danger-bg, -10), 5%) !default;
+
+
+//== Tooltips
+//
+//##
+
+//** Tooltip max width
+$tooltip-max-width:           200px !default;
+//** Tooltip text color
+$tooltip-color:               #fff !default;
+//** Tooltip background color
+$tooltip-bg:                  #000 !default;
+$tooltip-opacity:             .9 !default;
+
+//** Tooltip arrow width
+$tooltip-arrow-width:         5px !default;
+//** Tooltip arrow color
+$tooltip-arrow-color:         $tooltip-bg !default;
+
+
+//== Popovers
+//
+//##
+
+//** Popover body background color
+$popover-bg:                          #fff !default;
+//** Popover maximum width
+$popover-max-width:                   276px !default;
+//** Popover border color
+$popover-border-color:                rgba(0,0,0,.2) !default;
+//** Popover fallback border color
+$popover-fallback-border-color:       #ccc !default;
+
+//** Popover title background color
+$popover-title-bg:                    darken($popover-bg, 3%) !default;
+
+//** Popover arrow width
+$popover-arrow-width:                 10px !default;
+//** Popover arrow color
+$popover-arrow-color:                 $popover-bg !default;
+
+//** Popover outer arrow width
+$popover-arrow-outer-width:           ($popover-arrow-width + 1) !default;
+//** Popover outer arrow color
+$popover-arrow-outer-color:           fade_in($popover-border-color, 0.05) !default;
+//** Popover outer arrow fallback color
+$popover-arrow-outer-fallback-color:  darken($popover-fallback-border-color, 20%) !default;
+
+
+//== Labels
+//
+//##
+
+//** Default label background color
+$label-default-bg:            $gray-light !default;
+//** Primary label background color
+$label-primary-bg:            $brand-primary !default;
+//** Success label background color
+$label-success-bg:            $brand-success !default;
+//** Info label background color
+$label-info-bg:               $brand-info !default;
+//** Warning label background color
+$label-warning-bg:            $brand-warning !default;
+//** Danger label background color
+$label-danger-bg:             $brand-danger !default;
+
+//** Default label text color
+$label-color:                 #fff !default;
+//** Default text color of a linked label
+$label-link-hover-color:      #fff !default;
+
+
+//== Modals
+//
+//##
+
+//** Padding applied to the modal body
+$modal-inner-padding:         15px !default;
+
+//** Padding applied to the modal title
+$modal-title-padding:         15px !default;
+//** Modal title line-height
+$modal-title-line-height:     $line-height-base !default;
+
+//** Background color of modal content area
+$modal-content-bg:                             #fff !default;
+//** Modal content border color
+$modal-content-border-color:                   rgba(0,0,0,.2) !default;
+//** Modal content border color **for IE8**
+$modal-content-fallback-border-color:          #999 !default;
+
+//** Modal backdrop background color
+$modal-backdrop-bg:           #000 !default;
+//** Modal backdrop opacity
+$modal-backdrop-opacity:      .5 !default;
+//** Modal header border color
+$modal-header-border-color:   #e5e5e5 !default;
+//** Modal footer border color
+$modal-footer-border-color:   $modal-header-border-color !default;
+
+$modal-lg:                    97% !default;
+$modal-md:                    600px !default;
+$modal-sm:                    300px !default;
+
+
+//== Alerts
+//
+//## Define alert colors, border radius, and padding.
+
+$alert-padding:               15px !default;
+$alert-border-radius:         $border-radius-base !default;
+$alert-link-font-weight:      bold !default;
+
+$alert-success-bg:            $state-success-bg !default;
+$alert-success-text:          $state-success-text !default;
+$alert-success-border:        $state-success-border !default;
+
+$alert-info-bg:               $state-info-bg !default;
+$alert-info-text:             $state-info-text !default;
+$alert-info-border:           $state-info-border !default;
+
+$alert-warning-bg:            $state-warning-bg !default;
+$alert-warning-text:          $state-warning-text !default;
+$alert-warning-border:        $state-warning-border !default;
+
+$alert-danger-bg:             $state-danger-bg !default;
+$alert-danger-text:           $state-danger-text !default;
+$alert-danger-border:         $state-danger-border !default;
+
+
+//== Progress bars
+//
+//##
+
+//** Background color of the whole progress component
+$progress-bg:                 #f5f5f5 !default;
+//** Progress bar text color
+$progress-bar-color:          #fff !default;
+//** Variable for setting rounded corners on progress bar.
+$progress-border-radius:      $border-radius-base !default;
+
+//** Default progress bar color
+$progress-bar-bg:             $brand-primary !default;
+//** Success progress bar color
+$progress-bar-success-bg:     $brand-success !default;
+//** Warning progress bar color
+$progress-bar-warning-bg:     $brand-warning !default;
+//** Danger progress bar color
+$progress-bar-danger-bg:      $brand-danger !default;
+//** Info progress bar color
+$progress-bar-info-bg:        $brand-info !default;
+
+
+//== List group
+//
+//##
+
+//** Background color on `.list-group-item`
+$list-group-bg:                 #fff !default;
+//** `.list-group-item` border color
+$list-group-border:             #ddd !default;
+//** List group border radius
+$list-group-border-radius:      $border-radius-base !default;
+
+//** Background color of single list items on hover
+$list-group-hover-bg:           #f5f5f5 !default;
+//** Text color of active list items
+$list-group-active-color:       $component-active-color !default;
+//** Background color of active list items
+$list-group-active-bg:          $component-active-bg !default;
+//** Border color of active list elements
+$list-group-active-border:      $list-group-active-bg !default;
+//** Text color for content within active list items
+$list-group-active-text-color:  lighten($list-group-active-bg, 40%) !default;
+
+//** Text color of disabled list items
+$list-group-disabled-color:      $gray-light !default;
+//** Background color of disabled list items
+$list-group-disabled-bg:         $gray-lighter !default;
+//** Text color for content within disabled list items
+$list-group-disabled-text-color: $list-group-disabled-color !default;
+
+$list-group-link-color:         #555 !default;
+$list-group-link-hover-color:   $list-group-link-color !default;
+$list-group-link-heading-color: #333 !default;
+
+
+//== Panels
+//
+//##
+
+$panel-bg:                    #fff !default;
+$panel-body-padding:          15px !default;
+$panel-heading-padding:       10px 15px !default;
+$panel-footer-padding:        $panel-heading-padding !default;
+$panel-border-radius:         $border-radius-base !default;
+
+//** Border color for elements within panels
+$panel-inner-border:          #ddd !default;
+$panel-footer-bg:             #f5f5f5 !default;
+
+$panel-default-text:          $gray-dark !default;
+$panel-default-border:        #ddd !default;
+$panel-default-heading-bg:    #f5f5f5 !default;
+
+$panel-primary-text:          #fff !default;
+$panel-primary-border:        $brand-primary !default;
+$panel-primary-heading-bg:    $brand-primary !default;
+
+$panel-success-text:          $state-success-text !default;
+$panel-success-border:        $state-success-border !default;
+$panel-success-heading-bg:    $state-success-bg !default;
+
+$panel-info-text:             $state-info-text !default;
+$panel-info-border:           $state-info-border !default;
+$panel-info-heading-bg:       $state-info-bg !default;
+
+$panel-warning-text:          $state-warning-text !default;
+$panel-warning-border:        $state-warning-border !default;
+$panel-warning-heading-bg:    $state-warning-bg !default;
+
+$panel-danger-text:           $state-danger-text !default;
+$panel-danger-border:         $state-danger-border !default;
+$panel-danger-heading-bg:     $state-danger-bg !default;
+
+
+//== Thumbnails
+//
+//##
+
+//** Padding around the thumbnail image
+$thumbnail-padding:           4px !default;
+//** Thumbnail background color
+$thumbnail-bg:                $body-bg !default;
+//** Thumbnail border color
+$thumbnail-border:            #ddd !default;
+//** Thumbnail border radius
+$thumbnail-border-radius:     $border-radius-base !default;
+
+//** Custom text color for thumbnail captions
+$thumbnail-caption-color:     $text-color !default;
+//** Padding around the thumbnail caption
+$thumbnail-caption-padding:   9px !default;
+
+
+//== Wells
+//
+//##
+
+$well-bg:                     #f5f5f5 !default;
+$well-border:                 darken($well-bg, 7%) !default;
+
+
+//== Badges
+//
+//##
+
+$badge-color:                 #fff !default;
+//** Linked badge text color on hover
+$badge-link-hover-color:      #fff !default;
+$badge-bg:                    $gray-light !default;
+
+//** Badge text color in active nav link
+$badge-active-color:          $link-color !default;
+//** Badge background color in active nav link
+$badge-active-bg:             #fff !default;
+
+$badge-font-weight:           bold !default;
+$badge-line-height:           1 !default;
+$badge-border-radius:         10px !default;
+
+
+//== Breadcrumbs
+//
+//##
+
+$breadcrumb-padding-vertical:   8px !default;
+$breadcrumb-padding-horizontal: 15px !default;
+//** Breadcrumb background color
+$breadcrumb-bg:                 #f5f5f5 !default;
+//** Breadcrumb text color
+$breadcrumb-color:              #ccc !default;
+//** Text color of current page in the breadcrumb
+$breadcrumb-active-color:       $gray-light !default;
+//** Textual separator for between breadcrumb elements
+$breadcrumb-separator:          "/" !default;
+
+
+//== Carousel
+//
+//##
+
+$carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6) !default;
+
+$carousel-control-color:                      #fff !default;
+$carousel-control-width:                      15% !default;
+$carousel-control-opacity:                    .5 !default;
+$carousel-control-font-size:                  20px !default;
+
+$carousel-indicator-active-bg:                #fff !default;
+$carousel-indicator-border-color:             #fff !default;
+
+$carousel-caption-color:                      #fff !default;
+
+
+//== Close
+//
+//##
+
+$close-font-weight:           bold !default;
+$close-color:                 #000 !default;
+$close-text-shadow:           0 1px 0 #fff !default;
+
+
+//== Code
+//
+//##
+
+$code-color:                  #c7254e !default;
+$code-bg:                     #f9f2f4 !default;
+
+$kbd-color:                   #fff !default;
+$kbd-bg:                      #333 !default;
+
+$pre-bg:                      #f5f5f5 !default;
+$pre-color:                   $gray-dark !default;
+$pre-border-color:            #ccc !default;
+$pre-scrollable-max-height:   340px !default;
+
+
+//== Type
+//
+//##
+
+//** Horizontal offset for forms and lists.
+$component-offset-horizontal: 180px !default;
+//** Text muted color
+$text-muted:                  $gray-light !default;
+//** Abbreviations and acronyms border color
+$abbr-border-color:           $gray-light !default;
+//** Headings small color
+$headings-small-color:        $gray-light !default;
+//** Blockquote small color
+$blockquote-small-color:      $gray-light !default;
+//** Blockquote font size
+$blockquote-font-size:        ($font-size-base * 1.25) !default;
+//** Blockquote border color
+$blockquote-border-color:     $gray-lighter !default;
+//** Page header border color
+$page-header-border-color:    $gray-lighter !default;
+//** Width of horizontal description list titles
+$dl-horizontal-offset:        $component-offset-horizontal !default;
+//** Point at which .dl-horizontal becomes horizontal
+$dl-horizontal-breakpoint:    $grid-float-breakpoint !default;
+//** Horizontal line color.
+$hr-border:                   $gray-lighter !default;
\ No newline at end of file
diff --git a/lab-zachary/app/scss/lib/bootstrap/_custom-bootstrap.scss b/lab-zachary/app/scss/lib/bootstrap/_custom-bootstrap.scss
new file mode 100644
index 00000000..428e6eeb
--- /dev/null
+++ b/lab-zachary/app/scss/lib/bootstrap/_custom-bootstrap.scss
@@ -0,0 +1,51 @@
+
+@import "custom-bootstrap-vars";
+
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/mixins";
+
+// Reset and dependencies
+//@import "~bootstrap-sass/assets/stylesheets/bootstrap/normalize";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/print";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/glyphicons";
+
+// Core CSS
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/scaffolding";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/type";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/code";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/grid";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/tables";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/forms";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/buttons";
+
+// Components
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/component-animations";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/dropdowns";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/button-groups";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/input-groups";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/navs";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/navbar";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/breadcrumbs";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/pagination";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/pager";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/labels";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/badges";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/jumbotron";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/thumbnails";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/alerts";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/progress-bars";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/media";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/list-group";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/panels";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/responsive-embed";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/wells";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/close";
+
+// Components w/ JavaScript
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/modals";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/tooltip";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/popovers";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/carousel";
+
+// Utility classes
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/utilities";
+@import "~bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities";
\ No newline at end of file
diff --git a/lab-zachary/app/scss/main.scss b/lab-zachary/app/scss/main.scss
index 76187b60..124a74d7 100644
--- a/lab-zachary/app/scss/main.scss
+++ b/lab-zachary/app/scss/main.scss
@@ -1,3 +1,4 @@
 @import 'lib/reset/reset';
+@import "lib/bootstrap/custom-bootstrap";
 @import 'lib/base/global-vars';
 @import 'lib/base/base';
\ No newline at end of file
diff --git a/lab-zachary/app/view/home/home.html b/lab-zachary/app/view/home/home.html
index fbe602f3..33c93ff7 100644
--- a/lab-zachary/app/view/home/home.html
+++ b/lab-zachary/app/view/home/home.html
@@ -5,12 +5,16 @@
   <button class="btn-std" ng-click="homeCtrl.changeSort()">sorted by {{ homeCtrl.sort.name }}</button>
   <div class="clearfix"></div>
   <h2 ng-if="homeCtrl.galleries">Galleries</h2>
-  <ul>
+  <uib-accordion>
+
+  <ul uib-accordion-group heading="Galleries">
     <gallery-item ng-repeat="gallery in homeCtrl.galleries | gallerySearch: homeCtrl.gallerySearchTerm | orderBy: homeCtrl.galleries.created : reverse= homeCtrl.sort.val"
     gallery="gallery"
     current-gallery="homeCtrl.currentGallery"
     delete-done="homeCtrl.galleryDeleteDone(gallery)"
-    ng-click="homeCtrl.currentGallery=gallery"></gallery-item>
+    ng-click="homeCtrl.currentGallery=gallery"
+    ></gallery-item>
   </ul>
   <thumbnail-container ng-if="homeCtrl.currentGallery" gallery="homeCtrl.currentGallery"></thumbnail-container>
+  </uib-accordion>
 </section>
diff --git a/lab-zachary/package.json b/lab-zachary/package.json
index c703497f..6cff5aa7 100644
--- a/lab-zachary/package.json
+++ b/lab-zachary/package.json
@@ -18,10 +18,12 @@
     "angular-animate": "^1.6.3",
     "angular-route": "^1.6.3",
     "angular-touch": "^1.6.3",
+    "angular-ui-bootstrap": "^2.5.0",
     "angular-ui-router": "^0.4.2",
     "babel-core": "^6.24.0",
     "babel-loader": "^6.4.1",
     "babel-preset-es2015": "^6.24.0",
+    "bootstrap-sass": "^3.3.7",
     "camelcase": "^4.0.0",
     "clean-webpack-plugin": "^0.1.16",
     "css-loader": "^0.27.3",
diff --git a/lab-zachary/webpack.config.js b/lab-zachary/webpack.config.js
index a25d3ef5..7907844b 100644
--- a/lab-zachary/webpack.config.js
+++ b/lab-zachary/webpack.config.js
@@ -47,7 +47,11 @@ module.exports = {
           'file-loader?hash=sha512&digest=hex&name=[hash].[ext]',
           'image-webpack-loader?bypassOnDebug'
         ]
-      }
+      },
+      {
+        test: /\.(woff|tt|svg|eot).*/,
+        loader: 'url-loader?limit=10000&name=image/[hash].[ext]'
+      },
     ]
   }
 };
\ No newline at end of file