Move directories

app.js

@@ -13,7 +13,7 @@ var express  = require('express')
   , facebook = require('facebook-node-sdk')
   , mongo    = require('mongoose')
   , socketio = require('socket.io')
-  , middleware = require('./lib/middlewares')
+  , middleware = require('./lib/util/middlewares')
   , time     = require('time')
   , async    = require('async')
   , session  = require('express-session')
@@ -74,14 +74,14 @@ app.use(express.logger());
 app.engine('html', cons.swig);
 app.set('view cache', false);
 app.set('view engine', 'html');
-app.set('views', __dirname + '/views');
+app.set('views', __dirname + '/lib/views');
 app.use(express.methodOverride());
 app.use(express.bodyParser());
 app.use(express.cookieParser());
 app.use(session(sessionConfig));
 app.use(flash());
 
-configModel = require('./models/config')(app);
+configModel = require('./lib/models/config')(app);
 
 async.series([
   function (next) {
@@ -96,9 +96,9 @@ async.series([
       ;
 
 
-    app.set('mailer', require('./lib/mailer')(app));
+    app.set('mailer', require('./lib/util/mailer')(app));
 
-    models = require('./models')(app);
+    models = require('./lib/models')(app);
     models.Config = configModel;
 
     // configure application
@@ -190,7 +190,7 @@ async.series([
     });
 
     app.set('io', io);
-    require('./routes')(app);
+    require('./lib/routes')(app);
 
     next();
   }

config/default.js.dist

@@ -1,35 +0,0 @@
-/**
- * default config
- */
-
-module.exports = {
-  app: {
-    title: 'Crocos Wiki'
-  },
-  security: {
-    confidential: '',
-    passwordSeed: "j9a5gt", // please change here
-    registrationMode: 'Restricted', // Open, Restricted, Closed
-    registrationWhiteList: []
-  },
-  aws: {
-    bucket: 'crowi',
-    region: 'ap-northeast-1',
-    accessKeyId: '',
-    secretAccessKey: ''
-  },
-  searcher: {
-    url: 'https:// ...' // crocos-wikis
-  },
-  google: {
-    clientId: '',
-    clientSecret: ''
-  },
-  facebook: {
-    appId: '',
-    secret: ''
-  },
-  session: {
-    secret: 'please input here some string',
-  }
-}

form/admin/sec.js → lib/form/admin/sec.js

@@ -2,8 +2,8 @@
 
 var form = require('express-form')
   , field = form.field
-  , stringToArray = require('../../lib/formUtil').stringToArrayFilter
-  , normalizeCRLF = require('../../lib/formUtil').normalizeCRLFFilter
+  , stringToArray = require('../../util/formUtil').stringToArrayFilter
+  , normalizeCRLF = require('../../util/formUtil').normalizeCRLFFilter
   ;
 
 module.exports = form(

routes/index.js → lib/routes/index.js

@@ -1,5 +1,5 @@
 module.exports = function(app) {
-  var middleware = require('../lib/middlewares')
+  var middleware = require('../util/middlewares')
     , form      = require('../form')
     , page      = require('./page')(app)
     , login     = require('./login')(app)

lib/middlewares.js → lib/util/middlewares.js

@@ -23,7 +23,7 @@ exports.loginChecker = function(app, models) {
 
 exports.swigFunctions = function(app) {
   return function(req, res, next) {
-    res.locals(require('../lib/swigFunctions')(app));
+    res.locals(require('../util/swigFunctions')(app));
     next();
   };
 };