added cancel to login

.gitea/workflows/commit.yaml

@@ -3,23 +3,12 @@ run-name: ${{ gitea.event.head_commit.message }}
 on:
   push:
     branches:
+      - dev
       - master
 jobs:
-  test:
-    runs-on: debian-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Install Bats
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y bats
-      - name: Run Shell Tests
-        run: bats tests/shell/git_update.bats
-
   deploy:
+    if: gitea.ref_name == 'master'
     runs-on: self-hosted
-    needs: test
     steps:
       - name: Custom Checkout
         env:
@@ -43,6 +32,7 @@ jobs:
           rm .vault_pass.txt
 
   promote_stable:
+    if: gitea.ref_name == 'master'
     runs-on: self-hosted
     needs: deploy
     steps:

resources/js/pages/Acp.jsx

@@ -63,7 +63,6 @@ const StatusIcon = ({ status = 'bad', tooltip }) => {
 }
 
 function Acp({ isAdmin }) {
-    const forcedMinPhpForTesting = '>=8.5'
     const { t } = useTranslation()
     const { roles: authRoles } = useAuth()
     const canManageFounder = authRoles.includes('ROLE_FOUNDER')
@@ -470,11 +469,21 @@ function Acp({ isAdmin }) {
     }
 
     const cliDefaultPhpIsSufficient = useMemo(() => {
+        const minimum = parseMinPhpConstraint(systemStatus?.min_versions?.php)
         const current = normalizeSemver(systemStatus?.php_default_version)
-        const minimum = parseMinPhpConstraint(forcedMinPhpForTesting || systemStatus?.min_versions?.php)
-        if (!current || !minimum) return false
+        if (!minimum) return true
+        if (!current) return false
         return compareSemver(current, minimum) >= 0
-    }, [systemStatus, forcedMinPhpForTesting])
+    }, [systemStatus])
+
+    const phpSelectedIsSufficient = useMemo(() => {
+        if (!systemStatus?.php_selected_ok) return false
+        const minimum = parseMinPhpConstraint(systemStatus?.min_versions?.php)
+        const current = normalizeSemver(systemStatus?.php_selected_version)
+        if (!minimum) return true
+        if (!current) return false
+        return compareSemver(current, minimum) >= 0
+    }, [systemStatus])
 
     const systemChecks = useMemo(() => {
         if (!systemStatus) return []
@@ -483,9 +492,9 @@ function Acp({ isAdmin }) {
                 id: 'php',
                 label: 'PHP',
                 path: systemStatus.php_selected_path || '—',
-                min: forcedMinPhpForTesting || systemStatus.min_versions?.php || '—',
+                min: systemStatus.min_versions?.php || '—',
                 current: systemStatus.php_selected_version || '—',
-                status: systemStatus.php_selected_ok ? 'ok' : 'bad',
+                status: phpSelectedIsSufficient ? 'ok' : 'bad',
             },
             {
                 id: 'composer',
@@ -563,7 +572,7 @@ function Acp({ isAdmin }) {
                 status: systemStatus.updates_writable ? 'ok' : 'bad',
             },
         ]
-    }, [systemStatus, t])
+    }, [phpSelectedIsSufficient, systemStatus, t])
 
     const visibleSystemChecks = useMemo(() => {
         const visibilityBySection = {
@@ -3906,7 +3915,7 @@ function Acp({ isAdmin }) {
                                                     )}
                                                     <Form.Text className="bb-muted">
                                                         Minimum required PHP (from composer.json):{' '}
-                                                        {(forcedMinPhpForTesting || systemStatus?.min_versions?.php) || 'unknown'}. Use a custom binary
+                                                        {systemStatus?.min_versions?.php || 'unknown'}. Use a custom binary
                                                         on like php84. On KeyHelp setups use e.g. `keyhelp-php84`.
                                                     </Form.Text>
                                                 </Form.Group>

resources/js/pages/Login.jsx

@@ -1,6 +1,6 @@
 import { useState } from 'react'
 import { Button, Card, Container, Form } from 'react-bootstrap'
-import { useNavigate } from 'react-router-dom'
+import { Link, useNavigate } from 'react-router-dom'
 import { useAuth } from '../context/AuthContext'
 import { useTranslation } from 'react-i18next'
 
@@ -53,10 +53,18 @@ export default function Login() {
                                 onChange={(event) => setPassword(event.target.value)}
                                 required
                             />
+                            <div className="mt-2 text-end">
+                                <Link to="/reset-password">{t('auth.forgot_password')}</Link>
+                            </div>
                         </Form.Group>
-                        <Button type="submit" variant="dark" disabled={loading}>
-                            {loading ? t('form.signing_in') : t('form.sign_in')}
-                        </Button>
+                        <div className="d-flex gap-2">
+                            <Button as={Link} to="/" type="button" variant="outline-secondary" disabled={loading}>
+                                {t('acp.cancel')}
+                            </Button>
+                            <Button type="submit" variant="dark" disabled={loading}>
+                                {loading ? t('form.signing_in') : t('form.sign_in')}
+                            </Button>
+                        </div>
                     </Form>
                 </Card.Body>
             </Card>

resources/lang/de.json

@@ -81,6 +81,7 @@
   "auth.login_title": "Anmelden",
   "auth.login_identifier": "E-Mail oder Benutzername",
   "auth.login_placeholder": "name@example.com oder benutzername",
+  "auth.forgot_password": "Passwort vergessen?",
   "auth.register_hint": "Registriere dich mit E-Mail und einem eindeutigen Benutzernamen.",
   "auth.verify_notice": "Bitte bestätige deine E-Mail-Adresse, bevor du dich anmeldest.",
   "auth.register_title": "Konto erstellen",

resources/lang/en.json

@@ -81,6 +81,7 @@
   "auth.login_title": "Log in",
   "auth.login_identifier": "Email or username",
   "auth.login_placeholder": "name@example.com or username",
+  "auth.forgot_password": "Forgot password?",
   "auth.register_hint": "Register with an email and a unique username.",
   "auth.verify_notice": "Check your email to verify your account before logging in.",
   "auth.register_title": "Create account",

tests/run-shell-tests.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+cd "$ROOT_DIR"
+
+if ! command -v bats >/dev/null 2>&1; then
+  echo "bats is not installed. Install with: brew install bats-core" >&2
+  exit 1
+fi
+
+bats tests/shell/git_update.bats