From a77006fcf80bf5d375956c8c16c404c4e1031c5e Mon Sep 17 00:00:00 2001 From: Soroush Date: Tue, 24 Oct 2023 12:39:20 +0200 Subject: [PATCH 1/5] add all scientific track in one table. leave the rest for later --- src/components/ProgramTable.jsx | 57 ++++++++++++- src/components/Schedule.jsx | 136 +++++++++++++++++++++++++++++++- 2 files changed, 188 insertions(+), 5 deletions(-) diff --git a/src/components/ProgramTable.jsx b/src/components/ProgramTable.jsx index a4b31c8..78b51bb 100644 --- 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, +}) => (
{suptitle}
{title}
-
{text}
+
) @@ -22,8 +29,10 @@ export const FourColumnGreyCell = ({ title }) => ( ) -export const TimeCell = ({ title }) => ( - {title} +export const TimeCell = ({ title, rowSpan = 1 }) => ( + + {title} + ) export const BlueCell = ({ title }) => ( @@ -81,3 +90,43 @@ export const TableHeader = ({ day, date, hasScientificTrack = false }) => ( ) + +export const ScientificTrackHeader = ({ date }) => ( + + + + fountain + + +
+
+ State of the Map EU 2023 +
+
+

+ Scientific Track +

+

+ {date} +

+
+
+ + + + + Scientific Session + + + + + + + diff --git a/src/components/Schedule.jsx b/src/components/Schedule.jsx index 6c9ffcb..06eccec 100644 --- a/src/components/Schedule.jsx +++ b/src/components/Schedule.jsx @@ -7,6 +7,7 @@ import { BlueCell, EmptyCell, TableHeader, + ScientificTrackHeader, } from './ProgramTable' export function Schedule({ id }) { @@ -322,7 +323,6 @@ export function Schedule({ id }) { text="by Roland Olbricht" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
) From 72e92cd12b8cd0eac89bedcdc538afff9f7ddd8e Mon Sep 17 00:00:00 2001 From: Soroush Date: Tue, 24 Oct 2023 12:40:24 +0200 Subject: [PATCH 2/5] fix prettier --- src/components/ProgramTable.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ProgramTable.jsx b/src/components/ProgramTable.jsx index 78b51bb..e7aceb6 100644 --- a/src/components/ProgramTable.jsx +++ b/src/components/ProgramTable.jsx @@ -129,4 +129,4 @@ export const ScientificTrackHeader = ({ date }) => ( - + \ No newline at end of file From 7906d747ce93cb897ad68d48d185ebb9a56bfb09 Mon Sep 17 00:00:00 2001 From: Soroush Date: Tue, 24 Oct 2023 12:41:12 +0200 Subject: [PATCH 3/5] fix --- src/components/ProgramTable.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ProgramTable.jsx b/src/components/ProgramTable.jsx index e7aceb6..8983550 100644 --- a/src/components/ProgramTable.jsx +++ b/src/components/ProgramTable.jsx @@ -129,4 +129,4 @@ export const ScientificTrackHeader = ({ date }) => ( - \ No newline at end of file +) From e5b62e77b05a3affd341f780ad0f9e0adf12e7a6 Mon Sep 17 00:00:00 2001 From: Soroush Date: Tue, 24 Oct 2023 16:14:31 +0200 Subject: [PATCH 4/5] Remove Crowne Plaza Antwerp Remove Submit your maps Button Remove comments --- src/components/Accommodations.jsx | 13 ------------- src/components/CallForMaps.jsx | 6 +----- src/components/CallForPapers.jsx | 10 ---------- src/components/Hero.jsx | 3 --- src/components/Menu.jsx | 11 ++--------- 5 files changed, 3 insertions(+), 40 deletions(-) diff --git a/src/components/Accommodations.jsx b/src/components/Accommodations.jsx index 60a7e79..89f5368 100644 --- 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' + - '• 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' + - '• 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' + - '• 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 index d474226..de8cde6 100644 --- a/src/components/CallForMaps.jsx +++ b/src/components/CallForMaps.jsx @@ -64,11 +64,7 @@ export function CallForMaps({ id }) {
  • November 10-12: State of the Map Europe 2023
  • - {/*
    - -
    */} + diff --git a/src/components/CallForPapers.jsx b/src/components/CallForPapers.jsx index b129e4b..344f0e4 100644 --- a/src/components/CallForPapers.jsx +++ b/src/components/CallForPapers.jsx @@ -25,11 +25,6 @@ export function CallForPapers({ id }) {

    We especially encourage local and regional mappers to participate.

    - {/*
    - -
    */}

    Who should propose a session? You!

    @@ -278,11 +273,6 @@ export function CallForPapers({ id }) {
  • November 10-12: State of the Map Europe 2023
  • - {/*
    - -
    */} diff --git a/src/components/Hero.jsx b/src/components/Hero.jsx index b6f4a41..43c7a6a 100644 --- a/src/components/Hero.jsx +++ b/src/components/Hero.jsx @@ -43,9 +43,6 @@ export function Hero({ id }) { ))} -
    - -
    diff --git a/src/components/Menu.jsx b/src/components/Menu.jsx index 818ab08..7822423 100644 --- a/src/components/Menu.jsx +++ b/src/components/Menu.jsx @@ -49,9 +49,7 @@ export function Menu() { - +
    From aaade58e0e8c5cb4975f96eeeb88e4e2aee09939 Mon Sep 17 00:00:00 2001 From: Soroush Date: Tue, 24 Oct 2023 16:22:03 +0200 Subject: [PATCH 5/5] Add automatic overflow to tables. run prettier. --- src/components/CallForMaps.jsx | 1 - src/components/Menu.jsx | 2 - src/components/Schedule.jsx | 1135 ++++++++++++++++---------------- 3 files changed, 575 insertions(+), 563 deletions(-) diff --git a/src/components/CallForMaps.jsx b/src/components/CallForMaps.jsx index de8cde6..8591945 100644 --- a/src/components/CallForMaps.jsx +++ b/src/components/CallForMaps.jsx @@ -64,7 +64,6 @@ export function CallForMaps({ id }) {
  • November 10-12: State of the Map Europe 2023
  • - diff --git a/src/components/Menu.jsx b/src/components/Menu.jsx index 7822423..47cd5e8 100644 --- a/src/components/Menu.jsx +++ b/src/components/Menu.jsx @@ -49,7 +49,6 @@ export function Menu() { -
    diff --git a/src/components/Schedule.jsx b/src/components/Schedule.jsx index 06eccec..609ea46 100644 --- a/src/components/Schedule.jsx +++ b/src/components/Schedule.jsx @@ -18,571 +18,586 @@ export function Schedule({ id }) { The conference will be packed with great talks, workshops and opportunities to meet and network with the OpenStreetMap community.

    - - +
    +
    + - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -

    Mobile Mapping Workshop

    -

    ACTIVE MOVEMENT

    -

    by Andrew Hain

    -

    - Antwerp Berchem Station Meeting Point -

    -
    - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +

    Mobile Mapping Workshop

    +

    ACTIVE MOVEMENT

    +

    by Andrew Hain

    +

    + Antwerp Berchem Station Meeting Point +

    +
    + +
    + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    +
    + {' '} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    +
    + {' '} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    +
    + {' '} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    )