aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2016-10-21 12:16:28 +0200
committerChocobozzz <florian.bigard@gmail.com>2016-10-21 12:16:28 +0200
commitf253b1c1f19d9cb056ab95b2cb6208952e073894 (patch)
treece75f6a96d9ceebd09d33cedfa008c4efb32477b
parent844e39c2f843c6e2db81699176f13972c29c42fa (diff)
downloadPeerTube-f253b1c1f19d9cb056ab95b2cb6208952e073894.tar.gz
PeerTube-f253b1c1f19d9cb056ab95b2cb6208952e073894.tar.zst
PeerTube-f253b1c1f19d9cb056ab95b2cb6208952e073894.zip
Server: remove v1 directory, we don't really need it
-rw-r--r--server/controllers/api/clients.js (renamed from server/controllers/api/v1/clients.js)2
-rw-r--r--server/controllers/api/index.js (renamed from server/controllers/api/v1/index.js)0
-rw-r--r--server/controllers/api/pods.js (renamed from server/controllers/api/v1/pods.js)6
-rw-r--r--server/controllers/api/remote.js (renamed from server/controllers/api/v1/remote.js)4
-rw-r--r--server/controllers/api/requests.js (renamed from server/controllers/api/v1/requests.js)4
-rw-r--r--server/controllers/api/users.js (renamed from server/controllers/api/v1/users.js)8
-rw-r--r--server/controllers/api/videos.js (renamed from server/controllers/api/v1/videos.js)10
-rw-r--r--server/controllers/index.js4
8 files changed, 18 insertions, 20 deletions
diff --git a/server/controllers/api/v1/clients.js b/server/controllers/api/clients.js
index 5b460db2e..ce1149227 100644
--- a/server/controllers/api/v1/clients.js
+++ b/server/controllers/api/clients.js
@@ -3,7 +3,7 @@
3const express = require('express') 3const express = require('express')
4const mongoose = require('mongoose') 4const mongoose = require('mongoose')
5 5
6const constants = require('../../../initializers/constants') 6const constants = require('../../initializers/constants')
7 7
8const Client = mongoose.model('OAuthClient') 8const Client = mongoose.model('OAuthClient')
9 9
diff --git a/server/controllers/api/v1/index.js b/server/controllers/api/index.js
index 4cb65ed55..4cb65ed55 100644
--- a/server/controllers/api/v1/index.js
+++ b/server/controllers/api/index.js
diff --git a/server/controllers/api/v1/pods.js b/server/controllers/api/pods.js
index 2f4621327..853e0705b 100644
--- a/server/controllers/api/v1/pods.js
+++ b/server/controllers/api/pods.js
@@ -4,9 +4,9 @@ const express = require('express')
4const mongoose = require('mongoose') 4const mongoose = require('mongoose')
5const waterfall = require('async/waterfall') 5const waterfall = require('async/waterfall')
6 6
7const logger = require('../../../helpers/logger') 7const logger = require('../../helpers/logger')
8const friends = require('../../../lib/friends') 8const friends = require('../../lib/friends')
9const middlewares = require('../../../middlewares') 9const middlewares = require('../../middlewares')
10const admin = middlewares.admin 10const admin = middlewares.admin
11const oAuth = middlewares.oauth 11const oAuth = middlewares.oauth
12const podsMiddleware = middlewares.pods 12const podsMiddleware = middlewares.pods
diff --git a/server/controllers/api/v1/remote.js b/server/controllers/api/remote.js
index a22c5d151..17b1d07c4 100644
--- a/server/controllers/api/v1/remote.js
+++ b/server/controllers/api/remote.js
@@ -5,10 +5,10 @@ const eachSeries = require('async/eachSeries')
5const express = require('express') 5const express = require('express')
6const mongoose = require('mongoose') 6const mongoose = require('mongoose')
7 7
8const middlewares = require('../../../middlewares') 8const middlewares = require('../../middlewares')
9const secureMiddleware = middlewares.secure 9const secureMiddleware = middlewares.secure
10const validators = middlewares.validators.remote 10const validators = middlewares.validators.remote
11const logger = require('../../../helpers/logger') 11const logger = require('../../helpers/logger')
12 12
13const router = express.Router() 13const router = express.Router()
14const Video = mongoose.model('Video') 14const Video = mongoose.model('Video')
diff --git a/server/controllers/api/v1/requests.js b/server/controllers/api/requests.js
index 97616424d..52aad6997 100644
--- a/server/controllers/api/v1/requests.js
+++ b/server/controllers/api/requests.js
@@ -3,8 +3,8 @@
3const express = require('express') 3const express = require('express')
4const mongoose = require('mongoose') 4const mongoose = require('mongoose')
5 5
6const constants = require('../../../initializers/constants') 6const constants = require('../../initializers/constants')
7const middlewares = require('../../../middlewares') 7const middlewares = require('../../middlewares')
8const admin = middlewares.admin 8const admin = middlewares.admin
9const oAuth = middlewares.oauth 9const oAuth = middlewares.oauth
10 10
diff --git a/server/controllers/api/v1/users.js b/server/controllers/api/users.js
index 975e25e68..b4d687312 100644
--- a/server/controllers/api/v1/users.js
+++ b/server/controllers/api/users.js
@@ -5,10 +5,10 @@ const express = require('express')
5const mongoose = require('mongoose') 5const mongoose = require('mongoose')
6const waterfall = require('async/waterfall') 6const waterfall = require('async/waterfall')
7 7
8const constants = require('../../../initializers/constants') 8const constants = require('../../initializers/constants')
9const friends = require('../../../lib/friends') 9const friends = require('../../lib/friends')
10const logger = require('../../../helpers/logger') 10const logger = require('../../helpers/logger')
11const middlewares = require('../../../middlewares') 11const middlewares = require('../../middlewares')
12const admin = middlewares.admin 12const admin = middlewares.admin
13const oAuth = middlewares.oauth 13const oAuth = middlewares.oauth
14const pagination = middlewares.pagination 14const pagination = middlewares.pagination
diff --git a/server/controllers/api/v1/videos.js b/server/controllers/api/videos.js
index ee47ce7ac..e2d393074 100644
--- a/server/controllers/api/v1/videos.js
+++ b/server/controllers/api/videos.js
@@ -5,10 +5,10 @@ const mongoose = require('mongoose')
5const multer = require('multer') 5const multer = require('multer')
6const waterfall = require('async/waterfall') 6const waterfall = require('async/waterfall')
7 7
8const constants = require('../../../initializers/constants') 8const constants = require('../../initializers/constants')
9const logger = require('../../../helpers/logger') 9const logger = require('../../helpers/logger')
10const friends = require('../../../lib/friends') 10const friends = require('../../lib/friends')
11const middlewares = require('../../../middlewares') 11const middlewares = require('../../middlewares')
12const oAuth = middlewares.oauth 12const oAuth = middlewares.oauth
13const pagination = middlewares.pagination 13const pagination = middlewares.pagination
14const validators = middlewares.validators 14const validators = middlewares.validators
@@ -17,7 +17,7 @@ const validatorsSort = validators.sort
17const validatorsVideos = validators.videos 17const validatorsVideos = validators.videos
18const search = middlewares.search 18const search = middlewares.search
19const sort = middlewares.sort 19const sort = middlewares.sort
20const utils = require('../../../helpers/utils') 20const utils = require('../../helpers/utils')
21 21
22const router = express.Router() 22const router = express.Router()
23const Video = mongoose.model('Video') 23const Video = mongoose.model('Video')
diff --git a/server/controllers/index.js b/server/controllers/index.js
index 4c1d3dafe..6a3f3f98f 100644
--- a/server/controllers/index.js
+++ b/server/controllers/index.js
@@ -1,8 +1,6 @@
1'use strict' 1'use strict'
2 2
3const constants = require('../initializers/constants') 3const apiController = require('./api/')
4
5const apiController = require('./api/' + constants.API_VERSION)
6 4
7module.exports = { 5module.exports = {
8 api: apiController 6 api: apiController