From bf30ed745cf19d5515306ba8a51a5a9d68b78142 Mon Sep 17 00:00:00 2001 From: Matt Mayer <152770+matthewmayer@users.noreply.github.com> Date: Sun, 30 Jul 2023 22:15:40 -0400 Subject: [PATCH 1/3] Change sponsor short description (#316) --- src/_data/sponsors.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_data/sponsors.yml b/src/_data/sponsors.yml index 210ae31..7f12632 100644 --- a/src/_data/sponsors.yml +++ b/src/_data/sponsors.yml @@ -1,5 +1,5 @@ - name: AppSignal - about: "Monitor your apps from A to Z: error tracking, performance insights, server metrics, uptime pages, custom dashboards, and more. AppSignal works for all popular Ruby frameworks and automatically instruments and creates beautiful dashboards for Sidekiq, Active Job, and other integrations." + about: "Monitor your apps from A to Z: error tracking, performance insights, server metrics, uptime pages, logging, and more. AppSignal works for all popular Ruby frameworks and automatically instruments and creates beautiful dashboards for Sidekiq, Active Job, and other integrations." logo_url: /images/sponsors/appsignal.svg url: "https://www.appsignal.com/" level: silver From 5087d89a052a11d0c67e32d4ec8b922973914dbc Mon Sep 17 00:00:00 2001 From: Matt Mayer <152770+matthewmayer@users.noreply.github.com> Date: Tue, 8 Aug 2023 17:47:30 +0100 Subject: [PATCH 2/3] Add new JetBrains bio (#319) new jetbrains bio fix #318 --- src/_data/sponsors.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_data/sponsors.yml b/src/_data/sponsors.yml index 7f12632..fc5b503 100644 --- a/src/_data/sponsors.yml +++ b/src/_data/sponsors.yml @@ -9,7 +9,7 @@ url: "https://www.eventpop.me/" level: gold - name: Jetbrains - about: "JetBrains is a cutting-edge software vendor specializing in the creation of intelligent development tools, including RubyMine, the Ruby and Rails IDE with first-class support for Ruby and Rails, JavaScript and CoffeeScript, ERB and HAML, CSS, Sass and Less, and more." + about: "JetBrains is a global software company providing an extensive suite of professional software development tools, one of which is RubyMine. From writing and debugging code to testing and deploying a completed application, RubyMine is an integrated development environment (IDE) that helps you be more productive in every aspect of Ruby and Rails project development. The IDE provides smart coding assistance, intelligent code refactoring, and deep code analysis capabilities." logo_url: /images/sponsors/jetbrains.svg url: "https://www.jetbrains.com/" level: silver From 064400c0553286521872ecd1933fe12fdcc7cdd3 Mon Sep 17 00:00:00 2001 From: Michael Kohl Date: Tue, 8 Aug 2023 23:47:48 +0700 Subject: [PATCH 3/3] Add schedule (#317) * Add schedule * Address PR feedback * Add Ben Halpern's keynote title * Enable schedule in header * more compact navbar at xl breakpoint * Fix alignment of the speaker name * Reorder header navigation --------- Co-authored-by: Matt Mayer Co-authored-by: Olivier Robert --- .../components/_app-navigation.scss | 13 ++- .../stylesheets/components/_card-talk.scss | 9 +- src/_data/menu/header.yml | 8 +- src/_data/schedule/day_one.yml | 106 +++++++++++++----- src/_data/schedule/day_two.yml | 95 ++++++++++++---- src/_data/speakers.yml | 6 +- src/images/speakers/.keep | 0 src/schedule.md | 4 +- 8 files changed, 174 insertions(+), 67 deletions(-) delete mode 100644 src/images/speakers/.keep diff --git a/frontend/stylesheets/components/_app-navigation.scss b/frontend/stylesheets/components/_app-navigation.scss index 9a49ee0..a44e334 100644 --- a/frontend/stylesheets/components/_app-navigation.scss +++ b/frontend/stylesheets/components/_app-navigation.scss @@ -28,10 +28,13 @@ flex-direction: row; align-items: center; justify-content: end; - gap: var(--bs-gutter-x); - + gap: 0; padding-top: 0; } + + @include media-breakpoint-up('xxl') { + gap: var(--bs-gutter-x); + } } &__item { @@ -55,7 +58,7 @@ @include media-breakpoint-up('xl') { display: block; - padding: 0 1rem; + padding: 0 0.75rem; height: auto; } @@ -88,7 +91,7 @@ &__link:hover::before { width: 100%; height: 100%; - + @include media-breakpoint-up('xl') { opacity: 1; } @@ -97,4 +100,4 @@ &__text { white-space: pre; } -} \ No newline at end of file +} diff --git a/frontend/stylesheets/components/_card-talk.scss b/frontend/stylesheets/components/_card-talk.scss index fc1447b..07cce7b 100644 --- a/frontend/stylesheets/components/_card-talk.scss +++ b/frontend/stylesheets/components/_card-talk.scss @@ -4,7 +4,7 @@ .card-talk { &__title { margin-bottom: 0.5rem; - + @include media-breakpoint-up('sm') { font-size: map-get(variables.$font-sizes, 'xl'); } @@ -25,6 +25,11 @@ width: sizing.rem(60px); } + &__info { + display: flex; + align-items: center; + } + &__photo { max-width: 100%; border-radius: 50%; @@ -45,7 +50,7 @@ &-link:not(:hover) { color: variables.$base-font-color; - } + } } // For dual speaker talks diff --git a/src/_data/menu/header.yml b/src/_data/menu/header.yml index 1327af0..f471c38 100755 --- a/src/_data/menu/header.yml +++ b/src/_data/menu/header.yml @@ -2,13 +2,13 @@ permalink: /tickets - title: Venue permalink: /venue -- title: Practicalities - permalink: /practicalities -# - title: Schedule -# permalink: /schedule +- title: Schedule + permalink: /schedule - title: Speakers permalink: /speakers - title: Sponsors permalink: /sponsors +- title: Practicalities + permalink: /practicalities - title: Code of Conduct permalink: /code-of-conduct diff --git a/src/_data/schedule/day_one.yml b/src/_data/schedule/day_one.yml index a95e271..3ff2a5b 100644 --- a/src/_data/schedule/day_one.yml +++ b/src/_data/schedule/day_one.yml @@ -1,28 +1,78 @@ -# - start_at: "8:00" -# end_at: "9:00" -# title: "Registration & Conference Door Opens" -# - start_at: "9:00" -# end_at: "9:10" -# title: "Welcome Address" -# - start_at: -# end_at: -# title: -# speaker_id: -# slides_url: -# youtube_id: -# - start_at: "10:30" -# end_at: "10:50" -# title: "Coffee Break" -# - start_at: "12:30" -# end_at: "13:50" -# title: "Buffet Lunch" -# - start_at: "15:05" -# end_at: "15:35" -# title: "Coffee Break" -# - start_at: "17:00" -# end_at: "17:10" -# title: "Closing remarks & announcements" -# - start_at: "18:00" -# end_at: "22:00" -# title: "Official Party 🥳" -# subtitle: "at TBD" +- start_at: "8:00" + end_at: "9:00" + title: "Registration & Conference Door Opens" +- start_at: "9:00" + end_at: "9:10" + title: "Welcome Address" +- start_at: "9:10" + end_at: "9:55" + title: "Keynote: 30 Years of Ruby" + speaker_id: matz +# slides_url: +# youtube_id: +- start_at: "10:00" + end_at: "10:30" + title: "Component Driven UI with ViewComponent gem" + speaker_id: radoslav-stankov +# slides_url: +# youtube_id: +- start_at: "10:30" + end_at: "10:50" + title: "Coffee Break" +- start_at: "10:50" + end_at: "11:20" + title: "Learn to delegate; like a boss" + speaker_id: + - elle-meredith + - lachlan-hardy +# slides_url: +# youtube_id: +- start_at: "11:25" + end_at: "11:55" + title: "Error 418 - I'm a teapot" + speaker_id: matthew-lindfield-seager +# slides_url: +# youtube_id: +- start_at: "12:00" + end_at: "12:30" + title: "Big Corps, Big Worries. Some points on selling Ruby to Big Corps." + speaker_id: chakrit-wichian +# slides_url: +# youtube_id: +- start_at: "12:30" + end_at: "13:50" + title: "Buffet Lunch" +- start_at: "14:00" + end_at: "14:30" + title: "BYOJ: Build your own JIT with Ruby" + speaker_id: faraaz-ahmad +# slides_url: +# youtube_id: +- start_at: "14:35" + end_at: "15:05" + title: "Introducing Living Documentation" + speaker_id: steven-r-baker +# slides_url: +# youtube_id: +- start_at: "15:05" + end_at: "15:35" + title: "Coffee Break" +- start_at: "15:35" + end_at: "16:05" + title: "Data indexing with RGB (Ruby, Graphs and Bitmaps)" + speaker_id: benji-lewis +# slides_url: +# youtube_id: +- start_at: "16:10" + end_at: "16:55" + title: "Keynote: Breaking Barriers — Empowering the Unbanked with Innovative Tech" + speaker_id: bernard-banta +# slides_url: +# youtube_id: +- start_at: "17:00" + end_at: "17:10" + title: "Closing remarks & announcements" +- start_at: "18:00" + end_at: "22:00" + title: "Official Party 🥳" + subtitle: "at The Deck" diff --git a/src/_data/schedule/day_two.yml b/src/_data/schedule/day_two.yml index 83a0c08..6f3beb3 100644 --- a/src/_data/schedule/day_two.yml +++ b/src/_data/schedule/day_two.yml @@ -1,23 +1,72 @@ -# - start_at: "8:00" -# end_at: "9:00" -# title: "Conference Door Opens" -# - start_at: "9:00" -# end_at: "9:10" -# title: "Welcome Address" -# - start_at: -# end_at: -# title: -# speaker_id: -# youtube_id: -# - start_at: "10:30" -# end_at: "10:50" -# title: "Coffee Break" -# - start_at: "12:30" -# end_at: "13:50" -# title: "Buffet Lunch" -# - start_at: "15:05" -# end_at: "15:35" -# title: "Coffee Break" -# - start_at: "17:00" -# end_at: "17:10" -# title: "Closing remarks & announcements" +- start_at: "8:00" + end_at: "9:00" + title: "Conference Door Opens" +- start_at: "9:00" + end_at: "9:10" + title: "Welcome Address" +- start_at: "9:10" + end_at: "9:55" + title: "Keynote" + speaker_id: jemma-issroff +# slides_url: +# youtube_id: +- start_at: "10:00" + end_at: "10:30" + title: "A Beginner's Complete Guide to Microcontroller Programming with Ruby" + speaker_id: hitoshi-hasumi +# slides_url: +# youtube_id: +- start_at: "10:30" + end_at: "10:50" + title: "Coffee Break" +- start_at: "10:50" + end_at: "11:20" + title: "Avoiding Disaster: Practical Strategies for Incident Prevention" + speaker_id: huy-du +# slides_url: +# youtube_id: +- start_at: "11:25" + end_at: "11:55" + title: "Event Streaming Patterns for Ruby Services" + speaker_id: brad-urani +# slides_url: +# youtube_id: +- start_at: "12:00" + end_at: "12:30" + title: "The Art of Abstracting: Key Factors for Success in a Core/Platform/BuildingBlocks team" + speaker_id: omar-sotillo-franco +# slides_url: +# youtube_id: +- start_at: "12:30" + end_at: "13:50" + title: "Buffet Lunch" +- start_at: "14:00" + end_at: "14:30" + title: "Kickboxer vs Ruby - the state of MRuby, JRuby and CRuby" + speaker_id: + - michael-milewski + - selena-small +# slides_url: +# youtube_id: +- start_at: "14:35" + end_at: "15:05" + title: "The world of Passkeys 🤝🏽 Ruby" + speaker_id: helio-cola +# slides_url: +# youtube_id: +- start_at: "15:05" + end_at: "15:35" + title: "Coffee Break" +- start_at: "15:35" + end_at: "16:05" + title: "Rails Performance Monitoring 101: A Primer for Developers" + speaker_id: rishi-jain +# slides_url: +# youtube_id: +- start_at: "16:10" + end_at: "16:55" + title: "Keynote: Thriving in Uncertainty" + speaker_id: ben-halpern +- start_at: "17:00" + end_at: "17:10" + title: "Closing remarks & announcements" diff --git a/src/_data/speakers.yml b/src/_data/speakers.yml index 8da4dba..1a193c8 100644 --- a/src/_data/speakers.yml +++ b/src/_data/speakers.yml @@ -32,7 +32,7 @@ photo_url: /images/speakers/jemma2.jpg type: keynote mini_bio: Founder of wnb.rb, GC expert - bio: Jemma Issroff is a Ruby Core committer who works on Shopify's Ruby Infrastructure team. She is also a co-founder of WNB.rb, a women / non-binary Ruby community, and a co-host on The Ruby on Rails Podcast. + bio: Jemma Issroff is a Ruby Core committer who works on Shopify's Ruby Infrastructure team. She is also a co-founder of WNB.rb, a women / non-binary Ruby community, and a co-host on The Ruby on Rails Podcast. website: https://jemma.dev/ - id: ben-halpern first_name: Ben @@ -62,7 +62,7 @@ bio: | He(lio) has created things primarily in C/C++ & Ruby, over the past 20+ years. He first met Ruby at v1.8.7 and Rails 2.x in 2010 and he is a Happy Developer since then. - He is currently a part-time Rails consultant, while building a new product and doing some OSS!" + He is currently a part-time Rails consultant, while building a new product and doing some OSS! - id: brad-urani first_name: Brad last_name: Urani @@ -179,4 +179,4 @@ bio: A long-time front-end standards dev, Lachlan joined the Australian Ruby community in 2006, but first wrote Ruby for money in 2016 at GitHub. He's led teams and orgs for more than a decade, and now tries to share those experiences as much as possible through his work at Blackmill. social_url: https://tinnies.club/@lachlanhardy social_type: mastodon - website: https://lachstock.com.au \ No newline at end of file + website: https://lachstock.com.au diff --git a/src/images/speakers/.keep b/src/images/speakers/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/src/schedule.md b/src/schedule.md index f14bfe8..100d75d 100644 --- a/src/schedule.md +++ b/src/schedule.md @@ -2,7 +2,7 @@ layout: default page_class: schedule title: "Schedule" -published: false +published: true ---
@@ -22,7 +22,7 @@ published: false {% render "table_schedule", events: site.data.schedule.day_one, speakers: site.data.speakers %}
-
+
{% render "table_schedule", events: site.data.schedule.day_two, speakers: site.data.speakers %}