mirror of
https://github.com/Portabase/portabase.git
synced 2026-07-14 11:16:13 +02:00
For 1.1.3-rc-2 release.
This commit is contained in:
@@ -31,3 +31,6 @@ S3_USE_SSL=true
|
|||||||
|
|
||||||
# Storage Type (s3, local)
|
# Storage Type (s3, local)
|
||||||
STORAGE_TYPE=local
|
STORAGE_TYPE=local
|
||||||
|
|
||||||
|
# Retention
|
||||||
|
RETENTION_CRON="* * * * *"
|
||||||
@@ -20,7 +20,6 @@
|
|||||||
|
|
||||||

|

|
||||||
|
|
||||||
|
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -178,6 +177,9 @@ S3_USE_SSL=true
|
|||||||
|
|
||||||
# Storage Backend: 'local' or 's3'
|
# Storage Backend: 'local' or 's3'
|
||||||
STORAGE_TYPE=local
|
STORAGE_TYPE=local
|
||||||
|
|
||||||
|
# Retention
|
||||||
|
RETENTION_CRON="* * * * *"
|
||||||
```
|
```
|
||||||
|
|
||||||
### Semantic Versioning
|
### Semantic Versioning
|
||||||
|
|||||||
@@ -11,14 +11,11 @@ services:
|
|||||||
- '8887:80'
|
- '8887:80'
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
|
|
||||||
depends_on:
|
depends_on:
|
||||||
db:
|
db:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|
||||||
container_name: portabase-app-prod
|
container_name: portabase-app-prod
|
||||||
|
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: postgres:16-alpine
|
image: postgres:16-alpine
|
||||||
ports:
|
ports:
|
||||||
@@ -35,7 +32,6 @@ services:
|
|||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 5
|
retries: 5
|
||||||
|
|
||||||
|
|
||||||
s3:
|
s3:
|
||||||
image: docker.io/bitnami/minio:latest
|
image: docker.io/bitnami/minio:latest
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
@@ -1,25 +1,6 @@
|
|||||||
name: portabase-dev
|
name: portabase-dev
|
||||||
|
|
||||||
services:
|
services:
|
||||||
# app:
|
|
||||||
# build:
|
|
||||||
# context: .
|
|
||||||
# dockerfile: docker/dockerfile/Dockerfile
|
|
||||||
# target: dev
|
|
||||||
# ports:
|
|
||||||
# - "8887:8887"
|
|
||||||
# environment:
|
|
||||||
# - TIME_ZONE="Europe/Paris"
|
|
||||||
# - NODE_ENV=development
|
|
||||||
# depends_on:
|
|
||||||
# db:
|
|
||||||
# condition: service_healthy
|
|
||||||
# volumes:
|
|
||||||
# - .:/app
|
|
||||||
# - /app/node_modules
|
|
||||||
# container_name: portabase-app
|
|
||||||
#
|
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: postgres:16-alpine
|
image: postgres:16-alpine
|
||||||
ports:
|
ports:
|
||||||
@@ -36,38 +17,5 @@ services:
|
|||||||
timeout: 5s
|
timeout: 5s
|
||||||
retries: 5
|
retries: 5
|
||||||
|
|
||||||
# db-pgadmin:
|
|
||||||
# image: dpage/pgadmin4
|
|
||||||
# environment:
|
|
||||||
# PGADMIN_DEFAULT_EMAIL: "devuser@devuser.devuser"
|
|
||||||
# PGADMIN_DEFAULT_PASSWORD: "changeme"
|
|
||||||
# PGADMIN_CONFIG_SERVER_MODE: "False"
|
|
||||||
# POSTGRES_USER: "devuser"
|
|
||||||
# POSTGRES_PASSWORD: "changeme"
|
|
||||||
# volumes:
|
|
||||||
# - pgadmin-data:/var/lib/pgadmin
|
|
||||||
# ports:
|
|
||||||
# - "8080:80"
|
|
||||||
# restart: unless-stopped
|
|
||||||
# depends_on:
|
|
||||||
# - db
|
|
||||||
|
|
||||||
# s3:
|
|
||||||
# container_name: s3-portabase-dev
|
|
||||||
# image: docker.io/bitnami/minio:latest
|
|
||||||
# ports:
|
|
||||||
# - "9000:9000"
|
|
||||||
# - "9001:9001"
|
|
||||||
# volumes:
|
|
||||||
# - minio_data:/data
|
|
||||||
#
|
|
||||||
# environment:
|
|
||||||
# - MINIO_ROOT_USER=${S3_ACCESS_KEY}
|
|
||||||
# - MINIO_ROOT_PASSWORD=${S3_SECRET_KEY}
|
|
||||||
# - MINIO_DEFAULT_BUCKETS=${S3_BUCKET_NAME}
|
|
||||||
# - MINIO_BROWSER=on
|
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
postgres-data:
|
postgres-data:
|
||||||
# minio_data:
|
|
||||||
# pgadmin-data:
|
|
||||||
|
|||||||
+1
-1
@@ -60,7 +60,7 @@ export async function middleware(request: NextRequest) {
|
|||||||
function checkRouteExists(pathname: string) {
|
function checkRouteExists(pathname: string) {
|
||||||
// Define static and dynamic routes with patterns
|
// Define static and dynamic routes with patterns
|
||||||
const routePatterns = [
|
const routePatterns = [
|
||||||
//do not delete
|
// Do not delete
|
||||||
// /^\/api\/auth\/\d+$/, // Dynamic route with a number as a parameter (e.g., /api/dynamic/123)
|
// /^\/api\/auth\/\d+$/, // Dynamic route with a number as a parameter (e.g., /api/dynamic/123)
|
||||||
// /^\/api\/auth\/\w+$/, // Dynamic route with a number as a parameter (e.g., /api/dynamic/123)
|
// /^\/api\/auth\/\w+$/, // Dynamic route with a number as a parameter (e.g., /api/dynamic/123)
|
||||||
// /^\/api\/agent\/healthcheck\/\w+$/, // Dynamic route with an alphanumeric parameter (e.g., /api/user/username)
|
// /^\/api\/agent\/healthcheck\/\w+$/, // Dynamic route with an alphanumeric parameter (e.g., /api/user/username)
|
||||||
|
|||||||
@@ -1,10 +1,7 @@
|
|||||||
import {Card, CardContent, CardDescription, CardHeader, CardTitle} from "@/components/ui/card";
|
import {Card, CardContent, CardDescription, CardHeader, CardTitle} from "@/components/ui/card";
|
||||||
import {Button} from "@/components/ui/button";
|
import {Button} from "@/components/ui/button";
|
||||||
import {Download} from "lucide-react";
|
import {Download} from "lucide-react";
|
||||||
import {getFileUrlPresignedLocal, getFileUrlPreSignedS3Action} from "@/features/upload/private/upload.action";
|
import {getFileUrlPresignedLocal} from "@/features/upload/private/upload.action";
|
||||||
import {SafeActionResult} from "next-safe-action";
|
|
||||||
import {ZodString} from "zod";
|
|
||||||
import {ServerActionResult} from "@/types/action-type";
|
|
||||||
import {toast} from "sonner";
|
import {toast} from "sonner";
|
||||||
|
|
||||||
export type AdminSettingsTabProps = {};
|
export type AdminSettingsTabProps = {};
|
||||||
|
|||||||
Reference in New Issue
Block a user