refactor: split backend by context instead of type 'controllers/models/...'

app/admin/controllers/admin_controller.ts

@@ -1,9 +1,9 @@
-import CollectionsController from '#controllers/collections_controller';
+import AuthController from '#auth/controllers/auth_controller';
-import LinksController from '#controllers/links_controller';
+import CollectionsController from '#collections/controllers/collections_controller';
-import UsersController from '#controllers/users_controller';
+import LinksController from '#links/controllers/links_controller';
-import User from '#models/user';
+import User from '#user/models/user';
 import { inject } from '@adonisjs/core';
-import type { HttpContext } from '@adonisjs/core/http';
+import { HttpContext } from '@adonisjs/core/http';
 
 class UserWithRelationCountDto {
 	constructor(private user: User) {}
@@ -26,7 +26,7 @@ class UserWithRelationCountDto {
 @inject()
 export default class AdminController {
 	constructor(
-		protected usersController: UsersController,
+		protected usersController: AuthController,
 		protected linksController: LinksController,
 		protected collectionsController: CollectionsController
 	) {}

app/admin/routes/admin_routes.ts

@@ -1,7 +1,7 @@
 import { middleware } from '#start/kernel';
 import router from '@adonisjs/core/services/router';
 
-const AdminController = () => import('#controllers/admin_controller');
+const AdminController = () => import('#admin/controllers/admin_controller');
 
 /**
  * Routes for admin dashboard

app/admin/routes/routes.ts

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

app/auth/controllers/auth_controller.ts

@@ -1,10 +1,10 @@
-import User from '#models/user';
+import User from '#user/models/user';
 import type { HttpContext } from '@adonisjs/core/http';
 import logger from '@adonisjs/core/services/logger';
 import db from '@adonisjs/lucid/services/db';
 import { RouteName } from '@izzyjs/route/types';
 
-export default class UsersController {
+export default class AuthController {
 	private redirectTo: RouteName = 'auth';
 
 	login({ inertia }: HttpContext) {

app/auth/routes/auth_routes.ts

@@ -1,6 +1,6 @@
 import { middleware } from '#start/kernel';
 import router from '@adonisjs/core/services/router';
-const UsersController = () => import('#controllers/users_controller');
+const AuthController = () => import('#auth/controllers/auth_controller');
 
 const ROUTES_PREFIX = '/auth';
 
@@ -9,9 +9,9 @@ const ROUTES_PREFIX = '/auth';
  */
 router
 	.group(() => {
-		router.get('/google', [UsersController, 'google']).as('auth');
+		router.get('/google', [AuthController, 'google']).as('auth');
 		router
-			.get('/callback', [UsersController, 'callbackAuth'])
+			.get('/callback', [AuthController, 'callbackAuth'])
 			.as('auth.callback');
 	})
 	.prefix(ROUTES_PREFIX);
@@ -21,7 +21,7 @@ router
  */
 router
 	.group(() => {
-		router.get('/logout', [UsersController, 'logout']).as('auth.logout');
+		router.get('/logout', [AuthController, 'logout']).as('auth.logout');
 	})
 	.middleware([middleware.auth()])
 	.prefix(ROUTES_PREFIX);

app/auth/routes/routes.ts

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

app/collections/controllers/collections_controller.ts

@@ -1,10 +1,8 @@
-import Collection from '#models/collection';
+import Collection from '#collections/models/collection';
-import User from '#models/user';
+import { createCollectionValidator } from '#collections/validators/create_collection_validator';
-import {
+import { deleteCollectionValidator } from '#collections/validators/delete_collection_validator';
-	createCollectionValidator,
+import { updateCollectionValidator } from '#collections/validators/update_collection_validator';
-	deleteCollectionValidator,
+import User from '#user/models/user';
-	updateCollectionValidator,
-} from '#validators/collection';
 import type { HttpContext } from '@adonisjs/core/http';
 import db from '@adonisjs/lucid/services/db';
 

app/collections/models/collection.ts

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

app/collections/routes/collections_routes.ts

@@ -1,7 +1,7 @@
 import { middleware } from '#start/kernel';
 import router from '@adonisjs/core/services/router';
 const CollectionsController = () =>
-	import('#controllers/collections_controller');
+	import('#collections/controllers/collections_controller');
 
 router
 	.group(() => {

app/collections/routes/routes.ts

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

app/collections/validators/create_collection_validator.ts

@@ -1,10 +1,6 @@
-import { Visibility } from '#enums/visibility';
+import { Visibility } from '#collections/enums/visibility';
 import vine, { SimpleMessagesProvider } from '@vinejs/vine';
 
-const params = vine.object({
-	id: vine.number(),
-});
-
 export const createCollectionValidator = vine.compile(
 	vine.object({
 		name: vine.string().trim().minLength(1).maxLength(254),
@@ -14,23 +10,6 @@ export const createCollectionValidator = vine.compile(
 	})
 );
 
-export const updateCollectionValidator = vine.compile(
-	vine.object({
-		name: vine.string().trim().minLength(1).maxLength(254),
-		description: vine.string().trim().maxLength(254).nullable(),
-		visibility: vine.enum(Visibility),
-		nextId: vine.number().optional(),
-
-		params,
-	})
-);
-
-export const deleteCollectionValidator = vine.compile(
-	vine.object({
-		params,
-	})
-);
-
 createCollectionValidator.messagesProvider = new SimpleMessagesProvider({
 	name: 'Collection name is required',
 	'visibility.required': 'Collection visibiliy is required',

app/collections/validators/delete_collection_validator.ts

@@ -0,0 +1,8 @@
+import { params } from '#core/validators/params_object';
+import vine from '@vinejs/vine';
+
+export const deleteCollectionValidator = vine.compile(
+	vine.object({
+		params,
+	})
+);

app/collections/validators/update_collection_validator.ts

@@ -0,0 +1,14 @@
+import { Visibility } from '#collections/enums/visibility';
+import { params } from '#core/validators/params_object';
+import vine from '@vinejs/vine';
+
+export const updateCollectionValidator = vine.compile(
+	vine.object({
+		name: vine.string().trim().minLength(1).maxLength(254),
+		description: vine.string().trim().maxLength(254).nullable(),
+		visibility: vine.enum(Visibility),
+		nextId: vine.number().optional(),
+
+		params,
+	})
+);

app/controllers/apps_controller.ts

@@ -1,13 +0,0 @@
-import { PREFER_DARK_THEME } from '#constants/session';
-import { updateUserThemeValidator } from '#validators/user';
-import type { HttpContext } from '@adonisjs/core/http';
-
-export default class AppsController {
-	async updateUserTheme({ request, session, response }: HttpContext) {
-		const { preferDarkTheme } = await request.validateUsing(
-			updateUserThemeValidator
-		);
-		session.put(PREFER_DARK_THEME, preferDarkTheme);
-		return response.ok({ message: 'ok' });
-	}
-}

app/core/validators/params_object.ts

@@ -0,0 +1,5 @@
+import vine from '@vinejs/vine';
+
+export const params = vine.object({
+	id: vine.number(),
+});

app/favicons/controllers/favicons_controller.ts

@@ -1,5 +1,5 @@
-import FaviconNotFoundException from '#exceptions/favicon_not_found_exception';
+import { cache } from '#core/lib/cache';
-import { cache } from '#lib/cache';
+import FaviconNotFoundException from '#favicons/exceptions/favicon_not_found_exception';
 import type { HttpContext } from '@adonisjs/core/http';
 import logger from '@adonisjs/core/services/logger';
 import { parse } from 'node-html-parser';

app/favicons/routes/favicons_routes.ts

@@ -1,5 +1,6 @@
 import router from '@adonisjs/core/services/router';
-const FaviconsController = () => import('#controllers/favicons_controller');
+const FaviconsController = () =>
+	import('#favicons/controllers/favicons_controller');
 
 /**
  * Favicon routes

app/favicons/routes/routes.ts

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

app/home/routes/home_routes.ts

@@ -0,0 +1,3 @@
+import router from '@adonisjs/core/services/router';
+
+router.on('/').renderInertia('home').as('home');

app/home/routes/routes.ts

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

app/legal/routes/legal_routes.ts

@@ -0,0 +1,4 @@
+import router from '@adonisjs/core/services/router';
+
+router.on('/terms').renderInertia('terms').as('terms');
+router.on('/privacy').renderInertia('privacy').as('privacy');

app/legal/routes/routes.ts

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

app/links/controllers/links_controller.ts

@@ -1,13 +1,11 @@
-import CollectionsController from '#controllers/collections_controller';
+import CollectionsController from '#collections/controllers/collections_controller';
-import Link from '#models/link';
+import Link from '#links/models/link';
-import {
+import { createLinkValidator } from '#links/validators/create_link_validator';
-	createLinkValidator,
+import { deleteLinkValidator } from '#links/validators/delete_link_validator';
-	deleteLinkValidator,
+import { updateLinkFavoriteStatusValidator } from '#links/validators/update_favorite_link_validator';
-	updateLinkFavoriteStatusValidator,
+import { updateLinkValidator } from '#links/validators/update_link_validator';
-	updateLinkValidator,
-} from '#validators/link';
 import { inject } from '@adonisjs/core';
-import type { HttpContext } from '@adonisjs/core/http';
+import { HttpContext } from '@adonisjs/core/http';
 import db from '@adonisjs/lucid/services/db';
 
 @inject()

app/links/models/link.ts

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

app/links/routes/links_routes.ts

@@ -1,6 +1,6 @@
 import { middleware } from '#start/kernel';
 import router from '@adonisjs/core/services/router';
-const LinksController = () => import('#controllers/links_controller');
+const LinksController = () => import('#links/controllers/links_controller');
 
 /**
  * Routes for authenticated users

app/links/routes/routes.ts

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

app/links/validators/create_link_validator.ts

@@ -0,0 +1,11 @@
+import vine from '@vinejs/vine';
+
+export const createLinkValidator = vine.compile(
+	vine.object({
+		name: vine.string().trim().minLength(1).maxLength(254),
+		description: vine.string().trim().maxLength(300).optional(),
+		url: vine.string().trim(),
+		favorite: vine.boolean(),
+		collectionId: vine.number(),
+	})
+);

app/links/validators/delete_link_validator.ts

@@ -0,0 +1,8 @@
+import { params } from '#core/validators/params_object';
+import vine from '@vinejs/vine';
+
+export const deleteLinkValidator = vine.compile(
+	vine.object({
+		params,
+	})
+);

app/links/validators/update_favorite_link_validator.ts

@@ -0,0 +1,10 @@
+import { params } from '#core/validators/params_object';
+import vine from '@vinejs/vine';
+
+export const updateLinkFavoriteStatusValidator = vine.compile(
+	vine.object({
+		favorite: vine.boolean(),
+
+		params,
+	})
+);

app/links/validators/update_link_validator.ts

@@ -0,0 +1,14 @@
+import { params } from '#core/validators/params_object';
+import vine from '@vinejs/vine';
+
+export const updateLinkValidator = vine.compile(
+	vine.object({
+		name: vine.string().trim().minLength(1).maxLength(254),
+		description: vine.string().trim().maxLength(300).optional(),
+		url: vine.string().trim(),
+		favorite: vine.boolean(),
+		collectionId: vine.number(),
+
+		params,
+	})
+);

app/search/controllers/search_controller.ts

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

app/search/routes/routes.ts

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

app/search/routes/search_routes.ts

@@ -1,7 +1,8 @@
 import { middleware } from '#start/kernel';
 import router from '@adonisjs/core/services/router';
 
-const SearchesController = () => import('#controllers/searches_controller');
+const SearchesController = () =>
+	import('#search/controllers/search_controller');
 
 /**
  * Search routes

app/shared_collections/controllers/shared_collections_controller.ts

@@ -1,9 +1,9 @@
-import { Visibility } from '#enums/visibility';
+import { Visibility } from '#collections/enums/visibility';
-import Collection from '#models/collection';
+import Collection from '#collections/models/collection';
-import Link from '#models/link';
+import Link from '#links/models/link';
-import User from '#models/user';
+import User from '#user/models/user';
-import { getSharedCollectionValidator } from '#validators/shared_collection';
 import type { HttpContext } from '@adonisjs/core/http';
+import { getSharedCollectionValidator } from '../validators/shared_collection.js';
 
 class LinkWithoutFavoriteDto {
 	constructor(private link: Link) {}

app/shared_collections/routes/routes.ts

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

app/shared_collections/routes/shared_collections_routes.ts

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

app/shared_collections/validators/shared_collection.ts

@@ -1,9 +1,6 @@
+import { params } from '#core/validators/params_object';
 import vine from '@vinejs/vine';
 
-const params = vine.object({
-	id: vine.number(),
-});
-
 export const getSharedCollectionValidator = vine.compile(
 	vine.object({
 		params,

app/user/controllers/theme_controller.ts

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

app/user/models/user.ts

@@ -1,9 +1,9 @@
-import Collection from '#models/collection';
+import Collection from '#collections/models/collection';
-import Link from '#models/link';
+import AppBaseModel from '#core/models/app_base_model';
+import Link from '#links/models/link';
 import type { GoogleToken } from '@adonisjs/ally/types';
 import { column, computed, hasMany } from '@adonisjs/lucid/orm';
 import type { HasMany } from '@adonisjs/lucid/types/relations';
-import AppBaseModel from './app_base_model.js';
 import { DateTime } from 'luxon';
 
 export default class User extends AppBaseModel {

app/user/routes/routes.ts

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

app/user/routes/user_theme_route.ts

@@ -0,0 +1,5 @@
+import router from '@adonisjs/core/services/router';
+
+const ThemeController = () => import('#user/controllers/theme_controller');
+
+router.post('/user/theme', [ThemeController, 'index']).as('user.theme');

app/user/validators/update_theme_validator.ts

@@ -1,6 +1,6 @@
 import vine from '@vinejs/vine';
 
-export const updateUserThemeValidator = vine.compile(
+export const updateThemeValidator = vine.compile(
 	vine.object({
 		preferDarkTheme: vine.boolean(),
 	})

app/validators/link.ts

@@ -1,43 +0,0 @@
-import vine from '@vinejs/vine';
-
-const params = vine.object({
-	id: vine.number(),
-});
-
-export const createLinkValidator = vine.compile(
-	vine.object({
-		name: vine.string().trim().minLength(1).maxLength(254),
-		description: vine.string().trim().maxLength(300).optional(),
-		url: vine.string().trim(),
-		favorite: vine.boolean(),
-		collectionId: vine.number(),
-	})
-);
-
-export const updateLinkValidator = vine.compile(
-	vine.object({
-		name: vine.string().trim().minLength(1).maxLength(254),
-		description: vine.string().trim().maxLength(300).optional(),
-		url: vine.string().trim(),
-		favorite: vine.boolean(),
-		collectionId: vine.number(),
-
-		params,
-	})
-);
-
-export const deleteLinkValidator = vine.compile(
-	vine.object({
-		params,
-	})
-);
-
-export const updateLinkFavoriteStatusValidator = vine.compile(
-	vine.object({
-		favorite: vine.boolean(),
-
-		params: vine.object({
-			id: vine.number(),
-		}),
-	})
-);

config/auth.ts

@@ -1,6 +1,6 @@
 import { defineConfig } from '@adonisjs/auth';
-import { InferAuthEvents, Authenticators } from '@adonisjs/auth/types';
 import { sessionGuard, sessionUserProvider } from '@adonisjs/auth/session';
+import { Authenticators, InferAuthEvents } from '@adonisjs/auth/types';
 
 const authConfig = defineConfig({
 	default: 'web',
@@ -8,7 +8,7 @@ const authConfig = defineConfig({
 		web: sessionGuard({
 			useRememberMeTokens: false,
 			provider: sessionUserProvider({
-				model: () => import('#models/user'),
+				model: () => import('#user/models/user'),
 			}),
 		}),
 	},

config/inertia.ts

@@ -1,7 +1,7 @@
 import {
-	DARK_THEME_DEFAULT_VALUE,
 	PREFER_DARK_THEME,
-} from '#constants/session';
+	DARK_THEME_DEFAULT_VALUE,
+} from '#user/constants/theme';
 import { defineConfig } from '@adonisjs/inertia';
 
 export default defineConfig({

database/migrations/1714253983443_create_collections_table.ts

@@ -1,5 +1,5 @@
+import { Visibility } from '#collections/enums/visibility';
 import { defaultTableFields } from '#database/default_table_fields';
-import { Visibility } from '#enums/visibility';
 import { BaseSchema } from '@adonisjs/lucid/schema';
 
 export default class CreateCollectionTable extends BaseSchema {

database/seeders/collection_seeder.ts

@@ -1,6 +1,6 @@
-import { Visibility } from '#enums/visibility';
+import { Visibility } from '#collections/enums/visibility';
-import Collection from '#models/collection';
+import Collection from '#collections/models/collection';
-import User from '#models/user';
+import User from '#user/models/user';
 import { BaseSeeder } from '@adonisjs/lucid/seeders';
 import { faker } from '@faker-js/faker';
 

database/seeders/link_seeder.ts

@@ -1,7 +1,7 @@
+import Collection from '#collections/models/collection';
 import { getUserIds } from '#database/seeders/collection_seeder';
-import Collection from '#models/collection';
+import Link from '#links/models/link';
-import Link from '#models/link';
+import User from '#user/models/user';
-import User from '#models/user';
 import { BaseSeeder } from '@adonisjs/lucid/seeders';
 import { faker } from '@faker-js/faker';
 

database/seeders/user_seeder.ts

@@ -1,4 +1,4 @@
-import User from '#models/user';
+import User from '#user/models/user';
 import { GoogleToken } from '@adonisjs/ally/types';
 import { BaseSeeder } from '@adonisjs/lucid/seeders';
 import { faker } from '@faker-js/faker';

inertia/components/dashboard/dashboard_header.tsx

@@ -1,4 +1,3 @@
-import { Visibility } from '#enums/visibility';
 import { Link } from '@inertiajs/react';
 import { route } from '@izzyjs/route/client';
 import {
@@ -19,6 +18,7 @@ import { IoTrashOutline } from 'react-icons/io5';
 import { ShareCollection } from '~/components/share/share_collection';
 import { appendCollectionId } from '~/lib/navigation';
 import { useActiveCollection } from '~/stores/collection_store';
+import { Visibility } from '~/types/app';
 
 interface DashboardHeaderProps {
 	navbar: {

inertia/components/footer/footer.tsx

@@ -1,4 +1,4 @@
-import PATHS from '#constants/paths';
+import PATHS from '#core/constants/paths';
 import { Link } from '@inertiajs/react';
 import { route } from '@izzyjs/route/client';
 import { Anchor, Group, Text } from '@mantine/core';

inertia/components/form/form_collection.tsx

@@ -1,10 +1,9 @@
-import { Visibility } from '#enums/visibility';
 import { Box, Group, SegmentedControl, Text, TextInput } from '@mantine/core';
 import { FormEvent } from 'react';
 import { useTranslation } from 'react-i18next';
 import BackToDashboard from '~/components/common/navigation/back_to_dashboard';
 import { FormLayout, FormLayoutProps } from '~/layouts/form_layout';
-import { Collection } from '~/types/app';
+import { Collection, Visibility } from '~/types/app';
 
 export type FormCollectionData = {
 	name: string;

inertia/components/navbar/navbar.tsx

@@ -1,4 +1,4 @@
-import PATHS from '#constants/paths';
+import PATHS from '#core/constants/paths';
 import { Link } from '@inertiajs/react';
 import { route } from '@izzyjs/route/client';
 import {

inertia/components/share/share_collection.tsx

@@ -1,10 +1,10 @@
-import { Visibility } from '#enums/visibility';
 import { ActionIcon, Anchor, CopyButton, Popover, Text } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 import { TbShare3 } from 'react-icons/tb';
 import { Fragment } from 'react/jsx-runtime';
 import { generateShareUrl } from '~/lib/navigation';
 import { useActiveCollection } from '~/stores/collection_store';
+import { Visibility } from '~/types/app';
 
 const COPY_SUCCESS_TIMEOUT = 2_000;
 

inertia/hooks/use_shortcut.tsx

@@ -1,4 +1,4 @@
-import KEYS from '#constants/keys';
+import KEYS from '#core/constants/keys';
 import { useHotkeys } from 'react-hotkeys-hook';
 import { useGlobalHotkeysStore } from '~/stores/global_hotkeys_store';
 

inertia/layouts/_base_layout.tsx

@@ -1,8 +1,9 @@
-import { router } from '@inertiajs/react';
+import { router, usePage } from '@inertiajs/react';
 import { ColorSchemeScript, createTheme, MantineProvider } from '@mantine/core';
 import dayjs from 'dayjs';
 import { ReactNode, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
+import { InertiaPage } from '~/types/inertia';
 
 import '@mantine/core/styles.css';
 import '@mantine/spotlight/styles.css';
@@ -14,6 +15,8 @@ const TRANSITION_OUT_CLASS = '__transition_fadeOut';
 
 export default function BaseLayout({ children }: { children: ReactNode }) {
 	const { i18n } = useTranslation();
+	const { language } = usePage<InertiaPage>().props;
+	i18n.changeLanguage(language);
 	dayjs.locale(i18n.language);
 
 	const findAppElement = () => document.getElementById('app');

inertia/pages/collections/create.tsx

@@ -1,4 +1,3 @@
-import { Visibility } from '#enums/visibility';
 import { useForm } from '@inertiajs/react';
 import { route } from '@izzyjs/route/client';
 import { useMemo } from 'react';
@@ -6,6 +5,7 @@ import { useTranslation } from 'react-i18next';
 import MantineFormCollection, {
 	FormCollectionData,
 } from '~/components/form/form_collection';
+import { Visibility } from '~/types/app';
 
 export default function CreateCollectionPage({
 	disableHomeLink,

inertia/tsconfig.json

@@ -2,21 +2,12 @@
 	"extends": "@adonisjs/tsconfig/tsconfig.client.json",
 	"compilerOptions": {
 		"baseUrl": ".",
-		"target": "ESNext",
-		"lib": ["dom", "dom.iterable", "esnext"],
 		"module": "ESNext",
-		"moduleResolution": "Bundler",
 		"jsx": "react-jsx",
-		"allowSyntheticDefaultImports": true,
-		"esModuleInterop": true,
 		"resolveJsonModule": true,
-		"isolatedModules": true,
-		"noEmit": true,
 		"paths": {
-			"~/*": ["./*"],
+			"~/*": ["./*"]
-			"@/*": ["../*"]
+		}
-		},
-		"types": ["vite/client"]
 	},
 	"include": ["./**/*.ts", "./**/*.tsx"]
 }

inertia/types/app.ts

@@ -1,12 +1,10 @@
-import { Visibility } from '@/app/enums/visibility';
-
 type CommonBase = {
 	id: number;
 	createdAt: string;
 	updatedAt: string;
 };
 
-type User = CommonBase & {
+export type User = CommonBase & {
 	email: string;
 	fullname: string;
 	avatarUrl: string;
@@ -14,15 +12,15 @@ type User = CommonBase & {
 	lastSeenAt: string;
 };
 
-type PublicUser = Omit<User, 'email'>;
+export type PublicUser = Omit<User, 'email'>;
 
-type Users = User[];
+export type Users = User[];
 
-type UserWithCollections = User & {
+export type UserWithCollections = User & {
 	collections: Collection[];
 };
 
-type UserWithRelationCount = CommonBase & {
+export type UserWithRelationCount = CommonBase & {
 	email: string;
 	fullname: string;
 	avatarUrl: string;
@@ -32,7 +30,7 @@ type UserWithRelationCount = CommonBase & {
 	lastSeenAt: string;
 };
 
-type Link = CommonBase & {
+export type Link = CommonBase & {
 	name: string;
 	description: string | null;
 	url: string;
@@ -40,14 +38,14 @@ type Link = CommonBase & {
 	collectionId: number;
 };
 
-type LinkWithCollection = Link & {
+export type LinkWithCollection = Link & {
 	collection: Collection;
 };
 
-type PublicLink = Omit<Link, 'favorite'>;
+export type PublicLink = Omit<Link, 'favorite'>;
-type PublicLinkWithCollection = Omit<Link, 'favorite'>;
+export type PublicLinkWithCollection = Omit<Link, 'favorite'>;
 
-type Collection = CommonBase & {
+export type Collection = CommonBase & {
 	name: string;
 	description: string | null;
 	visibility: Visibility;
@@ -55,6 +53,11 @@ type Collection = CommonBase & {
 	authorId: number;
 };
 
-type CollectionWithLinks = Collection & {
+export type CollectionWithLinks = Collection & {
 	links: Link[];
 };
+
+export enum Visibility {
+	PUBLIC = 'PUBLIC',
+	PRIVATE = 'PRIVATE',
+}

package.json

@@ -15,25 +15,22 @@
 		"release": "release-it"
 	},
 	"imports": {
-		"#controllers/*": "./app/controllers/*.js",
+		"#admin/*": "./app/admin/*.js",
-		"#exceptions/*": "./app/exceptions/*.js",
+		"#auth/*": "./app/auth/*.js",
-		"#models/*": "./app/models/*.js",
+		"#collections/*": "./app/collections/*.js",
-		"#constants/*": "./app/constants/*.js",
+		"#core/*": "./app/core/*.js",
-		"#enums/*": "./app/enums/*.js",
+		"#favicons/*": "./app/favicons/*.js",
-		"#mails/*": "./app/mails/*.js",
+		"#home/*": "./app/home/*.js",
-		"#services/*": "./app/services/*.js",
+		"#legal/*": "./app/legal/*.js",
-		"#listeners/*": "./app/listeners/*.js",
+		"#links/*": "./app/links/*.js",
-		"#events/*": "./app/events/*.js",
+		"#search/*": "./app/search/*.js",
-		"#middleware/*": "./app/middleware/*.js",
+		"#shared_collections/*": "./app/shared_collections/*.js",
-		"#validators/*": "./app/validators/*.js",
+		"#user/*": "./app/user/*.js",
 		"#providers/*": "./providers/*.js",
-		"#policies/*": "./app/policies/*.js",
-		"#abilities/*": "./app/abilities/*.js",
 		"#database/*": "./database/*.js",
 		"#tests/*": "./tests/*.js",
 		"#start/*": "./start/*.js",
-		"#config/*": "./config/*.js",
+		"#config/*": "./config/*.js"
-		"#lib/*": "./app/lib/*.js"
 	},
 	"devDependencies": {
 		"@adonisjs/assembler": "^7.8.2",
@@ -100,8 +97,8 @@
 	},
 	"hotHook": {
 		"boundaries": [
-			"./app/controllers/**/*.ts",
+			"./app/**/controllers/*.ts",
-			"./app/middleware/*.ts"
+			"./app/**/middleware/*.ts"
 		]
 	},
 	"prettier": {

start/kernel.ts

@@ -15,7 +15,7 @@ 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'));
+server.errorHandler(() => import('#core/exceptions/handler'));
 
 /**
  * The server middleware stack runs middleware on all the HTTP
@@ -23,9 +23,9 @@ server.errorHandler(() => import('#exceptions/handler'));
  * the request URL.
  */
 server.use([
-	() => import('#middleware/container_bindings_middleware'),
+	() => import('#core/middlewares/container_bindings_middleware'),
 	() => import('@adonisjs/static/static_middleware'),
-	() => import('#middleware/log_request'),
+	() => import('#core/middlewares/log_request'),
 	() => import('@adonisjs/cors/cors_middleware'),
 	() => import('@adonisjs/vite/vite_middleware'),
 	() => import('@adonisjs/inertia/inertia_middleware'),
@@ -41,8 +41,8 @@ router.use([
 	() => import('@adonisjs/session/session_middleware'),
 	() => import('@adonisjs/shield/shield_middleware'),
 	() => import('@adonisjs/auth/initialize_auth_middleware'),
-	() => import('#middleware/silent_auth_middleware'),
+	() => import('#auth/middlewares/silent_auth_middleware'),
-	() => import('#middleware/update_user_last_seen_middleware'),
+	() => import('#user/middlewares/update_user_last_seen_middleware'),
 ]);
 
 /**
@@ -50,7 +50,7 @@ router.use([
  * the routes or the routes group.
  */
 export const middleware = router.named({
-	admin: () => import('#middleware/admin_middleware'),
+	admin: () => import('#admin/middlewares/is_admin_middleware'),
-	guest: () => import('#middleware/guest_middleware'),
+	guest: () => import('#auth/middlewares/guest_middleware'),
-	auth: () => import('#middleware/auth_middleware'),
+	auth: () => import('#auth/middlewares/auth_middleware'),
 });

start/routes.ts

@@ -1,8 +1,10 @@
-import './routes/admin.js';
+import '#admin/routes/routes';
-import './routes/app.js';
+import '#auth/routes/routes';
-import './routes/auth.js';
+import '#collections/routes/routes';
-import './routes/collection.js';
+import '#favicons/routes/routes';
-import './routes/favicon.js';
+import '#home/routes/routes';
-import './routes/link.js';
+import '#legal/routes/routes';
-import './routes/search.js';
+import '#links/routes/routes';
-import './routes/shared_collection.js';
+import '#search/routes/routes';
+import '#shared_collections/routes/routes';
+import '#user/routes/routes';

start/routes/app.ts

@@ -1,15 +0,0 @@
-import router from '@adonisjs/core/services/router';
-const AppsController = () => import('#controllers/apps_controller');
-
-/**
- * All routes for both logged and guest users
- */
-router.group(() => {
-	router.on('/').renderInertia('home').as('home');
-	router.on('/terms').renderInertia('terms').as('terms');
-	router.on('/privacy').renderInertia('privacy').as('privacy');
-
-	router
-		.post('/user/theme', [AppsController, 'updateUserTheme'])
-		.as('user.theme');
-});