Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/efdevcon/monorepo
Browse files Browse the repository at this point in the history
  • Loading branch information
lassejaco committed Oct 29, 2024
2 parents 0d62f89 + 9cccdfe commit e671d9f
Show file tree
Hide file tree
Showing 618 changed files with 4,483 additions and 838 deletions.
20 changes: 19 additions & 1 deletion devcon-api/data/events/devcon-7.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,24 @@
"venue_address": "60 Ratchadaphisek Rd, Khlong Toei, Bangkok 10110, Thailand",
"venue_website": "https://www.qsncc.com/",
"venue_directions": "https://maps.app.goo.gl/XLGaN7B9zViAe3DB6",
"rooms": [],
"rooms": [
"music-stage",
"classroom-a",
"classroom-b",
"classroom-c",
"classroom-d",
"classroom-e",
"breakout-1",
"breakout-2",
"breakout-3",
"stage-1",
"stage-2",
"stage-3",
"stage-4",
"stage-5",
"stage-6",
"main-stage",
"keynote"
],
"version": "0"
}
2 changes: 1 addition & 1 deletion devcon-api/data/rooms/devcon-7/breakout-1.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "breakout-1",
"name": "BREAKOUT 1",
"name": "Breakout 1",
"description": "",
"info": "",
"capacity": 100
Expand Down
2 changes: 1 addition & 1 deletion devcon-api/data/rooms/devcon-7/breakout-2.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "breakout-2",
"name": "BREAKOUT 2",
"name": "Breakout 2",
"description": "",
"info": "",
"capacity": 100
Expand Down
2 changes: 1 addition & 1 deletion devcon-api/data/rooms/devcon-7/breakout-3.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "breakout-3",
"name": "BREAKOUT 3",
"name": "Breakout 3",
"description": "Classroom for Community-Led-Sessions",
"info": "",
"capacity": 300
Expand Down
2 changes: 1 addition & 1 deletion devcon-api/data/rooms/devcon-7/classroom-a.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "classroom-a",
"name": "CLASSROOM A",
"name": "Classroom A",
"description": "",
"info": "",
"capacity": 172
Expand Down
2 changes: 1 addition & 1 deletion devcon-api/data/rooms/devcon-7/classroom-b.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "classroom-b",
"name": "CLASSROOM B",
"name": "Classroom B",
"description": "",
"info": "",
"capacity": 172
Expand Down
2 changes: 1 addition & 1 deletion devcon-api/data/rooms/devcon-7/classroom-c.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "classroom-c",
"name": "CLASSROOM C",
"name": "Classroom C",
"description": "",
"info": "",
"capacity": 150
Expand Down
2 changes: 1 addition & 1 deletion devcon-api/data/rooms/devcon-7/classroom-d.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "classroom-d",
"name": "CLASSROOM D",
"name": "Classroom D",
"description": "",
"info": "",
"capacity": 150
Expand Down
2 changes: 1 addition & 1 deletion devcon-api/data/rooms/devcon-7/classroom-e.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "classroom-e",
"name": "CLASSROOM E",
"name": "Classroom E",
"description": "Classroom (Round Tables)",
"info": "",
"capacity": 150
Expand Down
7 changes: 0 additions & 7 deletions devcon-api/data/rooms/devcon-7/keynote-stage.json

This file was deleted.

7 changes: 7 additions & 0 deletions devcon-api/data/rooms/devcon-7/keynote.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": "keynote",
"name": "Keynote",
"description": "Masks",
"info": "",
"capacity": 2944
}
7 changes: 7 additions & 0 deletions devcon-api/data/rooms/devcon-7/main-stage.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": "main-stage",
"name": "Main Stage",
"description": "Masks",
"info": "",
"capacity": 900
}
7 changes: 0 additions & 7 deletions devcon-api/data/rooms/devcon-7/mainstage-masks.json

This file was deleted.

7 changes: 7 additions & 0 deletions devcon-api/data/rooms/devcon-7/music-stage.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": "music-stage",
"name": "Music stage",
"description": "",
"info": "",
"capacity": null
}
7 changes: 0 additions & 7 deletions devcon-api/data/rooms/devcon-7/stage-1-fans.json

This file was deleted.

7 changes: 7 additions & 0 deletions devcon-api/data/rooms/devcon-7/stage-1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": "stage-1",
"name": "Stage 1",
"description": "Fans",
"info": "",
"capacity": 450
}
7 changes: 0 additions & 7 deletions devcon-api/data/rooms/devcon-7/stage-2-lantern.json

This file was deleted.

7 changes: 7 additions & 0 deletions devcon-api/data/rooms/devcon-7/stage-2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": "stage-2",
"name": "Stage 2",
"description": "Lantern",
"info": "",
"capacity": 300
}
7 changes: 0 additions & 7 deletions devcon-api/data/rooms/devcon-7/stage-3-fabrics.json

This file was deleted.

7 changes: 7 additions & 0 deletions devcon-api/data/rooms/devcon-7/stage-3.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": "stage-3",
"name": "Stage 3",
"description": "Fabrics",
"info": "",
"capacity": 300
}
7 changes: 0 additions & 7 deletions devcon-api/data/rooms/devcon-7/stage-4-leafs.json

This file was deleted.

7 changes: 7 additions & 0 deletions devcon-api/data/rooms/devcon-7/stage-4.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": "stage-4",
"name": "Stage 4",
"description": "Leafs",
"info": "",
"capacity": 250
}
7 changes: 0 additions & 7 deletions devcon-api/data/rooms/devcon-7/stage-5-hats.json

This file was deleted.

7 changes: 7 additions & 0 deletions devcon-api/data/rooms/devcon-7/stage-5.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": "stage-5",
"name": "Stage 5",
"description": "Hats",
"info": "",
"capacity": 400
}
7 changes: 0 additions & 7 deletions devcon-api/data/rooms/devcon-7/stage-6-kites.json

This file was deleted.

7 changes: 7 additions & 0 deletions devcon-api/data/rooms/devcon-7/stage-6.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"id": "stage-6",
"name": "Stage 6",
"description": "Kites",
"info": "",
"capacity": 450
}
9 changes: 8 additions & 1 deletion devcon-api/data/sessions/devcon-7/0xparc-panel.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,14 @@
"tags": [],
"language": "en",
"speakers": [
"janmajaya-mall",
"veronica-zheng",
"eduard-sanou",
"0xparc"
],
"eventId": "devcon-7"
"eventId": "devcon-7",
"slot_start": "2024-11-13T03:30:00.000Z",
"slot_end": "2024-11-13T04:30:00.000Z",
"slot_roomId": "main-stage",
"resources_presentation": "https://docs.google.com/presentation/d/15PuLJuxsNX_SplHtSilFiq69bAFCp-tGDBM9VNXWwm4"
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,9 @@
"venkatesh-rao",
"tim-beiko"
],
"eventId": "devcon-7"
"eventId": "devcon-7",
"slot_start": "2024-11-13T08:30:00.000Z",
"slot_end": "2024-11-13T11:30:00.000Z",
"slot_roomId": "classroom-e",
"resources_presentation": "https://docs.google.com/presentation/d/1gO904DKuSqj1sNQuLtbP57gbG3NphApmqMl4sI6azOs"
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,9 @@
"speakers": [
"qi-su"
],
"eventId": "devcon-7"
"eventId": "devcon-7",
"slot_start": "2024-11-12T11:20:00.000Z",
"slot_end": "2024-11-12T11:30:00.000Z",
"slot_roomId": "stage-4",
"resources_presentation": "https://docs.google.com/presentation/d/12NbVEiYl32qL-QEUHOpKoymfYvpnypnNwC2bLEg0kzI"
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,9 @@
"roberto-saltini",
"luca-zanolini"
],
"eventId": "devcon-7"
"eventId": "devcon-7",
"slot_start": "2024-11-14T09:40:00.000Z",
"slot_end": "2024-11-14T10:10:00.000Z",
"slot_roomId": "stage-1",
"resources_presentation": "https://docs.google.com/presentation/d/1eztv0xy8RI4T_eMei061J--yX-7gDRGN4ZnQYsasWbU"
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,9 @@
"speakers": [
"roozbeh-sarenche"
],
"eventId": "devcon-7"
"eventId": "devcon-7",
"slot_start": "2024-11-15T07:30:00.000Z",
"slot_end": "2024-11-15T08:00:00.000Z",
"slot_roomId": "stage-2",
"resources_presentation": "https://docs.google.com/presentation/d/15pGWoL5JVQjTyDhG1Gd2UgLELOwq6HZtyeZZ9rAGAZ8"
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,9 @@
"ahmad",
"andrew-twyman"
],
"eventId": "devcon-7"
"eventId": "devcon-7",
"slot_start": "2024-11-14T08:00:00.000Z",
"slot_end": "2024-11-14T09:30:00.000Z",
"slot_roomId": "classroom-b",
"resources_presentation": "https://docs.google.com/presentation/d/1Jn6onllMeGwArE5qb8v5g4TAqMZfdWeU4wZW8fFGUhw"
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,9 @@
"speakers": [
"mf"
],
"eventId": "devcon-7"
"eventId": "devcon-7",
"slot_start": "2024-11-12T08:00:00.000Z",
"slot_end": "2024-11-12T08:30:00.000Z",
"slot_roomId": "stage-3",
"resources_presentation": "https://docs.google.com/presentation/d/1dJRUdeeSAm3IMKjIUvUMfYutPBeDhcB5ai34k_UGutY"
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,9 @@
"speakers": [
"palina-tolmach"
],
"eventId": "devcon-7"
"eventId": "devcon-7",
"slot_start": "2024-11-12T10:30:00.000Z",
"slot_end": "2024-11-12T10:40:00.000Z",
"slot_roomId": "stage-4",
"resources_presentation": "https://docs.google.com/presentation/d/1w5ssCjwzeMzULOUFJzm_OVAD4K7Y8ivlYMu9NQds-Gw"
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"id": "a-practical-introduction-to-prediction-markets",
"sourceId": "BECMXA",
"title": "A practical introduction to prediction markets",
"description": "In this workshop, attendees will participate in \"play money\" prediction markets on fun events which will happen during the workshop. They will discover how prediction markets work and how they can be used as an information aggregation or decision tools. They will learn how to use prediction markets in their projects.\r\n- Mechanisms of conditional tokens\r\n- Categorical markets\r\n- Scalar markets\r\n- Multiscalar markets\r\n- Revelation loss problem\r\n- Conditional markets\r\n- Futarchy\r\n- Participant use cases",
"description": "In this workshop, attendees will participate in \"play money\" prediction markets on fun events which will happen during the workshop. They will discover how prediction markets work and how they can be used as an information aggregation or decision tools.\r\n- Mechanisms of conditional tokens\r\n- Categorical markets\r\n- Scalar markets\r\n- Multiscalar markets\r\n- Revelation loss problem\r\n- Conditional markets\r\n- Futarchy",
"track": "Real World Ethereum",
"type": "Workshop",
"expertise": "Beginner",
Expand All @@ -27,5 +27,9 @@
"speakers": [
"clement-lesaege"
],
"eventId": "devcon-7"
"eventId": "devcon-7",
"slot_start": "2024-11-12T05:30:00.000Z",
"slot_end": "2024-11-12T07:30:00.000Z",
"slot_roomId": "classroom-e",
"resources_presentation": "https://docs.google.com/presentation/d/1CNiy8pyXPgFrGk4YOJEIIwWPxSTEpivis_7GsXcdpdw"
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,9 @@
"speakers": [
"michael-moser"
],
"eventId": "devcon-7"
"eventId": "devcon-7",
"slot_start": "2024-11-15T05:00:00.000Z",
"slot_end": "2024-11-15T05:30:00.000Z",
"slot_roomId": "classroom-a",
"resources_presentation": "https://docs.google.com/presentation/d/10kKWaC4imyMLa4e4mR8BSiSrX6pmWjzQCOwVryP2ff8"
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,9 @@
"speakers": [
"conor-mcmenamin"
],
"eventId": "devcon-7"
"eventId": "devcon-7",
"slot_start": "2024-11-12T09:00:00.000Z",
"slot_end": "2024-11-12T09:30:00.000Z",
"slot_roomId": "stage-5",
"resources_presentation": "https://docs.google.com/presentation/d/1RyOkM2nzZPnG9r_QZgUBb98ZHMt2VtBlxR0avT7eWHA"
}
Loading

0 comments on commit e671d9f

Please sign in to comment.