commit 55f1e864a25a76d5d9b5a424ad063bf154981c50
parent 3b9bc01071f2b2939f5809c63d959509cb12693a
Author: Katja (ctucx) <git@ctu.cx>
Date: Sun, 19 Jan 2025 15:38:19 +0100
parent 3b9bc01071f2b2939f5809c63d959509cb12693a
Author: Katja (ctucx) <git@ctu.cx>
Date: Sun, 19 Jan 2025 15:38:19 +0100
remove travelynx feature
8 files changed, 4 insertions(+), 51 deletions(-)
diff --git a/src/journeyView.js b/src/journeyView.js @@ -1,6 +1,6 @@ import { cachedCoachSequence } from './reihung'; import { settings } from './settings.js'; -import { remarksTemplate, travelynxTemplate } from './templates.js'; +import { remarksTemplate } from './templates.js'; import { showDiv, hideDiv, ElementById, formatDateTime, formatDuration, formatPrice, formatTrainTypes, lineAdditionalName, lineDisplayName } from './helpers.js'; import { ConsoleLog, parseName, t, timeTemplate, getJourney, refreshJourney, platformTemplate, stopTemplate } from './app_functions.js'; import { showAlertModal, showLoader, hideOverlay, showModal } from './overlays.js'; @@ -30,8 +30,7 @@ const legTemplate = (leg, profile) => { <td colspan="4"> <span><a href="#/t/${profile}/${leg.tripId}">${lineDisplayName(leg.line)}${leg.direction ? html` → ${leg.direction}` : ''}</a> ${leg.cancelled ? html`<b class="cancelled-text">${t('cancelled-ride')}</b>` : ''} - ${Object.entries(remarks).map(remarksTemplate)} - ${travelynxTemplate(leg)}</span> + ${Object.entries(remarks).map(remarksTemplate)}</span> </td> </tr> <tr>
diff --git a/src/languages.js b/src/languages.js @@ -52,7 +52,6 @@ export const languages = { 'to': 'Nach', 'tram': 'Tram', 'transferinfo': 'Reise nach {}', - 'travelynx-checkin': 'Travelynx Check-in anzeigen', 'update': 'Anwendung updaten', 'via': 'Über', 'walkinfo': 'Laufe nach {}', @@ -119,7 +118,6 @@ export const languages = { 'to': 'Naar', 'tram': 'Tram', 'transferinfo': 'Reis naar {}', - 'travelynx-checkin': 'Travelynx check-in tonen', 'update': 'Applicatie updaten', 'via': 'Over', 'walkinfo': 'Ga naar {}', @@ -186,7 +184,6 @@ export const languages = { 'to': 'To', 'tram': 'Tram', 'transferinfo': 'Travel to {}', - 'travelynx-checkin': 'Show travelynx checkin', 'update': 'Update application', 'via': 'Via', 'walkinfo': 'Walk to {}',
diff --git a/src/settings.js b/src/settings.js @@ -25,7 +25,6 @@ const defaultSettings = { showRIL100Names: false, writeDebugLog: false, language: getDefaultLanguage(), - travelynx: false, journeysViewMode: 'canvas', showPrices: false, profile: "db",
diff --git a/src/settingsView.js b/src/settingsView.js @@ -16,7 +16,6 @@ const settingsTemplate = () => html` <b>${t('options')}:</b><br> <label><input type="checkbox" ?checked=${settings.showRIL100Names} id="ril100"> ${t('showds100')}</label><br> <label><input type="checkbox" ?checked=${settings.writeDebugLog} id="debug-messages"> ${t('showdebug')}</label><br> - <label><input type="checkbox" ?checked=${settings.travelynx} id="travelynx"> ${t('travelynx-checkin')}</label><br> <label><input type="checkbox" ?checked=${settings.advancedSelection} id="advancedSelection">ADVANCED® selection of trains</label><br> <br> <b>${t('language')}:</b><br> @@ -57,7 +56,6 @@ const saveSettings = async () => { await modifySettings(settings => { settings.showRIL100Names = ElementById('ril100').checked; settings.writeDebugLog = ElementById('debug-messages').checked; - settings.travelynx = ElementById('travelynx').checked; settings.advancedSelection = ElementById('advancedSelection').checked; const language = document.querySelector('input[name="language"]:checked').value;
diff --git a/src/templates.js b/src/templates.js @@ -17,18 +17,6 @@ export const remarksModalTemplate = (type, remarks) => html` </table> `; -export const travelynxTemplate = (element) => { - if (settings.travelynx && element.line && element.line.mode === 'train') { - const trainName = lineAdditionalName(element.line) || element.line?.name; - - if (trainName) { - return html` - <a class="link icon-travelynx" href="https://travelynx.de/s/${element.origin.id}?train=${encodeURIComponent(trainName)}"></a> - `; - } - } -}; - export const showRemarksModal = (type, remarks) => { showModal(t('remarks'), remarksModalTemplate(type, remarks)); };
diff --git a/src/tripView.js b/src/tripView.js @@ -1,5 +1,5 @@ import { settings } from './settings.js'; -import { remarksTemplate, travelynxTemplate } from './templates.js'; +import { remarksTemplate } from './templates.js'; import { showDiv, hideDiv, ElementById, formatDateTime, formatDuration, formatPrice, lineAdditionalName, lineDisplayName } from './helpers.js'; import { ConsoleLog, parseName, t, timeTemplate, processLeg, platformTemplate, stopTemplate } from './app_functions.js'; import { showAlertModal, showLoader, hideOverlay, showModal } from './overlays.js'; @@ -48,8 +48,7 @@ const tripTemplate = (data, profile) => { ${lineDisplayName(data.line)}${data.direction ? html` → ${data.direction}` : ''} `} ${data.cancelled ? html`<b class="cancelled-text">${t('cancelled-ride')}</b>` : ''} - ${Object.entries(remarks).map(remarksTemplate)} - ${travelynxTemplate(data)}</span> + ${Object.entries(remarks).map(remarksTemplate)}</span> </td> </tr> <tr>
diff --git a/static/img/travelynx.svg b/static/img/travelynx.svg @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="24" height="24" viewBox="0 0 24 24" version="1.1" id="svg6" sodipodi:docname="travelynx.svg" inkscape:version="0.92.4 (5da689c313, 2019-01-14)"> - <metadata id="metadata12"> - <rdf:RDF> - <cc:Work rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> - <dc:title/> - </cc:Work> - </rdf:RDF> - </metadata> - <defs id="defs10"/> - <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1918" inkscape:window-height="2131" id="namedview8" showgrid="false" inkscape:zoom="19.666667" inkscape:cx="0.25717638" inkscape:cy="10.252251" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="0" inkscape:current-layer="g4573"/> - <g id="g4573"> - <rect y="3.40678" x="3.1271186" height="9.5338984" width="10.550848" id="rect4564" style="fill:#ffffff;fill-opacity:1;stroke-width:1.44797695"/> - <g id="g4562"> - <path d="m 8.4266298,1.3049637 c -3.0613961,0 -6.1227924,0.3826745 -6.1227924,3.0613962 v 7.2708161 c 0,1.477124 1.2015981,2.678722 2.6787217,2.678722 l -1.1480235,1.148023 v 0.382675 H 5.5412639 L 7.071962,14.315898 h 2.8853658 l 1.5306982,1.530698 h 1.530698 V 15.463921 L 11.8707,14.315898 c 1.477124,0 2.678722,-1.201598 2.678722,-2.678722 V 4.3663599 c 0,-2.6787217 -2.73995,-3.0613962 -6.1227922,-3.0613962 z M 4.9825591,12.7852 c -0.6352397,0 -1.1480235,-0.512784 -1.1480235,-1.148024 0,-0.63524 0.5127838,-1.148024 1.1480235,-1.148024 0.6352397,0 1.1480236,0.512784 1.1480236,1.148024 0,0.63524 -0.5127839,1.148024 -1.1480236,1.148024 z M 7.6612808,7.427756 H 3.8345356 V 4.3663599 h 3.8267452 z m 1.5306982,0 V 4.3663599 h 3.826745 V 7.427756 Z M 11.8707,12.7852 c -0.635239,0 -1.148023,-0.512784 -1.148023,-1.148024 0,-0.63524 0.512784,-1.148024 1.148023,-1.148024 0.63524,0 1.148024,0.512784 1.148024,1.148024 0,0.63524 -0.512784,1.148024 -1.148024,1.148024 z" id="path14" inkscape:connector-curvature="0" style="stroke-width:0.76534903"/> - <path style="fill:none" inkscape:connector-curvature="0" d="M 0,0 H 24 V 24 H 0 Z" id="path16"/> - <path inkscape:connector-curvature="0" d="M 13.208696,20.997167 9.6183022,17.406774 8.3956743,18.620792 13.208696,23.433813 23.540763,13.101746 22.326745,11.887728 Z" id="path16-3" style="stroke-width:0.8610056"/> - </g> - </g> -</svg>- \ No newline at end of file
diff --git a/static/style.css b/static/style.css @@ -791,10 +791,6 @@ form>div.history { } -.icon-travelynx { - content: url('./img/travelynx.svg'); -} - .selector label { display: flex; justify-content: center;