Skip to content

James, Peter, Sredna - MEAN Stack 1 (Final) #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.

Sign up for GitHub

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

Jump to bottom
Open
pstrum wants to merge 166 commits into
base: master
Choose a base branch
from
Open

James, Peter, Sredna - MEAN Stack 1 (Final) #16

pstrum wants to merge 166 commits into from

Conversation

@pstrum
Copy link

@pstrum pstrum commented Oct 12, 2015

Created a simple, CRUD blog using the MEAN stack:

  • A local Mongo database
  • Express Server with API
  • Angular front-end JS framework for adding interactivity
  • Node running JS outside the browser

Peter Strumolo and others added 30 commits October 5, 2015 17:03
Add HTML
dd3133a
@pstrum
Merge pull request #4 from pstrum/basic-html
6580c2f 
Add HTML
Add initial layout architecture for Sass
ac7d65d
@pstrum
Merge pull request #7 from pstrum/sass-setup
c303f46 
Add initial layout architecture for Sass
@jimmynono-dd
Add in icons and icons font, add imports to INDEX files
95cdbf1
@jimmynono-dd
add in basic button styling by creating a buttons partial and using a…
4056337 
… mixin
@jimmynono-dd
adjust borders on buttons
ab91824
@pstrum
Merge pull request #9 from pstrum/basicHTML
03efe29 
Basic html
Add css/main.css to gitignore
ef1d23b
Add first draft of style-guide
46fa0ec
Resolve merge conflicts on rebase
ec17c2f
Resolve merge conflicts
92828af
Update the style guide
8a1570d
@pstrum
Merge pull request #10 from pstrum/style-guide
695df69 
Style guide
@jimmynono-dd
merge conflict
05ec40b
@jimmynono-dd
Merge conflicts
565d3f8
Add initial styles to navigation component
4bf3084
Add top navigation layout
88ff6e1
Add layout for the header and page title sections
436cb13
Remove superfluous navigation style sheet
1edfac1
@jimmynono-dd
Merge pull request #11 from pstrum/header-pagetitle
47cf28e 
Header Section & Page Title/Desc Section
@jimmynono-dd
styling on blog section, styling on articles
ec4b86e
@jimmynono-dd
fix merge issue
c78e01f
Work on footer social icons
e272e9d
Merge branch 'master' of https://github.com/pstrum/mean-stack-1 into …
f0850af 
…footer-socialmedia-icons
@pstrum
Merge pull request #12 from pstrum/basicHTML
27d3cd2 
Basic html
Finish creating footer social media icons
02afbc0
@jimmynono-dd
begin styling of footer section
087f923
Fix merge conflict
1cb4f21
@jimmynono-dd
Merge branch 'master' of https://github.com/pstrum/mean-stack-1 into …
e02d675 
…sassJames
Peter Strumolo and others added 30 commits October 11, 2015 19:17
Update delete method to work on form template
c79eb4d
Add ng-show a message when no posts
5f5447b
Add Jimmynono edits
cfe18eb
@pstrum
Merge pull request #40 from pstrum/angularJames
f7bff8e 
Angular james
Merge branch 'master' into angular-fixes
a0dc943 
* master:
  move pre-wrap to p tags
  add ellipses to blog preview, and paragraph breaks
Remove index.html to public gitignore
d429a12
Adjust cache for push
e9b9118
fix untracked files
4a15827
Add responsive, flexible navigation
e1ef8a8
Reverse the order of posts
cb03f27
Move ng-cloak outside article in blog-post.html
3ebec8a
Merge pull request #41 from pstrum/angular-fixes
e070fd8 
Final Updates - this does a lot
Add flexbox placeholder
187c11f
Style header layour
4f98518
Merge branch 'header-pagetitle' into blog-post-styling
7112313
initial set up fonts
c4270ca
Style blog section
4d3ac39
Style header layout
4c4a61b
Update .gitignore
92d380b
Update _blog.scss
d536b3f
Add fonts to gulp tasks
4b58f5d
Update .gitignore
1781893
@pstrum
Merge pull request #35 from pstrum/blog-post-styling
5cbbf6f 
Blog post styling
Edits to section padding
e50b3aa
Merge branch 'master' into fonts-gulp
e810838 
* master:
  Update .gitignore
  Update _blog.scss
  Update .gitignore
  Style header layout
  Style blog section
  Style header layour
  Add flexbox placeholder
  Remove output folder
  Add breaks between paragraphs in blog post view
  Change date to date format
  Work on limiting the number of characters in blog view
  Add missing semicolon. Add output folder to gitignore. Fix mispelled controller name in html
Add home and blog links
263110a
Add functionality to misc links
9f4bfce
Add hover effect on social links
f06e1c2
@pstrum
Merge pull request #43 from pstrum/fonts-gulp
6beec0e 
Final push with fonts gulp task and functional links
@jimmynono-dd
tidy up whitespace
827d8f1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@pstrum @jimmynono-dd