Skip to content
This repository has been archived by the owner on Jan 5, 2021. It is now read-only.

Zach Gordon mean-stack-2 (final) #4

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 entry.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
require("./src/js/app.router.js");
require("./src/js/blog.ctrl.js");
require("./src/js/blog.service.js");
6 changes: 3 additions & 3 deletions gulp/config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var dest = "./build";
var dest = "./public";
var src = './src';

module.exports = {
Expand All @@ -13,8 +13,8 @@ module.exports = {
dest: dest + '/assets/'
},
sass: {
src: src + "/css/**/*.{sass,scss}",
dest: dest + '/css/',
src: src + "/style/**/*.{sass,scss}",
dest: dest + '/style/',
settings: {
indentedSyntax: true, // Enable .sass syntax!
}
Expand Down
9 changes: 4 additions & 5 deletions gulp/tasks/markup.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
var gulp = require('gulp');
var config = require('../config').html;

gulp.task('markup', function() {
return gulp.src(config.src)
.pipe(gulp.dest(config.dest));
});

gulp.task("markup", function(){
gulp.src("./src/**/*.html")
.pipe(gulp.dest("./public/"));
})
10 changes: 6 additions & 4 deletions gulp/tasks/sass.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ var handleErrors = require('../util/handleErrors');
var autoprefixer = require('gulp-autoprefixer');
var config = require('../config').sass;

gulp.task('sass', function () {
return gulp.src(config.src)
gulp.task('sass', function() {
console.log(config);
return gulp.src(config.src)
.pipe(sourcemaps.init())
.pipe(sass(config.settings))
.on('error', handleErrors)
.pipe(sourcemaps.write())
.pipe(autoprefixer({ browsers: ['last 2 version'] }))
.pipe(autoprefixer({browsers: ["last 2 version"]}))
.pipe(gulp.dest(config.dest));
// .pipe(sass().on('error', sass.logError))
// .pipe(gulp.dest('./public/style/'));
});

20 changes: 9 additions & 11 deletions gulp/tasks/serve.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
var gulp = require('gulp');
var config = require('../config').server;
var webserver = require('gulp-webserver');
var webpack = require('webpack-stream');

gulp.task('serve', function() {
console.log(config.src);

gulp.src(config.src)
.pipe(webserver({
livereload: config.livereload,
directoryListing: config.directoryListing,
open: config.open,
port: config.port
}));
});
gulp.src("./public/")
.pipe(webserver({
livereload:true,
directoryListing: false,
open: false,
port: 9000,
}));
})
9 changes: 4 additions & 5 deletions gulp/tasks/watch.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
var gulp = require('gulp');
var config = require('../config');

gulp.task('watch', function() {
gulp.watch(config.javascript.src, ['webpack']);
gulp.watch(config.sass.src, ['sass']);
gulp.watch(config.markup.src, ['markup']);
// Watchify will watch and recompile our JS, so no need to gulp.watch it

gulp.task('default', ["sass", "markup", "webpack", "serve"], function(){
gulp.watch("./src/**/*.js", ["webpack"]);
gulp.watch("./src/**/*.html",["markup"]);
});
9 changes: 4 additions & 5 deletions gulp/tasks/webpack.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@ var gulp = require('gulp');
var config = require('../config').javascript;
var webpack = require('webpack-stream');

gulp.task('webpack', function(callback) {
return gulp.src(config.entry)
gulp.task('webpack', function(){
gulp.src("entry.js")
.pipe(webpack({
output: {
filename: config.outputFilename
filename: "bundle.js"
}
}))
.pipe(gulp.dest(config.dest));
.pipe(gulp.dest("./public/js"));
});

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@
"version": "1.0.0",
"description": "",
"dependencies": {
"angular": "^1.4.7",
"angular-route": "^1.4.7",
"gulp": "^3.8.11",
"gulp-autoprefixer": "^2.1.0",
"gulp-changed": "^1.1.1",
"gulp-filesize": "0.0.6",
"gulp-minify-css": "~0.5.1",
"gulp-notify": "^2.2.0",
"gulp-rename": "^1.2.2",
"gulp-sass": "~1.3.3",
"gulp-sass": "^1.3.3",
"gulp-sourcemaps": "^1.5.0",
"gulp-uglify": "^1.1.0",
"gulp-util": "^3.0.4",
Expand Down
8 changes: 8 additions & 0 deletions public/detailed.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<div ng-controller="GistController as gist">
<div>
<h1>{{gist.info[gist.idx].title}}<h1>
<h4>{{gist.info[gist.idx].description}}</h4>
<h6>{{gist.info[gist.idx].author}}</h6>
<h6>{{gist.info[gist.idx].id}}<h6>
</div>
</div>
87 changes: 87 additions & 0 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<!DOCTYPE html>
<html lang="en" ng-app="blog">
<head>
<meta charset="UTF-8">
<meta http-equiv="x-ua-compatible" content="ie=edge">
<title>API Blog</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="apple-touch-icon" href="apple-touch-icon.png">
<link rel="stylesheet" href="style/app.css">
</head>
<body>
<header>
<section>
<h1>intelly</h1>
<nav>
<label for="show-menu">
<span class="icon-menu3"></span>
</label>
<input type="checkbox" id="show-menu">
<ul>
<li><a href="#/">Home</a></li>
<li><a href="#">Pages</a></li>
<li><a href="#/">Blog</a></li>
<li><a href="#">Portfolio</a></li>
<li><a href="#">Shortcodes</a></li>
<li><a href="#">Features</a></li>
<li><a href="#">Contact</a></li>
</ul>
</nav>
</section>
</header>
<section class="hero-box"> <!-- hero-box -->
<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 even in its equatorial</p>
</section> <!-- ends hero-box -->
<nav class="secondary-nav">
<div class="secondary-nav__justify-L">
<a href="#/">Home</a>
<a href="#/">Blog</a>
</div>
<div class="secondary-nav__justify-R">
<p>Share</p>
<a href="http://www.twitter.com" class="icon-twitter secondary-nav__icon"></a>
<a href="http://www.facebook.com" class="icon-facebook secondary-nav__icon"></a>
<a href="https://plus.google.com/" class="icon-google-plus secondary-nav__icon"></a>
<a href="http://www.pinterest.com" class="icon-pinterest secondary-nav__icon"></a>
</div>
</nav><!-- end sec-nav -->

<main ng-view></main>
<script type="text/javascript" src="js/bundle.js"></script>

<section class="feature-box"> <!-- feature-box -->
<h1>Serene in their assurance of their empire over matter</h1>
<p>No one would have believed in the last years of the nineteenth century that this world was being watched keenly and closely by intelligences greater than man’s and yet as more</p>
<a class="btn btn__text btn--theme">Contact Now</a>
<a class="btn btn__text btn--theme">Learn More</a>
</section> <!-- end feature-box -->
<aside class="contact"> <!-- contact -->
<address class="contact__method"><a href="https://goo.gl/maps/C4Q1FUpTdJx">2319 Hilltop Haven Drive<br />Upper Greenwood Lake, NJ 07421</a></address>
<div class="contact__method">
<a href="tel:6624076792">662-407-6792</a>
<a href="mailto:contact@intell.com">contact@intell.com</a>
</div>
<div class="contact__method">
<a href="https://twitter.com/" class="connection-links connection-links__text">
<span class="icon-twitter connection-links__icon"></span>Follow Us
</a>
<a href="https://www.facebook.com/" class="connection-links connection-links__text">
<span class="icon-facebook connection-links__icon"></span>Like Us
</a>
<a href="https://www.linkedin.com/" class="connection-links connection-links__text">
<span class="icon-linkedin connection-links__icon"></span>Connect
</a>
</div>
</aside> <!-- ends contact -->
<footer>
<p>&#169 Intelly LLC</p>
<ul>
<li>Terms of use</li>
<li>Privacy Policy </li>
<li>Contact</li>
<li>Support</li>
</ul>
</footer>
</body>
</html>
Loading