diff --git a/CHANGELOG.md b/CHANGELOG.md index ade4f10..9a62c84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ The application version is maintained in `package.json` and displayed in the adm No changes recorded yet. +## 1.70.4 + +### Changed +- Guide: installation (Windows, Linux, Managed AMMC, SQLite storage) moved to a last tab, "Installation & server". Getting started now opens with decoder roles and the simulator. + ## 1.70.3 ### Fixed diff --git a/package-lock.json b/package-lock.json index f6d5cb4..1351d05 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.70.3", + "version": "1.70.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.70.3", + "version": "1.70.4", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index 6dd7cc4..ef06a1d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.70.3", + "version": "1.70.4", "private": true, "description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence", "engines": { diff --git a/src/app.js b/src/app.js index cefc857..63a4a32 100644 --- a/src/app.js +++ b/src/app.js @@ -2060,6 +2060,8 @@ const TRANSLATIONS = { "guide.series_example_3": "Steg 3: klistra in de 12 datumen, format ÖRC Winter, Seedningsträning på, snabbaste heatet sist -> 36 race (12 datum × 3 klasser).", "guide.series_example_4": "Varje söndag: välj förare per klass, och följ knappen på raden: Seedningsträning, Skapa kval, kör heaten, Skapa finaler, kör finalerna. Ställningen per klass är klar direkt efter sista finalen.", "guide.tab_videos": "Videoguider", + "guide.tab_install": "Installation & server", + "guide.install_intro": "För den som installerar eller flyttar RaceCore: Windows, Linux, hur Managed AMMC körs och var datan sparas. Ser du det här är RaceCore redan igång.", "warmup.title": "Transponderkontroll", "warmup.hint": "Under nedräkningen är banan öppen. Grön bock = transpondern har passerat linjen sedan nedräkningen började. Saknas någon kan du byta transponder direkt här, eller koppla en okänd transponder som just passerat.", "prologue.length": "Nedräkning", @@ -4184,6 +4186,8 @@ const TRANSLATIONS = { "guide.series_example_3": "Step 3: paste the 12 dates, format ÖRC Winter, seeding practice on, fastest heat last -> 36 races (12 dates × 3 classes).", "guide.series_example_4": "Each Sunday: pick drivers per class and follow the button on the row: seeding practice, create qualifying, run the heats, create finals, run the finals. The standings per class are ready right after the last final.", "guide.tab_videos": "Video guides", + "guide.tab_install": "Installation & server", + "guide.install_intro": "For whoever installs or moves RaceCore: Windows, Linux, how Managed AMMC runs and where the data is stored. If you can read this, RaceCore is already running.", "warmup.title": "Transponder check", "warmup.hint": "The track is open during the count-down. Green tick = the transponder has crossed the line since the count-down began. If someone is missing, change their transponder right here, or link an unknown transponder that just crossed.", "prologue.length": "Count-down", diff --git a/src/misc_views.js b/src/misc_views.js index 49eaafb..240bdde 100644 --- a/src/misc_views.js +++ b/src/misc_views.js @@ -1,5 +1,5 @@ let activeGuideTab = "start"; -const GUIDE_TAB_IDS = ["start", "create", "run", "series", "training", "videos"]; +const GUIDE_TAB_IDS = ["start", "create", "run", "series", "training", "videos", "install"]; function renderGuidePanel(titleKey, itemKeys, extras = "", { t }) { return ` @@ -38,9 +38,9 @@ export function renderGuideView({ dom, t }) { ${renderGuideOverviewCard("guide.series_title", "guide.card_series_blurb", { t })} ${renderGuideOverviewCard("guide.training_title", "guide.card_training_blurb", { t })} ${renderGuideOverviewCard("guide.archive_title", "guide.card_archive_blurb", { t })} - ${renderGuideOverviewCard("guide.windows_title", "guide.card_decoder_blurb", { t })} ${renderGuideOverviewCard("guide.schedule_title", "guide.card_schedule_blurb", { t })} ${renderGuideOverviewCard("guide.videos_title", "guide.card_videos_blurb", { t })} + ${renderGuideOverviewCard("guide.tab_install", "guide.card_decoder_blurb", { t })} @@ -52,34 +52,14 @@ export function renderGuideView({ dom, t }) { +
-
- ${renderGuidePanel("guide.windows_title", ["guide.windows_1", "guide.windows_2", "guide.windows_3", "guide.windows_4", "guide.windows_5"], "", { t })} - ${renderGuidePanel("guide.linux_title", ["guide.linux_1", "guide.linux_2", "guide.linux_3"], "", { t })} -
-
${renderGuidePanel("guide.decoder_roles_title", ["guide.decoder_roles_1", "guide.decoder_roles_2", "guide.decoder_roles_3", "guide.decoder_roles_4", "guide.decoder_roles_5", "guide.decoder_roles_6", "guide.decoder_roles_7", "guide.decoder_roles_8", "guide.decoder_roles_9", "guide.decoder_roles_10", "guide.decoder_roles_11", "guide.decoder_roles_12", "guide.decoder_roles_13", "guide.decoder_roles_14", "guide.decoder_roles_15"], "", { t })} ${renderGuidePanel("guide.sim_title", ["guide.sim_1", "guide.sim_2", "guide.sim_3", "guide.sim_4"], "", { t })} - ${renderGuidePanel("guide.host_title", ["guide.host_1", "guide.host_2", "guide.host_3", "guide.host_4", "guide.host_5", "guide.host_6", "guide.host_7", "guide.host_8"], "", { t })}
- -
-

${t("guide.sqlite_title")}

-
-
    -
  • ${t("guide.sqlite_1")}
  • -
  • ${t("guide.sqlite_2")}
  • -
  • ${t("guide.sqlite_3")}
  • -
  • ${t("guide.sqlite_4")}
  • -
  • ${t("guide.sqlite_5")}
  • -
  • ${t("guide.sqlite_6")}
  • -
-

${t("guide.ammc_ref")}

-
-
@@ -167,6 +147,33 @@ export function renderGuideView({ dom, t }) {
+ +
+

${t("guide.install_intro")}

+
+ ${renderGuidePanel("guide.windows_title", ["guide.windows_1", "guide.windows_2", "guide.windows_3", "guide.windows_4", "guide.windows_5"], "", { t })} + ${renderGuidePanel("guide.linux_title", ["guide.linux_1", "guide.linux_2", "guide.linux_3"], "", { t })} +
+ +
+ ${renderGuidePanel("guide.host_title", ["guide.host_1", "guide.host_2", "guide.host_3", "guide.host_4", "guide.host_5", "guide.host_6", "guide.host_7", "guide.host_8"], "", { t })} +
+ +
+

${t("guide.sqlite_title")}

+
+
    +
  • ${t("guide.sqlite_1")}
  • +
  • ${t("guide.sqlite_2")}
  • +
  • ${t("guide.sqlite_3")}
  • +
  • ${t("guide.sqlite_4")}
  • +
  • ${t("guide.sqlite_5")}
  • +
  • ${t("guide.sqlite_6")}
  • +
+

${t("guide.ammc_ref")}

+
+
+
`; const guideTabButtons = Array.from(dom.view.querySelectorAll(".guide-tab")); diff --git a/tests/browser_guide_tabs.js b/tests/browser_guide_tabs.js index 192353d..08b1b78 100644 --- a/tests/browser_guide_tabs.js +++ b/tests/browser_guide_tabs.js @@ -26,7 +26,7 @@ export async function runGuideTabsSmoke({ evaluate, navigate }) { assert.equal(visible.videos, false, "videos panel hidden by default"); console.log("PASS guide defaults to the Getting started tab with only that panel visible"); - for (const tab of ["create", "run", "series", "training", "videos", "start"]) { + for (const tab of ["create", "run", "series", "training", "videos", "install", "start"]) { await evaluate(`document.querySelector('[data-guide-tab="${tab}"]').click()`); assert.equal(await activeTab(), tab, `clicking the ${tab} tab activates it`); visible = await panelVisibility();