diff --git a/.github/workflows/build-and-deploy.yaml b/.github/workflows/build-and-deploy.yaml index 13a7604b..8cec5784 100644 --- a/.github/workflows/build-and-deploy.yaml +++ b/.github/workflows/build-and-deploy.yaml @@ -160,9 +160,9 @@ jobs: echo "REACT_APP_VERSION=${branch_name}-${short_sha}" >> $GITHUB_ENV if [ "$GITHUB_REF_TYPE" = "tag" ]; then - echo "REACT_APP_BACKEND_BASE_PATH=https://api.muenster-jetzt.de" >> $GITHUB_ENV + echo "REACT_APP_BACKEND_BASE_PATH=https://api.muenster-update.de" >> $GITHUB_ENV else - echo "REACT_APP_BACKEND_BASE_PATH=https://api.staging.muenster-jetzt.de" >> $GITHUB_ENV + echo "REACT_APP_BACKEND_BASE_PATH=https://api.staging.muenster-update.de" >> $GITHUB_ENV fi - name: Install Node.js 14 diff --git a/README.md b/README.md index a296cd52..ef50d829 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## Deployment -We use GitHub Actions and docker-compose to deploy the master branch to a staging environment at +We use GitHub Actions and docker-compose to deploy the master branch to a staging environment at ### Staging deployment diff --git a/backend/events/views.py b/backend/events/views.py index a5fa0543..c5bb10e4 100644 --- a/backend/events/views.py +++ b/backend/events/views.py @@ -16,10 +16,10 @@ schema_metadata = { - "title": "Münster Jetzt API", + "title": "Münster Update API", "description": ( "This is the OpenAPI v3 schema specification of the " - "[Münster Jetzt](https://muenster-jetzt.de) API.
" + "[Münster Update](https://muenster-update.de) API.
" "For more information, check out the " "[source code](https://github.com/codeformuenster/muenster-jetzt)." ), @@ -120,14 +120,14 @@ class OrganizersViewSet(viewsets.ReadOnlyModelViewSet): class MünsterJetztView(routers.APIRootView): """ - ## Willkommen auf der API-Dokumentation zu [Münster Jetzt]. + ## Willkommen auf der API-Dokumentation zu [Münster Update]. - Über die [Münster Jetzt] API können Anwendungen maschinenlesbare + Über die [Münster Update] API können Anwendungen maschinenlesbare Veranstaltungsinformationen abrufen. Herzstück des Datenschemas sind die [Events](/events). - [Münster Jetzt]: https://muenster-jetzt.de + [Münster Update]: https://muenster-update.de """ pass diff --git a/backend/setup.py b/backend/setup.py index 2bcb1bbe..3653075b 100644 --- a/backend/setup.py +++ b/backend/setup.py @@ -7,7 +7,7 @@ name="mj", version=mj.__version__, description="Database management, data import, and API for muenster-jetzt", - url="https://muenster-jetzt.de/", + url="https://muenster-update.de/", packages=["mj", "events", "scraping"], install_requires=[ "black", diff --git a/backend/templates/redoc.html b/backend/templates/redoc.html index 73b66e61..82184314 100644 --- a/backend/templates/redoc.html +++ b/backend/templates/redoc.html @@ -2,7 +2,7 @@ - Münster Jetzt API - ReDoc + Münster Update API - ReDoc diff --git a/backend/templates/rest_framework/api.html b/backend/templates/rest_framework/api.html index e5286ced..e02a42d7 100644 --- a/backend/templates/rest_framework/api.html +++ b/backend/templates/rest_framework/api.html @@ -1,6 +1,6 @@ {% extends "rest_framework/base.html" %} -{% block title %}{% if name %}{{ name }} – {% endif %}Münster Jetzt API{% endblock %} +{% block title %}{% if name %}{{ name }} – {% endif %}Münster Update API{% endblock %} {% block meta %} {% load static %} @@ -29,7 +29,7 @@ {% block branding %} - Münster Jetzt API + Münster Update API {% endblock %} @@ -67,5 +67,5 @@

Weitere Informationen

  • Code
  • Swagger UI
  • ReDoc
    • -
  • Info
    • +
  • Info
    • {% endblock %} diff --git a/backend/templates/swagger-ui.html b/backend/templates/swagger-ui.html index 3152e884..8c46d149 100644 --- a/backend/templates/swagger-ui.html +++ b/backend/templates/swagger-ui.html @@ -2,7 +2,7 @@ - Münster Jetzt API - Swagger + Münster Update API - Swagger diff --git a/deployment/README.md b/deployment/README.md index ce6bed56..b21833ca 100644 --- a/deployment/README.md +++ b/deployment/README.md @@ -1,4 +1,4 @@ -# Münster Jetzt Deployment Guide +# Münster Update Deployment Guide ## Kustomize / Kubernetes @@ -8,7 +8,7 @@ The kustomization in `dev` is an example for a deployment. Check out the `backen ## Plain docker / docker-compose -This document attempts to describe the deployment of Münster Jetzt to a linux server. +This document attempts to describe the deployment of Münster Update to a linux server. ### Requirements diff --git a/frontend/README.md b/frontend/README.md index 3d197de2..314e93a6 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -1,6 +1,6 @@ -# Münster Jetzt Frontend +# Münster Update Frontend -The front end to Münster Jetzt. It includes a web app for mobile, tablet and desktop browsers and a kiosk mode for big displays. +The front end to Münster Update. It includes a web app for mobile, tablet and desktop browsers and a kiosk mode for big displays. This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). You can learn more about [Create React App](https://github.com/facebook/create-react-app) in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started). @@ -13,7 +13,7 @@ The app uses some custom environment variables for configuration at runtime and | var | description | | --- | --- | -| `REACT_APP_BACKEND_BASE_PATH` | The URL used by the frontend to reach the api. Default is `http://localhost:8000`. CI sets this to `https://api(.staging).muenster-jetzt.de` depending on the branch. | +| `REACT_APP_BACKEND_BASE_PATH` | The URL used by the frontend to reach the api. Default is `http://localhost:8000`. CI sets this to `https://api(.staging).muenster-update.de` depending on the branch. | | `REACT_APP_VERSION` | Version string used in a meta tag in index.html. CI sets this to `{branch}-{short_sha}` where `branch` is the current branch and `short_sha` are the first 7 characters of the git commit sha. | ## Development in container @@ -37,7 +37,7 @@ You will also see any lint errors in the console. To use the staging (or production) api for development, start the app like this: ``` -REACT_APP_BACKEND_BASE_PATH=https://api.staging.muenster-jetzt.de npm run start +REACT_APP_BACKEND_BASE_PATH=https://api.staging.muenster-update.de npm run start ``` ### `npm test` @@ -82,4 +82,4 @@ To update (in case the font received an update), go to [https://github.com/arrow - copy the `@font-face` declarations to your `src/styles/base.scss` - change paths to `./fonts/` - don't forget to `git add` the new font files -- Optional: Delete old font files \ No newline at end of file +- Optional: Delete old font files diff --git a/frontend/config-overrides.js b/frontend/config-overrides.js index 304c2324..c29dcf8c 100644 --- a/frontend/config-overrides.js +++ b/frontend/config-overrides.js @@ -7,11 +7,11 @@ const cspConfigPolicy = { 'object-src': "'none'", 'script-src': [], 'style-src': ["'self'"], - 'img-src': ["'self'", "https://muenster-jetzt.de", "https://www.bleker-it.de", "https://www.muensterhack.de", "https://gobeta.de"], + 'img-src': ["'self'", "https://muenster-update.de", "https://www.bleker-it.de", "https://www.muensterhack.de", "https://gobeta.de"], 'font-src': ["'self'","data:"], 'frame-src': ["https://bike-frontend.azurewebsites.net", "https://db-muenster.veomo.com/"], 'connect-src': ["'self'", process.env.REACT_APP_BACKEND_BASE_PATH], - 'media-src': ["https://muenster-jetzt.de"], + 'media-src': ["https://muenster-update.de"], }; function addCspHtmlWebpackPlugin(config) { diff --git a/frontend/deployment/muenster-jetzt.nginx.conf b/frontend/deployment/muenster-jetzt.nginx.conf index 27aa6e8c..fd73e69b 100644 --- a/frontend/deployment/muenster-jetzt.nginx.conf +++ b/frontend/deployment/muenster-jetzt.nginx.conf @@ -32,7 +32,7 @@ server { etag off; } - valid_referers server_names muenster-jetzt.de *.muenster-jetzt.de; + valid_referers server_names muenster-update.de *.muenster-update.de muenster-jetzt.de *.muenster-jetzt.de; location ~* /qr/ { if ($invalid_referer) { diff --git a/frontend/package.json b/frontend/package.json index 4923235a..96ea8d3a 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -41,7 +41,7 @@ "generate-client": "restful-react import --url http://localhost:8000/openapi.json --output src/generated-api-client.tsx", "postgenerate-client": "prettier src/generated-api-client.tsx --write", "prepare-upgrade": "git checkout master && git pull origin master && git checkout -b frontend-deps-upgrade-$(date -Idate)", - "upgrade-all": "npm ci && npm upgrade && REACT_APP_BACKEND_BASE_PATH=https://api.staging.muenster-jetzt.de npm run start" + "upgrade-all": "npm ci && npm upgrade && REACT_APP_BACKEND_BASE_PATH=https://api.staging.muenster-update.de npm run start" }, "eslintConfig": { "extends": "react-app" diff --git a/frontend/public/index.html b/frontend/public/index.html index e5fdc3cc..b4275416 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -9,22 +9,22 @@ - + - + - Münster Jetzt + Münster Update - + - - - - + + + + diff --git a/frontend/public/manifest.json b/frontend/public/manifest.json index 855d3349..df9fb401 100644 --- a/frontend/public/manifest.json +++ b/frontend/public/manifest.json @@ -1,6 +1,6 @@ { - "short_name": "Münster Jetzt", - "name": "Münster Jetzt", + "short_name": "Münster Update", + "name": "Münster Update", "icons": [ { "src": "favicon.ico", diff --git a/frontend/src/InfoPage/LandingPage.tsx b/frontend/src/InfoPage/LandingPage.tsx index adc34467..ca229b13 100644 --- a/frontend/src/InfoPage/LandingPage.tsx +++ b/frontend/src/InfoPage/LandingPage.tsx @@ -16,7 +16,7 @@ import Row from "../UI/Info/Row"; import Footer from "../UI/Info/Footer"; const dataSources = [ - ["Münster Jetzt", ""], + ["Münster Update", ""], ["münsterland.digital", "https://www.muensterland.digital/api"], ["DB goBeta", "https://gobeta.de/alle-veranstaltungen/"], [ diff --git a/frontend/src/Kiosk/mockdata.ts b/frontend/src/Kiosk/mockdata.ts index 41f871c7..c32eeb06 100644 --- a/frontend/src/Kiosk/mockdata.ts +++ b/frontend/src/Kiosk/mockdata.ts @@ -6,16 +6,16 @@ const toIEvent = function toIEvent(slides: IEventBase[]) { }; const lambusEvent: IEventBase = { - imageUrl: "https://muenster-jetzt.de/static/uploads/v1/lambus.jpg", + imageUrl: "https://muenster-update.de/static/uploads/v1/lambus.jpg", }; const lambusApp: IEventBase = { - imageUrl: "https://muenster-jetzt.de/static/uploads/v1/lambus-app.jpg", + imageUrl: "https://muenster-update.de/static/uploads/v1/lambus-app.jpg", externalUrl: "https://www.lambus.io/", }; const lambusMap: IEventBase = { - imageUrl: "https://muenster-jetzt.de/static/uploads/v1/lambus-map.jpg", + imageUrl: "https://muenster-update.de/static/uploads/v1/lambus-map.jpg", }; const msHack: Omit = { @@ -31,18 +31,18 @@ const msHack: Omit = { }; const hygiene: IEventBase = { - imageUrl: "https://muenster-jetzt.de/static/uploads/hygienemassnahmen.jpg", + imageUrl: "https://muenster-update.de/static/uploads/hygienemassnahmen.jpg", externalUrl: "https://www.gemeinsamgehtdas.de/muenster", }; const nafeEvent: IEventBase = { - imageUrl: "https://muenster-jetzt.de/static/uploads/v1/nafe.jpg", + imageUrl: "https://muenster-update.de/static/uploads/v1/nafe.jpg", externalUrl: "https://gobeta.de/news/probiere-die-neue-mikromobilitaetsapp-nafe-aus/", }; const vesputi: IEventBase = { - imageUrl: "https://muenster-jetzt.de/static/uploads/v1/vesputi.jpg", + imageUrl: "https://muenster-update.de/static/uploads/v1/vesputi.jpg", }; const demoIntro: Omit = { @@ -62,7 +62,7 @@ const goBetaMs: Omit = { "#MünsterHbf ruft zum großen Sommertest: Im Rahmen des Projekts „Zukunftsbahnhof“ zeigen spannende Startups und lokale Partner ihre aktuellen Projekte rund um neue, komfortablere Mobilität. Und testen sie vor Ort, lokal, und mit echten Reisenden: Mit Euch!", style: { backgroundImage: - "url(https://muenster-jetzt.de/static/uploads/go-beta-background.jpg)", + "url(https://muenster-update.de/static/uploads/go-beta-background.jpg)", backgroundSize: "cover", color: "white", }, @@ -70,68 +70,68 @@ const goBetaMs: Omit = { }; const arWagenreihung: IEventBase = { - imageUrl: "https://muenster-jetzt.de/static/uploads/v1/ar-wagenreihung.jpg", + imageUrl: "https://muenster-update.de/static/uploads/v1/ar-wagenreihung.jpg", externalUrl: "https://gobeta.de/projekte/zuginformationen-per-app-mit-augmented-reality-ar-testen/", }; const singleton: IEventBase = { - imageUrl: "https://muenster-jetzt.de/static/uploads/v1/singleton.jpg", + imageUrl: "https://muenster-update.de/static/uploads/v1/singleton.jpg", }; const infabSpaet: IEventBase = { - imageUrl: "https://muenster-jetzt.de/static/uploads/v1/infab-spaetdran.jpg", + imageUrl: "https://muenster-update.de/static/uploads/v1/infab-spaetdran.jpg", }; // const infabMitmachen: IEventBase = { -// imageUrl: "https://muenster-jetzt.de/static/uploads/v1/infab-mitmachen.jpg", +// imageUrl: "https://muenster-update.de/static/uploads/v1/infab-mitmachen.jpg", // }; const infabMock: IEventBase = { - imageUrl: "https://muenster-jetzt.de/static/uploads/v1/infab-mock.jpg", + imageUrl: "https://muenster-update.de/static/uploads/v1/infab-mock.jpg", externalUrl: "https://gobeta.de/projekte/radparken-der-zukunft-gemeinsam-mobile-perspektiven-schaffen/", }; const tretty: IEventBase = { - imageUrl: "https://muenster-jetzt.de/static/uploads/v1/tretty.jpg", + imageUrl: "https://muenster-update.de/static/uploads/v1/tretty.jpg", externalUrl: "https://gobeta.de/projekte/tretty-tretroller-100-oekologisch-mit-muskelkraft-durch-muenster/", }; const icePortal: IEventBase = { - imageUrl: "https://muenster-jetzt.de/static/uploads/v1/ice-portal.jpg", + imageUrl: "https://muenster-update.de/static/uploads/v1/ice-portal.jpg", }; const motiontagMuensterBewegt: IEventBase = { - imageUrl: "https://muenster-jetzt.de/static/uploads/v1/motiontag_bike_mb.png", + imageUrl: "https://muenster-update.de/static/uploads/v1/motiontag_bike_mb.png", }; const motiontagSchritte: IEventBase = { imageUrl: - "https://muenster-jetzt.de/static/uploads/v1/motiontag_schritte_klima.png", + "https://muenster-update.de/static/uploads/v1/motiontag_schritte_klima.png", }; // const motiontagPreiseGruen: IEventBase = { -// imageUrl: "https://muenster-jetzt.de/static/uploads/v1/motiontag_preise_gruen.png", +// imageUrl: "https://muenster-update.de/static/uploads/v1/motiontag_preise_gruen.png", // }; const motiontagPreiseWeiss: IEventBase = { imageUrl: - "https://muenster-jetzt.de/static/uploads/v1/motiontag_preise_weiss.png", + "https://muenster-update.de/static/uploads/v1/motiontag_preise_weiss.png", }; const muensterlandmoment: IEventBase = { - imageUrl: "https://muenster-jetzt.de/static/uploads/v1/muensterland.jpg", + imageUrl: "https://muenster-update.de/static/uploads/v1/muensterland.jpg", externalUrl: "https://www.muensterland.com/deinmuensterlandmoment/", }; const gornationTeam: IEventBase = { - imageUrl: "https://muenster-jetzt.de/static/uploads/v1/gornation-team.jpg", + imageUrl: "https://muenster-update.de/static/uploads/v1/gornation-team.jpg", }; const veomo: IEventBase = { - imageUrl: "https://muenster-jetzt.de/static/uploads/v1/veomo-v2.jpg", + imageUrl: "https://muenster-update.de/static/uploads/v1/veomo-v2.jpg", }; const veomoFrame: Omit = { @@ -140,12 +140,12 @@ const veomoFrame: Omit = { const gornationSocialmedia: IEventBase = { imageUrl: - "https://muenster-jetzt.de/static/uploads/v1/gornation-socialmedia.jpg", + "https://muenster-update.de/static/uploads/v1/gornation-socialmedia.jpg", externalUrl: "https://gobeta.de/projekte/pop-up-store-lokal-digital/", }; const liefergruen: IEventBase = { - imageUrl: "https://muenster-jetzt.de/static/uploads/v1/liefergruen.jpg", + imageUrl: "https://muenster-update.de/static/uploads/v1/liefergruen.jpg", externalUrl: "https://liefergruen.com", }; @@ -153,8 +153,8 @@ const msj: Omit = { imageUrl: msjlogo, title: "Alle Veranstaltungen im Überblick", description: - "Münster Jetzt ist deine zentrale Anlaufstelle für alle Veranstaltungen in Münster.\nKostenlos und Open-Source!", - externalUrl: "https://muenster-jetzt.de/", + "Münster Update ist deine zentrale Anlaufstelle für alle Veranstaltungen in Münster.\nKostenlos und Open-Source!", + externalUrl: "https://muenster-update.de/", cssClassNames: ["vertical", "spaced"], }; @@ -164,37 +164,37 @@ const infabFrame: Omit = { // const infabVideo: Omit = { // video: { -// url: "https://muenster-jetzt.de/static/uploads/v1/infab.mov", +// url: "https://muenster-update.de/static/uploads/v1/infab.mov", // }, // }; // const motiontagVideo: Omit = { // video: { -// url: "https://muenster-jetzt.de/static/uploads/v1/motiontag.mp4", +// url: "https://muenster-update.de/static/uploads/v1/motiontag.mp4", // }, // }; const bahnhofLiveAppVideo: Omit = { video: { - url: "https://muenster-jetzt.de/static/uploads/testvideo-notpublic.mp4", + url: "https://muenster-update.de/static/uploads/testvideo-notpublic.mp4", }, }; const trettyVideo: Omit = { video: { - url: "https://muenster-jetzt.de/static/uploads/v1/tretty.mp4", + url: "https://muenster-update.de/static/uploads/v1/tretty.mp4", }, }; const goBetaVideo: Omit = { video: { - url: "https://muenster-jetzt.de/static/uploads/raysono-v3.mp4", + url: "https://muenster-update.de/static/uploads/raysono-v3.mp4", }, }; // const muensterlandRadVideo: Omit = { // video: { -// url: "https://muenster-jetzt.de/static/uploads/v1/muensterland-radtour.mp4", +// url: "https://muenster-update.de/static/uploads/v1/muensterland-radtour.mp4", // }, // }; diff --git a/frontend/src/UI/FullScreenCarousel/Slide.tsx b/frontend/src/UI/FullScreenCarousel/Slide.tsx index 0e967b18..f170bf27 100644 --- a/frontend/src/UI/FullScreenCarousel/Slide.tsx +++ b/frontend/src/UI/FullScreenCarousel/Slide.tsx @@ -18,7 +18,7 @@ const useQRURL: (externalUrl?: string) => string = (externalUrl) => { return ""; } - return `https://muenster-jetzt.de/qr/?url=${encodeURI(externalUrl)}`; + return `https://muenster-update.de/qr/?url=${encodeURI(externalUrl)}`; }, [externalUrl]); }; diff --git a/frontend/src/UI/Info/Hero.tsx b/frontend/src/UI/Info/Hero.tsx index 0fcd50c7..04c8c469 100644 --- a/frontend/src/UI/Info/Hero.tsx +++ b/frontend/src/UI/Info/Hero.tsx @@ -9,7 +9,7 @@ interface IHeroProps extends PropsWithChildren { const Hero: FC = ({ children, subtitle }) => ( <>
    - Münster Jetzt + Münster Update
    {subtitle}
    diff --git a/frontend/src/UI/Layout/Layout.tsx b/frontend/src/UI/Layout/Layout.tsx index 8a344050..cae6d8bc 100644 --- a/frontend/src/UI/Layout/Layout.tsx +++ b/frontend/src/UI/Layout/Layout.tsx @@ -12,7 +12,7 @@ interface ILayout extends PropsWithChildren { const Layout: FC = ({ children, header }) => ( <>
    - Münster Jetzt + Münster Update
    {header}
    diff --git a/frontend/src/UI/StyledProjectName/StyledProjectName.tsx b/frontend/src/UI/StyledProjectName/StyledProjectName.tsx index f102fd49..5cc4379f 100644 --- a/frontend/src/UI/StyledProjectName/StyledProjectName.tsx +++ b/frontend/src/UI/StyledProjectName/StyledProjectName.tsx @@ -12,7 +12,7 @@ const StyledProjectName: FC = ({ noBackground }) => ( [styles.styledNameBackground]: !noBackground, })} > - Münster Jetzt + Münster Update ); diff --git a/infrastructure/host_vars/45.132.245.60/vars.yml b/infrastructure/host_vars/45.132.245.60/vars.yml index 0b06da84..80f043b9 100644 --- a/infrastructure/host_vars/45.132.245.60/vars.yml +++ b/infrastructure/host_vars/45.132.245.60/vars.yml @@ -8,7 +8,7 @@ grant_ssh_access_for: is_webserver: true -application_domain: "muenster-jetzt.de" +application_domain: "muenster-update.de" db_user_staging: "{{vault_db_user_staging}}" db_password_staging: "{{vault_db_password_staging}}" diff --git a/infrastructure/https_proxy/files/docker-compose.yml b/infrastructure/https_proxy/files/docker-compose.yml index caea5ae2..aae48321 100644 --- a/infrastructure/https_proxy/files/docker-compose.yml +++ b/infrastructure/https_proxy/files/docker-compose.yml @@ -23,7 +23,7 @@ services: restart: unless-stopped ports: - 80:80 - - 443:443 + - 443:443 volumes: - "./traefik.toml:/etc/traefik/traefik.toml" - "./letsencrypt:/letsencrypt" @@ -44,5 +44,5 @@ services: - "traefik.http.routers.msj-redirect.tls.certresolver=letsencrypt" - "traefik.http.routers.msj-redirect.middlewares=msj-main-redirect" - "traefik.http.middlewares.msj-main-redirect.redirectRegex.regex=.*" - - "traefik.http.middlewares.msj-main-redirect.redirectRegex.replacement=https://muenster-jetzt.de" - - "traefik.http.middlewares.msj-main-redirect.redirectRegex.permanent=true" \ No newline at end of file + - "traefik.http.middlewares.msj-main-redirect.redirectRegex.replacement=https://muenster-update.de" + - "traefik.http.middlewares.msj-main-redirect.redirectRegex.permanent=true"