Skip to content

Commit

Permalink
Rename to Münster Update
Browse files Browse the repository at this point in the history
  • Loading branch information
ubergesundheit committed Dec 18, 2023
1 parent 4eb00fa commit c97acd2
Show file tree
Hide file tree
Showing 22 changed files with 75 additions and 75 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-and-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Deployment

We use GitHub Actions and docker-compose to deploy the master branch to a staging environment at <https://staging.muenster-jetzt.de>
We use GitHub Actions and docker-compose to deploy the master branch to a staging environment at <https://staging.muenster-update.de>

### Staging deployment

Expand Down
10 changes: 5 additions & 5 deletions backend/events/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.<br>"
"[Münster Update](https://muenster-update.de) API.<br>"
"For more information, check out the "
"[source code](https://github.com/codeformuenster/muenster-jetzt)."
),
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion backend/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion backend/templates/redoc.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Münster Jetzt API - ReDoc</title>
<title>Münster Update API - ReDoc</title>
<!-- needed for adaptive design -->
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1">
Expand Down
6 changes: 3 additions & 3 deletions backend/templates/rest_framework/api.html
Original file line number Diff line number Diff line change
@@ -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 %}
Expand Down Expand Up @@ -29,7 +29,7 @@

{% block branding %}
<a class="navbar-brand" rel="nofollow" href="/">
Münster Jetzt API
Münster Update API
</a>
{% endblock %}

Expand Down Expand Up @@ -67,5 +67,5 @@ <h3>Weitere Informationen</h3>
<li><a href="https://github.com/codeformuenster/muenster-jetzt">Code</a></li>
<li><a href="{% url "swagger-ui" %}">Swagger UI</a></li>
<li><a href="{% url "redoc" %}">ReDoc</a></li>
<li><a href="https://muenster-jetzt.de/info">Info</a></li>
<li><a href="https://muenster-update.de/info">Info</a></li>
{% endblock %}
2 changes: 1 addition & 1 deletion backend/templates/swagger-ui.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!DOCTYPE html>
<html>
<head>
<title>Münster Jetzt API - Swagger</title>
<title>Münster Update API - Swagger</title>
<meta charset="utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="{% static "[email protected]/swagger-ui.css" %}" />
Expand Down
4 changes: 2 additions & 2 deletions deployment/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Münster Jetzt Deployment Guide
# Münster Update Deployment Guide

## Kustomize / Kubernetes

Expand All @@ -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

Expand Down
10 changes: 5 additions & 5 deletions frontend/README.md
Original file line number Diff line number Diff line change
@@ -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).
Expand All @@ -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
Expand All @@ -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`
Expand Down Expand Up @@ -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
- Optional: Delete old font files
4 changes: 2 additions & 2 deletions frontend/config-overrides.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion frontend/deployment/muenster-jetzt.nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 8 additions & 8 deletions frontend/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#ffffff" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/muenster_jetzt192.png" />
<meta name="apple-mobile-web-app-title" content="Münster Jetzt">
<meta name="apple-mobile-web-app-title" content="Münster Update">
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<link rel="mask-icon" href="%PUBLIC_URL%/safari-pinned-tab.svg" color="#22cd5e">
<meta name="application-name" content="Münster Jetzt">
<meta name="application-name" content="Münster Update">
<meta name="msapplication-TileColor" content="#22cd5e">
<meta name="theme-color" content="#ffffff">
<title>Münster Jetzt</title>
<title>Münster Update</title>
<meta name="version" content="%REACT_APP_VERSION%" />
<link rel="preconnect" href="%REACT_APP_BACKEND_BASE_PATH%" crossorigin>
<link rel="dns-prefetch" href="%REACT_APP_BACKEND_BASE_PATH%">
<meta property="og:title" content="Münster Jetzt" />
<meta property="og:title" content="Münster Update" />
<meta property="og:locale" content="de_DE" />
<meta name="description" content="„Münster Jetzt“ ist deine zentrale Anlaufstelle für alle Veranstaltungen in Münster. Mit unserer App bist du immer bestens informiert. Die API bietet Zugriff auf maschinenlesbare Veranstaltungsinformationen als Offene Daten." />
<meta property="og:description" content="„Münster Jetzt“ ist deine zentrale Anlaufstelle für alle Veranstaltungen in Münster. Mit unserer App bist du immer bestens informiert. Die API bietet Zugriff auf maschinenlesbare Veranstaltungsinformationen als Offene Daten." />
<meta property="og:url" content="https://muenster-jetzt.de/" />
<meta property="og:site_name" content="Münster Jetzt" />
<meta name="description" content="„Münster Update“ ist deine zentrale Anlaufstelle für alle Veranstaltungen in Münster. Mit unserer App bist du immer bestens informiert. Die API bietet Zugriff auf maschinenlesbare Veranstaltungsinformationen als Offene Daten." />
<meta property="og:description" content="„Münster Update“ ist deine zentrale Anlaufstelle für alle Veranstaltungen in Münster. Mit unserer App bist du immer bestens informiert. Die API bietet Zugriff auf maschinenlesbare Veranstaltungsinformationen als Offene Daten." />
<meta property="og:url" content="https://muenster-update.de/" />
<meta property="og:site_name" content="Münster Update" />
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
4 changes: 2 additions & 2 deletions frontend/public/manifest.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/InfoPage/LandingPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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/"],
[
Expand Down
Loading

0 comments on commit c97acd2

Please sign in to comment.