-
Notifications
You must be signed in to change notification settings - Fork 15
lab20-Jeremiah #16
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
lab20-Jeremiah #16
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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" | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
# 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 | ||
*.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 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
'use strict'; | ||
|
||
require('./scss/reset.scss'); | ||
require('./scss/main.scss'); | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good job including your css files. |
||
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 = 'Mooseville'; | ||
|
||
cowsayCtrl.speak = function(input) { | ||
$log.debug('cowsayCtrl.speak()'); | ||
return cowsay.say({ text: input || 'Moose', f:'moose' }); | ||
}; | ||
|
||
cowsayCtrl.logger = function(input) { | ||
$log.debug('cowsayCtrl.logger()'); | ||
$log.log(input); | ||
}; | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good job setting up your controller. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
<!DOCTYPE html> | ||
<html ng-app="cowsayApp"> | ||
<head> | ||
<title>Mooseville</title> | ||
</head> | ||
<body> | ||
<main> | ||
<section class="container1" ng-controller="CowsayController"> | ||
<h2>2 Way Data Binding!</h2> | ||
|
||
<p class="text-binder">{{ cowsayCtrl.bindText }}</p> | ||
<input type="text" ng-model="cowsayCtrl.bindText"> | ||
<button ng-click="cowsayCtrl.logger(cowsayCtrl.text)">Update Something</button> | ||
|
||
</section> | ||
<section class="container" ng-controller="CowsayController"> | ||
<h2>{{ cowsayCtrl.title }}</h2> | ||
<pre class="moose">{{ cowsayCtrl.speak(cowsayCtrl.text) }}</pre> | ||
<input type="text" ng-model="cowsayCtrl.text"> | ||
<button ng-click="cowsayCtrl.logger(cowsayCtrl.text)">Say It</button> | ||
<button ng-click="cowsayCtrl.logger(cowsayCtrl.text)">Repeat It</button> | ||
</section> | ||
</main> | ||
</body> | ||
</html> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good job with your index. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
/* Variables */ | ||
|
||
$skin-primary: maroon; | ||
$btn-primary: $skin-primary / 2; | ||
$btn-hover: grey; | ||
$red: red ; | ||
$black: black ; | ||
$fresh:white; | ||
$box-set: 40%; | ||
$boundary: 20%; | ||
|
||
|
||
|
||
/* global */ | ||
|
||
body { | ||
font-family: helvetica; | ||
font-size: 2vw; | ||
background: $skin-primary; | ||
} | ||
|
||
h2 { | ||
font-size: 3vw; | ||
text-align: center; | ||
margin-bottom: $boundary / 3; | ||
} | ||
|
||
button { | ||
width: $box-set; | ||
margin-top: 1%; | ||
margin-right: 2.5%; | ||
margin-left:5%; | ||
padding: 2% 0; | ||
background: $btn-primary / 3; | ||
color: $red; | ||
border-radius: 3px; | ||
cursor: pointer; | ||
transition: 350ms all; | ||
|
||
&:hover { | ||
background: $btn-hover; | ||
} | ||
} | ||
|
||
input[type="text"] { | ||
margin-left: $boundary; | ||
|
||
width: $box-set + 10%; | ||
margin-right: $boundary / 2; | ||
padding: 2%; | ||
border: none; | ||
border-radius: 3px; | ||
background: $fresh; | ||
|
||
} | ||
|
||
.moose { | ||
margin-left: 20%; | ||
} | ||
|
||
// :::: app styles :::: | ||
|
||
|
||
.container { | ||
width: $box-set; | ||
margin: 5%; | ||
border: solid; | ||
} | ||
|
||
.container1 { | ||
float:right; | ||
margin-right: $boundary; | ||
} | ||
|
||
.text-binder { | ||
|
||
height: 4vw; | ||
font-size: 3vw; | ||
margin-left: $boundary; | ||
padding: 1vw; | ||
color: $black; | ||
background: $skin-primary / 2; | ||
border: solid .25vw $skin-primary; | ||
|
||
+ input { | ||
width: 100%; | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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']); |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
{ | ||
"name": "20-intro_to_angular_and_webpack", | ||
"version": "1.0.0", | ||
"description": " Lab 20 - Intro to Angular and Webpack ======", | ||
"main": "gulpfile.js", | ||
"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" | ||
}, | ||
"scripts": { | ||
"build": "./node_modules/webpack/bin/webpack.js", | ||
"watch": "./node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Don't forget to add in a lint script. |
||
}, | ||
"repository": { | ||
"type": "git", | ||
"url": "git+https://github.com/jtwalters25/20-intro_to_angular_and_webpack.git" | ||
}, | ||
"keywords": [], | ||
"author": "", | ||
"license": "ISC", | ||
"bugs": { | ||
"url": "https://github.com/jtwalters25/20-intro_to_angular_and_webpack/issues" | ||
}, | ||
"homepage": "https://github.com/jtwalters25/20-intro_to_angular_and_webpack#readme" | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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!' | ||
} | ||
] | ||
} | ||
}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Make sure to add your build folder to your gitignore.