martin/keeper
martin/keeper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

quick update colours and some more tidying

Browse Source
This commit is contained in:
martind2000 2016-03-06 23:00:49 +00:00
parent d069736771
commit b5cd0721af
7 changed files with 40 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/index.html
View File

@ -7,17 +7,19 @@
<link href="//fonts.googleapis.com/css?family=Roboto+Slab:400,300,700" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="//cdn.linearicons.com/free/1.0.0/icon-font.min.css">
<link href="//cdn.muicss.com/mui-0.4.6/css/mui.min.css" rel="stylesheet" type="text/css" />
<!-- inject:css -->
<!-- build:css -->
<link href="css/app.css" rel="stylesheet" type="text/css" />
<link href="css/md.css" rel="stylesheet" type="text/css" />
<link href="css/read.css" rel="stylesheet" type="text/css" />
<link href="css/gist.css" rel="stylesheet" type="text/css" />
<!-- endinject -->
<link href="css/read.css" rel="stylesheet" type="text/css" />
<link href="css/gist.css" rel="stylesheet" type="text/css" />
<!-- endbuild -->
<script src="libs/microevent.js"></script>
<script src="//cdn.muicss.com/mui-0.4.6/js/mui.min.js"></script>
<script src="//code.jquery.com/jquery-2.1.4.min.js"></script>
<!-- build:vendor -->
<script src="libs/ejs.js"></script>
<script src="libs/view.js"></script>
<!-- endbuild -->
<link rel="apple-touch-icon" sizes="57x57" href="fav/apple-touch-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="fav/apple-touch-icon-60x60.png">
@ -85,8 +87,8 @@
</div>
</footer>
</body>
<!-- inject:js -->
<!-- build:js -->
<script src="js/shell.js"></script>
<script src="js/app.js"></script>
<!-- endinject -->
<!-- endbuild -->
</html>

66
app/index.prod.html
View File

@ -1,66 +0,0 @@
<!doctype html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="//fonts.googleapis.com/css?family=Roboto+Slab:400,300,700" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="//cdn.linearicons.com/free/1.0.0/icon-font.min.css">
<link href="//cdn.muicss.com/mui-0.4.6/css/mui.min.css" rel="stylesheet" type="text/css" />
<!-- inject:css -->
<link href="css/app.min.css" rel="stylesheet" type="text/css" />
<link href="css/md.min.css" rel="stylesheet" type="text/css" />
<!-- endinject -->
<script src="//cdn.muicss.com/mui-0.4.6/js/mui.min.js"></script>
<script src="//code.jquery.com/jquery-2.1.4.min.js"></script>
<script src="libs/ejs_production.js"></script>
</head>
<body>
<div id="sidedrawer" class="mui--no-user-select">
<div id="sidedrawer-brand" class="mui--appbar-line-height mui--text-title">Recipes</div>
<div class="mui-divider"></div>
<div id="functions" class="fnBlock">
<span id="fnRefresh" class="lnr lnr-sync"></span>
<span id="fnSearch" class="lnr lnr-magnifier"></span>
</div>
<div id='searchbox' class="mui-textfield" style="display: none;">
<input id='newsearch' type="text" placeholder="Search for..">
</div>
<div class="mui-divider"></div>
<div id="listContainer">
</div>
<div class="mui-divider"></div>
<div class="mui-textfield">
<input id='newurl' type="text" placeholder="Add new url">
<div id="addstatus" style="display:none;">Adding...</div>
</div>
</div>
<header id="header">
<div class="mui-appbar mui--appbar-line-height">
<div class="mui-container-fluid">
<a class="sidedrawer-toggle mui--visible-xs-inline-block js-show-sidedrawer">☰</a>
<a class="sidedrawer-toggle mui--hidden-xs js-hide-sidedrawer">☰</a>
<span class="mui--text-title mui--visible-xs-inline-block">Brand.io</span>
</div>
</div>
</header>
<div id="content-wrapper">
<div class="mui--appbar-height"></div>
<div class="mui-container-fluid" id="bodyContents">
<!-- content here -->
</div>
</div>
<footer id="footer">
<div class="mui-container-fluid">
<br>
Made with ♥ by Martin</a>
</div>
</footer>
</body>
<!-- inject:js -->
<script src="js/main.min.js"></script>
<!-- endinject -->
</html>

1
app/js/shell.js
View File

@ -1,3 +1,4 @@
"use strict";
jQuery(function($) {
var $bodyEl = $('body'),
$sidedrawerEl = $('#sidedrawer');

39
gulpfile.js
View File

@ -13,28 +13,34 @@ var gulp = require('gulp'),
livereload = require('gulp-livereload'),
htmlmin = require('gulp-htmlmin'),
inject = require('gulp-inject'),
del = require('del');
del = require('del'),
htmlreplace = require('gulp-html-replace');
var filePath = {
build_dir: './dist'
};
gulp.task('scripts', function() {
return gulp.src('app/js/**/*.js')
.pipe(jshint('.jshintrc'))
.pipe(jshint.reporter('default'))
.pipe(concat('main.js'))
.pipe(gulp.dest('dist/js'))
.pipe(rename({suffix: '.min'}))
.pipe(uglify())
/*.pipe(gulp.dest('dist/js'))*/
/*.pipe(rename({suffix: '.min'}))*/
/* .pipe(uglify())*/
.pipe(concat('app.js'))
.pipe(gulp.dest('dist/js'))
.pipe(notify({ message: 'Scripts task complete' }));
});
gulp.task('styles', function() {
return gulp.src('app/css/**/*.css')
return gulp.src(['app/css/app.css','app/css/md.css','app/css/read.css','app/css/gist.css'])
.pipe(autoprefixer('last 2 version', 'safari 5', 'ie 8', 'ie 9', 'opera 12.1', 'ios 6', 'android 4'))
.pipe(gulp.dest('dist/css'))
.pipe(rename({suffix: '.min'}))
/*.pipe(gulp.dest('dist/css'))*/
/*.pipe(rename({suffix: '.min'}))*/
.pipe(cssnano())
.pipe(concat('app.css'))
.pipe(gulp.dest('dist/css'))
.pipe(notify({ message: 'Styles task complete' }));
});
@ -43,12 +49,23 @@ gulp.task('partials', function() {
gulp.src(['app/partials/**/*']).pipe(gulp.dest('dist/partials'));
gulp.src(['app/libs/ejs_production.js']).pipe(gulp.dest('dist/libs'));
gulp.src(['app/libs/microevent.js']).pipe(gulp.dest('dist/libs'));
gulp.src(['app/fav/**/*']).pipe(gulp.dest('dist/fav'));
});
gulp.task('minify-html', function () {
return gulp.src(['app/index.prod.html']).pipe(htmlmin({removeComments: true, collapseWhitespace: true, keepClosingSlash: true}))
.pipe(gulp.dest('dist/index.html'));
gulp.task('index', function () {
var sources = gulp.src(['js/apps.js', 'css/app.css'], {read: false});
return gulp.src(['app/index.html'])
.pipe(htmlreplace({
'css': 'css/app.css',
'js': 'js/app.js',
'vendor': 'libs/ejs_production.js'
}))
.pipe(htmlmin({removeComments: true, collapseWhitespace: true, keepClosingSlash: true}))
.pipe(gulp.dest('dist/'));
});
gulp.task('clean', function() {
@ -57,5 +74,5 @@ gulp.task('clean', function() {
gulp.task('default', ['clean'], function() {
gulp.start('styles', 'scripts','partials','minify-html');
gulp.start('styles', 'scripts','partials','index');
});

2
keeper-server.js
View File

@ -17,7 +17,7 @@ app.use(logger('dev'));
app.use(bodyParser.json());
app.use(bodyParser.urlencoded({ extended: true }));
app.use(cookieParser());
app.use(express.static(path.join(__dirname, 'app')));
app.use(express.static(path.join(__dirname, 'dist')));
app.use('/', keeper);

1
package.json
View File

@ -28,6 +28,7 @@
"gulp-cache": "^0.4.2",
"gulp-concat": "^2.6.0",
"gulp-cssnano": "^2.1.1",
"gulp-html-replace": "^1.5.5",
"gulp-htmlmin": "^1.3.0",
"gulp-inject": "^3.0.0",
"gulp-jshint": "^2.0.0",

2
server/keeper.js
View File

@ -29,7 +29,7 @@ var generics = ['ARTICLE', 'div.content_column', 'div.post','div.page'];
function cleaner(b) {
var _b = b;
var unwanted = ['div#disqus_thread', 'SCRIPT', 'FOOTER', 'div.ssba', '.shareaholic-canvas', '.yarpp-related', 'div.dfad', 'div.postFooterShare', 'div#nextPrevLinks', '.post-comments','HEADER', '.post-title','#side-menu','.footer-container','#pre-footer','#cakephp-global-navigation', '.masthead','.breadcrumb'];
var unwanted = ['div#disqus_thread', 'SCRIPT', 'FOOTER', 'div.ssba', '.shareaholic-canvas', '.yarpp-related', 'div.dfad', 'div.postFooterShare', 'div#nextPrevLinks', '.post-comments','HEADER', '.post-title','#side-menu','.footer-container','#pre-footer','#cakephp-global-navigation', '.masthead','.breadcrumb-header'];
for (var i = 0; i < unwanted.length; i++) {
_b.find(unwanted[i]).remove();