From d7fae39ae347d36a2857a7b50b4a5c05f4a49a17 Mon Sep 17 00:00:00 2001 From: Jakob Moser <moser@cl.uni-heidelberg.de> Date: Wed, 26 Jun 2024 09:51:21 +0200 Subject: [PATCH] Rename "Alle Dienste" to "FS-Dienste" --- .../pages/{AllServices.mjs => FsServices.mjs} | 4 ++-- portal/static/js/components/pages/UniServices.mjs | 2 +- portal/static/js/components/pieces/Nav.mjs | 4 ++-- portal/static/js/portal.mjs | 14 ++++++++++---- 4 files changed, 15 insertions(+), 9 deletions(-) rename portal/static/js/components/pages/{AllServices.mjs => FsServices.mjs} (84%) diff --git a/portal/static/js/components/pages/AllServices.mjs b/portal/static/js/components/pages/FsServices.mjs similarity index 84% rename from portal/static/js/components/pages/AllServices.mjs rename to portal/static/js/components/pages/FsServices.mjs index eb32c43..d779929 100644 --- a/portal/static/js/components/pages/AllServices.mjs +++ b/portal/static/js/components/pages/FsServices.mjs @@ -2,9 +2,9 @@ import { services } from "../../model/services.mjs" import { ServiceLink } from "../pieces/ServiceLink.mjs" import { Base } from "./Base.mjs" -export const All = { +export const FsServices = { oncreate() { - document.title = "Alle Dienste · FS Coli Portal" + document.title = "FS-Dienste · FS Coli Portal" }, view() { return m( diff --git a/portal/static/js/components/pages/UniServices.mjs b/portal/static/js/components/pages/UniServices.mjs index 72a713d..460c089 100644 --- a/portal/static/js/components/pages/UniServices.mjs +++ b/portal/static/js/components/pages/UniServices.mjs @@ -2,7 +2,7 @@ import { Service } from "../../model/Service.mjs" import { ServiceLink } from "../pieces/ServiceLink.mjs" import { Base } from "./Base.mjs" -export const Uni = { +export const UniServices = { oncreate() { document.title = "Uni-Dienste · FS Coli Portal" }, diff --git a/portal/static/js/components/pieces/Nav.mjs b/portal/static/js/components/pieces/Nav.mjs index 00d9aee..ba3181e 100644 --- a/portal/static/js/components/pieces/Nav.mjs +++ b/portal/static/js/components/pieces/Nav.mjs @@ -36,8 +36,8 @@ export const Nav = { m( "li", m(NavPageLink, { - href: "/all-services", - label: "Alle Dienste", + href: "/fs-services", + label: "FS-Dienste", }), ), m( diff --git a/portal/static/js/portal.mjs b/portal/static/js/portal.mjs index c47a8e2..6547a0d 100644 --- a/portal/static/js/portal.mjs +++ b/portal/static/js/portal.mjs @@ -1,6 +1,6 @@ -import { All } from "./components/pages/AllServices.mjs" -import { Uni } from "./components/pages/UniServices.mjs" import { Start } from "./components/pages/Start.mjs" +import { FsServices } from "./components/pages/FsServices.mjs" +import { UniServices } from "./components/pages/UniServices.mjs" import { Unlock } from "./components/pages/Unlock.mjs" import { Fachschaftssitzung } from "./components/pages/Fachschaftssitzung.mjs" import { Login } from "./components/pages/Login.mjs" @@ -11,8 +11,14 @@ import "/static/lib/mithril/mithril.min.js" m.route.prefix = "" m.route(document.body, "/", { "/": Start, - "/all-services": All, - "/uni-services": Uni, + "/fs-services": FsServices, + "/all-services": { + // Redirect for compatibility purposes, say, if anyone already has a bookmark to /all-services + onmatch(args) { + m.route.set("/fs-services") + }, + }, + "/uni-services": UniServices, "/unlock": Unlock, "/fachschaftssitzung": Fachschaftssitzung, "/login": Login, -- GitLab