Skip to content

Commit

Permalink
blog stub
Browse files Browse the repository at this point in the history
  • Loading branch information
ehpc committed Jun 14, 2016
1 parent a2edb66 commit 3709e83
Show file tree
Hide file tree
Showing 12 changed files with 43 additions and 169 deletions.
6 changes: 4 additions & 2 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ var express = require('express'),
logger = require('morgan'),
cookieParser = require('cookie-parser'),
bodyParser = require('body-parser'),
routes = require('./routes/index'),
routesIndex = require('./routes/index'),
routesBlog = require('./routes/blog'),
app = express();
// TODO var favicon = require('serve-favicon');

Expand All @@ -19,7 +20,8 @@ app.use(bodyParser.urlencoded({ extended: false }));
app.use(cookieParser());
app.use(express.static(path.join(__dirname, 'public')));

app.use('/', routes);
app.use('/', routesIndex);
app.use('/blog', routesBlog);

// Catch 404 and forward to error handler
app.use(function (req, res, next) {
Expand Down
38 changes: 33 additions & 5 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ var gulp = require('gulp'),
// Compile less to css
gulp.task('less', function () {
return gulp
.src(['less/index.less'])
.src(['less/**/*.less'])
.pipe(less())
.pipe(gulp.dest('public/css/'));
});

// Compile all styles to one
// Compile all index styles into one
gulp.task('compile-css-index', ['less'], function () {
return gulp
.src(['node_modules/normalize.css/normalize.css', 'public/css/index.css'])
Expand All @@ -25,6 +25,15 @@ gulp.task('compile-css-index', ['less'], function () {
.pipe(gulp.dest('public/css/'));
});

// Compile all blog styles into one
gulp.task('compile-css-blog', ['less'], function () {
return gulp
.src(['node_modules/normalize.css/normalize.css', 'public/css/blog.css'])
.pipe(concat('blog.min.css'))
.pipe(minifyCss())
.pipe(gulp.dest('public/css/'));
});

// Compile all index-specific js
gulp.task('compile-js-index', function () {
return gulp
Expand All @@ -36,19 +45,38 @@ gulp.task('compile-js-index', function () {
.pipe(gulp.dest('public/js/'));
});

// Compile all blog-specific js
gulp.task('compile-js-blog', function () {
return gulp
.src(['js/blog.js'])
.pipe(concat('blog.min.js'))
.pipe(uglify({
mangle: true
}))
.pipe(gulp.dest('public/js/'));
});

// Remove all temporary files
gulp.task('cleanup', ['compile-css-index', 'compile-js-index'], function () {
return del([
'public/css/index.css'
'public/css/index.css',
'public/css/blog.css'
]);
});

// Automated builds
gulp.task('watch', function () {
watch('less/**/*.less', batch(function (events, done) {
watch(['less/**/*.less', '**/*.js', '**/*.ejs'], batch(function (events, done) {
gulp.start('default', done);
}));
});

// All at once
gulp.task('default', ['less', 'compile-css-index', 'compile-js-index', 'cleanup']);
gulp.task('default', [
'less',
'compile-css-index',
'compile-css-blog',
'compile-js-index',
'compile-js-blog',
'cleanup'
]);
Empty file added js/blog.js
Empty file.
Empty file added less/blog.less
Empty file.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ehpc.io",
"version": "0.0.0",
"version": "0.1.0",
"private": true,
"scripts": {
"start": "node ./bin/www"
Expand Down
1 change: 1 addition & 0 deletions public/css/blog.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

155 changes: 0 additions & 155 deletions public/css/index.css

This file was deleted.

2 changes: 1 addition & 1 deletion public/css/index.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Empty file added public/js/blog.min.js
Empty file.
2 changes: 1 addition & 1 deletion public/js/index.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion routes/blog.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var express = require('express'),
router = express.Router();

router.get('/blog', function (req, res) {
router.get('/', function (req, res) {
res.render('blog/index');
});

Expand Down
4 changes: 1 addition & 3 deletions views/index.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">

<title>Eugene Maslovich aka ehpc</title>
<title>ehpc's home</title>

<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="css/index.min.css">
Expand All @@ -29,11 +29,9 @@
</header>

<nav>
<!-- Coming soon ;)
<div class="mainNav">
<a href="/blog">blog</a>
</div>
-->
<div class="linkNav">
<div class="row">
<div class="col single">
Expand Down

0 comments on commit 3709e83

Please sign in to comment.