Merge branch 'master' of https://github.com/fykosak/webs

fykosak · Nov 22, 2023 · 5a31f6c · 5a31f6c
2 parents a628605 + 316bf08
commit 5a31f6c
Show file tree

Hide file tree

Showing 7 changed files with 245 additions and 240 deletions.
diff --git a/app/Components/ResultsPanel/app.tsx b/app/Components/ResultsPanel/app.tsx
@@ -87,8 +87,8 @@ export const ForVisibleResults: React.FC<{data: DataInterface<true>, teams: Team
 
   return <>
     <div className="row strips">
-      {["A", "B", "C"].map(c =>
-        <div className="col-md-4">
+      {["A", "B", "C", "O"].map(c =>
+        <div className="col-md-3">
           <CategoryColumn category={c} points={points} showFull={showFull} mappedTeams={mappedTeams} />
         </div>
       )}
@@ -160,7 +160,7 @@ const CategoryColumn: React.FC<{
           <div className="team-name">{mappedTeams[p.team.teamId]?.name ?? p.team.name}</div>
           <div className="flags">
             {[...new Set(mappedTeams[p.team.teamId]?.participants.map(p => p.countryIso))].filter(iso => iso !== "ZZ").map(iso =>
-              <span className={`flag-icon flag-icon-${iso.toLowerCase()}`} />
+              <span className={`flag-icon flag-icon-${iso?.toLowerCase()}`} />
             )}
           </div>
         </td>

diff --git a/app/Components/ResultsPanel/panel.latte b/app/Components/ResultsPanel/panel.latte
@@ -25,6 +25,6 @@
                 data-teams="{control apiResults:teamsData}"
                 data-results="{control apiResults:resultsData}"
         ></div>
-        <script src="{='assets/results.js'|asset}"></script>
+        <script src="{asset 'assets/results.js'}"></script>
     </section>
 </div>
diff --git a/app/Modules/Fof/Core/templates/@layout.latte b/app/Modules/Fof/Core/templates/@layout.latte
@@ -203,7 +203,7 @@
                     </p>
                     <div class="other-logos">
                         <a target="_blank" href="https://fykos.cz/"><img class="other-logo" src="{$basePath}/images/logos/fykos_logo_white.png" alt="FYKOS" style="max-height: 2rem; margin: 0 1rem 1rem 0" /></a>
-                        <a target="_blank" href="{switch $lang}{case 'cs'}https://online.fyziklani.cz/{default}https://online.fyziklani.org/{/switch}"><img class="other-logo" src="{$basePath}/images/logos/fyziklani_online_{$lang}.svg"style="max-height: 2rem; margin: 0 1rem 1rem 0"/></a>
+                        <a target="_blank" href="{switch $lang}{case 'cs'}https://online.fyziklani.cz/{default}https://physicsbrawl.org/{/switch}"><img class="other-logo" src="{$basePath}/images/logos/fyziklani_online_{$lang}.svg"style="max-height: 2rem; margin: 0 1rem 1rem 0"/></a>
                         {if $lang=='cs'}<a target="_blank" href="https://dsef.cz/"><img class="other-logo" src="{$basePath}/images/logos/dsef_logo_white.png"style="max-height: 2rem; margin: 0 1rem 1rem 0"/></a>{/if}
                     </div>
                 </div>