4 files changed, 94 insertions, 39 deletions

diff --git a/start/events.ts b/start/events.ts
index 9fe05e3..b3667db 100644
--- a/start/events.ts
+++ b/start/events.ts
@@ -1,6 +1,6 @@
-import { Config } from '@adonisjs/core/config';
 import emitter from '@adonisjs/core/services/emitter';
 import mail from '@adonisjs/mail/services/main';
+import config from '@adonisjs/core/services/config';
 
 /*
 |--------------------------------------------------------------------------
@@ -19,9 +19,9 @@ emitter.on('forgot::password', async ({ user, token }) => {
       message
         .subject('[Ferdium] Forgot Password')
         .to(user.email)
-        .from(Config.get('dasshboard.mailFrom'))
+        .from(config.get('dasshboard.mailFrom'))
         .textView('emails.forgot-password', {
-          appUrl: Config.get('app.url'),
+          appUrl: config.get('app.url'),
           username: user.username,
           token,
         });
diff --git a/start/kernel.ts b/start/kernel.ts
index 86ec933..4bd783c 100644
--- a/start/kernel.ts
+++ b/start/kernel.ts
@@ -1,12 +1,46 @@
-import server from '@adonisjs/core/services/server';
+/*
+|--------------------------------------------------------------------------
+| HTTP kernel file
+|--------------------------------------------------------------------------
+|
+| The HTTP kernel file is used to register the middleware with the server
+| or the router.
+|
+*/
+
 import router from '@adonisjs/core/services/router';
+import server from '@adonisjs/core/services/server';
 
+/**
+ * The error handler is used to convert an exception
+ * to a HTTP response.
+ */
+server.errorHandler(() => import('#exceptions/handler'));
+
+/**
+ * The server middleware stack runs middleware on all the HTTP
+ * requests, even if there is no route registered for
+ * the request URL.
+ */
 server.use([
   () => import('@adonisjs/core/bodyparser_middleware'),
   () => import('@adonisjs/shield/shield_middleware'),
+  () => import('@adonisjs/cors/cors_middleware'),
+  () => import('#middleware/container_bindings_middleware'),
+  () => import('#middleware/force_json_response_middleware'),
 ]);
 
-router.named({
+/**
+ * The router middleware stack runs middleware on all the HTTP
+ * requests with a registered route.
+ */
+router.use([() => import('@adonisjs/core/bodyparser_middleware')]);
+
+/**
+ * Named middleware collection must be explicitly assigned to
+ * the routes or the routes group.
+ */
+export const middleware = router.named({
   auth: () => import('#app/Middleware/Auth'),
   dashboard: () => import('#app/Middleware/Dashboard'),
   guest: () => import('#app/Middleware/AllowGuestOnly'),
diff --git a/start/routes/api.ts b/start/routes/api.ts
index 77c3046..54250a2 100644
--- a/start/routes/api.ts
+++ b/start/routes/api.ts
@@ -4,6 +4,14 @@ import router from '@adonisjs/core/services/router';
 const UserController = () => import('#controllers/Http/UserController');
 const ServiceController = () => import('#controllers/Http/ServiceController');
 const RecipeController = () => import('#controllers/Http/RecipeController');
+const WorkspaceController = () =>
+  import('#controllers/Http/WorkspaceController');
+const FeaturesController = () =>
+  import('#controllers/Http/Api/Static/FeaturesController');
+const EmptyController = () =>
+  import('#controllers/Http/Api/Static/EmptyController');
+const AnnouncementsController = () =>
+  import('#controllers/Http/Api/Static/AnnouncementsController');
 
 router
   .group(() => {
@@ -46,23 +54,22 @@ router
 
     // // Workspaces
     router
-      .put('workspace/:id', 'WorkspaceController.edit')
+      .put('workspace/:id', [WorkspaceController, 'edit'])
       .middleware('auth:jwt');
     router
-      .delete('workspace/:id', 'WorkspaceController.delete')
+      .delete('workspace/:id', [WorkspaceController, 'delete'])
       .middleware('auth:jwt');
     router
-      .post('workspace', 'WorkspaceController.create')
+      .post('workspace', [WorkspaceController, 'create'])
+      .middleware('auth:jwt');
+    router
+      .get('workspace', [WorkspaceController, 'list'])
       .middleware('auth:jwt');
-    router.get('workspace', 'WorkspaceController.list').middleware('auth:jwt');
 
     // Static responses
-    router.get('features/:mode?', 'Api/Static/FeaturesController.show');
-    router.get('services', 'Api/Static/EmptyController.show');
-    router.get('news', 'Api/Static/EmptyController.show');
-    router.get(
-      'announcements/:version',
-      'Api/Static/AnnouncementsController.show',
-    );
+    router.get('features/:mode?', [FeaturesController, 'show']);
+    router.get('services', [EmptyController, 'show']);
+    router.get('news', [EmptyController, 'show']);
+    router.get('announcements/:version', [AnnouncementsController, 'show']);
   })
   .prefix('/v1');
diff --git a/start/routes/web.ts b/start/routes/web.ts
index 2907e62..a944c05 100644
--- a/start/routes/web.ts
+++ b/start/routes/web.ts
@@ -1,7 +1,27 @@
 import router from '@adonisjs/core/services/router';
+const HealthController = () => import('#controllers/Http/HealthController');
+const LoginController = () =>
+  import('#controllers/Http/Dashboard/LoginController');
+const ForgotPasswordController = () =>
+  import('#controllers/Http/Dashboard/ForgotPasswordController');
+const ResetPasswordController = () =>
+  import('#controllers/Http/Dashboard/ResetPasswordController');
+const AccountController = () =>
+  import('#controllers/Http/Dashboard/AccountController');
+const DataController = () =>
+  import('#controllers/Http/Dashboard/DataController');
+const ExportController = () =>
+  import('#controllers/Http/Dashboard/ExportController');
+const TransferController = () =>
+  import('#controllers/Http/Dashboard/TransferController');
+const DeleteController = () =>
+  import('#controllers/Http/Dashboard/DeleteController');
+const LogOutController = () =>
+  import('#controllers/Http/Dashboard/LogOutController');
+const UserController = () => import('#controllers/Http/UserController');
 
 // Health check
-router.get('health', 'HealthController.index');
+router.get('health', [HealthController, 'index']);
 
 // Legal documents
 router.get('terms', ({ response }) => response.redirect('/terms.html'));
@@ -17,40 +37,34 @@ router
         // Guest troutes
         router
           .group(() => {
-            router.get('login', 'Dashboard/LoginController.show');
-            router.post('login', 'Dashboard/LoginController.login').as('login');
+            router.get('login', [LoginController, 'show']);
+            router.post('login', [LoginController, 'login']).as('login');
 
             // Reset password
-            router.get('forgot', 'Dashboard/ForgotPasswordController.show');
-            router.post(
-              'forgot',
-              'Dashboard/ForgotPasswordController.forgotPassword',
-            );
+            router.get('forgot', [ForgotPasswordController, 'show']);
+            router.post('forgot', [ForgotPasswordController, 'forgotPassword']);
 
-            router.get('reset', 'Dashboard/ResetPasswordController.show');
-            router.post(
-              'reset',
-              'Dashboard/ResetPasswordController.resetPassword',
-            );
+            router.get('reset', [ResetPasswordController, 'show']);
+            router.post('reset', [ResetPasswordController, 'resetPassword']);
           })
           .middleware(['dashboard', 'guest']);
 
         // Authenticated routes
         router
           .group(() => {
-            router.get('account', 'Dashboard/AccountController.show');
-            router.post('account', 'Dashboard/AccountController.store');
+            router.get('account', [AccountController, 'show']);
+            router.post('account', [AccountController, 'store']);
 
-            router.get('data', 'Dashboard/DataController.show');
-            router.get('export', 'Dashboard/ExportController.show');
+            router.get('data', [DataController, 'show']);
+            router.get('export', [ExportController, 'show']);
 
-            router.get('transfer', 'Dashboard/TransferController.show');
-            router.post('transfer', 'Dashboard/TransferController.import');
+            router.get('transfer', [TransferController, 'show']);
+            router.post('transfer', [TransferController, 'import']);
 
-            router.get('delete', 'Dashboard/DeleteController.show');
-            router.post('delete', 'Dashboard/DeleteController.delete');
+            router.get('delete', [DeleteController, 'show']);
+            router.post('delete', [DeleteController, 'delete']);
 
-            router.get('logout', 'Dashboard/LogOutController.logout');
+            router.get('logout', [LogOutController, 'logout']);
 
             router.get('*', ({ response }) =>
               response.redirect('/user/account'),
@@ -62,7 +76,7 @@ router
 
     // Franz/Ferdi account import
     router.get('import', ({ view }) => view.render('others/import'));
-    router.post('import', 'UserController.import');
+    router.post('import', [UserController, 'import']);
 
     // 404 handler
     router.get('/*', ({ response }) => response.redirect('/'));