Shane Kilkelly 9 лет назад
Родитель
Сommit
57cd54bf55
67 измененных файлов с 227 добавлено и 362 удалено
  1. 3 3
      services/web/Gruntfile.coffee
  2. 3 3
      services/web/app/coffee/Features/StaticPages/HomeController.coffee
  3. 2 2
      services/web/app/coffee/infrastructure/Modules.coffee
  4. 1 1
      services/web/app/coffee/infrastructure/Server.coffee
  5. 0 0
      services/web/app/views/admin/index.pug
  6. 0 0
      services/web/app/views/admin/register.pug
  7. 0 0
      services/web/app/views/beta_program/opt_in.pug
  8. 0 0
      services/web/app/views/blog/blog_holder.pug
  9. 0 0
      services/web/app/views/contact-us-modal.pug
  10. 0 0
      services/web/app/views/general/404.pug
  11. 0 0
      services/web/app/views/general/500.pug
  12. 0 0
      services/web/app/views/general/closed.pug
  13. 0 0
      services/web/app/views/layout.pug
  14. 0 0
      services/web/app/views/layout/footer.pug
  15. 0 0
      services/web/app/views/layout/navbar.pug
  16. 0 0
      services/web/app/views/project/editor.pug
  17. 0 0
      services/web/app/views/project/editor/binary-file.pug
  18. 0 0
      services/web/app/views/project/editor/chat.pug
  19. 0 0
      services/web/app/views/project/editor/editor.pug
  20. 0 0
      services/web/app/views/project/editor/feature-onboarding.pug
  21. 0 0
      services/web/app/views/project/editor/file-tree.pug
  22. 0 0
      services/web/app/views/project/editor/header.pug
  23. 0 0
      services/web/app/views/project/editor/history.pug
  24. 0 0
      services/web/app/views/project/editor/hotkeys.pug
  25. 0 0
      services/web/app/views/project/editor/left-menu.pug
  26. 0 0
      services/web/app/views/project/editor/pdf.pug
  27. 0 0
      services/web/app/views/project/editor/publish-template.pug
  28. 0 0
      services/web/app/views/project/editor/review-panel.pug
  29. 0 0
      services/web/app/views/project/editor/share.pug
  30. 0 0
      services/web/app/views/project/invite/not-valid.pug
  31. 0 0
      services/web/app/views/project/invite/show.pug
  32. 0 0
      services/web/app/views/project/list.pug
  33. 0 0
      services/web/app/views/project/list/empty-project-list.pug
  34. 0 0
      services/web/app/views/project/list/modals.pug
  35. 0 0
      services/web/app/views/project/list/notifications.pug
  36. 0 0
      services/web/app/views/project/list/project-list.pug
  37. 0 0
      services/web/app/views/project/list/side-bar.pug
  38. 0 0
      services/web/app/views/referal/bonus.pug
  39. 0 0
      services/web/app/views/restore.pug
  40. 0 0
      services/web/app/views/scribtex-modal.pug
  41. 0 0
      services/web/app/views/sentry.pug
  42. 0 0
      services/web/app/views/subscriptions/custom_account.pug
  43. 0 0
      services/web/app/views/subscriptions/dashboard.pug
  44. 0 0
      services/web/app/views/subscriptions/edit-billing-details.pug
  45. 0 0
      services/web/app/views/subscriptions/group/invite.pug
  46. 0 0
      services/web/app/views/subscriptions/group/successful_join.pug
  47. 0 0
      services/web/app/views/subscriptions/group_admin.pug
  48. 0 0
      services/web/app/views/subscriptions/new.pug
  49. 0 0
      services/web/app/views/subscriptions/plans.pug
  50. 0 0
      services/web/app/views/subscriptions/successful_subscription.pug
  51. 0 0
      services/web/app/views/subscriptions/upgradeToAnnual.pug
  52. 0 0
      services/web/app/views/tests.pug
  53. 0 0
      services/web/app/views/translations/translation_message.pug
  54. 0 0
      services/web/app/views/university/case_study.pug
  55. 0 0
      services/web/app/views/university/university_holder.pug
  56. 0 0
      services/web/app/views/user/activate.pug
  57. 0 0
      services/web/app/views/user/login.pug
  58. 0 0
      services/web/app/views/user/passwordReset.pug
  59. 0 0
      services/web/app/views/user/register.pug
  60. 0 0
      services/web/app/views/user/restricted.pug
  61. 0 0
      services/web/app/views/user/sessions.pug
  62. 0 0
      services/web/app/views/user/setPassword.pug
  63. 0 0
      services/web/app/views/user/settings.pug
  64. 0 0
      services/web/app/views/view_templates/bonus_templates.pug
  65. 215 351
      services/web/npm-shrinkwrap.json
  66. 2 1
      services/web/package.json
  67. 1 1
      services/web/public/coffee/ide/editor/directives/aceEditor.coffee

+ 3 - 3
services/web/Gruntfile.coffee

@@ -222,11 +222,11 @@ module.exports = (grunt) ->
 
 
 		sed:
 		sed:
 			version:
 			version:
-				path: "app/views/sentry.jade"
+				path: "app/views/sentry.pug"
 				pattern: '@@COMMIT@@',
 				pattern: '@@COMMIT@@',
 				replacement: '<%= commit %>',
 				replacement: '<%= commit %>',
 			release:
 			release:
-				path: "app/views/sentry.jade"
+				path: "app/views/sentry.pug"
 				pattern: "@@RELEASE@@"
 				pattern: "@@RELEASE@@"
 				replacement: process.env.BUILD_NUMBER || "(unknown build)"
 				replacement: process.env.BUILD_NUMBER || "(unknown build)"
 
 
@@ -389,5 +389,5 @@ module.exports = (grunt) ->
 
 
 	grunt.registerTask 'default', 'run'
 	grunt.registerTask 'default', 'run'
 
 
-	grunt.registerTask 'version', "Write the version number into sentry.jade", ['git-rev-parse', 'sed']
+	grunt.registerTask 'version', "Write the version number into sentry.pug", ['git-rev-parse', 'sed']
 
 

+ 3 - 3
services/web/app/coffee/Features/StaticPages/HomeController.coffee

@@ -7,7 +7,7 @@ fs = require "fs"
 ErrorController = require "../Errors/ErrorController"
 ErrorController = require "../Errors/ErrorController"
 AuthenticationController = require('../Authentication/AuthenticationController')
 AuthenticationController = require('../Authentication/AuthenticationController')
 
 
-homepageExists = fs.existsSync Path.resolve(__dirname + "/../../../views/external/home.jade")
+homepageExists = fs.existsSync Path.resolve(__dirname + "/../../../views/external/home.pug")
 
 
 module.exports = HomeController =
 module.exports = HomeController =
 	index : (req,res)->
 	index : (req,res)->
@@ -28,10 +28,10 @@ module.exports = HomeController =
 
 
 	externalPage: (page, title) ->
 	externalPage: (page, title) ->
 		return (req, res, next = (error) ->) ->
 		return (req, res, next = (error) ->) ->
-			path = Path.resolve(__dirname + "/../../../views/external/#{page}.jade")
+			path = Path.resolve(__dirname + "/../../../views/external/#{page}.pug")
 			fs.exists path, (exists) -> # No error in this callback - old method in Node.js!
 			fs.exists path, (exists) -> # No error in this callback - old method in Node.js!
 				if exists
 				if exists
-					res.render "external/#{page}.jade",
+					res.render "external/#{page}.pug",
 						title: title
 						title: title
 				else
 				else
 					ErrorController.notFound(req, res, next)
 					ErrorController.notFound(req, res, next)

+ 2 - 2
services/web/app/coffee/infrastructure/Modules.coffee

@@ -1,6 +1,6 @@
 fs   = require "fs"
 fs   = require "fs"
 Path = require "path"
 Path = require "path"
-jade = require "jade"
+pug = require "pug"
 async = require "async"
 async = require "async"
 
 
 MODULE_BASE_PATH = Path.resolve(__dirname + "/../../../modules")
 MODULE_BASE_PATH = Path.resolve(__dirname + "/../../../modules")
@@ -29,7 +29,7 @@ module.exports = Modules =
 		for module in @modules
 		for module in @modules
 			for view, partial of module.viewIncludes or {}
 			for view, partial of module.viewIncludes or {}
 				@viewIncludes[view] ||= []
 				@viewIncludes[view] ||= []
-				@viewIncludes[view].push jade.compile(fs.readFileSync(Path.join(MODULE_BASE_PATH, module.name, "app/views", partial + ".jade")), doctype: "html")
+				@viewIncludes[view].push pug.compile(fs.readFileSync(Path.join(MODULE_BASE_PATH, module.name, "app/views", partial + ".pug")), doctype: "html")
 			
 			
 	moduleIncludes: (view, locals) ->
 	moduleIncludes: (view, locals) ->
 		compiledPartials = Modules.viewIncludes[view] or []
 		compiledPartials = Modules.viewIncludes[view] or []

+ 1 - 1
services/web/app/coffee/infrastructure/Server.coffee

@@ -62,7 +62,7 @@ if Settings.behindProxy
 
 
 webRouter.use express.static(__dirname + '/../../../public', {maxAge: staticCacheAge })
 webRouter.use express.static(__dirname + '/../../../public', {maxAge: staticCacheAge })
 app.set 'views', __dirname + '/../../views'
 app.set 'views', __dirname + '/../../views'
-app.set 'view engine', 'jade'
+app.set 'view engine', 'pug'
 Modules.loadViewIncludes app
 Modules.loadViewIncludes app
 
 
 
 

+ 0 - 0
services/web/app/views/admin/index.jade → services/web/app/views/admin/index.pug


+ 0 - 0
services/web/app/views/admin/register.jade → services/web/app/views/admin/register.pug


+ 0 - 0
services/web/app/views/beta_program/opt_in.jade → services/web/app/views/beta_program/opt_in.pug


+ 0 - 0
services/web/app/views/blog/blog_holder.jade → services/web/app/views/blog/blog_holder.pug


+ 0 - 0
services/web/app/views/contact-us-modal.jade → services/web/app/views/contact-us-modal.pug


+ 0 - 0
services/web/app/views/general/404.jade → services/web/app/views/general/404.pug


+ 0 - 0
services/web/app/views/general/500.jade → services/web/app/views/general/500.pug


+ 0 - 0
services/web/app/views/general/closed.jade → services/web/app/views/general/closed.pug


+ 0 - 0
services/web/app/views/layout.jade → services/web/app/views/layout.pug


+ 0 - 0
services/web/app/views/layout/footer.jade → services/web/app/views/layout/footer.pug


+ 0 - 0
services/web/app/views/layout/navbar.jade → services/web/app/views/layout/navbar.pug


+ 0 - 0
services/web/app/views/project/editor.jade → services/web/app/views/project/editor.pug


+ 0 - 0
services/web/app/views/project/editor/binary-file.jade → services/web/app/views/project/editor/binary-file.pug


+ 0 - 0
services/web/app/views/project/editor/chat.jade → services/web/app/views/project/editor/chat.pug


+ 0 - 0
services/web/app/views/project/editor/editor.jade → services/web/app/views/project/editor/editor.pug


+ 0 - 0
services/web/app/views/project/editor/feature-onboarding.jade → services/web/app/views/project/editor/feature-onboarding.pug


+ 0 - 0
services/web/app/views/project/editor/file-tree.jade → services/web/app/views/project/editor/file-tree.pug


+ 0 - 0
services/web/app/views/project/editor/header.jade → services/web/app/views/project/editor/header.pug


+ 0 - 0
services/web/app/views/project/editor/history.jade → services/web/app/views/project/editor/history.pug


+ 0 - 0
services/web/app/views/project/editor/hotkeys.jade → services/web/app/views/project/editor/hotkeys.pug


+ 0 - 0
services/web/app/views/project/editor/left-menu.jade → services/web/app/views/project/editor/left-menu.pug


+ 0 - 0
services/web/app/views/project/editor/pdf.jade → services/web/app/views/project/editor/pdf.pug


+ 0 - 0
services/web/app/views/project/editor/publish-template.jade → services/web/app/views/project/editor/publish-template.pug


+ 0 - 0
services/web/app/views/project/editor/review-panel.jade → services/web/app/views/project/editor/review-panel.pug


+ 0 - 0
services/web/app/views/project/editor/share.jade → services/web/app/views/project/editor/share.pug


+ 0 - 0
services/web/app/views/project/invite/not-valid.jade → services/web/app/views/project/invite/not-valid.pug


+ 0 - 0
services/web/app/views/project/invite/show.jade → services/web/app/views/project/invite/show.pug


+ 0 - 0
services/web/app/views/project/list.jade → services/web/app/views/project/list.pug


+ 0 - 0
services/web/app/views/project/list/empty-project-list.jade → services/web/app/views/project/list/empty-project-list.pug


+ 0 - 0
services/web/app/views/project/list/modals.jade → services/web/app/views/project/list/modals.pug


+ 0 - 0
services/web/app/views/project/list/notifications.jade → services/web/app/views/project/list/notifications.pug


+ 0 - 0
services/web/app/views/project/list/project-list.jade → services/web/app/views/project/list/project-list.pug


+ 0 - 0
services/web/app/views/project/list/side-bar.jade → services/web/app/views/project/list/side-bar.pug


+ 0 - 0
services/web/app/views/referal/bonus.jade → services/web/app/views/referal/bonus.pug


+ 0 - 0
services/web/app/views/restore.jade → services/web/app/views/restore.pug


+ 0 - 0
services/web/app/views/scribtex-modal.jade → services/web/app/views/scribtex-modal.pug


+ 0 - 0
services/web/app/views/sentry.jade → services/web/app/views/sentry.pug


+ 0 - 0
services/web/app/views/subscriptions/custom_account.jade → services/web/app/views/subscriptions/custom_account.pug


+ 0 - 0
services/web/app/views/subscriptions/dashboard.jade → services/web/app/views/subscriptions/dashboard.pug


+ 0 - 0
services/web/app/views/subscriptions/edit-billing-details.jade → services/web/app/views/subscriptions/edit-billing-details.pug


+ 0 - 0
services/web/app/views/subscriptions/group/invite.jade → services/web/app/views/subscriptions/group/invite.pug


+ 0 - 0
services/web/app/views/subscriptions/group/successful_join.jade → services/web/app/views/subscriptions/group/successful_join.pug


+ 0 - 0
services/web/app/views/subscriptions/group_admin.jade → services/web/app/views/subscriptions/group_admin.pug


+ 0 - 0
services/web/app/views/subscriptions/new.jade → services/web/app/views/subscriptions/new.pug


+ 0 - 0
services/web/app/views/subscriptions/plans.jade → services/web/app/views/subscriptions/plans.pug


+ 0 - 0
services/web/app/views/subscriptions/successful_subscription.jade → services/web/app/views/subscriptions/successful_subscription.pug


+ 0 - 0
services/web/app/views/subscriptions/upgradeToAnnual.jade → services/web/app/views/subscriptions/upgradeToAnnual.pug


+ 0 - 0
services/web/app/views/tests.jade → services/web/app/views/tests.pug


+ 0 - 0
services/web/app/views/translations/translation_message.jade → services/web/app/views/translations/translation_message.pug


+ 0 - 0
services/web/app/views/university/case_study.jade → services/web/app/views/university/case_study.pug


+ 0 - 0
services/web/app/views/university/university_holder.jade → services/web/app/views/university/university_holder.pug


+ 0 - 0
services/web/app/views/user/activate.jade → services/web/app/views/user/activate.pug


+ 0 - 0
services/web/app/views/user/login.jade → services/web/app/views/user/login.pug


+ 0 - 0
services/web/app/views/user/passwordReset.jade → services/web/app/views/user/passwordReset.pug


+ 0 - 0
services/web/app/views/user/register.jade → services/web/app/views/user/register.pug


+ 0 - 0
services/web/app/views/user/restricted.jade → services/web/app/views/user/restricted.pug


+ 0 - 0
services/web/app/views/user/sessions.jade → services/web/app/views/user/sessions.pug


+ 0 - 0
services/web/app/views/user/setPassword.jade → services/web/app/views/user/setPassword.pug


+ 0 - 0
services/web/app/views/user/settings.jade → services/web/app/views/user/settings.pug


+ 0 - 0
services/web/app/views/view_templates/bonus_templates.jade → services/web/app/views/view_templates/bonus_templates.pug


Разница между файлами не показана из-за своего большого размера
+ 215 - 351
services/web/npm-shrinkwrap.json


+ 2 - 1
services/web/package.json

@@ -64,7 +64,8 @@
     "underscore": "1.6.0",
     "underscore": "1.6.0",
     "v8-profiler": "^5.2.3",
     "v8-profiler": "^5.2.3",
     "xml2js": "0.2.0",
     "xml2js": "0.2.0",
-    "passport-saml": "^0.15.0"
+    "passport-saml": "^0.15.0",
+    "pug": "^2.0.0-beta6"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "bunyan": "0.22.1",
     "bunyan": "0.22.1",

+ 1 - 1
services/web/public/coffee/ide/editor/directives/aceEditor.coffee

@@ -13,7 +13,7 @@ define [
 	EditSession = ace.require('ace/edit_session').EditSession
 	EditSession = ace.require('ace/edit_session').EditSession
 	ModeList = ace.require('ace/ext/modelist')
 	ModeList = ace.require('ace/ext/modelist')
 
 
-	# set the path for ace workers if using a CDN (from editor.jade)
+	# set the path for ace workers if using a CDN (from editor.pug)
 	if window.aceWorkerPath != ""
 	if window.aceWorkerPath != ""
 		syntaxValidationEnabled = true
 		syntaxValidationEnabled = true
 		ace.config.set('workerPath', "#{window.aceWorkerPath}")
 		ace.config.set('workerPath', "#{window.aceWorkerPath}")

Некоторые файлы не были показаны из-за большого количества измененных файлов