add edit environment, fix user dropdown links

iliakan · iliakan · commit bc11690f4671 · 2015-01-01T21:55:56.000+03:00
diff --git a/edit b/edit
@@ -0,0 +1,3 @@
+#!/bin/bash
+NODE_ENV=production gulp edit --harmony
+
diff --git a/gulpfile.js b/gulpfile.js
@@ -68,7 +68,7 @@ gulp.task("client:livereload", lazyRequireTask("./tasks/livereload", {
 }));
 
 gulp.task("tutorial:import:watch", lazyRequireTask('tutorial/tasks/importWatch', {
-  root: "/js/javascript-nodejs/javascript-tutorial"
+  root: "/js/javascript-tutorial"
 }));
 
 gulp.task("test", lazyRequireTask('./tasks/test', {
@@ -127,7 +127,9 @@ gulp.task('build', function(callback) {
   runSequence("client:sync-resources", 'client:compile-css', 'client:sync-css-images', 'client:webpack', callback);
 });
 
-gulp.task('edit', ['dev', 'tutorial:import:watch']);
+gulp.task('server', lazyRequireTask('./tasks/server'));
+
+gulp.task('edit', ['build', 'tutorial:import:watch', 'client:livereload', 'server']);
 
 gulp.task('dev', function(callback) {
   runSequence("client:sync-resources", 'client:compile-css', 'client:sync-css-images', ['nodemon', 'client:livereload', 'client:webpack', 'watch'], callback);
diff --git a/tasks/server.js b/tasks/server.js
@@ -0,0 +1,11 @@
+var co = require('co');
+var app = require('app');
+
+module.exports = function() {
+  return function() {
+
+    return co(require('app').waitBootAndListen());
+
+  };
+};
+
diff --git a/templates/blocks/sitetoolbar.jade b/templates/blocks/sitetoolbar.jade
@@ -84,6 +84,6 @@
         +e('li').usermenu-item
           +e('a').secondary-link.__usermenu-link(href="/profile") Профиль
         +e('li').usermenu-item
-          +e('a').secondary-link.__usermenu-link(href="#settings") Настройки аккаунта
+          +e('a').secondary-link.__usermenu-link(href="/profile/account") Настройки аккаунта
         +e('li').usermenu-item
           +e('a').secondary-link.__usermenu-link(href="#" data-action-user-logout) Выйти

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+#!/bin/bash`
	`2`	`+NODE_ENV=production gulp edit --harmony`
	`3`	`+`