Merge pull request #96 from MfN-Berlin/testing-drupal-integration

v0.1.16
MfN-Berlin · Feb 3, 2025 · 31c3cd1 · 31c3cd1
2 parents e29821e + ad393ab
commit 31c3cd1
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 53 deletions.
diff --git a/gatsby-browser.js b/gatsby-browser.js
@@ -7,7 +7,7 @@
 import './src/styles/global.css'
 
 // Version logging
-const VERSION = 'v0.1.15'
+const VERSION = 'v0.1.16'
 
 export const onClientEntry = () => {
     // Temporär Prefetching deaktivieren

diff --git a/src/components/elements/Section.js b/src/components/elements/Section.js
@@ -5,7 +5,7 @@ const Section = ({
   className = '', 
   backgroundColor = 'bg-transparent',
   innerBg = '',
-  padding = 'py-16',
+  padding = 'py-8 md:py-16',
   columns = 1,
   gapClass = 'gap-4',
   layout = 'equal',

diff --git a/src/components/features/OpenToday.js b/src/components/features/OpenToday.js
@@ -29,14 +29,14 @@ const OpenToday = () => {
 
   const getOpeningInfo = () => {
     // const now = new Date();
-    const xdate = new Date('2024-12-25T22:00:00');  
-    const now = xdate;
+    // const xdate = new Date('2024-12-25T22:00:00');  
+    const now = new Date();
     const currentHour = now.getHours();
     const isAfterClosing = currentHour >= 18;
 
     // Wenn nach Schließzeit, dann Infos für morgen anzeigen
     // const targetDate = new Date();
-    const targetDate = xdate;
+    const targetDate = now;
     if (isAfterClosing) {
       targetDate.setDate(targetDate.getDate() + 1);
     }

diff --git a/src/components/layouts/StoryTime.js b/src/components/layouts/StoryTime.js
@@ -11,7 +11,7 @@ const StoryTime = ({
   linkText
 }) => {
   const ImageElement = (
-    <div className="w-full md:w-1/2 aspect-square relative">
+    <div className="w-full md:w-1/2 h-[400px] md:h-auto w-[400px] md:w-full md:aspect-square relative">
       <div className="absolute inset-0 rounded-full overflow-hidden m-12">
         <ContentImage 
           {...imageProps}
@@ -36,7 +36,7 @@ const StoryTime = ({
   );
 
   return (
-    <div className="w-full flex flex-col md:flex-row justify-start items-center gap-20 xl:gap-36">
+    <div className="w-full flex flex-col md:flex-row justify-start items-center gap-1 md:gap-20 xl:gap-36">
       {imagePosition === 'left' ? (
         <>
           {ImageElement}

diff --git a/...rplatz im Sommer (c) Pablo Castagnola.jpg → ...Vorplatz_im_Sommer_c_Pablo_Castagnola.jpg b/...rplatz im Sommer (c) Pablo Castagnola.jpg → ...Vorplatz_im_Sommer_c_Pablo_Castagnola.jpg
diff --git a/src/pages/de/besuch-planen.js b/src/pages/de/besuch-planen.js
@@ -46,7 +46,7 @@ const IndexPage = () => {
       <Header activeNavItem="besuchplanen" />
       <main className="flex flex-col items-center justify-center min-h-screen p-0 bg-Black-000">
         <AccessibilityNav currentPage="Besuch planen" />
-        <Section backgroundColor="bg-white" gapClass="gap-20 xl:gap-36">
+        <Section backgroundColor="bg-white" gapClass="gap-10 md:gap-20 xl:gap-36">
           <StoryTime
             imageProps={{
               imageName: "171030_naturkunde_156_c_thomas_rosenthal_0.jpg",
@@ -96,8 +96,8 @@ const IndexPage = () => {
           />
 
         </Section>
-        <Section columns={2} backgroundColor="bg-Green-100" gapClass="gap-20 xl:gap-36" justifyContent="center">
-          <div className="py-20">
+        <Section columns={2} backgroundColor="bg-Green-100" gapClass="gap-10 md:gap-20 xl:gap-36" justifyContent="center">
+          <div className="py-10 md:py-20">
             <CardText
               headline="Öffnungszeiten"
               headlineStyle="h1"
@@ -155,8 +155,8 @@ const IndexPage = () => {
           </Accordion>
 
         </Section>
-        <Section id="tickets-preise" columns={2} backgroundColor="bg-white" gapClass="gap-20 xl:gap-36" justifyContent="center">
-          <div className="flex flex-col justify-center items-center gap-20 py-20">
+        <Section id="tickets-preise" columns={2} backgroundColor="bg-white" gapClass="gap-10 md:gap-20 xl:gap-36" justifyContent="center">
+          <div className="flex flex-col justify-center items-center gap-10 md:gap-20 py-10 md:py-20">
             {/* <div className="flex items-center justify-center w-[166px] h-[166px] p-4 rotate-[7deg] bg-Yellow rounded-full shadow-lg">
               <p className="text-center text-black">
                 Am ersten Sonntag des Monats ist der <strong>Eintritt frei!</strong>
@@ -455,8 +455,8 @@ const IndexPage = () => {
 
         </Section>
 
-        <Section id="anreise" columns={2} backgroundColor="bg-Green-100" gapClass="gap-20 xl:gap-36" justifyContent="center">
-          <div className="flex flex-col justify-center items-center py-20">
+        <Section id="anreise" columns={2} backgroundColor="bg-Green-100" gapClass="gap-10 md:gap-20 xl:gap-36" justifyContent="center">
+          <div className="flex flex-col justify-center items-center py-10 md:py-20">
             <div className="py-[30px] mb-[17px]">
               <div className="w-[200px] h-[200px] relative overflow-hidden rounded-full">
                 <ContentImage
@@ -578,8 +578,8 @@ const IndexPage = () => {
             </AccordionItem>
           </Accordion>
         </Section>
-        <Section id="im-museum" columns={1} backgroundColor="bg-white" padding="pb-4 pt-16">
-          <div className="py-20">
+        <Section id="im-museum" columns={1} backgroundColor="bg-white" padding="pt-8 md:pt-16 pb-4 md:pb-8">
+          <div className="py-10 md:py-20">
             <CardText
               headline="Im Museum"
               headlineStyle="h1"
@@ -709,7 +709,7 @@ const IndexPage = () => {
             />
           </Slideshow>
         </Section>
-        <Section backgroundColor="bg-white" padding="py-0 gap-0 pb-16">
+        <Section backgroundColor="bg-white" padding="pt-8 md:pt-16 pb-4 md:pb-8">
           <div className="grid w-full grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4">
             <div className="sm:col-span-2 lg:col-span-2">
               <Card
@@ -801,8 +801,8 @@ const IndexPage = () => {
 
           </div>
         </Section>
-        <Section columns={1} backgroundColor="bg-Green-100" padding="pt-16 pb-0">
-          <div className="py-20">
+        <Section columns={1} backgroundColor="bg-Green-100" padding="pt-8 md:pt-16 pb-0">
+          <div className="py-10 md:py-20">
 
             <CardText
               headline="Besondere Besuche"
@@ -884,8 +884,8 @@ const IndexPage = () => {
             url="/de/museum/bildung/familien"
           />
         </Section>
-        <Section columns={2} backgroundColor="bg-white" gapClass="gap-36" justifyContent="center">
-          <div className="py-20">
+        <Section columns={2} backgroundColor="bg-white" gapClass="gap-10 md:gap-36" justifyContent="center">
+          <div className="py-10 md:py-20">
             <CardText
               headline="Oft gestellte Fragen"
               headlineStyle="h1"

diff --git a/src/pages/de/forschung.js b/src/pages/de/forschung.js
@@ -389,7 +389,7 @@ const VisitPage = () => {
 
                     </Slideshow>
                 </Section>
-                <Section backgroundColor="bg-White" columns={1} padding="pt-16 pb-8">
+                {/* <Section backgroundColor="bg-White" columns={1} padding="pt-16 pb-8">
                     <CardText
                         headline="Publikationen"
                         headlineStyle="h1"
@@ -403,7 +403,7 @@ const VisitPage = () => {
                             }
                         ]}
                     />
-                </Section>
+                </Section> */}
                 {/* <Section backgroundColor="bg-White" columns={3} padding="pb-16">
                     <Link to="/de/presse/pressemitteilungen/wie-lebensstrategien-und-lebensraeume-die-regenerationsfaehigkeiten-von" className="group w-full p-3 rounded-[10px] inline-flex flex-col items-start gap-2.5 hover:bg-Green-200 focus:border-2 focus:border-[#729800]">
                         <div className="w-full bg-Green-100 flex flex-col  ">

diff --git a/src/pages/de/kontakt.js b/src/pages/de/kontakt.js
@@ -39,7 +39,7 @@ const IndexPage = () => {
                 <Section backgroundColor="bg-white" gapClass="gap-20 xl:gap-36">
                     <StoryTime
                         imageProps={{
-                            imageName: "Museum für Naturkunde mit Vorplatz im Sommer (c) Pablo Castagnola.jpg",
+                            imageName: "Museum_fuer_Naturkunde_mit_Vorplatz_im_Sommer_c_Pablo_Castagnola.jpg",
                             alt: "Fassade des Museums für Naturkunde",
                             imageMap: imageMap,
                             className: "w-full h-full object-cover"

diff --git a/src/pages/de/museum.js b/src/pages/de/museum.js
@@ -85,16 +85,9 @@ const IndexPage = () => {
             }}
             textProps={{
               headline: "Ein Haus für Natur und Gesellschaft",
-              body: "Das Museum für Naturkunde Berlin der Zukunft wird offen, integriert und forschungsstark sein, ein Vorbild für die Forschungsmuseen weltweit. Unser Drehbuch auf dem Weg dorthin ist unser Zukunftsplan.",
+              body: " \"Für uns geht es darum, ein Ort der Begegnung, des Dialogs und der Demokratie zu sein. Konstante Veränderung ist Teil unserer DNA. Wir sind das Museum der Zukunft.\" – Prof. Johannes Vogel, PhD, Generaldirektor",
               headlineStyle: "h4",
               spacing: "wide",
-              buttons: [
-                {
-                  text: "Zukunftsplan",
-                  url: "/de/museum/zukunft/zukunftsplan/",
-                  className: "mt-4",
-                }
-              ]
             }}
             textStyle="box-white"
             textPosition="bottom-left"
@@ -126,7 +119,7 @@ const IndexPage = () => {
              </Section>
              <Section backgroundColor="bg-Green-100" columns={1}>
             <CardText
-            body="Der Zukunftsplan, den das Museum tagtäglich umsetzt, sieht die bauliche Sanierung des Museums vor, die mehr als 30 Millionen Objekte umfassende wissenschaftliche Sammlung des Museums wird erschlossen und besser zugänglich gemacht."
+            body="Das Museum für Naturkunde Berlin der Zukunft wird offen, integriert und forschungsstark sein, ein Vorbild für die Forschungsmuseen weltweit. Unser Drehbuch auf dem Weg dorthin ist unser Zukunftsplan."
             spacing="wide"
             alignment="center"
             buttons={[
@@ -408,7 +401,7 @@ const IndexPage = () => {
           <Card
             variant="classic"
             imageProps={{
-              imageName: "Museum für Naturkunde mit Vorplatz im Sommer (c) Pablo Castagnola.jpg",
+              imageName: "Museum_fuer_Naturkunde_mit_Vorplatz_im_Sommer_c_Pablo_Castagnola.jpg",
               alt: "Fassade des Museums für Naturkunde",
               imageMap: imageMap,
               className: "w-full h-auto object-cover"

diff --git a/src/pages/en/contact.js b/src/pages/en/contact.js
@@ -51,7 +51,7 @@ const ContactPage = () => {
               {Object.keys(imageMap).length > 0 && (
                 <StoryTime
                   imageProps={{
-                    imageName: "Museum für Naturkunde mit Vorplatz im Sommer (c) Pablo Castagnola.jpg",
+                    imageName: "Museum_fuer_Naturkunde_mit_Vorplatz_im_Sommer_c_Pablo_Castagnola.jpg",
                     alt: "Birds view of the Museum für Naturkunde",
                     imageMap: imageMap,
                     className: "w-full h-full object-cover"

diff --git a/src/pages/en/museum.js b/src/pages/en/museum.js
@@ -86,16 +86,9 @@ const IndexPage = () => {
             }}
             textProps={{
               headline: "A House for Nature and Society",
-              body: "The Museum für Naturkunde Berlin of the future will be open, integrated and strong in research, a role model for research museums worldwide. Our script on the way there is our future plan.",
+              body: "\"For us, it is about being a place of encounter, dialogue, and democracy. Constant change is part of our DNA. We are the museum of the future.\" Prof. Johannes Vogel, PhD, Generaldirektor",
               headlineStyle: "h4",
               spacing: "wide",
-              buttons: [
-                {
-                  text: "Future Plan",
-                  url: "/en/future/future-plan/",
-                  className: "mt-4",
-                }
-              ]
             }}
             textStyle="box-white"
             textPosition="bottom-left"
@@ -125,7 +118,7 @@ const IndexPage = () => {
             className="w-full"
           />
           <CardText
-            body="The future plan, which the museum implements daily, envisions the structural renovation of the museum, and will render the scientific collection of more than 30 million objects more accessible and better available."
+            body="The Museum für Naturkunde Berlin of the future will be open, integrated and strong in research, a role model for research museums worldwide. Our script on the way there is our future plan."
             spacing="normal"
             alignment="center"
             buttons={[
@@ -408,7 +401,7 @@ const IndexPage = () => {
           <Card
             variant="classic"
             imageProps={{
-              imageName: "Museum für Naturkunde mit Vorplatz im Sommer (c) Pablo Castagnola.jpg",
+              imageName: "Museum_fuer_Naturkunde_mit_Vorplatz_im_Sommer_c_Pablo_Castagnola.jpg",
               alt: "Birds View of the Museum für Naturkunde",
               imageMap: imageMap,
               className: "w-full h-auto object-cover"

diff --git a/src/pages/en/research.js b/src/pages/en/research.js
@@ -386,7 +386,7 @@ const ResearchPage = () => {
                     </Slideshow>
                 </Section>
 
-                <Section backgroundColor="bg-White" columns={1} padding="pt-16 pb-8">
+                {/* <Section backgroundColor="bg-White" columns={1} padding="pt-16 pb-8">
                     <CardText
                         headline="Publications"
                         headlineStyle="h1"
@@ -400,7 +400,7 @@ const ResearchPage = () => {
                             }
                         ]}
                     />
-                </Section>
+                </Section> */}
 
                 {/* <Section backgroundColor="bg-White" columns={3} padding="pb-16">
                     <Link to="/en/press/releases/how-life-strategies-and-habitats-influence-regeneration-abilities" className="group w-full p-3 rounded-[10px] inline-flex flex-col items-start gap-2.5 hover:bg-Green-200 focus:border-2 focus:border-[#729800]">

diff --git a/src/pages/en/visit.js b/src/pages/en/visit.js
@@ -47,7 +47,7 @@ const IndexPage = () => {
       <Header activeNavItem="visit" />
       <main className="flex flex-col items-center justify-center min-h-screen p-0 bg-Black-000">
           <AccessibilityNav currentPage="Plan Your Visit" />
-        <Section backgroundColor="bg-white" gapClass="gap-20 xl:gap-36">
+        <Section backgroundColor="bg-white" gapClass="gap-10 md:gap-20 xl:gap-36">
           <StoryTime
             imageProps={{
               imageName: "171030_naturkunde_156_c_thomas_rosenthal_0.jpg",
@@ -95,8 +95,8 @@ const IndexPage = () => {
             linkText="To Ticket Shop"
           />
         </Section>
-        <Section columns={2} backgroundColor="bg-Green-100" gapClass="gap-20 xl:gap-36" justifyContent="center">
-          <div>
+        <Section columns={2} backgroundColor="bg-Green-100" gapClass="gap-10 md:gap-20 xl:gap-36" justifyContent="center">
+          <div className="py-10 md:py-20">
             <CardText
               headline="Opening Hours"
               headlineStyle="h1"
@@ -154,8 +154,8 @@ const IndexPage = () => {
           </Accordion>
 
         </Section>
-        <Section columns={2} backgroundColor="bg-white" gapClass="gap-20 xl:gap-36" justifyContent="center">
-          <div className="flex -mt-40 flex-col justify-center items-center gap-20">
+        <Section columns={2} backgroundColor="bg-white" gapClass="gap-10 md:gap-20 xl:gap-36" justifyContent="center">
+          <div className="flex -mt-20 md:-mt-40 flex-col justify-center items-center gap-10 md:gap-20">
             <CardText
               headline="Tickets & Prices"
               headlineStyle="h1"
@@ -869,7 +869,7 @@ const IndexPage = () => {
             url="/en/museum/education/guided-tours"
           />
         </Section>
-        <Section columns={2} backgroundColor="bg-white" gapClass="gap-36" justifyContent="center">
+        <Section columns={2} backgroundColor="bg-white" gapClass="gap-10 md:gap-36" justifyContent="center">
           <CardText
             headline="Frequently Asked Questions"
             headlineStyle="h1"