Moviendo más carpetas a lib/backend (db-api, models, tags-images, translations)

Author: wencha

bin/dos-db

@@ -28,7 +28,7 @@ program
   .command('load <model> <source>')
   .description("Loads model's collection from .json source path.")
   .action(function (model, source) {
-    var mPath = resolve('./lib/models/' + model.toLowerCase() + '.js')
+    var mPath = resolve('./lib/backend/models/' + model.toLowerCase() + '.js')
     var sPath = resolve(source)
 
     if (!exists(mPath)) return write('Invalid api "' + model + '"')
@@ -39,7 +39,7 @@ program
 
     connect(function () {
       models()
-      var api = require('lib/db-api')
+      var api = require('lib/backend/db-api')
       var c = data.length
       data.forEach(function (doc) {
         api[model.toLowerCase()].create(doc, function (err) {
@@ -132,10 +132,10 @@ function connect (fn) {
 function models (fn) {
   write('Register mongoose models.')
   var except = ['index.js', 'forum-reserved-names.js']
-  var files = dir(resolve('./lib/models/'))
+  var files = dir(resolve('./lib/backend/models/'))
   files && files.forEach(function (f) {
     if (~except.indexOf(f)) return
-    require(resolve('./lib/models/' + f))(mongoose)
+    require(resolve('./lib/backend/models/' + f))(mongoose)
   })
   fn && fn()
 }

bin/dos-translate

@@ -9,7 +9,7 @@ var nomnom = require('nomnom')
 var config = require('../lib/config')
 
 // Load the list of available languages.
-var LANGS_FOLDER = path.resolve(__dirname, '../lib/translations/lib')
+var LANGS_FOLDER = path.resolve(__dirname, '../lib/backend/translations/lib')
 var languages = fs.readdirSync(LANGS_FOLDER).map(function (v) {
   return v.replace('.json', '')
 })

ext/bin/migrate-forums

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const models = require('lib/models')()
+const models = require('lib/backend/models')()
 
 const Forum = models.Forum
 

ext/bin/update-forums-finalizados

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const models = require('lib/models')()
+const models = require('lib/backend/models')()
 
 const Forum = models.Forum
 const Topic = models.Topic

ext/lib/api/admin-stats.js

@@ -5,7 +5,7 @@ var forumMiddlewares = require('lib/backend/middlewares/forum-middlewares')
 var privileges = require('lib/backend/privileges/forum')
 
 const api = require('lib/api-v2/db-api')
-var apiv1 = require('lib/db-api')
+var apiv1 = require('lib/backend/db-api')
 var utils = require('lib/backend/utils')
 var expose = utils.expose
 var restrict = utils.restrict

ext/lib/api/filter.js

@@ -1,7 +1,7 @@
 const express = require('express')
 const debug = require('debug')
 const log = debug('democracyos:ext:api:filters')
-const api = require('../db-api')
+const api = require('ext/lib/db-api')
 
 const app = module.exports = express()
 

ext/lib/api/forum.js

@@ -7,7 +7,7 @@ const middlewares = require('lib/api-v2/middlewares')
 const { expose } = require('lib/backend/utils')
 const { canCreateForum } = require('lib/backend/middlewares/forum-middlewares')
 
-const api = require('../db-api')
+const api = require('ext/lib/db-api')
 const apiV2 = require('lib/api-v2/db-api')
 
 const log = debug('democracyos:ext:api:create-forum')

ext/lib/api/search.js

@@ -1,8 +1,8 @@
 const express = require('express')
 const debug = require('debug')
 const log = debug('democracyos:ext:api:search')
-const models = require('lib/models')
-const api = require('../db-api')
+const models = require('lib/backend/models')
+const api = require('ext/lib/db-api')
 
 const Topic = models.Topic
 const Forum = models.Forum

ext/lib/api/stats.js

@@ -5,13 +5,13 @@ const express = require('express')
 // var privileges = require('lib/backend/privileges/forum')
 
 // const api = require('lib/api-v2/db-api')
-// var apiv1 = require('lib/db-api')
+// var apiv1 = require('lib/backend/db-api')
 // var utils = require('lib/backend/utils')
 // var expose = utils.expose
 // var restrict = utils.restrict
 var utils = require('lib/backend/utils')
 
-var models = require('lib/models')
+var models = require('lib/backend/models')
 var Forum = models.Forum
 var Topic = models.Topic
 var Comment = models.Comment

ext/lib/api/text.js

@@ -6,7 +6,7 @@ var utils = require('lib/backend/utils')
 var restrict = utils.restrict
 var maintenance = utils.maintenance
 
-const dbApi = require('../db-api')
+const dbApi = require('ext/lib/db-api')
 
 const app = module.exports = express.Router()
 

ext/lib/api/topics-ext.js

@@ -90,7 +90,7 @@ function postTopics (req, res, next) {
 
   log('Creating new topic/llamado')
 
-  // en ext/lib/db-api/index.js agregamos la key "extra" a las expose/updateables
+  // en ext/lib/backend/db-api/index.js agregamos la key "extra" a las expose/updateables
   dbApi.topics.create({
     user: req.user,
     forum: req.forum
@@ -121,7 +121,7 @@ function putTopics (req, res, next) {
 
   log('Updating existing topic/llamado')
 
-  // en ext/lib/db-api/index.js agregamos la key "extra" a las expose/updateables
+  // en ext/lib/backend/db-api/index.js agregamos la key "extra" a las expose/updateables
   dbApi.topics.edit({
     id: req.params.id,
     user: req.user,

ext/lib/api/user-verify.js

@@ -9,11 +9,11 @@ var utils = require('lib/backend/utils')
 var expose = utils.expose
 var restrict = utils.restrict
 var pluck = utils.pluck
-var models = require('lib/models')
+var models = require('lib/backend/models')
 var User = models.User
 
-const dbApi = require('../db-api')
-const dbApiOriginal = require('lib/db-api')
+const dbApi = require('ext/lib/db-api')
+const dbApiOriginal = require('lib/backend/db-api')
 
 const app = module.exports = express.Router()
 

ext/lib/comments/index.js

@@ -5,7 +5,7 @@ const config = require('lib/config')
 const urlBuilder = require('lib/backend/url-builder')
 const middlewares = require('lib/api-v2/middlewares')
 const api = require('lib/api-v2/db-api')
-const User = require('lib/models').User
+const User = require('lib/backend/models').User
 
 const app = module.exports = express()
 

ext/lib/db-api/forum.js

@@ -1,6 +1,6 @@
 var pick = require('mout/object/pick')
 var Log = require('debug')
-var models = require('lib/models')
+var models = require('lib/backend/models')
 var pluck = require('lib/backend/utils').pluck
 var log = new Log('democracyos:db-api:forum')
 var Forum = models.Forum

ext/lib/db-api/index.js

@@ -10,5 +10,5 @@ const topicScopes = require('lib/api-v2/db-api/topics/scopes')
 topicScopes.ordinary.keys.expose.push('extra')
 topicScopes.ordinary.select += ' extra'
 
-const userDbApi = require('lib/db-api/user')
+const userDbApi = require('lib/backend/db-api/user')
 userDbApi.expose.confidential.keys.push('extra')

ext/lib/db-api/text.js

@@ -5,7 +5,7 @@ const utils = require('lib/backend/utils')
 const pluck = utils.pluck
 
 // para esto hay que agregar el modelo a dos-overrides! (y rebuildear)
-const Text = require('lib/models').Text
+const Text = require('lib/backend/models').Text
 
 exports.all = function all (fn) {
   log('Looking for all texts.')

ext/lib/db-api/user.js

@@ -1,6 +1,6 @@
 const debug = require('debug')
 const escapeStringRegexp = require('escape-string-regexp')
-const User = require('lib/models').User
+const User = require('lib/backend/models').User
 const utils = require('lib/backend/utils')
 const pluck = utils.pluck
 const expose = utils.expose

ext/lib/site/boot/boot.js

@@ -1,4 +1,4 @@
-import 'lib/translations/translations'
+import 'lib/backend/translations/translations'
 import './overrides'
 
 require('ext/lib/boot/routes')()

ext/lib/translations/index.js

@@ -1,3 +1,3 @@
-const translations = require('lib/translations')
+const translations = require('lib/backend/translations')
 
 Object.assign(translations.es, require('./lib/es.json'))

index.js

@@ -3,7 +3,7 @@ const config = require('lib/config')
 const server = require('lib/backend/server')
 const checkNodeVersion = require('lib/backend/check-node-version')
 const migrations = require('lib/backend/migrations')
-const models = require('lib/models')()
+const models = require('lib/backend/models')()
 
 const log = debug('democracyos:root')
 

lib/api-v2/db-api/comments/index.js

@@ -1,4 +1,4 @@
-const Comment = require('lib/models').Comment
+const Comment = require('lib/backend/models').Comment
 const privileges = require('lib/backend/privileges/forum')
 const scopes = require('./scopes')
 

lib/api-v2/db-api/forums/index.js

@@ -1,4 +1,4 @@
-const Forum = require('lib/models').Forum
+const Forum = require('lib/backend/models').Forum
 
 /**
  * Default find Method, to be used in favor of Model.find()

lib/api-v2/db-api/search/index.js

@@ -1,4 +1,4 @@
-const Forum = require('lib/models').Forum
+const Forum = require('lib/backend/models').Forum
 const scopes = require('../forums/scopes')
 
 exports.searchForum = function searchForum (opts, query) {

lib/api-v2/db-api/topics/index.js

@@ -1,6 +1,6 @@
 const ObjectID = require('mongoose').Types.ObjectId
-const Topic = require('lib/models').Topic
-const Vote = require('lib/models').Vote
+const Topic = require('lib/backend/models').Topic
+const Vote = require('lib/backend/models').Vote
 const Comments = require('../comments')
 const scopes = require('./scopes')
 const removeOwnVote = require('./utils').removeOwnVote

lib/api-v2/db-api/topics/utils.js

@@ -1,5 +1,5 @@
 const difference = require('lodash.difference')
-const { Vote } = require('lib/models')
+const { Vote } = require('lib/backend/models')
 
 /**
 * Remove vote to change it.

lib/api-v2/middlewares/forums.js

@@ -1,7 +1,7 @@
 const ObjectID = require('mongoose').Types.ObjectId
 const filter = require('mout/object/filter')
 const privileges = require('lib/backend/privileges/forum')
-const Topic = require('lib/models').Topic
+const Topic = require('lib/backend/models').Topic
 const config = require('lib/config')
 const api = require('lib/api-v2/db-api')
 

lib/api-v2/middlewares/notifications.js

@@ -2,7 +2,7 @@ const notifier = require('democracyos-notifier')
 const urlBuilder = require('lib/backend/url-builder')
 const config = require('lib/config')
 const utils = require('lib/backend/utils')
-const api = require('lib/db-api')
+const api = require('lib/backend/db-api')
 const userScopes = require('lib/api-v2/db-api/users/scopes')
 
 exports.comment = function comment (req, res, next) {

lib/api-v2/topics/csv.js

@@ -2,7 +2,7 @@ const express = require('express')
 const debug = require('debug')
 const json2csv = require('json-2-csv').json2csv
 const csv2json = require('json-2-csv').csv2json
-const Topic = require('lib/models').Topic
+const Topic = require('lib/backend/models').Topic
 const getIdString = require('lib/backend/utils').getIdString
 const middlewares = require('lib/api-v2/middlewares')
 

lib/api/forgot/lib/forgotpassword.js

@@ -4,12 +4,12 @@
 
 var log = require('debug')('democracyos:forgotpassword')
 var t = require('t-component')
-var api = require('lib/db-api')
+var api = require('lib/backend/db-api')
 var config = require('lib/config')
 var utils = require('lib/backend/utils')
 var notifier = require('democracyos-notifier')
 var normalizeEmail = require('lib/backend/normalize-email')
-var User = require('lib/models').User
+var User = require('lib/backend/models').User
 
 /**
  * Creates a forgot password token and sends it to the user by email

lib/api/forum/index.js

@@ -2,7 +2,7 @@ var ObjectId = require('mongoose').Types.ObjectId
 var express = require('express')
 var Log = require('debug')
 var config = require('lib/config')
-var api = require('lib/db-api')
+var api = require('lib/backend/db-api')
 var utils = require('lib/backend/utils')
 var restrict = utils.restrict
 var maintenance = utils.maintenance

lib/api/notification/index.js

@@ -9,7 +9,7 @@ var accepts = require('lib/backend/accepts')
 var restrict = utils.restrict
 var pluck = utils.pluck
 var expose = utils.expose
-var api = require('lib/db-api')
+var api = require('lib/backend/db-api')
 
 var app = module.exports = express()
 var _handleError = utils._handleError

lib/api/settings/index.js

@@ -6,7 +6,7 @@ var express = require('express')
 var log = require('debug')('democracyos:settings')
 var t = require('t-component')
 var restrict = require('lib/backend/utils').restrict
-var User = require('lib/models').User
+var User = require('lib/backend/models').User
 
 /**
  * Exports Application

lib/api/signin/index.js

@@ -4,10 +4,10 @@
 
 var express = require('express')
 var t = require('t-component')
-var User = require('lib/models').User
+var User = require('lib/backend/models').User
 var config = require('lib/config')
 var jwt = require('lib/backend/jwt')
-var api = require('lib/db-api')
+var api = require('lib/backend/db-api')
 var normalizeEmail = require('lib/backend/normalize-email')
 var setDefaultForum = require('lib/backend/middlewares/forum-middlewares').setDefaultForum
 var initPrivileges = require('lib/backend/middlewares/user').initPrivileges

lib/api/signup/index.js

@@ -4,7 +4,7 @@
 
 var express = require('express')
 var config = require('lib/config')
-var api = require('lib/db-api')
+var api = require('lib/backend/db-api')
 var jwt = require('lib/backend/jwt')
 var l10n = require('lib/backend/l10n')
 

lib/api/signup/lib/signup.js

@@ -7,12 +7,12 @@ var request = require('request')
 var t = require('t-component')
 var notifier = require('democracyos-notifier')
 var utils = require('lib/backend/utils')
-var api = require('lib/db-api')
+var api = require('lib/backend/db-api')
 var config = require('lib/config')
 var SignupStrategy = require('lib/backend/signup-strategy')
 var emailWhitelisting = require('lib/backend/whitelist-strategy-email')()
 var normalizeEmail = require('lib/backend/normalize-email')
-var User = require('lib/models').User
+var User = require('lib/backend/models').User
 
 /**
  * Signups a user

lib/api/tag/index.js

@@ -4,7 +4,7 @@
 
 var express = require('express')
 var log = require('debug')('democracyos:tag')
-var api = require('lib/db-api')
+var api = require('lib/backend/db-api')
 var accepts = require('lib/backend/accepts')
 var utils = require('lib/backend/utils')
 var staff = utils.staff

lib/api/topic/index.js

@@ -1,6 +1,6 @@
 var debug = require('debug')
 var express = require('express')
-var api = require('lib/db-api')
+var api = require('lib/backend/db-api')
 var utils = require('lib/backend/utils')
 var accepts = require('lib/backend/accepts')
 var config = require('lib/config')

lib/api/whitelist/index.js

@@ -4,7 +4,7 @@
 
 var express = require('express')
 var log = require('debug')('democracyos:whitelist-api')
-var api = require('lib/db-api')
+var api = require('lib/backend/db-api')
 var config = require('lib/config')
 var utils = require('lib/backend/utils')
 var accepts = require('lib/backend/accepts')

lib/backend/auth/strategy.js

@@ -3,7 +3,7 @@
  */
 var passport = require('passport')
 var LocalStrategy = require('passport-local').Strategy
-var User = require('lib/models').User
+var User = require('lib/backend/models').User
 
 /**
  * Expose AuthStrategy

lib/db-api/forum.js lib/backend/db-api/forum.js

@@ -1,6 +1,6 @@
 var pick = require('mout/object/pick')
 var Log = require('debug')
-var models = require('lib/models')
+var models = require('lib/backend/models')
 var pluck = require('lib/backend/utils').pluck
 var log = new Log('democracyos:db-api:forum')
 var Forum = models.Forum