feat: add back button to playground and fix dice icon color

- Add back button to game-controls (shown only in playground mode)
- Replace dice img with inline SVG using currentColor for consistent styling
- Add SVG sizing rule to .btn-icon
- Add "back" translation to all 6 languages

🤖 Generated with [Claude Code](https://claude.com/claude-code)
This commit is contained in:
2026-01-16 14:55:11 +01:00
parent 7ecc115c55
commit fb5fbe4107
5 changed files with 71 additions and 9 deletions

View File

@@ -6,7 +6,7 @@ import { initI18n, t, getLanguage, setLanguage, applyTranslations } from "./i18n
import { parseHash, updateHash, replaceHash, getShareableUrl, RouteType, navigateTo } from "./helpers/router.js"; import { parseHash, updateHash, replaceHash, getShareableUrl, RouteType, navigateTo } from "./helpers/router.js";
import { sections, getSection, getModuleSection, getModulesBySection } from "./config/sections.js"; import { sections, getSection, getModuleSection, getModulesBySection } from "./config/sections.js";
import { getRandomTemplate } from "./config/playground-templates.js"; import { getRandomTemplate } from "./config/playground-templates.js";
import { initAuth } from "./auth.js"; import { initAuth, handleOAuthCallback } from "./auth.js";
// CodeMirror imports for syntax highlighting // CodeMirror imports for syntax highlighting
import { EditorState } from "@codemirror/state"; import { EditorState } from "@codemirror/state";
@@ -149,6 +149,7 @@ const elements = {
expectedOverlay: document.getElementById("expected-overlay"), expectedOverlay: document.getElementById("expected-overlay"),
previewWrapper: document.querySelector(".preview-wrapper"), previewWrapper: document.querySelector(".preview-wrapper"),
previewSection: document.querySelector(".preview-section"), previewSection: document.querySelector(".preview-section"),
backBtn: document.getElementById("back-btn"),
prevBtn: document.getElementById("prev-btn"), prevBtn: document.getElementById("prev-btn"),
nextBtn: document.getElementById("next-btn"), nextBtn: document.getElementById("next-btn"),
gameControls: document.querySelector(".game-controls"), gameControls: document.querySelector(".game-controls"),
@@ -750,7 +751,8 @@ function updateNavigationButtons() {
const engineState = lessonEngine.getCurrentState(); const engineState = lessonEngine.getCurrentState();
const isPlayground = engineState.lesson?.mode === "playground"; const isPlayground = engineState.lesson?.mode === "playground";
// Hide nav buttons and center controls in playground mode // Hide nav buttons and center controls in playground mode, show back button
elements.backBtn?.classList.toggle("hidden", !isPlayground);
elements.prevBtn.classList.toggle("hidden", isPlayground); elements.prevBtn.classList.toggle("hidden", isPlayground);
elements.nextBtn.classList.toggle("hidden", isPlayground); elements.nextBtn.classList.toggle("hidden", isPlayground);
elements.gameControls?.classList.toggle("centered", isPlayground); elements.gameControls?.classList.toggle("centered", isPlayground);
@@ -2456,11 +2458,14 @@ function init() {
// Load modules after editor is ready // Load modules after editor is ready
initializeModules(); initializeModules();
// Handle OAuth callback BEFORE router (tokens are in URL hash)
handleOAuthCallback().then(() => {
// Initialize URL router for shareable links // Initialize URL router for shareable links
initRouter(); initRouter();
// Initialize authentication // Initialize authentication
initAuth(lessonEngine); initAuth(lessonEngine);
});
// Sidebar controls // Sidebar controls
elements.menuBtn.addEventListener("click", openSidebar); elements.menuBtn.addEventListener("click", openSidebar);

View File

@@ -1,11 +1,53 @@
import { t, applyTranslations } from "./i18n.js"; import { t, applyTranslations } from "./i18n.js";
let currentUser = null; let currentUser = null;
let oauthHandled = false;
let lessonEngineRef = null; let lessonEngineRef = null;
let authModule = null; let authModule = null;
let progressModule = null; let progressModule = null;
let supabaseAvailable = false; let supabaseAvailable = false;
/**
* Check for OAuth callback tokens in URL hash BEFORE router runs.
* Call this before initializing the router.
* @returns {Promise<boolean>} true if OAuth callback was detected and handled
*/
export async function handleOAuthCallback() {
const hash = window.location.hash;
// Check if hash contains OAuth tokens (access_token, error, etc.)
if (!hash.includes("access_token") && !hash.includes("error_description") && !hash.includes("refresh_token")) {
return false;
}
console.log("[Auth] OAuth callback detected in URL hash");
try {
const supabaseModule = await import("./supabase.js");
if (!supabaseModule.isConfigured) {
return false;
}
// Let Supabase process the OAuth tokens
const { data, error } = await supabaseModule.auth.getSession();
if (error) {
console.error("[Auth] OAuth callback error:", error.message);
} else if (data?.session) {
console.log("[Auth] OAuth login successful:", data.session.user?.email);
oauthHandled = true;
}
// Clear the hash after processing (will be replaced by router)
window.history.replaceState(null, "", window.location.pathname);
return true;
} catch (e) {
console.error("[Auth] OAuth callback handling failed:", e.message);
return false;
}
}
/** /**
* Initialize the auth system * Initialize the auth system
* @param {Object} engine - The LessonEngine instance * @param {Object} engine - The LessonEngine instance
@@ -33,8 +75,13 @@ export async function initAuth(engine) {
return; return;
} }
// Debug: Check URL for OAuth callback params
console.log("[Auth] URL hash:", window.location.hash);
console.log("[Auth] URL search:", window.location.search);
// Listen for auth changes FIRST (catches OAuth callback) // Listen for auth changes FIRST (catches OAuth callback)
authModule.onAuthStateChange((event, session) => { authModule.onAuthStateChange((event, session) => {
console.log("[Auth] State change:", event, session?.user?.email);
if (event === "SIGNED_IN" && session?.user) { if (event === "SIGNED_IN" && session?.user) {
handleLogin(session.user); handleLogin(session.user);
} else if (event === "SIGNED_OUT") { } else if (event === "SIGNED_OUT") {
@@ -44,7 +91,8 @@ export async function initAuth(engine) {
// Check initial session (getSession handles OAuth callback URL) // Check initial session (getSession handles OAuth callback URL)
try { try {
const { data } = await authModule.getSession(); const { data, error } = await authModule.getSession();
console.log("[Auth] Initial session check:", data?.session?.user?.email, error);
if (data?.session?.user) handleLogin(data.session.user); if (data?.session?.user) handleLogin(data.session.user);
} catch (e) { } catch (e) {
console.log("Auth check failed:", e.message); console.log("Auth check failed:", e.message);

View File

@@ -30,6 +30,7 @@ const translations = {
hideExpected: "Hide Expected", hideExpected: "Hide Expected",
previous: "Previous", previous: "Previous",
next: "Next", next: "Next",
back: "Back",
levelIndicator: "Lesson {current} of {total}", levelIndicator: "Lesson {current} of {total}",
lessonLabel: "Lesson", lessonLabel: "Lesson",
@@ -252,6 +253,7 @@ const translations = {
hideExpected: "Lösung ausblenden", hideExpected: "Lösung ausblenden",
previous: "Zurück", previous: "Zurück",
next: "Weiter", next: "Weiter",
back: "Zurück",
levelIndicator: "Lektion {current} von {total}", levelIndicator: "Lektion {current} von {total}",
lessonLabel: "Lektion", lessonLabel: "Lektion",
@@ -474,6 +476,7 @@ const translations = {
hideExpected: "Ukryj oczekiwane", hideExpected: "Ukryj oczekiwane",
previous: "Poprzednia", previous: "Poprzednia",
next: "Następna", next: "Następna",
back: "Wstecz",
levelIndicator: "Lekcja {current} z {total}", levelIndicator: "Lekcja {current} z {total}",
lessonLabel: "Lekcja", lessonLabel: "Lekcja",
@@ -695,6 +698,7 @@ const translations = {
hideExpected: "Ocultar esperado", hideExpected: "Ocultar esperado",
previous: "Anterior", previous: "Anterior",
next: "Siguiente", next: "Siguiente",
back: "Volver",
levelIndicator: "Lección {current} de {total}", levelIndicator: "Lección {current} de {total}",
lessonLabel: "Lección", lessonLabel: "Lección",
@@ -918,6 +922,7 @@ const translations = {
hideExpected: "إخفاء المتوقع", hideExpected: "إخفاء المتوقع",
previous: "السابق", previous: "السابق",
next: "التالي", next: "التالي",
back: "رجوع",
levelIndicator: "الدرس {current} من {total}", levelIndicator: "الدرس {current} من {total}",
lessonLabel: "درس", lessonLabel: "درس",
@@ -1136,6 +1141,7 @@ const translations = {
hideExpected: "Сховати очікуване", hideExpected: "Сховати очікуване",
previous: "Попередній", previous: "Попередній",
next: "Наступний", next: "Наступний",
back: "Назад",
levelIndicator: "Урок {current} з {total}", levelIndicator: "Урок {current} з {total}",
lessonLabel: "Урок", lessonLabel: "Урок",

View File

@@ -408,7 +408,7 @@
<label for="code-input" class="editor-label" data-i18n="editorLabel">CSS Editor</label> <label for="code-input" class="editor-label" data-i18n="editorLabel">CSS Editor</label>
<div class="editor-actions"> <div class="editor-actions">
<div class="editor-tools"> <div class="editor-tools">
<button id="random-template-btn" class="btn btn-icon hidden" title="Load random template"><img src="./dice.svg" alt="" /></button> <button id="random-template-btn" class="btn btn-icon hidden" title="Load random template"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="2" y="2" width="20" height="20" rx="3" ry="3"/><circle cx="7" cy="7" r="1.5" fill="currentColor" stroke="none"/><circle cx="12" cy="12" r="1.5" fill="currentColor" stroke="none"/><circle cx="17" cy="17" r="1.5" fill="currentColor" stroke="none"/><circle cx="17" cy="7" r="1.5" fill="currentColor" stroke="none"/><circle cx="7" cy="17" r="1.5" fill="currentColor" stroke="none"/></svg></button>
<button id="undo-btn" class="btn btn-icon" data-i18n-title="undoTitle" title="Undo (Ctrl+Z)"></button> <button id="undo-btn" class="btn btn-icon" data-i18n-title="undoTitle" title="Undo (Ctrl+Z)"></button>
<button id="redo-btn" class="btn btn-icon" data-i18n-title="redoTitle" title="Redo (Ctrl+Shift+Z)"></button> <button id="redo-btn" class="btn btn-icon" data-i18n-title="redoTitle" title="Redo (Ctrl+Shift+Z)"></button>
<button <button
@@ -434,6 +434,7 @@
<!-- Right Panel: Preview + Navigation --> <!-- Right Panel: Preview + Navigation -->
<div class="right-panel"> <div class="right-panel">
<div class="game-controls"> <div class="game-controls">
<a id="back-btn" href="#" class="btn hidden" data-i18n="back">Back</a>
<button id="prev-btn" class="btn" data-i18n="previous">Previous</button> <button id="prev-btn" class="btn" data-i18n="previous">Previous</button>
<span class="module-pill" id="module-pill"> <span class="module-pill" id="module-pill">
<span class="module-name"></span> <span class="module-name"></span>

View File

@@ -1260,7 +1260,8 @@ button.lesson-list-item {
border-color: var(--section-color, var(--primary-color)); border-color: var(--section-color, var(--primary-color));
} }
.btn-icon img { .btn-icon img,
.btn-icon svg {
width: 1rem; width: 1rem;
height: 1rem; height: 1rem;
margin: 0; margin: 0;
@@ -1653,6 +1654,7 @@ input:checked + .toggle-slider::before {
font-size: 0.875rem; font-size: 0.875rem;
color: var(--primary-color); color: var(--primary-color);
text-decoration: none; text-decoration: none;
cursor: pointer;
} }
.auth-links .btn-text:hover { .auth-links .btn-text:hover {