Compare commits
14 Commits
c46cc1a8fb
...
3.1.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7fefabd9bf | ||
|
|
6e2d3d8c7a | ||
|
|
99759a85d1 | ||
|
|
3d88bcaa48 | ||
|
|
15e580942c | ||
|
|
8efa281a48 | ||
|
|
2dd96ff647 | ||
|
|
c54c1cc3da | ||
|
|
af08964fcc | ||
|
|
151ac0602a | ||
|
|
fb0345bf68 | ||
|
|
e28d5ebea8 | ||
|
|
e2494e8cf0 | ||
|
|
0d87a3f4bc |
@@ -13,7 +13,7 @@ storage
|
||||
|
||||
# Additional good to have ignores for dockerignore
|
||||
Dockerfile*
|
||||
docker-compose*
|
||||
compose*
|
||||
.dockerignore
|
||||
*.md
|
||||
.git
|
||||
|
||||
@@ -10,12 +10,5 @@ charset = utf-8
|
||||
trim_trailing_whitespace = true
|
||||
insert_final_newline = true
|
||||
|
||||
[*.json]
|
||||
insert_final_newline = unset
|
||||
|
||||
[**.min.js]
|
||||
indent_style = unset
|
||||
insert_final_newline = unset
|
||||
|
||||
[*.md]
|
||||
trim_trailing_whitespace = false
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
{
|
||||
"hooks": {
|
||||
"before:init": [
|
||||
"pnpm format",
|
||||
"pnpm lint"
|
||||
]
|
||||
"before:init": ["pnpm lint", "pnpm run typecheck"]
|
||||
},
|
||||
"git": {
|
||||
"commitMessage": "chore: release v${version}",
|
||||
@@ -17,4 +14,4 @@
|
||||
"npm": {
|
||||
"publish": false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
3
.vscode/extensions.json
vendored
@@ -1,3 +0,0 @@
|
||||
{
|
||||
"recommendations": ["vunguyentuan.vscode-css-variables"]
|
||||
}
|
||||
4
.vscode/settings.json
vendored
@@ -7,7 +7,7 @@
|
||||
"explorer.fileNesting.enabled": true,
|
||||
"explorer.fileNesting.patterns": {
|
||||
"*.js": "${capture}.js.map, ${capture}.min.js, ${capture}.d.ts",
|
||||
"package.json": "pnpm-lock.yaml, tsconfig.json, eslint.config.js, .babelrc, vite.config.ts, .editorconfig",
|
||||
"package.json": "pnpm-lock.yaml, pnpm-workspace.yaml, tsconfig.json, eslint.config.js, .babelrc, vite.config.ts, .editorconfig",
|
||||
"Makefile": "*compose.yml, Dockerfile, servers_pgadmin.json, .dockerignore"
|
||||
},
|
||||
"cssVariables.lookupFiles": [
|
||||
@@ -17,4 +17,4 @@
|
||||
"**/*.less",
|
||||
"node_modules/@mantine/core/styles.css"
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
# Source : https://github.com/adonisjs-community/adonis-packages/blob/main/Dockerfile
|
||||
|
||||
FROM node:22.11-alpine3.20 AS base
|
||||
FROM node:24.1-alpine3.20 AS base
|
||||
|
||||
RUN apk --no-cache add curl
|
||||
RUN corepack enable
|
||||
|
||||
@@ -11,6 +11,7 @@
|
||||
</div>
|
||||
|
||||
## Table of Contents
|
||||
|
||||
- [Main Features](#main-features)
|
||||
- [Getting Started](#getting-started)
|
||||
- [Setup](#setup)
|
||||
@@ -24,7 +25,7 @@
|
||||
- [Contributing](#contributing)
|
||||
- [License](#license)
|
||||
|
||||
## Main Features
|
||||
## Main Features
|
||||
|
||||
- **Organize bookmarks with collections**: Keep your links tidy and easily accessible by grouping them into customizable collections.
|
||||
- **Intuitive link management**: Add, edit, and manage your bookmarks effortlessly with a user-friendly interface.
|
||||
@@ -124,6 +125,7 @@ ssh-copy-id -i ./id_rsa.pub user@host
|
||||
> Source: https://github.com/appleboy/ssh-action#setting-up-a-ssh-key
|
||||
|
||||
## Contributing
|
||||
|
||||
We welcome contributions! Please visit our Trello board for project management and roadmap details. You can contribute by:
|
||||
|
||||
- Creating issues for bugs, features, or discussions.
|
||||
@@ -133,4 +135,4 @@ For detailed contribution guidelines, refer to the CONTRIBUTING.md file.
|
||||
|
||||
## License
|
||||
|
||||
This project is licensed under the [GPLv3 License](./LICENCE).
|
||||
This project is licensed under the [GPLv3 License](./LICENCE).
|
||||
|
||||
@@ -15,9 +15,6 @@ export default class Collection extends AppBaseModel {
|
||||
@column()
|
||||
declare visibility: Visibility;
|
||||
|
||||
@column()
|
||||
declare nextId: number;
|
||||
|
||||
@column()
|
||||
declare authorId: number;
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@ export const createCollectionValidator = vine.compile(
|
||||
name: vine.string().trim().minLength(1).maxLength(254),
|
||||
description: vine.string().trim().maxLength(254).nullable(),
|
||||
visibility: vine.enum(Visibility),
|
||||
nextId: vine.number().optional(),
|
||||
})
|
||||
);
|
||||
|
||||
|
||||
@@ -7,7 +7,6 @@ export const updateCollectionValidator = vine.compile(
|
||||
name: vine.string().trim().minLength(1).maxLength(254),
|
||||
description: vine.string().trim().maxLength(254).nullable(),
|
||||
visibility: vine.enum(Visibility),
|
||||
nextId: vine.number().optional(),
|
||||
|
||||
params,
|
||||
})
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
const PATHS = {
|
||||
AUTHOR: 'https://www.sonny.dev/?utm_source=mylinks',
|
||||
REPO_GITHUB: 'https://github.com/Sonny93/my-links',
|
||||
REPO_GITHUB: 'https://github.com/my-links/my-links',
|
||||
EXTENSION:
|
||||
'https://chromewebstore.google.com/detail/mylinks/agkmlplihacolkakgeccnbhphnepphma',
|
||||
} as const;
|
||||
|
||||
18
app/core/middlewares/service_worker_scope_extender.ts
Normal file
@@ -0,0 +1,18 @@
|
||||
import { HttpContext } from '@adonisjs/core/http';
|
||||
|
||||
const HEADER_NAME = 'Service-Worker-Allowed';
|
||||
|
||||
export default class ServiceWorkerScopeExtender {
|
||||
async handle(
|
||||
{ request, response, logger }: HttpContext,
|
||||
next: () => Promise<void>
|
||||
) {
|
||||
if (request.url().startsWith('/assets/sw.js')) {
|
||||
response.header(HEADER_NAME, '/');
|
||||
logger.debug(
|
||||
`Header ${HEADER_NAME} for ${request.url()} set to ${response.getHeader(HEADER_NAME)}`
|
||||
);
|
||||
}
|
||||
await next();
|
||||
}
|
||||
}
|
||||
43
compose.yml
@@ -15,33 +15,6 @@ services:
|
||||
ports:
|
||||
- '${DB_PORT}:5432'
|
||||
|
||||
pgadmin:
|
||||
container_name: pgadmin
|
||||
image: dpage/pgadmin4:8
|
||||
restart: always
|
||||
entrypoint: /bin/sh -c "chmod 0600 /pgpass; /entrypoint.sh;"
|
||||
healthcheck:
|
||||
test: ['CMD', 'wget', '-O', '-', 'http://localhost:80/misc/ping']
|
||||
interval: 2s
|
||||
timeout: 10s
|
||||
retries: 30
|
||||
env_file: .env
|
||||
environment:
|
||||
- PGADMIN_DEFAULT_EMAIL=myemail@gmail.com
|
||||
- PGADMIN_DEFAULT_PASSWORD=a12345678
|
||||
- PGADMIN_CONFIG_SERVER_MODE=False
|
||||
- PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False
|
||||
depends_on:
|
||||
- postgres
|
||||
ports:
|
||||
- '5050:80'
|
||||
user: root
|
||||
configs:
|
||||
- source: servers.json
|
||||
target: /pgadmin4/servers.json
|
||||
- source: pgpass
|
||||
target: /pgpass
|
||||
|
||||
my-links:
|
||||
container_name: my-links
|
||||
restart: always
|
||||
@@ -61,19 +34,3 @@ services:
|
||||
|
||||
volumes:
|
||||
postgres-volume:
|
||||
|
||||
configs:
|
||||
pgpass:
|
||||
content: postgres:${DB_PORT}:*:${DB_USER}:${DB_PASSWORD}
|
||||
servers.json:
|
||||
content: |
|
||||
{"Servers": {"1": {
|
||||
"Group": "Servers",
|
||||
"Name": "project",
|
||||
"Host": "postgres",
|
||||
"Port": ${DB_PORT},
|
||||
"MaintenanceDB": "${DB_DATABASE}",
|
||||
"Username": "${DB_USER}",
|
||||
"PassFile": "/pgpass",
|
||||
"SSLMode": "prefer"
|
||||
}}}
|
||||
|
||||
12
config/project.ts
Normal file
@@ -0,0 +1,12 @@
|
||||
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 default {
|
||||
name: PROJECT_NAME,
|
||||
description: PROJECT_DESCRIPTION,
|
||||
url: PROJECT_URL,
|
||||
color: APP_COLOR,
|
||||
};
|
||||
@@ -0,0 +1,21 @@
|
||||
import { BaseSchema } from '@adonisjs/lucid/schema';
|
||||
|
||||
export default class extends BaseSchema {
|
||||
protected tableName = 'collections';
|
||||
|
||||
async up() {
|
||||
this.schema.alterTable('collections', (table) => {
|
||||
table.dropColumn('next_id');
|
||||
});
|
||||
}
|
||||
|
||||
async down() {
|
||||
this.schema.alterTable('collections', (table) => {
|
||||
table
|
||||
.integer('next_id')
|
||||
.references('id')
|
||||
.inTable('collections')
|
||||
.defaultTo(null);
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -34,7 +34,6 @@ function createRandomCollection(userIds: User['id'][]) {
|
||||
name: faker.string.alphanumeric({ length: { min: 5, max: 25 } }),
|
||||
description: faker.string.alphanumeric({ length: { min: 0, max: 254 } }),
|
||||
visibility: Visibility.PRIVATE,
|
||||
nextId: collectionId + 1,
|
||||
authorId,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -15,48 +15,5 @@ services:
|
||||
ports:
|
||||
- "${DB_PORT}:5432"
|
||||
|
||||
pgadmin:
|
||||
container_name: pgadmin
|
||||
image: dpage/pgadmin4:8
|
||||
restart: always
|
||||
entrypoint: /bin/sh -c "chmod 0600 /pgpass; /entrypoint.sh;"
|
||||
healthcheck:
|
||||
test: ["CMD", "wget", "-O", "-", "http://localhost:80/misc/ping"]
|
||||
interval: 2s
|
||||
timeout: 10s
|
||||
retries: 30
|
||||
env_file: .env
|
||||
environment:
|
||||
- PGADMIN_DEFAULT_EMAIL=myemail@gmail.com
|
||||
- PGADMIN_DEFAULT_PASSWORD=a12345678
|
||||
- PGADMIN_CONFIG_SERVER_MODE=False
|
||||
- PGADMIN_CONFIG_MASTER_PASSWORD_REQUIRED=False
|
||||
depends_on:
|
||||
- postgres
|
||||
ports:
|
||||
- "5050:80"
|
||||
user: root
|
||||
configs:
|
||||
- source: servers.json
|
||||
target: /pgadmin4/servers.json
|
||||
- source: pgpass
|
||||
target: /pgpass
|
||||
|
||||
volumes:
|
||||
postgres-volume:
|
||||
|
||||
configs:
|
||||
pgpass:
|
||||
content: postgres:${DB_PORT}:*:${DB_USER}:${DB_PASSWORD}
|
||||
servers.json:
|
||||
content: |
|
||||
{"Servers": {"1": {
|
||||
"Group": "Servers",
|
||||
"Name": "project",
|
||||
"Host": "postgres",
|
||||
"Port": ${DB_PORT},
|
||||
"MaintenanceDB": "${DB_DATABASE}",
|
||||
"Username": "${DB_USER}",
|
||||
"PassFile": "/pgpass",
|
||||
"SSLMode": "prefer"
|
||||
}}}
|
||||
|
||||
|
Before Width: | Height: | Size: 957 B After Width: | Height: | Size: 957 B |
|
Before Width: | Height: | Size: 9.0 KiB After Width: | Height: | Size: 9.0 KiB |
@@ -1,4 +1,7 @@
|
||||
import { configApp } from '@adonisjs/eslint-config';
|
||||
export default configApp({
|
||||
files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
|
||||
rules: {
|
||||
'unicorn/filename-case': 'off',
|
||||
},
|
||||
});
|
||||
|
||||
@@ -3,13 +3,12 @@ import { FormEvent } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import BackToDashboard from '~/components/common/navigation/back_to_dashboard';
|
||||
import { FormLayout, FormLayoutProps } from '~/layouts/form_layout';
|
||||
import { Collection, Visibility } from '~/types/app';
|
||||
import { Visibility } from '~/types/app';
|
||||
|
||||
export type FormCollectionData = {
|
||||
name: string;
|
||||
description: string | null;
|
||||
visibility: Visibility;
|
||||
nextId?: Collection['id'];
|
||||
};
|
||||
|
||||
interface FormCollectionProps extends FormLayoutProps {
|
||||
|
||||
@@ -31,7 +31,7 @@ export default function Navbar() {
|
||||
<header className={classes.header}>
|
||||
<Group justify="space-between" h="100%">
|
||||
<Link href="/">
|
||||
<Image src="/logo-light.png" h={35} alt="MyLinks's logo" />
|
||||
<Image src="/logo.png" h={35} alt="MyLinks's logo" />
|
||||
</Link>
|
||||
|
||||
<Group h="100%" gap={0} visibleFrom="sm">
|
||||
|
||||
@@ -18,7 +18,6 @@ export default function EditCollectionPage({
|
||||
name: collection.name,
|
||||
description: collection.description,
|
||||
visibility: collection.visibility,
|
||||
nextId: collection.nextId,
|
||||
});
|
||||
const canSubmit = useMemo<boolean>(() => {
|
||||
const trimmedName = data.name.trim();
|
||||
|
||||
@@ -74,6 +74,7 @@ export const useFavorites = () =>
|
||||
);
|
||||
|
||||
export function useCollectionsSetter() {
|
||||
// eslint-disable-next-line @typescript-eslint/naming-convention
|
||||
const { _setCollections, setActiveCollection } = useCollectionStore();
|
||||
return { _setCollections, setActiveCollection };
|
||||
}
|
||||
|
||||
@@ -49,7 +49,6 @@ export type Collection = CommonBase & {
|
||||
name: string;
|
||||
description: string | null;
|
||||
visibility: Visibility;
|
||||
nextId: number;
|
||||
authorId: number;
|
||||
};
|
||||
|
||||
|
||||
119
package.json
@@ -1,18 +1,20 @@
|
||||
{
|
||||
"name": "my-links",
|
||||
"version": "3.0.3",
|
||||
"version": "3.1.2",
|
||||
"type": "module",
|
||||
"license": "GPL-3.0-only",
|
||||
"scripts": {
|
||||
"start": "node bin/server.js",
|
||||
"build": "node ace build",
|
||||
"dev": "node ace serve --watch",
|
||||
"dev": "node ace serve --hmr",
|
||||
"test": "node ace test",
|
||||
"lint": "eslint . --report-unused-disable-directives --max-warnings 0",
|
||||
"format": "prettier --write --parser typescript '**/*.{ts,tsx}'",
|
||||
"typecheck": "tsc --noEmit",
|
||||
"check": "pnpm run lint && pnpm run typecheck",
|
||||
"prepare": "husky",
|
||||
"release": "release-it"
|
||||
"release": "release-it",
|
||||
"generate-icons": "pwa-assets-generator"
|
||||
},
|
||||
"imports": {
|
||||
"#admin/*": "./app/admin/*.js",
|
||||
@@ -34,66 +36,68 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@adonisjs/assembler": "^7.8.2",
|
||||
"@adonisjs/eslint-config": "2.0.0-beta.6",
|
||||
"@adonisjs/prettier-config": "^1.4.0",
|
||||
"@adonisjs/tsconfig": "^1.4.0",
|
||||
"@faker-js/faker": "^9.2.0",
|
||||
"@japa/assert": "^3.0.0",
|
||||
"@japa/plugin-adonisjs": "^3.0.1",
|
||||
"@japa/runner": "^3.1.4",
|
||||
"@swc/core": "^1.9.1",
|
||||
"@types/luxon": "^3.4.2",
|
||||
"@types/node": "^20.14.10",
|
||||
"@types/react": "^18.3.12",
|
||||
"@types/react-dom": "^18.3.1",
|
||||
"@typescript-eslint/eslint-plugin": "^8.13.0",
|
||||
"@vitejs/plugin-react": "^4.3.3",
|
||||
"eslint": "^9.14.0",
|
||||
"hot-hook": "^0.3.1",
|
||||
"husky": "^9.1.6",
|
||||
"lint-staged": "^15.2.10",
|
||||
"pino-pretty": "^12.1.0",
|
||||
"postcss": "^8.4.47",
|
||||
"postcss-preset-mantine": "^1.17.0",
|
||||
"@adonisjs/eslint-config": "2.1.0",
|
||||
"@adonisjs/prettier-config": "^1.4.5",
|
||||
"@adonisjs/tsconfig": "^1.4.1",
|
||||
"@faker-js/faker": "^9.9.0",
|
||||
"@japa/assert": "^4.0.1",
|
||||
"@japa/plugin-adonisjs": "^4.0.0",
|
||||
"@japa/runner": "^4.2.0",
|
||||
"@swc/core": "^1.12.9",
|
||||
"@types/luxon": "^3.6.2",
|
||||
"@types/node": "^24.0.10",
|
||||
"@types/react": "^19.1.8",
|
||||
"@types/react-dom": "^19.1.6",
|
||||
"@typescript-eslint/eslint-plugin": "^8.35.1",
|
||||
"@vite-pwa/assets-generator": "^1.0.0",
|
||||
"eslint": "^9.30.1",
|
||||
"hot-hook": "^0.4.0",
|
||||
"husky": "^9.1.7",
|
||||
"lint-staged": "^16.1.2",
|
||||
"pino-pretty": "^13.0.0",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss-preset-mantine": "^1.18.0",
|
||||
"postcss-simple-vars": "^7.0.1",
|
||||
"prettier": "^3.3.3",
|
||||
"release-it": "^17.10.0",
|
||||
"ts-node-maintained": "^10.9.4",
|
||||
"typescript": "~5.6.3",
|
||||
"vite": "^5.4.10"
|
||||
"prettier": "^3.6.2",
|
||||
"release-it": "^19.0.3",
|
||||
"ts-node-maintained": "^10.9.5",
|
||||
"typescript": "~5.8.3",
|
||||
"vite": "^7.0.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"@adonisjs/ally": "^5.0.2",
|
||||
"@adonisjs/auth": "^9.2.4",
|
||||
"@adonisjs/core": "^6.14.1",
|
||||
"@adonisjs/ally": "^5.1.0",
|
||||
"@adonisjs/auth": "^9.4.0",
|
||||
"@adonisjs/core": "^6.19.0",
|
||||
"@adonisjs/cors": "^2.2.1",
|
||||
"@adonisjs/inertia": "^1.2.3",
|
||||
"@adonisjs/lucid": "^21.3.0",
|
||||
"@adonisjs/session": "^7.5.0",
|
||||
"@adonisjs/shield": "^8.1.1",
|
||||
"@adonisjs/inertia": "^3.1.1",
|
||||
"@adonisjs/lucid": "^21.7.0",
|
||||
"@adonisjs/session": "^7.5.1",
|
||||
"@adonisjs/shield": "^8.2.0",
|
||||
"@adonisjs/static": "^1.1.1",
|
||||
"@adonisjs/vite": "^3.0.0",
|
||||
"@inertiajs/react": "^1.2.0",
|
||||
"@adonisjs/vite": "^4.0.0",
|
||||
"@inertiajs/react": "^2.0.14",
|
||||
"@izzyjs/route": "^1.2.0",
|
||||
"@mantine/core": "^7.13.5",
|
||||
"@mantine/hooks": "^7.13.5",
|
||||
"@mantine/spotlight": "^7.13.5",
|
||||
"@vinejs/vine": "^2.1.0",
|
||||
"bentocache": "^1.0.0-beta.9",
|
||||
"@mantine/core": "^8.1.2",
|
||||
"@mantine/hooks": "^8.1.2",
|
||||
"@mantine/spotlight": "^8.1.2",
|
||||
"@vinejs/vine": "^3.0.1",
|
||||
"@vitejs/plugin-react-oxc": "^0.2.3",
|
||||
"bentocache": "^1.4.0",
|
||||
"dayjs": "^1.11.13",
|
||||
"edge.js": "^6.2.0",
|
||||
"i18next": "^23.16.5",
|
||||
"edge.js": "^6.2.1",
|
||||
"i18next": "^25.3.1",
|
||||
"knex": "^3.1.0",
|
||||
"luxon": "^3.5.0",
|
||||
"node-html-parser": "^6.1.13",
|
||||
"pg": "^8.13.1",
|
||||
"react": "^18.3.1",
|
||||
"react-dom": "^18.3.1",
|
||||
"react-hotkeys-hook": "^4.6.1",
|
||||
"react-i18next": "^15.1.1",
|
||||
"react-icons": "^5.3.0",
|
||||
"luxon": "^3.6.1",
|
||||
"node-html-parser": "^7.0.1",
|
||||
"pg": "^8.16.3",
|
||||
"react": "^19.1.0",
|
||||
"react-dom": "^19.1.0",
|
||||
"react-hotkeys-hook": "^5.1.0",
|
||||
"react-i18next": "^15.6.0",
|
||||
"react-icons": "^5.5.0",
|
||||
"reflect-metadata": "^0.2.2",
|
||||
"zustand": "^5.0.1"
|
||||
"vite-plugin-pwa": "^1.0.1",
|
||||
"zustand": "^5.0.6"
|
||||
},
|
||||
"hotHook": {
|
||||
"boundaries": [
|
||||
@@ -115,6 +119,11 @@
|
||||
"*.js,*.ts,*.jsx,*.tsx": "eslint --cache --fix"
|
||||
},
|
||||
"volta": {
|
||||
"node": "22.11.0"
|
||||
"node": "24.1.0"
|
||||
},
|
||||
"pnpm": {
|
||||
"overrides": {
|
||||
"vite": "npm:rolldown-vite@latest"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
8852
pnpm-lock.yaml
generated
4
pnpm-workspace.yaml
Normal file
@@ -0,0 +1,4 @@
|
||||
onlyBuiltDependencies:
|
||||
- '@swc/core'
|
||||
- esbuild
|
||||
- sharp
|
||||
BIN
public/apple-touch-icon-180x180.png
Normal file
|
After Width: | Height: | Size: 1.3 KiB |
BIN
public/favicon.ico
Normal file
|
After Width: | Height: | Size: 821 B |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.6 KiB |
@@ -1,21 +0,0 @@
|
||||
{
|
||||
"name": "MyLinks",
|
||||
"short_name": "MyLinks",
|
||||
"description": "MyLinks is a free and open source software, that lets you manage your favorite links in an intuitive interface",
|
||||
"launch_handler": {
|
||||
"client_mode": ["focus-existing", "auto"]
|
||||
},
|
||||
"icons": [
|
||||
{
|
||||
"src": "/favicon.png",
|
||||
"sizes": "192x192",
|
||||
"type": "image/png",
|
||||
"purpose": "any maskable"
|
||||
}
|
||||
],
|
||||
"theme_color": "#f0eef6",
|
||||
"background_color": "#f0eef6",
|
||||
"start_url": "/",
|
||||
"display": "standalone",
|
||||
"orientation": "portrait"
|
||||
}
|
||||
BIN
public/maskable-icon-512x512.png
Normal file
|
After Width: | Height: | Size: 4.1 KiB |
BIN
public/pwa-192x192.png
Normal file
|
After Width: | Height: | Size: 1.5 KiB |
BIN
public/pwa-512x512.png
Normal file
|
After Width: | Height: | Size: 4.0 KiB |
BIN
public/pwa-64x64.png
Normal file
|
After Width: | Height: | Size: 555 B |
|
Before Width: | Height: | Size: 44 KiB |
13
pwa-assets.config.ts
Normal file
@@ -0,0 +1,13 @@
|
||||
/* eslint-disable @unicorn/filename-case */
|
||||
import {
|
||||
defineConfig,
|
||||
minimal2023Preset as preset,
|
||||
} from '@vite-pwa/assets-generator/config';
|
||||
|
||||
export default defineConfig({
|
||||
headLinkOptions: {
|
||||
preset: '2023',
|
||||
},
|
||||
preset,
|
||||
images: ['public/favicon.png'],
|
||||
});
|
||||
@@ -19,7 +19,7 @@
|
||||
/>
|
||||
<link
|
||||
rel='manifest'
|
||||
href='/manifest.json'
|
||||
href='/assets/manifest.webmanifest'
|
||||
/>
|
||||
<link
|
||||
rel='apple-touch-icon'
|
||||
@@ -30,6 +30,13 @@
|
||||
href='/favicon.png'
|
||||
/>
|
||||
<title inertia>MyLinks</title>
|
||||
<script defer>
|
||||
if('serviceWorker' in navigator) {
|
||||
window.addEventListener('load', () => {
|
||||
navigator.serviceWorker.register('/assets/sw.js', { scope: '/' })
|
||||
})
|
||||
}
|
||||
</script>
|
||||
|
||||
@routes()
|
||||
@inertiaHead()
|
||||
|
||||
@@ -24,6 +24,7 @@ server.errorHandler(() => import('#core/exceptions/handler'));
|
||||
*/
|
||||
server.use([
|
||||
() => import('#core/middlewares/container_bindings_middleware'),
|
||||
() => import('#core/middlewares/service_worker_scope_extender'),
|
||||
() => import('@adonisjs/static/static_middleware'),
|
||||
() => import('#core/middlewares/log_request'),
|
||||
() => import('@adonisjs/cors/cors_middleware'),
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
{
|
||||
"extends": "@adonisjs/tsconfig/tsconfig.app.json",
|
||||
"compilerOptions": {
|
||||
"rootDir": "./",
|
||||
"outDir": "./build"
|
||||
},
|
||||
"exclude": ["./inertia/**/*", "node_modules", "build"]
|
||||
}
|
||||
"extends": "@adonisjs/tsconfig/tsconfig.app.json",
|
||||
"compilerOptions": {
|
||||
"rootDir": "./",
|
||||
"outDir": "./build"
|
||||
},
|
||||
"exclude": [
|
||||
"./inertia/**/*",
|
||||
"node_modules",
|
||||
"build"
|
||||
]
|
||||
}
|
||||
100
vite.config.ts
@@ -1,23 +1,111 @@
|
||||
import project from '#config/project';
|
||||
import { getDirname } from '@adonisjs/core/helpers';
|
||||
import inertia from '@adonisjs/inertia/client';
|
||||
import adonisjs from '@adonisjs/vite/client';
|
||||
import react from '@vitejs/plugin-react';
|
||||
import react from '@vitejs/plugin-react-oxc';
|
||||
import { defineConfig } from 'vite';
|
||||
import { VitePWA } from 'vite-plugin-pwa';
|
||||
|
||||
export default defineConfig({
|
||||
plugins: [
|
||||
VitePWA({
|
||||
registerType: 'autoUpdate',
|
||||
injectRegister: false,
|
||||
strategies: 'generateSW',
|
||||
devOptions: {
|
||||
enabled: true,
|
||||
},
|
||||
manifest: {
|
||||
name: project.name,
|
||||
short_name: project.name,
|
||||
description: project.description,
|
||||
theme_color: project.color,
|
||||
background_color: project.color,
|
||||
scope: '/',
|
||||
display: 'standalone',
|
||||
orientation: 'portrait',
|
||||
icons: [
|
||||
{
|
||||
src: '/pwa-64x64.png',
|
||||
sizes: '64x64',
|
||||
type: 'image/png',
|
||||
},
|
||||
{
|
||||
src: '/pwa-192x192.png',
|
||||
sizes: '192x192',
|
||||
type: 'image/png',
|
||||
},
|
||||
{
|
||||
src: '/pwa-512x512.png',
|
||||
sizes: '512x512',
|
||||
type: 'image/png',
|
||||
purpose: 'any',
|
||||
},
|
||||
{
|
||||
src: '/maskable-icon-512x512.png',
|
||||
sizes: '512x512',
|
||||
type: 'image/png',
|
||||
purpose: 'maskable',
|
||||
},
|
||||
],
|
||||
launch_handler: {
|
||||
client_mode: ['focus-existing', 'auto'],
|
||||
},
|
||||
},
|
||||
workbox: {
|
||||
clientsClaim: true,
|
||||
skipWaiting: true,
|
||||
globPatterns: ['**/*.{js,css,html,png,svg,ico,json,woff2}'],
|
||||
globIgnores: ['sw*.js', '**/manifest.webmanifest*'],
|
||||
// undefined is required for solving the following error :
|
||||
// Uncaught (in promise) non-precached-url: non-precached-url :: [{"url":"/index.html"}]
|
||||
// Source : https://github.com/vite-pwa/nuxt/issues/53#issuecomment-1615266204
|
||||
navigateFallback: undefined,
|
||||
runtimeCaching: [
|
||||
{
|
||||
urlPattern: /\.(?:js|css|woff2|woff|ttf|eot|otf)$/,
|
||||
handler: 'CacheFirst',
|
||||
options: {
|
||||
cacheName: 'static-assets-cache',
|
||||
expiration: {
|
||||
maxEntries: 50,
|
||||
maxAgeSeconds: 60 * 60 * 24 * 30,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
urlPattern: /\.(?:png|jpg|jpeg|svg|gif|webp|ico)$/,
|
||||
handler: 'CacheFirst',
|
||||
options: {
|
||||
cacheName: 'images-cache',
|
||||
expiration: {
|
||||
maxEntries: 100,
|
||||
maxAgeSeconds: 60 * 60 * 24 * 30,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
urlPattern: /\/.*$/,
|
||||
handler: 'NetworkFirst',
|
||||
options: {
|
||||
cacheName: 'html-cache',
|
||||
expiration: {
|
||||
maxEntries: 20,
|
||||
maxAgeSeconds: 60 * 60 * 24 * 7,
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
}),
|
||||
inertia({ ssr: { enabled: true, entrypoint: 'inertia/app/ssr.tsx' } }),
|
||||
react(),
|
||||
adonisjs({
|
||||
entrypoints: ['inertia/app/app.tsx'],
|
||||
entrypoints: [`${getDirname(import.meta.url)}/inertia/app/app.tsx`],
|
||||
reload: ['resources/views/**/*.edge'],
|
||||
}),
|
||||
],
|
||||
|
||||
/**
|
||||
* Define aliases for importing modules from
|
||||
* your frontend code
|
||||
*/
|
||||
resolve: {
|
||||
alias: {
|
||||
'~/': `${getDirname(import.meta.url)}/inertia/`,
|
||||
|
||||