From e4b065182ceaf55434d17dd15a47cd3b70d9a913 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 19 Sep 2023 09:21:37 +0200
Subject: [PATCH 1/8] Add CallForMaps page - proposition

---
 src/components/CallForMaps.jsx | 59 ++++++++++++++++++++++++++++++++++
 src/components/Menu.jsx        |  1 +
 src/pages/call-for-maps.jsx    | 24 ++++++++++++++
 3 files changed, 84 insertions(+)
 create mode 100644 src/components/CallForMaps.jsx
 create mode 100644 src/pages/call-for-maps.jsx

diff --git a/src/components/CallForMaps.jsx b/src/components/CallForMaps.jsx
new file mode 100644
index 0000000..34adfc2
--- /dev/null
+++ b/src/components/CallForMaps.jsx
@@ -0,0 +1,59 @@
+import Link from 'next/link'
+import { Container } from '@/components/Container'
+
+export function CallForMaps({ id }) {
+
+  return (
+    <section id={id} aria-label="CallForMaps" className="py-20 sm:py-32">
+      <Container>
+        <h1 className="mx-auto mb-6 max-w-2xl text-center font-dunbar text-5xl font-medium tracking-tighter text-sotm-blue sm:text-5xl">
+          Call for Maps
+        </h1>
+
+        <div className="mx-auto mt-6 space-y-6 font-poppins text-2xl tracking-tight text-sotm-blue">
+          <h3 className="mx-auto mt-6 max-w-2xl text-center font-dunbar text-2xl font-medium tracking-tighter text-sotm-blue sm:text-3xl">
+            Submit your map
+          </h3>
+          <p>
+          A SOTM conference would not be complete without a map exhibition! So at this SOTM-Europe,
+          you can submit a map, or a poster, to be exhibited during the conference. We are looking for
+          beautiful maps made of OSM data. You may either show to the community how well is mapped your
+          place or showcase a new map style. You can also display a poster about some OSM-related
+          research or process (an achievement within your local community, a use case of re-using OSM
+          data, ...). The only condition is that is should be about OSM.
+          </p>
+          <h3 className="mx-auto mt-6 max-w-2xl text-center font-dunbar text-2xl font-medium tracking-tighter text-sotm-blue sm:text-3xl">
+            Guidelines
+          </h3>
+          <p>We'd like to receive posters in the A0 format. The SOTM team can print it for the conference
+            venue. However, you can also print it yourself and bring a printed copy at the conference. In
+            this case, other format than A0 is acceptable as long as it would fit somehow into a A0 space...
+            If you want to showcase a digital map style, we cannot provide screen, but please consider to
+            print some screenshots and a short explanation of the style.
+          </p>
+          <h3 className="mx-auto mt-6 max-w-2xl text-center font-dunbar text-2xl font-medium tracking-tighter text-sotm-blue sm:text-3xl">
+            Submission
+          </h3>
+          <p>Simply write a email to <Link className="font-bold" href="mailto:contact@stateofthemap.eu">
+              contact@stateofthemap.eu
+            </Link> with "map submission" as the object. TODO
+          </p>
+          <h3 className="mx-auto mt-6 max-w-2xl text-center font-dunbar text-2xl font-medium tracking-tighter text-sotm-blue sm:text-3xl">
+            Timeline & Deadlines
+          </h3>
+          <div>
+            <ul className="list-inside list-disc">
+              <li>October 27 at 12:00: Deadline for map submissions</li>
+              <li>November 10-12: State of the Map Europe 2023</li>
+            </ul>
+          </div>
+          {/* <div className="text-center">
+            <Button className="font-bold" target="_blank" href={url}>
+              Submit your presentation
+            </Button>
+          </div> */}
+        </div>
+      </Container>
+    </section>
+  )
+}
diff --git a/src/components/Menu.jsx b/src/components/Menu.jsx
index 6b35415..bdb4f2c 100644
--- a/src/components/Menu.jsx
+++ b/src/components/Menu.jsx
@@ -10,6 +10,7 @@ const navigation = [
   { name: 'About', href: '/' },
   { name: 'Accommodations', href: '/accommodations' },
   { name: 'Schedule', href: '/schedule' },
+  { name: 'Map submission', href: '/call-for-maps' },
 ]
 
 const ticketURL = 'https://pretix.eu/sotm-eu/2023/'
diff --git a/src/pages/call-for-maps.jsx b/src/pages/call-for-maps.jsx
new file mode 100644
index 0000000..7939a41
--- /dev/null
+++ b/src/pages/call-for-maps.jsx
@@ -0,0 +1,24 @@
+import Head from 'next/head'
+
+import { Footer } from '@/components/Footer'
+import { Header } from '@/components/Header'
+import { CallForMaps } from '@/components/CallForMaps'
+
+export default function Page() {
+  return (
+    <>
+      <Head>
+        <title>State of the Map EU 2023 - Call for maps</title>
+        <meta
+          name="description"
+          content="State of the Map EU 2023 is the European conference of OpenStreetMap, organised this year by the OpenStreetMap Belgium community."
+        />
+      </Head>
+      <Header />
+      <main>
+        <CallForMaps id="call-for-maps" />
+      </main>
+      <Footer />
+    </>
+  )
+}

From 18e71a605ea0836e712faf9116dbe30e790abda4 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Tue, 19 Sep 2023 22:05:42 +0200
Subject: [PATCH 2/8] CallForMaps - some corrections

---
 src/components/CallForMaps.jsx | 25 +++++++++++++++----------
 src/components/Menu.jsx        |  2 +-
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/components/CallForMaps.jsx b/src/components/CallForMaps.jsx
index 34adfc2..1f71955 100644
--- a/src/components/CallForMaps.jsx
+++ b/src/components/CallForMaps.jsx
@@ -16,16 +16,14 @@ export function CallForMaps({ id }) {
           </h3>
           <p>
           A SOTM conference would not be complete without a map exhibition! So at this SOTM-Europe,
-          you can submit a map, or a poster, to be exhibited during the conference. We are looking for
+          you can submit a map to be exhibited during the conference. We are looking for
           beautiful maps made of OSM data. You may either show to the community how well is mapped your
-          place or showcase a new map style. You can also display a poster about some OSM-related
-          research or process (an achievement within your local community, a use case of re-using OSM
-          data, ...). The only condition is that is should be about OSM.
+          place or showcase a new map style. The only condition is that is should be mainly with OSM data.
           </p>
           <h3 className="mx-auto mt-6 max-w-2xl text-center font-dunbar text-2xl font-medium tracking-tighter text-sotm-blue sm:text-3xl">
             Guidelines
           </h3>
-          <p>We'd like to receive posters in the A0 format. The SOTM team can print it for the conference
+          <p>We'd like to receive maps in the A0 format. The SOTM team can print it for the conference
             venue. However, you can also print it yourself and bring a printed copy at the conference. In
             this case, other format than A0 is acceptable as long as it would fit somehow into a A0 space...
             If you want to showcase a digital map style, we cannot provide screen, but please consider to
@@ -34,16 +32,23 @@ export function CallForMaps({ id }) {
           <h3 className="mx-auto mt-6 max-w-2xl text-center font-dunbar text-2xl font-medium tracking-tighter text-sotm-blue sm:text-3xl">
             Submission
           </h3>
-          <p>Simply write a email to <Link className="font-bold" href="mailto:contact@stateofthemap.eu">
-              contact@stateofthemap.eu
-            </Link> with "map submission" as the object. TODO
+          <p>Simply write a email to <Link className="font-bold" href="mailto:maps@stateofthemap.eu">
+              maps@stateofthemap.eu
+            </Link> with "map submission" as the object, with
+            <ul className="list-inside list-disc">
+              <li>a link to download the map,</li>
+              <li>whether you'll bring your map or if you ask us to print it. </li>
+              <li>a title</li>
+              <li>name(s) of author(s)</li>
+              <li>and a short description (max. 10 lines)</li>
+            </ul>
           </p>
           <h3 className="mx-auto mt-6 max-w-2xl text-center font-dunbar text-2xl font-medium tracking-tighter text-sotm-blue sm:text-3xl">
-            Timeline & Deadlines
+            Deadline
           </h3>
           <div>
             <ul className="list-inside list-disc">
-              <li>October 27 at 12:00: Deadline for map submissions</li>
+              <li>October 18 at 12:00 GMT: Deadline for map submission</li>
               <li>November 10-12: State of the Map Europe 2023</li>
             </ul>
           </div>
diff --git a/src/components/Menu.jsx b/src/components/Menu.jsx
index bdb4f2c..5a35eb5 100644
--- a/src/components/Menu.jsx
+++ b/src/components/Menu.jsx
@@ -10,7 +10,6 @@ const navigation = [
   { name: 'About', href: '/' },
   { name: 'Accommodations', href: '/accommodations' },
   { name: 'Schedule', href: '/schedule' },
-  { name: 'Map submission', href: '/call-for-maps' },
 ]
 
 const ticketURL = 'https://pretix.eu/sotm-eu/2023/'
@@ -50,6 +49,7 @@ export function Menu() {
           <Button href={ticketURL} target="_blank">
             Get your tickets
           </Button>
+          <Button href="/call-for-maps">Call for maps</Button>
         </div>
         <div className="flex lg:hidden">
           <button

From 8c63dba1a69631b7183d4f700f14df07ae298e5c Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 25 Sep 2023 13:13:57 +0200
Subject: [PATCH 3/8] Call for maps: corrections from Marjan

---
 src/components/CallForMaps.jsx | 30 +++++++++++++-----------------
 src/components/Menu.jsx        |  2 +-
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/components/CallForMaps.jsx b/src/components/CallForMaps.jsx
index 1f71955..3d2bacb 100644
--- a/src/components/CallForMaps.jsx
+++ b/src/components/CallForMaps.jsx
@@ -15,32 +15,27 @@ export function CallForMaps({ id }) {
             Submit your map
           </h3>
           <p>
-          A SOTM conference would not be complete without a map exhibition! So at this SOTM-Europe,
-          you can submit a map to be exhibited during the conference. We are looking for
-          beautiful maps made of OSM data. You may either show to the community how well is mapped your
-          place or showcase a new map style. The only condition is that is should be mainly with OSM data.
+          A State of the Map conference would not be complete without maps! That is why you are invited to showcase your maps at State of the Map Europe. We welcome you to submit beautiful maps made of OSM data. You could demonstrate to the community how well your area is mapped, show a new map style... Everything is possible in our map exhibition. The only condition is that your map is mainly based on OSM data.
           </p>
           <h3 className="mx-auto mt-6 max-w-2xl text-center font-dunbar text-2xl font-medium tracking-tighter text-sotm-blue sm:text-3xl">
-            Guidelines
+            Map Requirements
           </h3>
-          <p>We'd like to receive maps in the A0 format. The SOTM team can print it for the conference
-            venue. However, you can also print it yourself and bring a printed copy at the conference. In
-            this case, other format than A0 is acceptable as long as it would fit somehow into a A0 space...
-            If you want to showcase a digital map style, we cannot provide screen, but please consider to
-            print some screenshots and a short explanation of the style.
+          <p>Please submit an A1-sized PDF map in high resolution. We will print and display it in the conference venue. If you already have a printed copy of your submitted map, you may take it with you to the conference, but make sure it does not exceed A1 size. If you want to showcase a digital map style, we cannot provide a screen, but please consider submitting screenshots and a short explanation of the style.
+
+          Note that if the number of maps we receive is larger than the space available, we will make a selection.
           </p>
           <h3 className="mx-auto mt-6 max-w-2xl text-center font-dunbar text-2xl font-medium tracking-tighter text-sotm-blue sm:text-3xl">
-            Submission
+            Submission Guidelines
           </h3>
           <p>Simply write a email to <Link className="font-bold" href="mailto:maps@stateofthemap.eu">
               maps@stateofthemap.eu
-            </Link> with "map submission" as the object, with
+            </Link> with "Map Submission" as the subject, containing the following information:
             <ul className="list-inside list-disc">
-              <li>a link to download the map,</li>
-              <li>whether you'll bring your map or if you ask us to print it. </li>
-              <li>a title</li>
-              <li>name(s) of author(s)</li>
-              <li>and a short description (max. 10 lines)</li>
+              <li>The map or a link to download it</li>
+              <li>A title for your map</li>
+              <li>The name(s) of author(s)</li>
+              <li>A short description (max. 250 words)</li>
+              <li>Whether you will bring the map or want us to print it</li>
             </ul>
           </p>
           <h3 className="mx-auto mt-6 max-w-2xl text-center font-dunbar text-2xl font-medium tracking-tighter text-sotm-blue sm:text-3xl">
@@ -48,6 +43,7 @@ export function CallForMaps({ id }) {
           </h3>
           <div>
             <ul className="list-inside list-disc">
+              <li>September 25: Call for maps open</li>
               <li>October 18 at 12:00 GMT: Deadline for map submission</li>
               <li>November 10-12: State of the Map Europe 2023</li>
             </ul>
diff --git a/src/components/Menu.jsx b/src/components/Menu.jsx
index a671068..e07ec2a 100644
--- a/src/components/Menu.jsx
+++ b/src/components/Menu.jsx
@@ -49,7 +49,7 @@ export function Menu() {
           <Button href={ticketURL} target="_blank">
             Get your tickets
           </Button>
-          <Button href="/call-for-maps">Call for maps</Button>
+          <Button href="/call-for-maps">Submit your maps</Button>
         </div>
         <div className="flex lg:hidden">
           <button

From 4409c16a53bf74c34c80bb5b61d9eae8ddb03f0c Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 25 Sep 2023 13:19:48 +0200
Subject: [PATCH 4/8] Call for maps: corrections in html structure and typing

---
 src/components/CallForMaps.jsx | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/components/CallForMaps.jsx b/src/components/CallForMaps.jsx
index 3d2bacb..ee5af7a 100644
--- a/src/components/CallForMaps.jsx
+++ b/src/components/CallForMaps.jsx
@@ -29,15 +29,16 @@ export function CallForMaps({ id }) {
           </h3>
           <p>Simply write a email to <Link className="font-bold" href="mailto:maps@stateofthemap.eu">
               maps@stateofthemap.eu
-            </Link> with "Map Submission" as the subject, containing the following information:
-            <ul className="list-inside list-disc">
-              <li>The map or a link to download it</li>
-              <li>A title for your map</li>
-              <li>The name(s) of author(s)</li>
-              <li>A short description (max. 250 words)</li>
-              <li>Whether you will bring the map or want us to print it</li>
-            </ul>
+            </Link> with &quot;Map Submission&quot; as the subject, containing the following information:
           </p>
+          <ul className="list-inside list-disc">
+            <li>The map or a link to download it</li>
+            <li>A title for your map</li>
+            <li>The name(s) of author(s)</li>
+            <li>A short description (max. 250 words)</li>
+            <li>Whether you will bring the map or want us to print it</li>
+          </ul>
+
           <h3 className="mx-auto mt-6 max-w-2xl text-center font-dunbar text-2xl font-medium tracking-tighter text-sotm-blue sm:text-3xl">
             Deadline
           </h3>

From 6705da82c0c196621926421b7f69c3db28f6f5d1 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 25 Sep 2023 21:13:03 +0200
Subject: [PATCH 5/8] Call for maps: add mobile support

---
 src/components/Hero.jsx | 5 ++++-
 src/components/Menu.jsx | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/Hero.jsx b/src/components/Hero.jsx
index fed7411..b6f4a41 100644
--- a/src/components/Hero.jsx
+++ b/src/components/Hero.jsx
@@ -1,5 +1,5 @@
 import Image from 'next/image'
-
+import { Button } from '@/components/Button'
 import { Container } from '@/components/Container'
 import Logo from '@/images/logos/SOTM_Blue_full_logo_black.png'
 
@@ -43,6 +43,9 @@ export function Hero({ id }) {
               </div>
             ))}
           </dl>
+          <div className="mt-20 text-center lg:hidden">
+            <Button href="/call-for-maps">Submit your maps</Button>
+          </div>
         </div>
       </Container>
     </div>
diff --git a/src/components/Menu.jsx b/src/components/Menu.jsx
index e07ec2a..73c0d13 100644
--- a/src/components/Menu.jsx
+++ b/src/components/Menu.jsx
@@ -49,7 +49,7 @@ export function Menu() {
           <Button href={ticketURL} target="_blank">
             Get your tickets
           </Button>
-          <Button href="/call-for-maps">Submit your maps</Button>
+          <Button className="hidden lg:block" href="/call-for-maps">Submit your maps</Button>
         </div>
         <div className="flex lg:hidden">
           <button
@@ -110,6 +110,12 @@ export function Menu() {
                 >
                   Get your tickets
                 </Link>
+                <Link
+                  href="/call-for-maps"
+                  className="-mx-3 block rounded-lg px-3 py-2.5 text-base font-semibold leading-7 text-gray-900 hover:bg-gray-50"
+                >
+                  Submit your maps
+                </Link>
               </div>
             </div>
           </div>

From 2b29b299310e9b60933691922ae814bff5695281 Mon Sep 17 00:00:00 2001
From: nobohan <juminet@gmail.com>
Date: Mon, 25 Sep 2023 21:19:19 +0200
Subject: [PATCH 6/8] Call for maps -prettier

---
 src/components/CallForMaps.jsx | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/components/CallForMaps.jsx b/src/components/CallForMaps.jsx
index ee5af7a..bfd388e 100644
--- a/src/components/CallForMaps.jsx
+++ b/src/components/CallForMaps.jsx
@@ -2,7 +2,6 @@ import Link from 'next/link'
 import { Container } from '@/components/Container'
 
 export function CallForMaps({ id }) {
-
   return (
     <section id={id} aria-label="CallForMaps" className="py-20 sm:py-32">
       <Container>
@@ -15,21 +14,37 @@ export function CallForMaps({ id }) {
             Submit your map
           </h3>
           <p>
-          A State of the Map conference would not be complete without maps! That is why you are invited to showcase your maps at State of the Map Europe. We welcome you to submit beautiful maps made of OSM data. You could demonstrate to the community how well your area is mapped, show a new map style... Everything is possible in our map exhibition. The only condition is that your map is mainly based on OSM data.
+            A State of the Map conference would not be complete without maps!
+            That is why you are invited to showcase your maps at State of the
+            Map Europe. We welcome you to submit beautiful maps made of OSM
+            data. You could demonstrate to the community how well your area is
+            mapped, show a new map style... Everything is possible in our map
+            exhibition. The only condition is that your map is mainly based on
+            OSM data.
           </p>
           <h3 className="mx-auto mt-6 max-w-2xl text-center font-dunbar text-2xl font-medium tracking-tighter text-sotm-blue sm:text-3xl">
             Map Requirements
           </h3>
-          <p>Please submit an A1-sized PDF map in high resolution. We will print and display it in the conference venue. If you already have a printed copy of your submitted map, you may take it with you to the conference, but make sure it does not exceed A1 size. If you want to showcase a digital map style, we cannot provide a screen, but please consider submitting screenshots and a short explanation of the style.
-
-          Note that if the number of maps we receive is larger than the space available, we will make a selection.
+          <p>
+            Please submit an A1-sized PDF map in high resolution. We will print
+            and display it in the conference venue. If you already have a
+            printed copy of your submitted map, you may take it with you to the
+            conference, but make sure it does not exceed A1 size. If you want to
+            showcase a digital map style, we cannot provide a screen, but please
+            consider submitting screenshots and a short explanation of the
+            style. Note that if the number of maps we receive is larger than the
+            space available, we will make a selection.
           </p>
           <h3 className="mx-auto mt-6 max-w-2xl text-center font-dunbar text-2xl font-medium tracking-tighter text-sotm-blue sm:text-3xl">
             Submission Guidelines
           </h3>
-          <p>Simply write a email to <Link className="font-bold" href="mailto:maps@stateofthemap.eu">
+          <p>
+            Simply write a email to{' '}
+            <Link className="font-bold" href="mailto:maps@stateofthemap.eu">
               maps@stateofthemap.eu
-            </Link> with &quot;Map Submission&quot; as the subject, containing the following information:
+            </Link>{' '}
+            with &quot;Map Submission&quot; as the subject, containing the
+            following information:
           </p>
           <ul className="list-inside list-disc">
             <li>The map or a link to download it</li>

From d1acd2200c8557b76a1f00f6b82ba991f2a58e22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonathan=20Beli=C3=ABn?= <dev@jbelien.be>
Date: Tue, 26 Sep 2023 15:24:35 +0200
Subject: [PATCH 7/8] Apply Prettier fixes

---
 src/components/Accommodations.jsx | 4 +++-
 src/components/Menu.jsx           | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/Accommodations.jsx b/src/components/Accommodations.jsx
index da1131f..bb27325 100644
--- a/src/components/Accommodations.jsx
+++ b/src/components/Accommodations.jsx
@@ -83,7 +83,9 @@ export function Accommodations({ id }) {
                   <div>
                     <p className="leading-6">Discount:</p>
                     <p className="mt-1 whitespace-pre-line leading-5">
-                      <ReactMarkdown linkTarget="_blank">{accommodation.discount}</ReactMarkdown>
+                      <ReactMarkdown linkTarget="_blank">
+                        {accommodation.discount}
+                      </ReactMarkdown>
                     </p>
                   </div>
                 </div>
diff --git a/src/components/Menu.jsx b/src/components/Menu.jsx
index 73c0d13..d1e6daf 100644
--- a/src/components/Menu.jsx
+++ b/src/components/Menu.jsx
@@ -49,7 +49,9 @@ export function Menu() {
           <Button href={ticketURL} target="_blank">
             Get your tickets
           </Button>
-          <Button className="hidden lg:block" href="/call-for-maps">Submit your maps</Button>
+          <Button className="hidden lg:block" href="/call-for-maps">
+            Submit your maps
+          </Button>
         </div>
         <div className="flex lg:hidden">
           <button

From 31fdd6295a15e1b25a61d7273f65124727addb26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonathan=20Beli=C3=ABn?= <dev@jbelien.be>
Date: Tue, 26 Sep 2023 15:25:17 +0200
Subject: [PATCH 8/8] Update deadline in call for maps

See https://github.com/osmbe/sotm-eu-2023/pull/119#issuecomment-1734338275
---
 src/components/CallForMaps.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/CallForMaps.jsx b/src/components/CallForMaps.jsx
index bfd388e..d474226 100644
--- a/src/components/CallForMaps.jsx
+++ b/src/components/CallForMaps.jsx
@@ -59,7 +59,7 @@ export function CallForMaps({ id }) {
           </h3>
           <div>
             <ul className="list-inside list-disc">
-              <li>September 25: Call for maps open</li>
+              <li>September 26: Call for maps open</li>
               <li>October 18 at 12:00 GMT: Deadline for map submission</li>
               <li>November 10-12: State of the Map Europe 2023</li>
             </ul>