diff --git a/.gitignore b/.gitignore index b89de51..f76f9d9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,6 @@ /build-min /node_modules side-by-side.zip +.ftppass +.vscode/settings.json +sftpCache.json diff --git a/Gruntfile.coffee b/Gruntfile.coffee index 739cc0b..dbbc69d 100644 --- a/Gruntfile.coffee +++ b/Gruntfile.coffee @@ -240,21 +240,39 @@ module.exports = (grunt) -> options: { compress: false } }]]) + grunt.config 'sftp-deploy', add([['build', { + auth: { + host: 'ssh.phx.nearlyfreespeech.net', + port: 22, + authKey: 'key1' + }, + cache: 'sftpCache.json', + src: './build-min/', + dest: '/home/public/sbs', + # exclusions: ['/path/to/source/folder/**/.DS_Store', '/path/to/source/folder/**/Thumbs.db', 'dist/tmp'], + serverSep: '/', + localSep: '/', + concurrency: 4, + progress: true + }]]) + # Load tasks grunt.loadNpmTasks('grunt-contrib-coffee'); grunt.loadNpmTasks('grunt-contrib-connect'); grunt.loadNpmTasks('grunt-contrib-copy'); grunt.loadNpmTasks('grunt-contrib-cssmin'); grunt.loadNpmTasks('grunt-contrib-jade'); - grunt.loadNpmTasks('grunt-contrib-qunit'); + # grunt.loadNpmTasks('grunt-contrib-qunit'); grunt.loadNpmTasks('grunt-contrib-stylus'); grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-watch'); + grunt.loadNpmTasks('grunt-sftp-deploy'); # Register tasks grunt.registerTask 'default', [ 'coffee:main', 'copy:main', 'copy:fonts', 'jade:main', 'stylus:main' ] grunt.registerTask 'min', [ 'jade:min', 'copy:min', 'copy:min_readme', 'copy:min_fonts', 'uglify:min', 'cssmin:min' ] - grunt.registerTask 'test', [ 'default', 'connect:main', 'qunit' ] + grunt.registerTask 'upload', ['min', 'sftp-deploy'] + # grunt.registerTask 'test', [ 'default', 'connect:main', 'qunit' ] grunt.registerTask 'serve', () -> grunt.task.run 'default' diff --git a/source/content/tao/config.json b/source/content/tao/config.json index a3df67f..43c5578 100644 --- a/source/content/tao/config.json +++ b/source/content/tao/config.json @@ -2,7 +2,7 @@ "title": "Tao Te Ching – translation comparison", "description": "The tao that can be told is not the eternal tao. The name that can be named is not the eternal name.", "heading": "Translator", - "display": { "Code": ["gff", "jhmd", "jc", "rh", "rp"] }, + "display": { "Code": ["gff", "rh", "rp", "ah"] }, "files": [ "1972-gia-fu-feng.md", "1988-stephen-mitchell.md", @@ -16,6 +16,7 @@ "2005-agnieszka-solska.md", "2009-red-pine.md", "2010-ames-and-hall.md" + ], "metaKeys": [ "Translator", "Year", "Source" ] } diff --git a/source/index.html.jade b/source/index.html.jade index 7ca9197..ae22585 100644 --- a/source/index.html.jade +++ b/source/index.html.jade @@ -38,6 +38,12 @@ html(ng-app="sideBySide" ng-controller="AppController") svg.icon use(xlink:href="/fonts/icons.svg#icon-star") span About + li + a(href="content/tao") Tao + li + a(href="content/enchiridion") Enchiridion + li + a(href="content/meditations-book-2") Meditations book 2 div(ng-controller="ComparisonController" class="cols-{{columns}}") include includes/comparison.html.jade