groonga/gcs-console [master] Divide routes into domains and admin (Groonga-commit) - Groonga - fulltext search engine.

Yoji SHIDARA	2012-12-05 12:28:41 +0900 (Wed, 05 Dec 2012)

  New Revision: 7fd38320fbfa3e40c4334a79ccf5f7409d38b86e
  https://github.com/groonga/gcs-console/commit/7fd38320fbfa3e40c4334a79ccf5f7409d38b86e

  Log:
    Divide routes into domains and admin

  Added files:
    routes/admin.js
  Modified files:
    app.js
  Renamed files:
    routes/domains.js
      (from routes/index.js)

  Modified: app.js (+17 -14)
===================================================================

--- app.js    2012-12-04 19:56:10 +0900 (c60d50b)
+++ app.js    2012-12-05 12:28:41 +0900 (6cf357e)
@@ -1,9 +1,12 @@
 var express = require('express')
-  , routes = require('./routes')
   , http = require('http')
   , path = require('path');
 var flash = require('connect-flash');
 var Config = require('./lib/config').Config;
+var routes = {
+  domains: require('./routes/domains'),
+  admin: require('./routes/admin')
+};
 
 function setupApplication(app) {
   var auth;
@@ -45,20 +48,20 @@ function setupApplication(app) {
   app.configure('development', function(){
   });
 
-  app.get('/', auth, routes.index);
-  app.get('/domain/:name', auth, routes.domain);
-  app.get('/domain/:name/search', auth, routes.domainSearch);
-  app.get('/domain/:name/index_fields', auth, routes.domainIndexFields);
-  app.get('/domain/:name/upload', auth, routes.domainUpload);
-  app.post('/domain/:name/upload', auth, routes.domainUploadPost);
-  app.get('/domain_create', auth, routes.domainCreate);
-  app.post('/domain_create', auth, routes.domainCreatePost);
-  app.post('/domain/:name/index_fields', auth, routes.domainCreateIndexField);
-  app.delete('/domain/:name/index_fields/:indexFieldName', auth, routes.domainDeleteIndexField);
-  app.delete('/domain/:name', auth, routes.domainDelete);
+  app.get('/', auth, routes.domains.index);
+  app.get('/domain/:name', auth, routes.domains.domain);
+  app.get('/domain/:name/search', auth, routes.domains.domainSearch);
+  app.get('/domain/:name/index_fields', auth, routes.domains.domainIndexFields);
+  app.get('/domain/:name/upload', auth, routes.domains.domainUpload);
+  app.post('/domain/:name/upload', auth, routes.domains.domainUploadPost);
+  app.get('/domain_create', auth, routes.domains.domainCreate);
+  app.post('/domain_create', auth, routes.domains.domainCreatePost);
+  app.post('/domain/:name/index_fields', auth, routes.domains.domainCreateIndexField);
+  app.delete('/domain/:name/index_fields/:indexFieldName', auth, routes.domains.domainDeleteIndexField);
+  app.delete('/domain/:name', auth, routes.domains.domainDelete);
 
-  app.get('/admin/password', routes.adminPassword);
-  app.post('/admin/password', routes.adminPasswordPost);
+  app.get('/admin/password', routes.admin.adminPassword);
+  app.post('/admin/password', routes.admin.adminPasswordPost);
 }
 
 module.exports.setupApplication = setupApplication;

  Added: routes/admin.js (+30 -0) 100644
===================================================================
--- /dev/null
+++ routes/admin.js    2012-12-05 12:28:41 +0900 (dc02199)
@@ -0,0 +1,30 @@
+exports.adminPassword = function(req, res) {
+  var config = req.app.get('config');
+  if (config.data.adminUsername && config.data.adminPassword) {
+    return res.redirect('/');
+  }
+  return res.render('admin-password');
+};
+
+var Config = require('../lib/config').Config;
+exports.adminPasswordPost = function(req, res) {
+  var config = req.app.get('config');
+
+  if (config.data.adminUsername && config.data.adminPassword) {
+    return res.redirect('/');
+  }
+
+  var username = req.body.username;
+  var password = req.body.password;
+
+  if (username && password) {
+    config.data.adminUsername = username;
+    config.data.adminPassword = password;
+    config.save();
+    return res.redirect('/');
+  } else {
+    return res.render('admin-password', {
+      error: new Error('Username and Password should not be empty')
+    });
+  }
+};

  Renamed: routes/domains.js (+0 -31) 92%
===================================================================
--- routes/index.js    2012-12-04 19:56:10 +0900 (63d1098)
+++ routes/domains.js    2012-12-05 12:28:41 +0900 (db08764)
@@ -364,34 +364,3 @@ exports.domainUploadPost = function(req, res) {
     });
   });
 };
-
-exports.adminPassword = function(req, res) {
-  var config = req.app.get('config');
-  if (config.data.adminUsername && config.data.adminPassword) {
-    return res.redirect('/');
-  }
-  return res.render('admin-password');
-};
-
-var Config = require('../lib/config').Config;
-exports.adminPasswordPost = function(req, res) {
-  var config = req.app.get('config');
-
-  if (config.data.adminUsername && config.data.adminPassword) {
-    return res.redirect('/');
-  }
-
-  var username = req.body.username;
-  var password = req.body.password;
-
-  if (username && password) {
-    config.data.adminUsername = username;
-    config.data.adminPassword = password;
-    config.save();
-    return res.redirect('/');
-  } else {
-    return res.render('admin-password', {
-      error: new Error('Username and Password should not be empty')
-    });
-  }
-};
-------------- next part --------------
HTML����������������������������...
Download 


Groonga - fulltext search engine.

[Groonga-commit] groonga/gcs-console [master] Divide routes into domains and admin