From d7764b2d61315ae475803e224337b7ee6c52d382 Mon Sep 17 00:00:00 2001 From: GLSea1979 Date: Mon, 20 Mar 2017 14:16:08 -0700 Subject: [PATCH 1/5] 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/5] 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/5] 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": { From 6893e59955b9a58619789c865bc5b8063f08f894 Mon Sep 17 00:00:00 2001 From: GLSea1979 Date: Tue, 21 Mar 2017 14:11:30 -0700 Subject: [PATCH 4/5] initial build finshed --- .babelrc | 3 + app/entry.js | 60 +++++++++----- app/index.html | 58 +++++++++----- app/scss/main.scss | 191 +++++++++++++++++++++++++-------------------- package.json | 6 +- webpack.config.js | 13 ++- 6 files changed, 207 insertions(+), 124 deletions(-) create mode 100644 .babelrc diff --git a/.babelrc b/.babelrc new file mode 100644 index 0000000..c13c5f6 --- /dev/null +++ b/.babelrc @@ -0,0 +1,3 @@ +{ + "presets": ["es2015"] +} diff --git a/app/entry.js b/app/entry.js index 5848c8a..c393995 100644 --- a/app/entry.js +++ b/app/entry.js @@ -8,34 +8,54 @@ const cowsay = require('cowsay-browser'); const cowsayApp = angular.module('cowsayApp', []); -cowsayApp.controller('CowsayController', ['$log', '$scope', CowsayController]); +cowsayApp.controller('CowsayController', ['$log', CowsayController]); -function CowsayController($log, $scope) { +function CowsayController($log) { $log.debug('CowsayController'); - let cowsayCtrl = $scope.cowsayCtrl = {} - let previous = []; + this.title = 'Welcome to Cowville!'; + this.history = []; - cowsayCtrl.title = 'Welcome to the farm!'; - cowsayCtrl.title2 = 'We eat people around here.' + cowsay.list((err, cowfiles) => { + this.cowfiles = cowfiles; + this.current = this.cowfiles[0]; + }); - cowsayCtrl.speak = function(input) { - $log.debug('cowsayCtrl.speak'); - return cowsay.say({ text: input || 'mooo!!! bitches', f: 'tux'}); + this.update = function(input) { + $log.debug('cowsayCtrl.update()'); + return cowsay.say({ text: input || 'moooooooo', f: this.current }); }; - cowsayCtrl.speak2 = function(input) { - $log.debug('cowsayCtrl.speak2'); - return cowsay.say({ text: input || 'My name is Squeek, the Dragon', f: 'dragon'}); + this.speak = function(input) { + $log.debug('cowsayCtrl.speak()'); + this.spoken = this.update(input); + this.history.push(this.spoken); }; - cowsayCtrl.remember = function(input) { - $log.debug('cowsayCtrl.remember'); - - } - - cowsayCtrl.logger = function(input) { - $log.debug('cowsayCtrl.logger()'); - $log.log(input); + this.undo = function() { + $log.debug('cowsayCtrl.undo()'); + this.history.pop(); + this.spoken = this.history.pop() || ''; }; }; + +cowsayApp.controller('NavController', ['$log', NavController]); + +function NavController($log) { + $log.debug('NavController'); + + this.routes = [ + { + name: 'home', + url: '/home' + }, + { + name: 'about', + url: '/about-us' + }, + { + name: 'contact', + url: '/contact-us' + } + ]; +}; diff --git a/app/index.html b/app/index.html index 769c23b..b4005f0 100644 --- a/app/index.html +++ b/app/index.html @@ -1,32 +1,52 @@ - - Welcome to Cowville or is it + Welcome to Cowville! +
+ +
+
-
-

{{ cowsayCtrl.title}}

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

{{ cowsayCtrl.title }}

-
-

2 Way Data Binding!

+ 
+          {{ cowsayCtrl.update(cowsayCtrl.text) }}
+
-

{{ cowsayCtrl.bindText }}

- -
+
+ -
-

{{ cowsayCtrl.title2}}

- - 
{{ cowsayCtrl.speak2(cowsayCtrl.text) }}
- 
{{ cowsayCtrl.remember(cowsayCtrl.text) }}
-
+ + +
+ 
+              {{ cowsayCtrl.spoken }}
+
+ +
+
+
diff --git a/app/scss/main.scss b/app/scss/main.scss index ff10920..a0b9b6a 100644 --- a/app/scss/main.scss +++ b/app/scss/main.scss @@ -1,83 +1,108 @@ - -// -- $variables ---- - -$brand-primary: #364; -$btn-primary: $brand-primary / 2; -$btn-hover: #31b1c1; -$black: #000; -$white: #fff; -$box-std: 30%; -$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%; -} - -.bigguy { - clear: left; - width: $box-std * 2; - 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%; - } -} +// // :::: $vars :::: +// +// $brand-primary: #444; +// $btn-primary: $brand-primary / 2; +// $btn-hover: #31b1c1; +// $black: #000; +// $white: #fff; +// $box-std: 100%; +// $gutter-std: 5%; +// $gutter-sm: $gutter-std / 2; +// +// // :::: global styles :::: +// +// body { +// font-family: helvetica; +// font-size: 2vw; +// background: $brand-primary * 3; +// } +// +// a { +// text-decoration: none; +// color: $black; +// cursor: pointer; +// } +// +// h2 { +// font-size: 5vw; +// text-align: center; +// text-decoration: underline; +// color: $brand-primary; +// margin-bottom: $gutter-std; +// } +// +// button { +// width: 100%; +// padding: 2% 0; +// margin-bottom: 20px; +// background: $btn-primary / 3; +// color: #fff; +// border: none; +// border-radius: 3px; +// cursor: pointer; +// transition: 350ms all; +// +// &:hover { +// background: $btn-hover; +// } +// } +// +// input[type="text"] { +// float: left; +// width: 96%; +// margin-bottom: 2%; +// padding: 2%; +// border: none; +// border-radius: 3px; +// } +// +// select { +// width: 100%; +// margin-bottom: 5px; +// } +// +// pre { +// overflow: auto; +// width: 100%; +// font-family: monospace; +// margin: $gutter-std; +// } +// +// // :::: app styles :::: +// +// nav { +// height: 4vw; +// background: $black; +// padding: 2vw; +// margin-bottom: $gutter-std; +// +// li { +// display: inline-block; +// margin-right: 3vw; +// +// a { +// font-size: 3vw; +// color: $white; +// text-shadow: 1px 1px 1px $btn-hover; +// } +// } +// } +// +// .container { +// width: 80%; +// margin-left: 10%; +// } +// +// .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/package.json b/package.json index bf9cd31..aed7d66 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "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 --progress --colors --inline --hot", + "watch": "./node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot", "monitor": "./node_modules/webpack-dev-server/bin/webpack-dev-server.js --progress --colors", "lint": "./eslint.format()" }, @@ -23,8 +23,12 @@ "homepage": "https://github.com/GLSea1979/20-intro_to_angular_and_webpack#readme", "dependencies": { "angular": "^1.6.3", + "babel-core": "^6.24.0", + "babel-loader": "^6.4.1", + "babel-preset-es2015": "^6.24.0", "cowsay-browser": "^1.1.8", "css-loader": "^0.27.3", + "extract-text-webpack-plugin": "^1.0.1", "html-webpack-plugin": "^2.28.0", "node-sass": "^4.5.0", "sass-loader": "^6.0.3", diff --git a/webpack.config.js b/webpack.config.js index 279dac8..ad54a41 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,6 +1,7 @@ 'use strict'; const HTMLPlugin = require('html-webpack-plugin'); +const ExtractTextPlugin = require('extract-text-webpack-plugin'); module.exports = { entry: `${__dirname}/app/entry.js`, @@ -11,13 +12,23 @@ module.exports = { plugins: [ new HTMLPlugin({ template: `${__dirname}/app/index.html` - }) + }), + new ExtractTextPlugin('bundle.css') ], module: { loaders: [ + { + test: /\.js$/, + exclude: /node_modules/, + loader: 'babel' + }, { test: /\.scss$/, loader: 'style!css!sass!' + }, + { + test: /\.(eot|woff|ttf|svg).*/, + loader: 'url?limit=10000&name=fonts/[hash].[ext]' } ] } From 8d81e1744c7a34ba512a4c7f7b29fd1b6e247d7c Mon Sep 17 00:00:00 2001 From: GLSea1979 Date: Tue, 21 Mar 2017 20:30:39 -0700 Subject: [PATCH 5/5] close on most --- app/index.html | 39 +++++--- app/index2.html | 0 app/scss/main.scss | 243 +++++++++++++++++++++++++-------------------- 3 files changed, 165 insertions(+), 117 deletions(-) create mode 100644 app/index2.html diff --git a/app/index.html b/app/index.html index b4005f0..b8175b2 100644 --- a/app/index.html +++ b/app/index.html @@ -20,33 +20,48 @@

cowcontrol.io

class="container" ng-controller="CowsayController as cowsayCtrl" ng-init="cowsayCtrl.current = 'squirrel'"> -

{{ cowsayCtrl.title }}

- 
-          {{ cowsayCtrl.update(cowsayCtrl.text) }}
-
+
+
+ cow creator + make it, view it, and undo it! +
+ 
+            {{ cowsayCtrl.update(cowsayCtrl.text) }}
+
+
- - - + + + +
-
- 
-              {{ cowsayCtrl.spoken }}
-
- +
+
+
+ view it! + check out the cow you just made! +
+ 
+                {{ cowsayCtrl.spoken }}
+
+
+ + + diff --git a/app/index2.html b/app/index2.html new file mode 100644 index 0000000..e69de29 diff --git a/app/scss/main.scss b/app/scss/main.scss index a0b9b6a..8e2f4d9 100644 --- a/app/scss/main.scss +++ b/app/scss/main.scss @@ -1,108 +1,141 @@ -// // :::: $vars :::: -// -// $brand-primary: #444; -// $btn-primary: $brand-primary / 2; -// $btn-hover: #31b1c1; -// $black: #000; -// $white: #fff; -// $box-std: 100%; -// $gutter-std: 5%; -// $gutter-sm: $gutter-std / 2; -// -// // :::: global styles :::: -// -// body { -// font-family: helvetica; -// font-size: 2vw; -// background: $brand-primary * 3; -// } -// -// a { -// text-decoration: none; -// color: $black; -// cursor: pointer; -// } -// -// h2 { -// font-size: 5vw; -// text-align: center; -// text-decoration: underline; -// color: $brand-primary; -// margin-bottom: $gutter-std; -// } -// -// button { -// width: 100%; -// padding: 2% 0; -// margin-bottom: 20px; -// background: $btn-primary / 3; -// color: #fff; -// border: none; -// border-radius: 3px; -// cursor: pointer; -// transition: 350ms all; -// -// &:hover { -// background: $btn-hover; -// } -// } -// + + +// :::: $vars :::: + +$brand-primary: #444; +$btn-primary: $brand-primary / 2; +$btn-hover: #31b1c1; +$darkgrey: #404347; +$white: #fff; +$box-std: 100%; +$gutter-std: 5%; +$gutter-sm: $gutter-std / 2; + +// :::: global styles :::: + +body { + font-family: helvetica; + font-size: 2vw; + background: $brand-primary * 3; +} + +a { + text-decoration: none; + color: $darkgrey / 100; + cursor: pointer; +} + + +button { + padding: 1%; + margin-bottom: 10px; + background: $btn-primary / 3; + color: #fff; + border: none; + border-radius: 5px; + cursor: pointer; + transition: 350ms all; + + &:hover { + background: $btn-hover; + } +} + +.selector { + display: block; + padding: 1%; + width: 24%; + float: right; + border: 1px solid black; + border-radius: 5px; + height: 2.7%; + margin-top: 5%; +} // input[type="text"] { -// float: left; -// width: 96%; +// float: right; +// width: 24%; // margin-bottom: 2%; -// padding: 2%; -// border: none; -// border-radius: 3px; -// } -// -// select { -// width: 100%; -// margin-bottom: 5px; -// } -// -// pre { -// overflow: auto; -// width: 100%; -// font-family: monospace; -// margin: $gutter-std; -// } -// -// // :::: app styles :::: -// -// nav { -// height: 4vw; -// background: $black; -// padding: 2vw; -// margin-bottom: $gutter-std; -// -// li { -// display: inline-block; -// margin-right: 3vw; -// -// a { -// font-size: 3vw; -// color: $white; -// text-shadow: 1px 1px 1px $btn-hover; -// } -// } -// } -// -// .container { -// width: 80%; -// margin-left: 10%; -// } -// -// .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%; -// } +// padding: 1%; +// border: 1px solid black; +// border-radius: 5px; +// height: 2.7% // } + +select { + width: 100%; + margin-bottom: 5px; +} + +pre { + border: 2px solid $brand-primary; + overflow: auto; + width: 100%; + font-family: monospace; + margin-right: $gutter-std * 2; +} + +// :::: app styles :::: +.line { + width: 90%; + height: 1%; + margin: 0 auto; + clear: both; + border-bottom: 2px solid $darkgrey; + margin-bottom: $gutter-std; +} +nav { + height: 4vw; + background: $darkgrey; + padding: 2vw; + margin-bottom: $gutter-std; + + h1 { + display: inline-block; + float: left; + font-size: 3.5vw; + color: $brand-primary * 3; + margin: 0 5%; + } + + li { + display: inline-block; + margin-right: 3vw; + float: right; + + a { + font-size: 3vw; + color: $brand-primary * 3; + text-shadow: 1px 1px 1px $btn-hover; + } + } +} + +.container { + width: 80%; + margin-left: 10%; +} + + +.cowfield { + clear: both; + width: 50%; + float: left; + color: black; + margin-right: $gutter-std; + margin-bottom: $gutter-std; +} +.largetitle { + display: inline-block; + font-size: 2.3vw; + margin-bottom: gutter-std; +} +.smalltitle { + display: inline-block; + font-size: 2.1vw; +} +footer { + clear: both; + height: 5vw; + width: 100%; + background: $darkgrey; +}