Merge pull request #1384 from hackmdio/refactor/new-web-arch

Refactor/new web arch

Author: jackycute

app.js

@@ -66,7 +66,7 @@ io.engine.ws = new (require('ws').Server)({
 })
 
 // others
-var realtime = require('./lib/realtime.js')
+var realtime = require('./lib/realtime/realtime.js')
 
 // assign socket io to realtime
 realtime.io = io
@@ -153,7 +153,7 @@ server.on('resumeSession', function (id, cb) {
 })
 
 // middleware which blocks requests when we're too busy
-app.use(require('./lib/web/middleware/tooBusy'))
+app.use(require('./lib/middleware/tooBusy'))
 
 app.use(flash())
 
@@ -162,10 +162,10 @@ app.use(passport.initialize())
 app.use(passport.session())
 
 // check uri is valid before going further
-app.use(require('./lib/web/middleware/checkURIValid'))
+app.use(require('./lib/middleware/checkURIValid'))
 // redirect url without trailing slashes
-app.use(require('./lib/web/middleware/redirectWithoutTrailingSlashes'))
-app.use(require('./lib/web/middleware/codiMDVersion'))
+app.use(require('./lib/middleware/redirectWithoutTrailingSlashes'))
+app.use(require('./lib/middleware/codiMDVersion'))
 
 // routes need sessions
 // template files
@@ -206,13 +206,7 @@ app.locals.enableDropBoxSave = config.isDropboxEnable
 app.locals.enableGitHubGist = config.isGitHubEnable
 app.locals.enableGitlabSnippets = config.isGitlabSnippetsEnable
 
-app.use(require('./lib/web/baseRouter'))
-app.use(require('./lib/web/statusRouter'))
-app.use(require('./lib/web/auth'))
-app.use(require('./lib/web/historyRouter'))
-app.use(require('./lib/web/userRouter'))
-app.use(require('./lib/web/imageRouter'))
-app.use(require('./lib/web/noteRouter'))
+app.use(require('./lib/routes').router)
 
 // response not found if no any route matxches
 app.get('*', function (req, res) {

lib/web/auth/bitbucket/index.js renamed to lib/auth/bitbucket/index.js

@@ -3,7 +3,7 @@
 const Router = require('express').Router
 const passport = require('passport')
 const BitbucketStrategy = require('passport-bitbucket-oauth2').Strategy
-const config = require('../../../config')
+const config = require('../../config')
 const { setReturnToFromReferer, passportGeneralCallback } = require('../utils')
 
 const bitbucketAuth = module.exports = Router()

lib/web/auth/dropbox/index.js renamed to lib/auth/dropbox/index.js

@@ -3,7 +3,7 @@
 const Router = require('express').Router
 const passport = require('passport')
 const DropboxStrategy = require('passport-dropbox-oauth2').Strategy
-const config = require('../../../config')
+const config = require('../../config')
 const { setReturnToFromReferer, passportGeneralCallback } = require('../utils')
 
 const dropboxAuth = module.exports = Router()

lib/web/auth/email/index.js renamed to lib/auth/email/index.js

@@ -4,12 +4,12 @@ const Router = require('express').Router
 const passport = require('passport')
 const validator = require('validator')
 const LocalStrategy = require('passport-local').Strategy
-const config = require('../../../config')
-const models = require('../../../models')
-const logger = require('../../../logger')
+const config = require('../../config')
+const models = require('../../models')
+const logger = require('../../logger')
 const { setReturnToFromReferer } = require('../utils')
 const { urlencodedParser } = require('../../utils')
-const response = require('../../../response')
+const response = require('../../response')
 
 const emailAuth = module.exports = Router()
 

lib/web/auth/facebook/index.js renamed to lib/auth/facebook/index.js

@@ -4,7 +4,7 @@ const Router = require('express').Router
 const passport = require('passport')
 const FacebookStrategy = require('passport-facebook').Strategy
 
-const config = require('../../../config')
+const config = require('../../config')
 const { setReturnToFromReferer, passportGeneralCallback } = require('../utils')
 
 const facebookAuth = module.exports = Router()

lib/web/auth/github/index.js renamed to lib/auth/github/index.js

@@ -3,8 +3,8 @@
 const Router = require('express').Router
 const passport = require('passport')
 const GithubStrategy = require('passport-github').Strategy
-const config = require('../../../config')
-const response = require('../../../response')
+const config = require('../../config')
+const response = require('../../response')
 const { setReturnToFromReferer, passportGeneralCallback } = require('../utils')
 const { URL } = require('url')
 

lib/web/auth/gitlab/index.js renamed to lib/auth/gitlab/index.js

@@ -3,8 +3,8 @@
 const Router = require('express').Router
 const passport = require('passport')
 const GitlabStrategy = require('passport-gitlab2').Strategy
-const config = require('../../../config')
-const response = require('../../../response')
+const config = require('../../config')
+const response = require('../../response')
 const { setReturnToFromReferer, passportGeneralCallback } = require('../utils')
 const HttpsProxyAgent = require('https-proxy-agent')
 

lib/web/auth/google/index.js renamed to lib/auth/google/index.js

@@ -3,7 +3,7 @@
 const Router = require('express').Router
 const passport = require('passport')
 var GoogleStrategy = require('passport-google-oauth20').Strategy
-const config = require('../../../config')
+const config = require('../../config')
 const { setReturnToFromReferer, passportGeneralCallback } = require('../utils')
 
 const googleAuth = module.exports = Router()

lib/web/auth/index.js renamed to lib/auth/index.js

@@ -3,9 +3,9 @@
 const Router = require('express').Router
 const passport = require('passport')
 
-const config = require('../../config')
-const logger = require('../../logger')
-const models = require('../../models')
+const config = require('../config')
+const logger = require('../logger')
+const models = require('../models')
 
 const authRouter = module.exports = Router()
 

lib/web/auth/ldap/index.js renamed to lib/auth/ldap/index.js

@@ -3,12 +3,12 @@
 const Router = require('express').Router
 const passport = require('passport')
 const LDAPStrategy = require('passport-ldapauth')
-const config = require('../../../config')
-const models = require('../../../models')
-const logger = require('../../../logger')
+const config = require('../../config')
+const models = require('../../models')
+const logger = require('../../logger')
 const { setReturnToFromReferer } = require('../utils')
 const { urlencodedParser } = require('../../utils')
-const response = require('../../../response')
+const response = require('../../response')
 
 const ldapAuth = module.exports = Router()