mirror of
https://github.com/Sonny93/my-links.git
synced 2025-12-10 15:35:35 +00:00
Compare commits
7 Commits
3.1.0
...
3d88bcaa48
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3d88bcaa48 | ||
|
|
15e580942c | ||
|
|
8efa281a48 | ||
|
|
2dd96ff647 | ||
|
|
c54c1cc3da | ||
|
|
af08964fcc | ||
|
|
151ac0602a |
@@ -13,7 +13,7 @@ storage
|
|||||||
|
|
||||||
# Additional good to have ignores for dockerignore
|
# Additional good to have ignores for dockerignore
|
||||||
Dockerfile*
|
Dockerfile*
|
||||||
docker-compose*
|
compose*
|
||||||
.dockerignore
|
.dockerignore
|
||||||
*.md
|
*.md
|
||||||
.git
|
.git
|
||||||
|
|||||||
@@ -10,12 +10,5 @@ charset = utf-8
|
|||||||
trim_trailing_whitespace = true
|
trim_trailing_whitespace = true
|
||||||
insert_final_newline = true
|
insert_final_newline = true
|
||||||
|
|
||||||
[*.json]
|
|
||||||
insert_final_newline = unset
|
|
||||||
|
|
||||||
[**.min.js]
|
[**.min.js]
|
||||||
indent_style = unset
|
indent_style = unset
|
||||||
insert_final_newline = unset
|
|
||||||
|
|
||||||
[*.md]
|
|
||||||
trim_trailing_whitespace = false
|
|
||||||
|
|||||||
2
.vscode/settings.json
vendored
2
.vscode/settings.json
vendored
@@ -7,7 +7,7 @@
|
|||||||
"explorer.fileNesting.enabled": true,
|
"explorer.fileNesting.enabled": true,
|
||||||
"explorer.fileNesting.patterns": {
|
"explorer.fileNesting.patterns": {
|
||||||
"*.js": "${capture}.js.map, ${capture}.min.js, ${capture}.d.ts",
|
"*.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"
|
"Makefile": "*compose.yml, Dockerfile, servers_pgadmin.json, .dockerignore"
|
||||||
},
|
},
|
||||||
"cssVariables.lookupFiles": [
|
"cssVariables.lookupFiles": [
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# Source : https://github.com/adonisjs-community/adonis-packages/blob/main/Dockerfile
|
# 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 apk --no-cache add curl
|
||||||
RUN corepack enable
|
RUN corepack enable
|
||||||
|
|||||||
@@ -15,9 +15,6 @@ export default class Collection extends AppBaseModel {
|
|||||||
@column()
|
@column()
|
||||||
declare visibility: Visibility;
|
declare visibility: Visibility;
|
||||||
|
|
||||||
@column()
|
|
||||||
declare nextId: number;
|
|
||||||
|
|
||||||
@column()
|
@column()
|
||||||
declare authorId: number;
|
declare authorId: number;
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ export const createCollectionValidator = vine.compile(
|
|||||||
name: vine.string().trim().minLength(1).maxLength(254),
|
name: vine.string().trim().minLength(1).maxLength(254),
|
||||||
description: vine.string().trim().maxLength(254).nullable(),
|
description: vine.string().trim().maxLength(254).nullable(),
|
||||||
visibility: vine.enum(Visibility),
|
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),
|
name: vine.string().trim().minLength(1).maxLength(254),
|
||||||
description: vine.string().trim().maxLength(254).nullable(),
|
description: vine.string().trim().maxLength(254).nullable(),
|
||||||
visibility: vine.enum(Visibility),
|
visibility: vine.enum(Visibility),
|
||||||
nextId: vine.number().optional(),
|
|
||||||
|
|
||||||
params,
|
params,
|
||||||
})
|
})
|
||||||
|
|||||||
43
compose.yml
43
compose.yml
@@ -15,33 +15,6 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- '${DB_PORT}:5432'
|
- '${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:
|
my-links:
|
||||||
container_name: my-links
|
container_name: my-links
|
||||||
restart: always
|
restart: always
|
||||||
@@ -61,19 +34,3 @@ services:
|
|||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
postgres-volume:
|
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"
|
|
||||||
}}}
|
|
||||||
|
|||||||
@@ -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 } }),
|
name: faker.string.alphanumeric({ length: { min: 5, max: 25 } }),
|
||||||
description: faker.string.alphanumeric({ length: { min: 0, max: 254 } }),
|
description: faker.string.alphanumeric({ length: { min: 0, max: 254 } }),
|
||||||
visibility: Visibility.PRIVATE,
|
visibility: Visibility.PRIVATE,
|
||||||
nextId: collectionId + 1,
|
|
||||||
authorId,
|
authorId,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,48 +15,5 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "${DB_PORT}:5432"
|
- "${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:
|
volumes:
|
||||||
postgres-volume:
|
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"
|
|
||||||
}}}
|
|
||||||
|
|||||||
@@ -3,13 +3,12 @@ import { FormEvent } from 'react';
|
|||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import BackToDashboard from '~/components/common/navigation/back_to_dashboard';
|
import BackToDashboard from '~/components/common/navigation/back_to_dashboard';
|
||||||
import { FormLayout, FormLayoutProps } from '~/layouts/form_layout';
|
import { FormLayout, FormLayoutProps } from '~/layouts/form_layout';
|
||||||
import { Collection, Visibility } from '~/types/app';
|
import { Visibility } from '~/types/app';
|
||||||
|
|
||||||
export type FormCollectionData = {
|
export type FormCollectionData = {
|
||||||
name: string;
|
name: string;
|
||||||
description: string | null;
|
description: string | null;
|
||||||
visibility: Visibility;
|
visibility: Visibility;
|
||||||
nextId?: Collection['id'];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
interface FormCollectionProps extends FormLayoutProps {
|
interface FormCollectionProps extends FormLayoutProps {
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ export default function EditCollectionPage({
|
|||||||
name: collection.name,
|
name: collection.name,
|
||||||
description: collection.description,
|
description: collection.description,
|
||||||
visibility: collection.visibility,
|
visibility: collection.visibility,
|
||||||
nextId: collection.nextId,
|
|
||||||
});
|
});
|
||||||
const canSubmit = useMemo<boolean>(() => {
|
const canSubmit = useMemo<boolean>(() => {
|
||||||
const trimmedName = data.name.trim();
|
const trimmedName = data.name.trim();
|
||||||
|
|||||||
@@ -49,7 +49,6 @@ export type Collection = CommonBase & {
|
|||||||
name: string;
|
name: string;
|
||||||
description: string | null;
|
description: string | null;
|
||||||
visibility: Visibility;
|
visibility: Visibility;
|
||||||
nextId: number;
|
|
||||||
authorId: number;
|
authorId: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
105
package.json
105
package.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "my-links",
|
"name": "my-links",
|
||||||
"version": "3.1.0",
|
"version": "3.1.1",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "GPL-3.0-only",
|
"license": "GPL-3.0-only",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -35,68 +35,68 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@adonisjs/assembler": "^7.8.2",
|
"@adonisjs/assembler": "^7.8.2",
|
||||||
"@adonisjs/eslint-config": "2.0.0-beta.6",
|
"@adonisjs/eslint-config": "2.1.0",
|
||||||
"@adonisjs/prettier-config": "^1.4.0",
|
"@adonisjs/prettier-config": "^1.4.5",
|
||||||
"@adonisjs/tsconfig": "^1.4.0",
|
"@adonisjs/tsconfig": "^1.4.1",
|
||||||
"@faker-js/faker": "^9.3.0",
|
"@faker-js/faker": "^9.9.0",
|
||||||
"@japa/assert": "^4.0.0",
|
"@japa/assert": "^4.0.1",
|
||||||
"@japa/plugin-adonisjs": "^3.0.1",
|
"@japa/plugin-adonisjs": "^4.0.0",
|
||||||
"@japa/runner": "^3.1.4",
|
"@japa/runner": "^4.2.0",
|
||||||
"@swc/core": "^1.10.4",
|
"@swc/core": "^1.12.9",
|
||||||
"@types/luxon": "^3.4.2",
|
"@types/luxon": "^3.6.2",
|
||||||
"@types/node": "^22.10.4",
|
"@types/node": "^24.0.10",
|
||||||
"@types/react": "^19.0.2",
|
"@types/react": "^19.1.8",
|
||||||
"@types/react-dom": "^19.0.2",
|
"@types/react-dom": "^19.1.6",
|
||||||
"@typescript-eslint/eslint-plugin": "^8.19.0",
|
"@typescript-eslint/eslint-plugin": "^8.35.1",
|
||||||
"@vite-pwa/assets-generator": "^0.2.6",
|
"@vite-pwa/assets-generator": "^1.0.0",
|
||||||
"@vitejs/plugin-react": "^4.3.4",
|
"eslint": "^9.30.1",
|
||||||
"eslint": "^9.17.0",
|
|
||||||
"hot-hook": "^0.4.0",
|
"hot-hook": "^0.4.0",
|
||||||
"husky": "^9.1.7",
|
"husky": "^9.1.7",
|
||||||
"lint-staged": "^15.3.0",
|
"lint-staged": "^16.1.2",
|
||||||
"pino-pretty": "^13.0.0",
|
"pino-pretty": "^13.0.0",
|
||||||
"postcss": "^8.4.49",
|
"postcss": "^8.5.6",
|
||||||
"postcss-preset-mantine": "^1.17.0",
|
"postcss-preset-mantine": "^1.18.0",
|
||||||
"postcss-simple-vars": "^7.0.1",
|
"postcss-simple-vars": "^7.0.1",
|
||||||
"prettier": "^3.4.2",
|
"prettier": "^3.6.2",
|
||||||
"release-it": "^17.11.0",
|
"release-it": "^19.0.3",
|
||||||
"ts-node-maintained": "^10.9.4",
|
"ts-node-maintained": "^10.9.5",
|
||||||
"typescript": "~5.7.2",
|
"typescript": "~5.8.3",
|
||||||
"vite": "^6.0.6"
|
"vite": "^7.0.2"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@adonisjs/ally": "^5.0.2",
|
"@adonisjs/ally": "^5.1.0",
|
||||||
"@adonisjs/auth": "^9.3.0",
|
"@adonisjs/auth": "^9.4.0",
|
||||||
"@adonisjs/core": "^6.17.0",
|
"@adonisjs/core": "^6.19.0",
|
||||||
"@adonisjs/cors": "^2.2.1",
|
"@adonisjs/cors": "^2.2.1",
|
||||||
"@adonisjs/inertia": "^2.1.2",
|
"@adonisjs/inertia": "^3.1.1",
|
||||||
"@adonisjs/lucid": "^21.6.0",
|
"@adonisjs/lucid": "^21.7.0",
|
||||||
"@adonisjs/session": "^7.5.0",
|
"@adonisjs/session": "^7.5.1",
|
||||||
"@adonisjs/shield": "^8.1.1",
|
"@adonisjs/shield": "^8.2.0",
|
||||||
"@adonisjs/static": "^1.1.1",
|
"@adonisjs/static": "^1.1.1",
|
||||||
"@adonisjs/vite": "^4.0.0",
|
"@adonisjs/vite": "^4.0.0",
|
||||||
"@inertiajs/react": "^2.0.0",
|
"@inertiajs/react": "^2.0.14",
|
||||||
"@izzyjs/route": "^1.2.0",
|
"@izzyjs/route": "^1.2.0",
|
||||||
"@mantine/core": "^7.15.2",
|
"@mantine/core": "^8.1.2",
|
||||||
"@mantine/hooks": "^7.15.2",
|
"@mantine/hooks": "^8.1.2",
|
||||||
"@mantine/spotlight": "^7.15.2",
|
"@mantine/spotlight": "^8.1.2",
|
||||||
"@vinejs/vine": "^3.0.0",
|
"@vinejs/vine": "^3.0.1",
|
||||||
"bentocache": "^1.0.0-beta.9",
|
"@vitejs/plugin-react-oxc": "^0.2.3",
|
||||||
|
"bentocache": "^1.4.0",
|
||||||
"dayjs": "^1.11.13",
|
"dayjs": "^1.11.13",
|
||||||
"edge.js": "^6.2.0",
|
"edge.js": "^6.2.1",
|
||||||
"i18next": "^24.2.0",
|
"i18next": "^25.3.1",
|
||||||
"knex": "^3.1.0",
|
"knex": "^3.1.0",
|
||||||
"luxon": "^3.5.0",
|
"luxon": "^3.6.1",
|
||||||
"node-html-parser": "^7.0.1",
|
"node-html-parser": "^7.0.1",
|
||||||
"pg": "^8.13.1",
|
"pg": "^8.16.3",
|
||||||
"react": "^19.0.0",
|
"react": "^19.1.0",
|
||||||
"react-dom": "^19.0.0",
|
"react-dom": "^19.1.0",
|
||||||
"react-hotkeys-hook": "^4.6.1",
|
"react-hotkeys-hook": "^5.1.0",
|
||||||
"react-i18next": "^15.4.0",
|
"react-i18next": "^15.6.0",
|
||||||
"react-icons": "^5.4.0",
|
"react-icons": "^5.5.0",
|
||||||
"reflect-metadata": "^0.2.2",
|
"reflect-metadata": "^0.2.2",
|
||||||
"vite-plugin-pwa": "^0.21.1",
|
"vite-plugin-pwa": "^1.0.1",
|
||||||
"zustand": "^5.0.2"
|
"zustand": "^5.0.6"
|
||||||
},
|
},
|
||||||
"hotHook": {
|
"hotHook": {
|
||||||
"boundaries": [
|
"boundaries": [
|
||||||
@@ -118,6 +118,11 @@
|
|||||||
"*.js,*.ts,*.jsx,*.tsx": "eslint --cache --fix"
|
"*.js,*.ts,*.jsx,*.tsx": "eslint --cache --fix"
|
||||||
},
|
},
|
||||||
"volta": {
|
"volta": {
|
||||||
"node": "22.11.0"
|
"node": "24.1.0"
|
||||||
|
},
|
||||||
|
"pnpm": {
|
||||||
|
"overrides": {
|
||||||
|
"vite": "npm:rolldown-vite@latest"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
6694
pnpm-lock.yaml
generated
6694
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
4
pnpm-workspace.yaml
Normal file
4
pnpm-workspace.yaml
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
onlyBuiltDependencies:
|
||||||
|
- '@swc/core'
|
||||||
|
- esbuild
|
||||||
|
- sharp
|
||||||
@@ -2,7 +2,7 @@ import project from '#config/project';
|
|||||||
import { getDirname } from '@adonisjs/core/helpers';
|
import { getDirname } from '@adonisjs/core/helpers';
|
||||||
import inertia from '@adonisjs/inertia/client';
|
import inertia from '@adonisjs/inertia/client';
|
||||||
import adonisjs from '@adonisjs/vite/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 { defineConfig } from 'vite';
|
||||||
import { VitePWA } from 'vite-plugin-pwa';
|
import { VitePWA } from 'vite-plugin-pwa';
|
||||||
|
|
||||||
@@ -101,7 +101,7 @@ export default defineConfig({
|
|||||||
inertia({ ssr: { enabled: true, entrypoint: 'inertia/app/ssr.tsx' } }),
|
inertia({ ssr: { enabled: true, entrypoint: 'inertia/app/ssr.tsx' } }),
|
||||||
react(),
|
react(),
|
||||||
adonisjs({
|
adonisjs({
|
||||||
entrypoints: ['inertia/app/app.tsx'],
|
entrypoints: [`${getDirname(import.meta.url)}/inertia/app/app.tsx`],
|
||||||
reload: ['resources/views/**/*.edge'],
|
reload: ['resources/views/**/*.edge'],
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
|
|||||||
Reference in New Issue
Block a user