32 Commits

Author SHA1 Message Date
Sonny
e4aea038fe chore: release v3.3.0 2025-11-09 03:18:11 +01:00
Sonny
d03004b841 chore(deps): update deps 2025-11-09 03:17:57 +01:00
Sonny
64cd4820c5 docs: add google oauth config step 2025-11-09 03:11:21 +01:00
Sonny
1c81a6a86f feat: allow adding links via ip 2025-11-09 03:10:51 +01:00
Sonny
208f2c631f feat: add api controllers and routes for browser extension 2025-08-28 16:44:31 +02:00
Sonny
9aa71dad30 refactor: use adonis's access tokens instead of creating custom (and unsecured) logic 2025-08-22 18:35:50 +02:00
Sonny
d00b6b9edd feat: add user token management 2025-08-21 16:39:02 +02:00
Sonny
376e9e32c3 feat: create dedicated settings page instead of creating many modals 2025-08-21 15:59:29 +02:00
Sonny
c2a1d06008 refactor: add new small content layout 2025-08-21 15:44:29 +02:00
Sonny
44c187acaf chore: release v3.2.0 2025-08-21 03:02:47 +02:00
Sonny
a076560285 chore: eslint ignore .adonisjs folder 2025-08-21 03:02:36 +02:00
Sonny
3d986bd662 fix: hide collection edit link only when activeCollection isnt defined 2025-08-21 02:55:11 +02:00
Sonny
8537eeb375 fix: show dashboard link for authenticated users only 2025-08-21 02:54:35 +02:00
Sonny
7672a719ea chore(deps): update deps and node version 2025-08-21 02:47:31 +02:00
Sonny
23ad1fda75 feat: stop force redirect to create collection form 2025-08-21 02:46:44 +02:00
Sonny
4ef2b639b6 feat: add multiple way to show collections and links 2025-08-21 02:27:51 +02:00
Sonny
18fe979069 fix: app base url shared in inertia config file 2025-08-21 02:25:16 +02:00
Sonny
5f7fad26fa refactor: shared collection controller 2025-08-21 02:24:11 +02:00
Sonny
87ced07d20 fix: add missing collectionId params in collection's form layout 2025-08-21 02:00:57 +02:00
Sonny
ac0605caf5 feat: show collection's favorité links first 2025-08-21 01:58:39 +02:00
Sonny
11df24128f fix: collection edit form page component name 2025-08-21 01:58:20 +02:00
Sonny
42f391d99a refactor: remove react-hotkeys-hook and use inertia propos instead of recreating a local store 2025-08-19 23:47:52 +02:00
Sonny
1d1e182523 refactor: compute favorite links in backend 2025-08-19 23:44:48 +02:00
Sonny
81d02d3d80 fix: issue when missing exporter layout 2025-08-19 23:44:23 +02:00
Sonny
d57f3ec486 feat: update user dropdown items 2025-08-17 00:47:13 +02:00
Sonny
9ff3ca112c refactor: split links controller into multiple controllers 2025-08-17 00:39:51 +02:00
Sonny
56b52adac0 refactor: collection controllers and service 2025-08-07 19:42:05 +02:00
Sonny
a5ddc9eb55 fix: navbar dashboard link 2025-08-06 22:52:38 +02:00
Sonny
309cf2c9d2 fix: tweak default mantine theme 2025-08-06 19:58:52 +02:00
Sonny
97ba56b1e7 feat: update default layout 2025-08-06 19:50:53 +02:00
Sonny
d56bd1ef80 chore: append manifest in edge file only in prod env 2025-08-06 19:15:50 +02:00
Sonny
8b176e3d0e chore: add tuyau 2025-08-06 19:09:22 +02:00
167 changed files with 5458 additions and 2169 deletions

476
.adonisjs/api.ts Normal file
View File

@@ -0,0 +1,476 @@
// @ts-nocheck
/* eslint-disable */
// --------------------------------------------------
// This file is auto-generated by Tuyau. Do not edit manually !
// --------------------------------------------------
import type { MakeTuyauRequest, MakeTuyauResponse } from '@tuyau/utils/types';
import type { InferInput } from '@vinejs/vine/types';
type AdminGetHead = {
request: unknown;
response: MakeTuyauResponse<
import('../app/admin/controllers/admin_controller.ts').default['index'],
false
>;
};
type AuthCallbackGetHead = {
request: unknown;
response: MakeTuyauResponse<
import('../app/auth/controllers/auth_controller.ts').default['callbackAuth'],
false
>;
};
type AuthLogoutGetHead = {
request: unknown;
response: MakeTuyauResponse<
import('../app/auth/controllers/auth_controller.ts').default['logout'],
false
>;
};
type DashboardGetHead = {
request: unknown;
response: MakeTuyauResponse<
import('../app/collections/controllers/show_collections_controller.ts').default['render'],
false
>;
};
type CollectionsCreateGetHead = {
request: unknown;
response: MakeTuyauResponse<
import('../app/collections/controllers/create_collection_controller.ts').default['render'],
false
>;
};
type CollectionsPost = {
request: MakeTuyauRequest<
InferInput<
(typeof import('../app/collections/validators/create_collection_validator.ts'))['createCollectionValidator']
>
>;
response: MakeTuyauResponse<
import('../app/collections/controllers/create_collection_controller.ts').default['execute'],
true
>;
};
type CollectionsEditGetHead = {
request: unknown;
response: MakeTuyauResponse<
import('../app/collections/controllers/update_collection_controller.ts').default['render'],
false
>;
};
type CollectionsIdPut = {
request: MakeTuyauRequest<
InferInput<
(typeof import('../app/collections/validators/update_collection_validator.ts'))['updateCollectionValidator']
>
>;
response: MakeTuyauResponse<
import('../app/collections/controllers/update_collection_controller.ts').default['execute'],
true
>;
};
type CollectionsDeleteGetHead = {
request: unknown;
response: MakeTuyauResponse<
import('../app/collections/controllers/delete_collection_controller.ts').default['render'],
false
>;
};
type CollectionsIdDelete = {
request: MakeTuyauRequest<
InferInput<
(typeof import('../app/collections/validators/delete_collection_validator.ts'))['deleteCollectionValidator']
>
>;
response: MakeTuyauResponse<
import('../app/collections/controllers/delete_collection_controller.ts').default['execute'],
true
>;
};
type FaviconGetHead = {
request: unknown;
response: MakeTuyauResponse<
import('../app/favicons/controllers/favicons_controller.ts').default['index'],
false
>;
};
type LinksCreateGetHead = {
request: unknown;
response: MakeTuyauResponse<
import('../app/links/controllers/delete_link_controller.js').default['showCreatePage'],
false
>;
};
type LinksPost = {
request: MakeTuyauRequest<
InferInput<
(typeof import('../app/links/validators/create_link_validator.ts'))['createLinkValidator']
>
>;
response: MakeTuyauResponse<
import('../app/links/controllers/delete_link_controller.js').default['store'],
true
>;
};
type LinksEditGetHead = {
request: unknown;
response: MakeTuyauResponse<
import('../app/links/controllers/delete_link_controller.js').default['showEditPage'],
false
>;
};
type LinksIdPut = {
request: MakeTuyauRequest<
InferInput<
(typeof import('../app/links/validators/update_link_validator.ts'))['updateLinkValidator']
>
>;
response: MakeTuyauResponse<
import('../app/links/controllers/delete_link_controller.js').default['update'],
true
>;
};
type LinksIdFavoritePut = {
request: MakeTuyauRequest<
InferInput<
(typeof import('../app/links/validators/update_favorite_link_validator.ts'))['updateLinkFavoriteStatusValidator']
>
>;
response: MakeTuyauResponse<
import('../app/links/controllers/delete_link_controller.js').default['toggleFavorite'],
true
>;
};
type LinksDeleteGetHead = {
request: unknown;
response: MakeTuyauResponse<
import('../app/links/controllers/delete_link_controller.js').default['showDeletePage'],
false
>;
};
type LinksIdDelete = {
request: MakeTuyauRequest<
InferInput<
(typeof import('../app/links/validators/delete_link_validator.ts'))['deleteLinkValidator']
>
>;
response: MakeTuyauResponse<
import('../app/links/controllers/delete_link_controller.js').default['execute'],
true
>;
};
type SearchGetHead = {
request: unknown;
response: MakeTuyauResponse<
import('../app/search/controllers/search_controller.ts').default['search'],
false
>;
};
type SharedIdGetHead = {
request: MakeTuyauRequest<
InferInput<
(typeof import('../app/shared_collections/validators/shared_collection.ts'))['getSharedCollectionValidator']
>
>;
response: MakeTuyauResponse<
import('../app/shared_collections/controllers/shared_collections_controller.ts').default['index'],
true
>;
};
type UserThemePost = {
request: MakeTuyauRequest<
InferInput<
(typeof import('../app/user/validators/update_theme_validator.ts'))['updateThemeValidator']
>
>;
response: MakeTuyauResponse<
import('../app/user/controllers/theme_controller.ts').default['index'],
true
>;
};
export interface ApiDefinition {
admin: {
$url: {};
$get: AdminGetHead;
$head: AdminGetHead;
};
auth: {
callback: {
$url: {};
$get: AuthCallbackGetHead;
$head: AuthCallbackGetHead;
};
logout: {
$url: {};
$get: AuthLogoutGetHead;
$head: AuthLogoutGetHead;
};
};
dashboard: {
$url: {};
$get: DashboardGetHead;
$head: DashboardGetHead;
};
collections: {
create: {
$url: {};
$get: CollectionsCreateGetHead;
$head: CollectionsCreateGetHead;
};
$url: {};
$post: CollectionsPost;
edit: {
$url: {};
$get: CollectionsEditGetHead;
$head: CollectionsEditGetHead;
};
':id': {
$url: {};
$put: CollectionsIdPut;
$delete: CollectionsIdDelete;
};
delete: {
$url: {};
$get: CollectionsDeleteGetHead;
$head: CollectionsDeleteGetHead;
};
};
favicon: {
$url: {};
$get: FaviconGetHead;
$head: FaviconGetHead;
};
links: {
create: {
$url: {};
$get: LinksCreateGetHead;
$head: LinksCreateGetHead;
};
$url: {};
$post: LinksPost;
edit: {
$url: {};
$get: LinksEditGetHead;
$head: LinksEditGetHead;
};
':id': {
$url: {};
$put: LinksIdPut;
favorite: {
$url: {};
$put: LinksIdFavoritePut;
};
$delete: LinksIdDelete;
};
delete: {
$url: {};
$get: LinksDeleteGetHead;
$head: LinksDeleteGetHead;
};
};
search: {
$url: {};
$get: SearchGetHead;
$head: SearchGetHead;
};
shared: {
':id': {
$url: {};
$get: SharedIdGetHead;
$head: SharedIdGetHead;
};
};
user: {
theme: {
$url: {};
$post: UserThemePost;
};
};
}
const routes = [
{
params: [],
name: 'admin.dashboard',
path: '/admin',
method: ['GET', 'HEAD'],
types: {} as AdminGetHead,
},
{
params: [],
name: 'auth',
path: '/auth/google',
method: ['GET', 'HEAD'],
types: {} as unknown,
},
{
params: [],
name: 'auth.callback',
path: '/auth/callback',
method: ['GET', 'HEAD'],
types: {} as AuthCallbackGetHead,
},
{
params: [],
name: 'auth.logout',
path: '/auth/logout',
method: ['GET', 'HEAD'],
types: {} as AuthLogoutGetHead,
},
{
params: [],
name: 'dashboard',
path: '/dashboard',
method: ['GET', 'HEAD'],
types: {} as DashboardGetHead,
},
{
params: [],
name: 'collection.create-form',
path: '/collections/create',
method: ['GET', 'HEAD'],
types: {} as CollectionsCreateGetHead,
},
{
params: [],
name: 'collection.create',
path: '/collections',
method: ['POST'],
types: {} as CollectionsPost,
},
{
params: [],
name: 'collection.edit-form',
path: '/collections/edit',
method: ['GET', 'HEAD'],
types: {} as CollectionsEditGetHead,
},
{
params: ['id'],
name: 'collection.edit',
path: '/collections/:id',
method: ['PUT'],
types: {} as CollectionsIdPut,
},
{
params: [],
name: 'collection.delete-form',
path: '/collections/delete',
method: ['GET', 'HEAD'],
types: {} as CollectionsDeleteGetHead,
},
{
params: ['id'],
name: 'collection.delete',
path: '/collections/:id',
method: ['DELETE'],
types: {} as CollectionsIdDelete,
},
{
params: [],
name: 'favicon',
path: '/favicon',
method: ['GET', 'HEAD'],
types: {} as FaviconGetHead,
},
{
params: [],
name: 'home',
path: '/',
method: ['GET', 'HEAD'],
types: {} as unknown,
},
{
params: [],
name: 'terms',
path: '/terms',
method: ['GET', 'HEAD'],
types: {} as unknown,
},
{
params: [],
name: 'privacy',
path: '/privacy',
method: ['GET', 'HEAD'],
types: {} as unknown,
},
{
params: [],
name: 'link.create-form',
path: '/links/create',
method: ['GET', 'HEAD'],
types: {} as LinksCreateGetHead,
},
{
params: [],
name: 'link.create',
path: '/links',
method: ['POST'],
types: {} as LinksPost,
},
{
params: [],
name: 'link.edit-form',
path: '/links/edit',
method: ['GET', 'HEAD'],
types: {} as LinksEditGetHead,
},
{
params: ['id'],
name: 'link.edit',
path: '/links/:id',
method: ['PUT'],
types: {} as LinksIdPut,
},
{
params: ['id'],
name: 'link.toggle-favorite',
path: '/links/:id/favorite',
method: ['PUT'],
types: {} as LinksIdFavoritePut,
},
{
params: [],
name: 'link.delete-form',
path: '/links/delete',
method: ['GET', 'HEAD'],
types: {} as LinksDeleteGetHead,
},
{
params: ['id'],
name: 'link.delete',
path: '/links/:id',
method: ['DELETE'],
types: {} as LinksIdDelete,
},
{
params: [],
name: 'search',
path: '/search',
method: ['GET', 'HEAD'],
types: {} as SearchGetHead,
},
{
params: ['id'],
name: 'shared',
path: '/shared/:id',
method: ['GET', 'HEAD'],
types: {} as SharedIdGetHead,
},
{
params: [],
name: 'user.theme',
path: '/user/theme',
method: ['POST'],
types: {} as UserThemePost,
},
] as const;
export const api = {
routes,
definition: {} as ApiDefinition,
};
declare module '@tuyau/inertia/types' {
type InertiaApi = typeof api;
export interface Api extends InertiaApi {}
}

3
.adonisjs/index.ts Normal file
View File

@@ -0,0 +1,3 @@
/// <reference path="../adonisrc.ts" />
export * from './api.js';

View File

@@ -1,16 +1,22 @@
# node ace generate:key
APP_KEY=soY8ZAtItT_fCkNUADfgffZUUo675lOj
# App
TZ=UTC
PORT=3333
HOST=localhost
LOG_LEVEL=info
LOG_LEVEL=debug
APP_KEY=soY8ZAtItT_fCkNUADfgffZUUo675lOj # node ace generate:key
NODE_ENV=development
SESSION_DRIVER=cookie
# App url
APP_URL=http://localhost:3333
# Database
DB_HOST=127.0.0.1
DB_PORT=5432
DB_USER=postgres
DB_PASSWORD=my-links-pwd
DB_DATABASE=my-links
DB_USER=root
DB_PASSWORD=root
DB_DATABASE=app
# Google
GOOGLE_CLIENT_ID=
GOOGLE_CLIENT_SECRET=
GOOGLE_CLIENT_CALLBACK_URL=http://localhost:3333/auth/callback

View File

@@ -1,6 +1,6 @@
# Source : https://github.com/adonisjs-community/adonis-packages/blob/main/Dockerfile
FROM node:24.1-alpine3.20 AS base
FROM node:24.11-alpine3.22 AS base
RUN apk --no-cache add curl
RUN corepack enable
@@ -34,9 +34,9 @@ ENV DB_PORT=5432
ENV DB_USER=db_user
ENV DB_PASSWORD=db_password
ENV DB_DATABASE=db_db
ENV APP_URL=http://localhost:3333
ENV GOOGLE_CLIENT_ID=client_id
ENV GOOGLE_CLIENT_SECRET=client_secret
ENV GOOGLE_CLIENT_CALLBACK_URL=http://localhost:3333/auth/callback
RUN node ace izzy:routes
RUN node ace build

View File

@@ -1,3 +1,7 @@
tuyau:
@node ace tuyau:generate
@pnpm run format
dev:
@docker compose down
@docker compose -f dev.compose.yml pull

View File

@@ -92,6 +92,27 @@ pnpm run start
openssl rand -base64 32
```
### Google OAuth
Pour obtenir le Client ID et Secret Google nécessaires à l'authentification :
1. Accédez à la [Console Google Cloud](https://console.cloud.google.com/)
2. Créez un nouveau projet ou sélectionnez un projet existant
3. Activez l'API **Google+ API** (ou utilisez directement l'API OAuth 2.0)
4. Allez dans **Identifiants** (Credentials) > **Créer des identifiants** > **ID client OAuth 2.0**
5. Configurez l'écran de consentement OAuth si ce n'est pas déjà fait :
- Type d'application : **Interne** ou **Externe**
- Remplissez les informations requises (nom de l'application, email de support, etc.)
6. Créez l'ID client OAuth 2.0 :
- Type d'application : **Application Web**
- Nom : choisissez un nom pour votre application
- URI de redirection autorisés : ajoutez `http://localhost:3333/auth/callback` pour le développement (ou votre URL de production + `/auth/callback`)
7. Une fois créé, vous obtiendrez :
- **Client ID** : à définir dans `GOOGLE_CLIENT_ID`
- **Client Secret** : à définir dans `GOOGLE_CLIENT_SECRET`
> **Note** : Pour la production, assurez-vous d'ajouter votre URL de production dans les URI de redirection autorisés (ex: `https://votre-domaine.com/auth/callback`)
### GitHub Actions
Env var to define :

View File

@@ -2,29 +2,30 @@ import { defineConfig } from '@adonisjs/core/app';
export default defineConfig({
/*
|--------------------------------------------------------------------------
| Commands
|--------------------------------------------------------------------------
|
| List of ace commands to register from packages. The application commands
| will be scanned automatically from the "./commands" directory.
|
*/
|--------------------------------------------------------------------------
| Commands
|--------------------------------------------------------------------------
|
| List of ace commands to register from packages. The application commands
| will be scanned automatically from the "./commands" directory.
|
*/
commands: [
() => import('@adonisjs/core/commands'),
() => import('@adonisjs/lucid/commands'),
() => import('@izzyjs/route/commands'),
() => import('@tuyau/core/commands'),
],
/*
|--------------------------------------------------------------------------
| Service providers
|--------------------------------------------------------------------------
|
| List of service providers to import and register when booting the
| application
|
*/
|--------------------------------------------------------------------------
| Service providers
|--------------------------------------------------------------------------
|
| List of service providers to import and register when booting the
| application
|
*/
providers: [
() => import('@adonisjs/core/providers/app_provider'),
() => import('@adonisjs/core/providers/hash_provider'),
@@ -45,27 +46,32 @@ export default defineConfig({
() => import('@adonisjs/ally/ally_provider'),
() => import('@izzyjs/route/izzy_provider'),
() => import('#providers/route_provider'),
() => import('@tuyau/core/tuyau_provider'),
],
/*
|--------------------------------------------------------------------------
| Preloads
|--------------------------------------------------------------------------
|
| List of modules to import before starting the application.
|
*/
preloads: [() => import('#start/routes'), () => import('#start/kernel')],
|--------------------------------------------------------------------------
| Preloads
|--------------------------------------------------------------------------
|
| List of modules to import before starting the application.
|
*/
preloads: [
() => import('#start/routes'),
() => import('#start/kernel'),
() => import('#start/view'),
],
/*
|--------------------------------------------------------------------------
| Tests
|--------------------------------------------------------------------------
|
| List of test suites to organize tests by their type. Feel free to remove
| and add additional suites.
|
*/
|--------------------------------------------------------------------------
| Tests
|--------------------------------------------------------------------------
|
| List of test suites to organize tests by their type. Feel free to remove
| and add additional suites.
|
*/
tests: {
suites: [
{
@@ -83,14 +89,14 @@ export default defineConfig({
},
/*
|--------------------------------------------------------------------------
| Metafiles
|--------------------------------------------------------------------------
|
| A collection of files you want to copy to the build folder when creating
| the production build.
|
*/
|--------------------------------------------------------------------------
| Metafiles
|--------------------------------------------------------------------------
|
| A collection of files you want to copy to the build folder when creating
| the production build.
|
*/
metaFiles: [
{
pattern: 'resources/views/**/*.edge',

View File

@@ -1,6 +1,6 @@
import AuthController from '#auth/controllers/auth_controller';
import CollectionsController from '#collections/controllers/collections_controller';
import LinksController from '#links/controllers/links_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';
@@ -28,14 +28,14 @@ export default class AdminController {
constructor(
protected usersController: AuthController,
protected linksController: LinksController,
protected collectionsController: CollectionsController
protected collectionService: CollectionService
) {}
async index({ inertia }: HttpContext) {
const users = await this.usersController.getAllUsersWithTotalRelations();
const linksCount = await this.linksController.getTotalLinksCount();
const collectionsCount =
await this.collectionsController.getTotalCollectionsCount();
await this.collectionService.getTotalCollectionsCount();
return inertia.render('admin/dashboard', {
users: users.map((user) => new UserWithRelationCountDto(user).toJson()),

View File

@@ -0,0 +1,20 @@
import { CollectionService } from '#collections/services/collection_service';
import { createCollectionValidator } from '#collections/validators/create_collection_validator';
import { inject } from '@adonisjs/core';
import { type HttpContext } from '@adonisjs/core/http';
@inject()
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);
return response.json({
message: 'Collection created successfully',
collection: collection.serialize(),
});
}
}

View File

@@ -0,0 +1,17 @@
import { CollectionService } from '#collections/services/collection_service';
import { deleteCollectionValidator } from '#collections/validators/delete_collection_validator';
import { inject } from '@adonisjs/core';
import { HttpContext } from '@adonisjs/core/http';
@inject()
export default class DeleteCollectionController {
constructor(private collectionService: CollectionService) {}
async execute({ request, response }: HttpContext) {
const { params } = await request.validateUsing(deleteCollectionValidator);
await this.collectionService.deleteCollection(params.id);
return response.json({
message: 'Collection deleted successfully',
});
}
}

View File

@@ -0,0 +1,16 @@
import { CollectionService } from '#collections/services/collection_service';
import { inject } from '@adonisjs/core';
import { HttpContext } from '@adonisjs/core/http';
@inject()
export default class GetCollectionsController {
constructor(private collectionService: CollectionService) {}
async show({ response }: HttpContext) {
const collections =
await this.collectionService.getCollectionsForAuthenticatedUser();
return response.json({
collections: collections.map((collection) => collection.serialize()),
});
}
}

View File

@@ -0,0 +1,21 @@
import { CollectionService } from '#collections/services/collection_service';
import { updateCollectionValidator } from '#collections/validators/update_collection_validator';
import { inject } from '@adonisjs/core';
import { HttpContext } from '@adonisjs/core/http';
@inject()
export default class UpdateCollectionController {
constructor(private collectionService: CollectionService) {}
async execute({ request, response }: HttpContext) {
const {
params: { id: collectionId },
...payload
} = await request.validateUsing(updateCollectionValidator);
await this.collectionService.updateCollection(collectionId, payload);
return response.json({
message: 'Collection updated successfully',
});
}
}

View File

@@ -0,0 +1,14 @@
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'] })]);

View File

@@ -0,0 +1,14 @@
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'] })]);

View File

@@ -0,0 +1,14 @@
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'] })]);

View File

@@ -0,0 +1,14 @@
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'] })]);

View File

@@ -0,0 +1,4 @@
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';

View File

@@ -0,0 +1,23 @@
import { LinkService } from '#links/services/link_service';
import { createLinkValidator } from '#links/validators/create_link_validator';
import { inject } from '@adonisjs/core';
import { HttpContext } from '@adonisjs/core/http';
@inject()
export default class CreateLinkController {
constructor(private linkService: LinkService) {}
async execute({ request, response }: HttpContext) {
const { collectionId, ...payload } =
await request.validateUsing(createLinkValidator);
const link = await this.linkService.createLink({
...payload,
collectionId,
});
return response.json({
message: 'Link created successfully',
link: link.serialize(),
});
}
}

View File

@@ -0,0 +1,39 @@
import { CollectionService } from '#collections/services/collection_service';
import { LinkService } from '#links/services/link_service';
import { deleteLinkValidator } from '#links/validators/delete_link_validator';
import { inject } from '@adonisjs/core';
import { HttpContext } from '@adonisjs/core/http';
import db from '@adonisjs/lucid/services/db';
@inject()
export default class DeleteLinkController {
constructor(
protected collectionsService: CollectionService,
protected linkService: LinkService
) {}
async render({ auth, inertia, request }: HttpContext) {
const linkId = request.qs()?.linkId;
if (!linkId) {
return this.collectionsService.redirectToDashboard();
}
const link = await this.linkService.getLinkById(linkId, auth.user!.id);
await link.load('collection');
return inertia.render('links/delete', { link });
}
async execute({ request, auth }: HttpContext) {
const { params } = await request.validateUsing(deleteLinkValidator);
const link = await this.linkService.getLinkById(params.id, auth.user!.id);
await this.linkService.deleteLink(params.id);
return this.collectionsService.redirectToCollectionId(link.collectionId);
}
async getTotalLinksCount() {
const totalCount = await db.from('links').count('* as total');
return Number(totalCount[0].total);
}
}

View File

@@ -0,0 +1,13 @@
import { LinkService } from '#links/services/link_service';
import { inject } from '@adonisjs/core';
import { HttpContext } from '@adonisjs/core/http';
@inject()
export default class GetFavoriteLinksController {
constructor(private linkService: LinkService) {}
public async execute({ response }: HttpContext) {
const links = await this.linkService.getFavoriteLinksForAuthenticatedUser();
return response.json(links);
}
}

View File

@@ -0,0 +1,19 @@
import { LinkService } from '#links/services/link_service';
import { updateLinkValidator } from '#links/validators/update_link_validator';
import { inject } from '@adonisjs/core';
import { HttpContext } from '@adonisjs/core/http';
@inject()
export default class UpdateLinkController {
constructor(private linkService: LinkService) {}
async execute({ request, response }: HttpContext) {
const { params, ...payload } =
await request.validateUsing(updateLinkValidator);
await this.linkService.updateLink(params.id, payload);
return response.json({
message: 'Link updated successfully',
});
}
}

View File

@@ -0,0 +1,12 @@
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'] })]);

View File

@@ -0,0 +1,14 @@
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'] })]);

View File

@@ -0,0 +1,14 @@
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'] })]);

View File

@@ -0,0 +1,14 @@
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'] })]);

View File

@@ -0,0 +1,4 @@
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';

View File

@@ -0,0 +1,18 @@
import UnAuthorizedException from '#api/tokens/exceptions/un_authorized_exception';
import { getTokenFromHeader } from '#api/tokens/lib/index';
import { inject } from '@adonisjs/core';
import { HttpContext } from '@adonisjs/core/http';
@inject()
export default class ApiTokenController {
async index(ctx: HttpContext) {
const token = getTokenFromHeader(ctx);
if (!token) {
throw new UnAuthorizedException();
}
return ctx.response.json({
message: 'Token is valid',
});
}
}

View File

@@ -0,0 +1,7 @@
import { Exception } from '@adonisjs/core/exceptions';
export default class UnAuthorizedException extends Exception {
static status = 401;
message = 'Missing or invalid authorization header';
code = 'UNAUTHORIZED';
}

View File

@@ -0,0 +1,11 @@
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);
}

View File

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

View File

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

View File

@@ -1,141 +0,0 @@
import Collection from '#collections/models/collection';
import { createCollectionValidator } from '#collections/validators/create_collection_validator';
import { deleteCollectionValidator } from '#collections/validators/delete_collection_validator';
import { updateCollectionValidator } from '#collections/validators/update_collection_validator';
import User from '#user/models/user';
import type { HttpContext } from '@adonisjs/core/http';
import db from '@adonisjs/lucid/services/db';
export default class CollectionsController {
// Dashboard
async index({ auth, inertia, request, response }: HttpContext) {
const collections = await this.getCollectionsByAuthorId(auth.user!.id);
if (collections.length === 0) {
return response.redirectToNamedRoute('collection.create-form');
}
const activeCollectionId = Number(request.qs()?.collectionId ?? '');
const activeCollection = collections.find(
(c) => c.id === activeCollectionId
);
if (!activeCollection && !!activeCollectionId) {
return response.redirectToNamedRoute('dashboard');
}
// TODO: Create DTOs
return inertia.render('dashboard', {
collections: collections.map((collection) => collection.serialize()),
activeCollection:
activeCollection?.serialize() || collections[0].serialize(),
});
}
// Create collection form
async showCreatePage({ inertia, auth }: HttpContext) {
const collections = await this.getCollectionsByAuthorId(auth.user!.id);
return inertia.render('collections/create', {
disableHomeLink: collections.length === 0,
});
}
// Method called when creating a collection
async store({ request, response, auth }: HttpContext) {
const payload = await request.validateUsing(createCollectionValidator);
const collection = await Collection.create({
...payload,
authorId: auth.user?.id!,
});
return this.redirectToCollectionId(response, collection.id);
}
async showEditPage({ auth, request, inertia, response }: HttpContext) {
const collectionId = request.qs()?.collectionId;
if (!collectionId) {
return response.redirectToNamedRoute('dashboard');
}
const collection = await this.getCollectionById(
collectionId,
auth.user!.id
);
return inertia.render('collections/edit', {
collection,
});
}
async update({ request, auth, response }: HttpContext) {
const { params, ...payload } = await request.validateUsing(
updateCollectionValidator
);
// Cant use validator (vinejs) custom rule 'cause its too generic,
// because we have to find a collection by identifier and
// check whether the current user is the author.
// https://vinejs.dev/docs/extend/custom_rules
await this.getCollectionById(params.id, auth.user!.id);
await Collection.updateOrCreate(
{
id: params.id,
},
payload
);
return this.redirectToCollectionId(response, params.id);
}
async showDeletePage({ auth, request, inertia, response }: HttpContext) {
const collectionId = request.qs()?.collectionId;
if (!collectionId) {
return response.redirectToNamedRoute('dashboard');
}
const collection = await this.getCollectionById(
collectionId,
auth.user!.id
);
return inertia.render('collections/delete', {
collection,
});
}
async delete({ request, auth, response }: HttpContext) {
const { params } = await request.validateUsing(deleteCollectionValidator);
const collection = await this.getCollectionById(params.id, auth.user!.id);
await collection.delete();
return response.redirectToNamedRoute('dashboard');
}
async getTotalCollectionsCount() {
const totalCount = await db.from('collections').count('* as total');
return Number(totalCount[0].total);
}
/**
* Get collection by id.
*
* /!\ Only return private collection (create by the current user)
*/
async getCollectionById(id: Collection['id'], userId: User['id']) {
return await Collection.query()
.where('id', id)
.andWhere('author_id', userId)
.firstOrFail();
}
async getCollectionsByAuthorId(authorId: User['id']) {
return await Collection.query()
.where('author_id', authorId)
.orderBy('created_at')
.preload('links');
}
redirectToCollectionId(
response: HttpContext['response'],
collectionId: Collection['id']
) {
return response.redirectToNamedRoute('dashboard', {
qs: { collectionId },
});
}
}

View File

@@ -0,0 +1,23 @@
import { CollectionService } from '#collections/services/collection_service';
import { createCollectionValidator } from '#collections/validators/create_collection_validator';
import { inject } from '@adonisjs/core';
import { type HttpContext } from '@adonisjs/core/http';
@inject()
export default class CreateCollectionController {
constructor(private collectionService: CollectionService) {}
async render({ inertia }: HttpContext) {
const collections =
await this.collectionService.getCollectionsForAuthenticatedUser();
return inertia.render('collections/create', {
disableHomeLink: collections.length === 0,
});
}
async execute({ request }: HttpContext) {
const payload = await request.validateUsing(createCollectionValidator);
const collection = await this.collectionService.createCollection(payload);
return this.collectionService.redirectToCollectionId(collection.id);
}
}

View File

@@ -0,0 +1,26 @@
import { CollectionService } from '#collections/services/collection_service';
import { deleteCollectionValidator } from '#collections/validators/delete_collection_validator';
import { inject } from '@adonisjs/core';
import { HttpContext } from '@adonisjs/core/http';
@inject()
export default class DeleteCollectionController {
constructor(private collectionService: CollectionService) {}
async render({ inertia }: HttpContext) {
const collectionId = await this.collectionService.validateCollectionId();
if (!collectionId) return;
const collection =
await this.collectionService.getCollectionById(collectionId);
return inertia.render('collections/delete', {
collection,
});
}
async execute({ request, response }: HttpContext) {
const { params } = await request.validateUsing(deleteCollectionValidator);
await this.collectionService.deleteCollection(params.id);
return response.redirectToNamedRoute('dashboard');
}
}

View File

@@ -0,0 +1,36 @@
import { CollectionService } from '#collections/services/collection_service';
import { LinkService } from '#links/services/link_service';
import { inject } from '@adonisjs/core';
import type { HttpContext } from '@adonisjs/core/http';
@inject()
export default class ShowCollectionsController {
constructor(
private collectionService: CollectionService,
private linkService: LinkService
) {}
// Dashboard
async render({ inertia, response }: HttpContext) {
const activeCollectionId =
await this.collectionService.validateCollectionId(false);
const [collections, favoriteLinks] = await Promise.all([
this.collectionService.getCollectionsForAuthenticatedUser(),
this.linkService.getFavoriteLinksForAuthenticatedUser(),
]);
const activeCollection = collections.find(
(c) => c.id === activeCollectionId
);
if (!activeCollection && !!activeCollectionId) {
return response.redirectToNamedRoute('dashboard');
}
return inertia.render('dashboard', {
collections: collections.map((collection) => collection.serialize()),
favoriteLinks: favoriteLinks.map((link) => link.serialize()),
activeCollection: activeCollection?.serialize(),
});
}
}

View File

@@ -0,0 +1,30 @@
import { CollectionService } from '#collections/services/collection_service';
import { updateCollectionValidator } from '#collections/validators/update_collection_validator';
import { inject } from '@adonisjs/core';
import { HttpContext } from '@adonisjs/core/http';
@inject()
export default class UpdateCollectionController {
constructor(private collectionService: CollectionService) {}
async render({ inertia }: HttpContext) {
const collectionId = await this.collectionService.validateCollectionId();
if (!collectionId) return;
const collection =
await this.collectionService.getCollectionById(collectionId);
return inertia.render('collections/edit', {
collection: collection.serialize(),
});
}
async execute({ request }: HttpContext) {
const {
params: { id: collectionId },
...payload
} = await request.validateUsing(updateCollectionValidator);
await this.collectionService.updateCollection(collectionId, payload);
return this.collectionService.redirectToCollectionId(collectionId);
}
}

View File

@@ -1,33 +1,45 @@
import { middleware } from '#start/kernel';
import router from '@adonisjs/core/services/router';
const CollectionsController = () =>
import('#collections/controllers/collections_controller');
const ShowCollectionsController = () =>
import('#collections/controllers/show_collections_controller');
const CreateCollectionController = () =>
import('#collections/controllers/create_collection_controller');
const UpdateCollectionController = () =>
import('#collections/controllers/update_collection_controller');
const DeleteCollectionController = () =>
import('#collections/controllers/delete_collection_controller');
router
.group(() => {
router.get('/dashboard', [CollectionsController, 'index']).as('dashboard');
router
.get('/dashboard', [ShowCollectionsController, 'render'])
.as('dashboard');
router
.group(() => {
// Create
router
.get('/create', [CollectionsController, 'showCreatePage'])
.get('/create', [CreateCollectionController, 'render'])
.as('collection.create-form');
router
.post('/', [CollectionsController, 'store'])
.post('/', [CreateCollectionController, 'execute'])
.as('collection.create');
// Update
router
.get('/edit', [CollectionsController, 'showEditPage'])
.get('/edit', [UpdateCollectionController, 'render'])
.as('collection.edit-form');
router
.put('/:id', [CollectionsController, 'update'])
.put('/:id', [UpdateCollectionController, 'execute'])
.as('collection.edit');
// Delete
router
.get('/delete', [CollectionsController, 'showDeletePage'])
.get('/delete', [DeleteCollectionController, 'render'])
.as('collection.delete-form');
router
.delete('/:id', [CollectionsController, 'delete'])
.delete('/:id', [DeleteCollectionController, 'execute'])
.as('collection.delete');
})
.prefix('/collections');

View File

@@ -0,0 +1,104 @@
import { Visibility } from '#collections/enums/visibility';
import Collection from '#collections/models/collection';
import { collectionIdValidator } from '#collections/validators/collection_id_validator';
import { HttpContext } from '@adonisjs/core/http';
import db from '@adonisjs/lucid/services/db';
type CreateCollectionPayload = {
name: string;
description: string | null;
visibility: Visibility;
};
type UpdateCollectionPayload = CreateCollectionPayload;
export class CollectionService {
async getCollectionById(id: Collection['id']) {
const context = this.getAuthContext();
return await Collection.query()
.where('id', id)
.andWhere('author_id', context.auth.user!.id)
.firstOrFail();
}
async getCollectionsForAuthenticatedUser() {
const context = this.getAuthContext();
return await Collection.query()
.where('author_id', context.auth.user!.id)
.orderBy('created_at')
.preload('links', (q) => q.orderBy('favorite', 'desc'));
}
async getTotalCollectionsCount() {
const totalCount = await db.from('collections').count('* as total');
return Number(totalCount[0].total);
}
createCollection(payload: CreateCollectionPayload) {
const context = this.getAuthContext();
return Collection.create({
...payload,
authorId: context.auth.user!.id,
});
}
async updateCollection(
id: Collection['id'],
payload: UpdateCollectionPayload
) {
const context = this.getAuthContext();
return await Collection.query()
.where('id', id)
.andWhere('author_id', context.auth.user!.id)
.update(payload);
}
deleteCollection(id: Collection['id']) {
const context = this.getAuthContext();
return Collection.query()
.where('id', id)
.andWhere('author_id', context.auth.user!.id)
.delete();
}
getPublicCollectionById(id: Collection['id']) {
return Collection.query()
.where('id', id)
.andWhere('visibility', Visibility.PUBLIC)
.preload('links')
.preload('author')
.firstOrFail();
}
private getAuthContext() {
const context = HttpContext.getOrFail();
if (!context.auth.user || !context.auth.user.id) {
throw new Error('User not authenticated');
}
return context;
}
async validateCollectionId(collectionIdRequired: boolean = true) {
const ctx = HttpContext.getOrFail();
const { collectionId } = await ctx.request.validateUsing(
collectionIdValidator
);
if (!collectionId && collectionIdRequired) {
this.redirectToDashboard();
return null;
}
return collectionId;
}
redirectToCollectionId(collectionId: Collection['id']) {
const ctx = HttpContext.getOrFail();
return ctx.response.redirectToNamedRoute('dashboard', {
qs: { collectionId },
});
}
redirectToDashboard() {
const ctx = HttpContext.getOrFail();
return ctx.response.redirectToNamedRoute('dashboard');
}
}

View File

@@ -0,0 +1,7 @@
import vine from '@vinejs/vine';
export const collectionIdValidator = vine.compile(
vine.object({
collectionId: vine.number().positive().optional(),
})
);

View File

@@ -36,6 +36,13 @@ export default class HttpExceptionHandler extends ExceptionHandler {
* response to the client
*/
async handle(error: unknown, ctx: HttpContext) {
if (ctx.request.url()?.startsWith('/api/v1')) {
return ctx.response.status(400).json({
message: 'Bad Request',
errors: [error],
});
}
if (error instanceof errors.E_ROW_NOT_FOUND) {
return ctx.response.redirectToNamedRoute('dashboard');
}

View File

@@ -0,0 +1,30 @@
import { CollectionService } from '#collections/services/collection_service';
import { LinkService } from '#links/services/link_service';
import { createLinkValidator } from '#links/validators/create_link_validator';
import { inject } from '@adonisjs/core';
import { HttpContext } from '@adonisjs/core/http';
@inject()
export default class CreateLinkController {
constructor(
private linkService: LinkService,
private collectionsService: CollectionService
) {}
async render({ inertia }: HttpContext) {
const collections =
await this.collectionsService.getCollectionsForAuthenticatedUser();
return inertia.render('links/create', { collections });
}
async execute({ request }: HttpContext) {
const { collectionId, ...payload } =
await request.validateUsing(createLinkValidator);
await this.linkService.createLink({
...payload,
collectionId,
});
return this.collectionsService.redirectToCollectionId(collectionId);
}
}

View File

@@ -0,0 +1,39 @@
import { CollectionService } from '#collections/services/collection_service';
import { LinkService } from '#links/services/link_service';
import { deleteLinkValidator } from '#links/validators/delete_link_validator';
import { inject } from '@adonisjs/core';
import { HttpContext } from '@adonisjs/core/http';
import db from '@adonisjs/lucid/services/db';
@inject()
export default class DeleteLinkController {
constructor(
protected collectionsService: CollectionService,
protected linkService: LinkService
) {}
async render({ auth, inertia, request }: HttpContext) {
const linkId = request.qs()?.linkId;
if (!linkId) {
return this.collectionsService.redirectToDashboard();
}
const link = await this.linkService.getLinkById(linkId, auth.user!.id);
await link.load('collection');
return inertia.render('links/delete', { link });
}
async execute({ request, auth }: HttpContext) {
const { params } = await request.validateUsing(deleteLinkValidator);
const link = await this.linkService.getLinkById(params.id, auth.user!.id);
await this.linkService.deleteLink(params.id);
return this.collectionsService.redirectToCollectionId(link.collectionId);
}
async getTotalLinksCount() {
const totalCount = await db.from('links').count('* as total');
return Number(totalCount[0].total);
}
}

View File

@@ -1,129 +0,0 @@
import CollectionsController from '#collections/controllers/collections_controller';
import Link from '#links/models/link';
import { createLinkValidator } from '#links/validators/create_link_validator';
import { deleteLinkValidator } from '#links/validators/delete_link_validator';
import { updateLinkFavoriteStatusValidator } from '#links/validators/update_favorite_link_validator';
import { updateLinkValidator } from '#links/validators/update_link_validator';
import { inject } from '@adonisjs/core';
import { HttpContext } from '@adonisjs/core/http';
import db from '@adonisjs/lucid/services/db';
@inject()
export default class LinksController {
constructor(protected collectionsController: CollectionsController) {}
async showCreatePage({ auth, inertia }: HttpContext) {
const collections =
await this.collectionsController.getCollectionsByAuthorId(auth.user!.id);
return inertia.render('links/create', { collections });
}
async store({ auth, request, response }: HttpContext) {
const { collectionId, ...payload } =
await request.validateUsing(createLinkValidator);
await this.collectionsController.getCollectionById(
collectionId,
auth.user!.id
);
await Link.create({
...payload,
collectionId,
authorId: auth.user?.id!,
});
return this.collectionsController.redirectToCollectionId(
response,
collectionId
);
}
async showEditPage({ auth, inertia, request, response }: HttpContext) {
const linkId = request.qs()?.linkId;
if (!linkId) {
return response.redirectToNamedRoute('dashboard');
}
const userId = auth.user!.id;
const collections =
await this.collectionsController.getCollectionsByAuthorId(userId);
const link = await this.getLinkById(linkId, userId);
return inertia.render('links/edit', { collections, link });
}
async update({ request, auth, response }: HttpContext) {
const { params, ...payload } =
await request.validateUsing(updateLinkValidator);
// Throw if invalid link id provided
await this.getLinkById(params.id, auth.user!.id);
await Link.updateOrCreate(
{
id: params.id,
},
payload
);
return response.redirectToNamedRoute('dashboard', {
qs: { collectionId: payload.collectionId },
});
}
async toggleFavorite({ request, auth, response }: HttpContext) {
const { params, favorite } = await request.validateUsing(
updateLinkFavoriteStatusValidator
);
// Throw if invalid link id provided
await this.getLinkById(params.id, auth.user!.id);
await Link.updateOrCreate(
{
id: params.id,
},
{ favorite }
);
return response.json({ status: 'ok' });
}
async showDeletePage({ auth, inertia, request, response }: HttpContext) {
const linkId = request.qs()?.linkId;
if (!linkId) {
return response.redirectToNamedRoute('dashboard');
}
const link = await this.getLinkById(linkId, auth.user!.id);
await link.load('collection');
return inertia.render('links/delete', { link });
}
async delete({ request, auth, response }: HttpContext) {
const { params } = await request.validateUsing(deleteLinkValidator);
const link = await this.getLinkById(params.id, auth.user!.id);
await link.delete();
return response.redirectToNamedRoute('dashboard', {
qs: { collectionId: link.id },
});
}
async getTotalLinksCount() {
const totalCount = await db.from('links').count('* as total');
return Number(totalCount[0].total);
}
/**
* Get link by id.
*
* /!\ Only return private link (create by the current user)
*/
private async getLinkById(id: Link['id'], userId: Link['id']) {
return await Link.query()
.where('id', id)
.andWhere('author_id', userId)
.firstOrFail();
}
}

View File

@@ -0,0 +1,19 @@
import { LinkService } from '#links/services/link_service';
import { updateLinkFavoriteStatusValidator } from '#links/validators/update_favorite_link_validator';
import { inject } from '@adonisjs/core';
import { HttpContext } from '@adonisjs/core/http';
@inject()
export default class ToggleFavoriteController {
constructor(private linkService: LinkService) {}
async toggleFavorite({ request, response }: HttpContext) {
const { params, favorite } = await request.validateUsing(
updateLinkFavoriteStatusValidator
);
await this.linkService.updateFavorite(params.id, favorite);
return response.json({ status: 'ok' });
}
}

View File

@@ -0,0 +1,34 @@
import { CollectionService } from '#collections/services/collection_service';
import { LinkService } from '#links/services/link_service';
import { updateLinkValidator } from '#links/validators/update_link_validator';
import { inject } from '@adonisjs/core';
import { HttpContext } from '@adonisjs/core/http';
@inject()
export default class UpdateLinkController {
constructor(
private linkService: LinkService,
private collectionsService: CollectionService
) {}
async render({ auth, inertia, request, response }: HttpContext) {
const linkId = request.qs()?.linkId;
if (!linkId) {
return response.redirectToNamedRoute('dashboard');
}
const collections =
await this.collectionsService.getCollectionsForAuthenticatedUser();
const link = await this.linkService.getLinkById(linkId, auth.user!.id);
return inertia.render('links/edit', { collections, link });
}
async execute({ request }: HttpContext) {
const { params, ...payload } =
await request.validateUsing(updateLinkValidator);
await this.linkService.updateLink(params.id, payload);
return this.collectionsService.redirectToCollectionId(payload.collectionId);
}
}

View File

@@ -1,6 +1,14 @@
import { middleware } from '#start/kernel';
import router from '@adonisjs/core/services/router';
const LinksController = () => import('#links/controllers/links_controller');
const CreateLinkController = () =>
import('#links/controllers/create_link_controller');
const DeleteLinkController = () =>
import('#links/controllers/delete_link_controller');
const UpdateLinkController = () =>
import('#links/controllers/update_link_controller');
const ToggleFavoriteController = () =>
import('#links/controllers/toggle_favorite_controller');
/**
* Routes for authenticated users
@@ -8,21 +16,21 @@ const LinksController = () => import('#links/controllers/links_controller');
router
.group(() => {
router
.get('/create', [LinksController, 'showCreatePage'])
.get('/create', [CreateLinkController, 'render'])
.as('link.create-form');
router.post('/', [LinksController, 'store']).as('link.create');
router.post('/', [CreateLinkController, 'execute']).as('link.create');
router.get('/edit', [LinksController, 'showEditPage']).as('link.edit-form');
router.put('/:id', [LinksController, 'update']).as('link.edit');
router.get('/edit', [UpdateLinkController, 'render']).as('link.edit-form');
router.put('/:id', [UpdateLinkController, 'execute']).as('link.edit');
router
.put('/:id/favorite', [LinksController, 'toggleFavorite'])
.put('/:id/favorite', [ToggleFavoriteController, 'toggleFavorite'])
.as('link.toggle-favorite');
router
.get('/delete', [LinksController, 'showDeletePage'])
.get('/delete', [DeleteLinkController, 'render'])
.as('link.delete-form');
router.delete('/:id', [LinksController, 'delete']).as('link.delete');
router.delete('/:id', [DeleteLinkController, 'execute']).as('link.delete');
})
.middleware([middleware.auth()])
.prefix('/links');

View File

@@ -0,0 +1,68 @@
import Link from '#links/models/link';
import { HttpContext } from '@adonisjs/core/http';
type CreateLinkPayload = {
name: string;
description?: string;
url: string;
favorite: boolean;
collectionId: number;
};
type UpdateLinkPayload = CreateLinkPayload;
export class LinkService {
createLink(payload: CreateLinkPayload) {
const context = this.getAuthContext();
return Link.create({
...payload,
authorId: context.auth.user!.id,
});
}
updateLink(id: number, payload: UpdateLinkPayload) {
const context = this.getAuthContext();
return Link.query()
.where('id', id)
.andWhere('author_id', context.auth.user!.id)
.update(payload);
}
deleteLink(id: number) {
const context = this.getAuthContext();
return Link.query()
.where('id', id)
.andWhere('author_id', context.auth.user!.id)
.delete();
}
async getLinkById(id: Link['id'], userId: Link['id']) {
return await Link.query()
.where('id', id)
.andWhere('author_id', userId)
.firstOrFail();
}
updateFavorite(id: number, favorite: boolean) {
return Link.query()
.where('id', id)
.andWhere('author_id', this.getAuthContext().auth.user!.id)
.update({ favorite });
}
async getFavoriteLinksForAuthenticatedUser() {
const context = this.getAuthContext();
return await Link.query()
.where('author_id', context.auth.user!.id)
.where('favorite', true)
.orderBy('created_at');
}
getAuthContext() {
const context = HttpContext.getOrFail();
if (!context.auth.user || !context.auth.user.id) {
throw new Error('User not authenticated');
}
return context;
}
}

View File

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

View File

@@ -1,11 +1,8 @@
import { baseLinkValidator } from '#links/validators/base_link_validator';
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(),
...baseLinkValidator.getProperties(),
})
);

View File

@@ -1,13 +1,10 @@
import { params } from '#core/validators/params_object';
import { baseLinkValidator } from '#links/validators/base_link_validator';
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(),
...baseLinkValidator.getProperties(),
params,
})

View File

@@ -1,61 +1,19 @@
import { Visibility } from '#collections/enums/visibility';
import Collection from '#collections/models/collection';
import Link from '#links/models/link';
import User from '#user/models/user';
import { CollectionService } from '#collections/services/collection_service';
import { inject } from '@adonisjs/core';
import type { HttpContext } from '@adonisjs/core/http';
import { getSharedCollectionValidator } from '../validators/shared_collection.js';
class LinkWithoutFavoriteDto {
constructor(private link: Link) {}
toJson = () => ({
id: this.link.id,
name: this.link.name,
description: this.link.description,
url: this.link.url,
collectionId: this.link.collectionId,
createdAt: this.link.createdAt.toString(),
updatedAt: this.link.updatedAt.toString(),
});
}
class UserWithoutEmailDto {
constructor(private user: User) {}
toJson = () => ({
id: this.user.id,
fullname: this.user.name,
avatarUrl: this.user.avatarUrl,
isAdmin: this.user.isAdmin,
createdAt: this.user.createdAt.toString(),
updatedAt: this.user.updatedAt.toString(),
});
}
@inject()
export default class SharedCollectionsController {
constructor(private collectionService: CollectionService) {}
async index({ request, inertia }: HttpContext) {
const { params } = await request.validateUsing(
getSharedCollectionValidator
);
const collection = await this.getSharedCollectionById(params.id);
return inertia.render('shared', { collection });
}
private async getSharedCollectionById(id: Collection['id']) {
const collection = await Collection.query()
.where('id', id)
.andWhere('visibility', Visibility.PUBLIC)
.preload('links')
.preload('author')
.firstOrFail();
return {
...collection.serialize(),
links: collection.links.map((link) =>
new LinkWithoutFavoriteDto(link).toJson()
),
author: new UserWithoutEmailDto(collection.author).toJson(),
};
const activeCollection =
await this.collectionService.getPublicCollectionById(params.id);
return inertia.render('shared', { activeCollection });
}
}

View File

@@ -0,0 +1,45 @@
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 { inject } from '@adonisjs/core';
import { HttpContext } from '@adonisjs/core/http';
@inject()
export default class ApiTokenController {
constructor(private apiTokenService: ApiTokenService) {}
async store({ request, response, auth, session }: HttpContext) {
const { name, expiresAt } = await request.validateUsing(
createApiTokenValidator
);
const token = await this.apiTokenService.createToken(auth.user!, {
name,
expiresAt,
});
session.flash('token', {
...token.toJSON(),
token: token.value?.release(),
identifier: token.identifier,
});
return response.redirect().withQs().back();
}
async destroy({ request, response, auth }: HttpContext) {
const { params } = await request.validateUsing(deleteApiTokenValidator);
const tokenId = params.tokenId;
const token = await this.apiTokenService.getTokenByValue(
auth.user!,
tokenId
);
if (!token) {
return response.notFound();
}
await this.apiTokenService.revokeToken(
auth.user!,
Number(token.identifier)
);
return response.redirect().withQs().back();
}
}

View File

@@ -0,0 +1,26 @@
import { getDisplayPreferences } from '#shared/lib/display_preferences';
import { updateDisplayPreferencesValidator } from '#user/validators/update_display_preferences';
import { HttpContext } from '@adonisjs/core/http';
export default class DisplayPreferencesController {
async update({ request, response, auth }: HttpContext) {
const { displayPreferences } = await request.validateUsing(
updateDisplayPreferencesValidator
);
const userPrefs = auth.user!.displayPreferences ?? {};
const mergedPrefs = {
linkListDisplay:
displayPreferences.linkListDisplay ??
userPrefs.linkListDisplay ??
getDisplayPreferences().linkListDisplay,
collectionListDisplay:
displayPreferences.collectionListDisplay ??
userPrefs.collectionListDisplay ??
getDisplayPreferences().collectionListDisplay,
};
auth.user!.displayPreferences = mergedPrefs;
console.log(auth.user!.displayPreferences);
await auth.user!.save();
return response.redirect().withQs().back();
}
}

12
app/user/lib/index.ts Normal file
View File

@@ -0,0 +1,12 @@
import { type DisplayPreferences } from '#shared/types/index';
import User from '#user/models/user';
export function ensureDisplayPreferences(user: User): DisplayPreferences {
const defaults: DisplayPreferences = {
linkListDisplay: 'grid',
collectionListDisplay: 'list',
};
user.displayPreferences = { ...defaults, ...user.displayPreferences };
return user.displayPreferences;
}

View File

@@ -1,7 +1,10 @@
import Collection from '#collections/models/collection';
import AppBaseModel from '#core/models/app_base_model';
import Link from '#links/models/link';
import { type DisplayPreferences } from '#shared/types/index';
import { ensureDisplayPreferences } from '#user/lib/index';
import type { GoogleToken } from '@adonisjs/ally/types';
import { DbAccessTokensProvider } from '@adonisjs/auth/access_tokens';
import { column, computed, hasMany } from '@adonisjs/lucid/orm';
import type { HasMany } from '@adonisjs/lucid/types/relations';
import { DateTime } from 'luxon';
@@ -51,4 +54,17 @@ export default class User extends AppBaseModel {
autoUpdate: true,
})
declare lastSeenAt: DateTime;
@column({
serialize: (value) => {
if (typeof value === 'string') {
return ensureDisplayPreferences(JSON.parse(value));
}
return value;
},
prepare: (value) => JSON.stringify(value),
})
declare displayPreferences: DisplayPreferences;
static accessTokens = DbAccessTokensProvider.forModel(User);
}

View File

@@ -0,0 +1,15 @@
import { middleware } from '#start/kernel';
import router from '@adonisjs/core/services/router';
const ApiTokenController = () =>
import('#user/controllers/api_token_controller');
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()]);

View File

@@ -1 +1,3 @@
import './api_token_routes.js';
import './user_display_preferences_route.js';
import './user_theme_route.js';

View File

@@ -0,0 +1,10 @@
import { middleware } from '#start/kernel';
import router from '@adonisjs/core/services/router';
const DisplayPreferencesController = () =>
import('#user/controllers/display_preferences_controller');
router
.post('/user/display-preferences', [DisplayPreferencesController, 'update'])
.as('user.update-display-preferences')
.middleware([middleware.auth()]);

View File

@@ -0,0 +1,28 @@
import User from '#user/models/user';
type CreateTokenParams = {
name: string;
expiresAt?: Date;
};
export class ApiTokenService {
createToken(user: User, { name, expiresAt }: CreateTokenParams) {
const expiresIn = expiresAt ? expiresAt.getTime() - Date.now() : undefined;
return User.accessTokens.create(user, undefined, {
name,
expiresIn,
});
}
getTokens(user: User) {
return User.accessTokens.all(user);
}
revokeToken(user: User, identifier: number) {
return User.accessTokens.delete(user, identifier);
}
getTokenByValue(user: User, value: string) {
return User.accessTokens.find(user, value);
}
}

View File

@@ -0,0 +1,8 @@
import vine from '@vinejs/vine';
export const createApiTokenValidator = vine.compile(
vine.object({
name: vine.string().trim().minLength(1).maxLength(255),
expiresAt: vine.date().optional(),
})
);

View File

@@ -0,0 +1,9 @@
import vine from '@vinejs/vine';
export const deleteApiTokenValidator = vine.compile(
vine.object({
params: vine.object({
tokenId: vine.string().trim().minLength(1).maxLength(255),
}),
})
);

View File

@@ -0,0 +1,26 @@
import {
COLLECTION_LIST_DISPLAYS,
DEFAULT_LIST_DISPLAY_PREFERENCES,
LINK_LIST_DISPLAYS,
} from '#shared/lib/display_preferences';
import vine from '@vinejs/vine';
export const updateDisplayPreferencesValidator = vine.compile(
vine.object({
displayPreferences: vine.object({
linkListDisplay: vine
.enum(LINK_LIST_DISPLAYS)
.optional()
.transform(
(value) => value ?? DEFAULT_LIST_DISPLAY_PREFERENCES.linkListDisplay
),
collectionListDisplay: vine
.enum(COLLECTION_LIST_DISPLAYS)
.optional()
.transform(
(value) =>
value ?? DEFAULT_LIST_DISPLAY_PREFERENCES.collectionListDisplay
),
}),
})
);

View File

@@ -0,0 +1,22 @@
import { ApiTokenService } from '#user/services/api_token_service';
import { inject } from '@adonisjs/core';
import { HttpContext } from '@adonisjs/core/http';
@inject()
export default class ShowUserSettingsController {
constructor(private apiTokenService: ApiTokenService) {}
public async render({ auth, inertia }: HttpContext) {
const user = await auth.authenticate();
const tokens = await this.apiTokenService.getTokens(user);
return inertia.render('user_settings/show', {
user,
tokens: tokens.map((token) => {
return {
...token.toJSON(),
identifier: token.identifier,
};
}),
});
}
}

View File

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

View File

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

View File

@@ -5,7 +5,7 @@ const allyConfig = defineConfig({
google: services.google({
clientId: env.get('GOOGLE_CLIENT_ID'),
clientSecret: env.get('GOOGLE_CLIENT_SECRET'),
callbackUrl: env.get('GOOGLE_CLIENT_CALLBACK_URL'),
callbackUrl: env.get('APP_URL') + '/auth/callback',
prompt: 'select_account',
display: 'page',
scopes: ['userinfo.email', 'userinfo.profile'],

View File

@@ -1,7 +1,7 @@
import env from '#start/env';
import app from '@adonisjs/core/services/app';
import { Secret } from '@adonisjs/core/helpers';
import { defineConfig } from '@adonisjs/core/http';
import app from '@adonisjs/core/services/app';
/**
* The app key is used for encrypting cookies, generating signed URLs,
@@ -23,7 +23,7 @@ export const http = defineConfig({
* Enabling async local storage will let you access HTTP context
* from anywhere inside your application.
*/
useAsyncLocalStorage: false,
useAsyncLocalStorage: true,
/**
* Manage cookies configuration. The settings for the session id cookie are

View File

@@ -1,4 +1,5 @@
import { defineConfig } from '@adonisjs/auth';
import { tokensGuard, tokensUserProvider } from '@adonisjs/auth/access_tokens';
import { sessionGuard, sessionUserProvider } from '@adonisjs/auth/session';
import { Authenticators, InferAuthEvents } from '@adonisjs/auth/types';
@@ -11,6 +12,12 @@ const authConfig = defineConfig({
model: () => import('#user/models/user'),
}),
}),
api: tokensGuard({
provider: tokensUserProvider({
tokens: 'accessTokens',
model: () => import('#user/models/user'),
}),
}),
},
});

View File

@@ -1,4 +1,5 @@
import { isSSREnableForPage } from '#config/ssr';
import env from '#start/env';
import { DEFAULT_USER_THEME, KEY_USER_THEME } from '#user/constants/theme';
import logger from '@adonisjs/core/services/logger';
import { defineConfig } from '@adonisjs/inertia';
@@ -14,6 +15,7 @@ export default defineConfig({
*/
sharedData: {
errors: (ctx) => ctx.session?.flashMessages.get('errors'),
token: (ctx) => ctx.session?.flashMessages.get('token'),
user: (ctx) => ({
theme: ctx.session?.get(KEY_USER_THEME, DEFAULT_USER_THEME),
}),
@@ -24,6 +26,7 @@ export default defineConfig({
isAuthenticated: ctx.auth?.isAuthenticated || false,
};
},
appUrl: env.get('APP_URL'),
},
/**

View File

@@ -1,12 +1,13 @@
const PROJECT_NAME = 'MyLinks';
const PROJECT_DESCRIPTION =
'Another bookmark manager that lets you manage and share your favorite links in an intuitive interface';
const PROJECT_URL = 'https://www.mylinks.app';
const APP_COLOR = '#f0eef6';
export const PRIMARY_COLOR = '#3f88c5';
export default {
name: PROJECT_NAME,
description: PROJECT_DESCRIPTION,
url: PROJECT_URL,
color: APP_COLOR,
};
export const PROJECT_NAME = 'MyLinks';
export const PROJECT_DESCRIPTION =
'Another bookmark manager that lets you manage and share your favorite links in an intuitive interface';
export const PROJECT_URL = 'https://www.mylinks.app';
export const PROJECT_REPO_GITHUB_URL = 'https://github.com/my-links/my-links';
export const PROJECT_EXTENSION_URL =
'https://chromewebstore.google.com/detail/mylinks/agkmlplihacolkakgeccnbhphnepphma';
export const AUTHOR_NAME = 'Sonny';
export const AUTHOR_GITHUB_URL = 'https://github.com/Sonny93';
export const AUTHOR_WEBSITE_URL = 'https://www.sonny.dev/?utm_source=mylinks';

7
config/tuyau.ts Normal file
View File

@@ -0,0 +1,7 @@
import { defineConfig } from '@tuyau/core';
const tuyauConfig = defineConfig({
codegen: {},
});
export default tuyauConfig;

View File

@@ -0,0 +1,17 @@
import { BaseSchema } from '@adonisjs/lucid/schema';
export default class extends BaseSchema {
protected tableName = 'users';
async up() {
this.schema.alterTable(this.tableName, (table) => {
table.jsonb('display_preferences').defaultTo('{}');
});
}
async down() {
this.schema.alterTable(this.tableName, (table) => {
table.dropColumn('display_preferences');
});
}
}

View File

@@ -0,0 +1,31 @@
import { BaseSchema } from '@adonisjs/lucid/schema';
export default class CreateAuthAccessTokensTable extends BaseSchema {
protected tableName = 'auth_access_tokens';
async up() {
this.schema.createTable(this.tableName, (table) => {
table.increments('id');
table
.integer('tokenable_id')
.notNullable()
.unsigned()
.references('id')
.inTable('users')
.onDelete('CASCADE');
table.string('type').notNullable();
table.string('name').nullable();
table.string('hash').notNullable();
table.text('abilities').notNullable();
table.timestamp('created_at');
table.timestamp('updated_at');
table.timestamp('last_used_at').nullable();
table.timestamp('expires_at').nullable();
});
}
async down() {
this.schema.dropTable(this.tableName);
}
}

View File

@@ -4,6 +4,7 @@ import { isSSREnableForPage } from 'config-ssr';
import 'dayjs/locale/en';
import 'dayjs/locale/fr';
import { createRoot, hydrateRoot } from 'react-dom/client';
import DefaultLayout from '~/layouts/default_layout';
import '../i18n/index';
const appName = import.meta.env.VITE_APP_NAME || 'MyLinks';
@@ -13,11 +14,19 @@ createInertiaApp({
title: (title) => `${appName}${title && ` - ${title}`}`,
resolve: (name) => {
return resolvePageComponent(
resolve: async (name) => {
const currentPage: any = await resolvePageComponent(
`../pages/${name}.tsx`,
import.meta.glob('../pages/**/*.tsx')
);
if (currentPage?.default) {
currentPage.default.layout =
currentPage.default.layout ||
((p: any) => <DefaultLayout children={p} />);
}
return currentPage;
},
setup({ el, App, props }) {

View File

@@ -1,5 +1,6 @@
import { createInertiaApp } from '@inertiajs/react';
import ReactDOMServer from 'react-dom/server';
import DefaultLayout from '~/layouts/default_layout';
export default function render(page: any) {
return createInertiaApp({
@@ -7,7 +8,15 @@ export default function render(page: any) {
render: ReactDOMServer.renderToString,
resolve: (name) => {
const pages = import.meta.glob('../pages/**/*.tsx', { eager: true });
return pages[`../pages/${name}.tsx`];
let pageComponent: any = pages[`../pages/${name}.tsx`];
if (pageComponent?.default) {
pageComponent.default.layout =
pageComponent.default.layout ||
((pageChildren: any) => <DefaultLayout children={pageChildren} />);
}
return pageComponent;
},
setup: ({ App, props }) => <App {...props} />,
});

View File

@@ -0,0 +1,128 @@
import { usePage } from '@inertiajs/react';
import {
ActionIcon,
Button,
Card,
CopyButton,
Group,
Text,
} from '@mantine/core';
import { modals } from '@mantine/modals';
import { useTranslation } from 'react-i18next';
import { TbPlus, TbTrash } from 'react-icons/tb';
import { SimpleTable } from '~/components/common/simple_table/simple_table';
import { useApiTokens } from '~/hooks/use_api_tokens';
import { ApiToken } from '~/types/app';
import { CreateTokenModal } from './create_token_modal';
const useGetCreatedToken = () => {
const newlyCreatedToken = usePage<{
token?: ApiToken;
}>().props.token;
return newlyCreatedToken;
};
export function ApiTokens() {
const { t } = useTranslation();
const { tokens, createToken, revokeToken } = useApiTokens();
const newlyCreatedToken = useGetCreatedToken();
const handleCreateTokenModal = () => {
modals.open({
title: t('api-tokens.create-new'),
children: (
<CreateTokenModal
onCreate={(name) => createToken(name)}
onClose={() => modals.closeAll()}
/>
),
});
};
const handleRevokeToken = async (tokenId: number) => {
const token = tokens.find((t) => t.identifier === tokenId);
if (!token) return;
modals.openConfirmModal({
title: (
<>
{t('api-tokens.revoke')} "<strong>{token.name}</strong>"
</>
),
children: <Text size="sm">{t('api-tokens.confirm-revoke')}</Text>,
labels: {
confirm: t('api-tokens.revoke'),
cancel: t('cancel'),
},
confirmProps: { color: 'red' },
onConfirm: () => revokeToken(tokenId),
});
};
const generateTokenRow = (token: ApiToken) =>
newlyCreatedToken?.identifier === token.identifier && (
<>
<Text c="green" size="sm">
{t('api-tokens.new-token')}{' '}
{newlyCreatedToken.token && (
<CopyButton value={newlyCreatedToken.token}>
{({ copied, copy }) => (
<Button
color={copied ? 'teal' : 'blue'}
onClick={copy}
size="xs"
variant="light"
>
{copied ? t('copied') : t('copy')}
</Button>
)}
</CopyButton>
)}
</Text>
</>
);
const generateRow = (token: ApiToken) => ({
key: token.identifier.toString(),
name: token.name,
token: generateTokenRow(token) || undefined,
expiresAt: token.expiresAt,
lastUsedAt: token.lastUsedAt,
actions: [
<ActionIcon
color="red"
variant="subtle"
onClick={() => handleRevokeToken(token.identifier)}
>
<TbTrash size={16} />
</ActionIcon>,
],
});
const rows = tokens.map(generateRow);
return (
<Card withBorder>
<Group justify="space-between" mb="md">
<Text fw={500}>{t('api-tokens.title')}</Text>
<Button
leftSection={<TbPlus size={16} />}
onClick={handleCreateTokenModal}
size="sm"
variant="light"
>
{t('api-tokens.create')}
</Button>
</Group>
{tokens.length === 0 && (
<Text c="dimmed" ta="center" py="xl">
{t('api-tokens.no-tokens')}
</Text>
)}
{tokens.length > 0 && <SimpleTable data={rows} />}
</Card>
);
}

View File

@@ -0,0 +1,53 @@
import { Button, Group, Stack, Text, TextInput } from '@mantine/core';
import { useState } from 'react';
import { useTranslation } from 'react-i18next';
interface CreateTokenModalProps {
onCreate: (name: string) => Promise<void>;
onClose: () => void;
}
export function CreateTokenModal({ onCreate, onClose }: CreateTokenModalProps) {
const { t } = useTranslation();
const [tokenName, setTokenName] = useState('');
const [isLoading, setIsLoading] = useState(false);
const handleCreate = async () => {
if (!tokenName.trim()) return;
setIsLoading(true);
try {
await onCreate(tokenName);
onClose();
} finally {
setIsLoading(false);
}
};
return (
<Stack>
<Text size="sm" c="dimmed">
{t('api-tokens.create-description')}
</Text>
<TextInput
label={t('api-tokens.name')}
placeholder={t('api-tokens.name-placeholder')}
value={tokenName}
onChange={(e) => setTokenName(e.target.value)}
required
/>
<Group justify="flex-end">
<Button variant="subtle" onClick={onClose}>
{t('cancel')}
</Button>
<Button
onClick={handleCreate}
disabled={!tokenName.trim() || isLoading}
loading={isLoading}
>
{t('api-tokens.create')}
</Button>
</Group>
</Stack>
);
}

View File

@@ -0,0 +1,66 @@
import { Combobox, Input, InputBase, useCombobox } from '@mantine/core';
import { ComboListItem } from '~/components/common/combo_list/combo_list_item';
export type ValueWithIcon = {
label: string;
value: string;
icon: React.ReactNode;
};
export function ComboList({
selectedValue,
values,
setValue,
}: {
selectedValue: string;
values: ValueWithIcon[];
setValue: (value: string) => void;
}) {
const combobox = useCombobox({
onDropdownClose: () => combobox.resetSelectedOption(),
});
const selectedOption = values.find((item) => item.value === selectedValue);
const options = values.map((item) => (
<Combobox.Option value={item.value} key={item.value}>
<ComboListItem emoji={item.icon} label={item.label} />
</Combobox.Option>
));
return (
<Combobox
store={combobox}
withinPortal={false}
onOptionSubmit={(val) => {
setValue(val as string);
combobox.closeDropdown();
}}
>
<Combobox.Target>
<InputBase
component="button"
type="button"
pointer
rightSection={<Combobox.Chevron />}
onClick={() => combobox.toggleDropdown()}
rightSectionPointerEvents="none"
multiline
>
{selectedOption ? (
<ComboListItem
emoji={selectedOption.icon}
label={selectedOption.label}
/>
) : (
<Input.Placeholder>Pick value</Input.Placeholder>
)}
</InputBase>
</Combobox.Target>
<Combobox.Dropdown>
<Combobox.Options>{options}</Combobox.Options>
</Combobox.Dropdown>
</Combobox>
);
}

View File

@@ -0,0 +1,16 @@
import { Group, Text } from '@mantine/core';
export const ComboListItem = ({
emoji,
label,
}: {
emoji: React.ReactNode;
label: string;
}) => (
<Group gap="xs" align="center">
{emoji}
<Text fz="sm" fw={500}>
{label}
</Text>
</Group>
);

View File

@@ -0,0 +1,36 @@
.navbarWrapper {
z-index: 9;
}
.navbar {
height: rem(60);
background-color: color-mix(
in srgb,
var(--mantine-color-body) 50%,
transparent
);
padding-inline: var(--mantine-spacing-lg);
transition: transform 400ms ease;
backdrop-filter: blur(16px);
overflow: hidden;
position: sticky;
top: 0;
left: 0;
right: 0;
z-index: 9;
}
.navbar__content {
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
height: 100%;
max-width: 100%;
margin-inline: auto;
}
.navbar__content > div:last-child {
flex: 1;
justify-content: flex-end;
}

View File

@@ -0,0 +1,116 @@
import {
PROJECT_EXTENSION_URL,
PROJECT_NAME,
PROJECT_REPO_GITHUB_URL,
} from '#config/project';
import {
Box,
Burger,
Button,
Drawer,
Flex,
Group,
Image,
rem,
useMantineTheme,
} from '@mantine/core';
import { useDisclosure, useMediaQuery } from '@mantine/hooks';
import { useEffect } from 'react';
import { UserDropdown } from '~/components/common/floating_navbar/user_dropdown';
import { ExternalLinkUnstyled } from '~/components/common/links/external_link_unstyled';
import { InternalLink } from '~/components/common/links/internal_link';
import { LocaleSwitcher } from '~/components/common/locale_switcher';
import { ThemeSwitcher } from '~/components/common/theme_switcher';
import { useAuth } from '~/hooks/use_auth';
import classes from './floating_navbar.module.css';
interface FloatingNavbarProps {
width: string;
}
export function FloatingNavbar({ width }: FloatingNavbarProps) {
const auth = useAuth();
const theme = useMantineTheme();
const [opened, handler] = useDisclosure(false);
const isMobile = useMediaQuery(`(max-width: ${theme.breakpoints.sm})`, false);
useEffect(() => {
if (opened && !isMobile) {
handler.close();
}
}, [isMobile]);
const links = (
<>
{auth.isAuthenticated && (
<InternalLink route="dashboard" style={{ fontSize: rem(16) }}>
Dashboard
</InternalLink>
)}
<ExternalLinkUnstyled
href={PROJECT_REPO_GITHUB_URL}
style={{ fontSize: rem(16) }}
>
Github
</ExternalLinkUnstyled>
<ExternalLinkUnstyled
href={PROJECT_EXTENSION_URL}
style={{ fontSize: rem(16) }}
>
Extension
</ExternalLinkUnstyled>
</>
);
return (
<>
<Box className={classes.navbar}>
<Group className={classes.navbar__content} style={{ width }}>
<Group>
<InternalLink style={{ fontSize: rem(24) }} route="home">
<Image
src="/logo.png"
h={35}
alt="MyLinks's logo"
referrerPolicy="no-referrer"
/>
</InternalLink>
</Group>
<Group>
{!isMobile && <Group>{links}</Group>}
{auth.isAuthenticated && <UserDropdown />}
{isMobile && <Burger opened={opened} onClick={handler.toggle} />}
{!auth.isAuthenticated && (
<Button
variant="default"
component={ExternalLinkUnstyled}
newTab={false}
href="/auth/google"
>
Log in
</Button>
)}
</Group>
</Group>
{/* Mobile drawer */}
<Drawer
opened={opened}
onClose={handler.close}
padding="md"
title={PROJECT_NAME}
zIndex={999999}
onClick={handler.close}
>
<Flex direction="column" gap="md">
{links}
</Flex>
<Group mt="md">
<ThemeSwitcher />
<LocaleSwitcher />
</Group>
</Drawer>
</Box>
</>
);
}

View File

@@ -0,0 +1,20 @@
.user {
color: light-dark(var(--mantine-color-black), var(--mantine-color-dark-0));
padding: var(--mantine-spacing-xs) var(--mantine-spacing-sm) !important;
border-radius: var(--mantine-radius-sm);
transition: background-color 100ms ease;
&:hover {
background-color: light-dark(
var(--mantine-color-white),
var(--mantine-color-dark-8)
);
}
}
.userActive {
background-color: light-dark(
var(--mantine-color-white),
var(--mantine-color-dark-8)
);
}

View File

@@ -0,0 +1,79 @@
import { Avatar, Group, Menu, Text, UnstyledButton } from '@mantine/core';
import { useDisclosure } from '@mantine/hooks';
import cx from 'clsx';
import { useTranslation } from 'react-i18next';
import { TbChevronDown, TbLogout, TbSettings, TbShield } from 'react-icons/tb';
import { InternalLinkUnstyled } from '~/components/common/links/internal_link_unstyled';
import { useAuth } from '~/hooks/use_auth';
import classes from './user_dropdown.module.css';
export function UserDropdown() {
const auth = useAuth();
const [userMenuOpened, { open: openUserMenu, close: closeUserMenu }] =
useDisclosure(false);
const { t } = useTranslation();
return (
<Menu
width={260}
position="bottom-end"
transitionProps={{ transition: 'pop-top-right' }}
onClose={closeUserMenu}
onOpen={openUserMenu}
withinPortal
>
<Menu.Target>
<UnstyledButton
className={cx(classes.user, { [classes.userActive]: userMenuOpened })}
>
<Group gap={7}>
<Avatar
src={auth.user?.avatarUrl}
alt={auth.user?.fullname}
radius="xl"
size={20}
imageProps={{
referrerPolicy: 'no-referrer',
}}
/>
<Text fw={500} size="sm" lh={1} mr={3}>
{auth.user?.fullname}
</Text>
<TbChevronDown size={12} />
</Group>
</UnstyledButton>
</Menu.Target>
<Menu.Dropdown>
{auth.user?.isAdmin && (
<>
<Menu.Label>{t('common:admin')}</Menu.Label>
<Menu.Item
leftSection={<TbShield size={16} />}
component={InternalLinkUnstyled}
href="/admin"
color="red"
>
{t('common:manage-users')}
</Menu.Item>
</>
)}
<Menu.Label>{t('common:user')}</Menu.Label>
<Menu.Item
leftSection={<TbSettings size={16} />}
component={InternalLinkUnstyled}
href="/user/settings"
>
{t('common:settings')}
</Menu.Item>
<Menu.Item
leftSection={<TbLogout size={16} />}
component={InternalLinkUnstyled}
href="/auth/logout"
>
{t('common:logout')}
</Menu.Item>
</Menu.Dropdown>
</Menu>
);
}

View File

@@ -0,0 +1,36 @@
.list {
position: relative;
margin-bottom: var(--mantine-spacing-md);
}
.indicator {
z-index: -1 !important;
background-color: var(--mantine-color-white);
border-radius: var(--mantine-radius-md);
border: 1px solid var(--mantine-color-gray-2);
box-shadow: var(--mantine-shadow-sm);
@mixin dark {
background-color: var(--mantine-color-dark-6);
border-color: var(--mantine-color-dark-4);
}
}
.tab {
z-index: 1;
font-weight: 500;
transition: color 100ms ease;
color: var(--mantine-color-gray-7);
&[data-active] {
color: var(--mantine-color-black);
}
@mixin dark {
color: var(--mantine-color-dark-1);
&[data-active] {
color: var(--mantine-color-white);
}
}
}

View File

@@ -0,0 +1,79 @@
import {
FloatingIndicator,
Indicator,
Tabs as MantineTabs,
Stack,
} from '@mantine/core';
import { useState } from 'react';
import classes from './floating_tabs.module.css';
export type FloatingTab = {
value: string;
label: string;
content: React.ReactNode;
disabled?: boolean;
indicator?: {
content: string;
color?: string;
pulse?: boolean;
disabled?: boolean;
};
};
interface FloatingTabsProps {
tabs: FloatingTab[];
keepMounted?: boolean;
}
export function FloatingTabs({ tabs, keepMounted = false }: FloatingTabsProps) {
const [rootRef, setRootRef] = useState<HTMLDivElement | null>(null);
const [value, setValue] = useState<string | null>(tabs[0].value);
const [controlsRefs, setControlsRefs] = useState<
Record<string, HTMLButtonElement | null>
>({});
const setControlRef = (val: string) => (node: HTMLButtonElement) => {
controlsRefs[val] = node;
setControlsRefs(controlsRefs);
};
return (
<MantineTabs
variant="none"
value={value}
onChange={setValue}
keepMounted={keepMounted}
>
<MantineTabs.List ref={setRootRef} className={classes.list}>
{tabs.map((tab) => (
<Indicator
label={tab.indicator?.content}
color={tab.indicator?.color}
processing={tab.indicator?.pulse}
disabled={!tab.indicator || tab.indicator.disabled}
size={16}
key={tab.value}
>
<MantineTabs.Tab
value={tab.value}
ref={setControlRef(tab.value)}
className={classes.tab}
disabled={tab.disabled}
>
{tab.label}
</MantineTabs.Tab>
</Indicator>
))}
<FloatingIndicator
target={value ? controlsRefs[value] : null}
parent={rootRef}
className={classes.indicator}
/>
</MantineTabs.List>
{tabs.map((tab) => (
<MantineTabs.Panel key={tab.value} value={tab.value}>
<Stack>{tab.content}</Stack>
</MantineTabs.Panel>
))}
</MantineTabs>
);
}

View File

@@ -0,0 +1,23 @@
.footer {
background-color: color-mix(
in srgb,
var(--mantine-color-body) 50%,
transparent
);
padding: var(--mantine-spacing-sm) var(--mantine-spacing-lg);
}
.footer__content {
max-width: 100%;
gap: var(--mantine-spacing-xs);
margin-inline: auto;
}
.footer__content p {
font-size: var(--mantine-font-size-sm) !important;
color: var(--mantine-color-dimmed) !important;
}
.footer__content a {
font-size: var(--mantine-font-size-sm) !important;
}

View File

@@ -0,0 +1,38 @@
import { AUTHOR_GITHUB_URL, AUTHOR_NAME } from '#config/project';
import PATHS from '#core/constants/paths';
import { route } from '@izzyjs/route/client';
import { Anchor, Group, Text } from '@mantine/core';
import { withTranslation, WithTranslation } from 'react-i18next';
import ExternalLink from '~/components/common/external_link';
import { ExternalLinkStyled } from '~/components/common/links/external_link_styled';
import { InternalLink } from '~/components/common/links/internal_link';
import { LocaleSwitcher } from '~/components/common/locale_switcher';
import { ThemeSwitcher } from '~/components/common/theme_switcher';
import packageJson from '../../../../package.json';
import classes from './footer.module.css';
export const Footer = withTranslation()(({ t }: WithTranslation) => (
<Group className={classes.footer}>
<Group className={classes.footer__content}>
<Text>
{t('footer.made_by')}{' '}
<ExternalLinkStyled href={AUTHOR_GITHUB_URL}>
{AUTHOR_NAME}
</ExternalLinkStyled>
</Text>
<Group gap="sm">
<ThemeSwitcher />
<LocaleSwitcher />
</Group>
<Group gap="sm">
<Anchor size="sm" component={ExternalLink} href={PATHS.REPO_GITHUB}>
{packageJson.version}
</Anchor>
<InternalLink href={route('privacy').path}>{t('privacy')}</InternalLink>
<InternalLink href={route('terms').path}>{t('terms')}</InternalLink>
</Group>
</Group>
</Group>
));

View File

@@ -0,0 +1,28 @@
import { Anchor } from '@mantine/core';
import { AnchorHTMLAttributes, CSSProperties, ReactNode } from 'react';
interface ExternalLinkStyledProps
extends AnchorHTMLAttributes<HTMLAnchorElement> {
children: ReactNode;
style?: CSSProperties;
title?: string;
className?: string;
}
export const ExternalLinkStyled = ({
children,
title,
href,
...props
}: ExternalLinkStyledProps) => (
<Anchor<'a'>
component="a"
target="_blank"
rel="noreferrer"
title={title}
href={href}
{...props}
>
{children}
</Anchor>
);

View File

@@ -0,0 +1,26 @@
import { Anchor, CSSProperties } from '@mantine/core';
import { AnchorHTMLAttributes, ReactNode } from 'react';
interface ExternalLinkUnstyledProps
extends AnchorHTMLAttributes<HTMLAnchorElement> {
children: ReactNode;
style?: CSSProperties;
title?: string;
className?: string;
newTab?: boolean;
}
export const ExternalLinkUnstyled = ({
children,
newTab = true,
...props
}: ExternalLinkUnstyledProps) => (
<Anchor
component="a"
target={newTab ? '_blank' : undefined}
rel="noreferrer"
{...props}
style={{ ...props.style, textDecoration: 'none' }}
>
{children}
</Anchor>
);

View File

@@ -0,0 +1,50 @@
import { ApiRouteName } from '#shared/types/index';
import { Link } from '@inertiajs/react';
import { Anchor } from '@mantine/core';
import { useTuyau } from '@tuyau/inertia/react';
import { CSSProperties } from 'react';
interface InternalLinkProps {
children: React.ReactNode;
onClick?: (event: React.MouseEvent<any>) => void;
route?: ApiRouteName;
href?: string;
forceRefresh?: boolean;
style?: CSSProperties;
className?: string;
params?: Record<string, string>;
}
export const InternalLink = ({
children,
onClick,
route,
href,
forceRefresh,
style,
className,
params,
}: InternalLinkProps) => {
const tuyau = useTuyau();
if ((!route && !href) || !tuyau) {
throw new Error('InternalLink: route, href or tuyau is missing');
}
const url = route ? tuyau.$route(route, params).path : href;
if (!url) {
throw new Error('InternalLink: url not found');
}
return (
<Anchor<'a' | typeof Link>
component={forceRefresh ? 'a' : Link}
href={url}
style={style}
onClick={onClick}
className={className}
>
{children}
</Anchor>
);
};

View File

@@ -0,0 +1,61 @@
import { ApiRouteName } from '#shared/types/index';
import { Link } from '@inertiajs/react';
import { useTuyau } from '@tuyau/inertia/react';
import { CSSProperties } from 'react';
interface InternalLinkProps {
children: React.ReactNode;
onClick?: (event: React.MouseEvent<any>) => void;
route?: ApiRouteName;
href?: string;
forceRefresh?: boolean;
style?: CSSProperties;
className?: string;
params?: Record<string, string>;
}
export const InternalLinkUnstyled = ({
children,
onClick,
route,
href,
forceRefresh,
style,
className,
params,
}: InternalLinkProps) => {
const tuyau = useTuyau();
if ((!route && !href) || !tuyau) {
throw new Error('InternalLink: route, href or tuyau is missing');
}
const url = route ? tuyau.$route(route, params).path : href;
if (!url) {
throw new Error('InternalLink: url not found');
}
if (forceRefresh) {
return (
<a
href={url}
style={{ ...style, textDecoration: 'none' }}
onClick={onClick}
className={className}
>
{children}
</a>
);
}
return (
<Link
href={url}
style={{ ...style, textDecoration: 'none' }}
onClick={onClick}
className={className}
>
{children}
</Link>
);
};

View File

@@ -2,7 +2,7 @@ import { ActionIcon, Image } from '@mantine/core';
import { useTranslation } from 'react-i18next';
import { LS_LANG_KEY } from '~/constants';
export function MantineLanguageSwitcher() {
export function LocaleSwitcher() {
const { i18n } = useTranslation();
const newLanguage = i18n.language === 'en' ? 'fr' : 'en';
return (

View File

@@ -0,0 +1,20 @@
.header {
position: sticky;
top: 0;
background-color: var(--mantine-color-body);
transition: box-shadow 150ms ease;
&::after {
content: '';
position: absolute;
left: 0;
right: 0;
bottom: 0;
border-bottom: 1px solid
light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-3));
}
}
.scrolled {
box-shadow: var(--mantine-shadow-sm);
}

View File

@@ -0,0 +1,56 @@
import { ScrollArea, Table, Text } from '@mantine/core';
import cx from 'clsx';
import { useState } from 'react';
import classes from './simple_table.module.css';
export type SimpleTableData = {
key: string;
[key: string]: string | React.ReactNode | undefined;
actions?: React.ReactNode[];
};
interface SimpleTableProps {
data: SimpleTableData[];
}
export function SimpleTable({ data }: SimpleTableProps) {
const [scrolled, setScrolled] = useState(false);
const columns = data.length > 0 ? Object.keys(data[0]) : [];
const rows = data.map((row) => {
return (
<Table.Tr key={row.key}>
{columns.map((column) => (
<Table.Td key={column}>
{row[column] ?? (
<Text c="dimmed" size="sm">
N/A
</Text>
)}
</Table.Td>
))}
</Table.Tr>
);
});
return (
<ScrollArea
h={300}
onScrollPositionChange={({ y }) => setScrolled(y !== 0)}
>
<Table miw={700}>
<Table.Thead
className={cx(classes.header, { [classes.scrolled]: scrolled })}
>
<Table.Tr>
{columns.map((column) => (
<Table.Th key={column}>{column}</Table.Th>
))}
</Table.Tr>
</Table.Thead>
<Table.Tbody>{rows}</Table.Tbody>
</Table>
</ScrollArea>
);
}

View File

@@ -2,7 +2,7 @@ import { ActionIcon, useMantineColorScheme } from '@mantine/core';
import { TbMoonStars, TbSun } from 'react-icons/tb';
import { makeRequest } from '~/lib/request';
export function MantineThemeSwitcher() {
export function ThemeSwitcher() {
const { colorScheme, toggleColorScheme } = useMantineColorScheme();
const handleThemeChange = () => {
toggleColorScheme();

View File

@@ -3,7 +3,7 @@ import { Avatar, Group, Menu, Text, UnstyledButton } from '@mantine/core';
import { forwardRef } from 'react';
import { useTranslation } from 'react-i18next';
import { TbChevronRight } from 'react-icons/tb';
import useUser from '~/hooks/use_user';
import { useAuth } from '~/hooks/use_auth';
interface UserButtonProps extends React.ComponentPropsWithoutRef<'button'> {
image: string;
@@ -45,9 +45,9 @@ const UserButton = forwardRef<HTMLButtonElement, UserButtonProps>(
)
);
export function MantineUserCard() {
export function UserCard() {
const { t } = useTranslation('common');
const { user, isAuthenticated } = useUser();
const { user, isAuthenticated } = useAuth();
return (
isAuthenticated && (
<Menu withArrow>

View File

@@ -0,0 +1,30 @@
import { Fieldset, Stack, Text } from '@mantine/core';
import { useTranslation } from 'react-i18next';
import { CollectionListSelector } from '~/components/dashboard/collection/collection_list_selector';
import { LinkListSelector } from '~/components/dashboard/link/link_list_selector';
import { useIsMobile } from '~/hooks/use_is_mobile';
export function UserPreferences() {
const { t } = useTranslation();
const isMobile = useIsMobile();
return (
<Fieldset legend={t('preferences')}>
{isMobile && (
<Text size="xs" c="orange" mb="sm">
{t('preferences-description')}
</Text>
)}
<Stack>
<Text size="sm" c="dimmed">
{t('display-preferences.collection-list-display')}
</Text>
<CollectionListSelector />
<Text size="sm" c="dimmed">
{t('display-preferences.link-list-display')}
</Text>
<LinkListSelector />
</Stack>
</Fieldset>
);
}

View File

@@ -0,0 +1,29 @@
import { ScrollArea, Stack, Text } from '@mantine/core';
import { useTranslation } from 'react-i18next';
import { CollectionFavoriteItem } from '~/components/dashboard/collection/item/collection_favorite_item';
import { CollectionItem } from '~/components/dashboard/collection/item/collection_item';
import { useCollections } from '~/hooks/collections/use_collections';
import { useIsMobile } from '~/hooks/use_is_mobile';
import styles from './list/collection_list.module.css';
export function CollectionList() {
const { t } = useTranslation();
const collections = useCollections();
const isMobile = useIsMobile();
return (
<Stack gap="xs" h="100%" w={isMobile ? '100%' : '350px'}>
<div style={{ display: 'flex', flexDirection: 'column' }}>
<Text c="dimmed" ml="md" mb="sm">
{t('collection.collections')} {collections.length}
</Text>
<ScrollArea className={styles.collectionList}>
<CollectionFavoriteItem />
{collections.map((collection) => (
<CollectionItem collection={collection} />
))}
</ScrollArea>
</div>
</Stack>
);
}

View File

@@ -0,0 +1,28 @@
import { COLLECTION_LIST_DISPLAYS } from '#shared/lib/display_preferences';
import { CollectionListDisplay } from '#shared/types/index';
import { SegmentedControl } from '@mantine/core';
import { useTranslation } from 'react-i18next';
import { useDisplayPreferences } from '~/hooks/use_display_preferences';
export function CollectionListSelector() {
const { t } = useTranslation();
const { displayPreferences, handleUpdateDisplayPreferences } =
useDisplayPreferences();
const data = COLLECTION_LIST_DISPLAYS.map((display) => ({
label: t(`display-preferences.${display}`),
value: display,
}));
return (
<SegmentedControl
data={data}
value={displayPreferences.collectionListDisplay}
onChange={(value) =>
handleUpdateDisplayPreferences({
collectionListDisplay: value as CollectionListDisplay,
})
}
w="50%"
/>
);
}

View File

@@ -0,0 +1,58 @@
import { router } from '@inertiajs/react';
import { route } from '@izzyjs/route/client';
import { Chip, Group, Text } from '@mantine/core';
import { useTranslation } from 'react-i18next';
import { useActiveCollection } from '~/hooks/collections/use_active_collection';
import { useCollections } from '~/hooks/collections/use_collections';
import { appendCollectionId } from '~/lib/navigation';
export function InlineCollectionList() {
const { t } = useTranslation();
const collections = useCollections();
const activeCollection = useActiveCollection();
const handleCollectionChange = (value?: string) => {
if (value) {
router.visit(appendCollectionId(route('dashboard').path, Number(value)));
return;
}
router.visit(route('dashboard').path);
};
const fields = [
{
label: t('common:favorite'),
value: 'favorite',
},
...collections.map((c) => ({
label: (
<Group gap="xs" wrap="nowrap">
<>{c.name}</>
<Text size="xs" c="dimmed">
{c.links.length}
</Text>
</Group>
),
value: c.id.toString(),
})),
];
return (
<Group gap="xs" w="100%">
{fields.map((field) => (
<Chip
key={field.value}
checked={
activeCollection?.id
? activeCollection.id === Number(field.value)
: field.value === 'favorite'
}
variant="light"
onClick={() => handleCollectionChange(field.value)}
>
{field.label}
</Chip>
))}
</Group>
);
}

Some files were not shown because too many files have changed in this diff Show More