- +

+ {tableStyle === "grouped" ? ( + + ) : ( + + )} +

+ +

+ - {timetableData.length > 0 && ( -

- 0 && ( +

+ diff --git a/src/frontend/app/routes/settings.tsx b/src/frontend/app/routes/settings.tsx index b75434d..3bc3492 100644 --- a/src/frontend/app/routes/settings.tsx +++ b/src/frontend/app/routes/settings.tsx @@ -2,8 +2,6 @@ import { useApp } from "../AppContext"; import "./settings.css"; import { useTranslation } from "react-i18next"; import { useState } from "react"; -import { swManager } from "../utils/serviceWorkerManager"; -import { RotateCcw, Download } from "lucide-react"; export default function Settings() { const { t, i18n } = useTranslation(); @@ -19,63 +17,6 @@ export default function Settings() { const [isCheckingUpdates, setIsCheckingUpdates] = useState(false); const [updateMessage, setUpdateMessage] = useState(null); - const handleCheckForUpdates = async () => { - setIsCheckingUpdates(true); - setUpdateMessage(null); - - try { - // Check if service worker is supported - if (!("serviceWorker" in navigator)) { - setUpdateMessage(t("about.sw_not_supported", "Service Workers no son compatibles en este navegador")); - return; - } - - // Force check for updates - await swManager.checkForUpdates(); - - // Wait a moment for the update check to complete - setTimeout(() => { - if (swManager.isUpdateAvailable()) { - setUpdateMessage(t("about.update_available", "¡Nueva versión disponible! Aparecerá una notificación para actualizar.")); - } else { - setUpdateMessage(t("about.up_to_date", "Ya tienes la versión más reciente.")); - } - }, 2000); - - } catch (error) { - console.error("Error checking for updates:", error); - setUpdateMessage(t("about.update_error", "Error al comprobar actualizaciones. Intenta recargar la página.")); - } finally { - setIsCheckingUpdates(false); - } - }; - - const handleClearCache = async () => { - if (confirm(t("about.clear_cache_confirm", "¿Estás seguro de que quieres limpiar la caché? Esto eliminará todos los datos guardados localmente."))) { - try { - await swManager.clearCache(); - setUpdateMessage(t("about.cache_cleared", "Caché limpiada. La página se recargará para aplicar los cambios.")); - setTimeout(() => { - window.location.reload(); - }, 2000); - } catch (error) { - console.error("Error clearing cache:", error); - setUpdateMessage(t("about.cache_error", "Error al limpiar la caché.")); - } - } - }; - - const handleResetPWA = async () => { - if (confirm(t("about.reset_pwa_confirm", "¿Estás seguro? Esto eliminará TODOS los datos de la aplicación y la reiniciará completamente. Úsalo solo si hay problemas graves de caché."))) { - try { - await swManager.resetPWA(); - } catch (error) { - console.error("Error resetting PWA:", error); - setUpdateMessage(t("about.reset_pwa_error", "Error al reiniciar la PWA.")); - } - } - }; - return (

{t("about.title")}

@@ -153,55 +94,6 @@ export default function Settings() {

{t("about.details_grouped")}

- -

{t("about.app_updates", "Actualizaciones de la aplicación")}

- - - - - -

- - {updateMessage && ( -

- {updateMessage} -

- )} - -

- {t("about.update_help", "Si tienes problemas con la aplicación o no ves las últimas funciones, usa estos botones para forzar una actualización o limpiar los datos guardados.")} -

{t("about.credits")}

diff --git a/src/frontend/app/routes/stoplist.tsx b/src/frontend/app/routes/stoplist.tsx index 1e55dc9..885a0da 100644 --- a/src/frontend/app/routes/stoplist.tsx +++ b/src/frontend/app/routes/stoplist.tsx @@ -69,8 +69,9 @@ export default function StopList() { return stopsList.reverse(); }, [data]); - if (data === null) + if (data === null) { return

{t("common.loading")}

; + } return (

@@ -83,60 +84,60 @@ export default function StopList() { -

- - - {searchResults && searchResults.length > 0 && ( -

- {t("stoplist.search_results", "Resultados de la búsqueda")} -

- ))} -

- )} + type="text" + placeholder={randomPlaceholder} + id="stopName" + onChange={handleStopSearch} + /> +

+ + {searchResults && searchResults.length > 0 && (

{t("stoplist.favourites")}

- - {favouritedStops?.length === 0 && ( -

- {t( - "stoplist.no_favourites", - "Accede a una parada y márcala como favorita para verla aquí.", - )} -

- )} - +

+ {t("stoplist.search_results", "Resultados de la búsqueda")} +

)} + {searchResults.map((stop: Stop) => ( + + ))}

- - {recentStops && recentStops.length > 0 && ( -

{t("stoplist.recents")}

- -

- ))} -

+ )} + +

{t("stoplist.favourites")}

+ + {favouritedStops?.length === 0 && ( +

+ {t( + "stoplist.no_favourites", + "Accede a una parada y márcala como favorita para verla aquí.", + )} +

)} +

+ + {recentStops && recentStops.length > 0 && (

{t("stoplist.all_stops", "Paradas")}

{t("stoplist.recents")}

+ +

+ ))} +

+ )} + +

{t("stoplist.all_stops", "Paradas")}

{ - try { - // Delete all caches - const cacheNames = await caches.keys(); - await Promise.all(cacheNames.map(name => caches.delete(name))); - console.log("All caches cleared"); - } catch (error) { - console.error("Failed to clear cache:", error); - throw error; - } - } - - // Nuclear option: completely reset the PWA - async resetPWA(): Promise { - try { - console.log("Resetting PWA completely..."); - - // 1. Unregister ALL service workers - const registrations = await navigator.serviceWorker.getRegistrations(); - await Promise.all(registrations.map(reg => reg.unregister())); - - // 2. Clear all caches - await this.clearCache(); - - // 3. Clear local storage (optional) - localStorage.clear(); - sessionStorage.clear(); - - console.log("PWA reset complete - reloading..."); - - // 4. Force reload after a short delay - setTimeout(() => { - window.location.reload(); - }, 500); - - } catch (error) { - console.error("Failed to reset PWA:", error); - throw error; - } - } -} - -export const swManager = new ServiceWorkerManager(); diff --git a/src/frontend/index.html b/src/frontend/index.html deleted file mode 100644 index 24697c0..0000000 --- a/src/frontend/index.html +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - UrbanoVigo Web - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - diff --git a/src/frontend/public/pwa-worker.js b/src/frontend/public/pwa-worker.js index f47ede0..ef696fe 100644 --- a/src/frontend/public/pwa-worker.js +++ b/src/frontend/public/pwa-worker.js @@ -1,49 +1,45 @@ -const CACHE_VERSION = "2025-0806a"; -const API_CACHE_NAME = `api-cache-${CACHE_VERSION}`; +const CACHE_VERSION = "2025-0907a"; const STATIC_CACHE_NAME = `static-cache-${CACHE_VERSION}`; +const STATIC_CACHE_ASSETS = [ + "/favicon.ico", + "/logo-256.png", + "/logo-512.jpg", + "/stops.json" +]; + +const EXPR_CACHE_AFTER_FIRST_VIEW = /(\/assets\/.*)|(\/api\/GetStopTimetable.*)/; -const API_URL_PATTERN = /\/api\/(GetStopList|GetStopEstimates|GetStopTimetable)/; -const API_MAX_AGE = 24 * 60 * 60 * 1000; // 24h const ESTIMATES_MIN_AGE = 15 * 1000; const ESTIMATES_MAX_AGE = 30 * 1000; self.addEventListener("install", (event) => { - console.log("SW: Installing new version"); + console.log("SW: Install event in progress. Cache version: ", CACHE_VERSION); event.waitUntil( caches.open(STATIC_CACHE_NAME).then((cache) => - cache.addAll([ - "/favicon.ico", - "/logo-256.png", - "/logo-512.jpg", - "/stops.json" - ]) + cache.addAll(STATIC_CACHE_ASSETS) ).then(() => self.skipWaiting()) ); }); self.addEventListener("activate", (event) => { - console.log("SW: Activating new version"); - event.waitUntil( - (async () => { - const cacheNames = await caches.keys(); - await Promise.all( - cacheNames.map((name) => { - if (name !== API_CACHE_NAME && name !== STATIC_CACHE_NAME) { - console.log("SW: Deleting old cache:", name); - return caches.delete(name); - } - }) - ); - await self.clients.claim(); - const clients = await self.clients.matchAll(); - clients.forEach((client) => - client.postMessage({ type: "SW_UPDATED" }) - ); - })() - ); + const doCleanup = async () => { + // Cleans the old caches + const cacheNames = await caches.keys(); + await Promise.all( + cacheNames.map((name) => { + if (name !== STATIC_CACHE_NAME) { + return caches.delete(name); + } + }) + ); + + await self.clients.claim(); + } + + event.waitUntil(doCleanup()); }); -self.addEventListener("fetch", (event) => { +self.addEventListener("fetch", async (event) => { const request = event.request; const url = new URL(request.url); @@ -52,94 +48,37 @@ self.addEventListener("fetch", (event) => { return; } - // API - if (request.method === "GET" && API_URL_PATTERN.test(url.pathname)) { - event.respondWith(handleApiRequest(request)); - return; - } - - // Navegación -> network first + // Navigating => we don't intercept anything, if it fails, good luck if (request.mode === "navigate") { - event.respondWith(handleNavigationRequest(request)); return; } - // Estáticos -> cache first - if (request.method === "GET") { - event.respondWith(handleStaticRequest(request)); - } -}); - -async function handleApiRequest(request) { - const url = new URL(request.url); - const isEstimates = url.pathname.includes("GetStopEstimates"); - const maxAge = isEstimates - ? ESTIMATES_MIN_AGE + Math.random() * (ESTIMATES_MAX_AGE - ESTIMATES_MIN_AGE) - : API_MAX_AGE; - - const cache = await caches.open(API_CACHE_NAME); - const cachedResponse = await cache.match(request); - - if (cachedResponse) { - const dateHeader = cachedResponse.headers.get("date"); - const age = dateHeader ? Date.now() - new Date(dateHeader).getTime() : 0; - if (age && age < maxAge) { - console.debug("SW: Cache HIT", request.url); - return cachedResponse; + // Static => cache first, if not, network; if not, fallback + const isAssetCacheable = STATIC_CACHE_ASSETS.includes(url.pathname) || EXPR_CACHE_AFTER_FIRST_VIEW.test(url.pathname); + if (request.method === "GET" && isAssetCacheable) { + const response = handleStaticRequest(request); + if (response !== null) { + event.respondWith(response); } - cache.delete(request); - } - - try { - const netResponse = await fetch(request); - if (netResponse.ok) cache.put(request, netResponse.clone()); - return netResponse; - } catch (error) { - if (cachedResponse) return cachedResponse; - throw error; + return; } -} +}); async function handleStaticRequest(request) { const cache = await caches.open(STATIC_CACHE_NAME); const cachedResponse = await cache.match(request); - if (cachedResponse) return cachedResponse; - - try { - const netResponse = await fetch(request); - if (netResponse.ok) cache.put(request, netResponse.clone()); - return netResponse; - } catch (err) { - return new Response("Offline asset not available", { - status: 503, - headers: { "Content-Type": "text/plain" } - }); + if (cachedResponse){ + console.log("SW handleStaticRequest: HIT for ", request.url); + return cachedResponse; } -} -async function handleNavigationRequest(request) { try { const netResponse = await fetch(request); + if (netResponse.ok) cache.put(request, netResponse.clone()); + console.log("SW handleStaticRequest: MISS for ", request.url); return netResponse; } catch (err) { - // Si no hay red, intenta fallback con caché estática - const cache = await caches.open(STATIC_CACHE_NAME); - const offline = await cache.match("/stops.json"); - return ( - offline || - new Response("App offline", { - status: 503, - headers: { "Content-Type": "text/plain" } - }) - ); + console.error("SW handleStaticRequest: FAIL for ", request.url, err); + return null; } } - -self.addEventListener("message", (event) => { - if (event.data?.type === "SKIP_WAITING") self.skipWaiting(); - if (event.data?.type === "CLEAR_CACHE") { - event.waitUntil( - caches.keys().then((names) => Promise.all(names.map((n) => caches.delete(n)))) - ); - } -}); -- cgit v1.3