mirror of
https://github.com/kyantech/Palmr.git
synced 2025-10-23 06:11:58 +00:00
feat: update frontend and docker compose
This commit is contained in:
5
.gitignore
vendored
5
.gitignore
vendored
@@ -23,11 +23,6 @@ apps/web/*.njsproj
|
|||||||
apps/web/*.sln
|
apps/web/*.sln
|
||||||
apps/web/*.sw?
|
apps/web/*.sw?
|
||||||
|
|
||||||
apps/web/pnpm-lock.yaml
|
|
||||||
apps/web/yarn.lock
|
|
||||||
apps/web/package-lock.json
|
|
||||||
apps/web/bun.lockb
|
|
||||||
|
|
||||||
#SERVER
|
#SERVER
|
||||||
apps/server/node_modules
|
apps/server/node_modules
|
||||||
apps/server/.env
|
apps/server/.env
|
||||||
|
@@ -20,6 +20,7 @@
|
|||||||
"@heroui/code": "2.2.7",
|
"@heroui/code": "2.2.7",
|
||||||
"@heroui/divider": "^2.2.6",
|
"@heroui/divider": "^2.2.6",
|
||||||
"@heroui/dropdown": "2.3.10",
|
"@heroui/dropdown": "2.3.10",
|
||||||
|
"@heroui/form": "^2.1.14",
|
||||||
"@heroui/image": "^2.2.6",
|
"@heroui/image": "^2.2.6",
|
||||||
"@heroui/input": "2.4.10",
|
"@heroui/input": "2.4.10",
|
||||||
"@heroui/kbd": "2.2.7",
|
"@heroui/kbd": "2.2.7",
|
||||||
@@ -27,13 +28,16 @@
|
|||||||
"@heroui/modal": "^2.2.8",
|
"@heroui/modal": "^2.2.8",
|
||||||
"@heroui/navbar": "2.2.9",
|
"@heroui/navbar": "2.2.9",
|
||||||
"@heroui/progress": "^2.2.7",
|
"@heroui/progress": "^2.2.7",
|
||||||
"@heroui/select": "^2.4.10",
|
"@heroui/select": "2.4.9",
|
||||||
"@heroui/snippet": "2.2.11",
|
"@heroui/snippet": "2.2.11",
|
||||||
|
"@heroui/spinner": "^2.2.12",
|
||||||
"@heroui/switch": "2.2.9",
|
"@heroui/switch": "2.2.9",
|
||||||
"@heroui/system": "2.4.7",
|
"@heroui/system": "2.4.6",
|
||||||
"@heroui/table": "^2.2.9",
|
"@heroui/table": "^2.2.9",
|
||||||
"@heroui/theme": "2.4.6",
|
"@heroui/theme": "2.4.6",
|
||||||
"@hookform/resolvers": "^4.0.0",
|
"@hookform/resolvers": "^4.0.0",
|
||||||
|
"@react-aria/selection": "3.21.0",
|
||||||
|
"@react-aria/utils": "3.27.0",
|
||||||
"@react-aria/visually-hidden": "3.8.19",
|
"@react-aria/visually-hidden": "3.8.19",
|
||||||
"@react-types/shared": "3.27.0",
|
"@react-types/shared": "3.27.0",
|
||||||
"axios": "^1.7.9",
|
"axios": "^1.7.9",
|
||||||
|
@@ -56,10 +56,10 @@ export function SettingsInput({ config, register, watch, error, smtpEnabled }: C
|
|||||||
labelPlacement="outside"
|
labelPlacement="outside"
|
||||||
size="md"
|
size="md"
|
||||||
>
|
>
|
||||||
<SelectItem key="true" value="true">
|
<SelectItem key="true">
|
||||||
{t("common.yes")}
|
{t("common.yes")}
|
||||||
</SelectItem>
|
</SelectItem>
|
||||||
<SelectItem key="false" value="false">
|
<SelectItem key="false">
|
||||||
{t("common.no")}
|
{t("common.no")}
|
||||||
</SelectItem>
|
</SelectItem>
|
||||||
</Select>
|
</Select>
|
||||||
|
@@ -63,10 +63,10 @@ export function UserFormModal({ isOpen, onClose, modalMode, selectedUser, formMe
|
|||||||
isInvalid={!!errors.isAdmin}
|
isInvalid={!!errors.isAdmin}
|
||||||
label={t("users.form.role")}
|
label={t("users.form.role")}
|
||||||
>
|
>
|
||||||
<SelectItem key="false" value="false">
|
<SelectItem key="false" >
|
||||||
{t("users.form.roleUser")}
|
{t("users.form.roleUser")}
|
||||||
</SelectItem>
|
</SelectItem>
|
||||||
<SelectItem key="true" value="true">
|
<SelectItem key="true" >
|
||||||
{t("users.form.roleAdmin")}
|
{t("users.form.roleAdmin")}
|
||||||
</SelectItem>
|
</SelectItem>
|
||||||
</Select>
|
</Select>
|
||||||
|
@@ -1,19 +1,16 @@
|
|||||||
version: "3.8"
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
api:
|
api:
|
||||||
build: ./server
|
build: ./apps/server
|
||||||
container_name: palmr-api
|
container_name: palmr-api
|
||||||
depends_on:
|
depends_on:
|
||||||
postgres:
|
postgres:
|
||||||
condition: "service_healthy"
|
condition: "service_healthy"
|
||||||
minio:
|
minio:
|
||||||
condition: "service_started"
|
condition: "service_healthy"
|
||||||
environment:
|
environment:
|
||||||
- PORT=3333
|
- PORT=3333
|
||||||
- DATABASE_URL=postgresql://palmr:palmr123@localhost:5432/palmr?schema=public
|
- DATABASE_URL=postgresql://palmr:palmr123@postgres:5432/palmr?schema=public
|
||||||
- MINIO_ENDPOINT=localhost
|
- MINIO_ENDPOINT=127.0.0.1
|
||||||
- MINIO_PORT=9000
|
- MINIO_PORT=9000
|
||||||
- MINIO_USE_SSL=false
|
- MINIO_USE_SSL=false
|
||||||
- MINIO_ROOT_USER=palmr
|
- MINIO_ROOT_USER=palmr
|
||||||
@@ -30,15 +27,11 @@ services:
|
|||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 5
|
retries: 5
|
||||||
start_period: 10s
|
start_period: 30s
|
||||||
network_mode: "host"
|
|
||||||
extra_hosts:
|
|
||||||
- "postgres:127.0.0.1"
|
|
||||||
- "minio:127.0.0.1"
|
|
||||||
|
|
||||||
web:
|
web:
|
||||||
build:
|
build:
|
||||||
context: ./web
|
context: ./apps/web
|
||||||
args:
|
args:
|
||||||
- VITE_API_URL=http://localhost:3333
|
- VITE_API_URL=http://localhost:3333
|
||||||
container_name: palmr-web
|
container_name: palmr-web
|
||||||
@@ -65,15 +58,15 @@ services:
|
|||||||
command: server /data --console-address ":9001"
|
command: server /data --console-address ":9001"
|
||||||
volumes:
|
volumes:
|
||||||
- minio_data:/data
|
- minio_data:/data
|
||||||
|
ports:
|
||||||
|
- "9000:9000"
|
||||||
|
- "9001:9001"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/ready"]
|
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/ready"]
|
||||||
interval: 10s
|
interval: 10s
|
||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 5
|
retries: 5
|
||||||
ports:
|
|
||||||
- "9000:9000"
|
|
||||||
- "9001:9001"
|
|
||||||
|
|
||||||
minio-init:
|
minio-init:
|
||||||
image: minio/mc:latest
|
image: minio/mc:latest
|
||||||
|
@@ -1,7 +1,4 @@
|
|||||||
version: "3.8"
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
|
|
||||||
api:
|
api:
|
||||||
image: kyantech/palmr-api:v1-beta
|
image: kyantech/palmr-api:v1-beta
|
||||||
container_name: palmr-api
|
container_name: palmr-api
|
||||||
|
Reference in New Issue
Block a user