fix format

.gitea/actions/build/action.yml

@@ -0,0 +1,49 @@
+name: Build docker image
+description: 'builds docker image'
+
+inputs:
+  tag:
+    description: 'Docker image tag'
+    required: true
+  REGISTRY_ACCESS_TOKEN:
+    description: 'Registry token to authenticate'
+    required: true
+  REGISTRY_USER:
+    description: 'Registry user to authenticate'
+    required: true
+
+outputs:
+  image_url:
+    description: 'Full image URL that was built'
+    value: ${{ steps.build.outputs.image_url }}
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Set up Docker Build
+      uses: docker/setup-buildx-action@v3
+
+    - name: Log in to registry
+      uses: docker/login-action@v3
+      with:
+        registry: ${{ vars.INSTANCE_URL }}
+        username: ${{ inputs.REGISTRY_USER }}
+        password: ${{ inputs.REGISTRY_ACCESS_TOKEN }}
+
+    - name: Set repository variable
+      shell: bash
+      id: repo
+      run: |
+        REPOSITORY=$(echo "${{ gitea.repository }}" | tr '[:upper:]' '[:lower:]')
+        echo "name=$REPOSITORY" >> $GITHUB_OUTPUT
+
+    - name: Build and push image
+      uses: docker/build-push-action@v6
+      with:
+        push: true
+        tags: '${{ vars.INSTANCE_URL }}/${{ steps.repo.outputs.name }}:${{ inputs.tag }}'
+
+    - name: Set output
+      shell: bash
+      run: |
+        echo "image_url=${{ vars.INSTANCE_URL }}/${{ steps.repo.outputs.name }}:${{ inputs.tag }}" >> $GITHUB_OUTPUT

.gitea/actions/buildDockerImage.yml

@@ -1,35 +0,0 @@
-name: Build docker image
-inputs:
-  tag:
-    description: 'Docker image tag'
-    required: true
-
-outputs:
-  image_url:
-    description: 'Full image URL that was built'
-    value: ${{ steps.build.outputs.image_url }}
-
-jobs:
-  build_docker:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set up Docker Build
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ vars.INSTANCE_URL }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.REGISTRY_ACCESS_TOKEN }}
-
-      - name: Build and push image
-        uses: docker/build-push-action@v6
-        with:
-          push: true
-          tags: ${{ vars.INSTANCE_URL }}/tech-reborn/phoenix:${{ inputs.tag }}
-
-      - name: Set output
-        shell: bash
-        run: |
-          echo "image_url=${{ vars.INSTANCE_URL }}/tech-reborn/phoenix:${{ inputs.tag }}" >> $GITHUB_OUTPUT

.gitea/actions/deploy.yml

@@ -1,93 +0,0 @@
-name: 'Docker Compose Deploy'
-description: 'Deploy application using Docker Compose'
-
-inputs:
-  compose_file:
-    description: 'Path to docker-compose file'
-    required: false
-    default: 'docker-compose.yml'
-  project_name:
-    description: 'Docker Compose project name'
-    required: true
-  url:
-    description: 'Url of the deployed application'
-    required: true
-  environment_file:
-    description: 'Path to environment file'
-    required: false
-    default: '.env'
-  image_url:
-    description: 'Docker image tag to deploy'
-    required: false
-    default: 'latest'
-  registry:
-    description: 'Docker registry'
-    required: false
-    default: 'git.klemp.dev'
-
-runs:
-  using: 'composite'
-  steps:
-    - uses: webfactory/ssh-agent@v0.9.1
-      with:
-        ssh-private-key: ${{ secrets.SSH_DEPLOYMENT_KEY }}
-
-    - name: Create environment file
-      shell: bash
-      run: |
-        cat > ${{ inputs.environment_file }} << EOF
-        IMAGE_URL=${{ inputs.image_url }}
-        URL=${{ inputs.url }}
-        REGISTRY=${{ inputs.registry }}
-        PROJECT_NAME=${{ inputs.project_name }}
-        COMPOSE_PROJECT_NAME=${{ inputs.project_name }}
-        EOF
-
-    - name: Create Docker context
-      shell: bash
-      run: |
-        # Remove existing context if it exists
-        docker context rm deploy_target 2>/dev/null || true
-
-        # Create new Docker context
-        docker context create deploy_target \
-          --docker "host=ssh://${{ vars.ssh_user }}@${{ vars.ssh_host }}:${{ vars.ssh_port }}"
-
-        # Verify context works
-        docker --context deploy_target info
-
-    - name: Stop existing deployment
-      shell: bash
-      run: |
-        docker-compose --context deploy_target -f ${{ inputs.compose_file }} -p ${{ inputs.project_name }} down --remove-orphans || true
-
-    - name: Pull latest images
-      shell: bash
-      run: |
-        docker-compose --context deploy_target -f ${{ inputs.compose_file }} -p ${{ inputs.project_name }} pull
-
-    - name: Deploy with Docker Compose
-      id: deploy
-      shell: bash
-      run: |
-        # Start services
-        docker-compose --context deploy_target -f ${{ inputs.compose_file }} -p ${{ inputs.project_name }} up -d
-
-        # Wait for services to be healthy
-        echo "Waiting for services to start..."
-        sleep 10
-
-        # Get container names
-        CONTAINERS=$(docker-compose --context deploy_target -f ${{ inputs.compose_file }} -p ${{ inputs.project_name }} ps --services | tr '\n' ',' | sed 's/,$//')
-        echo "containers=$CONTAINERS" >> $GITHUB_OUTPUT
-
-        echo "✅ Deployment completed successfully!"
-        echo "🌐 URL: ${{ inputs.url }}"
-        echo "📦 Containers: $CONTAINERS"
-
-    - name: Show deployment status
-      shell: bash
-      run: |
-        echo "=== Deployment Status ==="
-        docker-compose --context deploy_target -f ${{ inputs.compose_file }} -p ${{ inputs.project_name }} ps
-        echo "========================="

.gitea/actions/deploy/action.yml

@@ -0,0 +1,87 @@
+name: 'Docker Compose Deploy'
+description: 'Deploy application using Docker Compose'
+
+inputs:
+  compose_file:
+    description: 'Path to docker-compose file'
+    required: false
+    default: 'docker-compose.yml'
+  project_name:
+    description: 'Docker Compose project name'
+    required: true
+  url:
+    description: 'Url of the deployed application'
+    required: true
+  environment_file:
+    description: 'Path to environment file'
+    required: false
+    default: '.env'
+  image_url:
+    description: 'Docker image tag to deploy'
+    required: false
+    default: 'latest'
+  registry:
+    description: 'Docker registry'
+    required: false
+    default: 'git.klemp.dev'
+  deployment_key:
+    description: 'SSH deployment private key'
+    required: true
+  ssh_port:
+    description: 'SSH port'
+    required: true
+  ssh_host:
+    description: 'SSH host'
+    required: true
+  ssh_user:
+    description: 'SSH user'
+    required: true
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Get branch name
+      id: branch_name
+      uses: ./.gitea/actions/getTagSafeRef
+
+    - name: Setup SSH
+      uses: webfactory/ssh-agent@v0.9.1
+      with:
+        ssh-private-key: ${{ inputs.deployment_key  }}
+
+    - name: Add SSH host to known hosts
+      shell: bash
+      run: |
+        mkdir -p ~/.ssh
+        ssh-keyscan -p ${{ inputs.ssh_port }} ${{ inputs.ssh_host }} >> ~/.ssh/known_hosts
+
+        cat > .env << EOF
+        IMAGE_URL='${{ inputs.image_url }}'
+        URL='${{ inputs.url }}'
+        REGISTRY=git.klemp.dev
+        PROJECT_NAME=${{ steps.branch_name.outputs.branch_name }}
+        COMPOSE_PROJECT_NAME=${{ steps.branch_name.outputs.branch_name }}
+        EOF
+
+        docker context rm deploy_target 2>/dev/null || true
+        docker context create deploy_target --docker "host=ssh://${{ inputs.ssh_user }}@${{ inputs.ssh_host }}:${{ inputs.ssh_port }}"
+
+        DOCKER_CONTEXT=deploy_target docker compose -f docker-compose.yml -p ${{ steps.branch_name.outputs.branch_name }} down --remove-orphans || true
+
+        DOCKER_CONTEXT=deploy_target docker compose -f docker-compose.yml -p ${{ steps.branch_name.outputs.branch_name }} pull
+
+        DOCKER_CONTEXT=deploy_target docker compose -f docker-compose.yml -p ${{ steps.branch_name.outputs.branch_name }} up -d
+
+        echo "Waiting for services to start..."
+        sleep 10
+
+        CONTAINERS=$(DOCKER_CONTEXT=deploy_target docker compose -f docker-compose.yml -p ${{ steps.branch_name.outputs.branch_name }} ps --services | tr '\n' ',' | sed 's/,$//')
+        echo "containers=$CONTAINERS" >> $GITHUB_OUTPUT
+
+        echo "✅ Deployment completed successfully!"
+        echo "🌐 URL: ${{ inputs.url }}"
+        echo "📦 Containers: $CONTAINERS"
+
+        echo "=== Deployment Status ==="
+        DOCKER_CONTEXT=deploy_target docker compose -f docker-compose.yml -p ${{ steps.branch_name.outputs.branch_name }} ps
+        echo "========================="

.gitea/actions/getTagSafeRef/action.yml

@@ -9,11 +9,40 @@ outputs:
 runs:
   using: 'composite'
   steps:
+    - name: Get PR branch info via Gitea API
+      if: github.event.issue.pull_request
+      id: pr-info
+      shell: bash
+      run: |
+        # Use Gitea's API endpoint
+        PR_URL="${{ github.event.issue.pull_request.url }}"
+
+        # Extract PR info using curl (Gitea API is similar to GitHub)
+        PR_INFO=$(curl -s -H "Authorization: token ${{ gitea.token }}" "${{ gitea.api_url }}/repos/${{ gitea.repository }}/pulls/${{ gitea.event.issue.number }}")
+
+        # Extract branch name from JSON response
+        BRANCH_NAME=$(echo "$PR_INFO" | jq -r '.head.ref')
+
+        echo "pr_branch=$BRANCH_NAME" >> $GITHUB_OUTPUT
+        echo "Found PR branch: $BRANCH_NAME"
+
     - name: Create tag safe branch name
       id: get-branch
       shell: bash
       run: |
-        BRANCH_NAME="${{ github.ref }}"
+        if [[ "${{ github.event.issue.pull_request }}" != "" && "${{ github.event.issue.pull_request }}" != "null" ]]; then
+          # This is a PR comment - use the branch we got from API
+          BRANCH_NAME="${{ steps.pr-info.outputs.pr_branch }}"
+          echo "Using PR branch: $BRANCH_NAME"
+        elif [[ "${{ github.head_ref }}" != "" ]]; then
+          # This is a PR workflow
+          BRANCH_NAME="${{ github.head_ref }}"
+          echo "Using head ref: $BRANCH_NAME"
+        else
+          # This is a push to main/other branch
+          BRANCH_NAME="${{ github.ref_name }}"
+          echo "Using ref name: $BRANCH_NAME"
+        fi
 
         # Clean the branch name for Docker tag compatibility
         CLEAN_BRANCH=$(echo "$BRANCH_NAME" | sed 's/[^a-zA-Z0-9._-]/-/g' | tr '[:upper:]' '[:lower:]')

.gitea/workflows/commentDeploy.yml

@@ -2,30 +2,81 @@ name: ChatOps Deploy
 on: issue_comment
 
 jobs:
-  testing:
+  FeatureDeployment:
-    # if: |
+    if: |
-    #   github.event.issue.pull_request &&
+      gitea.event.issue.pull_request &&
-    #   startsWith(github.event.comment.body, '/deploy') &&
+      startsWith(gitea.event.comment.body, '/deploy')
-    #   (github.event.comment.author_association == 'OWNER' ||
-    #    github.event.comment.author_association == 'MEMBER')
     runs-on: ubuntu-latest
     steps:
-      - name: Get tag safe branch name
+      - name: Checkout
-        id: branch_name
+        uses: actions/checkout@v4
-        uses: .gitea/actions/getTagSafeRef
 
-      - name: Print branch_name
+      - name: Get branch name
-        run: echo "${{ steps.branch_name.outputs.branch_name }}"
+        id: branch_name
+        uses: ./.gitea/actions/getTagSafeRef
 
       # - name: Build and push image
       #   id: docker_build
-      #   uses: ./.github/actions/buildDockerImage
+      #   uses: ./.gitea/actions/build
       #   with:
       #     tag: ${{ steps.branch_name.outputs.branch_name }}
+      #     REGISTRY_ACCESS_TOKEN: ${{ secrets.REGISTRY_ACCESS_TOKEN }}
+      #     REGISTRY_USER: ${{ gitea.actor }}
 
-      # - name: Deploy application
+      - name: Create environment file
-      #   uses: ./.github/actions/deploy
+        run: |
-      #   with:
+          cat > .env << EOF
-      #     project_name: ${{ steps.branch_name.outputs.branch_name }}
+          TOLGEE_API_URL=${{ vars.TOLGEE_API_URL }}
-      #     url: '${{ steps.branch_name.outputs.branch_name }}.phoenix.klemp.local'
+          TOLGEE_API_KEY=${{ secrets.TOLGEE_API_KEY }}
-      #     image_url: ${{ steps.docker_build.outputs.image_url }}
+          TRANSLATION_CACHE_TTL=${{ vars.TRANSLATION_CACHE_TTL }}
+          EOF
+
+      - name: Deploy application
+        uses: ./.gitea/actions/deploy
+        with:
+          project_name: ${{ steps.branch_name.outputs.branch_name }}
+          url: '${{ steps.branch_name.outputs.branch_name }}.phoenix.klemp.local'
+          # image_url: ${{ steps.docker_bui ld.outputs.image_url }}
+          image_url: 'git.klemp.dev/tech-reborn/phoenix:feature-branch-deployments'
+          deployment_key: ${{ secrets.SSH_DEPLOYMENT_KEY  }}
+          ssh_host: ${{ vars.ssh_host }}
+          ssh_port: ${{ vars.ssh_port }}
+          ssh_user: ${{ vars.ssh_user }}
+
+      # - name: Remove old Docker context
+      #   run: 'docker context rm deploy_target 2>/dev/null || true'
+
+      # - name: Create Docker context
+      #   run: 'docker context create deploy_target --docker "host=ssh://${{ vars.ssh_user }}@${{ vars.ssh_host }}:${{ vars.ssh_port }}"'
+
+      # - name: Validate Docker context
+      #   run: 'docker --context deploy_target info'
+
+      # - name: Stop existing deployment
+      #   run: |
+      #     DOCKER_CONTEXT=deploy_target docker compose -f docker-compose.yml -p ${{ steps.branch_name.outputs.branch_name }} down --remove-orphans || true
+
+      # - name: Pull latest images
+      #   run: |
+      #     DOCKER_CONTEXT=deploy_target docker compose -f docker-compose.yml -p ${{ steps.branch_name.outputs.branch_name }} pull
+
+      # - name: Deploy with Docker Compose
+      #   id: deploy
+      #   run: |
+      #     DOCKER_CONTEXT=deploy_target docker compose -f docker-compose.yml -p ${{ steps.branch_name.outputs.branch_name }} up -d
+
+      #     echo "Waiting for services to start..."
+      #     sleep 10
+
+      #     CONTAINERS=$(DOCKER_CONTEXT=deploy_target docker compose -f docker-compose.yml -p ${{ steps.branch_name.outputs.branch_name }} ps --services | tr '\n' ',' | sed 's/,$//')
+      #     echo "containers=$CONTAINERS" >> $GITHUB_OUTPUT
+
+      #     echo "✅ Deployment completed successfully!"
+      #     echo "🌐 URL: ${{ steps.branch_name.outputs.branch_name }}.phoenix.klemp.local"
+      #     echo "📦 Containers: $CONTAINERS"
+
+      # - name: Show deployment status
+      #   run: |
+      #     echo "=== Deployment Status ==="
+      #     DOCKER_CONTEXT=deploy_target docker compose -f docker-compose.yml -p ${{ steps.branch_name.outputs.branch_name }} ps
+      #     echo "========================="

.gitea/workflows/deploy.yml

@@ -0,0 +1,112 @@
+name: Deploy
+
+on:
+  push:
+    branches:
+      - develop
+    tags:
+      - '*'
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v4
+
+      - name: Get branch name
+        id: branch_name
+        uses: ./.gitea/actions/getTagSafeRef
+
+      - name: Determine image tag
+        id: image_tag
+        run: |
+          if [[ ${{ github.ref }} == refs/tags/* ]]; then
+            IMAGE_TAG=${{ github.ref_name }}
+            ENVIRONMENT=production
+          elif [[ ${{ github.ref }} == refs/heads/develop ]]; then
+            IMAGE_TAG="develop"
+            ENVIRONMENT=develop
+          fi
+          echo "tag=$IMAGE_TAG" >> $GITHUB_OUTPUT
+          echo "env=$ENVIRONMENT" >> $GITHUB_OUTPUT
+          echo "Image tag will be: $IMAGE_TAG"
+          echo "env will be: $ENVIRONMENT"
+
+      - name: Build and push image
+        id: docker_build
+        uses: ./.gitea/actions/build
+        with:
+          tag: ${{ steps.image_tag.outputs.tag }}
+          REGISTRY_ACCESS_TOKEN: ${{ secrets.REGISTRY_ACCESS_TOKEN }}
+          REGISTRY_USER: ${{ gitea.actor }}
+
+      - name: Determine URL
+        id: url
+        run: |
+          if [[ ${{ github.ref_type }} == "tag" ]]; then
+            URL="phoenix.klemp.local"
+          elif [[ ${{ github.ref_name }} == "develop" ]]; then
+            URL="develop.phoenix.klemp.local"
+          fi
+          echo "url=$URL" >> $GITHUB_OUTPUT
+          echo "URL will be: $URL"
+
+      - name: Setup SSH
+        uses: webfactory/ssh-agent@v0.9.1
+        with:
+          ssh-private-key: ${{ secrets.SSH_DEPLOYMENT_KEY  }}
+
+      - name: Add SSH host to known hosts
+        shell: bash
+        run: |
+          mkdir -p ~/.ssh
+          ssh-keyscan -p ${{ vars.ssh_port }} ${{ vars.ssh_host }} >> ~/.ssh/known_hosts
+
+      - name: Create environment file
+        run: |
+          cat > .env << EOF
+          IMAGE_URL='${{ steps.docker_build.outputs.image_url }}'
+          URL='${{ steps.url.outputs.url }}'
+          REGISTRY=git.klemp.dev
+          PROJECT_NAME=${{ steps.branch_name.outputs.branch_name }}
+          COMPOSE_PROJECT_NAME=${{ steps.branch_name.outputs.branch_name }}
+          TOLGEE_API_URL=${{ vars.TOLGEE_API_URL }}
+          TOLGEE_API_KEY=${{ secrets.TOLGEE_API_KEY }}
+          TRANSLATION_CACHE_TTL=${{ vars.TRANSLATION_CACHE_TTL }}
+          EOF
+
+      - name: Remove old Docker context
+        run: 'docker context rm deploy_target 2>/dev/null || true'
+
+      - name: Create Docker context
+        run: 'docker context create deploy_target --docker "host=ssh://${{ vars.ssh_user }}@${{ vars.ssh_host }}:${{ vars.ssh_port }}"'
+
+      - name: Stop existing deployment
+        run: |
+          DOCKER_CONTEXT=deploy_target docker compose -f docker-compose.yml -p ${{ steps.image_tag.outputs.env }} down --remove-orphans || true
+
+      - name: Pull latest images
+        run: |
+          DOCKER_CONTEXT=deploy_target docker compose -f docker-compose.yml -p ${{ steps.image_tag.outputs.env }} pull
+
+      - name: Deploy with Docker Compose
+        id: deploy
+        run: |
+          DOCKER_CONTEXT=deploy_target docker compose -f docker-compose.yml -p ${{ steps.image_tag.outputs.env }} up -d
+
+          echo "Waiting for services to start..."
+          sleep 10
+
+          CONTAINERS=$(DOCKER_CONTEXT=deploy_target docker compose -f docker-compose.yml -p ${{ steps.image_tag.outputs.env }} ps --services | tr '\n' ',' | sed 's/,$//')
+          echo "containers=$CONTAINERS" >> $GITHUB_OUTPUT
+
+          echo "✅ Deployment completed successfully!"
+          echo "🌐 URL: ${{ steps.url.outputs.url }}"
+          echo "📦 Containers: $CONTAINERS"
+
+      - name: Show deployment status
+        run: |
+          echo "=== Deployment Status ==="
+          DOCKER_CONTEXT=deploy_target docker compose -f docker-compose.yml -p ${{ steps.image_tag.outputs.env }} ps
+          echo "========================="

docker-compose.yml

@@ -1,20 +1,27 @@
-version: '3.8'
 networks:
+  tolgee:
+    name: tolgee
+    external: true
   default:
-    external:
+    name: traefik-proxy
-      name: traefik-proxy
+    external: true
 
 services:
   app:
     image: ${IMAGE_URL}
     container_name: ${PROJECT_NAME}-app
-    restart: unless-stopped
     networks:
-      - traefik
+      - tolgee
-      - internal
+    environment:
+      TOLGEE_API_URL: ${TOLGEE_API_URL}
+      TOLGEE_API_KEY: ${TOLGEE_API_KEY}
+      TRANSLATION_CACHE_TTL: ${TRANSLATION_CACHE_TTL}
+    restart: unless-stopped
     labels:
       - traefik.enable=true
       - traefik.docker.network=traefik-proxy
+
+      - traefik.http.routers.${PROJECT_NAME}.entrypoints=http
+      - traefik.http.routers.${PROJECT_NAME}.service=${PROJECT_NAME}
       - traefik.http.routers.${PROJECT_NAME}.rule=Host(`${URL}`)
-      - traefik.http.routers.${PROJECT_NAME}.tls.certresolver=letsencrypt
       - traefik.http.services.${PROJECT_NAME}.loadbalancer.server.port=3000

src/lib/server/LanguageService.ts

@@ -64,6 +64,7 @@ class LanguageService {
 
   protected async fetchTranslations(languageCodes: string | string[]) {
     const url = new URL(`${env.TOLGEE_API_URL}/v2/projects/2/export`)
+    console.log('Getting language data', url.toString())
 
     url.searchParams.append('format', 'JSON')
     url.searchParams.append('zip', 'true')
@@ -76,7 +77,6 @@ class LanguageService {
     if (!env.TOLGEE_API_KEY) {
       throw new Error('TOLGEE_API_KEY not set')
     }
-
     const response = await fetch(url, {
       method: 'GET',
       headers: {

tsconfig.json

@@ -9,8 +9,8 @@
     "skipLibCheck": true,
     "sourceMap": true,
     "strict": true,
-    "moduleResolution": "bundler",
+    "moduleResolution": "bundler"
-  },
+  }
   // Path aliases are handled by https://svelte.dev/docs/kit/configuration#alias
   // except $lib which is handled by https://svelte.dev/docs/kit/configuration#files
   //