Refactor configuration files for consistency and readability. Update docker-compose and podman-compose to use single quotes for strings. Adjust healthcheck commands to use single quotes. Clean up whitespace in various files, including README and JSON language files, to ensure proper formatting.

.github/ISSUE_TEMPLATE/config.yml

@@ -1,6 +1,5 @@
-
 blank_issues_enabled: false
 contact_links:
-  - name: "🤔 Ask a question"
+  - name: '🤔 Ask a question'
     url: https://github.com/umami-software/umami/discussions
-    about: Ask questions and discuss with other community members.
+    about: Ask questions and discuss with other community members.

.github/workflows/cd-manual.yml

@@ -55,4 +55,4 @@ jobs:
           buildArgs: DATABASE_TYPE=${{ matrix.db-type }}
           registry: docker.io
           username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/cd.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set env
         run: |
           echo "NOW=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_ENV
-          
+
       - name: Generate tags
         id: generate_tags
         run: |
@@ -47,4 +47,4 @@ jobs:
           buildArgs: DATABASE_TYPE=${{ matrix.db-type }}
           registry: docker.io
           username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/ci.yml

@@ -18,21 +18,21 @@ jobs:
     strategy:
       matrix:
         include:
-        - node-version: 18.18
+          - node-version: 18.18
-          db-type: postgresql
+            db-type: postgresql
-        - node-version: 18.18
+          - node-version: 18.18
-          db-type: mysql
+            db-type: mysql
 
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
-    - name: Use Node.js ${{ matrix.node-version }}
+      - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
+        uses: actions/setup-node@v4
-      with:
+        with:
-        node-version: ${{ matrix.node-version }}
+          node-version: ${{ matrix.node-version }}
-        cache: 'yarn'
+          cache: 'yarn'
-      env:
+        env:
-        DATABASE_TYPE: ${{ matrix.db-type }}
+          DATABASE_TYPE: ${{ matrix.db-type }}
-    - run: npm install --global yarn
+      - run: npm install --global yarn
-    - run: yarn install
+      - run: yarn install
-    - run: yarn test
+      - run: yarn test
-    - run: yarn build
+      - run: yarn build

docker-compose.yml

@@ -3,7 +3,7 @@ services:
   umami:
     image: ghcr.io/umami-software/umami:postgresql-latest
     ports:
-      - "3000:3000"
+      - '3000:3000'
     environment:
       DATABASE_URL: postgresql://umami:umami@db:5432/umami
       DATABASE_TYPE: postgresql
@@ -14,7 +14,7 @@ services:
     init: true
     restart: always
     healthcheck:
-      test: ["CMD-SHELL", "curl http://localhost:3000/api/heartbeat"]
+      test: ['CMD-SHELL', 'curl http://localhost:3000/api/heartbeat']
       interval: 5s
       timeout: 5s
       retries: 5
@@ -28,7 +28,7 @@ services:
       - umami-db-data:/var/lib/postgresql/data
     restart: always
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      test: ['CMD-SHELL', 'pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}']
       interval: 5s
       timeout: 5s
       retries: 5

next.config.mjs

@@ -178,7 +178,8 @@ if (cloudMode && cloudUrl) {
 
 // Disable standalone output on Windows to avoid symlink errors during build.
 // Enable by setting NEXT_STANDALONE=true when needed (e.g., Docker/Linux deploys).
-const enableStandaloneOutput = process.platform !== 'win32' && (process.env.NEXT_STANDALONE !== 'false');
+const enableStandaloneOutput =
+  process.platform !== 'win32' && process.env.NEXT_STANDALONE !== 'false';
 
 /** @type {import('next').NextConfig} */
 export default {

podman/README.md

@@ -1,6 +1,5 @@
 # How to deploy umami on podman
 
-
 ## How to use
 
 1. Rename `env.sample` to `.env`
@@ -9,7 +8,6 @@
 
 If you need to stop umami, you can do so by running `podman-compose down`.
 
-
 ### Install systemd service (optional)
 
 If you want to install a systemd service to run umami, you can use the provided
@@ -17,9 +15,8 @@ systemd service.
 
 Edit `umami.service` and change these two variables:
 
-
+    WorkingDirectory=/opt/apps/umami
-	WorkingDirectory=/opt/apps/umami
+    EnvironmentFile=/opt/apps/umami/.env
-	EnvironmentFile=/opt/apps/umami/.env
 
 `WorkingDirectory` should be changed to the path in which `podman-compose.yml`
 is located.
@@ -30,16 +27,13 @@ located.
 You can run the script `install-systemd-user-service` to install the systemd
 service under the current user.
 
-
+    ./install-systemd-user-service
-	./install-systemd-user-service
 
 Note: this script will enable the service and also start it. So it will assume
-that umami is not currently running.  If you started it previously, bring it
+that umami is not currently running. If you started it previously, bring it
 down using:
 
-	podman-compose down
+    podman-compose down
-
-
 
 ## Compatibility
 

podman/podman-compose.yml

@@ -1,11 +1,11 @@
-version: "3.8"
+version: '3.8'
 
 services:
   umami:
     container_name: umami
     image: ghcr.io/umami-software/umami:postgresql-latest
     ports:
-      - "127.0.0.1:3000:3000"
+      - '127.0.0.1:3000:3000'
     environment:
       DATABASE_URL: ${DATABASE_URL}
       DATABASE_TYPE: ${DATABASE_TYPE}
@@ -16,7 +16,7 @@ services:
     init: true
     restart: always
     healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:3000/api/heartbeat || exit 1"]
+      test: ['CMD-SHELL', 'curl -f http://localhost:3000/api/heartbeat || exit 1']
       interval: 5s
       timeout: 5s
       retries: 5
@@ -32,7 +32,7 @@ services:
       - umami-db-data:/var/lib/postgresql/data:Z
     restart: always
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
+      test: ['CMD-SHELL', 'pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}']
       interval: 5s
       timeout: 5s
       retries: 5

public/site.webmanifest

@@ -1,19 +1,19 @@
 {
-    "name": "",
+  "name": "",
-    "short_name": "",
+  "short_name": "",
-    "icons": [
+  "icons": [
-        {
+    {
-            "src": "/android-chrome-192x192.png",
+      "src": "/android-chrome-192x192.png",
-            "sizes": "192x192",
+      "sizes": "192x192",
-            "type": "image/png"
+      "type": "image/png"
-        },
+    },
-        {
+    {
-            "src": "/android-chrome-512x512.png",
+      "src": "/android-chrome-512x512.png",
-            "sizes": "512x512",
+      "sizes": "512x512",
-            "type": "image/png"
+      "type": "image/png"
-        }
+    }
-    ],
+  ],
-    "theme_color": "#ffffff",
+  "theme_color": "#ffffff",
-    "background_color": "#ffffff",
+  "background_color": "#ffffff",
-    "display": "standalone"
+  "display": "standalone"
 }

rollup.tracker.config.mjs

@@ -10,8 +10,8 @@ export default {
   },
   plugins: [
     replace({
-      '__COLLECT_API_HOST__': process.env.COLLECT_API_HOST || '',
+      __COLLECT_API_HOST__: process.env.COLLECT_API_HOST || '',
-      '__COLLECT_API_ENDPOINT__': process.env.COLLECT_API_ENDPOINT || '/api/send',
+      __COLLECT_API_ENDPOINT__: process.env.COLLECT_API_ENDPOINT || '/api/send',
       delimiters: ['', ''],
       preventAssignment: true,
     }),

src/lang/de-CH.json

@@ -276,4 +276,4 @@
   "message.viewed-page": "Siite agluegt",
   "message.visitor-log": "Bsuecher us {country} nutzt {browser} uf {os} {device}",
   "message.visitors-dropped-off": "Bsuercher verlore"
-}
+}

src/lang/nb-NO.json

@@ -276,5 +276,4 @@
   "message.viewed-page": "Vist side",
   "message.visitor-log": "Besøkende fra {country} med {browser} på {os} {device}",
   "message.visitors-dropped-off": "Besøkende falt fra"
-
 }