From d7764b2d61315ae475803e224337b7ee6c52d382 Mon Sep 17 00:00:00 2001 From: GLSea1979 Date: Mon, 20 Mar 2017 14:16:08 -0700 Subject: [PATCH 1/3] initial build finished --- .eslintrc | 22 ++++++++ .gitignore | 125 ++++++++++++++++++++++++++++++++++++++++++++ app/entry.js | 29 ++++++++++ app/index.html | 24 +++++++++ app/scss/main.scss | 76 +++++++++++++++++++++++++++ app/scss/reset.scss | 48 +++++++++++++++++ gulpfile.js | 23 ++++++++ package.json | 35 +++++++++++++ webpack.config.js | 24 +++++++++ 9 files changed, 406 insertions(+) create mode 100755 .eslintrc create mode 100755 .gitignore create mode 100644 app/entry.js create mode 100644 app/index.html create mode 100644 app/scss/main.scss create mode 100644 app/scss/reset.scss create mode 100755 gulpfile.js create mode 100644 package.json create mode 100644 webpack.config.js diff --git a/.eslintrc b/.eslintrc new file mode 100755 index 0000000..a79e0c6 --- /dev/null +++ b/.eslintrc @@ -0,0 +1,22 @@ +{ + "rules": { + "no-console": "off", + "indent": [ "error", 2 ], + "quotes": [ "error", "single" ], + "semi": ["error", "always"], + "linebreak-style": [ "error", "unix" ], + # "linebreak-style": [ "error", "windows"] + }, + "env": { + "es6": true, + "node": true, + "mocha": true, + "jasmine": true + }, + "ecmaFeatures": { + "modules": true, + "experimentalObjectRestSpread": true, + "impliedStrict": true + }, + "extends": "eslint:recommended" +} diff --git a/.gitignore b/.gitignore new file mode 100755 index 0000000..c31d550 --- /dev/null +++ b/.gitignore @@ -0,0 +1,125 @@ + +# Created by https://www.gitignore.io/api/monodevelop,vim,node,windows,archlinuxpackages + +### ArchLinuxPackages ### +*.tar +*.tar.* +*.jar +*.exe +*.msi +*.zip +*.tgz +*.log +*.log.* +*.sig + +pkg/ +src/ + +### MonoDevelop ### +#User Specific +*.userprefs +*.usertasks + +#Mono Project Files +*.pidb +*.resources +test-results/ + +### Node ### +# Logs +logs +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' + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + + +### Vim ### +# swap +[._]*.s[a-v][a-z] +[._]*.sw[a-p] +[._]s[a-v][a-z] +[._]sw[a-p] +# session +Session.vim +# temporary +.netrwhist +*~ +# auto-generated tag files +tags + +### 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 +*.msm +*.msp + +# Windows shortcuts +*.lnk + +#temp hide of public folder +public/ + +# End of https://www.gitignore.io/api/monodevelop,vim,node,windows,archlinuxpackages diff --git a/app/entry.js b/app/entry.js new file mode 100644 index 0000000..d10a7a3 --- /dev/null +++ b/app/entry.js @@ -0,0 +1,29 @@ +'use strict'; + +require('./scss/reset.scss'); +require('./scss/main.scss'); + +const angular = require('angular'); +const cowsay = require('cowsay-browser'); + +const cowsayApp = angular.module('cowsayApp', []); + +cowsayApp.controller('CowsayController', ['$log', '$scope', CowsayController]); + +function CowsayController($log, $scope) { + $log.debug('CowsayController'); + + let cowsayCtrl = $scope.cowsayCtrl = {} + + cowsayCtrl.title = 'Welcome the farm!'; + + cowsayCtrl.speak = function(input) { + $log.debug('cowsayCtrl.speak()'); + return cowsay.say({ text: input || 'mooo!!! bitches'}); + }; + + cowsayCtrl.logger = function(input) { + $log.debug('cowsayCtrl.logger()'); + $log.log(input); + }; +}; diff --git a/app/index.html b/app/index.html new file mode 100644 index 0000000..f11daf0 --- /dev/null +++ b/app/index.html @@ -0,0 +1,24 @@ + + + + + Welcome to Cowville or is it + + +
+
+

{{ cowsayCtrl.title}}

+ 
{{ cowsayCtrl.speak(cowsayCtrl.text) }}
+ + +
+ +
+

2 Way Data Binding!

+ +

{{ cowsayCtrl.bindText }}

+ +
+
+ + diff --git a/app/scss/main.scss b/app/scss/main.scss new file mode 100644 index 0000000..0d01a9f --- /dev/null +++ b/app/scss/main.scss @@ -0,0 +1,76 @@ +// -- $variables ---- + +$brand-primary: #444; +$btn-primary: $brand-primary / 2; +$btn-hover: #31b1c1; +$black: #000; +$white: #fff; +$box-std: 40%; +$gutter-std: 5%; +$gutter-sm: $gutter-std / 2; + +// -- global styles ---- + +body { + font-family: helvetic; + font-size: 2vw; + background: $brand-primary * 3; +} + +h2 { + font-size: 3vw; + text-align: center; + margin-bottom: $gutter-std; +} + +button { + float: right; + width: $box-std; + padding: 2% 0; + background: $btn-primary / 3; + color: $white; + border: none; + border-radius: 3px; + cursor: pointer; + transition: 350ms all; + + &:hover { + background: $btn-hover; + } +} + +input[type="text"] { + float: left; + width: $box-std + 10%; + margin-right: $gutter-std / 2; + padding: 2%; + border: none; + border-radius: 3px; +} + +pre { + font-family: monospace; + margin: $gutter-std; +} + +// -- app styles ---- + +.container { + float: left; + width: $box-std; + margin: 5%; +} + +.text-binder { + height: 15vw; + font-size: 3vw; + margin: $gutter-std; + padding: 1vw; + color: $white; + background: $brand-primary / 3; + border: dotted .25vw $brand-primary; + + + input { + width: 100%; + } +} diff --git a/app/scss/reset.scss b/app/scss/reset.scss new file mode 100644 index 0000000..ed11813 --- /dev/null +++ b/app/scss/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/gulpfile.js b/gulpfile.js new file mode 100755 index 0000000..24190d6 --- /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']); diff --git a/package.json b/package.json new file mode 100644 index 0000000..c6588e3 --- /dev/null +++ b/package.json @@ -0,0 +1,35 @@ +{ + "name": "20-intro_to_angular_and_webpack", + "version": "1.0.0", + "description": "![cf](https://i.imgur.com/7v5ASc8.png) Lab 20 - Intro to Angular and Webpack ======", + "main": "index.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "build": "./node_modules/webpack/bin/webpack.js", + "watch": "./node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/GLSea1979/20-intro_to_angular_and_webpack.git" + }, + "keywords": [], + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/GLSea1979/20-intro_to_angular_and_webpack/issues" + }, + "homepage": "https://github.com/GLSea1979/20-intro_to_angular_and_webpack#readme", + "dependencies": { + "angular": "^1.6.3", + "cowsay-browser": "^1.1.8", + "css-loader": "^0.27.3", + "html-webpack-plugin": "^2.28.0", + "node-sass": "^4.5.0", + "sass-loader": "^6.0.3", + "style-loader": "^0.14.1", + "webpack": "^1.14.0" + }, + "devDependencies": { + "webpack-dev-server": "^1.16.2" + } +} diff --git a/webpack.config.js b/webpack.config.js new file mode 100644 index 0000000..279dac8 --- /dev/null +++ b/webpack.config.js @@ -0,0 +1,24 @@ +'use strict'; + +const HTMLPlugin = require('html-webpack-plugin'); + +module.exports = { + entry: `${__dirname}/app/entry.js`, + output: { + filename: 'bundle.js', + path: 'build' + }, + plugins: [ + new HTMLPlugin({ + template: `${__dirname}/app/index.html` + }) + ], + module: { + loaders: [ + { + test: /\.scss$/, + loader: 'style!css!sass!' + } + ] + } +}; From 39c8c2f0f898e26d43e894795817920860f4a3c8 Mon Sep 17 00:00:00 2001 From: GLSea1979 Date: Mon, 20 Mar 2017 15:34:49 -0700 Subject: [PATCH 2/3] added a dragon and changed cow to tux, changed colors n size --- app/entry.js | 17 ++++++++++++++--- app/index.html | 8 ++++++++ app/scss/main.scss | 11 +++++++++-- package.json | 3 ++- 4 files changed, 33 insertions(+), 6 deletions(-) diff --git a/app/entry.js b/app/entry.js index d10a7a3..4cd9e8a 100644 --- a/app/entry.js +++ b/app/entry.js @@ -15,13 +15,24 @@ function CowsayController($log, $scope) { let cowsayCtrl = $scope.cowsayCtrl = {} - cowsayCtrl.title = 'Welcome the farm!'; + cowsayCtrl.title = 'Welcome to the farm!'; + cowsayCtrl.title2 = 'We eat people around here.' cowsayCtrl.speak = function(input) { - $log.debug('cowsayCtrl.speak()'); - return cowsay.say({ text: input || 'mooo!!! bitches'}); + $log.debug('cowsayCtrl.speak'); + return cowsay.say({ text: input || 'mooo!!! bitches', f: 'tux'}); }; + cowsayCtrl.speak2 = function(input) { + $log.debug('cowsayCtrl.speak2'); + return cowsay.say({ text: input || 'My name is Squeek, the Dragon', f: 'dragon'}); + }; + + cowsayCtrl.remember = function(input) { + $log.debug('cowsayCtrl.remember') + + } + cowsayCtrl.logger = function(input) { $log.debug('cowsayCtrl.logger()'); $log.log(input); diff --git a/app/index.html b/app/index.html index f11daf0..769c23b 100644 --- a/app/index.html +++ b/app/index.html @@ -19,6 +19,14 @@

2 Way Data Binding!

{{ cowsayCtrl.bindText }}

+ +
+

{{ cowsayCtrl.title2}}

+ + 
{{ cowsayCtrl.speak2(cowsayCtrl.text) }}
+ 
{{ cowsayCtrl.remember(cowsayCtrl.text) }}
+
+ diff --git a/app/scss/main.scss b/app/scss/main.scss index 0d01a9f..ff10920 100644 --- a/app/scss/main.scss +++ b/app/scss/main.scss @@ -1,11 +1,12 @@ + // -- $variables ---- -$brand-primary: #444; +$brand-primary: #364; $btn-primary: $brand-primary / 2; $btn-hover: #31b1c1; $black: #000; $white: #fff; -$box-std: 40%; +$box-std: 30%; $gutter-std: 5%; $gutter-sm: $gutter-std / 2; @@ -61,6 +62,12 @@ pre { margin: 5%; } +.bigguy { + clear: left; + width: $box-std * 2; + margin: 5%; +} + .text-binder { height: 15vw; font-size: 3vw; diff --git a/package.json b/package.json index c6588e3..f7828c6 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1", "build": "./node_modules/webpack/bin/webpack.js", - "watch": "./node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot" + "watch": "./node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot", + "lint": "./eslint.format()" }, "repository": { "type": "git", From 39838b4adf57202dc969ba6bdc0414d16b152703 Mon Sep 17 00:00:00 2001 From: GLSea1979 Date: Mon, 20 Mar 2017 16:40:56 -0700 Subject: [PATCH 3/3] mostly done --- app/entry.js | 3 ++- package.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/entry.js b/app/entry.js index 4cd9e8a..5848c8a 100644 --- a/app/entry.js +++ b/app/entry.js @@ -14,6 +14,7 @@ function CowsayController($log, $scope) { $log.debug('CowsayController'); let cowsayCtrl = $scope.cowsayCtrl = {} + let previous = []; cowsayCtrl.title = 'Welcome to the farm!'; cowsayCtrl.title2 = 'We eat people around here.' @@ -29,7 +30,7 @@ function CowsayController($log, $scope) { }; cowsayCtrl.remember = function(input) { - $log.debug('cowsayCtrl.remember') + $log.debug('cowsayCtrl.remember'); } diff --git a/package.json b/package.json index f7828c6..bf9cd31 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1", "build": "./node_modules/webpack/bin/webpack.js", - "watch": "./node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot", + "watch": "./node_modules/webpack-dev-server/bin/webpack-dev-server.js --progress --colors --inline --hot", + "monitor": "./node_modules/webpack-dev-server/bin/webpack-dev-server.js --progress --colors", "lint": "./eslint.format()" }, "repository": {