diff --git a/frontend/public/promo/htwkarte.png b/frontend/public/promo/htwkarte.png
new file mode 100644
index 0000000..72fce41
Binary files /dev/null and b/frontend/public/promo/htwkarte.png differ
diff --git a/frontend/public/promo/mensa.png b/frontend/public/promo/mensa.png
new file mode 100644
index 0000000..c1c8e2c
Binary files /dev/null and b/frontend/public/promo/mensa.png differ
diff --git a/frontend/src/components/FaqPage.vue b/frontend/src/components/FaqPage.vue
index 0585bc5..8e56c57 100644
--- a/frontend/src/components/FaqPage.vue
+++ b/frontend/src/components/FaqPage.vue
@@ -236,8 +236,37 @@ along with this program. If not, see
+ {{ $t("faqView.crossPromo." + promoPage + ".description") }} +
+ +diff --git a/frontend/src/i18n/translations/de.json b/frontend/src/i18n/translations/de.json index 55f6cfc..20e19da 100644 --- a/frontend/src/i18n/translations/de.json +++ b/frontend/src/i18n/translations/de.json @@ -237,6 +237,20 @@ "eighthAnswer": "Die Entwicklung soll als aktives Git Projekt durch die Community verwaltet werden. Eine freie Version des HTWKalenders wird intern auf den Servern des FSR IM gehostet und ist für alle HTWK-Studierenden kostenlos.", "ninthQuestion": "Wo kann ich den Quellcode einsehen und mitwirken?", "ninthAnswer": "Wenn du dich für die Entwicklung und den Quelltext interessierst, kannst du jederzeit als HTWK-Student*in daran mitarbeiten. Quelltext und weitere Informationen findest du im ", + "crossPromoQuestion": "Weitere studentische Projekte.", + "crossPromo": { + "teaser": "Der HTWKalender arbeitet mit anderen studentischen Projekten zusammen, um dir das Studium zu erleichtern. Vermutlich gibt es noch mehr, als die hier gelisteten. Schau doch mal dort vorbei!", + "mensa": { + "title": "HTWK Mensa Mate", + "description": "Finde den Sitzplatz deiner Kommilitonen in der HTWK Mensa.", + "link": "https://mensa.heylinus.de/" + }, + "htwkarte": { + "title": "HTWKarte", + "description": "Finde dich auf dem Campus zurecht und suche nach Räumen. (in Entwicklung)", + "link": "https://htwkarte.de/" + } + }, "notFound": "Nicht gefunden, wonach du suchst?", "contact": "Kontakt aufnehmen" } diff --git a/frontend/src/i18n/translations/en.json b/frontend/src/i18n/translations/en.json index 08e3f7f..cadc413 100644 --- a/frontend/src/i18n/translations/en.json +++ b/frontend/src/i18n/translations/en.json @@ -237,6 +237,20 @@ "eighthAnswer": "The development should also be managed by the community as an active Git project. A free version of the HTW calendar is hosted internally on the servers of the FSR IMN and is free of charge for all HTWK students.", "ninthQuestion": "Where could i find the source code?", "ninthAnswer": "If you want to contribute, you can do so at any time if you are a HTWK student. The source code is available on ", + "crossPromoQuestion": "More student projects.", + "crossPromo": { + "teaser": "The HTWKalender collaborates with other student projects to make your studies easier. There are probably more than those listed here. Check them out!", + "mensa": { + "title": "HTWK Mensa Mate", + "description": "Find the seating location of your fellow students in the HTWK Mensa Academica.", + "link": "https://mensa.heylinus.de/" + }, + "htwkarte": { + "title": "HTWKarte", + "description": "Find your way around the campus and search for rooms. (in development)", + "link": "https://htwkarte.de/" + } + }, "notFound": "Not finding what you're looking for?", "contact": "Get in touch" } diff --git a/frontend/src/main.ts b/frontend/src/main.ts index ae51354..f5e0277 100644 --- a/frontend/src/main.ts +++ b/frontend/src/main.ts @@ -21,6 +21,7 @@ import { createHead } from "@unhead/vue"; import "./style.css"; import App from "./App.vue"; import PrimeVue from "primevue/config"; +import Avatar from "primevue/avatar"; import Badge from "primevue/badge"; import Button from "primevue/button"; import Dropdown from "primevue/dropdown"; @@ -80,6 +81,7 @@ app.use(pinia); app.use(DialogService); i18n.setup(); app.use(i18n.vueI18n); +app.component("Avatar", Avatar); app.component("Badge", Badge); app.component("Button", Button); app.component("Menu", Menu); diff --git a/reverseproxy.dev.conf b/reverseproxy.dev.conf index 31656bc..793ce4e 100644 --- a/reverseproxy.dev.conf +++ b/reverseproxy.dev.conf @@ -124,7 +124,7 @@ http { limit_req_zone $ratelimit_key zone=createFeed:10m rate=1r/m; # Limit the number of requests per IP - limit_req_zone $limit_feed zone=feed:20m rate=20r/m; + limit_req_zone $limit_key zone=feed:20m rate=20r/m; limit_req_zone $limit_key zone=modules:10m rate=30r/m; server {