From 0540429af49d426ca14b4015658414ac5be7feb2 Mon Sep 17 00:00:00 2001 From: caylazabel Date: Mon, 20 Mar 2017 15:54:14 -0700 Subject: [PATCH 1/6] basic lab done, trying for bonus now --- .eslintrc | 21 ++++++++ .gitignore | 123 ++++++++++++++++++++++++++++++++++++++++++++ app/entry.js | 29 +++++++++++ app/index.html | 28 ++++++++++ app/scss/main.scss | 37 +++++++++++++ app/scss/reset.scss | 48 +++++++++++++++++ gulpfile.js | 23 +++++++++ package.json | 34 ++++++++++++ webpack.config.js | 24 +++++++++ 9 files changed, 367 insertions(+) create mode 100644 .eslintrc create mode 100644 .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 100644 gulpfile.js create mode 100644 package.json create mode 100644 webpack.config.js diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000..8dc6807 --- /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" +} diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..aadf4a5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,123 @@ +# Created by https://www.gitignore.io/api/node,vim,osx,macos,linux + +*node_modules + +#ignore data files +data/ + +#ignore build directories +build + +### Node ### +# Logs +logs +*.log +npm-debug.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 + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules +jspm_packages + +# 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 + + + +### 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 + + +### 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 + + +### macOS ### +# Icon must end with two \r +# Thumbnails +# Files that might appear in the root of a volume +# Directories potentially created on remote AFP share + + +### 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* + +# End of https://www.gitignore.io/api/node,vim,osx,macos,linux diff --git a/app/entry.js b/app/entry.js new file mode 100644 index 0000000..5d2dec0 --- /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 to da beach duuuude!'; + + cowsayCtrl.speak = function(input) { + $log.debug('cowsayCtrl.speak()'); + return cowsay.say({ text: input || 'suppppp duuuuuude', f: 'turtle' }); + }; + + 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..874495a --- /dev/null +++ b/app/index.html @@ -0,0 +1,28 @@ + + + + Welcome to Cowville + + +
+

{{ 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..0306225 --- /dev/null +++ b/app/scss/main.scss @@ -0,0 +1,37 @@ +$main-back: #548; +$button-main: $main-back / 2; +$margin-bottom: 6%; +$button-width: 20%; + + +body { + font-family: fantasy; + font-size: 2vw; + background: $main-back * 3; + text-align: center; +} + +h2 { + font-size: 3vw; + margin-bottom: $margin-bottom; + margin-top: $margin-bottom; + +} + +button { + float: right; + width: $button-width; + margin-right: $margin-bottom; + padding: 2% 0; + background: $main-back / 3; + color: #587; + border: 0.2vw solid #587; + cursor: pointer; +} + +input { + background: $main-back / 3; + border: 0.2vw solid #587; + padding: 2% 0; + color: #587; +} 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 100644 index 0000000..032c482 --- /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..e26f646 --- /dev/null +++ b/package.json @@ -0,0 +1,34 @@ +{ + "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": "entry.js", + "scripts": { + "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/caylazabel/20-intro_to_angular_and_webpack.git" + }, + "keywords": [], + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/caylazabel/20-intro_to_angular_and_webpack/issues" + }, + "homepage": "https://github.com/caylazabel/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..7d44dd0 --- /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 61d08873613a4a5a97ffc3e6c60ba50ac0e889d0 Mon Sep 17 00:00:00 2001 From: caylazabel Date: Mon, 20 Mar 2017 16:55:33 -0700 Subject: [PATCH 2/6] bonus working I think --- app/entry.js | 14 +++++++++++--- app/index.html | 12 +++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/app/entry.js b/app/entry.js index 5d2dec0..1d7b624 100644 --- a/app/entry.js +++ b/app/entry.js @@ -16,14 +16,22 @@ function CowsayController($log, $scope) { let cowsayCtrl = $scope.cowsayCtrl = {}; cowsayCtrl.title = 'Welcome to da beach duuuude!'; + cowsayCtrl.oldTitle ='I repeat when asked to'; + + cowsayCtrl.spoke = function(oldInput) { + $log.debug('cowsayCtrl.spoke()'); + return cowsay.say({ text: oldInput|| 'suppppp duuuuuude', f: 'turtle' }); + }; cowsayCtrl.speak = function(input) { $log.debug('cowsayCtrl.speak()'); - return cowsay.say({ text: input || 'suppppp duuuuuude', f: 'turtle' }); + return cowsay.say({ text: input || 'suppp', f: 'turtle' }); }; - cowsayCtrl.logger = function(input) { + + cowsayCtrl.logger = function(input, oldInput) { $log.debug('cowsayCtrl.logger()'); - $log.log(input); + $log.log(input, oldInput); + // return cowsay.say({text: input || 'repeat me now'}); }; } diff --git a/app/index.html b/app/index.html index 874495a..18c3617 100644 --- a/app/index.html +++ b/app/index.html @@ -6,15 +6,21 @@

{{ cowsayCtrl.title }}

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

{{cowsayCtrl.oldTitle}}

+ 
+    {{ cowsayCtrl.spoke(cowsayCtrl.text) }}
+
+ - -
From 15b5207353c8d3597dedbcb79645345c8b26107d Mon Sep 17 00:00:00 2001 From: caylazabel Date: Tue, 21 Mar 2017 09:13:58 -0700 Subject: [PATCH 3/6] redid some styles --- app/scss/main.scss | 44 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 7 deletions(-) diff --git a/app/scss/main.scss b/app/scss/main.scss index 0306225..74bf0e7 100644 --- a/app/scss/main.scss +++ b/app/scss/main.scss @@ -1,20 +1,19 @@ $main-back: #548; $button-main: $main-back / 2; $margin-bottom: 6%; -$button-width: 20%; +$button-width: 50%; body { font-family: fantasy; font-size: 2vw; background: $main-back * 3; - text-align: center; } h2 { font-size: 3vw; + text-align: center; margin-bottom: $margin-bottom; - margin-top: $margin-bottom; } @@ -26,12 +25,43 @@ button { background: $main-back / 3; color: #587; border: 0.2vw solid #587; + border-radius: 3px; cursor: pointer; + transition: 350ms all; } -input { - background: $main-back / 3; +input [type="text"]{ + float: left; + width: $button-width; + margin-right: $margin-bottom; border: 0.2vw solid #587; - padding: 2% 0; - color: #587; + padding: 2%; + border: none; + border-radius: 3px; + +} + +pre { + font-family: monospace; + margin: $margin-bottom; +} + +.container { + float: left; + width: $button-width; + margin: 5%; +} + +.text-binder { + height: 15vw; + font-size: 3vw; + margin: $margin-bottom; + padding: 1vw; + color: #fff; + background: $main-back / 3; + border: dotted .25vw $main-back; + + + input { + width: 100%; + } } From 08601f1294dac0f3bed3480447ae81cb6f3a79ac Mon Sep 17 00:00:00 2001 From: caylazabel Date: Tue, 21 Mar 2017 13:00:55 -0700 Subject: [PATCH 4/6] small changes --- app/entry.js | 10 +++++----- app/index.html | 2 +- webpack.config.js | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/entry.js b/app/entry.js index 1d7b624..bf90783 100644 --- a/app/entry.js +++ b/app/entry.js @@ -1,12 +1,12 @@ 'use strict'; -require('./scss/reset.scss'); -require('./scss/main.scss'); +require('./scss/reset.scss'); //not js files// +require('./scss/main.scss'); //loaders and webpack turn from static assests into js files// -const angular = require('angular'); -const cowsay = require('cowsay-browser'); +const angular = require('angular'); //angular js// +const cowsay = require('cowsay-browser'); //so we can interact with the cowsay browser// -const cowsayApp = angular.module('cowsayApp', []); +const cowsayApp = angular.module('cowsayApp', []); //cowsayApp is the name of the app, no other major dependencies in this structure// cowsayApp.controller('CowsayController', ['$log', '$scope', CowsayController]); diff --git a/app/index.html b/app/index.html index 18c3617..7b498d8 100644 --- a/app/index.html +++ b/app/index.html @@ -1,5 +1,5 @@ - + Welcome to Cowville diff --git a/webpack.config.js b/webpack.config.js index 7d44dd0..8bfa11f 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -14,10 +14,10 @@ module.exports = { }) ], module: { - loaders: [ + loaders: [ //take static assets and turn them into javascript files { test: /\.scss$/, - loader: 'style!css!sass!' + loader: 'style!css!sass!' //from right to left// } ] } From c5ecf346b89e07c5e66bcac36d602d1557e3ad49 Mon Sep 17 00:00:00 2001 From: caylazabel Date: Tue, 21 Mar 2017 17:36:18 -0700 Subject: [PATCH 5/6] some basics on here right now --- .babelrc | 3 + app/entry.js | 62 ++++++++++++----- app/index.html | 78 ++++++++++++++-------- app/scss/main.scss | 163 ++++++++++++++++++++++++++++++++------------- package.json | 6 +- webpack.config.js | 15 ++++- 6 files changed, 236 insertions(+), 91 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 bf90783..a89341d 100644 --- a/app/entry.js +++ b/app/entry.js @@ -6,32 +6,60 @@ require('./scss/main.scss'); //loaders and webpack turn from static assests into const angular = require('angular'); //angular js// const cowsay = require('cowsay-browser'); //so we can interact with the cowsay browser// -const cowsayApp = angular.module('cowsayApp', []); //cowsayApp is the name of the app, no other major dependencies in this structure// +const cowsayApp = angular.module('cowsayApp', []); //cowsayApp is the name of the app, no other major dependencies in this structure// -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 = {}; + this.title = 'Cow Creator.'; + this.secondTitle = 'make it, view it, and undo it!'; + this.subTitle1 = 'view it!'; + this.subTitle2 = 'check out the cow you just made!'; + this.history = []; - cowsayCtrl.title = 'Welcome to da beach duuuude!'; - cowsayCtrl.oldTitle ='I repeat when asked to'; + cowsay.list((err, cowfiles)=> { + this.cowfiles = cowfiles; + this.current = this.cowfiles[0]; + }); - cowsayCtrl.spoke = function(oldInput) { - $log.debug('cowsayCtrl.spoke()'); - return cowsay.say({ text: oldInput|| 'suppppp duuuuuude', f: 'turtle' }); - }; - cowsayCtrl.speak = function(input) { - $log.debug('cowsayCtrl.speak()'); - return cowsay.say({ text: input || 'suppp', f: 'turtle' }); + this.update = function(input) { + $log.debug('cowsayCtrl.update'); + return cowsay.say({ text: input || 'suppppp duuuuuude', f: this.current}); }; + this.speak = function(input) { + $log.debug('cowsayCtrl.speak'); + this.spoken = this.update(input); + this.history.push(this.spoken); + }; - cowsayCtrl.logger = function(input, oldInput) { - $log.debug('cowsayCtrl.logger()'); - $log.log(input, oldInput); - // return cowsay.say({text: input || 'repeat me now'}); + 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: 'cow creator', + url: '/cowcreator' + }, + { + name: 'account', + url: '/myaccount' + } + ]; +} diff --git a/app/index.html b/app/index.html index 7b498d8..f2cb401 100644 --- a/app/index.html +++ b/app/index.html @@ -1,34 +1,60 @@ - - - Welcome to Cowville - - -
-

{{ cowsayCtrl.title }}

- + + + Welcome to Cowville + + +
+ +
- +
+
+
+

{{ cowsayCtrl.title }}

{{ cowsayCtrl.secondTitle }}

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

{{cowsayCtrl.oldTitle}}

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

2 Way Data Binding!!

+
+

_____________________________________________________________________

+
+

{{ cowsayCtrl.subTitle1 }}

{{ cowsayCtrl.subTitle2 }}

+
+ 
+             {{ cowsayCtrl.spoken }}
+
-

{{ cowsayCtrl.bindText }}

- -
-
- - + + + +
+ + diff --git a/app/scss/main.scss b/app/scss/main.scss index 74bf0e7..b606d9f 100644 --- a/app/scss/main.scss +++ b/app/scss/main.scss @@ -1,67 +1,140 @@ -$main-back: #548; -$button-main: $main-back / 2; -$margin-bottom: 6%; -$button-width: 50%; +$brand-primary: rgb(144, 144, 144); +$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: fantasy; - font-size: 2vw; - background: $main-back * 3; + font-family: helvetica; + font-size: 2vw; + background: $brand-primary * 3; +} + +a { + text-decoration: none; + color: $black; + cursor: pointer; } h2 { - font-size: 3vw; - text-align: center; - margin-bottom: $margin-bottom; + font-size: 5vw; + color: $brand-primary; + margin-left: 2.5%; + display:inline; +} +h3{ + margin-left: 0%; + display:inline; + color: $brand-primary; } -button { - float: right; - width: $button-width; - margin-right: $margin-bottom; - padding: 2% 0; - background: $main-back / 3; - color: #587; - border: 0.2vw solid #587; - border-radius: 3px; - cursor: pointer; - transition: 350ms all; +h4{ + color: lightgrey; + position: absolute; + display:inline; } +button { + position: relative; + width: 35%; + float:right; + padding: 2% 0; + margin-bottom: 20px; + background: $btn-primary / 3; + color: #fff; + border: none; + border-radius: 3px; + cursor: pointer; + transition: 350ms all; -input [type="text"]{ - float: left; - width: $button-width; - margin-right: $margin-bottom; - border: 0.2vw solid #587; - padding: 2%; - border: none; - border-radius: 3px; + &:hover { + background: $btn-hover; + } +} +input[type="text"] { + float: right; + width: 35%; + margin-bottom: 2%; + padding: 2%; + border: solid lightgrey; + border-radius: 3px; } +select { + width: 35%; + margin-bottom: 10%; + float: right; + margin-top: 5%; + +} +.animal{ + float:left; +} pre { - font-family: monospace; - margin: $margin-bottom; + overflow: hidden; + width: 87%; + font-family: monospace; + margin: $gutter-std / 5; + padding: $gutter-std; + border: solid .25vw black; } +// :::: app styles :::: + +nav { + height: 4vw; + background: $brand-primary; + padding: 2vw; + margin-bottom: $gutter-std; + + ul{ + float:right; + + li { + display: inline-block; + margin-right: 3vw; + + a { + font-size: 3vw; + color: lightgrey; + + + &:active{ + text-decoration:underline; + } + } + } + } + } + .container { - float: left; - width: $button-width; - margin: 5%; + width: 75%; + margin-left: 10%; } .text-binder { - height: 15vw; - font-size: 3vw; - margin: $margin-bottom; - padding: 1vw; - color: #fff; - background: $main-back / 3; - border: dotted .25vw $main-back; - - + input { - width: 100%; - } + height: 15vw; + font-size: 3vw; + margin: $gutter-std; + padding: 1vw; + color: $white; + background: $brand-primary / 3; + border: dotted .25vw $brand-primary; + + + input { + width: 100%; + } + // .divider{ + // margin-bottom: : 2%; + // + // } + + } diff --git a/package.json b/package.json index e26f646..19dff12 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "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": "entry.js", + "main": "index.js", "scripts": { "build": "./node_modules/webpack/bin/webpack.js", "watch": "./node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot" @@ -20,8 +20,12 @@ "homepage": "https://github.com/caylazabel/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 8bfa11f..1c9ee09 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: [ //take static assets and turn them into javascript files + { + test: /\.js$/, + exclude: /node_modules/, + loader: 'babel' + }, { test: /\.scss$/, - loader: 'style!css!sass!' //from right to left// + loader: 'style!css!sass!' + }, + { + test: /\.(eot|woff|ttf|svg).*/, + loader: 'url?limit=10000&name=fonts/[hash].[ext]' } ] } From cd931ab8c36886e01a3464b0b4321ba941dd52e4 Mon Sep 17 00:00:00 2001 From: caylazabel Date: Tue, 21 Mar 2017 22:26:11 -0700 Subject: [PATCH 6/6] this was alot --- app/index.html | 21 ++++++++++++++++----- app/scss/main.scss | 24 ++++++++++++++++++------ 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/app/index.html b/app/index.html index f2cb401..0e0b90d 100644 --- a/app/index.html +++ b/app/index.html @@ -29,19 +29,29 @@

{{ cowsayCtrl.title }}

{{ cowsayCtrl.secondTitle }}

{{ cowsayCtrl.update(cowsayCtrl.text) }} + +
- - - + + +
What does it say? - - +
+
View it! + +
+

_____________________________________________________________________

@@ -55,6 +65,7 @@

{{ cowsayCtrl.subTitle1 }}

{{ cowsayCtrl.subTitle2 }}

+
diff --git a/app/scss/main.scss b/app/scss/main.scss index b606d9f..4b86079 100644 --- a/app/scss/main.scss +++ b/app/scss/main.scss @@ -86,6 +86,20 @@ pre { border: solid .25vw black; } +aside{ + float: right; + width: 40%; + // height: 300px; + margin-top: $gutter-sm; + margin-right: $gutter-std; + color: $brand-primary; + } + + .extra-wrapper { + margin-top: 10%; + margin-bottom: 10%; + } + // :::: app styles :::: nav { @@ -131,10 +145,8 @@ nav { + input { width: 100%; } - // .divider{ - // margin-bottom: : 2%; - // - // } - - + footer{ + bottom: 1; + right: 1; + } }