Merge branch 'main' of https://github.com/d-oit/d-oit.github.io

Author: d-oit

.github/workflows/hugo.yaml

@@ -57,10 +57,7 @@ jobs:
           HUGO_ENV: production
           TZ: America/Los_Angeles
         run: |
-          hugo \
-            --gc \
-            --minify \
-            --baseURL "${{ steps.pages.outputs.base_url }}/"          
+          hugo --gc --minify --baseURL "${{ steps.pages.outputs.base_url }}/" && cd public/en && cp 404.html ../404.html    
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:

assets/free_basket_calendar.json

@@ -28,7 +28,7 @@ if (window.location.href.includes("/free-basketball-live-streams/")) {
         });
 
         var searchBox = document.getElementById("searchBoxInlinePage");
-        if (searchBox != null) {          
+        if (searchBox != null) {
           searchBox.addEventListener("input", function () {
             var filter = this.value.toLowerCase();
             var items = document.querySelectorAll('[data-search-content]');           

assets/js/critical/tableCardViewSwitch.js

@@ -40,6 +40,7 @@ for = '/**'
         """
     Access-Control-Allow-Origin = "*"
 # toml-docs-end server-config
+
 defaultContentLanguage = 'en'
 defaultContentLanguageInSubdir = true
 [[redirects]]

config/_default/server.toml

@@ -193,10 +193,15 @@
 - id: tablePageSelectAll
   translation: Alle
 
-
+  # Basketball streams table
+- id: SwitchCardTableView
+  translation: Ansicht wechseln
 - id: Date
   translation: Datum
 - id: Time
   translation: Uhrzeit
 - id: Description
-  translation: Beschreibung
+  translation: Beschreibung
+- id: League
+  translation: Liga
+

i18n/de.yaml

@@ -9,18 +9,19 @@
 # Toast color.js saved
 - id: websiteThemeMode 
   translation: Website Theme Mode
-
 - id: websiteThemeModeText 
   translation: Saved to local browser storage.
-
 - id: tablePageSelectAll
   translation: "All"
 
-
-
+  # Basketball streams table
+- id: SwitchCardTableView
+  translation: Switch view
 - id: Date
   translation: Date
 - id: Time
   translation: Time
 - id: Description
-  translation: Description
+  translation: Description
+- id: League
+  translation: League

i18n/en.yaml

@@ -10,6 +10,7 @@
                 </span>
                 {{- $home := printf "<a href=\"%s\">%s</a>" $base (T "pageNotFoundHome") -}}
                 <p>{{ T "pageNotFound" $home | safeHTML }}</p>
+                <p>Die Seite ist nicht vorhanden. Zurück zur Startseite <a href=/de>Startseite (de)</a>.</p>
             </div>
         </div>
     </div>

layouts/404.html

@@ -5,7 +5,7 @@
 {{ $data := transform.Unmarshal $json.Content }}
 {{ if $data }}
 <p class="text-end">
-  <button id="toggleView" class="btn btn-warning">Switch View</button>
+  <button id="toggleView" class="btn btn-warning">{{ i18n "SwitchCardTableView" }}</button>
 </p>
 <div id="content">
 
@@ -20,13 +20,20 @@
       {{ range $index, $item := $data }}
       <div class="col-sm-4 mb-3 mb-sm-1" data-search-content="{{ time.Format " :date_short" (time.AsTime $item.begin) }}
         {{ time.Format ":time_short" (time.AsTime $item.begin) }} {{ $item.name }}">
-
         <div class="card h-100">
           <div class="card-body">
-            <h4 class="card-title">{{ $item.name }}</h4>
+            <h4 class="card-title">{{ with $item.league }}
+              {{ if ne . "" }}
+                {{ $item.name }} ({{ . }})
+              {{ else }}
+                {{ $item.name }}
+              {{ end }}
+            {{ else }}
+              {{ $item.name }}
+            {{ end }}</h4>
             <h5 class="card-text">{{ time.Format ":date_short" (time.AsTime $item.begin) }} {{
               time.Format ":time_short" (time.AsTime $item.begin) }}</h5>
-            <p class="card-muted">{{ $item.description }}</p>
+            <p class="card-muted"><small>{{ $item.description }}</small></p>
           </div>
           <div class="card-footer">
             <p class="text-center">
@@ -60,7 +67,8 @@ <h5 class="card-text">{{ time.Format ":date_short" (time.AsTime $item.begin) }}
           <th data-sortable="false">{{ i18n "Date" }}</th>
           <th data-sortable="false">{{ i18n "Time" }}</th>
           <th>Teams</th>
-          <th>{{ i18n "Description" }}</th>
+          <th>{{ i18n "League" }}</th>
+          <th><small>{{ i18n "Description" }}</small></th>
           <th>Channel</th>
         </tr>
       </thead>
@@ -70,7 +78,8 @@ <h5 class="card-text">{{ time.Format ":date_short" (time.AsTime $item.begin) }}
           <td data-text="{{ $item.begin }}">{{ time.Format ":date_short" (time.AsTime $item.begin) }}</td>
           <td data-text="{{ $item.begin }}">{{ time.Format ":time_short" (time.AsTime $item.begin) }}</td>
           <td>{{ $item.name }}</td>
-          <td>{{ $item.description }}</td>
+          <td>{{ $item.league }}</td>
+          <td><small>{{ $item.description }}</small></td>
           <td> 
             {{ if $item.url }}
                 <a href="{{ $item.url }}" rel="noopener noreferrer">{{ $item.location }}</a>

layouts/shortcodes/basketCalendarJsonTable.html

@@ -24,6 +24,7 @@
     "start:example:prod": "npm run -s prestart  && hugo server --bind=0.0.0.0 --disableFastRender --printI18nWarnings --minify -e production -s exampleSite",
     "prebuild": "npm run clean:public && npm run -s mod:vendor",
     "build": "hugo --gc --minify",
+    "build:de": "hugo --gc --minify && cd public/en/404.html public/404.html",
     "build:cache": "npm run -s prebuild && hugo config | grep cachedir && hugo --gc --minify -e ci",
     "build:example": "npm run -s prebuild && hugo --gc --minify -s exampleSite",
     "build:example:ci": "npm run -s prebuild && hugo --gc --minify -s exampleSite -e ci",

package.json

@@ -39,6 +39,9 @@ def fetch_ics_file(url):
 berlin_tz = pytz.timezone('Europe/Berlin')
 
 def add_http_if_missing(url):
+    if not url:
+        return None
+
     if not url.startswith(('http://', 'https://')):
         print(f"add https to url %s" % url)
         return f"https://{url}"
@@ -65,7 +68,9 @@ def get_domain_name(url):
         url = extract_first_url(event.location)
         url = add_http_if_missing(url)  # Add https if missing
         location = get_domain_name(url) if url and url.startswith('http') else event.location
-        
+        if not url:
+            printf(f"url is empty {event.name}")
+
         # Check for 'league: Name' in description and remove it
         league = None
         if 'league:' in event.description: