Server: remove v1 directory, we don't really need it

diff --git a/server/controllers/api/v1/clients.js b/server/controllers/api/clients.js
similarity index 94%
rename from server/controllers/api/v1/clients.js
rename to server/controllers/api/clients.js
index 5b460db2edeb00c6780cad24d4bff41c5fee791a..ce1149227b6a7ea0601231a8af5708459eada74f 100644 (file)
--- a/server/controllers/api/v1/clients.js
+++ b/server/controllers/api/clients.js
@@ -3,7 +3,7 @@
 const express = require('express')
 const mongoose = require('mongoose')
 
-const constants = require('../../../initializers/constants')
+const constants = require('../../initializers/constants')
 
 const Client = mongoose.model('OAuthClient')
 

diff --git a/server/controllers/api/v1/index.js b/server/controllers/api/index.js
similarity index 100%
rename from server/controllers/api/v1/index.js
rename to server/controllers/api/index.js

diff --git a/server/controllers/api/v1/pods.js b/server/controllers/api/pods.js
similarity index 95%
rename from server/controllers/api/v1/pods.js
rename to server/controllers/api/pods.js
index 2f462132711263c1f496eaac4c191e5e262c088c..853e0705bcfb47c288ff2572ebf20b95a48f70c3 100644 (file)
--- a/server/controllers/api/v1/pods.js
+++ b/server/controllers/api/pods.js
@@ -4,9 +4,9 @@ const express = require('express')
 const mongoose = require('mongoose')
 const waterfall = require('async/waterfall')
 
-const logger = require('../../../helpers/logger')
-const friends = require('../../../lib/friends')
-const middlewares = require('../../../middlewares')
+const logger = require('../../helpers/logger')
+const friends = require('../../lib/friends')
+const middlewares = require('../../middlewares')
 const admin = middlewares.admin
 const oAuth = middlewares.oauth
 const podsMiddleware = middlewares.pods

diff --git a/server/controllers/api/v1/remote.js b/server/controllers/api/remote.js
similarity index 96%
rename from server/controllers/api/v1/remote.js
rename to server/controllers/api/remote.js
index a22c5d1515b2255033330701a71ba1145a9965e4..17b1d07c4bcd40bbe17a08393ba0151da58b3ca2 100644 (file)
--- a/server/controllers/api/v1/remote.js
+++ b/server/controllers/api/remote.js
@@ -5,10 +5,10 @@ const eachSeries = require('async/eachSeries')
 const express = require('express')
 const mongoose = require('mongoose')
 
-const middlewares = require('../../../middlewares')
+const middlewares = require('../../middlewares')
 const secureMiddleware = middlewares.secure
 const validators = middlewares.validators.remote
-const logger = require('../../../helpers/logger')
+const logger = require('../../helpers/logger')
 
 const router = express.Router()
 const Video = mongoose.model('Video')

diff --git a/server/controllers/api/v1/requests.js b/server/controllers/api/requests.js
similarity index 88%
rename from server/controllers/api/v1/requests.js
rename to server/controllers/api/requests.js
index 97616424d0e24d87996be0c0f3c30e417fd82709..52aad69972cbcb4062788542d1509383d34263fc 100644 (file)
--- a/server/controllers/api/v1/requests.js
+++ b/server/controllers/api/requests.js
@@ -3,8 +3,8 @@
 const express = require('express')
 const mongoose = require('mongoose')
 
-const constants = require('../../../initializers/constants')
-const middlewares = require('../../../middlewares')
+const constants = require('../../initializers/constants')
+const middlewares = require('../../middlewares')
 const admin = middlewares.admin
 const oAuth = middlewares.oauth
 

diff --git a/server/controllers/api/v1/users.js b/server/controllers/api/users.js
similarity index 94%
rename from server/controllers/api/v1/users.js
rename to server/controllers/api/users.js
index 975e25e68f5ea1979a501a7050d723a4bcb80e95..b4d68731280accd1b24ed86a0def4236944427d8 100644 (file)
--- a/server/controllers/api/v1/users.js
+++ b/server/controllers/api/users.js
@@ -5,10 +5,10 @@ const express = require('express')
 const mongoose = require('mongoose')
 const waterfall = require('async/waterfall')
 
-const constants = require('../../../initializers/constants')
-const friends = require('../../../lib/friends')
-const logger = require('../../../helpers/logger')
-const middlewares = require('../../../middlewares')
+const constants = require('../../initializers/constants')
+const friends = require('../../lib/friends')
+const logger = require('../../helpers/logger')
+const middlewares = require('../../middlewares')
 const admin = middlewares.admin
 const oAuth = middlewares.oauth
 const pagination = middlewares.pagination

diff --git a/server/controllers/api/v1/videos.js b/server/controllers/api/videos.js
similarity index 95%
rename from server/controllers/api/v1/videos.js
rename to server/controllers/api/videos.js
index ee47ce7accd4efc418b0d2ddec91f6df1bc1edac..e2d3930740ff30bb5ee81f9f82ed0335177668f0 100644 (file)
--- a/server/controllers/api/v1/videos.js
+++ b/server/controllers/api/videos.js
@@ -5,10 +5,10 @@ const mongoose = require('mongoose')
 const multer = require('multer')
 const waterfall = require('async/waterfall')
 
-const constants = require('../../../initializers/constants')
-const logger = require('../../../helpers/logger')
-const friends = require('../../../lib/friends')
-const middlewares = require('../../../middlewares')
+const constants = require('../../initializers/constants')
+const logger = require('../../helpers/logger')
+const friends = require('../../lib/friends')
+const middlewares = require('../../middlewares')
 const oAuth = middlewares.oauth
 const pagination = middlewares.pagination
 const validators = middlewares.validators
@@ -17,7 +17,7 @@ const validatorsSort = validators.sort
 const validatorsVideos = validators.videos
 const search = middlewares.search
 const sort = middlewares.sort
-const utils = require('../../../helpers/utils')
+const utils = require('../../helpers/utils')
 
 const router = express.Router()
 const Video = mongoose.model('Video')

diff --git a/server/controllers/index.js b/server/controllers/index.js
index 4c1d3dafe2ad78eb83fb6b181c48a4d2f9a77881..6a3f3f98f42172c90650f604b712a02b1e8024df 100644 (file)
--- a/server/controllers/index.js
+++ b/server/controllers/index.js
@@ -1,8 +1,6 @@
 'use strict'
 
-const constants = require('../initializers/constants')
-
-const apiController = require('./api/' + constants.API_VERSION)
+const apiController = require('./api/')
 
 module.exports = {
   api: apiController