Merge pull request #1 from eduardolat/main

Update pgbackweb

Author: AMufInABox

scripts/startup.sh .devcontainer/.bashrcscripts/startup.sh renamed to .devcontainer/.bashrc

@@ -11,24 +11,20 @@ alias la='ls -A'
 alias l='ls -CF'
 alias ..='cd ..'
 alias c='clear'
-echo "[OK] aliases set"
 
 # Set the user file-creation mode mask to 000, which allows all
 # users read, write, and execute permissions for newly created files.
 umask 000
-echo "[OK] umask set"
 
 # Run the 'fixperms' task that fixes the permissions of the files and
 # directories in the project.
 task fixperms
-echo "[OK] permissions fixed"
 
 # Configure Git to ignore ownership and file mode changes.
 git config --global --add safe.directory '*'
 git config --global core.fileMode false
 git config --unset core.fileMode
 git config core.fileMode false
-echo "[OK] git configured"
 
 echo "
 ───────────────────────────────────────────────

.devcontainer/devcontainer.json

@@ -7,7 +7,7 @@
       "extensions": [
         "golang.go",
         "bradlc.vscode-tailwindcss",
-        "denoland.vscode-deno",
+        "esbenp.prettier-vscode",
         "mhutchie.git-graph",
         "mutantdino.resourcemonitor",
         "Compile-TomaszKasperczyk.copy-to-llm"
@@ -18,59 +18,47 @@
         /////
         "editor.formatOnSave": true,
         "editor.foldingStrategy": "indentation",
-        "editor.rulers": [
-          80
-        ],
+        "editor.rulers": [80],
         "files.eol": "\n",
         /////
         // Language specific settings
         /////
         "[json]": {
-          "editor.defaultFormatter": "denoland.vscode-deno"
+          "editor.defaultFormatter": "esbenp.prettier-vscode"
         },
         "[jsonc]": {
-          "editor.defaultFormatter": "denoland.vscode-deno"
+          "editor.defaultFormatter": "esbenp.prettier-vscode"
         },
         "[typescript]": {
-          "editor.defaultFormatter": "denoland.vscode-deno"
+          "editor.defaultFormatter": "esbenp.prettier-vscode"
         },
         "[javascript]": {
-          "editor.defaultFormatter": "denoland.vscode-deno"
+          "editor.defaultFormatter": "esbenp.prettier-vscode"
         },
         "[css]": {
-          "editor.defaultFormatter": "denoland.vscode-deno"
+          "editor.defaultFormatter": "esbenp.prettier-vscode"
         },
         "[html]": {
-          "editor.defaultFormatter": "denoland.vscode-deno"
+          "editor.defaultFormatter": "esbenp.prettier-vscode"
         },
         "[markdown]": {
-          "editor.defaultFormatter": "denoland.vscode-deno"
+          "editor.defaultFormatter": "esbenp.prettier-vscode"
         },
         // Go & Golangci-lint
         "[go]": {
           "editor.defaultFormatter": "golang.go"
         },
         "go.lintTool": "golangci-lint",
-        "go.lintFlags": [
-          "--fast"
-        ],
-        // Deno
-        "deno.enable": true,
+        "go.lintFlags": ["--fast"],
         /////
         // Tailwind CSS + NodX
         /////
         "tailwindCSS.includeLanguages": {
           "go": "go"
         },
         "tailwindCSS.experimental.classRegex": [
-          [
-            "Class\\(([^)]*)\\)",
-            "[\"`]([^\"`]*)[\"`]"
-          ], // Class("...") or Class(`...`)
-          [
-            "ClassMap\\{([^)]*)\\}",
-            "[\"`]([^\"`]*)[\"`]"
-          ] // ClassMap{"..."} or ClassMap{`...`}
+          ["Class\\(([^)]*)\\)", "[\"`]([^\"`]*)[\"`]"], // Class("...") or Class(`...`)
+          ["ClassMap\\{([^)]*)\\}", "[\"`]([^\"`]*)[\"`]"] // ClassMap{"..."} or ClassMap{`...`}
         ]
       }
     }

.env.example

@@ -12,6 +12,10 @@ PBW_LISTEN_HOST=""
 # The port on which the pgbackweb will listen for incoming HTTP requests.
 PBW_LISTEN_PORT=""
 
+# Path prefix to use for all routes. If you set this to e.g. "/pgbackweb",
+# the web interface will be available at http://<host>:<port>/pgbackweb
+PBW_PATH_PREFIX=""
+
 # Your timezone, this impacts logging, backup filenames and default timezone
 # in the web interface.
 TZ=""

.github/workflows/lint-test-build.yaml .github/workflows/ci.yaml.github/workflows/lint-test-build.yaml renamed to .github/workflows/ci.yaml

@@ -1,4 +1,4 @@
-name: Lint, test, and build
+name: CI (Lint, Test, Build)
 on:
   workflow_dispatch:
   push:
@@ -11,13 +11,14 @@ on:
       - develop
 
 jobs:
-  lint-test-build:
+  ci:
     strategy:
       matrix:
-        vars: [
-          { os: ubuntu-24.04, platform: linux/amd64 },
-          { os: ubuntu-24.04-arm, platform: linux/arm64 },
-        ]
+        vars:
+          [
+            { os: ubuntu-24.04, platform: linux/amd64 },
+            { os: ubuntu-24.04-arm, platform: linux/arm64 },
+          ]
 
     name: Lint, test, and build the code
     runs-on: ${{ matrix.vars.os }}
@@ -41,14 +42,4 @@ jobs:
           --file docker/Dockerfile.dev .
 
       - name: Run lint, test, and build
-        run: >
-          docker run --rm -v $PWD:/app pgbackweb:latest /bin/bash -c "
-            cd /app &&
-            deno install &&
-            go mod download &&
-            task fixperms &&
-            task check-deps &&
-            task lint-only &&
-            task test-only &&
-            task build
-          "
+        run: docker run --rm -v $PWD:/app pgbackweb:latest /bin/bash -c "cd /app && task ci"

.github/workflows/docs-deploy.yaml

@@ -0,0 +1,28 @@
+name: Deploy Documentation
+
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "docs/**"
+
+jobs:
+  deploy:
+    name: Deploy to Cloudflare Pages
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      deployments: write
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Deploy
+        uses: cloudflare/wrangler-action@v3
+        with:
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          command: pages deploy ./docs --project-name=ufobackup
+          gitHubToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/publish-docker-image.yaml

@@ -8,7 +8,7 @@ on:
         required: true
         default: main
       tag:
-        description: The version tag for the Docker image (e.g., 1.0.0)
+        description: The version tag for the Docker image (e.g., 1.0.0) ⚠️ Without v prefix ⚠️
         required: true
       latest:
         description: Choose "yes" to also tag the image as "latest" in Docker Hub
@@ -22,10 +22,11 @@ jobs:
   build-and-push-images:
     strategy:
       matrix:
-        vars: [
-          { os: ubuntu-24.04, platform: amd64 },
-          { os: ubuntu-24.04-arm, platform: arm64 },
-        ]
+        vars:
+          [
+            { os: ubuntu-24.04, platform: amd64 },
+            { os: ubuntu-24.04-arm, platform: arm64 },
+          ]
 
     name: Build and push images
     runs-on: ${{ matrix.vars.os }}
@@ -37,6 +38,9 @@ jobs:
         with:
           ref: ${{ github.event.inputs.commit }}
 
+      - name: Set tag version
+        run: chmod +x ./scripts/set-version.sh && ./scripts/set-version.sh v${{ github.event.inputs.tag }}
+
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:

.golangci.yaml

@@ -1,12 +1,27 @@
-run:
-  timeout: "5m"
-
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
     - errcheck
-    - gosimple
     - govet
     - ineffassign
     - staticcheck
     - unused
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

.prettierignore

@@ -0,0 +1,2 @@
+internal/view/static/libs/
+internal/view/static/build/

.prettierrc

@@ -1,34 +1,22 @@
 {
   "If error return error": {
     "prefix": "rerr",
-    "body": [
-      "if err != nil {",
-      "\treturn err",
-      "}",
-      ""
-    ],
-    "description": "Inserts code to check for error and return it"
+    "body": ["if err != nil {", "\treturn err", "}", ""],
+    "description": "Inserts code to check for error and return it",
   },
   "Get request context": {
     "prefix": "grcr", // Get Request Context Request
-    "body": [
-      "ctx := c.Request().Context()"
-    ],
-    "description": "Get's the request from echo context"
+    "body": ["ctx := c.Request().Context()"],
+    "description": "Get's the request from echo context",
   },
   "Get request echo context": {
     "prefix": "grce", // Get Request Context Echo
-    "body": [
-      "reqCtx := reqctx.GetCtx(c)"
-    ],
-    "description": "Inserts code to get echo context from a request"
+    "body": ["reqCtx := reqctx.GetCtx(c)"],
+    "description": "Inserts code to get echo context from a request",
   },
   "Get both request and echo context": {
     "prefix": "grcb", // Get Request Context Both
-    "body": [
-      "ctx := c.Request().Context()",
-      "reqCtx := reqctx.GetCtx(c)"
-    ],
-    "description": "Inserts code to get both request and echo context"
+    "body": ["ctx := c.Request().Context()", "reqCtx := reqctx.GetCtx(c)"],
+    "description": "Inserts code to get both request and echo context",
   },
-}
+}