From 3544358446d7abfc97938635abb49ee6a64e5c4e Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Tue, 28 Mar 2017 20:03:11 -0700 Subject: [PATCH 01/31] scaffolding done --- app/entry.js | 0 app/index.html | 12 ++++++++++++ 2 files changed, 12 insertions(+) create mode 100644 app/entry.js create mode 100644 app/index.html diff --git a/app/entry.js b/app/entry.js new file mode 100644 index 00000000..e69de29b diff --git a/app/index.html b/app/index.html new file mode 100644 index 00000000..ded73b28 --- /dev/null +++ b/app/index.html @@ -0,0 +1,12 @@ + + + + + + + + + + + + From 3ac1e4bb5602b893bbc90229de72fb039a5c662e Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Tue, 28 Mar 2017 22:22:14 -0700 Subject: [PATCH 02/31] entry.js completed --- app/entry.js | 42 +++++++++++++++++++++++++++++++++++++ app/index.html | 2 +- app/service/auth-service.js | 0 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 app/service/auth-service.js diff --git a/app/entry.js b/app/entry.js index e69de29b..0820f262 100644 --- a/app/entry.js +++ b/app/entry.js @@ -0,0 +1,42 @@ +'use stirct'; + +require('./scss/lib/main.scss'); + +const path = require('path'); +const angular = require('angular'); +const camelcase = require('camelcase'); +const pascalcase = require('pascalcase'); +const uiRouter = require('angular-ui-router'); +const ngTouch = require('angular-touch'); +const ngAnimate = require('angular-animate'); + +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); + cfgram.controller(name, module); +}); + +context = require.context('./service/', true, +/\.js$/); +context.keys().forEach( key => { + let name = camelcase(path.basename(key, '.js')); + + let module = context(key); + 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); + cfgram.component(name, module); +}); diff --git a/app/index.html b/app/index.html index ded73b28..9c8f91c7 100644 --- a/app/index.html +++ b/app/index.html @@ -6,7 +6,7 @@ - +
diff --git a/app/service/auth-service.js b/app/service/auth-service.js new file mode 100644 index 00000000..e69de29b From 666e0e0074b7ba9edcd54c527c7ddd8df15f0fb6 Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Tue, 28 Mar 2017 22:47:30 -0700 Subject: [PATCH 03/31] view folder added --- app/service/auth-service.js | 77 +++++++++++++++++++++++++++++++++++++ app/view/home/_home.scss | 0 app/view/home/home.html | 0 app/view/home/home.js | 0 4 files changed, 77 insertions(+) create mode 100644 app/view/home/_home.scss create mode 100644 app/view/home/home.html create mode 100644 app/view/home/home.js diff --git a/app/service/auth-service.js b/app/service/auth-service.js index e69de29b..9ea749bc 100644 --- a/app/service/auth-service.js +++ b/app/service/auth-service.js @@ -0,0 +1,77 @@ +'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('authService.setToken'); + + if (! _token) { + return $q.reject(new Error('no token bro')); + } + + $window.localStorage.setItem('token', _token); + token = _token; + return $q.resolve(token); + } + + service.signup = function(user) { + $log.debug('authService.signup'); + + let url = `${__ARP_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); + }) + .catch( err => { + $log.error('failure:', err.message); + return $q.reject(err); + }); + + }; + + service.logout = function(){ + $log.debug('authService.logout'); + + $window.localStorage.removeItem('token'); + token = null; + return $q.resolve(); + }; + + 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.log('success', res.data); + return setToken(res.data); + }) + .catch( err => { + $log.error(err.message); + return $q.reject(err); + }); + }; + + return service; +} diff --git a/app/view/home/_home.scss b/app/view/home/_home.scss new file mode 100644 index 00000000..e69de29b diff --git a/app/view/home/home.html b/app/view/home/home.html new file mode 100644 index 00000000..e69de29b diff --git a/app/view/home/home.js b/app/view/home/home.js new file mode 100644 index 00000000..e69de29b From 30bbaf8b701bcf72e1640375681cf743174d195d Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Tue, 28 Mar 2017 23:23:47 -0700 Subject: [PATCH 04/31] scss scaffolding --- app/{view/home/home.js => scss/lib/theme/_vars.scss} | 0 app/view/home/home.html | 3 +++ 2 files changed, 3 insertions(+) rename app/{view/home/home.js => scss/lib/theme/_vars.scss} (100%) diff --git a/app/view/home/home.js b/app/scss/lib/theme/_vars.scss similarity index 100% rename from app/view/home/home.js rename to app/scss/lib/theme/_vars.scss diff --git a/app/view/home/home.html b/app/view/home/home.html index e69de29b..ddaf170f 100644 --- a/app/view/home/home.html +++ b/app/view/home/home.html @@ -0,0 +1,3 @@ +
+

welcome home!

+
From 4fb8e0570e869bd49cb365f23f3e38d0b434d1c9 Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Tue, 28 Mar 2017 23:39:27 -0700 Subject: [PATCH 05/31] karma installed with other dev dependencies --- .babelrc | 3 + .eslintrc | 21 ++++++ .gitignore | 94 ++++++++++++++++++++++++++ app/component/login/_login.scss | 0 app/component/login/login.html | 32 +++++++++ app/component/login/login.js | 22 ++++++ app/component/signup/_signup.scss | 0 app/component/signup/signup.html | 24 +++++++ app/component/signup/signup.js | 26 +++++++ app/config/router_config.js | 31 +++++++++ app/scss/lib/base/_base.scss | 0 app/scss/lib/base/_reset.scss | 0 app/scss/lib/layout/_content.scss | 0 app/scss/lib/layout/_footer.scss | 0 app/scss/lib/layout/_header.scss | 0 app/scss/lib/main.scss | 17 +++++ app/view/home/home-controller.js | 9 +++ app/view/landing/_landing.scss | 0 app/view/landing/landing-controller.js | 10 +++ app/view/landing/landing.html | 25 +++++++ gulpfile.js | 23 +++++++ karma.conf.js | 25 +++++++ package.json | 61 +++++++++++++++++ webpack.config.js | 44 ++++++++++++ 24 files changed, 467 insertions(+) create mode 100644 .babelrc create mode 100644 .eslintrc create mode 100644 .gitignore create mode 100644 app/component/login/_login.scss create mode 100644 app/component/login/login.html create mode 100644 app/component/login/login.js create mode 100644 app/component/signup/_signup.scss create mode 100644 app/component/signup/signup.html create mode 100644 app/component/signup/signup.js create mode 100644 app/config/router_config.js create mode 100644 app/scss/lib/base/_base.scss create mode 100644 app/scss/lib/base/_reset.scss create mode 100644 app/scss/lib/layout/_content.scss create mode 100644 app/scss/lib/layout/_footer.scss create mode 100644 app/scss/lib/layout/_header.scss create mode 100644 app/scss/lib/main.scss create mode 100644 app/view/home/home-controller.js create mode 100644 app/view/landing/_landing.scss create mode 100644 app/view/landing/landing-controller.js create mode 100644 app/view/landing/landing.html create mode 100644 gulpfile.js create mode 100644 karma.conf.js create mode 100644 package.json create mode 100644 webpack.config.js diff --git a/.babelrc b/.babelrc new file mode 100644 index 00000000..c13c5f62 --- /dev/null +++ b/.babelrc @@ -0,0 +1,3 @@ +{ + "presets": ["es2015"] +} diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 00000000..b663d772 --- /dev/null +++ b/.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" +} \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..4df309fa --- /dev/null +++ b/.gitignore @@ -0,0 +1,94 @@ +# 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 +build/ +*.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 diff --git a/app/component/login/_login.scss b/app/component/login/_login.scss new file mode 100644 index 00000000..e69de29b diff --git a/app/component/login/login.html b/app/component/login/login.html new file mode 100644 index 00000000..3216c9b7 --- /dev/null +++ b/app/component/login/login.html @@ -0,0 +1,32 @@ + diff --git a/app/component/login/login.js b/app/component/login/login.js new file mode 100644 index 00000000..58ecb75f --- /dev/null +++ b/app/component/login/login.js @@ -0,0 +1,22 @@ +'use strict'; +require('./_login.scss'); + +module.exports = { + template: require('./login.html'), + controller: ['$log', '$location', 'authService', LoginController], + controllerAs: 'loginCtrl' +}; + +function LoginController($log, $location, authService){ + $log.debug('LoginController'); + + authService.getToken() + .then( () => { + $location.url('/home'); + }); + + this.login = function(){ + $log.debug('loginCtrl.login'); + + }; +} diff --git a/app/component/signup/_signup.scss b/app/component/signup/_signup.scss new file mode 100644 index 00000000..e69de29b diff --git a/app/component/signup/signup.html b/app/component/signup/signup.html new file mode 100644 index 00000000..ea9fe413 --- /dev/null +++ b/app/component/signup/signup.html @@ -0,0 +1,24 @@ + diff --git a/app/component/signup/signup.js b/app/component/signup/signup.js new file mode 100644 index 00000000..d2a64706 --- /dev/null +++ b/app/component/signup/signup.js @@ -0,0 +1,26 @@ +'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( () => { + $location.url('/home'); + }); + + this.signup = function(user){ + $log.debug('signupCtrl.signup'); + + authService.getToken(user) + .then( () => { + $location.url('/home'); + }); + }; +} diff --git a/app/config/router_config.js b/app/config/router_config.js new file mode 100644 index 00000000..31d817b6 --- /dev/null +++ b/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); + }); +} diff --git a/app/scss/lib/base/_base.scss b/app/scss/lib/base/_base.scss new file mode 100644 index 00000000..e69de29b diff --git a/app/scss/lib/base/_reset.scss b/app/scss/lib/base/_reset.scss new file mode 100644 index 00000000..e69de29b diff --git a/app/scss/lib/layout/_content.scss b/app/scss/lib/layout/_content.scss new file mode 100644 index 00000000..e69de29b diff --git a/app/scss/lib/layout/_footer.scss b/app/scss/lib/layout/_footer.scss new file mode 100644 index 00000000..e69de29b diff --git a/app/scss/lib/layout/_header.scss b/app/scss/lib/layout/_header.scss new file mode 100644 index 00000000..e69de29b diff --git a/app/scss/lib/main.scss b/app/scss/lib/main.scss new file mode 100644 index 00000000..0c8fa713 --- /dev/null +++ b/app/scss/lib/main.scss @@ -0,0 +1,17 @@ +body{ + background-color: maroon; +} + +/* BASE */ +@import "lib/base/reset"; +@import "lib/base/base"; + +/* LAYOUT */ +@import "lib/layout/content"; +@import "lib/layout/header"; + +/* COMPONENT */ +@import "../component/login/login"; +@import "../component/signup/signup"; +@import "../component/player-info/player-info"; +/* @import "lib/base/reset"; */ diff --git a/app/view/home/home-controller.js b/app/view/home/home-controller.js new file mode 100644 index 00000000..dd9d54bf --- /dev/null +++ b/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'); +} diff --git a/app/view/landing/_landing.scss b/app/view/landing/_landing.scss new file mode 100644 index 00000000..e69de29b diff --git a/app/view/landing/landing-controller.js b/app/view/landing/landing-controller.js new file mode 100644 index 00000000..ad4e3b7e --- /dev/null +++ b/app/view/landing/landing-controller.js @@ -0,0 +1,10 @@ +'use strict'; + +require('./_landing.scss'); + +module.exports = ['$log', '$location', '$rootScope', 'authService', LandingController]; + +function LandingController($log, $location, authService) { + let url = $location.url(); + this.showSignup = url === '/join#signup' || url === '/join'; +} diff --git a/app/view/landing/landing.html b/app/view/landing/landing.html new file mode 100644 index 00000000..c92448ac --- /dev/null +++ b/app/view/landing/landing.html @@ -0,0 +1,25 @@ +
+
+
+ +

already a member?

+ + sign in here. + +
+
+ +
+
+ +

want to sign up?

+ + sign up here. + +
+
+
diff --git a/gulpfile.js b/gulpfile.js new file mode 100644 index 00000000..365d83da --- /dev/null +++ b/gulpfile.js @@ -0,0 +1,23 @@ +'use strict'; + +const gulp = require('gulp'); +const eslint = require('gulp-eslint'); +const mocha = require ('gulp-mocha'); + +gulp.task('test', function(){ + gulp.src('./test/*-test.js', { read: false}) + .pipe(mocha({ reporter: 'spec'})); +}); + +gulp.task('lint', function() { + return gulp.src(['**/*.js', '!node_modules']) + .pipe(eslint()) + .pipe(eslint.format()) + .pipe(eslint.failAfterError()); +}); + +gulp.task('dev', function(){ + gulp.watch(['**/*.js', '!node_modules/**'], ['lint', 'test']); +}); + +gulp.task('default', ['dev']); \ No newline at end of file diff --git a/karma.conf.js b/karma.conf.js new file mode 100644 index 00000000..58de3786 --- /dev/null +++ b/karma.conf.js @@ -0,0 +1,25 @@ +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, + }); +}; diff --git a/package.json b/package.json new file mode 100644 index 00000000..f74499c9 --- /dev/null +++ b/package.json @@ -0,0 +1,61 @@ +{ + "name": "25-angular_auth", + "version": "1.0.0", + "description": "![cf](https://i.imgur.com/7v5ASc8.png) Lab 25 - Client Side Auth ======", + "scripts": { + "build": "./node_modules/webpack/bin/webpack.js", + "watch": "./node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot", + "lint": "./node_modules/eslint/lib/eslint.js ." + }, + "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", + "angular-mocks": "^1.6.3", + "eslint": "^3.18.0", + "jasmine-core": "^2.5.2", + "karma": "^1.5.0", + "karma-jasmine": "^1.1.0", + "karma-mocha-reporter": "^2.2.3", + "karma-phantomjs-launcher": "^1.0.4", + "karma-webpack": "^2.0.3" +}, + "repository": { + "type": "git", + "url": "git+https://github.com/jtwalters25/25-angular_auth.git" + }, + "keywords": [], + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/jtwalters25/25-angular_auth/issues" + }, + "homepage": "https://github.com/jtwalters25/25-angular_auth#readme" +} diff --git a/webpack.config.js b/webpack.config.js new file mode 100644 index 00000000..f0f9a59e --- /dev/null +++ b/webpack.config.js @@ -0,0 +1,44 @@ +'use strict'; + +require('dotenv').load(); + +const webpack = require('webpack'); +const HTMLPlugin = require('html-webpack-plugin'); +const ExtractTextPlugin = require('extract-text-webpack-plugin'); + +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'), + // webpack constant env varible used for our app + new webpack.DefinePlugin({ + __API_URL__: JSON.stringify(process.env.API_URL) + }) + // API_URL is for our backend + ], + module: { + rules: [ + { + test: /\.js$/, + exclude: /node_modules/, + loader: 'babel-loader' + }, + { + test: /\.html$/, + loader: 'html-loader' + }, + { + test: /\.scss$/, + loader: ExtractTextPlugin.extract(['css-loader', 'sass-loader']) + } + ] + } +}; From f10f716b240fe121bdc5de15d8b1959eda87c8a3 Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Tue, 28 Mar 2017 23:43:53 -0700 Subject: [PATCH 06/31] main.scss --- app/scss/lib/base/_reset.scss | 48 ++++++++++++++++++++++++++++++++ app/scss/lib/layout/_footer.scss | 3 ++ app/scss/lib/layout/_header.scss | 3 ++ app/scss/{lib => }/main.scss | 0 4 files changed, 54 insertions(+) rename app/scss/{lib => }/main.scss (100%) diff --git a/app/scss/lib/base/_reset.scss b/app/scss/lib/base/_reset.scss index e69de29b..ed11813c 100644 --- a/app/scss/lib/base/_reset.scss +++ b/app/scss/lib/base/_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/app/scss/lib/layout/_footer.scss b/app/scss/lib/layout/_footer.scss index e69de29b..6f19c13a 100644 --- a/app/scss/lib/layout/_footer.scss +++ b/app/scss/lib/layout/_footer.scss @@ -0,0 +1,3 @@ +footer{ + +} diff --git a/app/scss/lib/layout/_header.scss b/app/scss/lib/layout/_header.scss index e69de29b..8ee8bc29 100644 --- a/app/scss/lib/layout/_header.scss +++ b/app/scss/lib/layout/_header.scss @@ -0,0 +1,3 @@ +header{ + +} diff --git a/app/scss/lib/main.scss b/app/scss/main.scss similarity index 100% rename from app/scss/lib/main.scss rename to app/scss/main.scss From 5c29d3ec5edf44613966150f3688bfaeb7105b1e Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Tue, 28 Mar 2017 23:54:47 -0700 Subject: [PATCH 07/31] css work --- app/entry.js | 2 +- app/scss/lib/base/_base.scss | 17 +++++++++++++++++ app/scss/lib/theme/_vars.scss | 14 ++++++++++++++ app/scss/main.scss | 8 +++----- 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/app/entry.js b/app/entry.js index 0820f262..2617d508 100644 --- a/app/entry.js +++ b/app/entry.js @@ -1,6 +1,6 @@ 'use stirct'; -require('./scss/lib/main.scss'); +require('./scss/main.scss'); const path = require('path'); const angular = require('angular'); diff --git a/app/scss/lib/base/_base.scss b/app/scss/lib/base/_base.scss index e69de29b..a037547e 100644 --- a/app/scss/lib/base/_base.scss +++ b/app/scss/lib/base/_base.scss @@ -0,0 +1,17 @@ +@import '../theme/vars'; + +body{ + background-color: $primarycolor; + font-size: 2.5vw; + font-family: times; + color: $secondarycolor; +} + +a{ + text-decoration: none; + color: navy; + + &hover{ + color:white; + } +} diff --git a/app/scss/lib/theme/_vars.scss b/app/scss/lib/theme/_vars.scss index e69de29b..24bbefdd 100644 --- a/app/scss/lib/theme/_vars.scss +++ b/app/scss/lib/theme/_vars.scss @@ -0,0 +1,14 @@ +//:::: COLORS :::: +$primarycolor: rgb(107, 19, 23); +$secondarycolor: #ccc; +$black: #000; +$white: #fff; + +//:::: LAYOUT :::: +$gutter-std: 5%; +$gutter-sm: $gutter-std / 2; + + +//:::: ELEMENTS :::: +$border-radius: 3px; +$input-padding: 2%; diff --git a/app/scss/main.scss b/app/scss/main.scss index 0c8fa713..d12132e2 100644 --- a/app/scss/main.scss +++ b/app/scss/main.scss @@ -1,6 +1,3 @@ -body{ - background-color: maroon; -} /* BASE */ @import "lib/base/reset"; @@ -13,5 +10,6 @@ body{ /* COMPONENT */ @import "../component/login/login"; @import "../component/signup/signup"; -@import "../component/player-info/player-info"; -/* @import "lib/base/reset"; */ + +/* VIEW */ +@import "../view/landing/landing"; From 889483aeab43fed2ff210f8befb2e478bfef9bf1 Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Wed, 29 Mar 2017 13:47:05 -0700 Subject: [PATCH 08/31] working on scss --- app/component/signup/_signup.scss | 13 +++++++++++++ app/index.html | 14 +++++++++++--- app/scss/lib/base/_base.scss | 13 ++++++++++++- 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/app/component/signup/_signup.scss b/app/component/signup/_signup.scss index e69de29b..dd23ca32 100644 --- a/app/component/signup/_signup.scss +++ b/app/component/signup/_signup.scss @@ -0,0 +1,13 @@ +@import '../../scss/lib/theme/vars'; + +.signup{ + margin: $gutter-std; + height: 85%; + width: 80%; + border: solid 2px yellow; +} + +input-std{ + text-align: center; + width:60%; +} diff --git a/app/index.html b/app/index.html index 9c8f91c7..2d2c3842 100644 --- a/app/index.html +++ b/app/index.html @@ -3,10 +3,18 @@ - + CF-GRAM - +
+
+ +
+ +
+
-
diff --git a/app/scss/lib/base/_base.scss b/app/scss/lib/base/_base.scss index a037547e..ee018d7d 100644 --- a/app/scss/lib/base/_base.scss +++ b/app/scss/lib/base/_base.scss @@ -1,10 +1,11 @@ @import '../theme/vars'; body{ - background-color: $primarycolor; + background-color: $secondarycolor; font-size: 2.5vw; font-family: times; color: $secondarycolor; + display: relative; } a{ @@ -15,3 +16,13 @@ a{ color:white; } } + +.signup-form{ + margin: 15px; + height:400px; + width: 50%; +} +main{ + background-color: $primarycolor; + margin: $gutter-std; +} From f811cb4fb48b34680e73d8c0640a6863c36cadaf Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Wed, 29 Mar 2017 15:17:49 -0700 Subject: [PATCH 09/31] scss wireframe --- app/component/signup/_signup.scss | 10 ++++- app/component/signup/signup.html | 1 + app/index.html | 2 +- app/scss/lib/base/_base.scss | 70 ++++++++++++++++++++++++++++++- app/scss/lib/layout/_content.scss | 6 +++ app/scss/lib/theme/_vars.scss | 4 +- app/view/landing/_landing.scss | 6 +++ 7 files changed, 94 insertions(+), 5 deletions(-) diff --git a/app/component/signup/_signup.scss b/app/component/signup/_signup.scss index dd23ca32..0523efbd 100644 --- a/app/component/signup/_signup.scss +++ b/app/component/signup/_signup.scss @@ -4,10 +4,18 @@ margin: $gutter-std; height: 85%; width: 80%; - border: solid 2px yellow; + + + h2{ + float: left; + font-size: 2vw; + margin-bottom: 0px; + margin-left:20px; + } } input-std{ text-align: center; width:60%; + height:10%; } diff --git a/app/component/signup/signup.html b/app/component/signup/signup.html index ea9fe413..7a0d1a9d 100644 --- a/app/component/signup/signup.html +++ b/app/component/signup/signup.html @@ -1,4 +1,5 @@ diff --git a/app/component/navbar/_navbar.scss b/app/component/navbar/_navbar.scss index 72a67d72..ed8fba94 100644 --- a/app/component/navbar/_navbar.scss +++ b/app/component/navbar/_navbar.scss @@ -1 +1,19 @@ -@import '../../../scss/lib/theme/vars'; +@import '../../scss/lib/theme/vars'; + +.navbar { + background-color: $secondarycolor; + color: $white; + height:90px; + img{ + height: 70px; + width: auto; + margin: 1%; + display: inline-block; + vertical-align: middle; + } + h1{ + display: inline-block; + font-size: 2vw; + vertical-align: middle; + } +} diff --git a/app/component/navbar/navbar.html b/app/component/navbar/navbar.html index 12fe3bc7..2ada27d8 100644 --- a/app/component/navbar/navbar.html +++ b/app/component/navbar/navbar.html @@ -1,6 +1,6 @@
-

cfgram

- + +

CF-GRAM

diff --git a/app/scss/lib/base/_base.scss b/app/scss/lib/base/_base.scss index f6744e89..2f180499 100644 --- a/app/scss/lib/base/_base.scss +++ b/app/scss/lib/base/_base.scss @@ -13,23 +13,7 @@ body{ .clearfix{ clear: both; } - nav { - background-color: $secondarycolor; - color: $white; - height:90px; - img{ - height: 70px; - width: auto; - margin: $gutter-std/2 $gutter-std; - display: inline-block; - vertical-align: middle; - } - h1{ - display: inline-block; - font-size: 2vw; - vertical-align: middle; - } - } + main { margin:$gutter-std; } diff --git a/app/scss/main.scss b/app/scss/main.scss index c82a7163..7678a85a 100644 --- a/app/scss/main.scss +++ b/app/scss/main.scss @@ -1,4 +1,5 @@ - +/* THEME */ +@import "lib/theme/vars"; /* BASE */ @import "lib/base/reset"; @import "lib/base/base"; @@ -12,6 +13,10 @@ @import "../component/landing/signup/signup"; @import "../component/navbar/navbar"; +@import "../component/gallery/create-gallery/create-gallery"; +@import "../component/gallery/edit-gallery/edit-gallery"; +@import "../component/gallery/gallery-item/gallery-item"; + /* VIEW */ @import "../view/landing/landing"; @import "../view/home/home"; diff --git a/app/service/auth-service.js b/app/service/auth-service.js index 9ea749bc..b5d23276 100644 --- a/app/service/auth-service.js +++ b/app/service/auth-service.js @@ -62,7 +62,7 @@ function authService($q, $log, $http, $window) { Authorization: `Basic ${base64}` } }; - return $http.get(url,config) + return $http.get(url, config) .then( res => { $log.log('success', res.data); return setToken(res.data); diff --git a/app/view/home/_home.scss b/app/view/home/_home.scss index 72a67d72..e9d8919b 100644 --- a/app/view/home/_home.scss +++ b/app/view/home/_home.scss @@ -1 +1 @@ -@import '../../../scss/lib/theme/vars'; +@import '../../scss/lib/theme/vars'; diff --git a/app/view/home/home-controller.js b/app/view/home/home-controller.js index dd9d54bf..1eb57771 100644 --- a/app/view/home/home-controller.js +++ b/app/view/home/home-controller.js @@ -4,6 +4,21 @@ require('./_home.scss'); module.exports = ['$log', HomeController]; -function HomeController($log) { +function HomeController($log, $rootScope, galleryService) { $log.debug('HomeController'); + + this.galleries = []; + + this.fetchGalleries = function() { + galleryService.fetchGalleries() + .then( galleries => { + this.galleries = galleries; + }); + }; + + this.fetchGalleries(); + + $rootScope.$on('$locationChangeSuccess', () => { + this.fetchGalleries(); + }); } diff --git a/app/view/landing/_landing.scss b/app/view/landing/_landing.scss index 632cfb5d..8c3b50a5 100644 --- a/app/view/landing/_landing.scss +++ b/app/view/landing/_landing.scss @@ -1,4 +1,4 @@ -@import '../../../scss/lib/theme/vars'; +@import '../../scss/lib/theme/vars'; .join-container{ text-align: right; From 9a020306aa6e4f644c7363ae66091846931e359f Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Fri, 31 Mar 2017 17:53:16 -0700 Subject: [PATCH 18/31] css almost finished. --- .../create-gallery/_create-gallery.scss | 5 ++++ .../create-gallery/create-gallery.html | 10 ++++---- .../gallery/edit-gallery/edit-gallery.html | 2 +- .../gallery/edit-gallery/edit-gallery.js | 1 + .../gallery/gallery-item/_gallery-item.scss | 14 +++++++++++ .../gallery/gallery-item/gallery-item.html | 13 +++++----- app/component/navbar/_navbar.scss | 4 +++ app/scss/lib/base/_base.scss | 25 ++++++++++++++++--- app/scss/lib/layout/_footer.scss | 2 +- app/service/auth-service.js | 13 +++++++++- app/service/gallery-service.js | 8 +++--- app/view/home/home-controller.js | 2 +- app/view/home/home.html | 8 +++++- 13 files changed, 84 insertions(+), 23 deletions(-) diff --git a/app/component/gallery/create-gallery/_create-gallery.scss b/app/component/gallery/create-gallery/_create-gallery.scss index 72a67d72..05cd87de 100644 --- a/app/component/gallery/create-gallery/_create-gallery.scss +++ b/app/component/gallery/create-gallery/_create-gallery.scss @@ -1 +1,6 @@ @import '../../../scss/lib/theme/vars'; + +h3{ + font-size: 2vw; + color:rgb(93, 93, 93); +} diff --git a/app/component/gallery/create-gallery/create-gallery.html b/app/component/gallery/create-gallery/create-gallery.html index 871018aa..80644a00 100644 --- a/app/component/gallery/create-gallery/create-gallery.html +++ b/app/component/gallery/create-gallery/create-gallery.html @@ -2,16 +2,16 @@
- +

Create a New Gallery

- - +
- - +
diff --git a/app/component/gallery/edit-gallery/edit-gallery.html b/app/component/gallery/edit-gallery/edit-gallery.html index 3aa50bf2..71dd3609 100644 --- a/app/component/gallery/edit-gallery/edit-gallery.html +++ b/app/component/gallery/edit-gallery/edit-gallery.html @@ -15,7 +15,7 @@ ng-model="editGalleryCtrl.gallery.desc" required> - +
diff --git a/app/component/gallery/edit-gallery/edit-gallery.js b/app/component/gallery/edit-gallery/edit-gallery.js index 8558e121..a0adfd8c 100644 --- a/app/component/gallery/edit-gallery/edit-gallery.js +++ b/app/component/gallery/edit-gallery/edit-gallery.js @@ -15,6 +15,7 @@ function EditGalleryController($log, galleryService){ $log.debug('EditGalleryController'); this.updateGallery = function(){ + $log.debug('EditGalleryController.updateGallery'); galleryService.updateGallery(this.gallery._id, this.gallery); }; } diff --git a/app/component/gallery/gallery-item/_gallery-item.scss b/app/component/gallery/gallery-item/_gallery-item.scss index 72a67d72..efbf9297 100644 --- a/app/component/gallery/gallery-item/_gallery-item.scss +++ b/app/component/gallery/gallery-item/_gallery-item.scss @@ -1 +1,15 @@ @import '../../../scss/lib/theme/vars'; + +.current-item{ + background-color:grey; + padding:20px; + margin-top:30px; + margin-bottom:30px; + border-radius: 10px 10px 10px; +} + +h3{ + font-size: 2vw; + color:rgb(34, 33, 33); + padding: 30px; +} diff --git a/app/component/gallery/gallery-item/gallery-item.html b/app/component/gallery/gallery-item/gallery-item.html index 76bf190a..b6a7f1d8 100644 --- a/app/component/gallery/gallery-item/gallery-item.html +++ b/app/component/gallery/gallery-item/gallery-item.html @@ -1,11 +1,11 @@
  • - name: - {{ galleryItemCtrl.gallery.name }} +

    name:

     + <{{ galleryItemCtrl.gallery.name }}
    - description: +

    description:

     {{ galleryItemCtrl.gallery.desc }}
    @@ -13,8 +13,9 @@ - edit - - delete + + + +
    • diff --git a/app/component/navbar/_navbar.scss b/app/component/navbar/_navbar.scss index ed8fba94..2c506f67 100644 --- a/app/component/navbar/_navbar.scss +++ b/app/component/navbar/_navbar.scss @@ -16,4 +16,8 @@ font-size: 2vw; vertical-align: middle; } + button{ + margin-top: -85px; + + } } diff --git a/app/scss/lib/base/_base.scss b/app/scss/lib/base/_base.scss index 2f180499..c22c1ddd 100644 --- a/app/scss/lib/base/_base.scss +++ b/app/scss/lib/base/_base.scss @@ -26,7 +26,7 @@ body{ border: 1px solid grey; margin: $gutter-std /2; margin-left: 2%; - font-size: 16px; + font-size: 25px; text-align: left; height: 60px; padding:5px; @@ -38,15 +38,34 @@ body{ padding: 0 $gutter-std*2.5; background-color: $secondarycolor; color: $white; - font-weight: 300; + font-size: x-large; + font-weight: lighter; + height:70px; float:right; - margin-right:-20px; + margin-right:0px; + border-radius: 10px 10px 10px } + .delete-btn-std{ + + width: unset; + padding: 0 $gutter-std*2.5; + background-color: $primarycolor / 2; + color: $black; + font-size: x-large; + font-weight: lighter; + height:70px; + float:right; + margin-right:0px; + border-radius: 10px 10px 10px + } + + footer{ background-color: grey; height:70px; width: 100%; + margin-top: 400px; // position: absolute; // bottom: 0px; } diff --git a/app/scss/lib/layout/_footer.scss b/app/scss/lib/layout/_footer.scss index 6f19c13a..c5311f9d 100644 --- a/app/scss/lib/layout/_footer.scss +++ b/app/scss/lib/layout/_footer.scss @@ -1,3 +1,3 @@ footer{ - + } diff --git a/app/service/auth-service.js b/app/service/auth-service.js index b5d23276..e0dbfa87 100644 --- a/app/service/auth-service.js +++ b/app/service/auth-service.js @@ -20,10 +20,21 @@ function authService($q, $log, $http, $window) { 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 = `${__ARP_URL__}/api/signup`; + let url = `${__API_URL__}/api/signup`; let config = { headers: { 'Content-Type': 'application/json', diff --git a/app/service/gallery-service.js b/app/service/gallery-service.js index d7a67ef7..8043f6ea 100644 --- a/app/service/gallery-service.js +++ b/app/service/gallery-service.js @@ -89,8 +89,8 @@ function galleryService($q, $log, $http, authService) { }); }; - service.updateGalleries = function (galleryID, galleryData) { - $log.debug('galleryService.updateGalleries'); + service.updateGallery = function (galleryID, galleryData) { + $log.debug('galleryService.updateGallery'); return authService.getToken() .then( token => { @@ -129,7 +129,7 @@ function galleryService($q, $log, $http, authService) { let url = `${__API_URL__}/api/gallery/${galleryID}`; let config = { headers: { - Authorization: `Beare ${token}` + Authorization: `Bearer ${token}` } }; @@ -139,7 +139,7 @@ function galleryService($q, $log, $http, authService) { for (let i=0; i -

    welcome home!

    + + +
      +

      Galleries

      + +
    From 0d7196f53bf7716eb1529c99ac1a952a63ba4e22 Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Fri, 31 Mar 2017 18:03:08 -0700 Subject: [PATCH 19/31] spacing with multiple galleries adjusted --- app/component/gallery/gallery-item/_gallery-item.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/component/gallery/gallery-item/_gallery-item.scss b/app/component/gallery/gallery-item/_gallery-item.scss index efbf9297..2eec2e1a 100644 --- a/app/component/gallery/gallery-item/_gallery-item.scss +++ b/app/component/gallery/gallery-item/_gallery-item.scss @@ -3,7 +3,7 @@ .current-item{ background-color:grey; padding:20px; - margin-top:30px; + margin-top:120px; margin-bottom:30px; border-radius: 10px 10px 10px; } From 362e41c000e58a11f0ac4c50aedec2da1d0cfad6 Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Mon, 3 Apr 2017 09:49:46 -0700 Subject: [PATCH 20/31] login functionality fixed --- app/component/gallery/gallery-item/_gallery-item.scss | 6 ++++++ app/component/gallery/gallery-item/gallery-item.html | 6 +++--- app/component/landing/login/login.js | 5 ++++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/app/component/gallery/gallery-item/_gallery-item.scss b/app/component/gallery/gallery-item/_gallery-item.scss index 2eec2e1a..9d63f0b0 100644 --- a/app/component/gallery/gallery-item/_gallery-item.scss +++ b/app/component/gallery/gallery-item/_gallery-item.scss @@ -6,6 +6,12 @@ margin-top:120px; margin-bottom:30px; border-radius: 10px 10px 10px; + + .item-label{ + font-size: 2vw; + color:rgb(57, 56, 56); + + } } h3{ diff --git a/app/component/gallery/gallery-item/gallery-item.html b/app/component/gallery/gallery-item/gallery-item.html index b6a7f1d8..06bec505 100644 --- a/app/component/gallery/gallery-item/gallery-item.html +++ b/app/component/gallery/gallery-item/gallery-item.html @@ -1,11 +1,11 @@
  • -

    name:

     - <{{ galleryItemCtrl.gallery.name }} + name: + {{ galleryItemCtrl.gallery.name }}
    -

    description:

     + description: {{ galleryItemCtrl.gallery.desc }}
    diff --git a/app/component/landing/login/login.js b/app/component/landing/login/login.js index 58ecb75f..45cf7ae6 100644 --- a/app/component/landing/login/login.js +++ b/app/component/landing/login/login.js @@ -17,6 +17,9 @@ function LoginController($log, $location, authService){ this.login = function(){ $log.debug('loginCtrl.login'); - + authService.login(this.user) + .then( () => { + $location.url('/home'); + }); }; } From 2c6f03dc5b8c021c3af0f5a1eafa724f24af9cda Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Mon, 3 Apr 2017 10:44:02 -0700 Subject: [PATCH 21/31] logout and delete buttons styled --- .../gallery/gallery-item/_gallery-item.scss | 22 +++++++++++++++++-- app/component/navbar/_navbar.scss | 13 +++++++++++ app/component/navbar/navbar.html | 2 +- app/scss/lib/base/_base.scss | 15 ------------- 4 files changed, 34 insertions(+), 18 deletions(-) diff --git a/app/component/gallery/gallery-item/_gallery-item.scss b/app/component/gallery/gallery-item/_gallery-item.scss index 9d63f0b0..258c9a23 100644 --- a/app/component/gallery/gallery-item/_gallery-item.scss +++ b/app/component/gallery/gallery-item/_gallery-item.scss @@ -4,13 +4,17 @@ background-color:grey; padding:20px; margin-top:120px; + margin-left:30px; margin-bottom:30px; border-radius: 10px 10px 10px; .item-label{ - font-size: 2vw; - color:rgb(57, 56, 56); + font-size: 3.5vw; + color:rgb(57, 56, 56); + span:first-child { + font-weight: bold; + } } } @@ -19,3 +23,17 @@ h3{ color:rgb(34, 33, 33); padding: 30px; } + +.delete-btn-std{ + +width: unset; +padding: 0 $gutter-std*2.5; +background-color: $primarycolor / 1.2; +color: $black; +font-size: x-large; +font-weight: lighter; +height:70px; +float:right; +margin-right:0px; +border-radius: 10px 10px 10px +} diff --git a/app/component/navbar/_navbar.scss b/app/component/navbar/_navbar.scss index 2c506f67..0953cde6 100644 --- a/app/component/navbar/_navbar.scss +++ b/app/component/navbar/_navbar.scss @@ -21,3 +21,16 @@ } } +.logout-btn-std{ + + width: unset; + padding: 0 $gutter-std*2.5; + background-color: rgb(194, 195, 198); + color: $black; + font-size: x-large; + font-weight: lighter; + height:70px; + float:right; + margin-right:0px; + border-radius: 10px 10px 10px +} diff --git a/app/component/navbar/navbar.html b/app/component/navbar/navbar.html index 2ada27d8..a5bcfe6b 100644 --- a/app/component/navbar/navbar.html +++ b/app/component/navbar/navbar.html @@ -3,7 +3,7 @@

    CF-GRAM

    diff --git a/app/scss/lib/base/_base.scss b/app/scss/lib/base/_base.scss index c22c1ddd..a93ccd26 100644 --- a/app/scss/lib/base/_base.scss +++ b/app/scss/lib/base/_base.scss @@ -46,21 +46,6 @@ body{ border-radius: 10px 10px 10px } - .delete-btn-std{ - - width: unset; - padding: 0 $gutter-std*2.5; - background-color: $primarycolor / 2; - color: $black; - font-size: x-large; - font-weight: lighter; - height:70px; - float:right; - margin-right:0px; - border-radius: 10px 10px 10px - } - - footer{ background-color: grey; height:70px; From a79de7abdec0f29c29e075310c7b595acf9ba3ef Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Mon, 3 Apr 2017 11:34:32 -0700 Subject: [PATCH 22/31] edited edit-gallery --- app/component/gallery/edit-gallery/edit-gallery.html | 9 +++++---- app/component/gallery/gallery-item/_gallery-item.scss | 3 --- app/component/navbar/_navbar.scss | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/component/gallery/edit-gallery/edit-gallery.html b/app/component/gallery/edit-gallery/edit-gallery.html index 71dd3609..43fc6cc5 100644 --- a/app/component/gallery/edit-gallery/edit-gallery.html +++ b/app/component/gallery/edit-gallery/edit-gallery.html @@ -5,13 +5,14 @@ novalidate=>
    - name: - + +
    - description - +
    diff --git a/app/component/gallery/gallery-item/_gallery-item.scss b/app/component/gallery/gallery-item/_gallery-item.scss index 258c9a23..ce77a0b9 100644 --- a/app/component/gallery/gallery-item/_gallery-item.scss +++ b/app/component/gallery/gallery-item/_gallery-item.scss @@ -12,9 +12,6 @@ font-size: 3.5vw; color:rgb(57, 56, 56); - span:first-child { - font-weight: bold; - } } } diff --git a/app/component/navbar/_navbar.scss b/app/component/navbar/_navbar.scss index 0953cde6..894e1dc3 100644 --- a/app/component/navbar/_navbar.scss +++ b/app/component/navbar/_navbar.scss @@ -29,7 +29,7 @@ color: $black; font-size: x-large; font-weight: lighter; - height:70px; + height:50px; float:right; margin-right:0px; border-radius: 10px 10px 10px From d03273ef533d0f5bfcec1cbcdd8730753bf6da53 Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Mon, 3 Apr 2017 23:54:07 -0700 Subject: [PATCH 23/31] picture upload not quite working --- .../create-gallery/create-gallery.html | 2 +- .../gallery/gallery-item/_gallery-item.scss | 2 +- .../gallery/gallery-item/gallery-item.html | 1 + .../_thumbnail-container.scss | 0 .../thumbnail-container.html | 8 ++++ .../thumbnail-container.js | 11 +++++ .../gallery/thumbnail/_thumbnail.scss | 0 .../gallery/thumbnail/thumbnail.html | 4 ++ app/component/gallery/thumbnail/thumbnail.js | 23 ++++++++++ .../gallery/upload-pic/_upload-pic.scss | 0 .../gallery/upload-pic/upload-pic.html | 23 ++++++++++ .../gallery/upload-pic/upload-pic.js | 27 ++++++++++++ app/entry.js | 4 +- app/service/pic-service.js | 43 +++++++++++++++++++ app/view/home/home-controller.js | 5 +++ app/view/home/home.html | 8 +++- package.json | 1 + 17 files changed, 156 insertions(+), 6 deletions(-) create mode 100644 app/component/gallery/thumbnail-container/_thumbnail-container.scss create mode 100644 app/component/gallery/thumbnail-container/thumbnail-container.html create mode 100644 app/component/gallery/thumbnail-container/thumbnail-container.js create mode 100644 app/component/gallery/thumbnail/_thumbnail.scss create mode 100644 app/component/gallery/thumbnail/thumbnail.html create mode 100644 app/component/gallery/thumbnail/thumbnail.js create mode 100644 app/component/gallery/upload-pic/_upload-pic.scss create mode 100644 app/component/gallery/upload-pic/upload-pic.html create mode 100644 app/component/gallery/upload-pic/upload-pic.js create mode 100644 app/service/pic-service.js diff --git a/app/component/gallery/create-gallery/create-gallery.html b/app/component/gallery/create-gallery/create-gallery.html index 80644a00..4474298b 100644 --- a/app/component/gallery/create-gallery/create-gallery.html +++ b/app/component/gallery/create-gallery/create-gallery.html @@ -15,6 +15,6 @@

    Create a New Gallery

    ng-model="createGalleryCtrl.gallery.desc" required> - + diff --git a/app/component/gallery/gallery-item/_gallery-item.scss b/app/component/gallery/gallery-item/_gallery-item.scss index ce77a0b9..1e6a7b1c 100644 --- a/app/component/gallery/gallery-item/_gallery-item.scss +++ b/app/component/gallery/gallery-item/_gallery-item.scss @@ -16,7 +16,7 @@ } h3{ - font-size: 2vw; + font-size: 4vw; color:rgb(34, 33, 33); padding: 30px; } diff --git a/app/component/gallery/gallery-item/gallery-item.html b/app/component/gallery/gallery-item/gallery-item.html index 06bec505..06d3ae25 100644 --- a/app/component/gallery/gallery-item/gallery-item.html +++ b/app/component/gallery/gallery-item/gallery-item.html @@ -1,5 +1,6 @@
  • +
    name: {{ galleryItemCtrl.gallery.name }} diff --git a/app/component/gallery/thumbnail-container/_thumbnail-container.scss b/app/component/gallery/thumbnail-container/_thumbnail-container.scss new file mode 100644 index 00000000..e69de29b diff --git a/app/component/gallery/thumbnail-container/thumbnail-container.html b/app/component/gallery/thumbnail-container/thumbnail-container.html new file mode 100644 index 00000000..df0a6be3 --- /dev/null +++ b/app/component/gallery/thumbnail-container/thumbnail-container.html @@ -0,0 +1,8 @@ +
    +

    {{ thumbnailContainerCtrl.gallery }}

    + + +
    + +
    +
    diff --git a/app/component/gallery/thumbnail-container/thumbnail-container.js b/app/component/gallery/thumbnail-container/thumbnail-container.js new file mode 100644 index 00000000..6a1ef3ae --- /dev/null +++ b/app/component/gallery/thumbnail-container/thumbnail-container.js @@ -0,0 +1,11 @@ +'use strict'; + +require('./_thumbnail-container.scss'); + +module.exports = { + template: require('./thumbnail-container.html'), + controllerAS: 'thumbnailContainerCtrl', + bindings: { + gallery: '<' + } +}; diff --git a/app/component/gallery/thumbnail/_thumbnail.scss b/app/component/gallery/thumbnail/_thumbnail.scss new file mode 100644 index 00000000..e69de29b diff --git a/app/component/gallery/thumbnail/thumbnail.html b/app/component/gallery/thumbnail/thumbnail.html new file mode 100644 index 00000000..685c175e --- /dev/null +++ b/app/component/gallery/thumbnail/thumbnail.html @@ -0,0 +1,4 @@ +
    + {{ thumbnailCtrl.pic.desc }} + Delete +
    diff --git a/app/component/gallery/thumbnail/thumbnail.js b/app/component/gallery/thumbnail/thumbnail.js new file mode 100644 index 00000000..1d188bee --- /dev/null +++ b/app/component/gallery/thumbnail/thumbnail.js @@ -0,0 +1,23 @@ + +'use strict'; + +require('./_thumbnail.scss'); + +module.exports = { + template: require('./thumbnail.html'), + controller: ['$log', 'picService', ThumbnailController], + controllerAs: 'thumbnailCtrl', + bindings: { + pic: '<' + } +}; + +function ThumbnailController($log) { + $log.debug('ThumbnailController'); + + this.deletePic = function() { + $log.debug('thumbnailCtrl.deletePic'); + }; + + +} diff --git a/app/component/gallery/upload-pic/_upload-pic.scss b/app/component/gallery/upload-pic/_upload-pic.scss new file mode 100644 index 00000000..e69de29b diff --git a/app/component/gallery/upload-pic/upload-pic.html b/app/component/gallery/upload-pic/upload-pic.html new file mode 100644 index 00000000..a8e5c864 --- /dev/null +++ b/app/component/gallery/upload-pic/upload-pic.html @@ -0,0 +1,23 @@ +
    +
    + +

    upload a new pic

    + +
    + + +
    + +
    + + + +
    +
    +
    diff --git a/app/component/gallery/upload-pic/upload-pic.js b/app/component/gallery/upload-pic/upload-pic.js new file mode 100644 index 00000000..6a950f16 --- /dev/null +++ b/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; + }); + }; +} diff --git a/app/entry.js b/app/entry.js index 2617d508..3fcb6eca 100644 --- a/app/entry.js +++ b/app/entry.js @@ -9,11 +9,11 @@ const pascalcase = require('pascalcase'); const uiRouter = require('angular-ui-router'); const ngTouch = require('angular-touch'); const ngAnimate = require('angular-animate'); +const ngFileUpload = require('ng-file-upload'); -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 => { cfgram.config(context(key)); }); diff --git a/app/service/pic-service.js b/app/service/pic-service.js new file mode 100644 index 00000000..b8f60025 --- /dev/null +++ b/app/service/pic-service.js @@ -0,0 +1,43 @@ +'use strict'; + +module.exports = ['$q', '$log', '$http', 'Upload', 'authService', picService]; + +function picService($q, $log, $http, Upload, authService) { + $log.debug('picService'); + + let service = {}; + + service.uploadGalleryPic = function(galleryData, picData) { + $log.debug('service.uploadGalleryPic'); + + return authService.getToken() + .then( token => { + let url = `${__API_URL__}/api/gallery/${galleryData._id}/pic`; + let headers = { + Authorization: `Bearer ${token}`, + Accept: 'application/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 => { + $log.error(err.message); + return $q.reject(err); + }); + }; + + return service; +} diff --git a/app/view/home/home-controller.js b/app/view/home/home-controller.js index 4640d170..a3e805c3 100644 --- a/app/view/home/home-controller.js +++ b/app/view/home/home-controller.js @@ -16,6 +16,11 @@ function HomeController($log, $rootScope, galleryService) { }); }; + this.galleryDeleteDone = function(gallery){ + if (this.currentGallery._id === gallery._id){ + this.currentGallery = null; + } + }; this.fetchGalleries(); $rootScope.$on('$locationChangeSuccess', () => { diff --git a/app/view/home/home.html b/app/view/home/home.html index 65009f00..4794d0ef 100644 --- a/app/view/home/home.html +++ b/app/view/home/home.html @@ -1,9 +1,13 @@
    - +

      Galleries

      + gallery="item" + delete-done="homeCtrl.galleryDeleteDone(galleryData)" + ng-click="homeCtrl.currentGallery = item">
    + +
    diff --git a/package.json b/package.json index f74499c9..e0c7ef1c 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,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", From f03f4cdf207063bd94f763819930df009d384b33 Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Tue, 4 Apr 2017 14:55:07 -0700 Subject: [PATCH 24/31] upload and delete working --- .../thumbnail-container.html | 4 +- .../thumbnail-container.js | 2 +- .../gallery/thumbnail/thumbnail.html | 2 +- app/component/gallery/thumbnail/thumbnail.js | 7 ++- .../gallery/upload-pic/upload-pic.html | 2 +- app/service/pic-service.js | 32 ++++++++++++- app/view/home/home.html | 4 +- karma.conf.js | 10 +++-- package.json | 7 ++- test/auth-service-test.js | 30 +++++++++++++ test/gallery-service-test.js | 45 +++++++++++++++++++ 11 files changed, 130 insertions(+), 15 deletions(-) create mode 100644 test/auth-service-test.js create mode 100644 test/gallery-service-test.js diff --git a/app/component/gallery/thumbnail-container/thumbnail-container.html b/app/component/gallery/thumbnail-container/thumbnail-container.html index df0a6be3..1c76e114 100644 --- a/app/component/gallery/thumbnail-container/thumbnail-container.html +++ b/app/component/gallery/thumbnail-container/thumbnail-container.html @@ -1,8 +1,8 @@
    -

    {{ thumbnailContainerCtrl.gallery }}

    +

    {{ thumbnailContainerCtrl.gallery.name }}

    - +
    diff --git a/app/component/gallery/thumbnail-container/thumbnail-container.js b/app/component/gallery/thumbnail-container/thumbnail-container.js index 6a1ef3ae..18bf16d4 100644 --- a/app/component/gallery/thumbnail-container/thumbnail-container.js +++ b/app/component/gallery/thumbnail-container/thumbnail-container.js @@ -4,7 +4,7 @@ require('./_thumbnail-container.scss'); module.exports = { template: require('./thumbnail-container.html'), - controllerAS: 'thumbnailContainerCtrl', + controllerAs: 'thumbnailContainerCtrl', bindings: { gallery: '<' } diff --git a/app/component/gallery/thumbnail/thumbnail.html b/app/component/gallery/thumbnail/thumbnail.html index 685c175e..2bcbaa0a 100644 --- a/app/component/gallery/thumbnail/thumbnail.html +++ b/app/component/gallery/thumbnail/thumbnail.html @@ -1,4 +1,4 @@
    {{ thumbnailCtrl.pic.desc }} - Delete +
    diff --git a/app/component/gallery/thumbnail/thumbnail.js b/app/component/gallery/thumbnail/thumbnail.js index 1d188bee..8390c3aa 100644 --- a/app/component/gallery/thumbnail/thumbnail.js +++ b/app/component/gallery/thumbnail/thumbnail.js @@ -8,15 +8,18 @@ module.exports = { controller: ['$log', 'picService', ThumbnailController], controllerAs: 'thumbnailCtrl', bindings: { - pic: '<' + pic: '<', + gallery: '<' } }; -function ThumbnailController($log) { +function ThumbnailController($log, picService) { $log.debug('ThumbnailController'); this.deletePic = function() { $log.debug('thumbnailCtrl.deletePic'); + + picService.deletePic(this.gallery, this.pic._id); }; diff --git a/app/component/gallery/upload-pic/upload-pic.html b/app/component/gallery/upload-pic/upload-pic.html index a8e5c864..acb870cb 100644 --- a/app/component/gallery/upload-pic/upload-pic.html +++ b/app/component/gallery/upload-pic/upload-pic.html @@ -17,7 +17,7 @@

    upload a new pic

    Select Pic To Upload - +
    diff --git a/app/service/pic-service.js b/app/service/pic-service.js index b8f60025..d95be865 100644 --- a/app/service/pic-service.js +++ b/app/service/pic-service.js @@ -8,7 +8,7 @@ function picService($q, $log, $http, Upload, authService) { let service = {}; service.uploadGalleryPic = function(galleryData, picData) { - $log.debug('service.uploadGalleryPic'); + $log.debug('picService.uploadGalleryPic'); return authService.getToken() .then( token => { @@ -39,5 +39,35 @@ function picService($q, $log, $http, Upload, authService) { }); }; + service.deletePic = function(galleryData, picID){ + $log.debug('picService.deletePic'); + + return authService.getToken() + .then( token => { + let url = `${__API_URL__}/api/gallery/${galleryData._id}/pic/${picID}`; + let config = { + headers: { + Authorization: `Bearer ${token}` + } + }; + + return $http.delete(url, config); + }) + .then( () => { + for (let i=0; i < galleryData.pics.length; i++){ + if (galleryData.pics[i]._id === picID){ + galleryData.pics.splice(i, 1); + break; + } + } + }) + .catch( err => { + $log.error(err.message); + return $q.reject(err); + }); + }; + + + return service; } diff --git a/app/view/home/home.html b/app/view/home/home.html index 4794d0ef..a33aff13 100644 --- a/app/view/home/home.html +++ b/app/view/home/home.html @@ -1,8 +1,8 @@
    - +

    Galleries

      -

      Galleries

      + { + angular.mock.module('cfgram'); + angular.mock.inject(($rootScope, authService, $window, $httpBackend) => { + this.$window = $window; //window object// + this.$rootScope = $rootScope; + this.authService = authService; + this.$httpBackend = $httpBackend; //mocks a backend// + }); + }); + + 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(); + }); + }); +}); diff --git a/test/gallery-service-test.js b/test/gallery-service-test.js new file mode 100644 index 00000000..1cdb3307 --- /dev/null +++ b/test/gallery-service-test.js @@ -0,0 +1,45 @@ +'use strict'; + +describe('Gallery Service', function () { + + beforeEach(() => { + angular.mock.module('cfgram'); + angular.mock.inject(($rootScope, authService, galleryService, $window, $httpBackend) => { + this.$window = $window; + this.$rootScope = $rootScope; + this.authService = authService; + this.galleryService = galleryService; + this.$httpBackend = $httpBackend; + }); + }); + + describe('galleryService.createGallery', () => { + it('should create a new gallery', () => { + let galleryData = { + name: 'example gallery', + desc: 'example description' + }; + + let headers = { + 'Content-Type': 'application/json', + Accept: 'application/json', + Authorization: 'Bearer test token' + }; + + this.$httpBackend.expectPOST('http://localhost:3000/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(); + }); + }); + + //TODO: create another test for deleting a gallery. expect delete. give headers, respond with 204, then call delete gallery to make sure// +}); From a2ce3a621e7aded70b363d84445e2142e9d5eb0b Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Tue, 4 Apr 2017 23:56:49 -0700 Subject: [PATCH 25/31] test --- test/gallery-service-test.js | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/test/gallery-service-test.js b/test/gallery-service-test.js index 1cdb3307..94586409 100644 --- a/test/gallery-service-test.js +++ b/test/gallery-service-test.js @@ -26,7 +26,7 @@ describe('Gallery Service', function () { Authorization: 'Bearer test token' }; - this.$httpBackend.expectPOST('http://localhost:3000/api/gallery', galleryData, headers) + this.$httpBackend.expectPOST('http://localhost:8000/api/gallery', galleryData, headers) .respond(200, { _id: '1234', username: 'testuser', @@ -41,5 +41,20 @@ describe('Gallery Service', function () { }); }); + describe('galleryService.deleteGallery', () => { + it('should 3delete a gallery', () => { + let galleryData = { + name: 'example gallery', + desc: 'example description' + }; + + let headers = { + 'Content-Type': 'application/json', + Accept: 'application/json', + Authorization: 'Bearer test token' + }; + }); + //TODO: create another test for deleting a gallery. expect delete. give headers, respond with 204, then call delete gallery to make sure// + }); }); From 74029215e8c552dbd21178784939e88dd7d3ec2f Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Wed, 5 Apr 2017 11:18:42 -0700 Subject: [PATCH 26/31] delete test done --- app/service/gallery-service.js | 3 +- test/edit-gallery-component-test.js | 65 +++++++++++++++++++++++++++++ test/gallery-item-component-test.js | 30 +++++++++++++ test/gallery-service-test.js | 9 ++++ 4 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 test/edit-gallery-component-test.js create mode 100644 test/gallery-item-component-test.js diff --git a/app/service/gallery-service.js b/app/service/gallery-service.js index 8043f6ea..9c32eb4e 100644 --- a/app/service/gallery-service.js +++ b/app/service/gallery-service.js @@ -129,7 +129,8 @@ function galleryService($q, $log, $http, authService) { let url = `${__API_URL__}/api/gallery/${galleryID}`; let config = { headers: { - Authorization: `Bearer ${token}` + Authorization: `Bearer ${token}`, + Accept: 'application/json' } }; diff --git a/test/edit-gallery-component-test.js b/test/edit-gallery-component-test.js new file mode 100644 index 00000000..3c7bbc9e --- /dev/null +++ b/test/edit-gallery-component-test.js @@ -0,0 +1,65 @@ +'use strict'; + +describe('Edit Gallery 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; + }); + }); + + it('should contain the proper component bindings', () => { + let mockBindings = { + gallery: { + name: 'test gallery name', + desc: 'test gallery description' + } + }; + + let editGalleryCtrl =this.$componentController('editGallery', null, mockBindings); + expect(editGalleryCtrl.gallery.name).toEqual(mockBindings.gallery.name); + expect(editGalleryCtrl.gallery.desc).toEqual(mockBindings.gallery.desc); + + this.$rootScope.$apply(); + }); + + describe('editGalleryCtrl.updateGallery', () => { + it('should make a valid PUT request', () => { + let url = 'http://localhost:8000/api/gallery/12345'; + let headers = { + 'Accept': 'application/json', + 'Content-Type': 'application/json', + Authorization: 'Bearer test token' + }; + + this.$httpBackend.expectPUT(url, { + _id: '12345', + name: 'updated name', + desc: 'updated desc' + }, headers).respond(200); + + let mockBindings = { + gallery: { + _id: '12345', + name: 'updated name', + desc: 'updated desc' + } + }; + + let editGalleryCtrl = this.$componentController('editGallery', null, mockBindings); + editGalleryCtrl.gallery.name = 'updated name'; + editGalleryCtrl.gallery.desc = 'updated desc'; + editGalleryCtrl.gallery.updateGallery() + .then( gallery => { + + }); + + this.$httpBackend.flush(); + this.$rootScope.$apply(); + }); + }); +}); diff --git a/test/gallery-item-component-test.js b/test/gallery-item-component-test.js new file mode 100644 index 00000000..bea2165a --- /dev/null +++ b/test/gallery-item-component-test.js @@ -0,0 +1,30 @@ +'use strict'; + +describe('Gallery Item Component', function() { + before(() => { + angular.mock.module('cfgram'); + angular.mock.inject(($rootScope, $componentController, $http, authService) => { + this.$rootScope = $rootScope; + this.$componentController = $componentController; + this.$httpBackend = $httpBackend; + this.authService = authService; + }); + }); + + describe('galleryItemCtrl.deleteDone', () => { + 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'); + + } + }; + }); + }); +}); diff --git a/test/gallery-service-test.js b/test/gallery-service-test.js index 94586409..b9167e95 100644 --- a/test/gallery-service-test.js +++ b/test/gallery-service-test.js @@ -53,6 +53,15 @@ describe('Gallery Service', function () { Accept: 'application/json', Authorization: 'Bearer test token' }; + + this.$httpBackend.expectDELETE(`${url}/${galleryData._id}`, headers) + .respond(204, {}); + + this.galleryService.deleteGallery(galleryData._id); + this.$log.debug('this', this); + this.$httpBackend.flush(); + this.$rootScope.$apply(); + }); //TODO: create another test for deleting a gallery. expect delete. give headers, respond with 204, then call delete gallery to make sure// From 64f07dd18a9be7e1f08270168afcb6a243102786 Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Wed, 5 Apr 2017 13:50:58 -0700 Subject: [PATCH 27/31] styles thumbnail container & thumbnail --- .../gallery/gallery-item/_gallery-item.scss | 26 +++++++++++-------- .../_thumbnail-container.scss | 25 ++++++++++++++++++ .../gallery/thumbnail/_thumbnail.scss | 20 ++++++++++++++ .../gallery/thumbnail/thumbnail.html | 10 +++++++ app/scss/lib/layout/_content.scss | 18 +++++++++++++ test/edit-gallery-component-test.js | 2 +- test/gallery-item-component-test.js | 6 ++++- 7 files changed, 94 insertions(+), 13 deletions(-) diff --git a/app/component/gallery/gallery-item/_gallery-item.scss b/app/component/gallery/gallery-item/_gallery-item.scss index 1e6a7b1c..5586f2e2 100644 --- a/app/component/gallery/gallery-item/_gallery-item.scss +++ b/app/component/gallery/gallery-item/_gallery-item.scss @@ -11,8 +11,12 @@ .item-label{ font-size: 3.5vw; color:rgb(57, 56, 56); - } + span:nth-child(2){ + font-size:2.5vw; + color:white; + } + } h3{ @@ -23,14 +27,14 @@ h3{ .delete-btn-std{ -width: unset; -padding: 0 $gutter-std*2.5; -background-color: $primarycolor / 1.2; -color: $black; -font-size: x-large; -font-weight: lighter; -height:70px; -float:right; -margin-right:0px; -border-radius: 10px 10px 10px + width: unset; + padding: 0 $gutter-std*2.5; + background-color: $primarycolor / 1.2; + color: $black; + font-size: x-large; + font-weight: lighter; + height:70px; + float:right; + margin-right:0px; + border-radius: 10px 10px 10px } diff --git a/app/component/gallery/thumbnail-container/_thumbnail-container.scss b/app/component/gallery/thumbnail-container/_thumbnail-container.scss index e69de29b..9b0538a8 100644 --- a/app/component/gallery/thumbnail-container/_thumbnail-container.scss +++ b/app/component/gallery/thumbnail-container/_thumbnail-container.scss @@ -0,0 +1,25 @@ +@import '../../../scss/lib/theme/vars'; + +.thumbnail-container{ + background-color:grey; + padding:20px; + margin-top:120px; + margin-left:30px; + margin-bottom:30px; + border-radius: 10px 10px 10px; + + h3{ + font-size: 3.5vw; + color:rgb(57, 56, 56); + } + span:nth-child(2){ + font-size:2.5vw; + color:white; + } + +} +/* +h3{ + font-size:2vw; + margin: 2px; +} */ diff --git a/app/component/gallery/thumbnail/_thumbnail.scss b/app/component/gallery/thumbnail/_thumbnail.scss index e69de29b..1378d115 100644 --- a/app/component/gallery/thumbnail/_thumbnail.scss +++ b/app/component/gallery/thumbnail/_thumbnail.scss @@ -0,0 +1,20 @@ +@import '../../../scss/lib/theme/vars'; + +.thumbnail{ + background-color:grey; + padding:20px; + margin-top:120px; + margin-left:30px; + margin-bottom:30px; + border-radius: 10px 10px 10px; + + .item-label{ + font-size: 3.5vw; + color:rgb(57, 56, 56); + } + span:nth-child(2){ + font-size:2.5vw; + color:white; + } + +} diff --git a/app/component/gallery/thumbnail/thumbnail.html b/app/component/gallery/thumbnail/thumbnail.html index 2bcbaa0a..af6abc83 100644 --- a/app/component/gallery/thumbnail/thumbnail.html +++ b/app/component/gallery/thumbnail/thumbnail.html @@ -1,4 +1,14 @@
      +
      + name: + {{ thumbnailCtrl.pic.name }} +
      +
      + description: + {{ thumbnailCtrl.pic.desc }} +
      +
      + {{ thumbnailCtrl.pic.desc }}
    diff --git a/app/scss/lib/layout/_content.scss b/app/scss/lib/layout/_content.scss index 87dc1554..af268471 100644 --- a/app/scss/lib/layout/_content.scss +++ b/app/scss/lib/layout/_content.scss @@ -4,3 +4,21 @@ body height: 49px; } } + .current-item{ + background-color:grey; + padding:20px; + margin-top:120px; + margin-left:30px; + margin-bottom:30px; + border-radius: 10px 10px 10px; + + .item-label{ + font-size: 3.5vw; + color:rgb(57, 56, 56); + } + span:nth-child(2){ + font-size:2.5vw; + color:green; + } + + } diff --git a/test/edit-gallery-component-test.js b/test/edit-gallery-component-test.js index 3c7bbc9e..b5254349 100644 --- a/test/edit-gallery-component-test.js +++ b/test/edit-gallery-component-test.js @@ -55,7 +55,7 @@ describe('Edit Gallery Component', function(){ editGalleryCtrl.gallery.desc = 'updated desc'; editGalleryCtrl.gallery.updateGallery() .then( gallery => { - + // expect statements }); this.$httpBackend.flush(); diff --git a/test/gallery-item-component-test.js b/test/gallery-item-component-test.js index bea2165a..2e23f17b 100644 --- a/test/gallery-item-component-test.js +++ b/test/gallery-item-component-test.js @@ -22,9 +22,13 @@ describe('Gallery Item Component', function() { }, deleteDone: function(data) { expect(data.galleryData._id).toEqual('12345'); - } }; + + let galleryItemCtrl = this.$componentController('galleryItem', null, mockBindings); + galleryItemCtrl.deleteDone({ galleryData: galleryItemCtrl.gallery }); + // additional tests can go here + this.$rootScope.$apply(); }); }); }); From fc50c33979cc09441f24527c6a825e67165f5cf9 Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Thu, 6 Apr 2017 09:45:42 -0700 Subject: [PATCH 28/31] 4 test passing --- app/scss/lib/base/_base.scss | 4 ++-- test/edit-gallery-component-test.js | 8 ++++---- test/gallery-item-component-test.js | 32 +++++++++++++++++++++++++++-- test/gallery-service-test.js | 2 +- 4 files changed, 37 insertions(+), 9 deletions(-) diff --git a/app/scss/lib/base/_base.scss b/app/scss/lib/base/_base.scss index a93ccd26..45f81ea6 100644 --- a/app/scss/lib/base/_base.scss +++ b/app/scss/lib/base/_base.scss @@ -34,8 +34,8 @@ body{ .btn-std{ - width: unset; - padding: 0 $gutter-std*2.5; + width: 30%; + padding: 5px ; background-color: $secondarycolor; color: $white; font-size: x-large; diff --git a/test/edit-gallery-component-test.js b/test/edit-gallery-component-test.js index b5254349..4dff55d5 100644 --- a/test/edit-gallery-component-test.js +++ b/test/edit-gallery-component-test.js @@ -53,10 +53,10 @@ describe('Edit Gallery Component', function(){ let editGalleryCtrl = this.$componentController('editGallery', null, mockBindings); editGalleryCtrl.gallery.name = 'updated name'; editGalleryCtrl.gallery.desc = 'updated desc'; - editGalleryCtrl.gallery.updateGallery() - .then( gallery => { - // expect statements - }); + editGalleryCtrl.updateGallery(); + // .then( gallery => { + // // expect statements + // }); this.$httpBackend.flush(); this.$rootScope.$apply(); diff --git a/test/gallery-item-component-test.js b/test/gallery-item-component-test.js index 2e23f17b..5d3f4fc4 100644 --- a/test/gallery-item-component-test.js +++ b/test/gallery-item-component-test.js @@ -26,9 +26,37 @@ describe('Gallery Item Component', function() { }; let galleryItemCtrl = this.$componentController('galleryItem', null, mockBindings); - galleryItemCtrl.deleteDone({ galleryData: galleryItemCtrl.gallery }); - // additional tests can go here + 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, text/plain, */*' + }; + + let mockBindings = { + gallery: { + _id: '12345', + name: 'test name', + desc: 'test description', + pics: [] + }, + deleteDone: function(data){ + expect(data.galleryData._id).toEqual(mockBindings.gallery._id); + } + }; + + this.$httpBackend.expectDELETE(url, headers).respond(204); + + let galleryItemCtrl = this.$componentController('galleryItem', null, mockBindings); + galleryItemCtrl.deleteGallery(); + + this.$httpBackend.flush(); + this.$rootScope.$apply(); + }); }); diff --git a/test/gallery-service-test.js b/test/gallery-service-test.js index b9167e95..762844c5 100644 --- a/test/gallery-service-test.js +++ b/test/gallery-service-test.js @@ -42,7 +42,7 @@ describe('Gallery Service', function () { }); describe('galleryService.deleteGallery', () => { - it('should 3delete a gallery', () => { + it('should delete a gallery', () => { let galleryData = { name: 'example gallery', desc: 'example description' From 91059157f181d01d6b35e68c8c2c99227dd473c5 Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Fri, 7 Apr 2017 09:26:48 -0700 Subject: [PATCH 29/31] fuzzy filter added --- .../gallery/edit-gallery/_edit-gallery.scss | 4 +++ .../gallery/edit-gallery/edit-gallery.html | 2 +- .../gallery/gallery-item/_gallery-item.scss | 4 +-- .../_thumbnail-container.scss | 2 +- .../gallery/thumbnail/_thumbnail.scss | 2 +- .../gallery/upload-pic/upload-pic.js | 4 +++ app/directive/social-icons.html | 11 +++++++ app/directive/social-icons.js | 18 +++++++++++ app/directive/social-icons.scss | 29 ++++++++++++++++++ app/entry.js | 14 +++++++++ app/filter/gallery-search.js | 19 ++++++++++++ app/index.html | 2 +- app/scss/lib/base/_base.scss | 17 +++++++--- app/view/home/home.html | 9 ++++-- assets/SocialIcons.png | Bin 0 -> 59049 bytes 15 files changed, 124 insertions(+), 13 deletions(-) create mode 100644 app/directive/social-icons.html create mode 100644 app/directive/social-icons.js create mode 100644 app/directive/social-icons.scss create mode 100644 app/filter/gallery-search.js create mode 100644 assets/SocialIcons.png diff --git a/app/component/gallery/edit-gallery/_edit-gallery.scss b/app/component/gallery/edit-gallery/_edit-gallery.scss index 72a67d72..a9d6a368 100644 --- a/app/component/gallery/edit-gallery/_edit-gallery.scss +++ b/app/component/gallery/edit-gallery/_edit-gallery.scss @@ -1 +1,5 @@ @import '../../../scss/lib/theme/vars'; + +fieldset{ + width:100%; +} diff --git a/app/component/gallery/edit-gallery/edit-gallery.html b/app/component/gallery/edit-gallery/edit-gallery.html index 43fc6cc5..e3691ede 100644 --- a/app/component/gallery/edit-gallery/edit-gallery.html +++ b/app/component/gallery/edit-gallery/edit-gallery.html @@ -15,7 +15,7 @@ - + diff --git a/app/component/gallery/gallery-item/_gallery-item.scss b/app/component/gallery/gallery-item/_gallery-item.scss index 5586f2e2..48747c44 100644 --- a/app/component/gallery/gallery-item/_gallery-item.scss +++ b/app/component/gallery/gallery-item/_gallery-item.scss @@ -4,7 +4,7 @@ background-color:grey; padding:20px; margin-top:120px; - margin-left:30px; + /* margin-left:30px; */ margin-bottom:30px; border-radius: 10px 10px 10px; @@ -14,7 +14,7 @@ } span:nth-child(2){ font-size:2.5vw; - color:white; + color:lightgrey; } } diff --git a/app/component/gallery/thumbnail-container/_thumbnail-container.scss b/app/component/gallery/thumbnail-container/_thumbnail-container.scss index 9b0538a8..1adb4517 100644 --- a/app/component/gallery/thumbnail-container/_thumbnail-container.scss +++ b/app/component/gallery/thumbnail-container/_thumbnail-container.scss @@ -14,7 +14,7 @@ } span:nth-child(2){ font-size:2.5vw; - color:white; + color:lightgrey; } } diff --git a/app/component/gallery/thumbnail/_thumbnail.scss b/app/component/gallery/thumbnail/_thumbnail.scss index 1378d115..8272b9ae 100644 --- a/app/component/gallery/thumbnail/_thumbnail.scss +++ b/app/component/gallery/thumbnail/_thumbnail.scss @@ -14,7 +14,7 @@ } span:nth-child(2){ font-size:2.5vw; - color:white; + color:lightgrey; } } diff --git a/app/component/gallery/upload-pic/upload-pic.js b/app/component/gallery/upload-pic/upload-pic.js index 6a950f16..cceadab5 100644 --- a/app/component/gallery/upload-pic/upload-pic.js +++ b/app/component/gallery/upload-pic/upload-pic.js @@ -1,5 +1,7 @@ 'use strict'; + +console.log('slkfjlksdjflksjflksdjlfkjsdlkfj cooolllllll beans'); require('./_upload-pic.scss'); module.exports = { @@ -17,6 +19,8 @@ function UploadPicController($log, picService) { this.pic = {}; this.uploadPic = function() { + console.log('this.pic', this.pic); + console.log('this.gallery', this.gallery); picService.uploadGalleryPic(this.gallery, this.pic) .then( () => { this.pic.name = null; diff --git a/app/directive/social-icons.html b/app/directive/social-icons.html new file mode 100644 index 00000000..816bc40a --- /dev/null +++ b/app/directive/social-icons.html @@ -0,0 +1,11 @@ + diff --git a/app/directive/social-icons.js b/app/directive/social-icons.js new file mode 100644 index 00000000..80f9d2c6 --- /dev/null +++ b/app/directive/social-icons.js @@ -0,0 +1,18 @@ +'use strict'; + +module.exports = function(){ + return { + restrict: 'EAC', //element attribute class + template: require('./social-icons.html'), + controller: ['$log', SocialIconsController], + bindToController: true, + controllerAs: 'socialIconsCtrl', + scope: { + tester: '@' + } + }; +}; + +function SocialIconsController(){ + this.icons = ['fb', 'twitter', 'instagram']; +} diff --git a/app/directive/social-icons.scss b/app/directive/social-icons.scss new file mode 100644 index 00000000..8210910b --- /dev/null +++ b/app/directive/social-icons.scss @@ -0,0 +1,29 @@ + + +.socialIcons-twitter, .socialIcons-facebook, .socialIcons-instagram { + background-image: url('../../assets/socialIcons.png'); + background-repeat: no-repeat; + +} + +.socialIcons-twitter { + height: 76px; + width: 100px; + background-position: -49px -52px; +} + +.socialIcons-facebook { + height: 109px; + width:109px; + background-position: -53px -232px; +} + +.socialIcons-instagram { + height: 84px; + width:92px; + background-position: -201px -41px; +} + +nav ul{ + display: inline-block; +} diff --git a/app/entry.js b/app/entry.js index 3fcb6eca..2319b6d5 100644 --- a/app/entry.js +++ b/app/entry.js @@ -40,3 +40,17 @@ context.keys().forEach( key => { let module = context(key); cfgram.component(name, module); }); + +context = require.context('./filter/', true, /\.js$/); +context.keys().forEach( key => { + let name = camelcase(path.basename(key, '.js')); + let module = context(key); + cfgram.filter(name, module); +}); + +context = require.context('./directive/', true, /\.js$/); +context.keys().forEach( key => { + let name = camelcase(path.basename(key, '.js')); + let module = context(key); + cfgram.directive(name, module); +}); diff --git a/app/filter/gallery-search.js b/app/filter/gallery-search.js new file mode 100644 index 00000000..5402c3e3 --- /dev/null +++ b/app/filter/gallery-search.js @@ -0,0 +1,19 @@ +'use strict'; + +module.exports = function() { + return function(galleries, searchTerm) { + let fuzzyRegex = generateFuzzyRegex(searchTerm); + console.log(searchTerm); + return galleries.filter(gallery => { + return fuzzyRegex.test(gallery.name.toUpperCase()); + }); + }; +}; + +function generateFuzzyRegex(input) { + if(!input) return /.*/; + let fuzzyString = '.*' + input.toUpperCase().split('').join('.*') + '.*'; + // split makes an array, join makes a string + console.log(fuzzyString); + return new RegExp(fuzzyString); +} diff --git a/app/index.html b/app/index.html index 6a8e1e1a..6c172cd4 100644 --- a/app/index.html +++ b/app/index.html @@ -12,6 +12,6 @@
    -
    +
    diff --git a/app/scss/lib/base/_base.scss b/app/scss/lib/base/_base.scss index 45f81ea6..4840d690 100644 --- a/app/scss/lib/base/_base.scss +++ b/app/scss/lib/base/_base.scss @@ -5,6 +5,7 @@ body{ font-family: times; display: relative; + a{ text-decoration: none; font-weight: bold; @@ -16,20 +17,26 @@ body{ main { margin:$gutter-std; - } + form{ width:100%; } input{ width: 100%; box-sizing:border-box; - border: 1px solid grey; - margin: $gutter-std /2; - margin-left: 2%; + border: 2px solid grey; + margin-top: $gutter-std /2; + margin-bottom: $gutter-std /2; font-size: 25px; text-align: left; height: 60px; padding:5px; + border-radius: 10px 10px 10px; + + &:focus { + background: black; + color: lightgrey; + } } .btn-std{ @@ -45,7 +52,7 @@ body{ margin-right:0px; border-radius: 10px 10px 10px } - +} footer{ background-color: grey; height:70px; diff --git a/app/view/home/home.html b/app/view/home/home.html index a33aff13..0a2c6d11 100644 --- a/app/view/home/home.html +++ b/app/view/home/home.html @@ -1,13 +1,18 @@
    +
    + +

    Galleries

      - -
    + +
    diff --git a/assets/SocialIcons.png b/assets/SocialIcons.png new file mode 100644 index 0000000000000000000000000000000000000000..2a2a45b5030fd448c69739885e5721937f9669ce GIT binary patch literal 59049 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 literal 0 HcmV?d00001 From 1ee150d3e34590762e18562c1f7300d67f65b32d Mon Sep 17 00:00:00 2001 From: Jeremiah Date: Fri, 7 Apr 2017 09:29:48 -0700 Subject: [PATCH 30/31] fuzzy filter, social icons --- app/directive/social-icons.html | 1 - 1 file changed, 1 deletion(-) diff --git a/app/directive/social-icons.html b/app/directive/social-icons.html index 816bc40a..f6d33a65 100644 --- a/app/directive/social-icons.html +++ b/app/directive/social-icons.html @@ -1,7 +1,6 @@