Sotaro KARASAWA 11 лет назад
Родитель
Сommit
ab68691a38
3 измененных файлов с 6 добавлено и 3 удалено
  1. 2 1
      app.js
  2. 1 1
      package.json
  3. 3 1
      routes/installer.js

+ 2 - 1
app.js

@@ -36,6 +36,8 @@ var mongoUri = process.env.MONGOLAB_URI
 mongo.connect(mongoUri);
 
 app.set('port', process.env.PORT || 3000);
+app.use(express.static(__dirname + '/public'));
+app.use(express.logger());
 app.engine('html', cons.swig);
 app.set('view cache', false);
 app.set('view engine', 'html');
@@ -48,7 +50,6 @@ app.use(express.session({
   secret: process.env.SECRET_TOKEN || 'this is default session secret',
 }));
 app.use(flash());
-app.use(express.static(__dirname + '/public'));
 
 config = require('./models/config')(app);
 

+ 1 - 1
package.json

@@ -40,7 +40,7 @@
     "grunt-contrib-jshint": "^0.10.0",
     "grunt-contrib-uglify": "~0.2.2",
     "grunt-contrib-watch": "~0.5.3",
-    "grunt-sass": "~0.13.1",
+    "grunt-sass": "~0.14.1",
     "reveal.js": "~2.6.2",
     "grunt-cli": "~0.1.13",
     "bower": "~1.3.9"

+ 3 - 1
routes/installer.js

@@ -23,9 +23,11 @@ module.exports = function(app) {
 
       User.createUserByEmailAndPassword(name, username, email, password, function(err, userData) {
         if (err) {
+          req.form.errors.push('管理ユーザーの作成に失敗しました。' + err.message);
           // TODO
-          return ;
+          return res.render('installer');
         }
+
         userData.makeAdmin(function(err, userData) {
           Config.applicationInstall(function(err, configs) {
             if (err) {