Commit cc882335 authored by Jakob Moser's avatar Jakob Moser
Browse files

Merge branch 'tacos' into 'master'

Introduce TaCoS service tab

See merge request !28
parents b05614d2 859a5555
Loading
Loading
Loading
Loading
Loading
+1 −0
Changes for .gitignore: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@
venv
__pycache__
.ipynb_checkpoints
.mypy_cache

# JavaScript-related
node_modules
+33 −0
Changes for portal/static/js/components/pages/Tacos.mjs: 33 added lines, 0 removed lines.
Original line number Diff line number Diff line
import { Service } from "../../model/Service.mjs"
import { ServiceLink } from "../pieces/ServiceLink.mjs"
import { Base } from "./Base.mjs"

export const Tacos = {
    oncreate() {
        document.title = "TaCoS · FS Coli Portal"
    },
    view() {
        return m(
            Base,
            m("article.services", [
                m(
                    ServiceLink,
                    new Service(
                        "ChefOrga",
                        "https://orga.chefexperte.de/",
                        "fa-solid fa-clipboard",
                        "Eigener Account",
                    ),
                ),
                m(
                    ServiceLink,
                    new Service(
                        "Meeting",
                        "https://fachschaft.cl.uni-heidelberg.de/tacos-meeting",
                        "fa-solid fa-phone-volume",
                    ),
                ),
            ]),
        )
    },
}
+10 −1
Changes for portal/static/js/components/pieces/Nav.mjs: 10 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -33,6 +33,13 @@ export const Nav = {
                                label: "Fachschaftssitzung",
                            }),
                        ),
                        m(
                            "li",
                            m(NavPageLink, {
                                href: "/tacos",
                                label: "TaCoS",
                            }),
                        ),
                        m(
                            "li",
                            m(NavPageLink, {
@@ -64,7 +71,9 @@ export const Nav = {
                                : m(NavPageLink, {
                                      href: hasQueryParam("next", m.route.get())
                                          ? m.route.get()
                                          : `/login?next=${m.route.get() || "/"}`,
                                          : `/login?next=${
                                                m.route.get() || "/"
                                            }`,
                                      label: " Anmelden",
                                      icon: "fa-solid fa-right-to-bracket",
                                  }),
+2 −0
Changes for portal/static/js/portal.mjs: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
import { Start } from "./components/pages/Start.mjs"
import { FsServices } from "./components/pages/FsServices.mjs"
import { UniServices } from "./components/pages/UniServices.mjs"
import { Tacos } from "./components/pages/Tacos.mjs"
import { Unlock } from "./components/pages/Unlock.mjs"
import { Fachschaftssitzung } from "./components/pages/Fachschaftssitzung.mjs"
import { Login } from "./components/pages/Login.mjs"
@@ -21,6 +22,7 @@ m.route(document.body, "/", {
    "/uni-services": UniServices,
    "/unlock": Unlock,
    "/fachschaftssitzung": Fachschaftssitzung,
    "/tacos": Tacos,
    "/login": Login,
    "/me": Me,
})