refactor: migrate from types to dto

.adonisjs/api.ts

@@ -10,192 +10,351 @@ import type { InferInput } from '@vinejs/vine/types';
 type AdminGetHead = {
 	request: unknown;
 	response: MakeTuyauResponse<
-		import('../app/admin/controllers/admin_controller.ts').default['index'],
+		import('../app/controllers/admin/admin_controller.ts').default['index'],
+		false
+	>;
+};
+type ApiV1CollectionsPost = {
+	request: MakeTuyauRequest<
+		InferInput<
+			(typeof import('../app/validators/collections/create_collection_validator.ts'))['createCollectionValidator']
+		>
+	>;
+	response: MakeTuyauResponse<
+		import('../app/controllers/api/collections/create_collection_controller.ts').default['execute'],
+		true
+	>;
+};
+type ApiV1CollectionsIdDelete = {
+	request: MakeTuyauRequest<
+		InferInput<
+			(typeof import('../app/validators/collections/delete_collection_validator.ts'))['deleteCollectionValidator']
+		>
+	>;
+	response: MakeTuyauResponse<
+		import('../app/controllers/api/collections/delete_collection_controller.ts').default['execute'],
+		true
+	>;
+};
+type ApiV1CollectionsGetHead = {
+	request: unknown;
+	response: MakeTuyauResponse<
+		import('../app/controllers/api/collections/get_collections_controller.ts').default['show'],
+		false
+	>;
+};
+type ApiV1CollectionsIdPut = {
+	request: MakeTuyauRequest<
+		InferInput<
+			(typeof import('../app/validators/collections/update_collection_validator.ts'))['updateCollectionValidator']
+		>
+	>;
+	response: MakeTuyauResponse<
+		import('../app/controllers/api/collections/update_collection_controller.ts').default['execute'],
+		true
+	>;
+};
+type ApiV1LinksPost = {
+	request: MakeTuyauRequest<
+		InferInput<
+			(typeof import('../app/validators/links/create_link_validator.ts'))['createLinkValidator']
+		>
+	>;
+	response: MakeTuyauResponse<
+		import('../app/controllers/api/links/create_link_controller.ts').default['execute'],
+		true
+	>;
+};
+type ApiV1LinksIdDelete = {
+	request: MakeTuyauRequest<
+		InferInput<
+			(typeof import('../app/validators/links/delete_link_validator.ts'))['deleteLinkValidator']
+		>
+	>;
+	response: MakeTuyauResponse<
+		import('../app/controllers/api/links/delete_link_controller.ts').default['execute'],
+		true
+	>;
+};
+type ApiV1LinksFavoritesGetHead = {
+	request: unknown;
+	response: MakeTuyauResponse<
+		import('../app/controllers/api/links/get_favorite_links_controller.ts').default['execute'],
+		false
+	>;
+};
+type ApiV1LinksIdPut = {
+	request: MakeTuyauRequest<
+		InferInput<
+			(typeof import('../app/validators/links/update_link_validator.ts'))['updateLinkValidator']
+		>
+	>;
+	response: MakeTuyauResponse<
+		import('../app/controllers/api/links/update_link_controller.ts').default['execute'],
+		true
+	>;
+};
+type ApiV1TokensCheckGetHead = {
+	request: unknown;
+	response: MakeTuyauResponse<
+		import('../app/controllers/api/tokens/api_token_controller.ts').default['index'],
 		false
 	>;
 };
 type AuthCallbackGetHead = {
 	request: unknown;
 	response: MakeTuyauResponse<
-		import('../app/auth/controllers/auth_controller.ts').default['callbackAuth'],
+		import('../app/controllers/auth/auth_controller.ts').default['callbackAuth'],
 		false
 	>;
 };
 type AuthLogoutGetHead = {
 	request: unknown;
 	response: MakeTuyauResponse<
-		import('../app/auth/controllers/auth_controller.ts').default['logout'],
+		import('../app/controllers/auth/auth_controller.ts').default['logout'],
 		false
 	>;
 };
 type DashboardGetHead = {
 	request: unknown;
 	response: MakeTuyauResponse<
-		import('../app/collections/controllers/show_collections_controller.ts').default['render'],
+		import('../app/controllers/collections/show_collections_controller.ts').default['render'],
 		false
 	>;
 };
 type CollectionsCreateGetHead = {
 	request: unknown;
 	response: MakeTuyauResponse<
-		import('../app/collections/controllers/create_collection_controller.ts').default['render'],
+		import('../app/controllers/collections/create_collection_controller.ts').default['render'],
 		false
 	>;
 };
 type CollectionsPost = {
 	request: MakeTuyauRequest<
 		InferInput<
-			(typeof import('../app/collections/validators/create_collection_validator.ts'))['createCollectionValidator']
+			(typeof import('../app/validators/collections/create_collection_validator.ts'))['createCollectionValidator']
 		>
 	>;
 	response: MakeTuyauResponse<
-		import('../app/collections/controllers/create_collection_controller.ts').default['execute'],
+		import('../app/controllers/collections/create_collection_controller.ts').default['execute'],
 		true
 	>;
 };
 type CollectionsEditGetHead = {
 	request: unknown;
 	response: MakeTuyauResponse<
-		import('../app/collections/controllers/update_collection_controller.ts').default['render'],
+		import('../app/controllers/collections/update_collection_controller.ts').default['render'],
 		false
 	>;
 };
 type CollectionsIdPut = {
 	request: MakeTuyauRequest<
 		InferInput<
-			(typeof import('../app/collections/validators/update_collection_validator.ts'))['updateCollectionValidator']
+			(typeof import('../app/validators/collections/update_collection_validator.ts'))['updateCollectionValidator']
 		>
 	>;
 	response: MakeTuyauResponse<
-		import('../app/collections/controllers/update_collection_controller.ts').default['execute'],
+		import('../app/controllers/collections/update_collection_controller.ts').default['execute'],
 		true
 	>;
 };
 type CollectionsDeleteGetHead = {
 	request: unknown;
 	response: MakeTuyauResponse<
-		import('../app/collections/controllers/delete_collection_controller.ts').default['render'],
+		import('../app/controllers/collections/delete_collection_controller.ts').default['render'],
 		false
 	>;
 };
 type CollectionsIdDelete = {
 	request: MakeTuyauRequest<
 		InferInput<
-			(typeof import('../app/collections/validators/delete_collection_validator.ts'))['deleteCollectionValidator']
+			(typeof import('../app/validators/collections/delete_collection_validator.ts'))['deleteCollectionValidator']
 		>
 	>;
 	response: MakeTuyauResponse<
-		import('../app/collections/controllers/delete_collection_controller.ts').default['execute'],
+		import('../app/controllers/collections/delete_collection_controller.ts').default['execute'],
 		true
 	>;
 };
 type FaviconGetHead = {
 	request: unknown;
 	response: MakeTuyauResponse<
-		import('../app/favicons/controllers/favicons_controller.ts').default['index'],
+		import('../app/controllers/favicons/favicons_controller.ts').default['index'],
 		false
 	>;
 };
 type LinksCreateGetHead = {
 	request: unknown;
 	response: MakeTuyauResponse<
-		import('../app/links/controllers/delete_link_controller.js').default['showCreatePage'],
+		import('../app/controllers/links/create_link_controller.ts').default['render'],
 		false
 	>;
 };
 type LinksPost = {
 	request: MakeTuyauRequest<
 		InferInput<
-			(typeof import('../app/links/validators/create_link_validator.ts'))['createLinkValidator']
+			(typeof import('../app/validators/links/create_link_validator.ts'))['createLinkValidator']
 		>
 	>;
 	response: MakeTuyauResponse<
-		import('../app/links/controllers/delete_link_controller.js').default['store'],
+		import('../app/controllers/links/create_link_controller.ts').default['execute'],
 		true
 	>;
 };
 type LinksEditGetHead = {
 	request: unknown;
 	response: MakeTuyauResponse<
-		import('../app/links/controllers/delete_link_controller.js').default['showEditPage'],
+		import('../app/controllers/links/update_link_controller.ts').default['render'],
 		false
 	>;
 };
 type LinksIdPut = {
 	request: MakeTuyauRequest<
 		InferInput<
-			(typeof import('../app/links/validators/update_link_validator.ts'))['updateLinkValidator']
+			(typeof import('../app/validators/links/update_link_validator.ts'))['updateLinkValidator']
 		>
 	>;
 	response: MakeTuyauResponse<
-		import('../app/links/controllers/delete_link_controller.js').default['update'],
+		import('../app/controllers/links/update_link_controller.ts').default['execute'],
 		true
 	>;
 };
 type LinksIdFavoritePut = {
 	request: MakeTuyauRequest<
 		InferInput<
-			(typeof import('../app/links/validators/update_favorite_link_validator.ts'))['updateLinkFavoriteStatusValidator']
+			(typeof import('../app/validators/links/update_favorite_link_validator.ts'))['updateLinkFavoriteStatusValidator']
 		>
 	>;
 	response: MakeTuyauResponse<
-		import('../app/links/controllers/delete_link_controller.js').default['toggleFavorite'],
+		import('../app/controllers/links/toggle_favorite_controller.ts').default['toggleFavorite'],
 		true
 	>;
 };
 type LinksDeleteGetHead = {
 	request: unknown;
 	response: MakeTuyauResponse<
-		import('../app/links/controllers/delete_link_controller.js').default['showDeletePage'],
+		import('../app/controllers/links/delete_link_controller.ts').default['render'],
 		false
 	>;
 };
 type LinksIdDelete = {
 	request: MakeTuyauRequest<
 		InferInput<
-			(typeof import('../app/links/validators/delete_link_validator.ts'))['deleteLinkValidator']
+			(typeof import('../app/validators/links/delete_link_validator.ts'))['deleteLinkValidator']
 		>
 	>;
 	response: MakeTuyauResponse<
-		import('../app/links/controllers/delete_link_controller.js').default['execute'],
+		import('../app/controllers/links/delete_link_controller.ts').default['execute'],
 		true
 	>;
 };
 type SearchGetHead = {
 	request: unknown;
 	response: MakeTuyauResponse<
-		import('../app/search/controllers/search_controller.ts').default['search'],
+		import('../app/controllers/search/search_controller.ts').default['search'],
 		false
 	>;
 };
 type SharedIdGetHead = {
+	request: unknown;
+	response: MakeTuyauResponse<
+		import('../app/controllers/shared_collections/shared_collections_controller.ts').default['index'],
+		false
+	>;
+};
+type UserApitokensPost = {
 	request: MakeTuyauRequest<
 		InferInput<
-			(typeof import('../app/shared_collections/validators/shared_collection.ts'))['getSharedCollectionValidator']
+			(typeof import('../app/validators/user/token/create_api_token.ts'))['createApiTokenValidator']
 		>
 	>;
 	response: MakeTuyauResponse<
-		import('../app/shared_collections/controllers/shared_collections_controller.ts').default['index'],
+		import('../app/controllers/user/api_token_controller.ts').default['store'],
+		true
+	>;
+};
+type UserApitokensIdDelete = {
+	request: MakeTuyauRequest<
+		InferInput<
+			(typeof import('../app/validators/user/token/delete_api_token.ts'))['deleteApiTokenValidator']
+		>
+	>;
+	response: MakeTuyauResponse<
+		import('../app/controllers/user/api_token_controller.ts').default['destroy'],
+		true
+	>;
+};
+type UserDisplaypreferencesPost = {
+	request: MakeTuyauRequest<
+		InferInput<
+			(typeof import('../app/validators/user/update_display_preferences.ts'))['updateDisplayPreferencesValidator']
+		>
+	>;
+	response: MakeTuyauResponse<
+		import('../app/controllers/user/display_preferences_controller.ts').default['update'],
 		true
 	>;
 };
 type UserThemePost = {
 	request: MakeTuyauRequest<
 		InferInput<
-			(typeof import('../app/user/validators/update_theme_validator.ts'))['updateThemeValidator']
+			(typeof import('../app/validators/user/update_theme_validator.ts'))['updateThemeValidator']
 		>
 	>;
 	response: MakeTuyauResponse<
-		import('../app/user/controllers/theme_controller.ts').default['index'],
+		import('../app/controllers/user/theme_controller.ts').default['index'],
 		true
 	>;
 };
+type UserSettingsGetHead = {
+	request: unknown;
+	response: MakeTuyauResponse<
+		import('../app/controllers/user_settings/show_user_settings_controller.ts').default['render'],
+		false
+	>;
+};
 export interface ApiDefinition {
 	admin: {
 		$url: {};
 		$get: AdminGetHead;
 		$head: AdminGetHead;
 	};
+	api: {
+		v1: {
+			collections: {
+				$url: {};
+				$post: ApiV1CollectionsPost;
+				':id': {
+					$url: {};
+					$delete: ApiV1CollectionsIdDelete;
+					$put: ApiV1CollectionsIdPut;
+				};
+				$get: ApiV1CollectionsGetHead;
+				$head: ApiV1CollectionsGetHead;
+			};
+			links: {
+				$url: {};
+				$post: ApiV1LinksPost;
+				':id': {
+					$url: {};
+					$delete: ApiV1LinksIdDelete;
+					$put: ApiV1LinksIdPut;
+				};
+				favorites: {
+					$url: {};
+					$get: ApiV1LinksFavoritesGetHead;
+					$head: ApiV1LinksFavoritesGetHead;
+				};
+			};
+			tokens: {
+				check: {
+					$url: {};
+					$get: ApiV1TokensCheckGetHead;
+					$head: ApiV1TokensCheckGetHead;
+				};
+			};
+		};
+	};
 	auth: {
 		callback: {
 			$url: {};
@@ -283,10 +442,27 @@ export interface ApiDefinition {
 		};
 	};
 	user: {
+		'api-tokens': {
+			$url: {};
+			$post: UserApitokensPost;
+			':tokenId': {
+				$url: {};
+				$delete: UserApitokensIdDelete;
+			};
+		};
+		'display-preferences': {
+			$url: {};
+			$post: UserDisplaypreferencesPost;
+		};
 		theme: {
 			$url: {};
 			$post: UserThemePost;
 		};
+		settings: {
+			$url: {};
+			$get: UserSettingsGetHead;
+			$head: UserSettingsGetHead;
+		};
 	};
 }
 const routes = [
@@ -297,6 +473,69 @@ const routes = [
 		method: ['GET', 'HEAD'],
 		types: {} as AdminGetHead,
 	},
+	{
+		params: [],
+		name: 'api-collections.create',
+		path: '/api/v1/collections',
+		method: ['POST'],
+		types: {} as ApiV1CollectionsPost,
+	},
+	{
+		params: ['id'],
+		name: 'api-collections.delete',
+		path: '/api/v1/collections/:id',
+		method: ['DELETE'],
+		types: {} as ApiV1CollectionsIdDelete,
+	},
+	{
+		params: [],
+		name: 'api-collections.index',
+		path: '/api/v1/collections',
+		method: ['GET', 'HEAD'],
+		types: {} as ApiV1CollectionsGetHead,
+	},
+	{
+		params: ['id'],
+		name: 'api-collections.update',
+		path: '/api/v1/collections/:id',
+		method: ['PUT'],
+		types: {} as ApiV1CollectionsIdPut,
+	},
+	{
+		params: [],
+		name: 'api-links.create',
+		path: '/api/v1/links',
+		method: ['POST'],
+		types: {} as ApiV1LinksPost,
+	},
+	{
+		params: ['id'],
+		name: 'api-links.delete',
+		path: '/api/v1/links/:id',
+		method: ['DELETE'],
+		types: {} as ApiV1LinksIdDelete,
+	},
+	{
+		params: [],
+		name: 'api-links.get-favorite-links',
+		path: '/api/v1/links/favorites',
+		method: ['GET', 'HEAD'],
+		types: {} as ApiV1LinksFavoritesGetHead,
+	},
+	{
+		params: ['id'],
+		name: 'api-links.update',
+		path: '/api/v1/links/:id',
+		method: ['PUT'],
+		types: {} as ApiV1LinksIdPut,
+	},
+	{
+		params: [],
+		name: 'api-tokens.index',
+		path: '/api/v1/tokens/check',
+		method: ['GET', 'HEAD'],
+		types: {} as ApiV1TokensCheckGetHead,
+	},
 	{
 		params: [],
 		name: 'auth',
@@ -458,6 +697,27 @@ const routes = [
 		method: ['GET', 'HEAD'],
 		types: {} as SharedIdGetHead,
 	},
+	{
+		params: [],
+		name: 'user.api-tokens.store',
+		path: '/user/api-tokens',
+		method: ['POST'],
+		types: {} as UserApitokensPost,
+	},
+	{
+		params: ['tokenId'],
+		name: 'user.api-tokens.destroy',
+		path: '/user/api-tokens/:tokenId',
+		method: ['DELETE'],
+		types: {} as UserApitokensIdDelete,
+	},
+	{
+		params: [],
+		name: 'user.update-display-preferences',
+		path: '/user/display-preferences',
+		method: ['POST'],
+		types: {} as UserDisplaypreferencesPost,
+	},
 	{
 		params: [],
 		name: 'user.theme',
@@ -465,6 +725,13 @@ const routes = [
 		method: ['POST'],
 		types: {} as UserThemePost,
 	},
+	{
+		params: [],
+		name: 'user.settings',
+		path: '/user/settings',
+		method: ['GET', 'HEAD'],
+		types: {} as UserSettingsGetHead,
+	},
 ] as const;
 export const api = {
 	routes,

app/admin/controllers/admin_controller.ts

@@ -1,46 +0,0 @@
-import AuthController from '#auth/controllers/auth_controller';
-import { CollectionService } from '#collections/services/collection_service';
-import LinksController from '#links/controllers/delete_link_controller';
-import User from '#user/models/user';
-import { inject } from '@adonisjs/core';
-import { HttpContext } from '@adonisjs/core/http';
-
-class UserWithRelationCountDto {
-	constructor(private user: User) {}
-
-	toJson = () => ({
-		id: this.user.id,
-		email: this.user.email,
-		fullname: this.user.name,
-		avatarUrl: this.user.avatarUrl,
-		isAdmin: this.user.isAdmin,
-		createdAt: this.user.createdAt.toString(),
-		updatedAt: this.user.updatedAt.toString(),
-		lastSeenAt:
-			this.user.lastSeenAt?.toString() ?? this.user.updatedAt.toString(),
-		linksCount: Number(this.user.$extras.totalLinks),
-		collectionsCount: Number(this.user.$extras.totalCollections),
-	});
-}
-
-@inject()
-export default class AdminController {
-	constructor(
-		protected usersController: AuthController,
-		protected linksController: LinksController,
-		protected collectionService: CollectionService
-	) {}
-
-	async index({ inertia }: HttpContext) {
-		const users = await this.usersController.getAllUsersWithTotalRelations();
-		const linksCount = await this.linksController.getTotalLinksCount();
-		const collectionsCount =
-			await this.collectionService.getTotalCollectionsCount();
-
-		return inertia.render('admin/dashboard', {
-			users: users.map((user) => new UserWithRelationCountDto(user).toJson()),
-			totalLinks: linksCount,
-			totalCollections: collectionsCount,
-		});
-	}
-}

app/admin/routes/routes.ts

@@ -1 +0,0 @@
-import './admin_routes.js';

app/api/collections/routes/api_create_collections_routes.ts

@@ -1,14 +0,0 @@
-import { middleware } from '#start/kernel';
-import router from '@adonisjs/core/services/router';
-
-const CreateCollectionsController = () =>
-	import('#api/collections/controllers/create_collection_controller');
-
-router
-	.group(() => {
-		router
-			.post('', [CreateCollectionsController, 'execute'])
-			.as('api-collections.create');
-	})
-	.prefix('/api/v1/collections')
-	.middleware([middleware.auth({ guards: ['api'] })]);

app/api/collections/routes/api_delete_collections_routes.ts

@@ -1,14 +0,0 @@
-import { middleware } from '#start/kernel';
-import router from '@adonisjs/core/services/router';
-
-const DeleteCollectionsController = () =>
-	import('#api/collections/controllers/delete_collection_controller');
-
-router
-	.group(() => {
-		router
-			.delete('/:id', [DeleteCollectionsController, 'execute'])
-			.as('api-collections.delete');
-	})
-	.prefix('/api/v1/collections')
-	.middleware([middleware.auth({ guards: ['api'] })]);

app/api/collections/routes/api_get_collections_routes.ts

@@ -1,14 +0,0 @@
-import { middleware } from '#start/kernel';
-import router from '@adonisjs/core/services/router';
-
-const GetCollectionsController = () =>
-	import('#api/collections/controllers/get_collections_controller');
-
-router
-	.group(() => {
-		router
-			.get('', [GetCollectionsController, 'show'])
-			.as('api-collections.index');
-	})
-	.prefix('/api/v1/collections')
-	.middleware([middleware.auth({ guards: ['api'] })]);

app/api/collections/routes/api_update_collections_routes.ts

@@ -1,14 +0,0 @@
-import { middleware } from '#start/kernel';
-import router from '@adonisjs/core/services/router';
-
-const UpdateCollectionsController = () =>
-	import('#api/collections/controllers/update_collection_controller');
-
-router
-	.group(() => {
-		router
-			.put('/:id', [UpdateCollectionsController, 'execute'])
-			.as('api-collections.update');
-	})
-	.prefix('/api/v1/collections')
-	.middleware([middleware.auth({ guards: ['api'] })]);

app/api/collections/routes/routes.ts

@@ -1,4 +0,0 @@
-import '#api/collections/routes/api_create_collections_routes';
-import '#api/collections/routes/api_delete_collections_routes';
-import '#api/collections/routes/api_get_collections_routes';
-import '#api/collections/routes/api_update_collections_routes';

app/api/links/routes/api_create_link_routes.ts

@@ -1,12 +0,0 @@
-import { middleware } from '#start/kernel';
-import router from '@adonisjs/core/services/router';
-
-const CreateLinkController = () =>
-	import('#api/links/controllers/create_link_controller');
-
-router
-	.group(() => {
-		router.post('', [CreateLinkController, 'execute']).as('api-links.create');
-	})
-	.prefix('/api/v1/links')
-	.middleware([middleware.auth({ guards: ['api'] })]);

app/api/links/routes/api_delete_link_route.ts

@@ -1,14 +0,0 @@
-import { middleware } from '#start/kernel';
-import router from '@adonisjs/core/services/router';
-
-const DeleteLinkController = () =>
-	import('#api/links/controllers/delete_link_controller');
-
-router
-	.group(() => {
-		router
-			.delete('/:id', [DeleteLinkController, 'execute'])
-			.as('api-links.delete');
-	})
-	.prefix('/api/v1/links')
-	.middleware([middleware.auth({ guards: ['api'] })]);

app/api/links/routes/api_get_favorite_links_routes.ts

@@ -1,14 +0,0 @@
-import { middleware } from '#start/kernel';
-import router from '@adonisjs/core/services/router';
-
-const GetFavoriteLinksController = () =>
-	import('#api/links/controllers/get_favorite_links_controller');
-
-router
-	.group(() => {
-		router
-			.get('', [GetFavoriteLinksController, 'execute'])
-			.as('api-links.get-favorite-links');
-	})
-	.prefix('/api/v1/links/favorites')
-	.middleware([middleware.auth({ guards: ['api'] })]);

app/api/links/routes/api_update_link_route.ts

@@ -1,14 +0,0 @@
-import { middleware } from '#start/kernel';
-import router from '@adonisjs/core/services/router';
-
-const UpdateLinkController = () =>
-	import('#api/links/controllers/update_link_controller');
-
-router
-	.group(() => {
-		router
-			.put('/:id', [UpdateLinkController, 'execute'])
-			.as('api-links.update');
-	})
-	.prefix('/api/v1/links')
-	.middleware([middleware.auth({ guards: ['api'] })]);

app/api/links/routes/routes.ts

@@ -1,4 +0,0 @@
-import '#api/links/routes/api_create_link_routes';
-import '#api/links/routes/api_delete_link_route';
-import '#api/links/routes/api_get_favorite_links_routes';
-import '#api/links/routes/api_update_link_route';

app/api/tokens/lib/index.ts

@@ -1,11 +0,0 @@
-import { HttpContext } from '@adonisjs/core/http';
-
-export function getTokenFromHeader(ctx: HttpContext) {
-	const authHeader = ctx.request.header('Authorization');
-
-	if (!authHeader || !authHeader.startsWith('Bearer ')) {
-		return null;
-	}
-
-	return authHeader.substring(7);
-}

app/api/tokens/routes/routes.ts

@@ -1 +0,0 @@
-import '#api/tokens/routes/api_token_routes';

app/auth/routes/routes.ts

@@ -1 +0,0 @@
-import './auth_routes.js';

app/collections/routes/routes.ts

@@ -1 +0,0 @@
-import './collections_routes.js';

app/constants/user/theme.ts

@@ -0,0 +1,5 @@
+export const KEY_USER_THEME = 'user_theme';
+
+export const DEFAULT_USER_THEME = 'light';
+
+export const THEMES = ['light', 'dark'] as const;

app/controllers/admin/admin_controller.ts

@@ -0,0 +1,28 @@
+import AuthController from '#controllers/auth/auth_controller';
+import LinksController from '#controllers/links/delete_link_controller';
+import { UserWithCountersDto } from '#dtos/user_with_counters';
+import { CollectionService } from '#services/collections/collection_service';
+import { inject } from '@adonisjs/core';
+import { HttpContext } from '@adonisjs/core/http';
+
+@inject()
+export default class AdminController {
+	constructor(
+		protected usersController: AuthController,
+		protected linksController: LinksController,
+		protected collectionService: CollectionService
+	) {}
+
+	async render({ inertia }: HttpContext) {
+		const users = await this.usersController.getAllUsersWithTotalRelations();
+		const linksCount = await this.linksController.getTotalLinksCount();
+		const collectionsCount =
+			await this.collectionService.getTotalCollectionsCount();
+
+		return inertia.render('admin/dashboard', {
+			users: UserWithCountersDto.fromArray(users),
+			totalLinks: linksCount,
+			totalCollections: collectionsCount,
+		});
+	}
+}

app/controllers/api/collections/create_collection_controller.ts

@@ -1,5 +1,6 @@
-import { CollectionService } from '#collections/services/collection_service';
-import { createCollectionValidator } from '#collections/validators/create_collection_validator';
+import { CollectionWithLinksDto } from '#dtos/collection_with_links';
+import { CollectionService } from '#services/collections/collection_service';
+import { createCollectionValidator } from '#validators/collections/create_collection_validator';
 import { inject } from '@adonisjs/core';
 import { type HttpContext } from '@adonisjs/core/http';
 
@@ -8,13 +9,15 @@ export default class CreateCollectionController {
 	constructor(private collectionService: CollectionService) {}
 
 	async execute({ request, response }: HttpContext) {
-		console.log('avant');
 		const payload = await request.validateUsing(createCollectionValidator);
-		const collection = await this.collectionService.createCollection(payload);
-		console.log('après', collection);
+		const collection = await this.collectionService.createCollection({
+			name: payload.name,
+			description: payload.description,
+			visibility: payload.visibility,
+		});
 		return response.json({
 			message: 'Collection created successfully',
-			collection: collection.serialize(),
+			collection: new CollectionWithLinksDto(collection).serialize(),
 		});
 	}
 }

app/controllers/api/collections/delete_collection_controller.ts

@@ -1,5 +1,5 @@
-import { CollectionService } from '#collections/services/collection_service';
-import { deleteCollectionValidator } from '#collections/validators/delete_collection_validator';
+import { CollectionService } from '#services/collections/collection_service';
+import { deleteCollectionValidator } from '#validators/collections/delete_collection_validator';
 import { inject } from '@adonisjs/core';
 import { HttpContext } from '@adonisjs/core/http';
 

app/controllers/api/collections/get_collections_controller.ts

@@ -1,4 +1,5 @@
-import { CollectionService } from '#collections/services/collection_service';
+import { CollectionWithLinksDto } from '#dtos/collection_with_links';
+import { CollectionService } from '#services/collections/collection_service';
 import { inject } from '@adonisjs/core';
 import { HttpContext } from '@adonisjs/core/http';
 
@@ -6,11 +7,11 @@ import { HttpContext } from '@adonisjs/core/http';
 export default class GetCollectionsController {
 	constructor(private collectionService: CollectionService) {}
 
-	async show({ response }: HttpContext) {
+	async render({ response }: HttpContext) {
 		const collections =
 			await this.collectionService.getCollectionsForAuthenticatedUser();
 		return response.json({
-			collections: collections.map((collection) => collection.serialize()),
+			collections: CollectionWithLinksDto.fromArray(collections),
 		});
 	}
 }

app/controllers/api/collections/update_collection_controller.ts

@@ -1,5 +1,5 @@
-import { CollectionService } from '#collections/services/collection_service';
-import { updateCollectionValidator } from '#collections/validators/update_collection_validator';
+import { CollectionService } from '#services/collections/collection_service';
+import { updateCollectionValidator } from '#validators/collections/update_collection_validator';
 import { inject } from '@adonisjs/core';
 import { HttpContext } from '@adonisjs/core/http';
 
@@ -13,7 +13,11 @@ export default class UpdateCollectionController {
 			...payload
 		} = await request.validateUsing(updateCollectionValidator);
 
-		await this.collectionService.updateCollection(collectionId, payload);
+		await this.collectionService.updateCollection(collectionId, {
+			name: payload.name,
+			description: payload.description,
+			visibility: payload.visibility,
+		});
 		return response.json({
 			message: 'Collection updated successfully',
 		});

app/controllers/api/links/create_link_controller.ts

@@ -1,5 +1,6 @@
-import { LinkService } from '#links/services/link_service';
-import { createLinkValidator } from '#links/validators/create_link_validator';
+import { LinkDto } from '#dtos/link';
+import { LinkService } from '#services/links/link_service';
+import { createLinkValidator } from '#validators/links/create_link_validator';
 import { inject } from '@adonisjs/core';
 import { HttpContext } from '@adonisjs/core/http';
 
@@ -17,7 +18,7 @@ export default class CreateLinkController {
 		});
 		return response.json({
 			message: 'Link created successfully',
-			link: link.serialize(),
+			link: new LinkDto(link).serialize(),
 		});
 	}
 }

app/controllers/api/links/delete_link_controller.ts

@@ -1,6 +1,7 @@
-import { CollectionService } from '#collections/services/collection_service';
-import { LinkService } from '#links/services/link_service';
-import { deleteLinkValidator } from '#links/validators/delete_link_validator';
+import { LinkWithCollectionDto } from '#dtos/link_with_collection';
+import { CollectionService } from '#services/collections/collection_service';
+import { LinkService } from '#services/links/link_service';
+import { deleteLinkValidator } from '#validators/links/delete_link_validator';
 import { inject } from '@adonisjs/core';
 import { HttpContext } from '@adonisjs/core/http';
 import db from '@adonisjs/lucid/services/db';
@@ -20,7 +21,9 @@ export default class DeleteLinkController {
 
 		const link = await this.linkService.getLinkById(linkId, auth.user!.id);
 		await link.load('collection');
-		return inertia.render('links/delete', { link });
+		return inertia.render('links/delete', {
+			link: new LinkWithCollectionDto(link).serialize(),
+		});
 	}
 
 	async execute({ request, auth }: HttpContext) {

app/controllers/api/links/get_favorite_links_controller.ts

@@ -1,4 +1,5 @@
-import { LinkService } from '#links/services/link_service';
+import { LinkDto } from '#dtos/link';
+import { LinkService } from '#services/links/link_service';
 import { inject } from '@adonisjs/core';
 import { HttpContext } from '@adonisjs/core/http';
 
@@ -8,6 +9,6 @@ export default class GetFavoriteLinksController {
 
 	public async execute({ response }: HttpContext) {
 		const links = await this.linkService.getFavoriteLinksForAuthenticatedUser();
-		return response.json(links);
+		return response.json(LinkDto.fromArray(links));
 	}
 }

app/controllers/api/links/update_link_controller.ts

@@ -1,5 +1,5 @@
-import { LinkService } from '#links/services/link_service';
-import { updateLinkValidator } from '#links/validators/update_link_validator';
+import { LinkService } from '#services/links/link_service';
+import { updateLinkValidator } from '#validators/links/update_link_validator';
 import { inject } from '@adonisjs/core';
 import { HttpContext } from '@adonisjs/core/http';
 

app/controllers/api/tokens/api_token_controller.ts

@@ -1,11 +1,11 @@
-import UnAuthorizedException from '#api/tokens/exceptions/un_authorized_exception';
-import { getTokenFromHeader } from '#api/tokens/lib/index';
+import UnAuthorizedException from '#exceptions/api/tokens/un_authorized_exception';
+import { getTokenFromHeader } from '#lib/api/tokens/index';
 import { inject } from '@adonisjs/core';
 import { HttpContext } from '@adonisjs/core/http';
 
 @inject()
 export default class ApiTokenController {
-	async index(ctx: HttpContext) {
+	async render(ctx: HttpContext) {
 		const token = getTokenFromHeader(ctx);
 		if (!token) {
 			throw new UnAuthorizedException();

app/controllers/auth/auth_controller.ts

@@ -1,4 +1,4 @@
-import User from '#user/models/user';
+import User from '#models/user';
 import type { HttpContext } from '@adonisjs/core/http';
 import logger from '@adonisjs/core/services/logger';
 import db from '@adonisjs/lucid/services/db';

app/controllers/collections/create_collection_controller.ts

@@ -1,5 +1,5 @@
-import { CollectionService } from '#collections/services/collection_service';
-import { createCollectionValidator } from '#collections/validators/create_collection_validator';
+import { CollectionService } from '#services/collections/collection_service';
+import { createCollectionValidator } from '#validators/collections/create_collection_validator';
 import { inject } from '@adonisjs/core';
 import { type HttpContext } from '@adonisjs/core/http';
 
@@ -17,7 +17,11 @@ export default class CreateCollectionController {
 
 	async execute({ request }: HttpContext) {
 		const payload = await request.validateUsing(createCollectionValidator);
-		const collection = await this.collectionService.createCollection(payload);
+		const collection = await this.collectionService.createCollection({
+			name: payload.name,
+			description: payload.description,
+			visibility: payload.visibility,
+		});
 		return this.collectionService.redirectToCollectionId(collection.id);
 	}
 }

app/controllers/collections/delete_collection_controller.ts

@@ -1,5 +1,6 @@
-import { CollectionService } from '#collections/services/collection_service';
-import { deleteCollectionValidator } from '#collections/validators/delete_collection_validator';
+import { CollectionDto } from '#dtos/collection';
+import { CollectionService } from '#services/collections/collection_service';
+import { deleteCollectionValidator } from '#validators/collections/delete_collection_validator';
 import { inject } from '@adonisjs/core';
 import { HttpContext } from '@adonisjs/core/http';
 
@@ -14,7 +15,7 @@ export default class DeleteCollectionController {
 		const collection =
 			await this.collectionService.getCollectionById(collectionId);
 		return inertia.render('collections/delete', {
-			collection,
+			collection: new CollectionDto(collection).serialize(),
 		});
 	}
 

app/controllers/collections/show_collections_controller.ts

@@ -1,5 +1,7 @@
-import { CollectionService } from '#collections/services/collection_service';
-import { LinkService } from '#links/services/link_service';
+import { CollectionDto } from '#dtos/collection';
+import { LinkDto } from '#dtos/link';
+import { CollectionService } from '#services/collections/collection_service';
+import { LinkService } from '#services/links/link_service';
 import { inject } from '@adonisjs/core';
 import type { HttpContext } from '@adonisjs/core/http';
 
@@ -28,9 +30,11 @@ export default class ShowCollectionsController {
 		}
 
 		return inertia.render('dashboard', {
-			collections: collections.map((collection) => collection.serialize()),
-			favoriteLinks: favoriteLinks.map((link) => link.serialize()),
-			activeCollection: activeCollection?.serialize(),
+			collections: CollectionDto.fromArray(collections),
+			favoriteLinks: LinkDto.fromArray(favoriteLinks),
+			activeCollection: activeCollection
+				? new CollectionDto(activeCollection).serialize()
+				: null,
 		});
 	}
 }

app/controllers/collections/update_collection_controller.ts

@@ -1,5 +1,6 @@
-import { CollectionService } from '#collections/services/collection_service';
-import { updateCollectionValidator } from '#collections/validators/update_collection_validator';
+import { CollectionDto } from '#dtos/collection';
+import { CollectionService } from '#services/collections/collection_service';
+import { updateCollectionValidator } from '#validators/collections/update_collection_validator';
 import { inject } from '@adonisjs/core';
 import { HttpContext } from '@adonisjs/core/http';
 
@@ -14,7 +15,7 @@ export default class UpdateCollectionController {
 		const collection =
 			await this.collectionService.getCollectionById(collectionId);
 		return inertia.render('collections/edit', {
-			collection: collection.serialize(),
+			collection: new CollectionDto(collection).serialize(),
 		});
 	}
 
@@ -24,7 +25,11 @@ export default class UpdateCollectionController {
 			...payload
 		} = await request.validateUsing(updateCollectionValidator);
 
-		await this.collectionService.updateCollection(collectionId, payload);
+		await this.collectionService.updateCollection(collectionId, {
+			name: payload.name,
+			description: payload.description,
+			visibility: payload.visibility,
+		});
 		return this.collectionService.redirectToCollectionId(collectionId);
 	}
 }

app/controllers/favicons/favicons_controller.ts

@@ -1,6 +1,6 @@
-import { CacheService } from '#favicons/services/cache_service';
-import { FaviconService } from '#favicons/services/favicons_service';
-import { Favicon } from '#favicons/types/favicon_type';
+import { CacheService } from '#services/favicons/cache_service';
+import { FaviconService } from '#services/favicons/favicons_service';
+import { Favicon } from '#types/favicons/favicon_type';
 import { inject } from '@adonisjs/core';
 import type { HttpContext } from '@adonisjs/core/http';
 
@@ -14,7 +14,7 @@ export default class FaviconsController {
 		this.cacheService = cacheService;
 	}
 
-	async index(ctx: HttpContext) {
+	async render(ctx: HttpContext) {
 		const url = ctx.request.qs()?.url;
 		if (!url) {
 			throw new Error('Missing URL');

app/controllers/links/create_link_controller.ts

@@ -1,6 +1,7 @@
-import { CollectionService } from '#collections/services/collection_service';
-import { LinkService } from '#links/services/link_service';
-import { createLinkValidator } from '#links/validators/create_link_validator';
+import { CollectionDto } from '#dtos/collection';
+import { CollectionService } from '#services/collections/collection_service';
+import { LinkService } from '#services/links/link_service';
+import { createLinkValidator } from '#validators/links/create_link_validator';
 import { inject } from '@adonisjs/core';
 import { HttpContext } from '@adonisjs/core/http';
 
@@ -14,7 +15,9 @@ export default class CreateLinkController {
 	async render({ inertia }: HttpContext) {
 		const collections =
 			await this.collectionsService.getCollectionsForAuthenticatedUser();
-		return inertia.render('links/create', { collections });
+		return inertia.render('links/create', {
+			collections: CollectionDto.fromArray(collections),
+		});
 	}
 
 	async execute({ request }: HttpContext) {

app/controllers/links/delete_link_controller.ts

@@ -1,6 +1,7 @@
-import { CollectionService } from '#collections/services/collection_service';
-import { LinkService } from '#links/services/link_service';
-import { deleteLinkValidator } from '#links/validators/delete_link_validator';
+import { LinkWithCollectionDto } from '#dtos/link_with_collection';
+import { CollectionService } from '#services/collections/collection_service';
+import { LinkService } from '#services/links/link_service';
+import { deleteLinkValidator } from '#validators/links/delete_link_validator';
 import { inject } from '@adonisjs/core';
 import { HttpContext } from '@adonisjs/core/http';
 import db from '@adonisjs/lucid/services/db';
@@ -20,7 +21,9 @@ export default class DeleteLinkController {
 
 		const link = await this.linkService.getLinkById(linkId, auth.user!.id);
 		await link.load('collection');
-		return inertia.render('links/delete', { link });
+		return inertia.render('links/delete', {
+			link: new LinkWithCollectionDto(link).serialize(),
+		});
 	}
 
 	async execute({ request, auth }: HttpContext) {

app/controllers/links/toggle_favorite_controller.ts

@@ -1,5 +1,5 @@
-import { LinkService } from '#links/services/link_service';
-import { updateLinkFavoriteStatusValidator } from '#links/validators/update_favorite_link_validator';
+import { LinkService } from '#services/links/link_service';
+import { updateLinkFavoriteStatusValidator } from '#validators/links/update_favorite_link_validator';
 import { inject } from '@adonisjs/core';
 import { HttpContext } from '@adonisjs/core/http';
 

app/controllers/links/update_link_controller.ts

@@ -1,6 +1,8 @@
-import { CollectionService } from '#collections/services/collection_service';
-import { LinkService } from '#links/services/link_service';
-import { updateLinkValidator } from '#links/validators/update_link_validator';
+import { CollectionDto } from '#dtos/collection';
+import { LinkDto } from '#dtos/link';
+import { CollectionService } from '#services/collections/collection_service';
+import { LinkService } from '#services/links/link_service';
+import { updateLinkValidator } from '#validators/links/update_link_validator';
 import { inject } from '@adonisjs/core';
 import { HttpContext } from '@adonisjs/core/http';
 
@@ -21,7 +23,10 @@ export default class UpdateLinkController {
 			await this.collectionsService.getCollectionsForAuthenticatedUser();
 		const link = await this.linkService.getLinkById(linkId, auth.user!.id);
 
-		return inertia.render('links/edit', { collections, link });
+		return inertia.render('links/edit', {
+			collections: CollectionDto.fromArray(collections),
+			link: new LinkDto(link).serialize(),
+		});
 	}
 
 	async execute({ request }: HttpContext) {

app/controllers/search/search_controller.ts

@@ -2,7 +2,7 @@ import type { HttpContext } from '@adonisjs/core/http';
 import db from '@adonisjs/lucid/services/db';
 
 export default class SearchController {
-	async search({ request, auth }: HttpContext) {
+	async render({ request, auth }: HttpContext) {
 		const term = request.qs()?.term;
 		if (!term) {
 			console.warn('qs term null');

app/controllers/shared_collections/shared_collections_controller.ts

@@ -1,19 +1,22 @@
-import { CollectionService } from '#collections/services/collection_service';
+import { SharedCollectionDto } from '#dtos/shared_collection';
+import { CollectionService } from '#services/collections/collection_service';
+import { getSharedCollectionValidator } from '#validators/shared_collections/shared_collection';
 import { inject } from '@adonisjs/core';
 import type { HttpContext } from '@adonisjs/core/http';
-import { getSharedCollectionValidator } from '../validators/shared_collection.js';
 
 @inject()
 export default class SharedCollectionsController {
 	constructor(private collectionService: CollectionService) {}
 
-	async index({ request, inertia }: HttpContext) {
+	async render({ request, inertia }: HttpContext) {
 		const { params } = await request.validateUsing(
 			getSharedCollectionValidator
 		);
 
 		const activeCollection =
 			await this.collectionService.getPublicCollectionById(params.id);
-		return inertia.render('shared', { activeCollection });
+		return inertia.render('shared', {
+			activeCollection: new SharedCollectionDto(activeCollection).serialize(),
+		});
 	}
 }

app/controllers/user/api_token_controller.ts

@@ -1,6 +1,6 @@
-import { ApiTokenService } from '#user/services/api_token_service';
-import { createApiTokenValidator } from '#user/validators/token/create_api_token';
-import { deleteApiTokenValidator } from '#user/validators/token/delete_api_token';
+import { ApiTokenService } from '#services/user/api_token_service';
+import { createApiTokenValidator } from '#validators/user/token/create_api_token';
+import { deleteApiTokenValidator } from '#validators/user/token/delete_api_token';
 import { inject } from '@adonisjs/core';
 import { HttpContext } from '@adonisjs/core/http';
 

app/controllers/user/display_preferences_controller.ts

@@ -1,5 +1,5 @@
 import { getDisplayPreferences } from '#shared/lib/display_preferences';
-import { updateDisplayPreferencesValidator } from '#user/validators/update_display_preferences';
+import { updateDisplayPreferencesValidator } from '#validators/user/update_display_preferences';
 import { HttpContext } from '@adonisjs/core/http';
 
 export default class DisplayPreferencesController {
@@ -19,7 +19,6 @@ export default class DisplayPreferencesController {
 				getDisplayPreferences().collectionListDisplay,
 		};
 		auth.user!.displayPreferences = mergedPrefs;
-		console.log(auth.user!.displayPreferences);
 		await auth.user!.save();
 		return response.redirect().withQs().back();
 	}

app/controllers/user/theme_controller.ts

@@ -1,9 +1,9 @@
-import { KEY_USER_THEME } from '#user/constants/theme';
-import { updateThemeValidator } from '#user/validators/update_theme_validator';
+import { KEY_USER_THEME } from '#constants/user/theme';
+import { updateThemeValidator } from '#validators/user/update_theme_validator';
 import type { HttpContext } from '@adonisjs/core/http';
 
 export default class ThemeController {
-	async index({ request, session, response }: HttpContext) {
+	async render({ request, session, response }: HttpContext) {
 		const { theme } = await request.validateUsing(updateThemeValidator);
 		session.put(KEY_USER_THEME, theme);
 		return response.ok({ message: 'ok' });

app/controllers/user_settings/show_user_settings_controller.ts

@@ -1,4 +1,4 @@
-import { ApiTokenService } from '#user/services/api_token_service';
+import { ApiTokenService } from '#services/user/api_token_service';
 import { inject } from '@adonisjs/core';
 import { HttpContext } from '@adonisjs/core/http';
 

app/dtos/collection.ts

@@ -0,0 +1,47 @@
+import { CommonModelDto } from '#dtos/common_model';
+import { Visibility } from '#enums/collections/visibility';
+import Collection from '#models/collection';
+
+export class CollectionDto extends CommonModelDto<Collection> {
+	declare id: number;
+	declare name: string;
+	declare description: string | null;
+	declare visibility: Visibility;
+	declare authorId: number;
+	declare createdAt: string | null;
+	declare updatedAt: string | null;
+
+	constructor(collection?: Collection) {
+		if (!collection) return;
+		super(collection);
+
+		this.id = collection.id;
+		this.name = collection.name;
+		this.description = collection.description;
+		this.visibility = collection.visibility;
+		this.authorId = collection.authorId;
+		this.createdAt = collection.createdAt?.toISO();
+		this.updatedAt = collection.updatedAt?.toISO();
+	}
+
+	serialize(): {
+		id: number;
+		name: string;
+		description: string | null;
+		visibility: Visibility;
+		authorId: number;
+		createdAt: string | null;
+		updatedAt: string | null;
+	} {
+		return {
+			...super.serialize(),
+			id: this.id,
+			name: this.name,
+			description: this.description,
+			visibility: this.visibility,
+			authorId: this.authorId,
+			createdAt: this.createdAt,
+			updatedAt: this.updatedAt,
+		};
+	}
+}

app/dtos/collection_with_links.ts

@@ -0,0 +1,53 @@
+import { CommonModelDto } from '#dtos/common_model';
+import { LinkDto } from '#dtos/link';
+import { Visibility } from '#enums/collections/visibility';
+import Collection from '#models/collection';
+import { Link } from '#shared/types/dto';
+
+export class CollectionWithLinksDto extends CommonModelDto<Collection> {
+	declare id: number;
+	declare name: string;
+	declare description: string | null;
+	declare visibility: Visibility;
+	declare authorId: number;
+	declare links: LinkDto[];
+	declare createdAt: string | null;
+	declare updatedAt: string | null;
+
+	constructor(collection?: Collection) {
+		if (!collection) return;
+		super(collection);
+
+		this.id = collection.id;
+		this.name = collection.name;
+		this.description = collection.description;
+		this.visibility = collection.visibility;
+		this.authorId = collection.authorId;
+		this.links = LinkDto.fromArray(collection.links);
+		this.createdAt = collection.createdAt?.toISO();
+		this.updatedAt = collection.updatedAt?.toISO();
+	}
+
+	serialize(): {
+		id: number;
+		name: string;
+		description: string | null;
+		visibility: Visibility;
+		authorId: number;
+		links: Link[];
+		createdAt: string | null;
+		updatedAt: string | null;
+	} {
+		return {
+			...super.serialize(),
+			id: this.id,
+			name: this.name,
+			description: this.description,
+			visibility: this.visibility,
+			authorId: this.authorId,
+			links: this.links.map((link) => link.serialize()),
+			createdAt: this.createdAt,
+			updatedAt: this.updatedAt,
+		};
+	}
+}

app/dtos/common_model.ts

@@ -0,0 +1,57 @@
+import SimplePaginatorDto from '#dtos/simple_paginator';
+import AppBaseModel from '#models/app_base_model';
+import { SimplePaginatorDtoMetaRange, StaticDto } from '#types/dto';
+import { LucidRow, ModelPaginatorContract } from '@adonisjs/lucid/types/model';
+import { SimplePaginatorContract } from '@adonisjs/lucid/types/querybuilder';
+
+export abstract class CommonModelDto<T extends AppBaseModel> {
+	declare id: number;
+	declare createdAt: string | null;
+	declare updatedAt: string | null;
+
+	constructor(model?: T) {
+		if (!model) return;
+		this.id = model.id;
+		this.createdAt = model.createdAt?.toISO();
+		this.updatedAt = model.updatedAt?.toISO();
+	}
+
+	static fromArray<
+		T extends AppBaseModel,
+		TDto extends CommonModelDto<T>,
+		TModel = any,
+	>(
+		this: new (model: TModel, ...args: any[]) => TDto,
+		models: TModel[],
+		...args: any[]
+	): TDto[] {
+		if (!Array.isArray(models)) return [];
+		return models.map((model) => new this(model, ...args));
+	}
+
+	static fromPaginator<
+		T extends AppBaseModel,
+		TDto extends CommonModelDto<T>,
+		TModel = any,
+	>(
+		this: StaticDto<TModel, TDto>,
+		paginator: TModel extends LucidRow
+			? ModelPaginatorContract<TModel>
+			: SimplePaginatorContract<TModel>,
+		range?: SimplePaginatorDtoMetaRange
+	) {
+		return new SimplePaginatorDto(paginator, this, range);
+	}
+
+	serialize(): {
+		id: number;
+		createdAt: string | null;
+		updatedAt: string | null;
+	} {
+		return {
+			id: this.id,
+			createdAt: this.createdAt,
+			updatedAt: this.updatedAt,
+		};
+	}
+}

app/dtos/link.ts

@@ -0,0 +1,54 @@
+import { CommonModelDto } from '#dtos/common_model';
+import Link from '#models/link';
+
+export class LinkDto extends CommonModelDto<Link> {
+	declare id: number;
+	declare name: string;
+	declare description: string | null;
+	declare url: string;
+	declare favorite: boolean;
+	declare collectionId: number;
+	declare authorId: number;
+	declare createdAt: string | null;
+	declare updatedAt: string | null;
+
+	constructor(link?: Link) {
+		if (!link) return;
+		super(link);
+
+		this.id = link.id;
+		this.name = link.name;
+		this.description = link.description;
+		this.url = link.url;
+		this.favorite = link.favorite;
+		this.collectionId = link.collectionId;
+		this.authorId = link.authorId;
+		this.createdAt = link.createdAt?.toISO();
+		this.updatedAt = link.updatedAt?.toISO();
+	}
+
+	serialize(): {
+		id: number;
+		name: string;
+		description: string | null;
+		url: string;
+		favorite: boolean;
+		collectionId: number;
+		authorId: number;
+		createdAt: string | null;
+		updatedAt: string | null;
+	} {
+		return {
+			...super.serialize(),
+			id: this.id,
+			name: this.name,
+			description: this.description,
+			url: this.url,
+			favorite: this.favorite,
+			collectionId: this.collectionId,
+			authorId: this.authorId,
+			createdAt: this.createdAt,
+			updatedAt: this.updatedAt,
+		};
+	}
+}

app/dtos/link_with_collection.ts

@@ -0,0 +1,60 @@
+import { CollectionDto } from '#dtos/collection';
+import { CommonModelDto } from '#dtos/common_model';
+import Link from '#models/link';
+import { Collection } from '#shared/types/dto';
+
+export class LinkWithCollectionDto extends CommonModelDto<Link> {
+	declare id: number;
+	declare name: string;
+	declare description: string | null;
+	declare url: string;
+	declare favorite: boolean;
+	declare collectionId: number;
+	declare collection: CollectionDto;
+	declare authorId: number;
+	declare createdAt: string | null;
+	declare updatedAt: string | null;
+
+	constructor(link?: Link) {
+		if (!link) return;
+		super(link);
+
+		this.id = link.id;
+		this.name = link.name;
+		this.description = link.description;
+		this.url = link.url;
+		this.favorite = link.favorite;
+		this.collectionId = link.collectionId;
+		this.collection = new CollectionDto(link.collection);
+		this.authorId = link.authorId;
+		this.createdAt = link.createdAt?.toISO();
+		this.updatedAt = link.updatedAt?.toISO();
+	}
+
+	serialize(): {
+		id: number;
+		name: string;
+		description: string | null;
+		url: string;
+		favorite: boolean;
+		collectionId: number;
+		collection: Collection;
+		authorId: number;
+		createdAt: string | null;
+		updatedAt: string | null;
+	} {
+		return {
+			...super.serialize(),
+			id: this.id,
+			name: this.name,
+			description: this.description,
+			url: this.url,
+			favorite: this.favorite,
+			collectionId: this.collectionId,
+			collection: this.collection.serialize(),
+			authorId: this.authorId,
+			createdAt: this.createdAt,
+			updatedAt: this.updatedAt,
+		};
+	}
+}

app/dtos/shared_collection.ts

@@ -0,0 +1,58 @@
+import { CommonModelDto } from '#dtos/common_model';
+import { LinkDto } from '#dtos/link';
+import { UserDto } from '#dtos/user';
+import { Visibility } from '#enums/collections/visibility';
+import Collection from '#models/collection';
+import { Link, User } from '#shared/types/dto';
+
+export class SharedCollectionDto extends CommonModelDto<Collection> {
+	declare id: number;
+	declare name: string;
+	declare description: string | null;
+	declare visibility: Visibility;
+	declare links: LinkDto[];
+	declare authorId: number;
+	declare author: UserDto;
+	declare createdAt: string | null;
+	declare updatedAt: string | null;
+
+	constructor(collection?: Collection) {
+		if (!collection) return;
+		super(collection);
+
+		this.id = collection.id;
+		this.name = collection.name;
+		this.description = collection.description;
+		this.visibility = collection.visibility;
+		this.links = LinkDto.fromArray(collection.links);
+		this.authorId = collection.authorId;
+		this.author = new UserDto(collection.author);
+		this.createdAt = collection.createdAt?.toISO();
+		this.updatedAt = collection.updatedAt?.toISO();
+	}
+
+	serialize(): {
+		id: number;
+		name: string;
+		description: string | null;
+		visibility: Visibility;
+		links: Link[];
+		authorId: number;
+		author: User;
+		createdAt: string | null;
+		updatedAt: string | null;
+	} {
+		return {
+			...super.serialize(),
+			id: this.id,
+			name: this.name,
+			description: this.description,
+			visibility: this.visibility,
+			links: this.links.map((link) => link.serialize()),
+			authorId: this.authorId,
+			author: this.author.serialize(),
+			createdAt: this.createdAt,
+			updatedAt: this.updatedAt,
+		};
+	}
+}

app/dtos/simple_paginator.ts

@@ -0,0 +1,65 @@
+// Source : https://github.com/adocasts/package-dto/blob/main/src/paginator/simple_paginator_dto.ts
+
+import { CommonModelDto } from '#dtos/common_model';
+import AppBaseModel from '#models/app_base_model';
+import {
+	SimplePaginatorDtoContract,
+	SimplePaginatorDtoMetaContract,
+	SimplePaginatorDtoMetaRange,
+	StaticDto,
+} from '#types/dto';
+import { LucidRow, ModelPaginatorContract } from '@adonisjs/lucid/types/model';
+import { SimplePaginatorContract } from '@adonisjs/lucid/types/querybuilder';
+
+export default class SimplePaginatorDto<
+	T extends AppBaseModel,
+	TDto extends CommonModelDto<T>,
+	TModel = any,
+> implements SimplePaginatorDtoContract<TDto>
+{
+	declare data: TDto[];
+	declare meta: SimplePaginatorDtoMetaContract;
+
+	/**
+	 * Constructs a new instance of the SimplePaginatorDto class.
+	 *
+	 * @param {SimplePaginatorContract<Model>|ModelPaginatorContract<Model>} paginator - The paginator object containing the data.
+	 * @param {StaticDto<Model, Dto>} dto - The static DTO class used to map the data.
+	 * @param {SimplePaginatorDtoMetaRange} [range] - Optional range for the paginator.
+	 */
+	constructor(
+		paginator: TModel extends LucidRow
+			? ModelPaginatorContract<TModel>
+			: SimplePaginatorContract<TModel>,
+		dto: StaticDto<TModel, TDto>,
+		range?: SimplePaginatorDtoMetaRange
+	) {
+		this.data = paginator.all().map((row) => new dto(row));
+
+		this.meta = {
+			total: paginator.total,
+			perPage: paginator.perPage,
+			currentPage: paginator.currentPage,
+			lastPage: paginator.lastPage,
+			firstPage: paginator.firstPage,
+			firstPageUrl: paginator.getUrl(1),
+			lastPageUrl: paginator.getUrl(paginator.lastPage),
+			nextPageUrl: paginator.getNextPageUrl(),
+			previousPageUrl: paginator.getPreviousPageUrl(),
+		};
+
+		if (range?.start || range?.end) {
+			const start = range?.start || paginator.firstPage;
+			const end = range?.end || paginator.lastPage;
+
+			this.meta.pagesInRange = paginator.getUrlsForRange(start, end);
+		}
+	}
+
+	serialize() {
+		return {
+			data: this.data.map((item) => item.serialize()),
+			meta: this.meta,
+		};
+	}
+}

app/dtos/user.ts

@@ -0,0 +1,42 @@
+import { CommonModelDto } from '#dtos/common_model';
+import User from '#models/user';
+
+export class UserDto extends CommonModelDto<User> {
+	declare id: number;
+	declare fullname: string;
+	declare avatarUrl: string;
+	declare isAdmin: boolean;
+	declare createdAt: string | null;
+	declare updatedAt: string | null;
+
+	constructor(user?: User) {
+		if (!user) return;
+		super(user);
+
+		this.id = user.id;
+		this.fullname = user.fullname;
+		this.avatarUrl = user.avatarUrl;
+		this.isAdmin = user.isAdmin;
+		this.createdAt = user.createdAt.toISO();
+		this.updatedAt = user.updatedAt.toISO();
+	}
+
+	serialize(): {
+		id: number;
+		fullname: string;
+		avatarUrl: string;
+		isAdmin: boolean;
+		createdAt: string | null;
+		updatedAt: string | null;
+	} {
+		return {
+			...super.serialize(),
+			id: this.id,
+			fullname: this.fullname,
+			avatarUrl: this.avatarUrl,
+			isAdmin: this.isAdmin,
+			createdAt: this.createdAt,
+			updatedAt: this.updatedAt,
+		};
+	}
+}

app/dtos/user_auth.ts

@@ -0,0 +1,27 @@
+import { UserDto } from '#dtos/user';
+import User from '#models/user';
+
+export class UserAuthDto {
+	declare isAuthenticated: boolean;
+	declare isAdmin: boolean;
+	declare user?: UserDto;
+
+	constructor(user: User | undefined) {
+		if (!user) return;
+		this.isAuthenticated = !!user;
+		this.isAdmin = user?.isAdmin;
+		this.user = user && new UserDto(user);
+	}
+
+	serialize(): {
+		isAuthenticated: boolean;
+		isAdmin: boolean;
+		user: ReturnType<UserDto['serialize']> | undefined;
+	} {
+		return {
+			isAuthenticated: this.isAuthenticated,
+			isAdmin: this.isAdmin,
+			user: this.user?.serialize(),
+		};
+	}
+}

app/dtos/user_with_counters.ts

@@ -0,0 +1,58 @@
+import { CommonModelDto } from '#dtos/common_model';
+import User from '#models/user';
+
+export class UserWithCountersDto extends CommonModelDto<User> {
+	declare id: number;
+	declare email: string;
+	declare fullname: string;
+	declare avatarUrl: string;
+	declare isAdmin: boolean;
+	declare linksCount: number;
+	declare collectionsCount: number;
+	declare lastSeenAt: string | null;
+	declare createdAt: string | null;
+	declare updatedAt: string | null;
+
+	constructor(user?: User) {
+		if (!user) return;
+		super(user);
+
+		this.id = user.id;
+		this.email = user.email;
+		this.fullname = user.fullname;
+		this.avatarUrl = user.avatarUrl;
+		this.isAdmin = user.isAdmin;
+		this.linksCount = Number(user.$extras.totalLinks);
+		this.collectionsCount = Number(user.$extras.totalCollections);
+		this.lastSeenAt = user.lastSeenAt?.toString() ?? user.updatedAt.toString();
+		this.createdAt = user.createdAt?.toISO();
+		this.updatedAt = user.updatedAt?.toISO();
+	}
+
+	serialize(): {
+		id: number;
+		email: string;
+		fullname: string;
+		avatarUrl: string;
+		isAdmin: boolean;
+		linksCount: number;
+		collectionsCount: number;
+		lastSeenAt: string | null;
+		createdAt: string | null;
+		updatedAt: string | null;
+	} {
+		return {
+			...super.serialize(),
+			id: this.id,
+			email: this.email,
+			fullname: this.fullname,
+			avatarUrl: this.avatarUrl,
+			isAdmin: this.isAdmin,
+			linksCount: this.linksCount,
+			collectionsCount: this.collectionsCount,
+			lastSeenAt: this.lastSeenAt,
+			createdAt: this.createdAt,
+			updatedAt: this.updatedAt,
+		};
+	}
+}

app/exceptions/api/tokens/un_authorized_exception.ts

@@ -2,6 +2,9 @@ import { Exception } from '@adonisjs/core/exceptions';
 
 export default class UnAuthorizedException extends Exception {
 	static status = 401;
-	message = 'Missing or invalid authorization header';
-	code = 'UNAUTHORIZED';
+	static code = 'E_UNAUTHORIZED';
+
+	constructor() {
+		super('Unauthorized', { status: 401, code: 'E_UNAUTHORIZED' });
+	}
 }

app/exceptions/favicons/favicon_not_found_exception.ts

@@ -0,0 +1,10 @@
+import { Exception } from '@adonisjs/core/exceptions';
+
+export default class FaviconNotFoundException extends Exception {
+	static status = 404;
+	static code = 'E_FAVICON_NOT_FOUND';
+
+	constructor(message: string) {
+		super(message, { status: 404, code: 'E_FAVICON_NOT_FOUND' });
+	}
+}

app/favicons/exceptions/favicon_not_found_exception.ts

@@ -1,20 +0,0 @@
-import { Exception } from '@adonisjs/core/exceptions';
-import { HttpContext } from '@adonisjs/core/http';
-import logger from '@adonisjs/core/services/logger';
-import { createReadStream } from 'node:fs';
-import { resolve } from 'node:path';
-
-export default class FaviconNotFoundException extends Exception {
-	static status = 404;
-	static code = 'E_FAVICON_NOT_FOUND';
-
-	async handle(error: this, ctx: HttpContext) {
-		const readStream = createReadStream(
-			resolve(process.cwd(), './public/empty-image.png')
-		);
-
-		ctx.response.header('Content-Type', 'image/png');
-		ctx.response.stream(readStream);
-		logger.debug(error.message);
-	}
-}

app/favicons/routes/favicons_routes.ts

@@ -1,10 +0,0 @@
-import router from '@adonisjs/core/services/router';
-const FaviconsController = () =>
-	import('#favicons/controllers/favicons_controller');
-
-/**
- * Favicon routes
- */
-router.group(() => {
-	router.get('/favicon', [FaviconsController, 'index']).as('favicon');
-});

app/favicons/routes/routes.ts

@@ -1 +0,0 @@
-import './favicons_routes.js';

app/home/routes/routes.ts

@@ -1 +0,0 @@
-import './home_routes.js';

app/legal/routes/routes.ts

@@ -1 +0,0 @@
-import './legal_routes.js';

app/lib/api/tokens/index.ts

@@ -0,0 +1,15 @@
+import type { HttpContext } from '@adonisjs/core/http';
+
+export function getTokenFromHeader(ctx: HttpContext): string | null {
+	const authHeader = ctx.request.header('authorization');
+	if (!authHeader) {
+		return null;
+	}
+
+	const parts = authHeader.split(' ');
+	if (parts.length !== 2 || parts[0] !== 'Bearer') {
+		return null;
+	}
+
+	return parts[1];
+}

app/lib/user/index.ts

@@ -0,0 +1,8 @@
+import { getDisplayPreferences } from '#shared/lib/display_preferences';
+import type { DisplayPreferences } from '#shared/types/index';
+
+export function ensureDisplayPreferences(
+	value: Partial<DisplayPreferences> | DisplayPreferences | null | undefined
+): DisplayPreferences {
+	return getDisplayPreferences(value ?? undefined);
+}

app/links/routes/routes.ts

@@ -1 +0,0 @@
-import './links_routes.js';

app/models/collection.ts

@@ -1,7 +1,7 @@
-import { Visibility } from '#collections/enums/visibility';
-import AppBaseModel from '#core/models/app_base_model';
-import Link from '#links/models/link';
-import User from '#user/models/user';
+import { Visibility } from '#enums/collections/visibility';
+import AppBaseModel from '#models/app_base_model';
+import Link from '#models/link';
+import User from '#models/user';
 import { belongsTo, column, hasMany } from '@adonisjs/lucid/orm';
 import type { BelongsTo, HasMany } from '@adonisjs/lucid/types/relations';
 

app/models/link.ts

@@ -1,6 +1,6 @@
-import Collection from '#collections/models/collection';
-import AppBaseModel from '#core/models/app_base_model';
-import User from '#user/models/user';
+import Collection from '#models/collection';
+import AppBaseModel from '#models/app_base_model';
+import User from '#models/user';
 import { belongsTo, column } from '@adonisjs/lucid/orm';
 import type { BelongsTo } from '@adonisjs/lucid/types/relations';
 

app/models/user.ts

@@ -1,8 +1,8 @@
-import Collection from '#collections/models/collection';
-import AppBaseModel from '#core/models/app_base_model';
-import Link from '#links/models/link';
+import Collection from '#models/collection';
+import AppBaseModel from '#models/app_base_model';
+import Link from '#models/link';
 import { type DisplayPreferences } from '#shared/types/index';
-import { ensureDisplayPreferences } from '#user/lib/index';
+import { ensureDisplayPreferences } from '#lib/user/index';
 import type { GoogleToken } from '@adonisjs/ally/types';
 import { DbAccessTokensProvider } from '@adonisjs/auth/access_tokens';
 import { column, computed, hasMany } from '@adonisjs/lucid/orm';

app/routes/admin.ts

@@ -1,14 +1,11 @@
 import { middleware } from '#start/kernel';
 import router from '@adonisjs/core/services/router';
 
-const AdminController = () => import('#admin/controllers/admin_controller');
+const AdminController = () => import('#controllers/admin/admin_controller');
 
-/**
- * Routes for admin dashboard
- */
 router
 	.group(() => {
-		router.get('/', [AdminController, 'index']).as('admin.dashboard');
+		router.get('/', [AdminController, 'render']).as('admin.dashboard');
 	})
 	.middleware([middleware.auth(), middleware.admin()])
 	.prefix('/admin');

app/routes/api/collections/routes.ts

@@ -0,0 +1,29 @@
+import { middleware } from '#start/kernel';
+import router from '@adonisjs/core/services/router';
+
+const GetCollectionsController = () =>
+	import('#controllers/api/collections/get_collections_controller');
+const CreateCollectionsController = () =>
+	import('#controllers/api/collections/create_collection_controller');
+const UpdateCollectionsController = () =>
+	import('#controllers/api/collections/update_collection_controller');
+const DeleteCollectionsController = () =>
+	import('#controllers/api/collections/delete_collection_controller');
+
+router
+	.group(() => {
+		router
+			.get('', [GetCollectionsController, 'render'])
+			.as('api-collections.index');
+		router
+			.post('', [CreateCollectionsController, 'execute'])
+			.as('api-collections.create');
+		router
+			.put('/:id', [UpdateCollectionsController, 'execute'])
+			.as('api-collections.update');
+		router
+			.delete('/:id', [DeleteCollectionsController, 'execute'])
+			.as('api-collections.delete');
+	})
+	.prefix('/api/v1/collections')
+	.middleware([middleware.auth({ guards: ['api'] })]);

app/routes/api_collections.ts

@@ -0,0 +1,29 @@
+import { middleware } from '#start/kernel';
+import router from '@adonisjs/core/services/router';
+
+const GetCollectionsController = () =>
+	import('#controllers/api/collections/get_collections_controller');
+const CreateCollectionsController = () =>
+	import('#controllers/api/collections/create_collection_controller');
+const UpdateCollectionsController = () =>
+	import('#controllers/api/collections/update_collection_controller');
+const DeleteCollectionsController = () =>
+	import('#controllers/api/collections/delete_collection_controller');
+
+router
+	.group(() => {
+		router
+			.get('', [GetCollectionsController, 'render'])
+			.as('api-collections.index');
+		router
+			.post('', [CreateCollectionsController, 'execute'])
+			.as('api-collections.create');
+		router
+			.put('/:id', [UpdateCollectionsController, 'execute'])
+			.as('api-collections.update');
+		router
+			.delete('/:id', [DeleteCollectionsController, 'execute'])
+			.as('api-collections.delete');
+	})
+	.prefix('/api/v1/collections')
+	.middleware([middleware.auth({ guards: ['api'] })]);

app/routes/api_links.ts

@@ -0,0 +1,33 @@
+import { middleware } from '#start/kernel';
+import router from '@adonisjs/core/services/router';
+
+const CreateLinkController = () =>
+	import('#controllers/api/links/create_link_controller');
+const UpdateLinkController = () =>
+	import('#controllers/api/links/update_link_controller');
+const DeleteLinkController = () =>
+	import('#controllers/api/links/delete_link_controller');
+const GetFavoriteLinksController = () =>
+	import('#controllers/api/links/get_favorite_links_controller');
+
+router
+	.group(() => {
+		router.post('', [CreateLinkController, 'execute']).as('api-links.create');
+		router
+			.put('/:id', [UpdateLinkController, 'execute'])
+			.as('api-links.update');
+		router
+			.delete('/:id', [DeleteLinkController, 'execute'])
+			.as('api-links.delete');
+	})
+	.prefix('/api/v1/links')
+	.middleware([middleware.auth({ guards: ['api'] })]);
+
+router
+	.group(() => {
+		router
+			.get('', [GetFavoriteLinksController, 'execute'])
+			.as('api-links.get-favorite-links');
+	})
+	.prefix('/api/v1/links/favorites')
+	.middleware([middleware.auth({ guards: ['api'] })]);

app/routes/api_tokens.ts

@@ -2,11 +2,11 @@ import { middleware } from '#start/kernel';
 import router from '@adonisjs/core/services/router';
 
 const ApiTokenController = () =>
-	import('#api/tokens/controllers/api_token_controller');
+	import('#controllers/api/tokens/api_token_controller');
 
 router
 	.group(() => {
-		router.get('/check', [ApiTokenController, 'index']).as('api-tokens.index');
+		router.get('/check', [ApiTokenController, 'render']).as('api-tokens.index');
 	})
 	.prefix('/api/v1/tokens')
 	.middleware([middleware.auth({ guards: ['api'] })]);

app/routes/auth.ts

@@ -1,12 +1,10 @@
 import { middleware } from '#start/kernel';
 import router from '@adonisjs/core/services/router';
-const AuthController = () => import('#auth/controllers/auth_controller');
+
+const AuthController = () => import('#controllers/auth/auth_controller');
 
 const ROUTES_PREFIX = '/auth';
 
-/**
- * Auth routes for unauthicated users
- */
 router
 	.group(() => {
 		router.get('/google', [AuthController, 'google']).as('auth');
@@ -16,9 +14,6 @@ router
 	})
 	.prefix(ROUTES_PREFIX);
 
-/**
- * Routes for authenticated users
- */
 router
 	.group(() => {
 		router.get('/logout', [AuthController, 'logout']).as('auth.logout');

app/routes/collections.ts

@@ -2,13 +2,13 @@ import { middleware } from '#start/kernel';
 import router from '@adonisjs/core/services/router';
 
 const ShowCollectionsController = () =>
-	import('#collections/controllers/show_collections_controller');
+	import('#controllers/collections/show_collections_controller');
 const CreateCollectionController = () =>
-	import('#collections/controllers/create_collection_controller');
+	import('#controllers/collections/create_collection_controller');
 const UpdateCollectionController = () =>
-	import('#collections/controllers/update_collection_controller');
+	import('#controllers/collections/update_collection_controller');
 const DeleteCollectionController = () =>
-	import('#collections/controllers/delete_collection_controller');
+	import('#controllers/collections/delete_collection_controller');
 
 router
 	.group(() => {
@@ -18,7 +18,6 @@ router
 
 		router
 			.group(() => {
-				// Create
 				router
 					.get('/create', [CreateCollectionController, 'render'])
 					.as('collection.create-form');
@@ -26,7 +25,6 @@ router
 					.post('/', [CreateCollectionController, 'execute'])
 					.as('collection.create');
 
-				// Update
 				router
 					.get('/edit', [UpdateCollectionController, 'render'])
 					.as('collection.edit-form');
@@ -34,7 +32,6 @@ router
 					.put('/:id', [UpdateCollectionController, 'execute'])
 					.as('collection.edit');
 
-				// Delete
 				router
 					.get('/delete', [DeleteCollectionController, 'render'])
 					.as('collection.delete-form');

app/routes/favicons.ts

@@ -0,0 +1,8 @@
+import router from '@adonisjs/core/services/router';
+
+const FaviconsController = () =>
+	import('#controllers/favicons/favicons_controller');
+
+router.group(() => {
+	router.get('/favicon', [FaviconsController, 'render']).as('favicon');
+});

app/routes/links.ts

@@ -2,17 +2,14 @@ import { middleware } from '#start/kernel';
 import router from '@adonisjs/core/services/router';
 
 const CreateLinkController = () =>
-	import('#links/controllers/create_link_controller');
+	import('#controllers/links/create_link_controller');
 const DeleteLinkController = () =>
-	import('#links/controllers/delete_link_controller');
+	import('#controllers/links/delete_link_controller');
 const UpdateLinkController = () =>
-	import('#links/controllers/update_link_controller');
+	import('#controllers/links/update_link_controller');
 const ToggleFavoriteController = () =>
-	import('#links/controllers/toggle_favorite_controller');
+	import('#controllers/links/toggle_favorite_controller');
 
-/**
- * Routes for authenticated users
- */
 router
 	.group(() => {
 		router

app/routes/search.ts

@@ -0,0 +1,10 @@
+import { middleware } from '#start/kernel';
+import router from '@adonisjs/core/services/router';
+
+const SearchController = () => import('#controllers/search/search_controller');
+
+router
+	.group(() => {
+		router.get('/search', [SearchController, 'render']).as('search');
+	})
+	.middleware([middleware.auth()]);

app/routes/shared_collections.ts

@@ -0,0 +1,6 @@
+import router from '@adonisjs/core/services/router';
+
+const SharedCollectionsController = () =>
+	import('#controllers/shared_collections/shared_collections_controller');
+
+router.get('/shared/:id', [SharedCollectionsController, 'render']).as('shared');

app/routes/user.ts

@@ -0,0 +1,25 @@
+import { middleware } from '#start/kernel';
+import router from '@adonisjs/core/services/router';
+
+const ThemeController = () => import('#controllers/user/theme_controller');
+const DisplayPreferencesController = () =>
+	import('#controllers/user/display_preferences_controller');
+const ApiTokenController = () =>
+	import('#controllers/user/api_token_controller');
+
+router.post('/user/theme', [ThemeController, 'render']).as('user.theme');
+
+router
+	.post('/user/display-preferences', [DisplayPreferencesController, 'update'])
+	.as('user.update-display-preferences')
+	.middleware([middleware.auth()]);
+
+router
+	.group(() => {
+		router.post('/', [ApiTokenController, 'store']).as('user.api-tokens.store');
+		router
+			.delete('/:tokenId', [ApiTokenController, 'destroy'])
+			.as('user.api-tokens.destroy');
+	})
+	.prefix('/user/api-tokens')
+	.middleware([middleware.auth()]);

app/routes/user_settings.ts

@@ -1,7 +1,7 @@
 import router from '@adonisjs/core/services/router';
 
 const ShowUserSettingsController = () =>
-	import('#user_settings/controllers/show_user_settings_controller');
+	import('#controllers/user_settings/show_user_settings_controller');
 
 router
 	.get('/user/settings', [ShowUserSettingsController, 'render'])

app/search/routes/routes.ts

@@ -1 +0,0 @@
-import './search_routes.js';

app/search/routes/search_routes.ts

@@ -1,14 +0,0 @@
-import { middleware } from '#start/kernel';
-import router from '@adonisjs/core/services/router';
-
-const SearchesController = () =>
-	import('#search/controllers/search_controller');
-
-/**
- * Search routes
- */
-router
-	.group(() => {
-		router.get('/search', [SearchesController, 'search']).as('search');
-	})
-	.middleware([middleware.auth()]);

app/services/collections/collection_service.ts

@@ -1,6 +1,6 @@
-import { Visibility } from '#collections/enums/visibility';
-import Collection from '#collections/models/collection';
-import { collectionIdValidator } from '#collections/validators/collection_id_validator';
+import { Visibility } from '#enums/collections/visibility';
+import Collection from '#models/collection';
+import { collectionIdValidator } from '#validators/collections/collection_id_validator';
 import { HttpContext } from '@adonisjs/core/http';
 import db from '@adonisjs/lucid/services/db';
 
@@ -25,7 +25,7 @@ export class CollectionService {
 		const context = this.getAuthContext();
 		return await Collection.query()
 			.where('author_id', context.auth.user!.id)
-			.orderBy('created_at')
+			.orderBy('created_at', 'desc')
 			.preload('links', (q) => q.orderBy('favorite', 'desc'));
 	}
 

app/services/favicons/cache_service.ts

@@ -1,5 +1,5 @@
-import { cache } from '#core/lib/cache';
-import { Favicon } from '#favicons/types/favicon_type';
+import { cache } from '#lib/cache';
+import { Favicon } from '#types/favicons/favicon_type';
 
 export class CacheService {
 	private cacheNs = cache.namespace('favicon');