Merge remote-tracking branch 'origin/master' into merge-pr394

# Conflicts:
#	frontend/src/components/Vote/VoteEdit.vue
#	frontend/src/i18n/en.json

Author: mahmoud

.github/workflows/lint-frontend.yml

@@ -0,0 +1,40 @@
+name: Lint & Build Frontend (Vue)
+
+on:
+  workflow_call:
+
+jobs:
+  lint-and-build:
+    name: Lint & Build
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    defaults:
+      run:
+        working-directory: ./frontend
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Cache npm dependencies
+        uses: actions/cache@v4
+        with:
+          path: ~/.npm
+          key: npm-${{ runner.os }}-${{ hashFiles('frontend/package-lock.json') }}
+          restore-keys: npm-${{ runner.os }}-
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: Check formatting (Prettier)
+        run: npx prettier --check src/
+
+      - name: Lint (ESLint)
+        run: npx eslint src/ --ext .vue,.js,.jsx,.cjs,.mjs
+
+      - name: Build
+        run: npm run build

.github/workflows/pr.yml

@@ -0,0 +1,69 @@
+name: CI
+
+on:
+  pull_request:
+    branches: [master]
+    types: [opened, synchronize, reopened]
+  push:
+    branches: [master]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  changes:
+    name: Detect Changes
+    runs-on: ubuntu-latest
+    outputs:
+      backend: ${{ steps.filter.outputs.backend }}
+      frontend: ${{ steps.filter.outputs.frontend }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dorny/paths-filter@v3
+        id: filter
+        with:
+          filters: |
+            backend:
+              - 'montage/**'
+              - 'requirements.txt'
+              - 'requirements.in'
+              - 'setup.py'
+              - 'dockerfile'
+            frontend:
+              - 'frontend/**'
+
+  test-backend:
+    name: Test Backend (Python)
+    needs: changes
+    if: needs.changes.outputs.backend == 'true'
+    uses: ./.github/workflows/test-backend.yml
+
+  lint-frontend:
+    name: Lint & Build Frontend (Vue)
+    needs: changes
+    if: needs.changes.outputs.frontend == 'true'
+    uses: ./.github/workflows/lint-frontend.yml
+
+  ci-complete:
+    name: CI Complete
+    runs-on: ubuntu-latest
+    needs: [test-backend, lint-frontend]
+    if: always()
+    steps:
+      - name: Check job results
+        run: |
+          for job in test-backend lint-frontend; do
+            case "$job" in
+              test-backend)  result="${{ needs.test-backend.result }}" ;;
+              lint-frontend) result="${{ needs.lint-frontend.result }}" ;;
+            esac
+            if [ "$result" != "success" ] && [ "$result" != "skipped" ]; then
+              echo "::error::Job $job failed with result: $result"
+              exit 1
+            fi
+          done
+          echo "All CI jobs passed or were correctly skipped."

.github/workflows/test-backend.yml

@@ -0,0 +1,33 @@
+name: Test Backend (Python)
+
+on:
+  workflow_call:
+
+jobs:
+  test:
+    name: Run Backend Tests
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Build Docker image
+        run: docker build -t montage-ci -f dockerfile .
+
+      - name: Run pytest
+        run: |
+          docker run --rm \
+            -v "${{ github.workspace }}":/app \
+            -e PYTHONPATH=/app \
+            montage-ci \
+            python -m pytest montage/tests/test_web_basic.py \
+              -v --tb=short -p no:cacheprovider
+
+      - name: Verify backend imports
+        run: |
+          docker run --rm \
+            -v "${{ github.workspace }}":/app \
+            -e PYTHONPATH=/app \
+            montage-ci \
+            python -c "from montage import loaders, rdb, admin_endpoints, juror_endpoints; print('All modules import OK')"

.travis.yml

@@ -8,5 +8,6 @@ COPY requirements.txt .
 
 RUN pip install --upgrade pip
 RUN pip install -r requirements.txt
+RUN pip install pytest
 
 EXPOSE 5000

dockerfile

@@ -9,7 +9,9 @@
     "preview": "vite preview",
     "toolforge:build": "export SHELL=/bin/sh && npm run build && cp -r dist/* ../montage/static",
     "lint": "eslint . --ext .vue,.js,.jsx,.cjs,.mjs --fix --ignore-path .gitignore",
-    "format": "prettier --write src/"
+    "format": "prettier --write src/",
+    "lint:check": "eslint src/ --ext .vue,.js,.jsx,.cjs,.mjs",
+    "format:check": "prettier --check src/"
   },
   "dependencies": {
     "@wikimedia/codex": "^1.14.0",

frontend/package.json

@@ -1,16 +1,15 @@
 <template>
   <app-header />
-  <main class="main-container" >
+  <main class="main-container">
     <router-view />
   </main>
-  <app-footer  />
+  <app-footer />
 </template>
 
 <script setup>
 import { RouterView } from 'vue-router'
 import AppHeader from '@/components/AppHeader.vue'
 import AppFooter from '@/components/AppFooter.vue'
-
 </script>
 
 <style scoped>

frontend/src/App.vue

@@ -60,4 +60,4 @@
 
 .cdx-select-vue__handle {
   min-width: 120px;
-}
+}

frontend/src/assets/main.css

@@ -10,7 +10,7 @@
         {{ $t('montage-about') }}</a
       >
       <a href="https://github.com/hatnote/montage" class="footer-link" target="_blank">
-        {{  $t('montage-source-code') }}
+        {{ $t('montage-source-code') }}
       </a>
     </div>
     <div class="footer-right">

frontend/src/components/AppFooter.vue

@@ -8,7 +8,7 @@
           <span>{{ userStore.user.username }}</span>
         </div>
         <cdx-button action="destructive" weight="quiet" @click="userStore.logout">
-          {{  $t('montage-login-logout') }}
+          {{ $t('montage-login-logout') }}
         </cdx-button>
       </div>
       <cdx-select