Merge pull request 'ai' (#1) from ai into main

Reviewed-on: #1

.dockerignore

@@ -1,25 +0,0 @@
-node_modules
-npm-debug.log
-.git
-.gitignore
-*.md
-.vscode
-.idea
-*.log
-dist
-build
-coverage
-.nyc_output
-playwright-report
-test-results
-e2e
-*.test.ts
-*.test.tsx
-*.spec.ts
-*.spec.tsx
-vitest.config.ts
-playwright.config.ts
-eslint.config.js
-.qwen
-*.ico
-cgg-ico\ copy.png

.gitea/workflows/demo.yaml

@@ -1,24 +0,0 @@
-name: Gitea Actions Demo
-run-name: ${{ gitea.actor }} is testing out Gitea Actions 🚀
-on: [push]
-
-jobs:
-  Explore-Gitea-Actions:
-    runs-on: [ubuntu-latest] 
-    steps:
-      - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event."
-      - run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!"
-      - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
-      - run: whoami
-      - run: hostname
-      
-      - run: node -v
-      #- name: Check out repository code
-        #uses: actions/checkout@v6
-      
-      - run: echo "💡 The ${{ gitea.repository }} repository has been cloned to the runner."
-      - run: echo "🖥️ The workflow is now ready to test your code on the runner."
-      - name: List files in the repository
-        run: |
-          ls ${{ gitea.workspace }}
-      - run: echo "🍏 This job's status is ${{ job.status }}."

DEPLOYMENT.md

@@ -1,317 +0,0 @@
-# Configucci Docker Deployment Guide
-
-## Quick Start
-
-### Local Deployment (Windows/Linux/Mac)
-
-```bash
-# Make script executable (Linux/Mac only)
-chmod +x deploy-docker.sh
-
-# Deploy locally
-./deploy-docker.sh
-
-# Or on Windows (PowerShell)
-bash deploy-docker.sh
-```
-
-### Remote Deployment (Linux Server)
-
-```bash
-# Deploy to remote server
-./deploy-docker.sh user@your-server.com
-
-# Example
-./deploy-docker.sh root@192.168.1.100
-```
-
----
-
-## Manual Deployment
-
-### 1. Build and Run Locally
-
-```bash
-# Build image
-docker-compose build
-
-# Start container
-docker-compose up -d
-
-# View logs
-docker-compose logs -f
-
-# Stop
-docker-compose down
-```
-
-### 2. Deploy to Linux Server
-
-#### Option A: Using Deployment Script (Recommended)
-
-```bash
-# From your local machine
-./deploy-docker.sh user@your-server.com
-```
-
-#### Option B: Manual Steps on Server
-
-```bash
-# SSH to server
-ssh user@your-server.com
-
-# Install Docker (if not installed)
-curl -fsSL https://get.docker.com -o get-docker.sh
-sudo sh get-docker.sh
-sudo usermod -aG docker $USER
-exit
-
-# SSH again (to apply group changes)
-ssh user@your-server.com
-
-# Clone repository
-git clone https://git.six83.ru/ssa/configucci.git
-cd configucci
-
-# Build and run
-docker-compose build
-docker-compose up -d
-
-# View logs
-docker-compose logs -f
-```
-
----
-
-## Accessing the Application
-
-After deployment, access the app at:
-
-- **Local:** http://localhost:11088
-- **Server:** http://your-server-ip:11088
-
----
-
-## Useful Docker Commands
-
-```bash
-# View running containers
-docker-compose ps
-
-# View logs
-docker-compose logs -f
-
-# Restart application
-docker-compose restart
-
-# Stop application
-docker-compose down
-
-# Rebuild and restart
-docker-compose build --no-cache
-docker-compose up -d
-
-# View resource usage
-docker stats configucci-app
-
-# Execute command in container
-docker exec -it configucci-app sh
-
-# Remove everything (container + image)
-docker-compose down --rmi all
-```
-
----
-
-## Production Setup with SSL
-
-### 1. Install Nginx Proxy Manager (Recommended)
-
-```yaml
-# Add to docker-compose.yml
-version: '3.8'
-
-services:
-  proxy:
-    image: jc21/nginx-proxy-manager:latest
-    ports:
-      - "80:80"
-      - "81:81"
-      - "443:443"
-    volumes:
-      - ./data:/data
-      - ./letsencrypt:/etc/letsencrypt
-    restart: unless-stopped
-
-  configucci:
-    # ... existing configucci config
-```
-
-Then access `http://your-server:81` to configure SSL via web UI.
-
-### 2. Or Use Certbot Directly
-
-```bash
-# On host server (not in Docker)
-sudo apt install certbot -y
-
-# Get certificate
-sudo certbot certonly --standalone -d your-domain.com
-
-# Mount certificates in docker-compose.yml
-volumes:
-  - /etc/letsencrypt:/etc/letsencrypt:ro
-```
-
----
-
-## Environment Variables
-
-You can customize the build by setting environment variables:
-
-```bash
-# In docker-compose.yml or .env file
-GIT_URL=https://git.six83.ru/ssa/configucci.git
-GIT_BRANCH=ai
-```
-
----
-
-## Troubleshooting
-
-### Container Won't Start
-
-```bash
-# Check logs
-docker-compose logs
-
-# Check if port 80 is in use
-sudo netstat -tlnp | grep :80
-
-# Use different port
-# Edit docker-compose.yml: ports: - "8080:80"
-```
-
-### Build Fails
-
-```bash
-# Clean build cache
-docker-compose build --no-cache
-
-# Remove all Docker resources
-docker system prune -a
-```
-
-### Can't Access Application
-
-```bash
-# Check firewall
-sudo ufw status
-sudo ufw allow 80/tcp
-
-# Check container is running
-docker-compose ps
-
-# Test from server
-curl http://localhost
-```
-
----
-
-## Automated Deployment with CI/CD
-
-Create `.gitlab-ci.yml` or GitHub Actions workflow:
-
-```yaml
-# Example: GitHub Actions
-name: Deploy
-
-on:
-  push:
-    branches: [ai]
-
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      
-      - name: Deploy to server
-        uses: appleboy/ssh-action@master
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          username: ${{ secrets.SERVER_USER }}
-          key: ${{ secrets.SSH_PRIVATE_KEY }}
-          script: |
-            cd /opt/configucci
-            git pull
-            docker-compose build --no-cache
-            docker-compose up -d
-```
-
----
-
-## Backup and Restore
-
-### Backup
-
-```bash
-# Backup configuration
-tar -czf configucci-backup.tar.gz docker-compose.yml nginx.conf
-```
-
-### Restore
-
-```bash
-tar -xzf configucci-backup.tar.gz
-docker-compose up -d
-```
-
----
-
-## Monitoring
-
-### Install Docker Monitoring
-
-```bash
-# Install cAdvisor for container monitoring
-docker run \
-  --volume=/:/rootfs:ro \
-  --volume=/var/run:/var/run:ro \
-  --volume=/sys:/sys:ro \
-  --volume=/var/lib/docker/:/var/lib/docker:ro \
-  --volume=/dev/disk/:/dev/disk:ro \
-  --publish=8080:8080 \
-  --name=cadvisor \
-  google/cadvisor:latest
-```
-
-Access at: `http://your-server:8080`
-
----
-
-## Security Recommendations
-
-1. **Use HTTPS** - Always use SSL in production
-2. **Firewall** - Only open necessary ports
-3. **Regular Updates** - Keep Docker and system updated
-4. **Non-root User** - Run container as non-root
-5. **Resource Limits** - Set CPU/memory limits in docker-compose.yml
-
-```yaml
-# Add resource limits
-deploy:
-  resources:
-    limits:
-      cpus: '0.5'
-      memory: 512M
-```
-
----
-
-## Support
-
-For issues, check:
-- Docker logs: `docker-compose logs`
-- Nginx logs: `docker exec configucci-app cat /var/log/nginx/error.log`
-- Application health: `docker inspect --format='{{.State.Health.Status}}' configucci-app`

Dockerfile

@@ -1,39 +0,0 @@
-# Build stage
-FROM node:20-alpine AS build
-
-WORKDIR /app
-
-# Install git
-RUN apk add --no-cache git
-
-# Clone repository
-ARG GIT_URL=https://git.six83.ru/ssa/configucci.git
-ARG GIT_BRANCH=main
-RUN git clone --depth 1 --branch ${GIT_BRANCH} ${GIT_URL} .
-
-# Install dependencies
-COPY package*.json ./
-RUN npm ci
-
-# Copy source and build
-COPY . .
-RUN npm run build
-
-# Production stage
-FROM nginx:alpine
-
-# Copy custom nginx config
-COPY nginx.conf /etc/nginx/conf.d/default.conf
-
-# Copy built files from build stage
-COPY --from=build /app/dist /usr/share/nginx/html
-
-# Expose port 80
-EXPOSE 80
-
-# Health check
-HEALTHCHECK --interval=30s --timeout=3s --start-period=5s --retries=3 \
-    CMD wget --no-verbose --tries=1 --spider http://localhost/ || exit 1
-
-# Start nginx
-CMD ["nginx", "-g", "daemon off;"]

deploy-docker.sh

@@ -1,152 +0,0 @@
-#!/bin/bash
-
-# Configucci Docker Deployment Script
-# Usage: ./deploy-docker.sh [server]
-
-set -e
-
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-NC='\033[0m' # No Color
-
-# Configuration
-SERVER="${1:-}"
-APP_NAME="configucci"
-GIT_BRANCH="main"
-
-echo -e "${GREEN}==================================${NC}"
-echo -e "${GREEN}  Configucci Docker Deployment   ${NC}"
-echo -e "${GREEN}==================================${NC}"
-
-# Function to deploy locally
-deploy_local() {
-    echo -e "${YELLOW}Building Docker image...${NC}"
-    docker-compose build --no-cache
-    
-    echo -e "${YELLOW}Stopping existing container (if any)...${NC}"
-    docker-compose down || true
-    
-    echo -e "${YELLOW}Starting new container...${NC}"
-    docker-compose up -d
-    
-    echo -e "${YELLOW}Waiting for application to start...${NC}"
-    sleep 5
-    
-    echo -e "${GREEN}==================================${NC}"
-    echo -e "${GREEN}  Deployment Complete!          ${NC}"
-    echo -e "${GREEN}==================================${NC}"
-    echo ""
-    echo -e "Application URL: ${GREEN}http://localhost${NC}"
-    echo ""
-    echo -e "Useful commands:"
-    echo -e "  View logs:        ${YELLOW}docker-compose logs -f${NC}"
-    echo -e "  Stop app:         ${YELLOW}docker-compose down${NC}"
-    echo -e "  Restart app:      ${YELLOW}docker-compose restart${NC}"
-    echo -e "  Rebuild:          ${YELLOW}docker-compose build && docker-compose up -d${NC}"
-}
-
-# Function to deploy to remote server
-deploy_remote() {
-    echo -e "${YELLOW}Deploying to server: ${SERVER}${NC}"
-    
-    # Check if server is accessible
-    if ! ping -c 1 "$SERVER" &> /dev/null; then
-        echo -e "${RED}Cannot connect to server: ${SERVER}${NC}"
-        exit 1
-    fi
-    
-    # Create deployment script on server
-    cat << 'EOF' > /tmp/deploy-configucci.sh
-#!/bin/bash
-set -e
-
-APP_DIR="/opt/configucci"
-GIT_URL="https://git.six83.ru/ssa/configucci.git"
-GIT_BRANCH="main"
-
-echo "Creating app directory..."
-mkdir -p \$APP_DIR
-cd \$APP_DIR
-
-echo "Pulling latest code..."
-if [ -d ".git" ]; then
-    git pull origin \$GIT_BRANCH
-else
-    git clone --depth 1 --branch \$GIT_BRANCH \$GIT_URL .
-fi
-
-echo "Building Docker image..."
-docker-compose build --no-cache
-
-echo "Stopping existing container..."
-docker-compose down || true
-
-echo "Starting new container..."
-docker-compose up -d
-
-echo "Cleaning up old images..."
-docker image prune -f
-
-echo "Deployment complete!"
-docker-compose ps
-EOF
-
-    # Copy docker-compose.yml to server
-    echo -e "${YELLOW}Copying files to server...${NC}"
-    scp docker-compose.yml Dockerfile nginx.conf "$SERVER:/tmp/"
-    
-    # Execute deployment on server
-    echo -e "${YELLOW}Executing deployment on server...${NC}"
-    ssh "$SERVER" << 'ENDSSH'
-#!/bin/bash
-set -e
-
-APP_DIR="/opt/configucci"
-cd $APP_DIR
-
-# Copy files from /tmp
-cp /tmp/docker-compose.yml .
-cp /tmp/Dockerfile .
-cp /tmp/nginx.conf .
-
-# Build and deploy
-docker-compose build --no-cache
-docker-compose down || true
-docker-compose up -d
-
-# Cleanup
-docker image prune -f
-docker-compose ps
-ENDSSH
-    
-    echo -e "${GREEN}==================================${NC}"
-    echo -e "${GREEN}  Remote Deployment Complete!   ${NC}"
-    echo -e "${GREEN}==================================${NC}"
-    echo ""
-    echo -e "Server: ${GREEN}http://${SERVER}${NC}"
-    echo ""
-    echo -e "Useful commands:"
-    echo -e "  SSH to server:    ${YELLOW}ssh ${SERVER}${NC}"
-    echo -e "  View logs:        ${YELLOW}ssh ${SERVER} 'docker-compose logs -f'${NC}"
-    echo -e "  Stop app:         ${YELLOW}ssh ${SERVER} 'docker-compose down'${NC}"
-}
-
-# Check if Docker is available
-if ! command -v docker &> /dev/null; then
-    echo -e "${RED}Docker is not installed or not in PATH${NC}"
-    exit 1
-fi
-
-if ! command -v docker-compose &> /dev/null; then
-    echo -e "${RED}docker-compose is not installed or not in PATH${NC}"
-    exit 1
-fi
-
-# Deploy
-if [ -z "$SERVER" ]; then
-    deploy_local
-else
-    deploy_remote
-fi

docker-compose.yml

@@ -1,34 +0,0 @@
-version: '3.8'
-
-services:
-  configucci:
-    build:
-      context: .
-      dockerfile: Dockerfile
-      args:
-        GIT_URL: https://git.six83.ru/ssa/configucci.git
-        GIT_BRANCH: main
-    container_name: configucci-app
-    ports:
-      - "11088:80"
-    restart: unless-stopped
-    networks:
-      - configucci-network
-    volumes:
-      # Optional: persist nginx logs
-      - nginx-logs:/var/log/nginx
-    environment:
-      - TZ=Europe/Moscow
-    healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost/"]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 10s
-
-networks:
-  configucci-network:
-    driver: bridge
-
-volumes:
-  nginx-logs:

e2e/environment.spec.ts

@@ -119,56 +119,6 @@ test.describe('Environment Management', () => {
     expect(hostPlaceholderCount).toBe(2);
   });
 
-  test('should validate template with unquoted placeholders', async ({ page }) => {
-    await page.goto('/');
-    await page.click('button:has-text("Create new")');
-    await page.waitForTimeout(500);
-    
-    // Add a parameter
-    await page.click('button:has-text("✚")');
-    await page.waitForTimeout(300);
-    const nameInput = page.locator('input[placeholder="name"]');
-    const valueInput = page.locator('input[placeholder="value"]');
-    const addButton = page.locator('button:has-text("✓")');
-    await nameInput.fill('port');
-    await valueInput.fill('8080');
-    await addButton.click();
-    await page.waitForTimeout(500);
-    
-    // Go to Content Template and edit with unquoted placeholder
-    await page.click('a:has-text("Content Template")');
-    await page.waitForTimeout(300);
-    await page.click('button:has-text("Edit")');
-    await page.waitForTimeout(300);
-    
-    // Fill template with unquoted @port@ placeholder
-    const textarea = page.locator('textarea');
-    await textarea.fill('{\n    "Host": "@host@",\n    "Port": @port@,\n    "Url": "http://@host@:@port@/api"\n}');
-    await page.waitForTimeout(300);
-    
-    // Check that Save button is enabled (validation passed)
-    const saveButton = page.locator('button:has-text("Save")');
-    await expect(saveButton).toBeEnabled();
-    
-    // Check that there's no JSON error
-    const errorAlert = page.locator('.alert-danger');
-    await expect(errorAlert).not.toBeVisible();
-    
-    // Save the template
-    await saveButton.click();
-    await page.waitForTimeout(500);
-    
-    // Verify it was saved - should be in view mode with Edit button visible
-    const editButton = page.locator('button:has-text("Edit")');
-    await expect(editButton).toBeVisible();
-    
-    // Verify the template content is displayed correctly
-    const codeContent = page.locator('code');
-    await expect(codeContent).toBeVisible();
-    const content = await codeContent.textContent();
-    expect(content).toContain('@port@');
-  });
-
   test('should download config file with correct filename', async ({ page }) => {
     await page.goto('/');
     await page.click('button:has-text("Create new")');

nginx.conf

@@ -1,36 +0,0 @@
-server {
-    listen 80;
-    server_name localhost;
-    
-    root /usr/share/nginx/html;
-    index index.html;
-
-    # Gzip compression
-    gzip on;
-    gzip_vary on;
-    gzip_min_length 1024;
-    gzip_proxied expired no-cache no-store private auth;
-    gzip_types text/plain text/css text/xml text/javascript application/x-javascript application/xml application/javascript application/json;
-
-    # Security headers
-    add_header X-Frame-Options "SAMEORIGIN" always;
-    add_header X-Content-Type-Options "nosniff" always;
-    add_header X-XSS-Protection "1; mode=block" always;
-
-    # SPA routing - all routes go to index.html
-    location / {
-        try_files $uri $uri/ /index.html;
-    }
-
-    # Cache static assets
-    location ~* \.(js|css|png|jpg|jpeg|gif|ico|svg|woff|woff2|ttf|eot)$ {
-        expires 1y;
-        add_header Cache-Control "public, immutable";
-        access_log off;
-    }
-
-    # Disable cache for index.html
-    location = /index.html {
-        add_header Cache-Control "no-cache, no-store, must-revalidate";
-    }
-}

src/componets/content/ConfigTemplate.tsx

@@ -35,10 +35,9 @@ export function ConfigTemplate(props: ConfigTemplateProps) {
   }
 
   function handleSave() {
-    // Validate JSON before saving (with placeholder support)
+    // Validate JSON before saving
     try {
-      const sanitizedValue = draftContent.replace(/@[^@]+@/g, '1');
-      JSON.parse(sanitizedValue);
+      JSON.parse(draftContent);
       setJsonError(null);
       props.onSaved(draftContent);
       setMode('view');
@@ -53,9 +52,7 @@ export function ConfigTemplate(props: ConfigTemplateProps) {
     try {
       if (value.trim()) {
         // Replace @placeholders@ with valid JSON values for validation
-        // Strategy: Replace ALL @...@ patterns with "1" (valid for both string and numeric contexts)
-        const sanitizedValue = value.replace(/@[^@]+@/g, '1');
-        
+        const sanitizedValue = value.replace(/"@?(\w+)@?"/g, '"__PLACEHOLDER__"');
         JSON.parse(sanitizedValue);
         setJsonError(null);
       } else {

src/test/ConfigTemplate.test.ts

@@ -1,108 +0,0 @@
-import { describe, it, expect } from 'vitest';
-
-describe('JSON Validation with @placeholders@', () => {
-  /**
-   * Helper function that mimics the validation logic in ConfigTemplate.tsx
-   */
-  function validateJsonWithPlaceholders(value: string): { valid: boolean; error?: string } {
-    try {
-      if (!value.trim()) {
-        return { valid: true };
-      }
-
-      // This is the current implementation from ConfigTemplate.tsx
-      // Replace ALL @...@ patterns with "1" (valid for both string and numeric contexts)
-      const sanitizedValue = value.replace(/@[^@]+@/g, '1');
-
-      JSON.parse(sanitizedValue);
-      return { valid: true };
-    } catch (e) {
-      return { valid: false, error: (e as Error).message };
-    }
-  }
-
-  it('should validate quoted placeholders', () => {
-    const json = `{
-      "Host": "@host@",
-      "Port": "@port@"
-    }`;
-    
-    const result = validateJsonWithPlaceholders(json);
-    expect(result.valid).toBe(true);
-  });
-
-  it('should validate unquoted placeholders', () => {
-    const json = `{
-      "Host": "@host@",
-      "Port": @port@
-    }`;
-    
-    const result = validateJsonWithPlaceholders(json);
-    expect(result.valid).toBe(true);
-  });
-
-  it('should validate mixed quoted and unquoted placeholders', () => {
-    const json = `{
-      "Host": "@host@",
-      "Port": @port@,
-      "ApiPath": "@host@:@port@/v1/data",
-      "MessageBroker": {
-        "hosts": @MessageBrokerHosts@
-      }
-    }`;
-    
-    const result = validateJsonWithPlaceholders(json);
-    expect(result.valid).toBe(true);
-  });
-
-  it('should validate placeholders inside strings (URLs)', () => {
-    const json = `{
-      "ApiUrl": "http://@host@:@port@/api"
-    }`;
-    
-    const result = validateJsonWithPlaceholders(json);
-    expect(result.valid).toBe(true);
-  });
-
-  it('should validate complex real-world template', () => {
-    const json = `{
-      "Host": "@host@",
-      "Port": @port@,
-
-      "ApiPath": "@host@:@port@/v1/data",
-
-      "MessageBroker": {
-        "hosts": @MessageBrokerHosts@
-      },
-
-      "basePath": "./@env_name@/in",
-
-      "NoParam": "@no_param@"
-    }`;
-    
-    const result = validateJsonWithPlaceholders(json);
-    expect(result.valid).toBe(true);
-  });
-
-  it('should reject invalid JSON structure', () => {
-    const json = `{
-      "Host": "@host@",
-      "Port": @port@
-      "Missing": "comma"
-    }`;
-    
-    const result = validateJsonWithPlaceholders(json);
-    expect(result.valid).toBe(false);
-    expect(result.error).toContain('Expected');
-  });
-
-  it('should handle empty value', () => {
-    const result = validateJsonWithPlaceholders('');
-    expect(result.valid).toBe(true);
-  });
-
-  it('should handle whitespace only', () => {
-    const result = validateJsonWithPlaceholders('   \n\t  ');
-    expect(result.valid).toBe(true);
-  });
-});