Skip to content

Commit

Permalink
Merge branch 'main' into feature/create-program-day-table
Browse files Browse the repository at this point in the history
  • Loading branch information
soroushowji-tomtom committed Oct 11, 2023
2 parents 61a86ef + 22de567 commit 49440be
Show file tree
Hide file tree
Showing 12 changed files with 3,050 additions and 612 deletions.
3,490 changes: 2,901 additions & 589 deletions package-lock.json

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,21 @@
"dependencies": {
"@headlessui/react": "^1.7.17",
"@heroicons/react": "^2.0.18",
"autoprefixer": "^10.4.15",
"autoprefixer": "^10.4.16",
"clsx": "^2.0.0",
"focus-visible": "^5.2.0",
"next": "13.4.19",
"next": "13.5.4",
"postcss-focus-visible": "^9.0.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-markdown": "^9.0.0",
"tailwindcss": "^3.3.3"
},
"devDependencies": {
"eslint": "8.49.0",
"eslint-config-next": "13.4.19",
"eslint": "8.51.0",
"eslint-config-next": "13.5.4",
"prettier": "^3.0.3",
"prettier-plugin-tailwindcss": "^0.5.4",
"prettier-plugin-tailwindcss": "^0.5.5",
"sharp": "^0.32.6"
}
}
21 changes: 12 additions & 9 deletions src/components/Accommodations.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Container } from '@/components/Container'
import Link from 'next/link'
import ReactMarkdown from 'react-markdown'
import { Container } from '@/components/Container'

const accommodations = [
{
Expand All @@ -20,18 +21,18 @@ const accommodations = [
'Enjoy a 15% discount on the booking rate by emailing [email protected] and mentioning that you\'re attending the event "State of the Map".',
url: 'https://www.vandervalkantwerpen.be/en',
distance: 2.7,
osm: 'https://www.openstreetmap.org/way/46246193',
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 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.crowneplaza.com/redirect?path=hd&brandCode=CP&localeCode=en&regionCode=1&hotelCode=anrbe&_PMID=99801505&GPC=T10&cn=no&viewfullsite=true',
'• 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',
},
Expand All @@ -55,7 +56,7 @@ export function Accommodations({ id }) {
{accommodations.map((accommodation) => (
<li
key={accommodation.name}
className="flex justify-between py-5"
className="flex flex-col justify-between py-5 sm:flex-row"
>
<div className="pr-6 sm:w-1/2 sm:flex-none">
<Link
Expand All @@ -79,10 +80,12 @@ export function Accommodations({ id }) {
</p>
</div>
<div className="flex items-center justify-between gap-x-4 sm:w-1/2 sm:flex-none">
<div className="hidden sm:block">
<div>
<p className="leading-6">Discount:</p>
<p className="mt-1 whitespace-pre-line leading-5">
{accommodation.discount}
<ReactMarkdown linkTarget="_blank">
{accommodation.discount}
</ReactMarkdown>
</p>
</div>
</div>
Expand Down
76 changes: 76 additions & 0 deletions src/components/CallForMaps.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
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 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>
<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:[email protected]">
[email protected]
</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>
<div>
<ul className="list-inside list-disc">
<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>
</div>
{/* <div className="text-center">
<Button className="font-bold" target="_blank" href={url}>
Submit your presentation
</Button>
</div> */}
</div>
</Container>
</section>
)
}
1 change: 1 addition & 0 deletions src/components/CallForPapers.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ export function CallForPapers({ id }) {
<li>Julien Minet</li>
<li>Lorenzo Stucchi</li>
<li>Stefan Keller</li>
<li>Manfred Stock</li>
</ul>
</div>
<div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Menu } from '@/components/Menu'
export function Header() {
return (
<header>
<div className="relative z-50 flex-none lg:pt-11">
<div className="relative flex-none lg:pt-11">
<div className="mx-auto flex max-w-7xl flex-wrap items-center justify-center px-4 sm:justify-between sm:px-6 lg:flex-nowrap lg:px-8">
<div className="order-first -mx-4 flex flex-auto basis-full overflow-x-auto whitespace-nowrap border-b border-blue-600/10 py-4 font-mono text-sotm-blue sm:-mx-6 lg:order-none lg:mx-0 lg:basis-auto lg:border-0 lg:py-0">
<div className="mx-auto flex items-center gap-4 px-4">
Expand Down
5 changes: 4 additions & 1 deletion src/components/Hero.jsx
Original file line number Diff line number Diff line change
@@ -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'

Expand Down Expand Up @@ -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>
Expand Down
10 changes: 10 additions & 0 deletions src/components/Menu.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +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>
</div>
<div className="flex lg:hidden">
<button
Expand Down Expand Up @@ -93,6 +96,7 @@ export function Menu() {
<div className="space-y-2 py-6">
{navigation.map((item) => (
<Link
onClick={() => setMobileMenuOpen(false)}
key={item.name}
href={item.href}
className="-mx-3 block rounded-lg px-3 py-2 text-base font-semibold leading-7 text-gray-900 hover:bg-gray-50"
Expand All @@ -108,6 +112,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>
Expand Down
22 changes: 15 additions & 7 deletions src/components/Sponsors.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import logoMapbox from '@/images/sponsors/mapbox.svg'
import logoHere from '@/images/sponsors/here.svg'
import logoGeofabrik from '@/images/sponsors/geofabrik.png'
import logoOverture from '@/images/sponsors/overture.png'
import logNgi from '@/images/sponsors/ngi.png'
import logoNgi from '@/images/sponsors/ngi.png'
import logoGeoPostcodes from '@/images/sponsors/geopostcodes.jpg'

const platinum = [{ name: 'TomTom', logo: logoTomTom }]

Expand All @@ -29,6 +30,7 @@ const supporter = [
{ name: 'GIM', website: 'https://www.gim.be/nl' },
{ name: 'Geo-6', website: 'https://geo6.be/en/' },
{ name: 'Nazka Mapps', website: 'https://www.nazka.be/' },
{ name: 'Geoapify', website: 'https://www.geoapify.com/' },
]

const gold = [
Expand Down Expand Up @@ -56,7 +58,7 @@ const silver = [
},
{
name: 'IGN-NGI',
logo: logNgi,
logo: logoNgi,
website: 'https://www.ngi.be/website/',
width: 350,
},
Expand All @@ -66,14 +68,20 @@ const bronze = [
{
name: 'HERE',
logo: logoHere,
width: 100,
website: 'https://www.here.com/',
width: 100,
},
{
name: 'Geofabrik',
logo: logoGeofabrik,
width: 160,
website: 'https://www.geofabrik.de/',
width: 160,
},
{
name: 'GeoPostcodes',
logo: logoGeoPostcodes,
website: 'https://www.geopostcodes.com/',
width: 200,
},
]

Expand Down Expand Up @@ -174,7 +182,7 @@ export function Sponsors({ id }) {
<h3 className="text-1xl mx-auto max-w-2xl pt-8 text-center font-dunbar font-semibold tracking-tight text-sotm-blue">
Bronze
</h3>
<div className="mx-auto mt-8 grid max-w-max grid-cols-1 place-content-center gap-x-32 gap-y-12 sm:grid-cols-2 md:gap-x-16 lg:gap-x-32">
<div className="mx-auto mt-8 grid max-w-max grid-cols-1 place-content-center gap-x-32 gap-y-12 sm:grid-cols-3 md:gap-x-16 lg:gap-x-32">
{bronze.map((sponsor) => (
<div
key={sponsor.name}
Expand Down Expand Up @@ -229,8 +237,8 @@ export function Sponsors({ id }) {
))}
</div>
<div className="mx-auto max-w-2xl pt-8 text-center font-dunbar font-semibold tracking-tight text-sotm-blue">
TomTom has supported this conference from the beginning as an
organizing partner in collaboration with OpenStreetMap Belgium.
TomTom has supported this conference from the beginning as a
production partner in collaboration with OpenStreetMap Belgium.
</div>
{/* <h3 className="mx-auto max-w-2xl text-center font-dunbar text-2xl font-semibold tracking-tight text-sotm-blue pt-8">
Some of the past State of the Map sponsors
Expand Down
Binary file added src/images/SOTM_EU_Program.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/sponsors/geopostcodes.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions src/pages/call-for-maps.jsx
Original file line number Diff line number Diff line change
@@ -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 />
</>
)
}

0 comments on commit 49440be

Please sign in to comment.