Skip to content

Commit e53a8cd

Browse files
rayriffyrayriffy
committed
chore: staged changes
1 parent fc59563 commit e53a8cd

File tree

10 files changed

+116
-42
lines changed

10 files changed

+116
-42
lines changed

‎src/packlets/front/center.astro‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
<h1 class="z-40 select-none text-9xl font-bold">JS</h1>
2-
<h2 class="z-40 select-none text-4xl font-semibold">Bangkok</h2>
2+
<h2 class="z-40 select-none text-3xl font-semibold">Bangkok 2.0.0</h2>
3+
<h3 class="z-40 select-none text-xl">October 18 - 19, 2024</h3>

‎src/packlets/front/conference.astro‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<section class="bg-เหล็กไหล text-white">
2+
<h1>Conference</h1>
3+
<div id="map-conf" class="h-80"></div>
4+
</section>
5+
6+
<script>
7+
window.addEventListener('load', function () {
8+
mapkit.init({
9+
authorizationCallback: done => {
10+
fetch('https://api.rayriffy.com/appleMaps/token')
11+
.then(res => res.text())
12+
.then(done)
13+
},
14+
language: 'en',
15+
})
16+
17+
const map = new mapkit.Map('map-conf')
18+
const coordinate = new mapkit.Coordinate(13.6869421, 100.6112208)
19+
const region = new mapkit.CoordinateRegion(
20+
coordinate,
21+
new mapkit.CoordinateSpan(0.1, 0.11)
22+
)
23+
24+
map.cameraZoomRange = new mapkit.CameraZoomRange(250, 75000)
25+
map.region = region
26+
27+
// @ts-expect-error CameraBoundaryDescription.region does not exist in Map
28+
map.cameraBoundary = region
29+
30+
map.showItems([
31+
new mapkit.MarkerAnnotation(coordinate, {
32+
title: 'True Digital Park West',
33+
subtitle: 'Grand Hall, 3rd Fl.',
34+
selected: true,
35+
}),
36+
])
37+
})
38+
</script>

‎src/packlets/front/map.astro‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,13 @@
1212
})
1313

1414
const map = new mapkit.Map('map')
15-
const coordinate = new mapkit.Coordinate(13.6869421, 100.6112208)
15+
16+
const microsoftCoordinate = new mapkit.Coordinate(13.7391678, 100.5476439)
17+
const tdpkCoordinate = new mapkit.Coordinate(13.6869421, 100.6112208)
18+
const centerCoordinate = new mapkit.Coordinate(13.71305495, 100.57943235)
19+
1620
const region = new mapkit.CoordinateRegion(
17-
coordinate,
21+
centerCoordinate,
1822
new mapkit.CoordinateSpan(0.1, 0.11)
1923
)
2024

@@ -25,19 +29,15 @@
2529
map.cameraBoundary = region
2630

2731
map.showItems([
28-
new mapkit.MarkerAnnotation(coordinate, {
32+
new mapkit.MarkerAnnotation(microsoftCoordinate, {
33+
title: 'Microsoft (Thailand) Ltd.',
34+
subtitle: 'All Seasons Place, 37th Fl.',
35+
}),
36+
new mapkit.MarkerAnnotation(tdpkCoordinate, {
2937
title: 'True Digital Park West',
3038
subtitle: 'Grand Hall, 3rd Fl.',
3139
selected: true,
3240
}),
3341
])
3442
})
3543
</script>
36-
37-
<script
38-
src="https://cdn.apple-mapkit.com/mk/5.x.x/mapkit.core.js"
39-
crossorigin
40-
async
41-
data-libraries="services,full-map"
42-
is:inline
43-
slot="body-end"></script>

‎src/packlets/front/schedule.astro‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
11
---
2-
import TBA from './tba.astro'
2+
import ScheduleTabs from '$schedule/tabs.svelte'
33
---
44

5-
<section class="py-12 text-เหล็กไหล">
6-
<h1 class="pb-12 text-center text-4xl font-bold">Schedule</h1>
7-
<TBA />
5+
<section class="bg-เหล็กไหล py-12 text-white">
6+
<h1 class="pb-12 text-center text-5xl font-bold">Schedule</h1>
7+
<div class="space-y-4 text-center">
8+
<div>
9+
<b class="text-xl">Workshop</b>
10+
<p class="space-x-2 text-lg">
11+
<span>Friday, October 18, 2024</span>
12+
<span></span>
13+
</p>
14+
</div>
15+
<div>
16+
<b class="text-xl">Conference</b>
17+
<p class="space-x-2 text-lg">
18+
<span>Saturday, October 19, 2024</span>
19+
<span>8:30 Door open / 9:00 Start</span>
20+
</p>
21+
</div>
22+
</div>
823
</section>

‎src/packlets/front/speaker.astro‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<article class="flex rounded-xl bg-ขาวผ่อง px-4 py-6 text-เหล็กไหล">
1+
<article class="flex rounded-xl bg-white px-4 py-6 text-เหล็กไหล">
22
<div class="shrink-0">
33
<div class="aspect-square w-24 rounded-full bg-green-400"></div>
44
</div>

‎src/packlets/front/speakers.astro‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import Speaker from './speaker.astro'
33
import TBA from './tba.astro'
44
---
55

6-
<section class="bg-เหล็กไหล py-12 text-white">
7-
<h1 class="pb-12 text-center text-4xl font-bold">Speakers</h1>
6+
<section class="py-12 text-เหล็กไหล">
7+
<h1 class="pb-12 text-center text-5xl font-bold">Speakers</h1>
88
<TBA>
99
<div class="mx-auto grid max-w-4xl gap-4 px-4 md:grid-cols-2">
1010
<Speaker />

‎src/packlets/front/sponsors.astro‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import odds from '$assets/odds.svg'
55
import tdpk from '$assets/tdpk.svg'
66
---
77

8-
<section class="bg-เหล็กไหล py-12 text-white">
8+
<section class="py-12 text-เหล็กไหล">
99
<div class="pb-12 text-center">
10-
<h1 class="pb-6 text-4xl font-bold">Sponsors</h1>
10+
<h1 class="pb-6 text-5xl font-bold">Sponsors</h1>
1111
<p>
1212
JavaScript Bangkok would like to thank our sponsors for their kind
1313
contributions.
@@ -18,19 +18,19 @@ import tdpk from '$assets/tdpk.svg'
1818
</p>
1919
</div>
2020
<ul class="mx-auto max-w-4xl space-y-6 px-4">
21-
<li class="rounded-xl bg-ขาวผ่อง px-8 py-6 text-เหล็กไหล">
21+
<li class="rounded-xl bg-white px-8 py-6 text-เหล็กไหล">
2222
<h2 class="pb-4 text-2xl font-bold">Platinum</h2>
2323
<div class="flex flex-wrap justify-center gap-6">
2424
<Image src={odds} alt="ODDS" />
2525
</div>
2626
</li>
27-
<li class="rounded-xl bg-ขาวผ่อง px-8 py-6 text-เหล็กไหล">
27+
<li class="rounded-xl bg-white px-8 py-6 text-เหล็กไหล">
2828
<h2 class="pb-4 text-2xl font-bold">Gold</h2>
2929
<div class="flex flex-wrap justify-center gap-6">
3030
<Image src={tdpk} alt="True Digital Park" />
3131
</div>
3232
</li>
33-
<li class="rounded-xl bg-ขาวผ่อง px-8 py-6 text-เหล็กไหล">
33+
<li class="rounded-xl bg-white px-8 py-6 text-เหล็กไหล">
3434
<h2 class="pb-4 text-2xl font-bold">Silver</h2>
3535
<div class="flex flex-wrap justify-center gap-6">
3636
<p class="px-4 text-center">Sponsorship slot available!</p>

‎src/packlets/playground/date.svelte‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,18 @@
22
import { draggable } from '@neodrag/svelte'
33
</script>
44

5-
<p
6-
class="absolute left-8 top-8 z-[41] cursor-grab select-none rounded bg-ม่วงคราม px-4 py-1 text-xl font-medium text-ขาวผ่อง"
5+
<div
6+
class="absolute left-8 top-8 z-[41] cursor-grab select-none rounded bg-ม่วงคราม px-4 py-1.5 text-xl font-medium text-ขาวผ่อง"
77
use:draggable={{ bounds: 'body' }}
88
>
9-
Sat, 19th October 2024
10-
</p>
9+
<p>October 18, 2024</p>
10+
<p>Microsoft (Thailand) Ltd.</p>
11+
</div>
12+
13+
<div
14+
class="absolute bottom-8 left-8 z-[41] cursor-grab select-none rounded bg-ม่วงคราม px-4 py-1.5 text-xl font-medium text-ขาวผ่อง"
15+
use:draggable={{ bounds: 'body' }}
16+
>
17+
<p>October 19, 2024</p>
18+
<p>True Digital Park West</p>
19+
</div>

‎src/packlets/playground/location.svelte‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎src/pages/index.astro‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,44 @@ import Base from '$layouts/base.astro'
33
44
import Center from '$front/center.astro'
55
import Schedule from '$front/schedule.astro'
6+
import Conference from '$front/conference.astro'
67
import Map from '$front/map.astro'
78
import Sponsors from '$front/sponsors.astro'
89
import Speakers from '$front/speakers.astro'
910
1011
import Playground from '$playground/playground.svelte'
11-
import Date from '$playground/date.svelte'
12-
import Location from '$playground/location.svelte'
1312
---
1413

1514
<Base title="JavaScript Bangkok 2.0.0">
1615
<Playground client:idle>
17-
<Date client:idle />
18-
<Location client:idle />
1916
<Center />
2017
</Playground>
18+
<section
19+
class="grid grid-cols-1 gap-8 bg-เหล็กไหล px-8 py-12 text-white md:grid-cols-2"
20+
>
21+
<div class="text-center font-bold">
22+
<h1 class="text-xl">Day 1</h1>
23+
<h2 class="text-4xl">Workshop</h2>
24+
<h3 class="text-xl">(Fri) October 18, 2024</h3>
25+
<p class="pt-4 text-lg font-normal">Microsoft (Thailand) Ltd.</p>
26+
</div>
27+
<div class="text-center font-bold">
28+
<h1 class="text-xl">Day 2</h1>
29+
<h2 class="text-4xl">Conference</h2>
30+
<h3 class="text-xl">(Sat) October 19, 2024</h3>
31+
<p class="pt-4 text-lg font-normal">True Digital Park West</p>
32+
</div>
33+
</section>
2134
<Map />
2235
<Speakers />
2336
<Schedule />
2437
<Sponsors />
38+
39+
<script
40+
src="https://cdn.apple-mapkit.com/mk/5.x.x/mapkit.core.js"
41+
crossorigin
42+
async
43+
data-libraries="services,full-map"
44+
is:inline
45+
slot="body-end"></script>
2546
</Base>

0 commit comments

Comments
 (0)