Skip to content

Commit

Permalink
Merge pull request #337 from streamethorg/develop
Browse files Browse the repository at this point in the history
  • Loading branch information
greatsamist authored Dec 21, 2023
2 parents 7bb97ee + b99fb1b commit 40f96f2
Show file tree
Hide file tree
Showing 24 changed files with 21 additions and 19 deletions.
2 changes: 1 addition & 1 deletion data/sessions/swarm_winter_solstice/closing.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"id":"closing","name":"Closing","description":"Antonio on stage for final thoughts. ","start":1703179500000,"end":1703179800000,"stageId":"mainstage","speakers":[{"id":"antonio_gonzalo_moderator","name":"Antonio Gonzalo (Moderator)","bio":"\n","eventId":"swarm_winter_solstice"}],"playbackId":"","eventId":"swarm_winter_solstice","coverImage":"/sessions/swarm_winter_solstice/closing.jpg"}
{"id":"closing","name":"Closing","description":"Antonio on stage for final thoughts. ","start":1703178480000,"end":1703178720000,"stageId":"mainstage","speakers":[{"id":"antonio_gonzalo_moderator","name":"Antonio Gonzalo (Moderator)","bio":"\n","eventId":"swarm_winter_solstice"}],"playbackId":"","eventId":"swarm_winter_solstice","coverImage":"/sessions/swarm_winter_solstice/closing.jpg"}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"id":"opening_speech_welcome_by_antonio","name":"Opening speech (welcome) by Antonio","description":"place Antonio (moderator) into the program after Video1 finishes","start":1703174700000,"end":1703174880000,"stageId":"mainstage","speakers":[{"id":"antonio_gonzalo_moderator","name":"Antonio Gonzalo (Moderator)","bio":"\n","eventId":"swarm_winter_solstice"}],"playbackId":"","eventId":"swarm_winter_solstice","coverImage":"/sessions/swarm_winter_solstice/opening_speech_welcome_by_antonio.jpg"}
{"id":"opening_speech_welcome_by_antonio","name":"Opening speech (welcome) by Antonio","description":"place Antonio (moderator) into the program after Video1 finishes; he will introduce Nugaon (short)","start":1703174700000,"end":1703174880000,"stageId":"mainstage","speakers":[{"id":"antonio_gonzalo_moderator","name":"Antonio Gonzalo (Moderator)","bio":"\n","eventId":"swarm_winter_solstice"}],"playbackId":"","eventId":"swarm_winter_solstice","coverImage":"/sessions/swarm_winter_solstice/opening_speech_welcome_by_antonio.jpg"}
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"id":"swarm_20_the_new_frontier","name":"Swarm 2.0: The New Frontier","description":"Antonio is joined by: Viktor, Callum and Niki on stage; FLOW: \n1. Antonio invites Viktor to speak; \n2. Antonio invites Niki to speak; \n3. Antonio invites Callum to speak; \n4. PLAY VIDEO2 on cue from Antonio; \n5. back to Callum\n6. To Antonio and Viktor \nThe speakers can all be in the frame all the time, but if possible, the current speaker should be put in the bigger window on the go.\n","start":1703174880000,"end":1703175720000,"stageId":"mainstage","speakers":[{"id":"antonio_gonzalo_moderator","name":"Antonio Gonzalo (Moderator)","bio":"\n","eventId":"swarm_winter_solstice"},{"id":"viktor_tron","name":"Viktor Tron","bio":"No description","eventId":"swarm_winter_solstice"},{"id":"callum_toner","name":"Callum Toner","bio":"No description","eventId":"swarm_winter_solstice"},{"id":"niki_papadatou","name":"Niki Papadatou","bio":"\n\n\n\n","eventId":"swarm_winter_solstice"}],"playbackId":"","eventId":"swarm_winter_solstice","coverImage":"/sessions/swarm_winter_solstice/swarm_20_the_new_frontier.jpg"}
{"id":"swarm_20_the_new_frontier","name":"Swarm 2.0: The New Frontier","description":"Antonio is joined by: Viktor, Callum and Niki on stage; FLOW: \n1. Antonio short intro; \n2. PLAY VIDEO 2; Antonio invites Niki to speak; \n3. Antonio invites Viktor to speak; \n4. Antonio invites Callum to speak; \n5. Niki speaks\n6. Callum speaks \n7. Viktor short comment; to Antonio. >> The speakers can all be in the frame all the time, but if possible, the current speaker should be put in the bigger window on the go.\n","start":1703174880000,"end":1703175720000,"stageId":"mainstage","speakers":[{"id":"antonio_gonzalo_moderator","name":"Antonio Gonzalo (Moderator)","bio":"\n","eventId":"swarm_winter_solstice"},{"id":"viktor_tron","name":"Viktor Tron","bio":"No description","eventId":"swarm_winter_solstice"},{"id":"callum_toner","name":"Callum Toner","bio":"No description","eventId":"swarm_winter_solstice"},{"id":"niki_papadatou","name":"Niki Papadatou","bio":"\n\n\n\n","eventId":"swarm_winter_solstice"}],"playbackId":"","eventId":"swarm_winter_solstice","coverImage":"/sessions/swarm_winter_solstice/swarm_20_the_new_frontier.jpg"}

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"swarm_together_community_20__engagement","name":"Swarm Together: Community 2.0 & Engagement","description":"Antonio welcomes Niki back to the stage; Niki to speak, then Antonio to speak and lead to the next chapter","start":1703176200000,"end":1703176500000,"stageId":"mainstage","speakers":[{"id":"antonio_gonzalo_moderator","name":"Antonio Gonzalo (Moderator)","bio":"\n","eventId":"swarm_winter_solstice"},{"id":"niki_papadatou","name":"Niki Papadatou","bio":"\n\n\n\n","eventId":"swarm_winter_solstice"}],"playbackId":"","eventId":"swarm_winter_solstice","coverImage":"/sessions/swarm_winter_solstice/swarm_together_community_20__engagement.jpg"}
2 changes: 1 addition & 1 deletion data/sessions/swarm_winter_solstice/the_call_of_swarm.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"id":"the_call_of_swarm","name":"The Call of Swarm","description":"Gregor on stage.","start":1703178900000,"end":1703179200000,"stageId":"mainstage","speakers":[{"id":"gregor_avcer","name":"Gregor Žavcer","bio":"No description","eventId":"swarm_winter_solstice"}],"playbackId":"","eventId":"swarm_winter_solstice","coverImage":"/sessions/swarm_winter_solstice/the_call_of_swarm.jpg"}
{"id":"the_call_of_swarm","name":"The Call of Swarm","description":"VIDEO FIRST, then Gregor on stage. ","start":1703177880000,"end":1703178180000,"stageId":"mainstage","speakers":[{"id":"gregor_avcer","name":"Gregor Žavcer","bio":"No description","eventId":"swarm_winter_solstice"}],"playbackId":"","eventId":"swarm_winter_solstice","coverImage":"/sessions/swarm_winter_solstice/the_call_of_swarm.jpg"}
2 changes: 1 addition & 1 deletion data/sessions/swarm_winter_solstice/the_future_vision.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"id":"the_future_vision","name":"The future vision","description":"Antonio and Viktor on stage.","start":1703179200000,"end":1703179500000,"stageId":"mainstage","speakers":[{"id":"antonio_gonzalo_moderator","name":"Antonio Gonzalo (Moderator)","bio":"\n","eventId":"swarm_winter_solstice"},{"id":"viktor_tron","name":"Viktor Tron","bio":"No description","eventId":"swarm_winter_solstice"}],"playbackId":"","eventId":"swarm_winter_solstice","coverImage":"/sessions/swarm_winter_solstice/the_future_vision.jpg"}
{"id":"the_future_vision","name":"The future vision","description":"Antonio and Viktor on stage.","start":1703178180000,"end":1703178480000,"stageId":"mainstage","speakers":[{"id":"antonio_gonzalo_moderator","name":"Antonio Gonzalo (Moderator)","bio":"\n","eventId":"swarm_winter_solstice"},{"id":"viktor_tron","name":"Viktor Tron","bio":"No description","eventId":"swarm_winter_solstice"}],"playbackId":"","eventId":"swarm_winter_solstice","coverImage":"/sessions/swarm_winter_solstice/the_future_vision.jpg"}
1 change: 1 addition & 0 deletions data/speakers/swarm_winter_solstice/andrew_deboot.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"andrew_deboot","name":"Andrew (DeBoot)","bio":"No description","eventId":"swarm_winter_solstice"}
1 change: 0 additions & 1 deletion data/speakers/swarm_winter_solstice/aron_soos.json

This file was deleted.

1 change: 1 addition & 0 deletions data/speakers/swarm_winter_solstice/arthur_deboot.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"arthur_deboot","name":"Arthur (DeBoot)","bio":"No description","eventId":"swarm_winter_solstice"}
1 change: 0 additions & 1 deletion data/speakers/swarm_winter_solstice/deboot.json

This file was deleted.

1 change: 0 additions & 1 deletion data/speakers/swarm_winter_solstice/klemen_robnik.json

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"klemen_robnik_fds_fairdrive","name":"Klemen Robnik (FDS Fairdrive)","bio":"No description","eventId":"swarm_winter_solstice"}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"marco_moshi__grendel_polygon_village","name":"Marco Moshi - Grendel (Polygon village)","bio":"No description","eventId":"swarm_winter_solstice"}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"miha_mohorko_fairdrive_dao","name":"Miha Mohorko (Fairdrive DAO)","bio":"No description","eventId":"swarm_winter_solstice"}
1 change: 0 additions & 1 deletion data/speakers/swarm_winter_solstice/nugaon.json

This file was deleted.

1 change: 1 addition & 0 deletions data/speakers/swarm_winter_solstice/tadej_tx_datafund.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"tadej_tx_datafund","name":"Tadej Tx (Datafund)","bio":"No description","eventId":"swarm_winter_solstice"}
1 change: 1 addition & 0 deletions data/stages/swarm_winter_solstice/breakout_room.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"id":"breakout_room","name":"Breakout Room","eventId":"swarm_winter_solstice","streamSettings":{"streamId":""}}
12 changes: 8 additions & 4 deletions packages/app/app/(home)/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,14 @@ export default async function Home() {
<LiveEvents events={liveEvents} />
</>
)}
<p className="px-4 mt-3 font-ubuntu font-bold md:py-2 text-blue text-2xl md:text-4xl">
Upcoming Events
</p>
<UpcomingEvents events={upComing} />
{upComing?.length > 0 && (
<>
<p className="px-4 mt-3 font-ubuntu font-bold md:py-2 text-blue text-2xl md:text-4xl">
Upcoming Events
</p>
<UpcomingEvents events={upComing} />
</>
)}
<EventList events={pastEvents} />
</div>
</main>
Expand Down

0 comments on commit 40f96f2

Please sign in to comment.