fix filtrowania RJ na posterunkach; favicons index

This commit is contained in:
2023-11-12 15:47:55 +01:00
parent 7b4da9d422
commit 8705dd1df5
3 changed files with 34 additions and 19 deletions
+25 -11
View File
@@ -1,11 +1,14 @@
<!DOCTYPE html> <!doctype html>
<html lang="pl"> <html lang="pl">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width,initial-scale=1.0" /> <meta name="viewport" content="width=device-width,initial-scale=1.0" />
<meta name="keywords" content="Stacjownik, TD2, Train Driver 2, stacjownik-td2, stacjownik, td2.info.pl" /> <meta
name="keywords"
content="Stacjownik, TD2, Train Driver 2, stacjownik-td2, stacjownik, td2.info.pl"
/>
<meta name="description" content="Pomocnik maszynisty i dyżurnego symulatora Train Driver 2" /> <meta name="description" content="Pomocnik maszynisty i dyżurnego symulatora Train Driver 2" />
<title>Stacjownik</title> <title>Stacjownik</title>
@@ -18,10 +21,6 @@
<meta name="msapplication-TileColor" content="#da532c" /> <meta name="msapplication-TileColor" content="#da532c" />
<meta name="theme-color" content="#222222" /> <meta name="theme-color" content="#222222" />
<link rel="icon" href="favicon-64.png" sizes="64x64" type="image/png" />
<link rel="icon" href="favicon-62.png" sizes="62x62" type="image/png" />
<link rel="icon" href="favicon-32.png" sizes="32x32" type="image/png" />
<link rel="icon" href="favicon-16.png" sizes="16x16" type="image/png" />
<link rel="icon" href="favicon.ico" /> <link rel="icon" href="favicon.ico" />
<!-- Static OpenGraph meta --> <!-- Static OpenGraph meta -->
@@ -29,18 +28,33 @@
<meta property="og:url" content="https://stacjownik-td2.web.app/" /> <meta property="og:url" content="https://stacjownik-td2.web.app/" />
<meta property="og:type" content="website" /> <meta property="og:type" content="website" />
<meta property="og:title" content="Stacjownik" /> <meta property="og:title" content="Stacjownik" />
<meta property="og:description" content="Pomocnik maszynisty i dyżurnego symulatora Train Driver 2" /> <meta
<meta property="og:image" content="https://raw.githubusercontent.com/Spythere/api/main/thumbnails/stacjownik.jpg" /> property="og:description"
content="Pomocnik maszynisty i dyżurnego symulatora Train Driver 2"
/>
<meta
property="og:image"
content="https://raw.githubusercontent.com/Spythere/api/main/thumbnails/stacjownik.jpg"
/>
<meta property="og:image:width" content="1200" /> <meta property="og:image:width" content="1200" />
<meta property="og:image:height" content="630" /> <meta property="og:image:height" content="630" />
<meta property="og:site_name" content="Stacjownik" /> <meta property="og:site_name" content="Stacjownik" />
<meta name="twitter:card" content="summary_large_image" /> <meta name="twitter:card" content="summary_large_image" />
<meta name="twitter:title" content="Stacjownik" /> <meta name="twitter:title" content="Stacjownik" />
<meta name="twitter:description" content="Pomocnik maszynisty i dyżurnego symulatora Train Driver 2" /> <meta
<meta name="twitter:image" content="https://raw.githubusercontent.com/Spythere/api/main/thumbnails/stacjownik.jpg" /> name="twitter:description"
content="Pomocnik maszynisty i dyżurnego symulatora Train Driver 2"
/>
<meta
name="twitter:image"
content="https://raw.githubusercontent.com/Spythere/api/main/thumbnails/stacjownik.jpg"
/>
<link href="https://fonts.googleapis.com/css2?family=Quicksand:wght@500;700&display=swap" rel="stylesheet" /> <link
href="https://fonts.googleapis.com/css2?family=Quicksand:wght@500;700&display=swap"
rel="stylesheet"
/>
</head> </head>
<body> <body>
+1
View File
@@ -151,6 +151,7 @@ img.train-image {
&-list { &-list {
position: relative; position: relative;
overflow-y: hidden; overflow-y: hidden;
min-height: 100%;
@include smallScreen() { @include smallScreen() {
width: 100%; width: 100%;
+8 -8
View File
@@ -188,7 +188,7 @@ export function getScheduledTrains(
sceneryData: API.ActiveSceneries.Data, sceneryData: API.ActiveSceneries.Data,
stationGeneralInfo: Station['generalInfo'] stationGeneralInfo: Station['generalInfo']
): ScheduledTrain[] { ): ScheduledTrain[] {
const stationName = sceneryData.stationName.toLocaleLowerCase(); const stationNameLower = sceneryData.stationName.toLocaleLowerCase();
stationGeneralInfo?.checkpoints.forEach((cp) => (cp.scheduledTrains.length = 0)); stationGeneralInfo?.checkpoints.forEach((cp) => (cp.scheduledTrains.length = 0));
@@ -199,14 +199,14 @@ export function getScheduledTrains(
if (!timetable.sceneries.includes(sceneryData.stationHash)) return acc; if (!timetable.sceneries.includes(sceneryData.stationHash)) return acc;
const stopInfoIndex = timetable.followingStops.findIndex((stop) => { const stopInfoIndex = timetable.followingStops.findIndex((stop) => {
const stopName = stop.stopNameRAW.toLowerCase(); const stopNameLower = stop.stopNameRAW.toLocaleLowerCase();
return ( return (
stationName == stopName || stationNameLower == stopNameLower ||
(!/(po\.|podg\.)/.test(stopName) && stopName.includes(stationName)) || (!/(po\.|podg\.)/.test(stopNameLower) && stopNameLower.includes(stationNameLower)) ||
(!/(po\.|podg\.)/.test(stationName) && stationName.includes(stopName)) || (!/(po\.|podg\.)/.test(stationNameLower) && stationNameLower.includes(stopNameLower)) ||
(stopName.split(', podg.')[0] !== undefined && (stopNameLower.split(', podg.')[0] !== undefined &&
stationName.startsWith(stopName.split(', podg.')[0])) stationNameLower.startsWith(stopNameLower.split(', podg.')[0]))
); );
}); });
@@ -219,7 +219,7 @@ export function getScheduledTrains(
} }
stationGeneralInfo?.checkpoints?.forEach((checkpoint) => { stationGeneralInfo?.checkpoints?.forEach((checkpoint) => {
if (checkpoint.checkpointName.toLocaleLowerCase() == stationName) return; // if (checkpoint.checkpointName.toLocaleLowerCase() == stationNameLower) return;
if ( if (
checkpointScheduledTrains.findIndex( checkpointScheduledTrains.findIndex(