feat: Finalise admin panel. Fix k8s. Add demo user portal

Author: uniuuu

.env_example

@@ -34,8 +34,18 @@ ADMIN_USERNAME=admin
 ADMIN_PASSWORD=admin
 ADMIN_EMAIL=admin@example.tld
 
+#Web Admin UI
+#cd stack/admin/app
+#php -r "echo password_hash('your_password', PASSWORD_BCRYPT, ['cost' => 12]) . PHP_EOL;"
+WEBADMIN_USERNAME='admin'
+WEBADMIN_PASSWORD='$2y$12$hTwdJQunSJJYEb/uA2ZH/e0wGdmR/LFtbIazPpaHh4gyixp6ouWW.'
+
+#User Portal WebUI
+# Session secret: Generate with `openssl rand -hex 32`
+PORTAL_SESSION_SECRET=
+
 #Version 
-VER=v3.1.0
+VER=v3.2.0
 
 
 

.github/workflows/push-all-images.yml

@@ -162,4 +162,24 @@ jobs:
           file: stack/tinymce-clean-server/tmcs.Dockerfile
           platforms: linux/amd64,linux/arm64
           push: true
-          tags: uniuu/zotprime-tinymceclean:${{ env.VERSION }}
+          tags: uniuu/zotprime-tinymceclean:${{ env.VERSION }}
+
+      -
+        name: Build and push admin
+        uses: docker/build-push-action@v5
+        with:
+          context: ./stack/admin
+          file: stack/admin/admin.Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: uniuu/zotprime-admin:${{ env.VERSION }}
+
+      -
+        name: Build and push portal
+        uses: docker/build-push-action@v5
+        with:
+          context: ./stack/webui/portal
+          file: stack/webui/portal/webui.Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: uniuu/zotprime-portal:${{ env.VERSION }}

.gitignore

@@ -10,6 +10,14 @@ docker-compose-test.yml
 **/cred.json
 .vscode/
 
+# Next.js / TypeScript
+node_modules
+.next
+out
+*.tsbuildinfo
+next-env.d.ts
+.env*.local
+
 zotprime-k8s/microk8s/helm-chart/values.yaml
 zotprime-k8s/microk8s/helm-chart/values-*.yaml
 !zotprime-k8s/microk8s/helm-chart/values-example.yaml

bin/admin.sh

@@ -9,7 +9,7 @@ if [ -f "$PROJECT_DIR/.env" ]; then
     export $(grep -v '^#' "$PROJECT_DIR/.env" | xargs)
 fi
 
-# Derive DSHOST from SERVER_IP
+# Default DSHOST from SERVER_IP
 DSHOST="http://${SERVER_IP:-127.0.0.1}:8080"
 
 # Validate required env vars
@@ -24,7 +24,10 @@ usage() {
     cat <<EOF
 ZotPrime Admin Tool
 
-Usage: $0 <resource> <action> [args...]
+Usage: $0 [--host <url>] <resource> <action> [args...]
+
+Options:
+  --host <url>    Dataserver URL (default: http://127.0.0.1:8080)
 
 Resources and Actions:
   user create <username> <email> <password>   Create a new user
@@ -165,10 +168,10 @@ user_enable() {
 }
 
 user_quota() {
-    local mode=$1 user_id=$2
+    local user_id=$1
 
     if [ -z "$user_id" ]; then
-        echo "Usage: $0 $mode user quota <user_id>" >&2
+        echo "Usage: $0 user quota <user_id>" >&2
         exit 1
     fi
 
@@ -328,23 +331,34 @@ group_members() {
     local group_id=$1
 
     if [ -z "$group_id" ]; then
-        echo "Usage: $0 <mode> group members <group_id>" >&2
+        echo "Usage: $0 group members <group_id>" >&2
         exit 1
     fi
 
     local response=$(api_call GET "groups/$group_id/users")
 
-    echo "UserID  Role"
-    echo "------  ------"
+    # Get all users to map ID to username
+    local users_response=$(curl -s -H "Authorization: Bearer $API_SUPER_TOKEN" \
+        "${DSHOST}/admin/users")
+    
+    echo "UserID  Username            Role"
+    echo "------  ------------------  ------"
     echo "$response" | grep -oP '<xfer:user id="\K[^"]+' | while read uid; do
         local role=$(echo "$response" | grep "id=\"$uid\"" | grep -oP 'role="\K[^"]+')
-        printf "%-6s  %s\n" "$uid" "$role"
+        local username=$(echo "$users_response" | jq -r ".[] | select(.userID==$uid) | .username")
+        printf "%-6s  %-18s  %s\n" "$uid" "$username" "$role"
     done
 }
 
 # Main
 [ $# -lt 2 ] && usage
 
+# Parse --host flag
+if [ "$1" = "--host" ]; then
+    DSHOST="$2"
+    shift 2
+fi
+
 RESOURCE=$1
 ACTION=$2
 shift 2

docker-compose-dev-arm.yml

@@ -112,6 +112,28 @@ services:
       platforms:
         - linux/arm64
 
+  zotprime-admin:
+    profiles: ["admin"]
+    platform: linux/arm64
+    image: "uniuu/zotprime-admin:${VER}-arm64"
+    pull_policy: build
+    build:
+      context: ./stack/admin
+      dockerfile: admin.Dockerfile
+      platforms:
+        - linux/arm64
+
+  zotprime-portal:
+    profiles: ["portal"]
+    platform: linux/arm64
+    image: "uniuu/zotprime-portal:${VER}-arm64"
+    pull_policy: build
+    build:
+      context: ./stack/webui/portal
+      dockerfile: webui.Dockerfile
+      platforms:
+        - linux/arm64
+
   zotprime-init:
     platform: linux/arm64
     image: "uniuu/zotprime-dataserver:${VER}-arm64"

docker-compose-dev.yml

@@ -122,6 +122,13 @@ services:
       context: ./stack/admin
       dockerfile: admin.Dockerfile
 
+  zotprime-portal:
+    profiles: ["portal"]
+    pull_policy: build
+    build:
+      context: ./stack/webui
+      dockerfile: webui.Dockerfile
+
   # zotprime-init:
   #   build:
   #     context: ./stack/init

docker-compose.yml

@@ -259,6 +259,7 @@ services:
       - API_SUPER_TOKEN=${API_SUPER_TOKEN}
     volumes:
       - /etc/localtime:/etc/localtime:ro
+      - admin-data:/var/lib/admin-data
     depends_on:
       zotprime-dataserver:
         condition: service_started
@@ -268,11 +269,34 @@ services:
     networks:
       zotprime:
         ipv4_address: 10.5.5.12
+  zotprime-portal:
+    profiles: ["portal"]
+    image: "uniuu/zotprime-portal:${VER}"
+    ports:
+      - "3045:3000"
+    environment:
+      - PORTAL_SESSION_SECRET=${PORTAL_SESSION_SECRET}
+      - API_SUPER_TOKEN=${API_SUPER_TOKEN}
+      - NODE_ENV=production
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
+      - ./stack/webui/portal/config.yaml:/app/config.yaml:ro
+    depends_on:
+      zotprime-dataserver:
+        condition: service_started
+    links:
+      - zotprime-dataserver:dataserver
+    restart: always
+    networks:
+      zotprime:
+        ipv4_address: 10.5.5.13
 volumes:
   dbdata:
    driver: local
   miniodata:
    driver: local
+  admin-data:
+   driver: local
 
 networks:
   zotprime:

docs/admin.md

@@ -1,74 +1,52 @@
 # Admin UI Setup
 
-## 1. Generate Password Hash
+## Docker Compose
 
-```bash
-cd stack/admin/app
-php -r "echo password_hash('your_password', PASSWORD_BCRYPT, ['cost' => 12]) . PHP_EOL;"
-```
-
-## 2. Build Tailwind CSS
+### 1. Generate Password Hash
 
 ```bash
 cd stack/admin/app
-curl -sLO https://github.com/tailwindlabs/tailwindcss/releases/latest/download/tailwindcss-linux-x64
-chmod +x tailwindcss-linux-x64
-./tailwindcss-linux-x64 -i ./resources/css/app.css -o ./public/css/app.css --minify
-rm tailwindcss-linux-x64
+php -r "echo password_hash('your_password', PASSWORD_BCRYPT, ['cost' => 12]) . PHP_EOL;"
 ```
 
-## 3. Add to `.env`
+### 2. Add to `.env`
 
 ```env
 WEBADMIN_USERNAME=admin
 WEBADMIN_PASSWORD=$2y$12$...hash_from_step_1...
 API_SUPER_TOKEN=your_existing_token
 ```
 
-## 4. Deploy
-
-### Docker Compose
+### 3. Deploy:
 
 ```bash
 docker-compose --profile admin up -d
 ```
 
 Access: `http://localhost:8082/login`
 
-### Kubernetes
+## K8s
 
-Edit `zotprime-k8s/*/helm-chart/values.yaml`:
+### 1. Edit `zotprime-k8s/*/helm-chart/values.yaml`:
 
 ```yaml
 webAdmin:
   enabled: true  # Set to false to disable
   username: ""  # echo -n "admin" | base64
-  password: ""  # echo -n "$2y$12$...hash..." | base64
+  password: ""  # echo -n "...hash..." | base64   # where hash generated as in step 1 docker: php -r "echo password_hash('your_password', PASSWORD_BCRYPT, ['cost' => 12]) . PHP_EOL;"
+
 ```
 
-Deploy:
+### 2. Deploy:
 
 ```bash
 helm upgrade zotprime-k8s helm-chart --namespace zotprime
 ```
 
 Access: `https://admin.yourdomain.com/login`
 
-## 5. First Login
+## First Login
 
 1. Enter username and password
 2. Scan QR code with Google Authenticator
-3. Enter 6-digit code
-
-## Troubleshooting
-
-```bash
-# Check logs
-docker logs zotprime-admin
-
-# Verify Redis
-docker exec zotprime-admin redis-cli ping
-
-# Check environment
-docker exec zotprime-admin env | grep WEBADMIN
-```
+3. Enter 6-digit code

stack/admin/admin.Dockerfile

@@ -2,7 +2,10 @@
 FROM php:8-fpm AS builder
 
 # Install build dependencies
-RUN apt-get update && apt-get install -y curl unzip && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y curl unzip libyaml-dev && rm -rf /var/lib/apt/lists/*
+
+# Install PHP extensions for build
+RUN pecl install yaml && docker-php-ext-enable yaml
 
 # Install Composer
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
@@ -15,10 +18,14 @@ RUN curl -sLO https://github.com/tailwindlabs/tailwindcss/releases/latest/downlo
 # Copy application
 WORKDIR /var/www/html
 COPY app/ .
+COPY config.yaml ../config.yaml
 
 # Install Laravel dependencies
 RUN composer install --no-dev --optimize-autoloader
 
+# # Generate APP_KEY
+# RUN php artisan key:generate --force
+
 # Build Tailwind CSS
 RUN tailwindcss -i ./resources/css/app.css -o ./public/css/app.css --minify
 
@@ -32,16 +39,19 @@ RUN useradd -m -u 1000 appuser
 RUN apt-get update && apt-get install -y \
     nginx \
     redis-server \
+    libyaml-dev \
     && rm -rf /var/lib/apt/lists/*
 
 # Install PHP extensions
 RUN docker-php-ext-install pdo pdo_mysql \
-    && pecl install redis \
-    && docker-php-ext-enable redis
+    && pecl install redis yaml \
+    && docker-php-ext-enable redis yaml
 
 # Copy application from builder
 WORKDIR /var/www/html
 COPY --from=builder --chown=appuser:appuser /var/www/html .
+COPY --chown=appuser:appuser config.yaml ../config.yaml
+COPY --chown=appuser:appuser entrypoint.sh /entrypoint.sh
 
 # Copy configs
 COPY nginx/nginx.conf /etc/nginx/nginx.conf
@@ -51,10 +61,12 @@ COPY redis/redis.conf /etc/redis/redis.conf
 RUN chown -R appuser:appuser /var/www/html \
     && chown -R appuser:appuser /var/log/nginx \
     && chown -R appuser:appuser /var/lib/nginx \
-    && mkdir -p /run/php /var/run/redis \
-    && chown -R appuser:appuser /run/php /var/run/redis \
+    && chown -R appuser:appuser /etc/redis \
+    && mkdir -p /run/php /var/run/redis /var/lib/admin-data/redis /var/lib/admin-data/sqlite \
+    && chown -R appuser:appuser /run/php /var/run/redis /var/lib/admin-data \
     && touch /run/nginx.pid \
-    && chown appuser:appuser /run/nginx.pid
+    && chown appuser:appuser /run/nginx.pid \
+    && chmod +x /entrypoint.sh
 
 # Switch to non-root user
 USER appuser
@@ -63,4 +75,4 @@ USER appuser
 EXPOSE 8080
 
 # Start services
-CMD ["/bin/sh", "-c", "redis-server /etc/redis/redis.conf --daemonize yes && php-fpm & nginx -g 'daemon off;'"]
+CMD ["/entrypoint.sh"]