- added own provider for drive methods
Some checks failed
CI Pipeline / japa-tests (push) Failing after 1m13s

- renamed middleware Role and Can to role_middleware and can_middleware
- added some typing for inertia vue3 components
- npm updates
This commit is contained in:
Kaimbacher 2024-04-23 19:36:45 +02:00
parent cb51a4136f
commit 296c8fd46e
67 changed files with 2515 additions and 1913 deletions

View file

@ -19,7 +19,7 @@ export default await Env.create(new URL("../", import.meta.url), {
APP_KEY: Env.schema.string(),
APP_NAME: Env.schema.string(),
CACHE_VIEWS: Env.schema.boolean(),
SESSION_DRIVER: Env.schema.string(),
SESSION_DRIVER: Env.schema.enum(["cookie" ,"memory"] as const),
DRIVE_DISK: Env.schema.enum(['local'] as const),
NODE_ENV: Env.schema.enum(['development', 'production', 'test'] as const),
@ -31,6 +31,9 @@ export default await Env.create(new URL("../", import.meta.url), {
PG_DB_NAME: Env.schema.string(),
REDIS_HOST: Env.schema.string({ format: 'host' }),
REDIS_PORT: Env.schema.number()
REDIS_PORT: Env.schema.number(),
HASH_DRIVER: Env.schema.enum(["scrypt", "argon", "bcrypt", "laravel", undefined] as const),
OAI_LIST_SIZE: Env.schema.number()
})

View file

@ -24,6 +24,7 @@ server.errorHandler(
server.use([
() => import('#middleware/container_bindings_middleware'),
() => import('@adonisjs/static/static_middleware'),
// () => import('@adonisjs/cors/cors_middleware'),
() => import('@adonisjs/inertia/inertia_middleware'),
])
@ -46,10 +47,8 @@ router.use([
* the routes or the routes group.
*/
export const middleware = router.named({
// guest: () => import('#middleware/guest_middleware'),
// stardust: () => import('#middleware/stardust_middleware'),
// guest: () => import('#middleware/guest_middleware'),
guest: () => import('#middleware/guest_middleware'),
auth: () => import('#middleware/auth_middleware'),
is: () => import('#middleware/Role'),
can: () => import('#middleware/Can'),
is: () => import('#middleware/role_middleware'),
can: () => import('#middleware/can_middleware'),
})

View file

@ -29,7 +29,7 @@ import AuthValidator from '#app/Validators/AuthValidator';
import User from '#app/Models/User';
import AuthController from '#controllers/Http/Auth/AuthController';
import UserController from '#controllers/Http/Auth/UserController';
import AdminUserController from '#controllers/Http/Admin/UsersController';
import AdminuserController from '#controllers/Http/Admin/AdminuserController';
import RoleController from '#controllers/Http/Admin/RoleController';
import DatasetController from '#app/Controllers/Http/Submitter/DatasetController';
@ -131,20 +131,20 @@ router.group(() => {
.as('overview');
// user routes
router.get('/user', [AdminUserController, 'index']).as('user.index').use(middleware.can(['user-list']));
router.get('/user/create', [AdminUserController, 'create']).as('user.create').use(middleware.can(['user-create']));
router.post('/user/store', [AdminUserController, 'store']).as('user.store').use(middleware.can(['user-create']));
router.get('/user/:id', [AdminUserController, 'show']).as('user.show').where('id', router.matchers.number());
router.get('/user/:id/edit', [AdminUserController, 'edit']).as('user.edit').where('id', router.matchers.number()).use(middleware.can(['user-edit']));
router.put('/user/:id/update', [AdminUserController, 'update'])
router.get('/user', [AdminuserController, 'index']).as('user.index').use(middleware.can(['user-list']));
router.get('/user/create', [AdminuserController, 'create']).as('user.create').use(middleware.can(['user-create']));
router.post('/user/store', [AdminuserController, 'store']).as('user.store').use(middleware.can(['user-create']));
router.get('/user/:id', [AdminuserController, 'show']).as('user.show').where('id', router.matchers.number());
router.get('/user/:id/edit', [AdminuserController, 'edit']).as('user.edit').where('id', router.matchers.number()).use(middleware.can(['user-edit']));
router.put('/user/:id/update', [AdminuserController, 'update'])
.as('user.update')
.where('id', router.matchers.number())
.use(middleware.can(['user-edit']));
// // Route.delete('/user/:id', [AdminUserController, 'destroy'])
// // Route.delete('/user/:id', [AdminuserController, 'destroy'])
// // .as('user.destroy')
// // .where('id', Route.matchers.number())
// // .use(middleware.can(['user-delete']));
// // Route.resource('user', 'AdminUserController');
// // Route.resource('user', 'AdminuserController');
router.get('/role', [RoleController, 'index']).as('role.index').use(middleware.can(['user-list']));
router.get('/role/create', [RoleController, 'create']).as('role.create').use(middleware.can(['user-create']));