minor

Author: iliakan

extra

@@ -0,0 +1 @@
+/js/js-extra

extra/.gitkeep

@@ -100,38 +100,3 @@ function addProviderRoute(providerName) {
 
 // disconnect with existing profile
 router.post('/disconnect/:providerName', mustBeAuthenticated, disconnect.post);
-
-/*
- router.get('/mail', function*(next) {
- require('lib/mailer').sendMail({
- from: 'iliakan@javascript.ru',
- to: '[email protected]',
- subject: 'hello',
- text: 'hello world!'
- }, function() {
- console.log(arguments);
- });
- this.body = "test";
- });
- */
-
-
-/*if (err) return next(err);
- if (!user) { return res.redirect('/signin') }
- *         res.redirect('/account');
- *       }
- { successRedirect: '/auth/popup-success', failureRedirect: '/auth/popup-failure' })*/
-
-/*
-
-router.get('/popup-success', function*() {
-  this.body = this.render('popup-success');
-});
-
-router.get('/popup-failure', function*() {
-  var reason = this.session.messages ? this.session.messages[0] : '';
-  delete this.session.messages;
-
-  this.body = this.render('popup-failure', { reason: reason });
-});
-*/

handlers/auth/router.js

@@ -18,9 +18,6 @@ module.exports = new LocalStrategy({
 
   co(function*() {
 
-    // @tyv UNCOMMENT SPINNER
-    // yield function(callback) {};
-
     if (!email) throw new UserAuthError('Укажите email.');
     if (!password) throw new UserAuthError('Укажите пароль.');
 

handlers/auth/strategies/localStrategy.js

@@ -8,7 +8,7 @@ block append variables
 
 block content
 
-  p Вы хотели бы получать уведомления по темам:
+  p Темы:
 
   style.
     .main ul > li:before {

handlers/newsletter/templates/subscriptions.jade

@@ -138,6 +138,7 @@ schema.statics.findTree = function* (options) {
   addPrevNext();
 
   return {
+    articles: articlesById,
     children: root,
     byId:     function(id) {
       if (!id) return undefined;

handlers/tutorial/models/article.js

@@ -220,6 +220,8 @@ UserSchema.methods.getProfileUrl = function() {
 
 UserSchema.methods.checkPassword = function(password) {
   if (!password) return false; // empty password means no login by password
+  if (!this.passwordHash) return false; // this user does not have password (the line below would hang!)
+
   return hash.createHashSlow(password, this.salt) == this.passwordHash;
 };
 

handlers/users/models/user.js

@@ -39,14 +39,6 @@ app.requireHandler('requestLog');
 
 app.requireHandler('nocache');
 
-/*
- app.id = Math.random();
- app.use(function*(next) {
- console.log(app.id);
- yield next;
- });
- */
-
 //app.requireHandler('time');
 
 // this middleware adds this.render method
@@ -92,13 +84,6 @@ app.requireHandler('flash');
 
 app.requireHandler('paymentsMethods');
 
-//app.requireHandler('sendMail');
-
-// right before endpoints
-// so that the error won't fall through the handlers above
-// all above ^^^ handlers can finish processing the usual way
-//app.requireHandler('throwFinish');
-
 // ======== Endpoint services that actually generate something ==========
 
 var endpoints = [];

modules/app.js

@@ -159,7 +159,8 @@ var webpackConfig = {
 };
 
 
-if (process.env.NODE_ENV != 'development') { // production, ebook
+//if (process.env.NODE_ENV != 'development') { // production, ebook
+if (process.env.NODE_ENV == 'production') { // production, ebook
   webpackConfig.plugins.push(
     function clearBeforeRun() {
       function clear(compiler, callback) {