Skip to content

Commit

Permalink
feature/map (#273)
Browse files Browse the repository at this point in the history
* cleaning
* linting
* npm i in root
* Add @visx/geo and @visx/text dependencies
* Refactor CountryStatisticsLayerCountries component
* Add new dependencies for min-indent and redent packages
* Bump the visx group with 4 updates

Bumps the visx group with 4 updates: [@visx/geo](https://github.com/airbnb/visx), [@visx/legend](https://github.com/airbnb/visx), [@visx/scale](https://github.com/airbnb/visx) and [@visx/shape](https://github.com/airbnb/visx).

Signed-off-by: @awesomephant 
Co-authored-by: Christian Kehres <c.kehres@wus.agency>
Co-authored-by: Max Kohler <hello@maxkohler.com>
  • Loading branch information
3 people authored Mar 12, 2024
1 parent b0364d0 commit 3c58777
Show file tree
Hide file tree
Showing 313 changed files with 36,517 additions and 18,263 deletions.
97 changes: 97 additions & 0 deletions .github/ISSUE_TEMPLATE/learning-unit.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
---
name: Learning Unit
about: Standard workflow for producing a new learning unit
title: LU XX
labels: e-learning, Learning Unit, content
---

- [ ] Autorenvertrag
- [ ] Vertrag an die Autor:innen schicken
- [ ] Unterschriebenen Vertrag erhalten
- [ ] An Ute Möntnich schicken, fuer Vorstand zum unterschreiben
- [ ] Unterschriebenen Vertrag zurück an die Autor:innen schicken
- [ ] Bezahlung (1. Hälfte)
- [ ] Rechnung 1 erhalten
- [ ] Rechnung 1 bezahlt
- [ ] Onboarding-Anruf mit Autor:innen
- [ ] Onboarding-Email an Autor:innen (mit Dropbox-Links)
- [ ] Email an Autor:innen: Schickt uns CV, Profilbild, Affiliation
- [ ] 1. Draft von Autor:innen erhalten (Word oder Dropbox)
- [ ] 1. Inhaltliches Review (Niklas + nn) (Kommentare im Dokument + Email)
- [ ] 2. Draft von Autor:innen erhalten
- [ ] 2. Inhaltiches Review (Niklas + nn)
- [ ] 2. Draft erhalten, alle sind zufrieden
- [ ] Draft an Language Editing schicken (mit Frist: TBD)
- [ ] Final Draft kommt zurueck
- [ ] Animated Podcasts vorbereiten
- [ ] Email an Autor:innen: Nehmt eure Audios auf (mit Frist: TBD)
- [ ] Audiofile Rohversion da
- [ ] Storyboards erstellen
- [ ] Storyboards abnehmen
- [ ] Icon-Auftrag erteilen (Icons, die in dem Storyboard gebraucht werden)
- [ ] Zusätzliche Assets sammeln (Bilder, Videos, etc; Rechte beachten)
- [ ] Zusätzliche Assets bearbeiten falls nötig / erlaubt
- [ ] Icons kommen zurueck
- [ ] Animated Podcasts erstellen
- [ ] Dropbox-Order erstellen (Storyboard, Audio-Dateien, Icons, Assets, Autoren-Namen, Autoren-Bilder, Script fuer Kontext)
- [ ] Ordner an Form-Art schicken / Auftrag erteilen mit Frist
- [ ] Video + Cover-Bild kommt zurück (in editierbarem Format für weiter unten)
- [ ] Abnahme durch uns, wenn nicht: Monita
- [ ] Untertitel erstellen (Premiere)
- [ ] Finale Video-Dateien exportieren
- [ ] Video + Cover-Bild + Untertitel hochladen auf VideoStream Server
- [ ] Assets im Text
- [ ] Fotos
- [ ] Nutzungs- und Bearbeitungsrechte klären
- [ ] Bild nachbearbeiten falls nötig && erlaubt
- [ ] Fertiges Bild in Dropbox Ablegen
- [ ] Korrekte Lizenzinformationen in die Permissions-Tabelle schreiben
- [ ] Unsere Grafiken (PRIF) (Landkarten, Diagramme)
- [ ] Datengrundlagen für Grafiken einholen
- [ ] Nutzungsrechte der Datengrundlage klären
- [ ] Externe Grafiken
- [ ] Skizzen prüfen
- [ ] Dropbox-Paket mit allen Skizzen/Notitzen vorberreiten
- [ ] Email an Agentur: Hier ist das Paket, macht Grafiken, Frist
- [ ] Grafiken kommen zurueck
- [ ] Email an Autoren: Gebt die Grafiken frei!
- [ ] Grafiken sind fertig und bereit
- [ ] Fertige Grafiken in Dropbox speichern fuer spaeter
- MDX Create
- [ ] Branch: Feat/LuXX
- [ ] Neuer Order für LU
- [ ] `index.mdx`:
- [ ] Titel
- [ ] Autor:innen (Namen, Fotos, CV, Institution)
- [ ] Summary
- [ ] Learning Objectives
- [ ] Cover-Bild (+ credits)
- [ ] Kapitel-MDX
- [ ] Titel
- [ ] Intro
- [ ] Inhalte
- [ ] Assets einbauen: (Karten, Charts, Bilder, Interaktive Komponenten, Timelines, Zitate, Externe Grafiken)
- [ ] Videos einbauen
- [ ] ggf. Glossar-Begriffe einbetten und Definitionen hinterlegen (`terms.json`): ggf. Review durch Niklas
- Einheit fertig, branch deploy erzeugen
- Email an Autor: Hier ist dein Branch Deploy, bitte abnehmen (Frist)
- [ ] Freigabe liegt vor?
- Certificate Section aktualisieren
- [ ] Neues Quiz anlegen (versteckt), mit neuen Fraugen fuer die neuen Inhalte
- [ ] Scores vom alten aufs neue Quiz übertragen
- [ ] Certifikat anpassen (auf das neue Quiz zeigen, aber alte Quizzes weiterhin gelten lassen)
- [ ] Veröffentlichung
- [ ] Text an PrÖA für Twitter und Email: Wir gehen dann und dann live!
- Email an Autor:innen: Wir gehen dann und dann live!
- `git merge feat/luXX`
- [ ] Moodle-Upload
- [ ] Autorin Bild + Text einfügen
- [ ] Inhaltsverzeichnis in Lernbar aktualisieren (siehe Dokumentation, ist glaubt Max, eine HTML-Datei)
- [ ] Startseite: Anzahl Experts + Videos aktualisieren
- [ ] In Moodle: LU in "new" Kategorie einfuegen
- [ ] Beschreibungstext der LU
- [ ] Redirect in .htaccess aktualisieren
- Post-Launch
- [ ] Email an Autor:in: Ist live, schick Rechnung 2!
- [ ] Rechnung 2 erhalten
- [ ] Rechnung 2 bezahlt
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ updates:
retext:
patterns:
- 'retext*'
testing-library:
patterns:
- '@testing-library*'
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: "CodeQL"

on:
push:
branches: [ "main" ]
branches: [ "main", "feature/*"]
pull_request:
branches: [ "main" ]
branches: [ "main", "feature/*" ]
workflow_dispatch:

jobs:
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/elearning-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: '[eLearning] Run tests'

on:
pull_request:
paths:
- './e-learning/**'
workflow_dispatch:
permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- name: Install dependencies
working-directory: ./e-learning/
run: npm install
- name: Run tests
working-directory: ./e-learning/
run: npm run test
10 changes: 1 addition & 9 deletions .github/workflows/elearning-update-treaties.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
path: main
- uses: actions/checkout@v3
with:
path: updates
- uses: actions/setup-node@v3
with:
node-version: 18
cache: npm
cache-dependency-path: |
main/package-lock.json
updates/package-lock.json
- name: Run update script
run: ${GITHUB_WORKSPACE}/main/scripts/updateTreaties.sh
run: ${GITHUB_WORKSPACE}/scripts/updateTreaties.sh
env:
BRANCH_NAME: update-treaty-participants
GITHUB_ACTOR: ${{ github.actor }}
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/shared-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: '[shared] Run tests'

on:
pull_request:
workflow_dispatch:
permissions:
contents: read

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- name: Install dependencies
working-directory: ./shared/
run: npm install
- name: Run tests
working-directory: ./shared/
run: npm run test
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
.netlify
tmp
node_modules
.netlify
tmp
.DS_Store
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"prisma-smart-formatter.typescript.defaultFormatter": "esbenp.prettier-vscode",
"prisma-smart-formatter.typescriptreact.defaultFormatter": "esbenp.prettier-vscode"
}
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ This is a monorepo for all our React-based editorial products.

## Deployment Status

| Site | URL | Status |
| ----------- | --------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| eLearning | [eunpdc-elearning.netlify.app](https://eunpdc-elearning.netlify.app/) | [![Netlify Status](https://api.netlify.com/api/v1/badges/be127c78-15e4-457f-8880-078ca5f1128c/deploy-status)](https://app.netlify.com/sites/eunpdc-elearning/deploys) [![[eLearning] Build and Deploy](https://github.com/Peace-Research-Institute-Frankfurt/websites/actions/workflows/elearning-deploy.yml/badge.svg)](https://github.com/Peace-Research-Institute-Frankfurt/websites/actions/workflows/elearning-deploy.yml) [![[eLearning] Update Treaties](https://github.com/Peace-Research-Institute-Frankfurt/websites/actions/workflows/elearning-update-treaties.yml/badge.svg)](https://github.com/Peace-Research-Institute-Frankfurt/websites/actions/workflows/elearning-update-treaties.yml) [![[eLearning] Check Markdown Links](https://github.com/Peace-Research-Institute-Frankfurt/websites/actions/workflows/elearning-check-links.yml/badge.svg)](https://github.com/Peace-Research-Institute-Frankfurt/websites/actions/workflows/elearning-check-links.yml) |
| New Work | [leibniz-nw.netlify.app](https://leibniz-nw.netlify.app/) | [![Netlify Status](https://api.netlify.com/api/v1/badges/a9e50b5c-a39d-4bd7-9324-bf20958b2ecf/deploy-status)](https://app.netlify.com/sites/leibniz-nw/deploys) [![[New Work] Check Markdown Links](https://github.com/Peace-Research-Institute-Frankfurt/websites/actions/workflows/new-work-check-links.yml/badge.svg)](https://github.com/Peace-Research-Institute-Frankfurt/websites/actions/workflows/new-work-check-links.yml) |
| PRIF Review | [review.prif.org](https://review.prif.org) | [![Netlify Status](https://api.netlify.com/api/v1/badges/61f8dfa0-3e12-4cb2-95ee-128c928efd25/deploy-status)](https://app.netlify.com/sites/prif-review/deploys) [![[PRIF Review] Check Markdown Links](https://github.com/Peace-Research-Institute-Frankfurt/websites/actions/workflows/prif-review-check-links.yml/badge.svg?branch=main)](https://github.com/Peace-Research-Institute-Frankfurt/websites/actions/workflows/prif-review-check-links.yml) |
| CNTR | TBD | TBD |
| Site | URL | Status |
| ------------ | --------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| eLearning | [eunpdc-elearning.netlify.app](https://eunpdc-elearning.netlify.app/) | [![Netlify Status](https://api.netlify.com/api/v1/badges/be127c78-15e4-457f-8880-078ca5f1128c/deploy-status)](https://app.netlify.com/sites/eunpdc-elearning/deploys) [![[eLearning] Build and Deploy](https://github.com/Peace-Research-Institute-Frankfurt/websites/actions/workflows/elearning-deploy.yml/badge.svg)](https://github.com/Peace-Research-Institute-Frankfurt/websites/actions/workflows/elearning-deploy.yml) [![[eLearning] Update Treaties](https://github.com/Peace-Research-Institute-Frankfurt/websites/actions/workflows/elearning-update-treaties.yml/badge.svg)](https://github.com/Peace-Research-Institute-Frankfurt/websites/actions/workflows/elearning-update-treaties.yml) [![[eLearning] Check Markdown Links](https://github.com/Peace-Research-Institute-Frankfurt/websites/actions/workflows/elearning-check-links.yml/badge.svg)](https://github.com/Peace-Research-Institute-Frankfurt/websites/actions/workflows/elearning-check-links.yml) |
| New Work | [leibniz-nw.netlify.app](https://leibniz-nw.netlify.app/) | [![Netlify Status](https://api.netlify.com/api/v1/badges/a9e50b5c-a39d-4bd7-9324-bf20958b2ecf/deploy-status)](https://app.netlify.com/sites/leibniz-nw/deploys) [![[New Work] Check Markdown Links](https://github.com/Peace-Research-Institute-Frankfurt/websites/actions/workflows/new-work-check-links.yml/badge.svg)](https://github.com/Peace-Research-Institute-Frankfurt/websites/actions/workflows/new-work-check-links.yml) |
| PRIF Review | [review.prif.org](https://review.prif.org) | [![Netlify Status](https://api.netlify.com/api/v1/badges/61f8dfa0-3e12-4cb2-95ee-128c928efd25/deploy-status)](https://app.netlify.com/sites/prif-review/deploys) [![[PRIF Review] Check Markdown Links](https://github.com/Peace-Research-Institute-Frankfurt/websites/actions/workflows/prif-review-check-links.yml/badge.svg?branch=main)](https://github.com/Peace-Research-Institute-Frankfurt/websites/actions/workflows/prif-review-check-links.yml) |
| CNTR Monitor | [monitor.cntrarmscontrol.org](https://monitor.cntrarmscontrol.org/) | [![Netlify Status](https://api.netlify.com/api/v1/badges/e20bc7bc-3b8f-42e0-bcfc-d36721be2bf0/deploy-status)](https://app.netlify.com/sites/cntr-monitor/deploys) |
6 changes: 6 additions & 0 deletions cntr-monitor/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.cache/
public
fonts/
documentation/
.env
.netlify
6 changes: 6 additions & 0 deletions cntr-monitor/content/de/issues/2024/authors/test-author.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
name: Test Author
author_id: test-author
---

This is the author's bio
8 changes: 8 additions & 0 deletions cntr-monitor/content/de/issues/2024/index.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
title: CNTR Monitor 2024
year: 2024
order: 0
color: '#ef7d23'
---

Issue intro copy (DE)
7 changes: 7 additions & 0 deletions cntr-monitor/content/de/issues/2024/posts/1_test.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
order: 1
title: Test Post
color: rgb(0, 131, 181)
---

This is the post copy (DE)
6 changes: 6 additions & 0 deletions cntr-monitor/content/de/pages/accessibility.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
title: Barrierefreiheit
order: 2
---

TODO A11y statement
6 changes: 6 additions & 0 deletions cntr-monitor/content/de/pages/legal.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
order: 4
title: Impressum
---

TODO Legal (DE)
6 changes: 6 additions & 0 deletions cntr-monitor/content/de/pages/privacy.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
order: 1
title: Datenschutz
---

TODO Privacy
6 changes: 6 additions & 0 deletions cntr-monitor/content/en/issues/2024/authors/test-author.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
name: Test Author
author_id: test-author
---

This is the author's bio
7 changes: 7 additions & 0 deletions cntr-monitor/content/en/issues/2024/index.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: CNTR Monitor 2024
year: 2024
order: 0
---

Issue intro copy (EN)
7 changes: 7 additions & 0 deletions cntr-monitor/content/en/issues/2024/posts/1_test.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
order: 0
title: Test Post
color: rgb(0, 131, 181)
---

This is the post copy (EN)
6 changes: 6 additions & 0 deletions cntr-monitor/content/en/pages/accessibility.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
title: Accessibility
order: 2
---

TODO A11y Statement (DE)
Loading

0 comments on commit 3c58777

Please sign in to comment.