Skip to content
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

Molly and Zach Week 6 MEAN Stack 1: FINAL #7

Open
wants to merge 113 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
0da3ee2
Rename and add new readme
Oct 5, 2015
783d0b9
Set up basic file structure
mollyfish Oct 6, 2015
a8fd527
Install Gulp and Sass, run npm init
mollyfish Oct 6, 2015
66a8d77
Merge pull request #1 from mollyfish/directories
Oct 6, 2015
e45271e
Remove .DS_Store, add mongoose, express and express server
Oct 6, 2015
7426bef
Add procfile
Oct 6, 2015
4bb3dca
Merge pull request #2 from mollyfish/express-server
mollyfish Oct 6, 2015
bbf03ae
Add 404 response to server.js
mollyfish Oct 6, 2015
63b5907
Add root directory to server so it can find stylesheets
mollyfish Oct 6, 2015
9fe8517
Break to show Mark a different branch
mollyfish Oct 6, 2015
9bf6122
Add public folder as default folder
mollyfish Oct 6, 2015
fbc76fa
Merge pull request #3 from mollyfish/express
Oct 6, 2015
b096b80
Add icomoon icons
Oct 6, 2015
011b71d
Add icon circle style
Oct 6, 2015
9f5480f
Revise icon circle style
Oct 6, 2015
5a10e2d
Make button components, Typography and Color modules
mollyfish Oct 6, 2015
d3832b6
Revise icon circle style
Oct 6, 2015
bfc8e63
Add icon.html component
Oct 6, 2015
84bb4f7
Merge pull request #4 from mollyfish/buttons
Oct 6, 2015
467fb5a
Add imports and gulp watch
Oct 6, 2015
87345e1
Merge pull request #5 from mollyfish/icons
mollyfish Oct 6, 2015
b8cecc3
Fix font imports
Oct 6, 2015
94462e5
Merge pull request #6 from mollyfish/fix-icons
mollyfish Oct 6, 2015
74f0369
Create Connection Link module and component
mollyfish Oct 6, 2015
d70b27f
Merge pull request #7 from mollyfish/connection-links
Oct 6, 2015
96ef304
Add footer elements
Oct 6, 2015
fae6862
Resolve merge conflicts
Oct 6, 2015
3650be2
Style footer
Oct 6, 2015
95fd2f4
Merge pull request #8 from mollyfish/footer
mollyfish Oct 6, 2015
680d057
Add header html file and header scss
Oct 6, 2015
a783748
Fix footer tags and tabbing
Oct 6, 2015
680d13c
Merge pull request #9 from mollyfish/footer
mollyfish Oct 6, 2015
a0782e3
Merge branch 'master' into header
Oct 6, 2015
4b2e98b
Begin Contact section component - break for lecture
mollyfish Oct 6, 2015
a94c4d0
Add breakpoint mixin
mollyfish Oct 6, 2015
b60ffc4
Break for lecture. In the middle of media queries
mollyfish Oct 6, 2015
804fa61
Add basic angular
mollyfish Oct 6, 2015
754909e
Add html boiler
Oct 6, 2015
80bbc8b
Finish contact section with mostly flexbox
mollyfish Oct 6, 2015
06df612
Resolve merge conflict in main.scss
mollyfish Oct 6, 2015
81cb145
Merge pull request #10 from mollyfish/contact-info
Oct 7, 2015
2b6d798
Merge pull request #11 from mollyfish/angular
Oct 7, 2015
33d1726
Merge branch 'master' into header
Oct 7, 2015
e9b1b75
Fix flex issue in footer
Oct 7, 2015
ca34446
Add header import and begin desktop nav layout
Oct 7, 2015
5e6f119
Fix Sass bug
mollyfish Oct 7, 2015
d0f01f8
Merge pull request #12 from mollyfish/sass-bug
mollyfish Oct 7, 2015
f0663a6
Create hero box component
mollyfish Oct 7, 2015
8a3120b
Secondary nav component. Restyled icons
mollyfish Oct 7, 2015
f48c67e
Merge pull request #13 from mollyfish/hero-box
Oct 7, 2015
9e56bdf
Add my name to author in json
Oct 7, 2015
68406b7
Fix merge conflicts
Oct 7, 2015
e1cf7aa
Merge branch 'secondary-nav'
Oct 7, 2015
aaad73f
Fix merge conflicts
Oct 7, 2015
57c842d
Fix merge conflicts
Oct 7, 2015
dbc1300
Add home nav bar style
Oct 7, 2015
c46f6e4
Add mobile nav responsiveness
Oct 7, 2015
7129d1f
Final edits
Oct 7, 2015
198ddcd
Merge pull request #15 from mollyfish/conflicts-fix
mollyfish Oct 7, 2015
8d1504a
Make feature box component, update btn component styles
mollyfish Oct 7, 2015
3a20742
Merge pull request #16 from mollyfish/feature-box
Oct 7, 2015
f70b20c
Merge pull request #17 from mollyfish/header
mollyfish Oct 7, 2015
1c572b9
Compile html files into index
Oct 7, 2015
2650b16
Remove unused footer classes
Oct 7, 2015
b4d3c3e
Merge pull request #18 from mollyfish/compile-index
mollyfish Oct 7, 2015
69a81e9
Working webpack, but not in watch mode
mollyfish Oct 7, 2015
7ba0d29
Working angular require and webpack and Sass watch
mollyfish Oct 7, 2015
341ff84
Attempt to resolve errors
mollyfish Oct 7, 2015
4105e93
resolve merge conflicts
mollyfish Oct 7, 2015
8e5289b
Merge pull request #20 from mollyfish/old-state
Oct 7, 2015
bf20a70
Fix package.json to allow webpack to run
mollyfish Oct 7, 2015
c248cff
Merge pull request #21 from mollyfish/old-state
Oct 7, 2015
bcc0695
Convert header and nav spans to pseudo elements
mollyfish Oct 7, 2015
f259819
Reorg files. Make src directory. Make Previews component
mollyfish Oct 7, 2015
b5657c7
Refactor angular to iterate through a collection of posts
mollyfish Oct 7, 2015
ceaa6d2
Start small format fixes
mollyfish Oct 7, 2015
9ff343a
Code lint
mollyfish Oct 7, 2015
f5ff700
Finish small format fixes
mollyfish Oct 7, 2015
8d6a30d
Merge pull request #23 from mollyfish/format-bugs
Oct 7, 2015
cc1688e
Merge branch 'master' into blog-posts
mollyfish Oct 7, 2015
cbf64ab
Merge pull request #22 from mollyfish/blog-posts
Oct 7, 2015
68679f5
Initial commit. File cleanup
mollyfish Oct 8, 2015
d5c34a2
Ignore testing directory
mollyfish Oct 8, 2015
c96e82c
Import Mike's soccer app to work in our folders
mollyfish Oct 8, 2015
3ffbfb5
Break to show off Angular
mollyfish Oct 8, 2015
8e7b5d5
Change names to blog and post
mollyfish Oct 8, 2015
f5affd2
Import styles, reformat post list template
mollyfish Oct 8, 2015
448a0ef
Limit length of displayed preview
mollyfish Oct 8, 2015
981e7fe
Add posts to database
mollyfish Oct 8, 2015
71420f8
Format detail view and new post form
mollyfish Oct 8, 2015
23eb64a
Remove extra files. Check public into git
mollyfish Oct 8, 2015
1cf07f9
Edit README
mollyfish Oct 8, 2015
3ca2738
Merge pull request #24 from mollyfish/server-test
Oct 8, 2015
182cea1
Apply refactors from lecture.
mollyfish Oct 9, 2015
450e69f
Refactor server.js to avoid assets aliasing
mollyfish Oct 9, 2015
2028c36
Format date field in input form
mollyfish Oct 9, 2015
204240a
Merge pull request #26 from mollyfish/refactor
Oct 9, 2015
0f6b9f5
Format date field to give a default of the current date
mollyfish Oct 9, 2015
8ebb5a1
Merge pull request #27 from mollyfish/refactor
Oct 9, 2015
691f799
Moved index.html into public, modified gitignore
mollyfish Oct 9, 2015
0cfb8f1
Removed complied files from git cache
mollyfish Oct 9, 2015
0b741c8
Merge pull request #28 from mollyfish/ignore-edits
Oct 9, 2015
b5d12f2
Pull templates out of index.html
mollyfish Oct 9, 2015
8075ef2
Move templates out of index.html
mollyfish Oct 9, 2015
c93cbbc
Merge pull request #29 from mollyfish/templates
Oct 9, 2015
bf99c99
Fix filename typo in post_detail.html
mollyfish Oct 9, 2015
4ced0da
Merge pull request #30 from mollyfish/bugfix
Oct 9, 2015
66bbb1b
Fix typo in server.js, clean up package.json
mollyfish Oct 9, 2015
4e2fd35
Merge pull request #31 from mollyfish/typofix
Oct 9, 2015
282c176
Add minifyCSS back into package.json
mollyfish Oct 9, 2015
6dc9afb
Merge pull request #32 from mollyfish/npm-fix
Oct 9, 2015
0a67dfb
Remove redundant Date.now()
mollyfish Oct 12, 2015
ca63f52
Merge pull request #33 from mollyfish/date
mollyfish Oct 12, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add 404 response to server.js
mollyfish committed Oct 6, 2015
commit bbf03aed4b8aff95edf6053efc9d205a4de273a5
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@
},
"homepage": "https://github.com/mollyfish/mean-stack-1#readme",
"devDependencies": {
"express": "^4.13.3",
"gulp": "^3.9.0",
"gulp-sass": "^2.0.4"
},
13 changes: 10 additions & 3 deletions server.js
Original file line number Diff line number Diff line change
@@ -2,7 +2,16 @@ var express = require('express');
var app = express();

app.get('/', function(req, res){
res.sendFile('public/index.html', {root: __dirname + '/'});
res.status(200).sendFile('public/index.html', {root: __dirname + '/'});
});
app.get('/index', function(req, res){
res.status(200).sendFile('public/index.html', {root: __dirname + '/'});
});
app.get('/index.html', function(req, res){
res.status(200).sendFile('public/index.html', {root: __dirname + '/'});
});
app.get('/*', function(req, res){
res.status(404).sendFile('public/404.html', {root: __dirname + '/'});
});

var port = process.env.PORT || 3000;
@@ -12,5 +21,3 @@ var server = app.listen(port, 'localhost', function() {
var port = server.address().port;
console.log('Server running on: http://localhost:%s',port);
});