Merge pull request #26 from udk-berlin/lilli

Lilli

locales/de.json

@@ -31,7 +31,9 @@
         "description": "Die Universität der Künste Berlin lädt vom 19. bis 21. Juli zum Rundgang – Tage der offenen Tür. Werkstätten, Ateliers, Studios und Probenräume der Fakultäten Bildende Kunst, Architektur, Gestaltung, Musik und Darstellende Kunst sowie das Hochschulübergreifende Zentrum Tanz Berlin, das Jazz-Institut Berlin und das Berlin Career College öffnen zum Ende des akademischen Jahres ihre Türen. Von Malerei, Skulptur und Performance über Designentwürfe, Modenschau und Filmscreenings bis hin zu Konzerten, Tanz und Soundinstallationen zeigen Studierende Ergebnisse und Prozesse ihrer künstlerischen Arbeit."
     },
     "Saved": {
+        "title": "Gemerkte Projekte",
         "saved_items": "Gemerkte Projekte",
+        "description": "Hier können Projekte oder Veranstaltung gespeichert werden",
         "remove": "entfernen",
         "save": "merken",
         "remove_all": "Alle entfernen"
@@ -55,7 +57,7 @@
         "title": "UdK Rundgang 2024",
         "studentproject": "Projekt",
         "event": "Veranstaltung",
-        "meta_description": "{type}: {name}"
+        "meta_description": "{template, select, studentproject {Projekt zum UdK Rundgang 2024 - Autor*innen: {name}} event {Veranstaltung zum UdK Rundgang 2024 - Autor*innen: {name}} other {Autor*innen: {name}}}"
     },
     "format": "{count, plural, =1 {Format} other {Formate}}",
     "faculty": "{count, plural, =1 {Fakultät/Zentrum} other {Fakultäten/Zentren}}",

locales/en.json

@@ -33,6 +33,7 @@
     "Saved": {
         "title": "Saved Projects",
         "saved_items": "Saved Projects",
+        "description": "Projects or events can be saved here.",
         "remove": "remove",
         "save": "save",
         "remove_all": "Remove All"
@@ -56,7 +57,7 @@
         "title": "UdK Rundgang 2024",
         "studentproject": "Project",
         "event": "Event",
-        "meta_description": "{type}: {name}"
+        "meta_description": "{template, select, studentproject {Project at the UdK Rundgang 2024 - Authors: {name}} event {Event at the UdK Rundgang 2024 - Authors: {name}} other {Authors: {name}}}"
     },
     "format": "{count, plural, =1 {Format} other {Formats}}",
     "faculty": "{count, plural, =1 {Faculty/Centre} other {Faculties/Centres}}",

src/api/constants.ts

@@ -6,6 +6,7 @@ export const LOCATION_INFO = {
     maxZoom: 15.25,
     labelPosition: 'bottom-0 right-16',
     name: 'Fasanenstraße 1B',
+    popupMargin: '-mt-20',
   },
   '!RuJBwEwOQcFrQabJnn:content.udk-berlin.de': {
     lng: 13.3299,
@@ -14,6 +15,7 @@ export const LOCATION_INFO = {
     maxZoom: 14.1,
     labelPosition: 'bottom-0 right-8',
     name: 'Bundesallee 1-12',
+    popupMargin: '-mt-32',
   },
   '!YIwQSiHDpoiNHDMWmC:content.udk-berlin.de': {
     lng: 13.32215,
@@ -22,6 +24,7 @@ export const LOCATION_INFO = {
     maxZoom: 14.7,
     labelPosition: 'bottom-8 right-8',
     name: 'Einsteinufer 43',
+    popupMargin: '-mt-20',
   },
   '!XGSFQYZUnFtQNzOBnD:content.udk-berlin.de': {
     lng: 13.327300406397331,
@@ -30,6 +33,7 @@ export const LOCATION_INFO = {
     maxZoom: 13.7,
     labelPosition: 'bottom-8 right-8',
     name: 'Hardenbergstraße 33',
+    popupMargin: '-mt-10',
   },
   '!GFauydmVRlpqvDETXH:content.udk-berlin.de': {
     lng: 13.3588243,
@@ -38,6 +42,7 @@ export const LOCATION_INFO = {
     maxZoom: 14.66,
     labelPosition: 'bottom-8 left-8',
     name: 'Grunewaldstraße 2-5',
+    popupMargin: '-mt-20',
   },
   '!eVjUBtkIgDQkQSKVxm:content.udk-berlin.de': {
     lng: 13.329011660461106,
@@ -46,6 +51,7 @@ export const LOCATION_INFO = {
     maxZoom: 15.45,
     labelPosition: 'bottom-8 left-8',
     name: 'Straße des 17. Juni 118',
+    popupMargin: '-mt-20',
   },
   '!OkEblSLtaWAObRcCHm:content.udk-berlin.de': {
     lng: 13.332849698118526,
@@ -54,6 +60,7 @@ export const LOCATION_INFO = {
     maxZoom: 15.6,
     labelPosition: 'bottom-8 left-8',
     name: 'Lietzenburger Straße 45',
+    popupMargin: '-mt-32',
   },
   '!fPuAzLpetwUYPJZwCF:content.udk-berlin.de': {
     lng: 13.30389,
@@ -62,6 +69,7 @@ export const LOCATION_INFO = {
     maxZoom: 15.89,
     labelPosition: 'bottom-8 left-8',
     name: 'Mierendorffstraße 28-30',
+    popupMargin: '-mt-20',
   },
   '!HXlOLrPXYbIQdkqryj:content.udk-berlin.de': {
     lng: 13.32345,
@@ -70,6 +78,7 @@ export const LOCATION_INFO = {
     maxZoom: 16.8,
     labelPosition: 'top-8 right-8',
     name: 'Hardenbergstraße 41',
+    popupMargin: '-mt-40',
   },
   '!RpTarLRqYYIdDCBLyV:content.udk-berlin.de': {
     lng: 13.3281,
@@ -78,6 +87,7 @@ export const LOCATION_INFO = {
     maxZoom: 15.2,
     labelPosition: 'top-[40px] left-8',
     name: 'UNI.T - Theater der UdK Berlin',
+    popupMargin: '-mt-20',
   },
   '!YOMEVNrNhhIBxSAhNQ:content.udk-berlin.de': {
     lng: 13.374843,
@@ -86,6 +96,7 @@ export const LOCATION_INFO = {
     maxZoom: 16.1,
     labelPosition: 'bottom-8 left-8',
     name: 'Campus Uferstudios',
+    popupMargin: '-mb-20',
   },
   '!CmGOTOZlDoWMcJFHkZ:content.udk-berlin.de': {
     lng: 13.321916506276636,
@@ -94,6 +105,7 @@ export const LOCATION_INFO = {
     maxZoom: 15.2,
     labelPosition: 'bottom-8 right-8',
     name: 'Ernst Reuter-Platz ',
+    popupMargin: '-mt-20',
   },
   '!IKWVNtgTydTHMgpUwQ:content.udk-berlin.de': {
     lng: 13.36031847972046,
@@ -102,6 +114,7 @@ export const LOCATION_INFO = {
     maxZoom: 15.2,
     labelPosition: 'bottom-8 left-8',
     name: 'Kurfürstenstr. 145',
+    popupMargin: '-mt-20',
   },
   '!KzIsljbqAmULTkxsCU:content.udk-berlin.de': {
     lng: 13.3286,
@@ -110,6 +123,7 @@ export const LOCATION_INFO = {
     maxZoom: 14.8,
     labelPosition: 'bottom-8 left-8',
     name: 'Fasanenstraße 1B',
+    popupMargin: '-mt-20',
   },
   '!BwOubkPoQLppzIHegK:content.udk-berlin.de': {
     lng: 13.3299,
@@ -118,6 +132,7 @@ export const LOCATION_INFO = {
     maxZoom: 13.5,
     labelPosition: 'bottom-0 right-8',
     name: 'Bundesallee 1-12',
+    popupMargin: '-mt-32',
   },
   '!sJUtqUiNvdoxXDNxCG:content.udk-berlin.de': {
     lng: 13.32215,
@@ -126,6 +141,7 @@ export const LOCATION_INFO = {
     maxZoom: 14.1,
     labelPosition: 'bottom-8 right-8',
     name: 'Einsteinufer 43',
+    popupMargin: '-mt-20',
   },
   '!GdQiRUtkgoGlNOxTLD:content.udk-berlin.de': {
     lng: 13.32731,
@@ -134,6 +150,7 @@ export const LOCATION_INFO = {
     maxZoom: 13.2,
     labelPosition: 'bottom-8 right-8',
     name: 'Hardenbergstraße 33',
+    popupMargin: '-mt-10',
   },
   '!nfZcJbplQdHUXtATXR:content.udk-berlin.de': {
     lng: 13.35885,
@@ -142,6 +159,7 @@ export const LOCATION_INFO = {
     maxZoom: 14.2,
     labelPosition: 'bottom-8 left-8',
     name: 'Grunewaldstraße 2-5',
+    popupMargin: '-mt-20',
   },
   '!HILXSleVJzHEpzINsZ:content.udk-berlin.de': {
     lng: 13.329011660461106,
@@ -150,6 +168,7 @@ export const LOCATION_INFO = {
     maxZoom: 14.8,
     labelPosition: 'bottom-8 left-8',
     name: 'Straße des 17. Juni 118',
+    popupMargin: '-mt-20',
   },
   '!CSXYmlMoZpDBByZfqj:content.udk-berlin.de': {
     lng: 13.33283,
@@ -158,6 +177,7 @@ export const LOCATION_INFO = {
     maxZoom: 15.0,
     labelPosition: 'bottom-8 left-8',
     name: 'Lietzenburger Straße 45',
+    popupMargin: '-mt-32',
   },
   '!oVBzAqSwRRNhoaUgMg:content.udk-berlin.de': {
     lng: 13.30389,
@@ -166,6 +186,7 @@ export const LOCATION_INFO = {
     maxZoom: 15.3,
     labelPosition: 'bottom-8 left-8',
     name: 'Mierendorffstraße 28-30',
+    popupMargin: '-mt-20',
   },
   '!MvJOJtvpfocMzxUHrQ:content.udk-berlin.de': {
     lng: 13.32345,
@@ -174,6 +195,7 @@ export const LOCATION_INFO = {
     maxZoom: 16.4,
     labelPosition: 'top-8 right-8',
     name: 'Hardenbergstraße 41',
+    popupMargin: '-mt-40',
   },
   '!CTmDtbjUTOOsurMDPc:content.udk-berlin.de': {
     lng: 13.374843,
@@ -182,6 +204,7 @@ export const LOCATION_INFO = {
     maxZoom: 15.6,
     labelPosition: 'bottom-8 left-8',
     name: 'Uferstraße 23',
+    popupMargin: 'mt-20',
   },
   '!YRPlAmtcyMajlqsecM:content.udk-berlin.de': {
     lat: 52.43893183717061,
@@ -190,8 +213,9 @@ export const LOCATION_INFO = {
     image: 'simple',
     name: 'Galerie Alte Schule Adlershof',
     labelPosition: 'bottom-8 left-8',
+    popupMargin: '-mt-20',
   },
-};
+} as const;
 
 export const FLOORPLANS = {
   '!PsyURUpKAbSPistHpQ:content.udk-berlin.de': 7,

src/api/graphql/items.ts

@@ -98,10 +98,6 @@ export const getFilteredGraphQLItems = cache(
 export const getFilteredGraphQLLocationItems = cache(async (place: string) => {
   const locationItems = await getLocationItems(place);
   const allItems = await getGraphQLItems();
-  console.log(
-    allItems.map((i) => i.id),
-    locationItems,
-  );
 
   return allItems.filter((item) => locationItems.includes(item.id));
 });

src/api/rest/location.ts

@@ -5,6 +5,7 @@ import {
   restApiLocationsRoot,
   FLOORPLANS,
   FLOORPLAN_MARGINS,
+  LOCATION_INFO,
 } from '../constants';
 import { getTreeById } from '@/api/rest/tree';
 import { getPathListById } from '@/api/rest/pathlist';
@@ -76,9 +77,9 @@ export const getLocation = cache(async (id: string): Promise<LocationItem> => {
     level: level,
     levels: levels,
     margin:
-      level && level?.id in FLOORPLAN_MARGINS
-        ? FLOORPLAN_MARGINS[level?.id]
-        : 'm-0',
+      building && building.id in LOCATION_INFO
+        ? LOCATION_INFO[building.id].popupMargin
+        : '-mt-20',
     rooms: rooms,
   };
 });

src/app/[locale]/contact/page.tsx

@@ -8,6 +8,9 @@ export async function generateMetadata(): Promise<Metadata> {
   return {
     title: t('title'),
     description: t('description'),
+    openGraph: {
+      images: ['/assets/projects/ja/writing.png'],
+    },
   };
 }
 export default async function Page(props: any) {

src/app/[locale]/imprint/page.tsx

@@ -7,6 +7,9 @@ export async function generateMetadata(): Promise<Metadata> {
   return {
     title: t('title'),
     description: t('description'),
+    openGraph: {
+      images: ['/assets/projects/hi/writing.png'],
+    },
   };
 }
 

src/app/[locale]/info/page.tsx

@@ -7,6 +7,9 @@ export async function generateMetadata(): Promise<Metadata> {
   return {
     title: t('title'),
     description: t('description'),
+    openGraph: {
+      images: ['/assets/projects/de/writing.png'],
+    },
   };
 }
 export default function InfoPage() {

src/app/[locale]/layout.tsx

@@ -11,6 +11,8 @@ import { getGraphQLFilters } from '@/api/graphql/filters';
 import { AppStoreProvider } from '@/lib/useAppContext';
 import { defaultInitState } from '@/lib/appStore';
 import { ReactNode } from 'react';
+import { extractProjectLanguageSearchParam } from '@/app/(landing)/components/desktop/landing.server';
+import { ProjectLanguages } from '@/projects';
 
 type RootLayoutProps = {
   children: ReactNode;
@@ -20,22 +22,32 @@ type RootLayoutProps = {
 
 export async function generateMetadata({
   params: { locale },
+  searchParams,
 }: {
   params: { locale: string };
+  searchParams?: { lang: ProjectLanguages };
 }) {
   const t = await getTranslations({ locale, namespace: 'RootLayout' });
 
+  const lang = extractProjectLanguageSearchParam(searchParams);
+
   return {
     title: t('title'),
     description: t('description'),
-    metadataBase: new URL('https://localhost:3000'),
+    metadataBase:
+      process.env.NODE_ENV == 'development'
+        ? new URL('http://localhost:3000')
+        : new URL('http://rundgang-frontend-24.dev.medienhaus.udk-berlin.de'),
     alternates: {
       canonical: '/',
       languages: {
         en: '/en',
         de: '/de',
       },
     },
+    openGraph: {
+      images: [`/assets/projects/${lang}/writing.png`],
+    },
   };
 }
 

src/app/[locale]/locations/[[...slug]]/components/floorplan/index.server.tsx

@@ -1,14 +1,20 @@
 import Image from 'next/image';
+import cx from 'classnames';
 import Rooms from './rooms';
 import { LocationItem } from '@/types/types';
 
 export default function Floorplan({ location }: { location: LocationItem }) {
   return (
-    <div className="relative aspect-square w-full p-1">
+    <div
+      className={cx(
+        'pointer-events-none relative col-span-1 aspect-square w-full p-1',
+        location.margin,
+      )}
+    >
       <Image
         fill
         alt="building background"
-        className="h-full w-full object-contain"
+        className="pointer-events-none h-full w-full object-contain"
         placeholder="empty"
         src={`/assets/svg/map/ground_plan/popup/${location.image}.svg`}
       />

src/app/[locale]/locations/[[...slug]]/components/floorplan/rooms.tsx

@@ -30,6 +30,7 @@ export default function Rooms({ location }: any) {
                   'fill-white',
                   'stroke-black',
                   'stroke-[10px]',
+                  'pointer-events-auto ',
                 );
               } else if (location.rooms?.find((r) => r.id == room.id)) {
                 roomRect.classList.add(
@@ -38,6 +39,7 @@ export default function Rooms({ location }: any) {
                   'hover:fill-white',
                   'stroke-white',
                   'stroke-[10px]',
+                  'pointer-events-auto ',
                 );
               } else {
                 roomRect.classList.add('fill-highlight', 'pointer-events-none');