From c6fb4c3184880bad4802e01d15b2bac51ae9508b Mon Sep 17 00:00:00 2001 From: Francesco Siddi Date: Thu, 1 Feb 2018 17:01:03 +0100 Subject: [PATCH] Switch from .jade to .pug templates No functional change, we simply align with the preprocessing pipeline used in Pillar. --- gulpfile.js | 10 +++++----- package.json | 2 +- .../{_notifications.jade => _notifications.pug} | 0 .../assets/{for_project.jade => for_project.pug} | 0 .../{view_asset_embed.jade => view_asset_embed.pug} | 0 .../attract/errors/{layout.jade => layout.pug} | 0 .../{project_not_setup.jade => project_not_setup.pug} | 0 src/templates/attract/{help.jade => help.pug} | 0 src/templates/attract/{index.jade => index.pug} | 0 ...non_left_column.jade => index_anon_left_column.pug} | 0 src/templates/attract/{layout.jade => layout.pug} | 0 src/templates/attract/{project.jade => project.pug} | 0 .../{attract_layout.jade => attract_layout.pug} | 0 .../{offer_setup.jade => offer_setup.pug} | 0 .../project_settings/{settings.jade => settings.pug} | 0 .../shots/{for_project.jade => for_project.pug} | 0 src/templates/attract/shots/{index.jade => index.pug} | 0 ...activities_embed.jade => view_activities_embed.pug} | 0 .../{view_shot_embed.jade => view_shot_embed.pug} | 0 src/templates/attract/{sidebar.jade => sidebar.pug} | 0 .../tasks/{for_project.jade => for_project.pug} | 0 .../attract/tasks/{for_user.jade => for_user.pug} | 0 src/templates/attract/tasks/{index.jade => index.pug} | 0 ...{task_list_for_user.jade => task_list_for_user.pug} | 0 ...activities_embed.jade => view_activities_embed.pug} | 0 .../{view_task_embed.jade => view_task_embed.pug} | 0 26 files changed, 6 insertions(+), 6 deletions(-) rename src/templates/attract/{_notifications.jade => _notifications.pug} (100%) rename src/templates/attract/assets/{for_project.jade => for_project.pug} (100%) rename src/templates/attract/assets/{view_asset_embed.jade => view_asset_embed.pug} (100%) rename src/templates/attract/errors/{layout.jade => layout.pug} (100%) rename src/templates/attract/errors/{project_not_setup.jade => project_not_setup.pug} (100%) rename src/templates/attract/{help.jade => help.pug} (100%) rename src/templates/attract/{index.jade => index.pug} (100%) rename src/templates/attract/{index_anon_left_column.jade => index_anon_left_column.pug} (100%) rename src/templates/attract/{layout.jade => layout.pug} (100%) rename src/templates/attract/{project.jade => project.pug} (100%) rename src/templates/attract/project_settings/{attract_layout.jade => attract_layout.pug} (100%) rename src/templates/attract/project_settings/{offer_setup.jade => offer_setup.pug} (100%) rename src/templates/attract/project_settings/{settings.jade => settings.pug} (100%) rename src/templates/attract/shots/{for_project.jade => for_project.pug} (100%) rename src/templates/attract/shots/{index.jade => index.pug} (100%) rename src/templates/attract/shots/{view_activities_embed.jade => view_activities_embed.pug} (100%) rename src/templates/attract/shots/{view_shot_embed.jade => view_shot_embed.pug} (100%) rename src/templates/attract/{sidebar.jade => sidebar.pug} (100%) rename src/templates/attract/tasks/{for_project.jade => for_project.pug} (100%) rename src/templates/attract/tasks/{for_user.jade => for_user.pug} (100%) rename src/templates/attract/tasks/{index.jade => index.pug} (100%) rename src/templates/attract/tasks/{task_list_for_user.jade => task_list_for_user.pug} (100%) rename src/templates/attract/tasks/{view_activities_embed.jade => view_activities_embed.pug} (100%) rename src/templates/attract/tasks/{view_task_embed.jade => view_task_embed.pug} (100%) diff --git a/gulpfile.js b/gulpfile.js index 49915fb..6a40d8d 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -5,7 +5,7 @@ var concat = require('gulp-concat'); var git = require('gulp-git'); var gulp = require('gulp'); var gulpif = require('gulp-if'); -var jade = require('gulp-jade'); +var pug = require('gulp-pug'); var livereload = require('gulp-livereload'); var plumber = require('gulp-plumber'); var rename = require('gulp-rename'); @@ -45,12 +45,12 @@ gulp.task('styles', function() { }); -/* Templates - Jade */ +/* Templates - Pug */ gulp.task('templates', function() { - gulp.src('src/templates/**/*.jade') + gulp.src('src/templates/**/*.pug') .pipe(gulpif(enabled.failCheck, plumber())) .pipe(cache('templating')) - .pipe(jade({ + .pipe(pug({ pretty: enabled.prettyPug })) .pipe(gulp.dest(destination.pug)) @@ -96,7 +96,7 @@ gulp.task('watch',function() { } gulp.watch('src/styles/**/*.sass',['styles']); - gulp.watch('src/templates/**/*.jade',['templates']); + gulp.watch('src/templates/**/*.pug',['templates']); gulp.watch('src/scripts/*.js',['scripts']); gulp.watch('src/scripts/tutti/*.js',['scripts_tutti']); }); diff --git a/package.json b/package.json index c66fb39..c802c4c 100644 --- a/package.json +++ b/package.json @@ -14,9 +14,9 @@ "gulp-concat": "~2.6.0", "gulp-if": "^2.0.1", "gulp-git": "~2.4.2", - "gulp-jade": "~1.1.0", "gulp-livereload": "~3.8.1", "gulp-plumber": "~1.1.0", + "gulp-pug": "~3.3.0", "gulp-rename": "~1.2.2", "gulp-sass": "~2.3.1", "gulp-sourcemaps": "~1.6.0", diff --git a/src/templates/attract/_notifications.jade b/src/templates/attract/_notifications.pug similarity index 100% rename from src/templates/attract/_notifications.jade rename to src/templates/attract/_notifications.pug diff --git a/src/templates/attract/assets/for_project.jade b/src/templates/attract/assets/for_project.pug similarity index 100% rename from src/templates/attract/assets/for_project.jade rename to src/templates/attract/assets/for_project.pug diff --git a/src/templates/attract/assets/view_asset_embed.jade b/src/templates/attract/assets/view_asset_embed.pug similarity index 100% rename from src/templates/attract/assets/view_asset_embed.jade rename to src/templates/attract/assets/view_asset_embed.pug diff --git a/src/templates/attract/errors/layout.jade b/src/templates/attract/errors/layout.pug similarity index 100% rename from src/templates/attract/errors/layout.jade rename to src/templates/attract/errors/layout.pug diff --git a/src/templates/attract/errors/project_not_setup.jade b/src/templates/attract/errors/project_not_setup.pug similarity index 100% rename from src/templates/attract/errors/project_not_setup.jade rename to src/templates/attract/errors/project_not_setup.pug diff --git a/src/templates/attract/help.jade b/src/templates/attract/help.pug similarity index 100% rename from src/templates/attract/help.jade rename to src/templates/attract/help.pug diff --git a/src/templates/attract/index.jade b/src/templates/attract/index.pug similarity index 100% rename from src/templates/attract/index.jade rename to src/templates/attract/index.pug diff --git a/src/templates/attract/index_anon_left_column.jade b/src/templates/attract/index_anon_left_column.pug similarity index 100% rename from src/templates/attract/index_anon_left_column.jade rename to src/templates/attract/index_anon_left_column.pug diff --git a/src/templates/attract/layout.jade b/src/templates/attract/layout.pug similarity index 100% rename from src/templates/attract/layout.jade rename to src/templates/attract/layout.pug diff --git a/src/templates/attract/project.jade b/src/templates/attract/project.pug similarity index 100% rename from src/templates/attract/project.jade rename to src/templates/attract/project.pug diff --git a/src/templates/attract/project_settings/attract_layout.jade b/src/templates/attract/project_settings/attract_layout.pug similarity index 100% rename from src/templates/attract/project_settings/attract_layout.jade rename to src/templates/attract/project_settings/attract_layout.pug diff --git a/src/templates/attract/project_settings/offer_setup.jade b/src/templates/attract/project_settings/offer_setup.pug similarity index 100% rename from src/templates/attract/project_settings/offer_setup.jade rename to src/templates/attract/project_settings/offer_setup.pug diff --git a/src/templates/attract/project_settings/settings.jade b/src/templates/attract/project_settings/settings.pug similarity index 100% rename from src/templates/attract/project_settings/settings.jade rename to src/templates/attract/project_settings/settings.pug diff --git a/src/templates/attract/shots/for_project.jade b/src/templates/attract/shots/for_project.pug similarity index 100% rename from src/templates/attract/shots/for_project.jade rename to src/templates/attract/shots/for_project.pug diff --git a/src/templates/attract/shots/index.jade b/src/templates/attract/shots/index.pug similarity index 100% rename from src/templates/attract/shots/index.jade rename to src/templates/attract/shots/index.pug diff --git a/src/templates/attract/shots/view_activities_embed.jade b/src/templates/attract/shots/view_activities_embed.pug similarity index 100% rename from src/templates/attract/shots/view_activities_embed.jade rename to src/templates/attract/shots/view_activities_embed.pug diff --git a/src/templates/attract/shots/view_shot_embed.jade b/src/templates/attract/shots/view_shot_embed.pug similarity index 100% rename from src/templates/attract/shots/view_shot_embed.jade rename to src/templates/attract/shots/view_shot_embed.pug diff --git a/src/templates/attract/sidebar.jade b/src/templates/attract/sidebar.pug similarity index 100% rename from src/templates/attract/sidebar.jade rename to src/templates/attract/sidebar.pug diff --git a/src/templates/attract/tasks/for_project.jade b/src/templates/attract/tasks/for_project.pug similarity index 100% rename from src/templates/attract/tasks/for_project.jade rename to src/templates/attract/tasks/for_project.pug diff --git a/src/templates/attract/tasks/for_user.jade b/src/templates/attract/tasks/for_user.pug similarity index 100% rename from src/templates/attract/tasks/for_user.jade rename to src/templates/attract/tasks/for_user.pug diff --git a/src/templates/attract/tasks/index.jade b/src/templates/attract/tasks/index.pug similarity index 100% rename from src/templates/attract/tasks/index.jade rename to src/templates/attract/tasks/index.pug diff --git a/src/templates/attract/tasks/task_list_for_user.jade b/src/templates/attract/tasks/task_list_for_user.pug similarity index 100% rename from src/templates/attract/tasks/task_list_for_user.jade rename to src/templates/attract/tasks/task_list_for_user.pug diff --git a/src/templates/attract/tasks/view_activities_embed.jade b/src/templates/attract/tasks/view_activities_embed.pug similarity index 100% rename from src/templates/attract/tasks/view_activities_embed.jade rename to src/templates/attract/tasks/view_activities_embed.pug diff --git a/src/templates/attract/tasks/view_task_embed.jade b/src/templates/attract/tasks/view_task_embed.pug similarity index 100% rename from src/templates/attract/tasks/view_task_embed.jade rename to src/templates/attract/tasks/view_task_embed.pug