From 26642f46c63d1b0e15fa98c38bc1a185826ec164 Mon Sep 17 00:00:00 2001 From: Anton Afanasyeu Date: Sat, 20 Jun 2026 21:26:51 +0200 Subject: [PATCH] sync be --- .../androidcast/network/BackendEndpoints.java | 21 ++++-- .../network/BackendEndpointsTest.java | 2 +- examples/app_hub/index.php | 33 +++++----- examples/app_hub/landing-pages.inc.php | 2 +- .../backend/config/config.example.php | 9 ++- .../crash_reporter/backend/config/config.php | 5 +- .../backend/nginx.apps-port80.fragment | 62 ++++++++++------- .../backend/public/assets/css/app.css | 22 +++++++ .../backend/public/assets/js/two_factor.js | 66 +++++++++++++++++++ .../crash_reporter/backend/public/index.php | 16 ++--- .../backend/scripts/apply-be-port80-nginx.sh | 2 +- examples/crash_reporter/backend/src/Auth.php | 25 ++++++- .../backend/src/AuthTwoFactorPage.php | 35 ++++++++++ .../backend/src/GraphRepository.php | 4 +- .../crash_reporter/backend/src/bootstrap.php | 21 ++++++ .../crash_reporter/backend/views/layout.php | 2 +- .../backend/views/live_education.php | 2 +- .../backend/views/live_join.php | 2 +- .../crash_reporter/backend/views/login.php | 5 +- .../crash_reporter/backend/views/register.php | 5 +- .../backend/views/two_factor_challenge.php | 15 ++++- .../backend/views/verify_email.php | 5 +- 22 files changed, 284 insertions(+), 77 deletions(-) create mode 100644 examples/crash_reporter/backend/public/assets/js/two_factor.js create mode 100644 examples/crash_reporter/backend/src/AuthTwoFactorPage.php diff --git a/app/src/main/java/com/foxx/androidcast/network/BackendEndpoints.java b/app/src/main/java/com/foxx/androidcast/network/BackendEndpoints.java index a273f05..6b517e6 100644 --- a/app/src/main/java/com/foxx/androidcast/network/BackendEndpoints.java +++ b/app/src/main/java/com/foxx/androidcast/network/BackendEndpoints.java @@ -3,8 +3,10 @@ package com.foxx.androidcast.network; /** Canonical production BE URLs on {@code apps.f0xx.org} (network self-test + defaults). */ public final class BackendEndpoints { public static final String APPS_HOST = "apps.f0xx.org"; - public static final String CRASHES_BASE = - "https://" + APPS_HOST + "/app/androidcast_project/crashes"; + public static final String ISSUES_BASE = + "https://" + APPS_HOST + "/app/androidcast_project/issues"; + /** @deprecated use {@link #ISSUES_BASE}; nginx 301 redirects legacy path. */ + public static final String CRASHES_BASE = ISSUES_BASE; public static final String GRAPHS_BASE = "https://" + APPS_HOST + "/app/androidcast_project/graphs"; public static final String HEARTBEAT_URL = CRASHES_BASE + "/api/heartbeat.php"; @@ -27,9 +29,15 @@ public final class BackendEndpoints { return trimmed; } if (trimmed.contains("://f0xx.org/app/androidcast_project/crashes") - || trimmed.contains("://foxx.org/app/androidcast_project/crashes")) { + || trimmed.contains("://foxx.org/app/androidcast_project/crashes") + || trimmed.contains("://f0xx.org/app/androidcast_project/issues") + || trimmed.contains("://foxx.org/app/androidcast_project/issues")) { return trimmed.replace("://f0xx.org/", "://" + APPS_HOST + "/") - .replace("://foxx.org/", "://" + APPS_HOST + "/"); + .replace("://foxx.org/", "://" + APPS_HOST + "/") + .replace("/crashes/", "/issues/"); + } + if (trimmed.contains("/crashes/")) { + return trimmed.replace("/crashes/", "/issues/"); } return trimmed; } @@ -40,8 +48,9 @@ public final class BackendEndpoints { return GRAPH_UPLOAD_URL; } String trimmed = normalizeCrashesUrl(crashesUrl.trim()); - if (trimmed.contains("/crashes/")) { - return trimmed.replace("/crashes/", "/graphs/").replace("/api/upload.php", "/api/graph_upload.php"); + if (trimmed.contains("/issues/")) { + return trimmed.replace("/issues/", "/graphs/") + .replace("/api/upload.php", "/api/graph_upload.php"); } return GRAPH_UPLOAD_URL; } diff --git a/app/src/test/java/com/foxx/androidcast/network/BackendEndpointsTest.java b/app/src/test/java/com/foxx/androidcast/network/BackendEndpointsTest.java index d2678fd..fbd26bb 100644 --- a/app/src/test/java/com/foxx/androidcast/network/BackendEndpointsTest.java +++ b/app/src/test/java/com/foxx/androidcast/network/BackendEndpointsTest.java @@ -9,7 +9,7 @@ public class BackendEndpointsTest { @Test public void canonicalUrlsUseAppsHost() { assertTrue(BackendEndpoints.HEARTBEAT_URL.startsWith("https://apps.f0xx.org/")); - assertTrue(BackendEndpoints.UPLOAD_URL.contains("/api/upload.php")); + assertTrue(BackendEndpoints.UPLOAD_URL.contains("/issues/api/upload.php")); assertTrue(BackendEndpoints.ENTITLEMENTS_FETCH_URL.contains("/entitlements/api/fetch.php")); } diff --git a/examples/app_hub/index.php b/examples/app_hub/index.php index 4f4a84c..e3a6531 100644 --- a/examples/app_hub/index.php +++ b/examples/app_hub/index.php @@ -5,7 +5,8 @@ if (!is_file($__platformDir . '/footer.php')) { } require_once $__platformDir . '/footer.php'; $__sessionFile = $__platformDir . '/shared_session.php'; -$hubCrashesBase = '/app/androidcast_project/crashes'; +$hubProjectBase = '/app/androidcast_project'; +$hubIssuesBase = '/app/androidcast_project/issues'; $hubUsername = ''; if (is_file($__sessionFile) && function_exists('session_start')) { require_once $__sessionFile; @@ -35,7 +36,7 @@ function hub_h(string $s): string { if (l === 'en' || l === 'ru') document.documentElement.setAttribute('lang', l); })(); - + @@ -46,12 +47,12 @@ function hub_h(string $s): string { } } - + - + - + @@ -139,15 +140,15 @@ function hub_h(string $s): string {
@@ -156,14 +157,14 @@ function hub_h(string $s): string { - Security - @@ -171,7 +172,7 @@ function hub_h(string $s): string { Logout - @@ -414,7 +415,7 @@ function hub_h(string $s): string { var docsToc = document.getElementById('hub-docs-toc'); var docsPanels = document.getElementById('hub-docs-panels'); var compassLayer = document.getElementById('hub-compass-layer'); - var docsApi = '/app/androidcast_project/crashes/api/hub_deploy_docs.php'; + var docsApi = '/app/androidcast_project/issues/api/hub_deploy_docs.php'; var docsQueue = []; var docsLoading = false; var docsCache = {}; diff --git a/examples/app_hub/landing-pages.inc.php b/examples/app_hub/landing-pages.inc.php index 98e4051..cbfe49b 100644 --- a/examples/app_hub/landing-pages.inc.php +++ b/examples/app_hub/landing-pages.inc.php @@ -69,7 +69,7 @@

Resources

Documentation, deployment guides, and integration patterns for your environment.

-

Crashes console Builder Git browser

+

Issues console Builder Git browser

diff --git a/examples/crash_reporter/backend/config/config.example.php b/examples/crash_reporter/backend/config/config.example.php index 1d55b10..a994f44 100644 --- a/examples/crash_reporter/backend/config/config.example.php +++ b/examples/crash_reporter/backend/config/config.example.php @@ -11,9 +11,12 @@ * Digest: SHA256 fcd4a89ef4201736923d0e7e1ad88868bba7e39eadb9fcf0ffb9d1ba7efecd12 */ return [ - 'app_name' => 'Android Cast Issues', - // Production: '/app/androidcast_project/crashes' — Local php -S: use '' (empty string) - 'base_path' => '/app/androidcast_project/crashes', + 'app_name' => 'Android Cast', + // Console (issues/tickets/…) — production path + 'project_base_path' => '/app/androidcast_project', + 'base_path' => '/app/androidcast_project/issues', + // Legacy alias kept for redirects/nginx; do not use in new links + 'legacy_base_path' => '/app/androidcast_project/crashes', 'db' => [ // sqlite = default file DB; mysql = MariaDB/MySQL (recommended on BE for concurrency) 'driver' => 'sqlite', // sqlite | mysql | mariadb (alias) diff --git a/examples/crash_reporter/backend/config/config.php b/examples/crash_reporter/backend/config/config.php index fc1cbfe..3180c35 100644 --- a/examples/crash_reporter/backend/config/config.php +++ b/examples/crash_reporter/backend/config/config.php @@ -11,8 +11,9 @@ * Digest: SHA256 8b7149a4cd8a0f7d13ee8a22535c3697e919e35b9fe5bb8a80764769cc6c6853 */ return [ - 'app_name' => 'Android Cast Crashes', - 'base_path' => '/app/androidcast_project/crashes', + 'app_name' => 'Android Cast', + 'project_base_path' => '/app/androidcast_project', + 'base_path' => '/app/androidcast_project/issues', 'db' => [ 'driver' => 'mysql', // sqlite | mysql 'sqlite_path' => __DIR__ . '/../data/crashes.sqlite', diff --git a/examples/crash_reporter/backend/nginx.apps-port80.fragment b/examples/crash_reporter/backend/nginx.apps-port80.fragment index aa7f7ee..7945465 100644 --- a/examples/crash_reporter/backend/nginx.apps-port80.fragment +++ b/examples/crash_reporter/backend/nginx.apps-port80.fragment @@ -33,40 +33,56 @@ server { try_files $uri $uri/ =404; } + location = /app/androidcast_project/issues { + return 301 /app/androidcast_project/issues/; + } + location = /app/androidcast_project/crashes { - return 301 /app/androidcast_project/crashes/; + return 301 /app/androidcast_project/issues/; + } + + location ~ ^/app/androidcast_project/crashes(/.*)?$ { + return 301 /app/androidcast_project/issues$1; + } + + location ~ ^/app/androidcast_project/(login|logout|register|two-factor|verify-email)(/|$) { + include fastcgi_params; + fastcgi_pass unix:/run/php-fpm.socket; + fastcgi_param SCRIPT_FILENAME /var/www/localhost/htdocs/apps/app/androidcast_project/android_cast/examples/crash_reporter/backend/public/index.php; + fastcgi_param SCRIPT_NAME /app/androidcast_project/issues/index.php; + fastcgi_param REQUEST_URI $request_uri; + } + + location ^~ /app/androidcast_project/issues/assets/ { + alias /var/www/localhost/htdocs/apps/app/androidcast_project/android_cast/examples/crash_reporter/backend/public/assets/; + } + + location = /app/androidcast_project/issues/api/upload.php { + include fastcgi_params; + fastcgi_pass unix:/run/php-fpm.socket; + fastcgi_param SCRIPT_FILENAME /var/www/localhost/htdocs/apps/app/androidcast_project/android_cast/examples/crash_reporter/backend/public/api/upload.php; + fastcgi_param SCRIPT_NAME /app/androidcast_project/issues/api/upload.php; + fastcgi_param REQUEST_URI $request_uri; + client_max_body_size 4m; + } + + location ^~ /app/androidcast_project/issues/ { + include fastcgi_params; + fastcgi_pass unix:/run/php-fpm.socket; + fastcgi_param SCRIPT_FILENAME /var/www/localhost/htdocs/apps/app/androidcast_project/android_cast/examples/crash_reporter/backend/public/index.php; + fastcgi_param SCRIPT_NAME /app/androidcast_project/issues/index.php; + fastcgi_param REQUEST_URI $request_uri; + client_max_body_size 4m; } location = /app/androidcast_project/graphs { return 301 /app/androidcast_project/graphs/; } - location ^~ /app/androidcast_project/crashes/assets/ { - alias /var/www/localhost/htdocs/apps/app/androidcast_project/android_cast/examples/crash_reporter/backend/public/assets/; - } - location ^~ /app/androidcast_project/graphs/assets/ { alias /var/www/localhost/htdocs/apps/app/androidcast_project/android_cast/examples/crash_reporter/backend/public/assets/; } - location = /app/androidcast_project/crashes/api/upload.php { - include fastcgi_params; - fastcgi_pass unix:/run/php-fpm.socket; - fastcgi_param SCRIPT_FILENAME /var/www/localhost/htdocs/apps/app/androidcast_project/android_cast/examples/crash_reporter/backend/public/api/upload.php; - fastcgi_param SCRIPT_NAME /app/androidcast_project/crashes/api/upload.php; - fastcgi_param REQUEST_URI $request_uri; - client_max_body_size 4m; - } - - location ^~ /app/androidcast_project/crashes/ { - include fastcgi_params; - fastcgi_pass unix:/run/php-fpm.socket; - fastcgi_param SCRIPT_FILENAME /var/www/localhost/htdocs/apps/app/androidcast_project/android_cast/examples/crash_reporter/backend/public/index.php; - fastcgi_param SCRIPT_NAME /app/androidcast_project/crashes/index.php; - fastcgi_param REQUEST_URI $request_uri; - client_max_body_size 4m; - } - location = /app/androidcast_project/graphs/api/graphs.php { include fastcgi_params; fastcgi_pass unix:/run/php-fpm.socket; diff --git a/examples/crash_reporter/backend/public/assets/css/app.css b/examples/crash_reporter/backend/public/assets/css/app.css index 40e4839..8406f61 100644 --- a/examples/crash_reporter/backend/public/assets/css/app.css +++ b/examples/crash_reporter/backend/public/assets/css/app.css @@ -2317,6 +2317,14 @@ button.report-tag--filter:hover { } /* Nav icons: live + education */ +.nav-icon--live { + width: 18px; + height: 16px; +} +.nav-icon--education { + width: 18px; + height: 16px; +} .nav-icon--live::before { content: ''; position: absolute; @@ -2361,3 +2369,17 @@ button.report-tag--filter:hover { background: rgba(52, 211, 153, 0.15); color: #6ee7b7; } + +.twofa-qr-wrap { + margin: 12px 0 16px; + text-align: center; +} +.twofa-qr { + border-radius: 8px; + background: #fff; + padding: 6px; +} +.twofa-qr-wrap figcaption { + margin-top: 8px; + font-size: 0.88rem; +} diff --git a/examples/crash_reporter/backend/public/assets/js/two_factor.js b/examples/crash_reporter/backend/public/assets/js/two_factor.js new file mode 100644 index 0000000..3e5ec56 --- /dev/null +++ b/examples/crash_reporter/backend/public/assets/js/two_factor.js @@ -0,0 +1,66 @@ +(function () { + 'use strict'; + + function boot() { + var form = document.querySelector('form.login-card'); + var input = document.getElementById('twofa-code-input'); + if (!form || !input) { + return; + } + input.focus(); + input.select(); + + function digitsOnly(val) { + return String(val || '').replace(/\D/g, '').slice(0, 6); + } + + function maybeSubmit() { + if (input.value.length === 6) { + if (typeof form.requestSubmit === 'function') { + form.requestSubmit(); + } else { + form.submit(); + } + } + } + + input.addEventListener('input', function () { + var next = digitsOnly(input.value); + if (next !== input.value) { + input.value = next; + } + maybeSubmit(); + }); + + input.addEventListener('paste', function (ev) { + ev.preventDefault(); + var text = (ev.clipboardData && ev.clipboardData.getData('text')) || ''; + input.value = digitsOnly(text); + maybeSubmit(); + }); + + document.addEventListener('keydown', function (ev) { + if (!/^[0-9]$/.test(ev.key)) { + return; + } + var ae = document.activeElement; + if (ae === input) { + return; + } + var tag = ae && ae.tagName ? ae.tagName.toLowerCase() : ''; + if (tag === 'input' || tag === 'textarea' || tag === 'select' || (ae && ae.isContentEditable)) { + return; + } + ev.preventDefault(); + input.focus(); + input.value = digitsOnly(input.value + ev.key); + maybeSubmit(); + }); + } + + if (document.readyState === 'loading') { + document.addEventListener('DOMContentLoaded', boot); + } else { + boot(); + } +})(); diff --git a/examples/crash_reporter/backend/public/index.php b/examples/crash_reporter/backend/public/index.php index 26b02c9..c7f6ef4 100644 --- a/examples/crash_reporter/backend/public/index.php +++ b/examples/crash_reporter/backend/public/index.php @@ -15,10 +15,7 @@ require_once __DIR__ . '/../src/bootstrap.php'; $uri = parse_url($_SERVER['REQUEST_URI'] ?? '/', PHP_URL_PATH) ?: '/'; $base = Auth::basePath(); -if ($base !== '' && str_starts_with($uri, $base)) { - $uri = substr($uri, strlen($base)) ?: '/'; -} -$route = rtrim($uri, '/') ?: '/'; +$route = resolve_console_route($uri); if ($route === '/api/upload.php' || str_ends_with($route, '/api/upload.php')) { require __DIR__ . '/api/upload.php'; @@ -152,7 +149,7 @@ if ($route === '/api/auth_register.php' || str_ends_with($route, '/api/auth_regi if ($route === '/logout') { Auth::logout(); - header('Location: ' . $base . '/login'); + header('Location: ' . Auth::authUrl('/login')); exit; } @@ -165,7 +162,7 @@ if ($route === '/login' && $_SERVER['REQUEST_METHOD'] === 'POST') { exit; } if ($result === 'pending_2fa') { - header('Location: ' . $base . '/two-factor'); + header('Location: ' . Auth::authUrl('/two-factor')); exit; } $loginError = 'Invalid credentials'; @@ -183,7 +180,7 @@ if ($route === '/login' && $_SERVER['REQUEST_METHOD'] === 'POST') { if ($route === '/login') { if (Auth::pending2faUserId() > 0) { - header('Location: ' . $base . '/two-factor'); + header('Location: ' . Auth::authUrl('/two-factor')); exit; } require __DIR__ . '/../views/login.php'; @@ -235,7 +232,7 @@ if ($route === '/verify-email') { if ($route === '/two-factor' && $_SERVER['REQUEST_METHOD'] === 'POST') { if (Auth::pending2faUserId() <= 0) { - header('Location: ' . $base . '/login'); + header('Location: ' . Auth::authUrl('/login')); exit; } $code = trim($_POST['code'] ?? ''); @@ -250,9 +247,10 @@ if ($route === '/two-factor' && $_SERVER['REQUEST_METHOD'] === 'POST') { if ($route === '/two-factor') { if (Auth::pending2faUserId() <= 0) { - header('Location: ' . $base . '/login'); + header('Location: ' . Auth::authUrl('/login')); exit; } + $twofaQr = AuthTwoFactorPage::qrPayload(); require __DIR__ . '/../views/two_factor_challenge.php'; exit; } diff --git a/examples/crash_reporter/backend/scripts/apply-be-port80-nginx.sh b/examples/crash_reporter/backend/scripts/apply-be-port80-nginx.sh index 35a42c6..7154446 100755 --- a/examples/crash_reporter/backend/scripts/apply-be-port80-nginx.sh +++ b/examples/crash_reporter/backend/scripts/apply-be-port80-nginx.sh @@ -15,7 +15,7 @@ from pathlib import Path frag, apps_path = map(Path, sys.argv[1:3]) text = apps_path.read_text() start = text.index("server {\n\tlisten 80;") -end = text.index("\n}\n\n\nserver {\n\tlisten 443") +end = text.index("\nserver {\n\tlisten 443") apps_path.write_text(text[:start] + frag.read_text().strip() + text[end:]) print(f"Updated listen 80 in {apps_path}") PY diff --git a/examples/crash_reporter/backend/src/Auth.php b/examples/crash_reporter/backend/src/Auth.php index 9de0440..9981227 100644 --- a/examples/crash_reporter/backend/src/Auth.php +++ b/examples/crash_reporter/backend/src/Auth.php @@ -36,7 +36,7 @@ final class Auth { public static function check(): void { if (!self::user()) { - header('Location: ' . self::basePath() . '/login'); + header('Location: ' . self::authUrl('/login')); exit; } } @@ -141,4 +141,27 @@ final class Auth { $bp = cfg('base_path', ''); return rtrim($bp, '/'); } + + /** Shared project prefix, e.g. /app/androidcast_project */ + public static function projectBasePath(): string { + $p = trim((string) cfg('project_base_path', '')); + if ($p !== '') { + return rtrim($p, '/'); + } + $bp = self::basePath(); + if (preg_match('#^(.+)/(?:crashes|issues|graphs|build)$#', $bp, $m)) { + return $m[1]; + } + return '/app/androidcast_project'; + } + + /** Login/logout/register/2FA live at project root, not under /issues/. */ + public static function authUrl(string $path = ''): string { + $root = self::projectBasePath(); + $path = '/' . ltrim($path, '/'); + if ($path === '/' || $path === '') { + return $root; + } + return $root . $path; + } } diff --git a/examples/crash_reporter/backend/src/AuthTwoFactorPage.php b/examples/crash_reporter/backend/src/AuthTwoFactorPage.php new file mode 100644 index 0000000..31ecbd6 --- /dev/null +++ b/examples/crash_reporter/backend/src/AuthTwoFactorPage.php @@ -0,0 +1,35 @@ + $longUrl]; + } + $bearers = ShortLinksRepository::listBearers(); + if ($bearers === []) { + return ['long_url' => $longUrl]; + } + $bearerId = (int) ($bearers[0]['id'] ?? 0); + if ($bearerId <= 0) { + return ['long_url' => $longUrl]; + } + $mint = ShortLinksRepository::createLink($bearerId, $longUrl, 900); + if (empty($mint['ok'])) { + return ['long_url' => $longUrl]; + } + return [ + 'long_url' => $longUrl, + 'short_url' => (string) ($mint['short_url'] ?? ''), + 'qr_url' => (string) ($mint['qr_url'] ?? ''), + ]; + } +} diff --git a/examples/crash_reporter/backend/src/GraphRepository.php b/examples/crash_reporter/backend/src/GraphRepository.php index 19ade6a..8d01253 100644 --- a/examples/crash_reporter/backend/src/GraphRepository.php +++ b/examples/crash_reporter/backend/src/GraphRepository.php @@ -334,8 +334,8 @@ final class GraphRepository { return [ 'hub' => $prefix . '/', 'graphs' => $prefix . '/graphs/', - 'crashes' => $prefix . '/crashes/?view=reports', - 'tickets' => $prefix . '/crashes/?view=tickets', + 'issues' => $prefix . '/issues/?view=reports', + 'tickets' => $prefix . '/issues/?view=tickets', 'build' => $prefix . '/build/', 'git' => $prefix . '/git/', ]; diff --git a/examples/crash_reporter/backend/src/bootstrap.php b/examples/crash_reporter/backend/src/bootstrap.php index f1987dc..9d1f07a 100644 --- a/examples/crash_reporter/backend/src/bootstrap.php +++ b/examples/crash_reporter/backend/src/bootstrap.php @@ -72,6 +72,7 @@ require_once __DIR__ . '/WireGuardAddressPool.php'; require_once __DIR__ . '/WireGuardTrafficStats.php'; require_once __DIR__ . '/RsshSessionProvisioner.php'; require_once __DIR__ . '/RsshBastionProvisioner.php'; +require_once __DIR__ . '/AuthTwoFactorPage.php'; require_once __DIR__ . '/AnalyticsHead.php'; function cfg(string $key, $default = null) { @@ -108,6 +109,23 @@ function json_out(array $data, int $code = 200): void { exit; } +/** Resolve web route: auth pages at project root; console pages under base_path. */ +function resolve_console_route(string $uri): string { + $projectRoot = rtrim((string) cfg('project_base_path', '/app/androidcast_project'), '/'); + $base = rtrim((string) cfg('base_path', ''), '/'); + if ($projectRoot !== '' && str_starts_with($uri, $projectRoot)) { + $suffix = substr($uri, strlen($projectRoot)) ?: '/'; + $candidate = rtrim(strtok($suffix, '?') ?: '/', '/') ?: '/'; + if (preg_match('#^/(login|logout|register|two-factor|verify-email)(?:/|$)#', $candidate)) { + return $candidate; + } + } + if ($base !== '' && str_starts_with($uri, $base)) { + $uri = substr($uri, strlen($base)) ?: '/'; + } + return rtrim(strtok($uri, '?') ?: '/', '/') ?: '/'; +} + /** Public URL prefix for the active console view (graphs vs crashes). */ function console_base_path(?string $view = null): string { $view = $view ?? (string) ($_GET['view'] ?? ''); @@ -117,6 +135,9 @@ function console_base_path(?string $view = null): string { return rtrim($graphs, '/'); } $crashes = rtrim((string) cfg('base_path', ''), '/'); + if (str_ends_with($crashes, '/issues')) { + return substr($crashes, 0, -strlen('/issues')) . '/graphs'; + } if (str_ends_with($crashes, '/crashes')) { return substr($crashes, 0, -strlen('/crashes')) . '/graphs'; } diff --git a/examples/crash_reporter/backend/views/layout.php b/examples/crash_reporter/backend/views/layout.php index 3f1d51b..e91d811 100644 --- a/examples/crash_reporter/backend/views/layout.php +++ b/examples/crash_reporter/backend/views/layout.php @@ -220,7 +220,7 @@ Security -
- + ← Back to the console Education demo
diff --git a/examples/crash_reporter/backend/views/live_join.php b/examples/crash_reporter/backend/views/live_join.php index 6a2dab3..e6637ab 100644 --- a/examples/crash_reporter/backend/views/live_join.php +++ b/examples/crash_reporter/backend/views/live_join.php @@ -29,7 +29,7 @@ $role = trim((string) ($_GET['role'] ?? '')); data-direct="" data-role="">
- + ← Back to the console Live viewer
diff --git a/examples/crash_reporter/backend/views/login.php b/examples/crash_reporter/backend/views/login.php index 39c1f7b..ddc7932 100644 --- a/examples/crash_reporter/backend/views/login.php +++ b/examples/crash_reporter/backend/views/login.php @@ -11,6 +11,7 @@ * Digest: SHA256 9bef983f4d34cb790922cda355ccf5d14b565b29273d2ebfe48b3173cd2e8f9f */ $bp = Auth::basePath(); +$auth = Auth::authUrl(); ?> @@ -40,7 +41,7 @@ $bp = Auth::basePath();
-
+

Sign in to view anonymous issue reports

@@ -50,7 +51,7 @@ $bp = Auth::basePath();

Default: admin / admin

-

Register

+

Register

diff --git a/examples/crash_reporter/backend/views/register.php b/examples/crash_reporter/backend/views/register.php index 88dbc10..100252b 100644 --- a/examples/crash_reporter/backend/views/register.php +++ b/examples/crash_reporter/backend/views/register.php @@ -1,5 +1,6 @@ @@ -29,7 +30,7 @@ $bp = Auth::basePath(); -
+

Create account

We will email a verification link before you can sign in.

@@ -45,7 +46,7 @@ $bp = Auth::basePath(); -

Back to sign in

+

Back to sign in

diff --git a/examples/crash_reporter/backend/views/two_factor_challenge.php b/examples/crash_reporter/backend/views/two_factor_challenge.php index 24183d8..e3a96ea 100644 --- a/examples/crash_reporter/backend/views/two_factor_challenge.php +++ b/examples/crash_reporter/backend/views/two_factor_challenge.php @@ -1,5 +1,7 @@ @@ -17,6 +19,7 @@ $bp = Auth::basePath(); +
@@ -28,16 +31,22 @@ $bp = Auth::basePath();
-
+

Two-factor authentication

Enter the 6-digit code from your authenticator app.

+ +
+ QR code for mobile sign-in link +
Scan to open the hub on your phone ·
+
+ + -

Cancel

+

Cancel

diff --git a/examples/crash_reporter/backend/views/verify_email.php b/examples/crash_reporter/backend/views/verify_email.php index 4b5b179..d6f0871 100644 --- a/examples/crash_reporter/backend/views/verify_email.php +++ b/examples/crash_reporter/backend/views/verify_email.php @@ -1,5 +1,6 @@ @@ -21,10 +22,10 @@ $bp = Auth::basePath();

Email verification

Your email is verified. You can sign in and enroll two-factor authentication.

-

Sign in

+

Sign in

-

Register again

+

Register again