1008 #14 ok 先把client別開了？

pulipulichen · Oct 7, 2019 · 49807b6 · 49807b6
1 parent d8c77c9
commit 49807b6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/...ntrollers/Http/ClientMessageController.js → ...trollers/Http/Client/MessageController.js b/...ntrollers/Http/ClientMessageController.js → ...trollers/Http/Client/MessageController.js
@@ -3,16 +3,16 @@
 const User = use('App/Models/User')
 const Message = use('App/Models/Message')
 
-class ClientMessageController {
+class MessageController {
   /**
    * 列出最近10則訊息
    */
-  async list ({ request, response, view, origin }) {
+  async list ({ origin }) {
     const messages = await Message.list(origin, 10)
     return messages.toJSON().reverse()
   }
 
-  async syncList ({ request, response, view, auth, origin }) {
+  async syncList ({ request, auth, origin }) {
     const query = request.get()
     let lastUpdateTimestamp = query.lastUpdateTimestamp
     if (isNaN(lastUpdateTimestamp) === true) {
@@ -35,7 +35,7 @@ class ClientMessageController {
 
     return messages.toJSON()    
   }
-  async insert ({ request, response, view, auth }) {
+  async insert ({ request, auth }) {
     const query = request.post()
     if (typeof(query.message) !== 'string') {
       return false
@@ -54,4 +54,4 @@ class ClientMessageController {
   }
 }
 
-module.exports = ClientMessageController
+module.exports = MessageController
diff --git a/app/Controllers/Http/ClientUserController.js → ...Controllers/Http/Client/UserController.js b/app/Controllers/Http/ClientUserController.js → ...Controllers/Http/Client/UserController.js
@@ -5,7 +5,7 @@ const UserOAuth = use('App/Models/UserOAuth')
 
 const Hash = use('Hash')
 
-class ClientUserController {
+class UserController {
   async login ({ request, auth, origin }) {
     const query = request.get()
 
@@ -209,4 +209,4 @@ class ClientUserController {
   }
 }
 
-module.exports = ClientUserController
+module.exports = UserController
diff --git a/start/routes.js b/start/routes.js
@@ -20,16 +20,16 @@ Route.on('/').render('welcome')
 
 // ------------------------------------------
 
-Route.get('/client/user/login', 'ClientUserController.login')
-Route.get('/client/user/register', 'ClientUserController.register')
-Route.get('/client/user/logout', 'ClientUserController.logout')
-Route.get('/client/user/check-login', 'ClientUserController.checkLogin')
-Route.get('/client/user/attempt-login-via-username', 'ClientUserController.attemptLoginViaUsername')
+Route.get('/client/user/login', 'Client/UserController.login')
+Route.get('/client/user/register', 'Client/UserController.register')
+Route.get('/client/user/logout', 'Client/UserController.logout')
+Route.get('/client/user/check-login', 'Client/UserController.checkLogin')
+Route.get('/client/user/attempt-login-via-username', 'Client/UserController.attemptLoginViaUsername')
 
-Route.get('/client/message/list', 'ClientMessageController.list')
-Route.get('/client/message/sync-list', 'ClientMessageController.syncList')
-Route.post('/client/message/insert', 'ClientMessageController.insert')
+Route.get('/client/message/list', 'Client/MessageController.list')
+Route.get('/client/message/sync-list', 'Client/MessageController.syncList')
+Route.post('/client/message/insert', 'Client/MessageController.insert')
 
-Route.get('/oauth/request/:driver', 'ClientUserController.oauthRequest')
-Route.get('/oauth/authenticated/:driver', 'ClientUserController.oauthAuthenticated')
-Route.get('/oauth/login', 'ClientUserController.oauthLogin')
+Route.get('/oauth/request/:driver', 'Client/UserController.oauthRequest')
+Route.get('/oauth/authenticated/:driver', 'Client/UserController.oauthAuthenticated')
+Route.get('/oauth/login', 'Client/UserController.oauthLogin')