From e1c47572a6235fd8fd20af888ac3a11c7ae1369d Mon Sep 17 00:00:00 2001 From: MCMXC <16797721+mcmxcdev@users.noreply.github.com> Date: Sat, 10 Feb 2024 18:37:40 -0700 Subject: updates --- start/env.ts | 4 +-- start/events.ts | 18 ++++++------ start/kernel.ts | 6 ++-- start/routes.ts | 4 +-- start/routes/api.ts | 81 +++++++++++++++++++++++++++++++++-------------------- start/routes/web.ts | 64 ++++++++++++++++++++++++------------------ 6 files changed, 103 insertions(+), 74 deletions(-) (limited to 'start') diff --git a/start/env.ts b/start/env.ts index 3e1702e..c51a472 100644 --- a/start/env.ts +++ b/start/env.ts @@ -11,7 +11,7 @@ | and hence do not rename or move this file to a different location. | */ -import { Env } from '@adonisjs/core/env' +import { Env } from '@adonisjs/core/env'; export default await Env.create(new URL('../', import.meta.url), { HOST: Env.schema.string({ format: 'host' }), @@ -21,4 +21,4 @@ export default await Env.create(new URL('../', import.meta.url), { APP_NAME: Env.schema.string(), NODE_ENV: Env.schema.enum(['development', 'production', 'test'] as const), -}) +}); diff --git a/start/events.ts b/start/events.ts index faedc29..9fe05e3 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/config'; +import emitter from '@adonisjs/core/services/emitter'; +import mail from '@adonisjs/mail/services/main'; /* |-------------------------------------------------------------------------- @@ -14,8 +14,8 @@ import mail from '@adonisjs/mail/services/main' emitter.on('forgot::password', async ({ user, token }) => { try { // eslint-disable-next-line no-console - console.log('Sending message') - await mail.send((message) => { + console.log('Sending message'); + await mail.send(message => { message .subject('[Ferdium] Forgot Password') .to(user.email) @@ -24,10 +24,10 @@ emitter.on('forgot::password', async ({ user, token }) => { appUrl: Config.get('app.url'), username: user.username, token, - }) - }) + }); + }); } catch (error) { // eslint-disable-next-line no-console - console.log(`Couldn't send mail: ${error}`) + console.log(`Couldn't send mail: ${error}`); } -}) +}); diff --git a/start/kernel.ts b/start/kernel.ts index 99a0820..0081844 100644 --- a/start/kernel.ts +++ b/start/kernel.ts @@ -9,7 +9,7 @@ | */ -import { server } from '@adonisjs/core/services/server' +import { server } from '@adonisjs/core/services/server'; /* |-------------------------------------------------------------------------- @@ -23,7 +23,7 @@ import { server } from '@adonisjs/core/services/server' server.middleware.register([ () => import('@ioc:Adonis/Core/BodyParser'), () => import('@ioc:Adonis/Addons/Shield'), -]) +]); /* |-------------------------------------------------------------------------- @@ -46,4 +46,4 @@ server.middleware.registerNamed({ dashboard: () => import('App/Middleware/Dashboard'), guest: () => import('App/Middleware/AllowGuestOnly'), shield: () => import('@ioc:Adonis/Addons/Shield'), -}) +}); diff --git a/start/routes.ts b/start/routes.ts index 7c62909..ea090c9 100644 --- a/start/routes.ts +++ b/start/routes.ts @@ -18,5 +18,5 @@ | */ -import './routes/api.js' -import './routes/web.js' +import './routes/api.js'; +import './routes/web.js'; diff --git a/start/routes/api.ts b/start/routes/api.ts index 8992154..77c3046 100644 --- a/start/routes/api.ts +++ b/start/routes/api.ts @@ -1,47 +1,68 @@ // As this is currently a rebuild of the initial API we it is grouped in /v2/ -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') +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'); router .group(() => { // User authentification - router.post('auth/signup', [UserController, 'signup']).middleware('guest') - router.post('auth/login', [UserController, 'login']).middleware('guest') + router.post('auth/signup', [UserController, 'signup']).middleware('guest'); + router.post('auth/login', [UserController, 'login']).middleware('guest'); // User info - router.get('me', [UserController, 'me']).middleware('auth:jwt') - router.put('me', [UserController, 'updateMe']).middleware('auth:jwt') - router.get('me/newtoken', [UserController, 'newToken']).middleware('auth:jwt') + router.get('me', [UserController, 'me']).middleware('auth:jwt'); + router.put('me', [UserController, 'updateMe']).middleware('auth:jwt'); + router + .get('me/newtoken', [UserController, 'newToken']) + .middleware('auth:jwt'); // // Service info - router.post('service', [ServiceController, 'create']).middleware('auth:jwt') - router.put('service/reorder', [ServiceController, 'reorder']).middleware('auth:jwt') - router.put('service/:id', [ServiceController, 'edit']).middleware('auth:jwt') - router.delete('service/:id', [ServiceController, 'delete']).middleware('auth:jwt') - router.get('me/services', [ServiceController, 'list']).middleware('auth:jwt') - router.get('recipe', [ServiceController, 'list']).middleware('auth:jwt') - router.get('icon/:id', [ServiceController, 'icon']) + router + .post('service', [ServiceController, 'create']) + .middleware('auth:jwt'); + router + .put('service/reorder', [ServiceController, 'reorder']) + .middleware('auth:jwt'); + router + .put('service/:id', [ServiceController, 'edit']) + .middleware('auth:jwt'); + router + .delete('service/:id', [ServiceController, 'delete']) + .middleware('auth:jwt'); + router + .get('me/services', [ServiceController, 'list']) + .middleware('auth:jwt'); + router.get('recipe', [ServiceController, 'list']).middleware('auth:jwt'); + router.get('icon/:id', [ServiceController, 'icon']); // Recipe store - router.get('recipes', [RecipeController, 'list']) - router.get('recipes/search', [RecipeController, 'search']) - router.get('recipes/popular', [RecipeController, 'popularRecipes']) - router.get('recipes/download/:recipe', [RecipeController, 'download']) - router.post('recipes/update', [RecipeController, 'update']) + router.get('recipes', [RecipeController, 'list']); + router.get('recipes/search', [RecipeController, 'search']); + router.get('recipes/popular', [RecipeController, 'popularRecipes']); + router.get('recipes/download/:recipe', [RecipeController, 'download']); + router.post('recipes/update', [RecipeController, 'update']); // // Workspaces - router.put('workspace/:id', 'WorkspaceController.edit').middleware('auth:jwt') - router.delete('workspace/:id', 'WorkspaceController.delete').middleware('auth:jwt') - router.post('workspace', 'WorkspaceController.create').middleware('auth:jwt') - router.get('workspace', 'WorkspaceController.list').middleware('auth:jwt') + router + .put('workspace/:id', 'WorkspaceController.edit') + .middleware('auth:jwt'); + router + .delete('workspace/:id', 'WorkspaceController.delete') + .middleware('auth:jwt'); + router + .post('workspace', 'WorkspaceController.create') + .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?', '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', + ); }) - .prefix('/v1') + .prefix('/v1'); diff --git a/start/routes/web.ts b/start/routes/web.ts index fd12bf2..2907e62 100644 --- a/start/routes/web.ts +++ b/start/routes/web.ts @@ -1,14 +1,14 @@ -import router from '@adonisjs/core/services/router' +import router from '@adonisjs/core/services/router'; // Health check -router.get('health', 'HealthController.index') +router.get('health', 'HealthController.index'); // Legal documents -router.get('terms', ({ response }) => response.redirect('/terms.html')) -router.get('privacy', ({ response }) => response.redirect('/privacy.html')) +router.get('terms', ({ response }) => response.redirect('/terms.html')); +router.get('privacy', ({ response }) => response.redirect('/privacy.html')); // Index -router.get('/', ({ view }) => view.render('others/index')) +router.get('/', ({ view }) => view.render('others/index')); router .group(() => { @@ -17,46 +17,54 @@ router // Guest troutes router .group(() => { - router.get('login', 'Dashboard/LoginController.show') - router.post('login', 'Dashboard/LoginController.login').as('login') + router.get('login', 'Dashboard/LoginController.show'); + router.post('login', 'Dashboard/LoginController.login').as('login'); // Reset password - router.get('forgot', 'Dashboard/ForgotPasswordController.show') - router.post('forgot', 'Dashboard/ForgotPasswordController.forgotPassword') + router.get('forgot', 'Dashboard/ForgotPasswordController.show'); + router.post( + 'forgot', + 'Dashboard/ForgotPasswordController.forgotPassword', + ); - router.get('reset', 'Dashboard/ResetPasswordController.show') - router.post('reset', 'Dashboard/ResetPasswordController.resetPassword') + router.get('reset', 'Dashboard/ResetPasswordController.show'); + router.post( + 'reset', + 'Dashboard/ResetPasswordController.resetPassword', + ); }) - .middleware(['dashboard', 'guest']) + .middleware(['dashboard', 'guest']); // Authenticated routes router .group(() => { - router.get('account', 'Dashboard/AccountController.show') - router.post('account', 'Dashboard/AccountController.store') + router.get('account', 'Dashboard/AccountController.show'); + router.post('account', 'Dashboard/AccountController.store'); - router.get('data', 'Dashboard/DataController.show') - router.get('export', 'Dashboard/ExportController.show') + router.get('data', 'Dashboard/DataController.show'); + router.get('export', 'Dashboard/ExportController.show'); - router.get('transfer', 'Dashboard/TransferController.show') - router.post('transfer', 'Dashboard/TransferController.import') + router.get('transfer', 'Dashboard/TransferController.show'); + router.post('transfer', 'Dashboard/TransferController.import'); - router.get('delete', 'Dashboard/DeleteController.show') - router.post('delete', 'Dashboard/DeleteController.delete') + router.get('delete', 'Dashboard/DeleteController.show'); + router.post('delete', 'Dashboard/DeleteController.delete'); - router.get('logout', 'Dashboard/LogOutController.logout') + router.get('logout', 'Dashboard/LogOutController.logout'); - router.get('*', ({ response }) => response.redirect('/user/account')) + router.get('*', ({ response }) => + response.redirect('/user/account'), + ); }) - .middleware(['dashboard', 'auth:web']) + .middleware(['dashboard', 'auth:web']); }) - .prefix('user') + .prefix('user'); // Franz/Ferdi account import - router.get('import', ({ view }) => view.render('others/import')) - router.post('import', 'UserController.import') + router.get('import', ({ view }) => view.render('others/import')); + router.post('import', 'UserController.import'); // 404 handler - router.get('/*', ({ response }) => response.redirect('/')) + router.get('/*', ({ response }) => response.redirect('/')); }) - .middleware(['dashboard']) + .middleware(['dashboard']); -- cgit v1.2.3-70-g09d2