mirror of
https://github.com/Sonny93/my-links.git
synced 2025-12-08 14:43:24 +00:00
Compare commits
4 Commits
c54c1cc3da
...
3d88bcaa48
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3d88bcaa48 | ||
|
|
15e580942c | ||
|
|
8efa281a48 | ||
|
|
2dd96ff647 |
@@ -13,7 +13,7 @@ storage
|
||||
|
||||
# Additional good to have ignores for dockerignore
|
||||
Dockerfile*
|
||||
docker-compose*
|
||||
compose*
|
||||
.dockerignore
|
||||
*.md
|
||||
.git
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Source : https://github.com/adonisjs-community/adonis-packages/blob/main/Dockerfile
|
||||
|
||||
FROM node:22.14-alpine3.20 AS base
|
||||
FROM node:24.1-alpine3.20 AS base
|
||||
|
||||
RUN apk --no-cache add curl
|
||||
RUN corepack enable
|
||||
|
||||
43
compose.yml
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"
|
||||
}}}
|
||||
|
||||
@@ -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"
|
||||
}}}
|
||||
|
||||
71
package.json
71
package.json
@@ -35,68 +35,68 @@
|
||||
},
|
||||
"devDependencies": {
|
||||
"@adonisjs/assembler": "^7.8.2",
|
||||
"@adonisjs/eslint-config": "2.0.0",
|
||||
"@adonisjs/prettier-config": "^1.4.4",
|
||||
"@adonisjs/tsconfig": "^1.4.0",
|
||||
"@faker-js/faker": "^9.6.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.11.16",
|
||||
"@types/luxon": "^3.6.0",
|
||||
"@types/node": "^22.14.0",
|
||||
"@types/react": "^19.1.0",
|
||||
"@types/react-dom": "^19.1.1",
|
||||
"@typescript-eslint/eslint-plugin": "^8.29.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",
|
||||
"@vitejs/plugin-react": "^4.3.4",
|
||||
"eslint": "^9.23.0",
|
||||
"eslint": "^9.30.1",
|
||||
"hot-hook": "^0.4.0",
|
||||
"husky": "^9.1.7",
|
||||
"lint-staged": "^15.5.0",
|
||||
"lint-staged": "^16.1.2",
|
||||
"pino-pretty": "^13.0.0",
|
||||
"postcss": "^8.5.3",
|
||||
"postcss-preset-mantine": "^1.17.0",
|
||||
"postcss": "^8.5.6",
|
||||
"postcss-preset-mantine": "^1.18.0",
|
||||
"postcss-simple-vars": "^7.0.1",
|
||||
"prettier": "^3.5.3",
|
||||
"release-it": "^18.1.2",
|
||||
"prettier": "^3.6.2",
|
||||
"release-it": "^19.0.3",
|
||||
"ts-node-maintained": "^10.9.5",
|
||||
"typescript": "~5.8.2",
|
||||
"vite": "^6.2.5"
|
||||
"typescript": "~5.8.3",
|
||||
"vite": "^7.0.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"@adonisjs/ally": "^5.1.0",
|
||||
"@adonisjs/auth": "^9.4.0",
|
||||
"@adonisjs/core": "^6.17.2",
|
||||
"@adonisjs/core": "^6.19.0",
|
||||
"@adonisjs/cors": "^2.2.1",
|
||||
"@adonisjs/inertia": "^3.1.1",
|
||||
"@adonisjs/lucid": "^21.6.1",
|
||||
"@adonisjs/lucid": "^21.7.0",
|
||||
"@adonisjs/session": "^7.5.1",
|
||||
"@adonisjs/shield": "^8.2.0",
|
||||
"@adonisjs/static": "^1.1.1",
|
||||
"@adonisjs/vite": "^4.0.0",
|
||||
"@inertiajs/react": "^2.0.6",
|
||||
"@inertiajs/react": "^2.0.14",
|
||||
"@izzyjs/route": "^1.2.0",
|
||||
"@mantine/core": "^7.17.3",
|
||||
"@mantine/hooks": "^7.17.3",
|
||||
"@mantine/spotlight": "^7.17.3",
|
||||
"@mantine/core": "^8.1.2",
|
||||
"@mantine/hooks": "^8.1.2",
|
||||
"@mantine/spotlight": "^8.1.2",
|
||||
"@vinejs/vine": "^3.0.1",
|
||||
"bentocache": "^1.2.1",
|
||||
"@vitejs/plugin-react-oxc": "^0.2.3",
|
||||
"bentocache": "^1.4.0",
|
||||
"dayjs": "^1.11.13",
|
||||
"edge.js": "^6.2.1",
|
||||
"i18next": "^24.2.3",
|
||||
"i18next": "^25.3.1",
|
||||
"knex": "^3.1.0",
|
||||
"luxon": "^3.6.1",
|
||||
"node-html-parser": "^7.0.1",
|
||||
"pg": "^8.14.1",
|
||||
"pg": "^8.16.3",
|
||||
"react": "^19.1.0",
|
||||
"react-dom": "^19.1.0",
|
||||
"react-hotkeys-hook": "^4.6.1",
|
||||
"react-i18next": "^15.4.1",
|
||||
"react-hotkeys-hook": "^5.1.0",
|
||||
"react-i18next": "^15.6.0",
|
||||
"react-icons": "^5.5.0",
|
||||
"reflect-metadata": "^0.2.2",
|
||||
"vite-plugin-pwa": "^1.0.0",
|
||||
"zustand": "^5.0.3"
|
||||
"vite-plugin-pwa": "^1.0.1",
|
||||
"zustand": "^5.0.6"
|
||||
},
|
||||
"hotHook": {
|
||||
"boundaries": [
|
||||
@@ -118,6 +118,11 @@
|
||||
"*.js,*.ts,*.jsx,*.tsx": "eslint --cache --fix"
|
||||
},
|
||||
"volta": {
|
||||
"node": "22.11.0"
|
||||
"node": "24.1.0"
|
||||
},
|
||||
"pnpm": {
|
||||
"overrides": {
|
||||
"vite": "npm:rolldown-vite@latest"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
4406
pnpm-lock.yaml
generated
4406
pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@@ -2,7 +2,7 @@ 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';
|
||||
|
||||
@@ -101,7 +101,7 @@ export default defineConfig({
|
||||
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'],
|
||||
}),
|
||||
],
|
||||
|
||||
Reference in New Issue
Block a user