commit 6d0a0a869c9ed5176389ab95e054afbf0734d5db
parent f6c0d1f50e845122b274b854e064eb30afe3d463
Author: Katja (ctucx) <git@ctu.cx>
Date: Fri, 31 Jan 2025 12:43:31 +0100
parent f6c0d1f50e845122b274b854e064eb30afe3d463
Author: Katja (ctucx) <git@ctu.cx>
Date: Fri, 31 Jan 2025 12:43:31 +0100
helpers: move `getFrom`, `getTo` to to `app_functions.js`
3 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/src/app_functions.js b/src/app_functions.js @@ -4,7 +4,7 @@ import { go } from './router.js'; import { settings, subscribeSettings } from './settings.js'; import { showLoader, hideOverlay, showModal, showAlertModal } from './overlays.js'; import { languages } from './languages.js'; -import { isEmptyObject, getFrom, getTo, generateSlug, loyaltyCardToString, loyaltyCardFromString } from './helpers.js'; +import { isEmptyObject, generateSlug, loyaltyCardToString, loyaltyCardFromString } from './helpers.js'; import { formatDateTime } from './formatters.js'; import { getHafasClient, client } from './hafas_client.js'; import { trainsearchToHafas, hafasToTrainsearch } from './refresh_token/index.js'; @@ -21,6 +21,9 @@ const journeySettings = () => { return { }}; +export const getFrom = journeys => journeys[0].legs[0].origin; +export const getTo = journeys => journeys[0].legs[journeys[0].legs.length-1].destination; + const addJourneys = async data => { if (!data) return false;
diff --git a/src/helpers.js b/src/helpers.js @@ -53,15 +53,13 @@ export const isValidDate = date => { composedDate.getFullYear() == y; }; +export const loyaltyCardToString = loyaltyCard => `${loyaltyCardsReverse[loyaltyCard.type.toString()]}-${loyaltyCard.discount}-${loyaltyCard.class}`; export const loyaltyCardFromString = string => { const splitedString = string.split('-'); if (splitedString[0] === 'NONE') return { type: loyaltyCards[splitedString[0]] }; return { type: loyaltyCards[splitedString[0]], discount: splitedString[1], class: splitedString[2] }; }; -export const loyaltyCardToString = loyaltyCard => { - return `${loyaltyCardsReverse[loyaltyCard.type.toString()]}-${loyaltyCard.discount}-${loyaltyCard.class}`; -} export const generateSlug = () => { const len = 8; @@ -73,12 +71,3 @@ export const generateSlug = () => { return result; }; - - -export const getFrom = journeys => { - return journeys[0].legs[0].origin; -}; - -export const getTo = journeys => { - return journeys[0].legs[journeys[0].legs.length-1].destination; -};
diff --git a/src/journeysView.js b/src/journeysView.js @@ -1,6 +1,6 @@ import { html, nothing, render } from 'lit-html'; -import { ElementById, setThemeColor, queryBackgroundColor, getFrom, getTo, padZeros } from './helpers.js'; -import { getJourneys, getMoreJourneys, refreshJourneys } from './app_functions.js'; +import { ElementById, setThemeColor, queryBackgroundColor, padZeros } from './helpers.js'; +import { getJourneys, getMoreJourneys, refreshJourneys, getFrom, getTo } from './app_functions.js'; import { formatName, formatDuration, formatFromTo, formatPrice } from './formatters.js'; import { timeTemplate } from './templates.js'; import { settings, modifySettings } from './settings.js';