From 7fc55f4dfa13324cd0ce2f78d3892d76f1840577 Mon Sep 17 00:00:00 2001 From: Nikko Pisciotti Date: Mon, 20 Mar 2017 16:27:53 -0700 Subject: [PATCH 1/2] added basic structure+ first two cowsay controller functions --- .eslintrc | 0 .gitignore | 132 ++++++++++++++++++++++++++++++++++++++++++++ app/entry.js | 27 +++++++++ app/index.html | 12 ++++ app/scss/main.scss | 0 app/scss/reset.scss | 48 ++++++++++++++++ package.json | 34 ++++++++++++ webpack.config.js | 25 +++++++++ 8 files changed, 278 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 package.json create mode 100644 webpack.config.js diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000..e69de29 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4785718 --- /dev/null +++ b/.gitignore @@ -0,0 +1,132 @@ + +# Created by https://www.gitignore.io/api/node,osx,windows,linux + +### Linux ### +*~ + +#Build (webpack) +build/ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +### Node ### +# Logs +logs +*.log +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# Runtime data +pids +*.pid +*.seed +*.pid.lock + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul +coverage + +# nyc test coverage +.nyc_output + +# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) +.grunt + +# Bower dependency directory (https://bower.io/) +bower_components + +# node-waf configuration +.lock-wscript + +# Compiled binary addons (http://nodejs.org/api/addons.html) +build/Release + +# Dependency directories +node_modules/ +jspm_packages/ + +# Typescript v1 declaration files +typings/ + +# Optional npm cache directory +.npm + +# Optional eslint cache +.eslintcache + +# Optional REPL history +.node_repl_history + +# Output of 'npm pack' +*.tgz + +# Yarn Integrity file +.yarn-integrity + +# dotenv environment variables file +.env + + +### OSX ### +*.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### Windows ### +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# End of https://www.gitignore.io/api/node,osx,windows,linux diff --git a/app/entry.js b/app/entry.js new file mode 100644 index 0000000..5de43d1 --- /dev/null +++ b/app/entry.js @@ -0,0 +1,27 @@ +'use strict'; + +require('./app/scss/reset.scss'); +require('./app/scss/main.scss'); + +const angular = require('angular'); +const cowsay = require('cowsay-browser'); + +const mooMooCowApp = angular.module('mooMooCowApp', []); + +mooMooCowApp.controller('CowsayController', ['$log', '$scope', CowsayController]); + +function CowsayController($log, $scope) { + $log.debug('CowsayController'); + + let cowsayCtrl = $scope.cowsayCtrl = {}; + + cowsayCtrl.speak = function(input) { + $log.debug('cowsayCtrl.speak'); + return cowsay.say({ text: input || 'I\'m a Moo Moo' }) + }; + + 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..76be87a --- /dev/null +++ b/app/index.html @@ -0,0 +1,12 @@ + + + + + Welcome to MooMooTown + + +
+ +
+ + diff --git a/app/scss/main.scss b/app/scss/main.scss new file mode 100644 index 0000000..e69de29 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/package.json b/package.json new file mode 100644 index 0000000..09892fb --- /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": "webpack.config.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/npisciotti1/20-intro_to_angular_and_webpack.git" + }, + "keywords": [], + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/npisciotti1/20-intro_to_angular_and_webpack/issues" + }, + "homepage": "https://github.com/npisciotti1/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..b744fd1 --- /dev/null +++ b/webpack.config.js @@ -0,0 +1,25 @@ +'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 0957b236b3dcf7af5d7c581ba8a35480577e6dba Mon Sep 17 00:00:00 2001 From: Nikko Pisciotti Date: Mon, 20 Mar 2017 21:49:16 -0700 Subject: [PATCH 2/2] added silly styles --- app/entry.js | 9 ++++++--- app/index.html | 14 +++++++++++++- app/scss/main.scss | 24 ++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/app/entry.js b/app/entry.js index 5de43d1..1256688 100644 --- a/app/entry.js +++ b/app/entry.js @@ -1,7 +1,7 @@ 'use strict'; -require('./app/scss/reset.scss'); -require('./app/scss/main.scss'); +require('./scss/reset.scss'); +require('./scss/main.scss'); const angular = require('angular'); const cowsay = require('cowsay-browser'); @@ -17,7 +17,10 @@ function CowsayController($log, $scope) { cowsayCtrl.speak = function(input) { $log.debug('cowsayCtrl.speak'); - return cowsay.say({ text: input || 'I\'m a Moo Moo' }) + return cowsay.say({ + text: input || 'I\'m a cow... so what!', + f: 'small' + }) }; cowsayCtrl.logger = function(input) { diff --git a/app/index.html b/app/index.html index 76be87a..1f6f066 100644 --- a/app/index.html +++ b/app/index.html @@ -2,11 +2,23 @@ - Welcome to MooMooTown + MooMoo Town
+

{{ cowsayCtrl.title }}

+ + 
+        {{ cowsayCtrl.speak(cowsayCtrl.text) }}
+
+ + + +
+
diff --git a/app/scss/main.scss b/app/scss/main.scss index e69de29..41c575c 100644 --- a/app/scss/main.scss +++ b/app/scss/main.scss @@ -0,0 +1,24 @@ + +body { + background-image: url("http://whd.erth.biz/wp-content/uploads/texture/Green-field-texture.jpg"); + + section { + position: absolute; + top: 300px; + left: 300px; + font-size: 30px; + outline: dotted 1px orange; + } +} + +.cow-speak { + margin: auto; + height: 30px; + border-radius: 5px; +} + +.log-button { + position: absolute; + top: 100px; + left: 300px; +}