Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
181 commits
Select commit Hold shift + click to select a range
aa43e7f
setting up
Brian11f Oct 6, 2015
78c7249
getting ready
Brian11f Oct 6, 2015
ce21998
webpack
Brian11f Oct 6, 2015
4e1d68b
webpack
Brian11f Oct 6, 2015
ef20bc7
working!
Brian11f Oct 6, 2015
976c094
Merge pull request #1 from brain11f/brian-brach
chrisdholt Oct 6, 2015
9510963
setting up local dependencies
chrisdholt Oct 6, 2015
1fd38e4
Add content to index.html
toalina Oct 6, 2015
7b70f8f
Set up server.js, npm install express --save-dev
toalina Oct 6, 2015
acebc4e
Merge pull request #2 from brain11f/htmlsetup
Brian11f Oct 6, 2015
63aa2f4
Merge branch 'master' of github.com:brain11f/mean-stack-1
chrisdholt Oct 6, 2015
366092c
Merge pull request #3 from brain11f/serversetup
Brian11f Oct 6, 2015
2bad8e0
merging
Brian11f Oct 6, 2015
8c9c0b3
merging
Brian11f Oct 6, 2015
d384d2e
html review
Brian11f Oct 6, 2015
c6d408d
Merge pull request #4 from brain11f/brian-brach
toalina Oct 6, 2015
e7a32c6
resolving merge conflicts
chrisdholt Oct 6, 2015
bae2e8e
Set up Sass file structure, start styleguide.md
toalina Oct 6, 2015
5436199
Add to styleguide.md
toalina Oct 6, 2015
da8ab2a
Merge pull request #7 from brain11f/folders
chrisdholt Oct 6, 2015
7227435
Merge branch 'master' of github.com:brain11f/mean-stack-1 into ch-tue…
chrisdholt Oct 6, 2015
c837819
Set up sub directories and import files in index.scss
toalina Oct 6, 2015
2ebd444
Merge pull request #19 from brain11f/subnav
Brian11f Oct 6, 2015
13911b7
Merge branch 'master' of github.com:brain11f/mean-stack-1 into ch-tue…
chrisdholt Oct 6, 2015
461692e
Set up _subnav and _share-social-icons sass components
toalina Oct 6, 2015
be8305d
Set up _footer.scss in componenets/
toalina Oct 6, 2015
11d4170
Add style to _footer.scss
toalina Oct 6, 2015
dc4954c
Add style to subnav, share-social-icons, and footer components
toalina Oct 6, 2015
2be3404
Set up _contact.scss component
toalina Oct 6, 2015
13ff616
dropdown mobile menu
Brian11f Oct 6, 2015
3e9eedb
Add style to sub-nav, contact, learn-more, share-social, and footer c…
toalina Oct 6, 2015
19bcf7b
added icons to fonts folder, added _typography.scss for @font-family …
chrisdholt Oct 7, 2015
1c62dc0
added selection.json file with details on icons
chrisdholt Oct 7, 2015
1edeb62
added icon logic, added icon class to subNav
chrisdholt Oct 7, 2015
777dee1
Merge pull request #23 from brain11f/ch-tuesday
toalina Oct 7, 2015
3e53de3
Resolve merge conflict
toalina Oct 7, 2015
c7c936c
font size functions and color map functions created, variables create…
chrisdholt Oct 7, 2015
b4aed87
Merge pull request #21 from brain11f/mininav
chrisdholt Oct 7, 2015
d199f16
Merge branch 'master' of github.com:brain11f/mean-stack-1 into ch-tue…
chrisdholt Oct 7, 2015
06f5d86
fix webpack
Brian11f Oct 7, 2015
c5ae61e
added font families, added functions for font sizes, font families, a…
chrisdholt Oct 7, 2015
20ecc01
Finish footer layout
toalina Oct 7, 2015
2aaecd4
Continue work on contact-social-links circle borders
toalina Oct 7, 2015
cb28882
initial layout for desktop for blog summary component and summary con…
chrisdholt Oct 7, 2015
f46d50b
adjusted blog summary layout to flexbox for mobile and after breakpoint
chrisdholt Oct 7, 2015
b194a9c
Merge pull request #24 from brain11f/ch-tuesday
Brian11f Oct 7, 2015
68c7b52
adjusted button sizes to be fixed width by adding display property an…
chrisdholt Oct 7, 2015
ea4389e
Merge branch 'master' of github.com:brain11f/mean-stack-1 into ch-tue…
chrisdholt Oct 7, 2015
788b40d
dropdown mobile menu
Brian11f Oct 7, 2015
072096b
dropdown mobile menu
Brian11f Oct 7, 2015
8cf9c33
dropdown mobile menu
Brian11f Oct 7, 2015
0841e8f
fixed merge conflict
Brian11f Oct 7, 2015
3f11b74
Continue work on border-circle around social links
toalina Oct 7, 2015
e2a4adc
mobile menu
Brian11f Oct 7, 2015
2acf2eb
Complete border-circles on social icons
toalina Oct 7, 2015
a23d261
Resolve merge conflict
toalina Oct 7, 2015
c0b5a58
mobile menu
Brian11f Oct 7, 2015
be952de
Merge pull request #25 from brain11f/socialicons
chrisdholt Oct 7, 2015
d3a641b
added page banner using @mixin
chrisdholt Oct 7, 2015
6253f4b
Merge branch 'master' of github.com:brain11f/mean-stack-1 into page-t…
chrisdholt Oct 7, 2015
f10c7a6
added em function back in as we wait for bourbon
chrisdholt Oct 7, 2015
779f72c
Merge pull request #26 from brain11f/header-nav
chrisdholt Oct 7, 2015
94c0bf2
Add style to footer and contact section
toalina Oct 7, 2015
b4d44c7
Merge pull request #27 from brain11f/socialicons
chrisdholt Oct 7, 2015
c1b7393
merge conflicts
chrisdholt Oct 7, 2015
a437f47
Merge branch 'master' of github.com:brain11f/mean-stack-1 into page-t…
chrisdholt Oct 7, 2015
ab1167c
Merge pull request #28 from brain11f/page-title
Brian11f Oct 7, 2015
7e5397e
Fix border-circle style and height
toalina Oct 7, 2015
481d54e
Merge pull request #29 from brain11f/footer
Brian11f Oct 7, 2015
c9fba70
Fix server.js
toalina Oct 8, 2015
947e40b
gulp working, webpack getting import typography error
Brian11f Oct 8, 2015
058ab1a
Merge pull request #30 from brain11f/serversetup
Brian11f Oct 8, 2015
0bbb546
fixed merge confilict in the package.json
Brian11f Oct 8, 2015
8382ec1
moving to angular
Brian11f Oct 8, 2015
ec6a194
adding partials
Brian11f Oct 8, 2015
f1ae299
adding partials
Brian11f Oct 8, 2015
58626e9
adding partials
Brian11f Oct 8, 2015
308eea8
Merge pull request #31 from brain11f/angularjs-base
chrisdholt Oct 8, 2015
d4ba8df
Complete server.js, successful tests in Postman
toalina Oct 8, 2015
6baea77
all working!
Brian11f Oct 8, 2015
a728bec
Merge pull request #32 from brain11f/crud
Brian11f Oct 8, 2015
6ae5fa2
Merge pull request #33 from brain11f/angularjs-base
toalina Oct 8, 2015
42c97c4
i hate gulp
chrisdholt Oct 8, 2015
a9da706
Merge branch 'master' of github.com:brain11f/mean-stack-1
chrisdholt Oct 8, 2015
48db23d
Create form.html partial
toalina Oct 8, 2015
c37e798
Create blogpost.html, blog.html partials. Revise index.html to includ…
toalina Oct 8, 2015
3fbcffb
Merge pull request #34 from brain11f/angular
chrisdholt Oct 8, 2015
a1aea7b
Merge branch 'master' of github.com:brain11f/mean-stack-1 into holt-t…
chrisdholt Oct 8, 2015
c31fe3f
deleted templates
Brian11f Oct 8, 2015
d898be7
added browserfy
Brian11f Oct 8, 2015
00db887
added gulp-ug
Brian11f Oct 8, 2015
a102e8c
Brian is burning webpack to the ground, adding in angular files for b…
chrisdholt Oct 8, 2015
700554c
Merge pull request #35 from brain11f/holt-thursday
toalina Oct 8, 2015
8c3c3ea
updating
Brian11f Oct 8, 2015
d7ce47d
updating
Brian11f Oct 8, 2015
155ec74
added angular-route
Brian11f Oct 8, 2015
6e585be
Modify variable names for consistancy, Blog to Blogpost
toalina Oct 8, 2015
51715b3
Merge pull request #36 from brain11f/angular
chrisdholt Oct 8, 2015
eeeef6d
Modify blogpost.html partial and naming consistency in scrips/ files
toalina Oct 8, 2015
35b52f3
cleaning up dependencies
Brian11f Oct 8, 2015
7f2937f
gulp working
Brian11f Oct 8, 2015
9a3bd11
Modify style in Learn More, mininav, and page-guide sections
toalina Oct 8, 2015
87f3bd1
Add styles
toalina Oct 8, 2015
c204fd3
Merge pull request #39 from brain11f/testing
chrisdholt Oct 8, 2015
ed278c2
gulp working
Brian11f Oct 8, 2015
899339a
gulp giving error
Brian11f Oct 8, 2015
499e798
gulp giving error
Brian11f Oct 8, 2015
c2ad8cf
gulp giving error
Brian11f Oct 8, 2015
4219e9d
gulp giving error
Brian11f Oct 9, 2015
7827bfb
boom!
Brian11f Oct 9, 2015
bf9f7a7
Merge pull request #40 from brain11f/nukeWebpackTwo
chrisdholt Oct 9, 2015
1a2205e
working on route
Brian11f Oct 9, 2015
46fbc42
pushing to work on gulp agian
Brian11f Oct 9, 2015
fd31115
all working now we can do angular
Brian11f Oct 9, 2015
944df6a
Merge pull request #42 from brain11f/angularjs-blogpost
chrisdholt Oct 9, 2015
44fc905
Fix server.js
toalina Oct 9, 2015
4b93d8e
Fix server.js, add form styles
toalina Oct 9, 2015
19f81af
Merge pull request #43 from brain11f/fixserver
Brian11f Oct 9, 2015
8667004
Modify banner and form styles
toalina Oct 9, 2015
7ddb1aa
Merge pull request #44 from brain11f/fixstyle
Brian11f Oct 9, 2015
6cb526c
Fix fonts paths
toalina Oct 9, 2015
68d4207
Merge pull request #45 from brain11f/fixstyle
Brian11f Oct 9, 2015
22d6863
Fix styles in blogContainer, blogSummary, form, and subnav
toalina Oct 9, 2015
b723b3d
Merge pull request #46 from brain11f/styles
chrisdholt Oct 9, 2015
798d9d8
pushing to master...please don't break. Syntax errors in blog_form.ct…
chrisdholt Oct 9, 2015
0cad34b
Merge pull request #49 from brain11f/fixFormCtrl
toalina Oct 9, 2015
f7295a7
single blog post now appearing!
chrisdholt Oct 9, 2015
db12774
Merge pull request #50 from brain11f/singlePostFix
toalina Oct 9, 2015
524a2f1
blog routes correctly after creation. Server was returning JSON objec…
chrisdholt Oct 9, 2015
f4b63bf
Merge pull request #51 from brain11f/singlePostFix
toalina Oct 9, 2015
617702f
Remove whitespace in index.html
toalina Oct 9, 2015
3ae3997
Remove unused files
toalina Oct 9, 2015
ba55a19
Update package.json
toalina Oct 9, 2015
698ebb0
Merge pull request #52 from brain11f/fixangular
Brian11f Oct 9, 2015
6fcbe41
removing dep
Brian11f Oct 9, 2015
110057b
Merge pull request #57 from brain11f/cleanUpDep
toalina Oct 9, 2015
1e8b7cd
added 'add new blog' button
chrisdholt Oct 9, 2015
3d5fe44
Merge branch 'master' of github.com:brain11f/mean-stack-1 into single…
chrisdholt Oct 9, 2015
6b577e6
add new button added
chrisdholt Oct 9, 2015
112b450
Merge pull request #61 from brain11f/singlePostFix
toalina Oct 9, 2015
b4200e9
added missed dep
Brian11f Oct 9, 2015
fb93247
entry js
Brian11f Oct 9, 2015
e3e0571
entry js
Brian11f Oct 9, 2015
c4c8ebe
entry js
Brian11f Oct 9, 2015
50b9934
Add date controller
toalina Oct 9, 2015
5016ca5
Merge pull request #63 from brain11f/gulpOneFile
toalina Oct 9, 2015
9976674
Resolve merge conflict
toalina Oct 9, 2015
ef09e10
Merge pull request #64 from brain11f/autodate
Brian11f Oct 9, 2015
8dcf38d
Run index.html through HTML Tidy
toalina Oct 9, 2015
918d44d
Add gulp-csslint and gulp-jshint to dev dependencies.
toalina Oct 9, 2015
9225b5c
bourbon working
chrisdholt Oct 9, 2015
2293b6e
adjusted time on blog page, adjusted layout for 'delete' buttons and …
chrisdholt Oct 9, 2015
90cbe48
adjusted top margin for contact/social
chrisdholt Oct 10, 2015
7df94ae
removed extra h1's to match comp, adjusted height from top
chrisdholt Oct 10, 2015
52e2e53
polishing some css up and adjusting to look more like the comp
chrisdholt Oct 10, 2015
67323bd
used limitTo to limit text shown in summary view. Full view shows ful…
chrisdholt Oct 10, 2015
98434f1
removed redundant styles in header-nav
chrisdholt Oct 10, 2015
6666e7a
Merge pull request #67 from brain11f/htmltidy
Brian11f Oct 10, 2015
8ec0717
linked form for editing, trying to prepoluate data into form fields f…
chrisdholt Oct 10, 2015
5c29b7e
Merge pull request #70 from brain11f/singlePostFix
Brian11f Oct 10, 2015
8e75400
working on nav bar
Brian11f Oct 10, 2015
6024ed9
working on nav bar
Brian11f Oct 10, 2015
32290ee
Merge pull request #71 from brain11f/sassyNavBar
chrisdholt Oct 10, 2015
303f6cc
fixed entry js
Brian11f Oct 10, 2015
034a649
Merge pull request #72 from brain11f/objError
chrisdholt Oct 10, 2015
b420310
adjusted font styles for heading to match comp
chrisdholt Oct 10, 2015
938a66c
Merge branch 'master' of github.com:brain11f/mean-stack-1
chrisdholt Oct 10, 2015
14ab47f
moved to new branch off master for push, edit implementation and fix …
chrisdholt Oct 11, 2015
f0d7deb
Merge pull request #74 from brain11f/edit-fix
Brian11f Oct 11, 2015
0e34fa5
style changes to form, moved page banner and sub-nav to partial view
chrisdholt Oct 12, 2015
874760e
adjust form field font size and family
chrisdholt Oct 12, 2015
e53d392
social icon hover added
chrisdholt Oct 12, 2015
feace03
adding new gulp command
Brian11f Oct 12, 2015
f8d883a
partials include page specific banner & page specific subnav
chrisdholt Oct 12, 2015
ff4d1c2
Merge pull request #75 from brain11f/edit-fix
Brian11f Oct 12, 2015
4fd1bbc
Merge branch 'master' of https://github.com/brain11f/mean-stack-1 int…
Brian11f Oct 12, 2015
3fc62da
added serve command
Brian11f Oct 12, 2015
612cb80
Merge pull request #76 from brain11f/messingWithStuff
toalina Oct 12, 2015
4746d5b
Update readme.md
toalina Oct 12, 2015
310cf4c
Merge pull request #77 from brain11f/readme
Brian11f Oct 12, 2015
dc4c8ca
Update readme.md
toalina Nov 13, 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
Binary file added .DS_Store
Binary file not shown.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ logs
pids
*.pid
*.seed
*.DS_Store

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov
Expand All @@ -21,6 +22,8 @@ coverage

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release
app/public/js/**/*.js
app/public/css/*.css

# Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
Expand Down
84 changes: 84 additions & 0 deletions Gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
var gulp = require('gulp'),
sass = require('gulp-sass'),
neat = require('node-neat'),
browserify = require('browserify'),
source = require('vinyl-source-stream'),
uglify = require('gulp-uglify'),
rename = require('gulp-rename'),
es = require('event-stream'),
autoprefixer = require('gulp-autoprefixer');

var csslint = require('gulp-csslint');
var jshint = require('gulp-jshint');

///////all the js to one min file///////////////////
gulp.task('browserify', function() {
// we define our input files, which we want to have
// bundled:
var files = [
'./app/entry.js'
];
// map them to our stream function
var tasks = files.map(function(entry) {
return browserify({ entries: [entry] })
.bundle()
.pipe(source(entry))
// rename them to have "bundle as postfix"
.pipe(rename({
extname: '.bundle.js'
}))
.pipe(gulp.dest('./app/public/js'));
});
// create a merged stream
return es.merge.apply(null, tasks);
});

//////// sass //////////////
var csspaths = {
scss: './app/**/*.scss'
};

gulp.task('sass', function () {
return gulp.src(csspaths.scss)
.pipe(sass({
includePaths: [['run'].concat(neat),
require('node-bourbon').includePaths,
require('node-neat').includePaths
]
}))
.pipe(autoprefixer({
browsers: ['last 2 versions'],
cascade: false
}))
.pipe(gulp.dest('./app/public/css'));
});


/////// run js and sass ///////////
gulp.task('run',function(){
gulp.start('sass');
gulp.start('browserify');
});

/////// watch js and sass //////////
gulp.task('watch', function() {
gulp.watch("./app/**/*.scss", ["sass"]);
gulp.watch(['./node_modules/angular/angular.js', './node_modules/angular-route/angular-route.js', './app/app.js', './app/script/**/*js'], ['browserify']);
});

//////// server js and sass /////////
gulp.task('serve', ['run', 'watch']);

////////// css lint //////////
gulp.task("css", function() {
gulp.src(".app/public/css/*.css")
.pipe(csslint())
.pipe(csslint.reporter());
});

//////// js lint //////////////
gulp.task('lint', function() {
return gulp.src('./app/**/*.js')
.pipe(jshint())
.pipe(jshint.reporter('default'));
});
Binary file added app/.DS_Store
Binary file not shown.
46 changes: 46 additions & 0 deletions app/app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
// require('angular');
// require('angular-route');
(function(){

'use strict';
// Declare app level module which depends on filters, and services
var AwesomeBlogApp = angular.module('AwesomeBlog', ['ngRoute']).

config(["$routeProvider", function ($routeProvider) {
$routeProvider

////route home page blog posts//////////
.when("/blogposts", {
templateUrl: "partials/blogpost.html",
controller: "BlogpostsCtrl as vm",
})

/////form to make more blog posts///////
.when("/blogposts/new", {
templateUrl: "partials/form.html",
controller: "BlogFormCtrl as vm",
})
.when("/blogposts/:blogpost_id/edit", {
templateUrl: "partials/form.html",
controller: "BlogFormCtrl as vm",
})
.when("/blogposts/:blogpost_id", {
templateUrl: "partials/blog.html",
controller: "BlogpostCtrl as vm",
})
.otherwise({
redirectTo: "/blogposts",
});

}]);

// Controller to make DATE work!
AwesomeBlogApp.controller("DateCtrl", ["$scope", function($scope) {
$scope.date = new Date();
}]);

}());

// require('./scripts/blog.service');
// require('./scripts/blog.ctrl');
// require('./blog_form.ctrl');
8 changes: 8 additions & 0 deletions app/entry.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
require("../node_modules/angular/angular.js");
require("../node_modules/angular-route/angular-route.js");
require("./app.js");
require("./scripts/blog.ctrl.js");
require("./scripts/blog.service.js");
require("./scripts/blog_details.directive.js");
require("./scripts/blog_form.ctrl.js");
require("./scripts/blogposts.ctrl.js");
5 changes: 5 additions & 0 deletions app/index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@import "bourbon";
@import "sass/base/index";
@import "sass/typography/index";
@import "sass/utils/index";
@import "sass/components/index";
Binary file added app/public/css/fonts/RobotoSlab-Light.ttf
Binary file not shown.
Binary file added app/public/css/fonts/RobotoSlab-Regular.ttf
Binary file not shown.
Binary file added app/public/css/fonts/Ubuntu-B.ttf
Binary file not shown.
Binary file added app/public/css/fonts/Ubuntu-L.ttf
Binary file not shown.
Binary file added app/public/css/fonts/Ubuntu-LI.ttf
Binary file not shown.
Binary file added app/public/css/fonts/Ubuntu-M.ttf
Binary file not shown.
Binary file added app/public/css/fonts/Ubuntu-R.ttf
Binary file not shown.
Binary file added app/public/css/fonts/icomoon.eot
Binary file not shown.
15 changes: 15 additions & 0 deletions app/public/css/fonts/icomoon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/public/css/fonts/icomoon.ttf
Binary file not shown.
Binary file added app/public/css/fonts/icomoon.woff
Binary file not shown.
100 changes: 100 additions & 0 deletions app/public/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
<!doctype html>
<html lang="en" ng-app="AwesomeBlog">
<head>
<meta charset="UTF-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="viewport" content="width=device-width, user-scalable=no">
<link rel="stylesheet" href="css/index.css">
<title>AwesomeBlog!</title>
</head>
<body>
<!-- NAV -->
<header class="header-container">
<h1 class="logo">intelly</h1>
<nav class="primary-nav-wrap">
<ul>
<li><a class="mobile-nav" href="#">Menu</a>
<ul class="main-nav">
<li><a href="#">HOME</a></li>
<li><a href="#">PAGES</a></li>
<li><a href="#">BLOG</a></li>
<li><a href="#">PORTFOLIO</a>
<ul>
<li><a href="#">Web Design</a></li>
<li><a href="#">Photography</a></li>
<li><a href="#">Consulting</a></li>
<li><a href="#">IOS Develpment</a></li>
</ul>
</li>
<li><a href="#">SHORTCODES</a></li>
<li><a href="#">FEATURES</a></li>
<li><a href="#">CONTACT</a></li>
</ul>
</li>
</ul>
</nav>
</header>


<!-- SOME KIND OF NG-VIEW THING -->
<div ng-controller="BlogpostsCtrl" ng-view></div>

<!-- CONTACT SECTION -->
<section>
<div class="learn-more-wrapper">
<h1>Serene in their assurance of their empire over matter</h1>
<p>No one would have believed in the last years of the nine-teenth century that this world was being watched keenly and closely by intelligence grater than man's</p>
<div class="learn-button-wrapper">
<a class="btn-secondary" href="#">Contact Now</a>
<a class="btn-secondary" href="#">Learn More</a>
</div>
</div>
<div class="contact-info-wrapper">
<div class="address-wrapper">
<address>
2319 Hilltop Haven Drive<br>
Upper Greenwood Lake, NJ 07421
</address>
</div>
<div class="phone-email-wrapper">
<a href="tel:+16624076792">662-407-6792</a><br>
<a href="mailto:contact@intell.com" target="_top">contact@intell.com</a>
</div>
</div>
<div class="contact-social-links-wrapper">
<ul>
<li>
<a class="icon-twitter" href="#">
<span>Follow Us</span>
</a>
</li>
<li>
<a class="icon-facebook" href="#">
<span>Like Us</span>
</a>
</li>
<li>
<a class="icon-linkedin" href="#">
<span>Connect</span>
</a>
</li>
</ul>
</div>
</section>

<!-- FOOTER -->
<footer>
<ul>
<li>&#169; 2014 intelly LLC</li>
<li><a href="#">TERMS OF USE</a></li>
<li><a href="#">PRIVACY POLICY</a></li>
<li><a href="#">CONTACT</a></li>
<li><a href="#">SUPPORT</a></li>
</ul>
</footer>

<!-- SCRIPT TAGS -->
<script src="js/app/entry.bundle.js"></script>

</body>
</html>
37 changes: 37 additions & 0 deletions app/public/partials/blog.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<!-- Blog Main SECTION -->
<section class="page-banner">
<h1>Blog</h1>
</section>
<!-- MINI NAV -->
<div class="sub-nav-wrapper">
<nav class="sub-nav">
<ul>
<li><a href="#">HOME</a></li>
<li><a href="#/blogposts/">BLOG</a></li>
<li>{{vm.blogpost.title}}</li>
</ul>
</nav>
<div class="share-social-icons">
<p>Share</p>
<ul>
<li><a class="icon-twitter" href="#"></a></li>
<li><a class="icon-facebook" href="#"></a></li>
<li><a class="icon-google" href="#"></a></li>
<li><a class="icon-pinterest" href="#"></a></li>
</ul>
</div>
</div>
<section class="blog-container">
<!-- <h1>Single Blogpost!</h1> -->
<article ng-controller="BlogpostCtrl" class="blog-summary">
<h1>{{ vm.blogpost.title }}</h1>
<p> {{ vm.blogpost.text }}</p>
<ul class="blog-metadata">
<li>{{ vm.blogpost.author }}</li>
<li class="date">{{ vm.blogpost.date | date:"MM-dd-yyyy" }}</li>
<li>4 comments</li>
</ul>
<a class="btn-primary" href="#/blogposts/{{ blogpost._id }}">View All</a>
<a class= "btn-small" href="#/blogposts/{{vm.blogpost._id}}/edit">Edit</a>
</article>
</section>
41 changes: 41 additions & 0 deletions app/public/partials/blogpost.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<!-- Blog Main SECTION -->
<section class="page-banner">
<h1>Blog</h1>
<p>The secular cooling that must someday overtake our planet has already gone far indeed with our neighbour. Its physical condition is still largely a mystery, but we know now that</p>
</section>

<!-- MINI NAV -->
<div class="sub-nav-wrapper">
<nav class="sub-nav">
<ul>
<li><a href="#">HOME</a></li>
<li>BLOG</li>
<!-- BLOG link is breadcrumbs -->
</ul>
</nav>
<div class="share-social-icons">
<p>Share</p>
<ul>
<li><a class="icon-twitter" href="#"></a></li>
<li><a class="icon-facebook" href="#"></a></li>
<li><a class="icon-google" href="#"></a></li>
<li><a class="icon-pinterest" href="#"></a></li>
</ul>
</div>
</div>

<section class="blog-container">
<!-- <h1>List of Blogposts!</h1> -->
<article ng-repeat="blogpost in vm.blogposts" class="blog-summary">
<h1>{{ blogpost.title }}</h1>
<p> {{ blogpost.text | limitTo: 300 }}{{ blogpost.text.length > 300 ? '...' : '' }}</p>
<ul class="blog-metadata">
<li>{{ blogpost.author }}</li>
<li class="date">{{ blogpost.date | date:"MM-dd-yyyy" }}</li>
<li>4 comments</li>
</ul>
<a class="btn-primary" href="#/blogposts/{{ blogpost._id }}">Read More</a>
<a class="btn-small" ng-click="vm.delete(blogpost)">Delete</a>
</article>
<a class="btn-primary-alt" href="#/blogposts/new">Add New</a>
</section>
31 changes: 31 additions & 0 deletions app/public/partials/form.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<section class="page-banner">
<h1>Add or Edit A Blogpost</h1>
</section>

<!-- MINI NAV -->
<div class="sub-nav-wrapper">
<nav class="sub-nav">
<ul>
<li><a href="#">HOME</a></li>
<li><a href="#">BLOG</a></li>
<li>Add/Edit</li>
</ul>
</nav>
<div class="share-social-icons">
<p>Share</p>
<ul>
<li><a class="icon-twitter" href="#"></a></li>
<li><a class="icon-facebook" href="#"></a></li>
<li><a class="icon-google" href="#"></a></li>
<li><a class="icon-pinterest" href="#"></a></li>
</ul>
</div>
</div>
<!-- Form -->
<form ng-submit="vm.save()" ng-controller="BlogFormCtrl">
<input type="text" ng-model="vm.blogpost.title" placeholder="Title" />
<textarea type="text" ng-model="vm.blogpost.text" placeholder="Text"></textarea>
<input type="text" ng-model="vm.blogpost.author" placeholder="Author" />
<input type="date" ng-model="vm.blogpost.date" placeholder="Date" />
<input class="btn-primary-alt" type="submit" name="Submit">
</form>
Binary file added app/sass/.DS_Store
Binary file not shown.
3 changes: 3 additions & 0 deletions app/sass/base/_index.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import "reset";
@import "variables";
@import "typography";
Loading