Skip to content

Commit

Permalink
Merge pull request #19 from udk-berlin/dev
Browse files Browse the repository at this point in the history
Merge dev
  • Loading branch information
marisanest authored Jun 26, 2024
2 parents 963d839 + 31119a9 commit d6fc36c
Show file tree
Hide file tree
Showing 160 changed files with 2,680 additions and 898 deletions.
19 changes: 19 additions & 0 deletions locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@
"faculties": "Fakultäten/Zentren",
"languages": "Sprachen"
},
"Locations": {
"levels": "Etagen",
"rooms": "Räume",
"level": "Etage",
"room": "Raum",
"all": "alle"
},
"RootLayout": {
"title": "Rundgang 2024",
"description": "Rundgang 2024"
Expand All @@ -28,5 +35,17 @@
"Landing": {
"udk_berlin": "UdK Berlin",
"date": "19. - 21. Juli 2024"
},
"design": {
"title": "Teilnehmer*innen",
"description": {
"title": "Projektbeschreibung",
"text": " Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec sapien lorem, placerat a ultricies quis, eleifend sed quam. Integer quis rhoncus ipsum. Phasellus vitae mauris et dolor blandit tempor. Duis a vestibulum eros. Suspendisse quis mattis diam, ac venenatis tellus. Duis lobortis quam nulla, placerat vehicula odio accumsan vitae. Etiam eros nisl, bibendum a mauris vel, mollis suscipit tortor. Sed fermentum ut lorem ac gravida. In accumsan sagittis scelerisque."
}
},
"faculty": "{count, plural, =1 {Fakultät/Zentrum} other {Fakultäten/Zentren}}",
"language": "{count, plural, =1 {Sprache} other {Sprachen}}",
"errors": {
"audiPlayer": "Dein Browser unterstützt dieses Audioelement nicht."
}
}
19 changes: 19 additions & 0 deletions locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@
"faculties": "Faculties/Centres",
"languages": "Languages"
},
"Locations": {
"levels": "Levels",
"rooms": "Rooms",
"level": "level",
"room": "room",
"all": "all"
},
"RootLayout": {
"title": "Round Tour 2024",
"description": "Round Tour 2024"
Expand All @@ -28,5 +35,17 @@
"Landing": {
"udk_berlin": "UdK Berlin",
"date": "19th - 21st of July 2024"
},
"design": {
"title": "Participants",
"description": {
"title": "Project description",
"text": " Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec sapien lorem, placerat a ultricies quis, eleifend sed quam. Integer quis rhoncus ipsum. Phasellus vitae mauris et dolor blandit tempor. Duis a vestibulum eros. Suspendisse quis mattis diam, ac venenatis tellus. Duis lobortis quam nulla, placerat vehicula odio accumsan vitae. Etiam eros nisl, bibendum a mauris vel, mollis suscipit tortor. Sed fermentum ut lorem ac gravida. In accumsan sagittis scelerisque."
}
},
"faculty": "{count, plural, =1 {Faculty/Centre} other {Faculties/Centres}}",
"language": "{count, plural, =1 {Language} other {Languages}}",
"errors": {
"audiPlayer": "Your browser does not support the audio element."
}
}
38 changes: 35 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"react-dom": "^18",
"react-map-gl": "^7.1.7",
"react-markdown": "^9.0.1",
"react-svg": "^16.1.34",
"zustand": "^4.5.2"
},
"devDependencies": {
Expand Down
Binary file added public/assets/placeholder.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 0 additions & 6 deletions public/assets/svg/close.svg

This file was deleted.

14 changes: 14 additions & 0 deletions public/assets/svg/map/ground_plan/marker/1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions public/assets/svg/map/ground_plan/marker/10.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions public/assets/svg/map/ground_plan/marker/11.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions public/assets/svg/map/ground_plan/marker/12.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions public/assets/svg/map/ground_plan/marker/13.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions public/assets/svg/map/ground_plan/marker/2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions public/assets/svg/map/ground_plan/marker/3.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions public/assets/svg/map/ground_plan/marker/4.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions public/assets/svg/map/ground_plan/marker/5.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions public/assets/svg/map/ground_plan/marker/6.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions public/assets/svg/map/ground_plan/marker/7.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions public/assets/svg/map/ground_plan/marker/8.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions public/assets/svg/map/ground_plan/marker/9.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/assets/svg/map/ground_plan/marker/simple.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions public/assets/svg/map/ground_plan/popup/1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit d6fc36c

Please sign in to comment.