Feature/add scientific track (#149)

* add all scientific track in one table. leave the rest for later * fix prettier * fix * Remove Crowne Plaza Antwerp Remove Submit your maps Button Remove comments * Add automatic overflow to tables. run prettier.
osmbe · Oct 24, 2023 · b42bb73 · b42bb73
1 parent 5d20456
commit b42bb73
Show file tree

Hide file tree

Showing 7 changed files with 630 additions and 472 deletions.
diff --git a/src/components/Accommodations.jsx b/src/components/Accommodations.jsx
@@ -23,19 +23,6 @@ const accommodations = [
     distance: 2.7,
     osm: 'https://www.openstreetmap.org/node/7282987029',
   },
-  {
-    name: 'Crowne Plaza Antwerp',
-    address: 'Gerard le Grellelaan 10, 2020 Antwerpen',
-    phone: '+32 (0)3 259 75 00',
-    discount:
-      'Fixed price\r\n' +
-      '&bull; Guests can reserve a room through [this link](https://www.ihg.com/crowneplaza/hotels/us/en/antwerp/anrbe/hoteldetail?fromRedirect=true&qSrt=sBR&qIta=99801505&icdv=99801505&qSlH=anrbe&qGrpCd=T10&setPMCookies=true&qSHBrC=CP&qDest=Gerard%20Legrellelaan%2010%2C%20Antwerp%2C%20BE&srb_u=1) by the deadline of 24th October.\r\n' +
-      '&bull; Single standard at 129.00 € per room, per night incl breakfast buffet, all services and V.A.T. + City tax is 2.97 € per person, per night.\r\n' +
-      '&bull; Double standard at 149.00 € per room, per night incl breakfast buffet, all services and V.A.T. + City tax is 2.97 € per person, per night.',
-    url: 'https://www.ihg.com/crowneplaza/hotels/us/en/antwerp/anrbe/hoteldetail?fromRedirect=true&qSrt=sBR&qIta=99801505&icdv=99801505&qSlH=anrbe&qGrpCd=T10&setPMCookies=true&qSHBrC=CP&qDest=Gerard%20Legrellelaan%2010%2C%20Antwerp%2C%20BE&srb_u=1',
-    distance: 2.1,
-    osm: 'https://www.openstreetmap.org/way/58114273',
-  },
 ]
 
 export function Accommodations({ id }) {

diff --git a/src/components/CallForMaps.jsx b/src/components/CallForMaps.jsx
@@ -64,11 +64,6 @@ export function CallForMaps({ id }) {
               <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/CallForPapers.jsx b/src/components/CallForPapers.jsx
@@ -25,11 +25,6 @@ export function CallForPapers({ id }) {
           <p>
             We especially encourage local and regional mappers to participate.
           </p>
-          {/* <div className="text-center">
-            <Button className="mx-auto font-bold" target="_blank" href={url}>
-              Submit your presentation
-            </Button>
-          </div> */}
           <h3 className="mx-auto mt-8 max-w-2xl text-center font-dunbar text-2xl font-medium tracking-tighter text-sotm-blue sm:text-3xl">
             Who should propose a session? You!
           </h3>
@@ -278,11 +273,6 @@ export function CallForPapers({ id }) {
               <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/Hero.jsx b/src/components/Hero.jsx
@@ -43,9 +43,6 @@ 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
@@ -49,9 +49,6 @@ 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>
         </div>
         <div className="flex lg:hidden">
           <button
@@ -112,12 +109,6 @@ 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>

diff --git a/src/components/ProgramTable.jsx b/src/components/ProgramTable.jsx
@@ -2,14 +2,21 @@ import Image from 'next/image'
 import Logo from '@/images/logos/SOTM_Blue_full_logo_black.png'
 import Fountain from '../images/fountain.jpg'
 
-export const YellowCell = ({ title, text, suptitle, rowSpan = 1 }) => (
+export const YellowCell = ({
+  title,
+  text,
+  suptitle,
+  rowSpan = 1,
+  colSpan = 1,
+}) => (
   <td
+    colSpan={colSpan}
     rowSpan={rowSpan}
     className="border border-sotm-yellow bg-sotm-yellow-200 p-2 text-center font-poppins text-sotm-blue"
   >
     <div className="text-xs font-bold">{suptitle}</div>
     <div className="font-bold">{title}</div>
-    <div>{text}</div>
+    <div dangerouslySetInnerHTML={{ __html: text }}></div>
   </td>
 )
 
@@ -22,8 +29,10 @@ export const FourColumnGreyCell = ({ title }) => (
   </td>
 )
 
-export const TimeCell = ({ title }) => (
-  <td className="border bg-sotm-blue py-2 text-white">{title}</td>
+export const TimeCell = ({ title, rowSpan = 1 }) => (
+  <td rowSpan={rowSpan} className="border bg-sotm-blue py-2 text-white">
+    {title}
+  </td>
 )
 
 export const BlueCell = ({ title }) => (
@@ -81,3 +90,43 @@ export const TableHeader = ({ day, date, hasScientificTrack = false }) => (
     </tr>
   </thead>
 )
+
+export const ScientificTrackHeader = ({ date }) => (
+  <thead>
+    <tr>
+      <th
+        style={{ width: 150, padding: 0 }}
+        className="bg-gradient-to-r from-indigo-500 to-blue-300"
+        rowSpan={4}
+      >
+        <Image src={Fountain} width={150} alt="fountain" />
+      </th>
+      <th colSpan={4}>
+        <div className="flex w-full justify-between">
+          <div className="grow">
+            <Image src={Logo} height={80} alt="State of the Map EU 2023" />
+          </div>
+          <div class="text-right">
+            <h3 className="font-dunbar text-3xl font-bold text-sotm-blue sm:text-4xl">
+              Scientific Track
+            </h3>
+            <p className="font-dunbar text-2xl font-medium text-black sm:text-3xl">
+              {date}
+            </p>
+          </div>
+        </div>
+      </th>
+    </tr>
+    <tr>
+      <td
+        className="border border-sotm-yellow bg-gray-100 text-center font-poppins font-bold text-sotm-blue"
+        colSpan={4}
+      >
+        Scientific Session
+      </td>
+    </tr>
+    <tr>
+      <YellowCell colSpan={4} title="Vasco Da Gama" text="Tech Track" />
+    </tr>
+  </thead>
+)
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,9 +43,6 @@ 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>
@@ Expand Down @@