Merge pull request #291 from bangkokrb/release/5.4.0

bangkokrb · May 10, 2023 · cf05801 · cf05801
2 parents 034a3bf + bdefdbc
commit cf05801
Show file tree

Hide file tree

Showing 12 changed files with 77 additions and 41 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -96,9 +96,13 @@ GEM
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
+    mini_portile2 (2.8.1)
     minitest (5.18.0)
     multipart-post (2.2.3)
     nio4r (2.5.8)
+    nokogiri (1.14.3)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
     nokogiri (1.14.3-aarch64-linux)
       racc (~> 1.4)
     nokogiri (1.14.3-arm64-darwin)
@@ -141,6 +145,7 @@ GEM
 PLATFORMS
   aarch64-linux
   arm64-darwin-21
+  ruby
   x86_64-linux
 
 DEPENDENCIES

diff --git a/frontend/stylesheets/screens/_home.scss b/frontend/stylesheets/screens/_home.scss
@@ -1,5 +1,5 @@
 body.home .app-hero {
-  
+
   color: $primary;
   text-align: center;
 
@@ -27,24 +27,29 @@ body.home .app-hero {
 }
 
 body.home .app-content {
+
   text-align: center;
 
   h2 {
     border: none;
   }
 }
 
-body.home .app-hero .list-speaker__photo {
-  max-width:320px;
-  margin-top:1rem;
+body.home .speaker-lineup {
+
+  .list-speaker {
+    @include media-breakpoint-up('sm') {
+      grid-template-columns: repeat(2, 1fr);
+    }
+  }
 }
 
 body.home .sponsors {
-    
+
   .list-sponsor {
     justify-content: center;
     padding-left: 0;
-  
+
     @include media-breakpoint-up('sm') {
       margin-inline: auto;
     }

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/_components/list_speaker.liquid b/src/_components/list_speaker.liquid
@@ -2,7 +2,7 @@
   {% for speaker in speakers %}
   <li class="list-speaker__individual" id="{{ speaker.id }}">
     <a href="/speakers#{{ speaker.id }}" target="_blank" class="list-sponsor__link">
-      <img class="list-speaker__photo" src="{{ speaker.photo_url }}" alt="{{ speaker.first_name }} {{ speaker.last_name }}" />
+      <img class="list-speaker__photo" src="{{ speaker.photo_url }}" alt="{{ speaker.first_name | smartify }} {{ speaker.last_name | smartify }}" />
     </a>
     <div class="list-speaker__name text-branded">
       <span>{{ speaker.first_name }}</span>&nbsp;{{ speaker.last_name }}

diff --git a/src/_data/speakers.yml b/src/_data/speakers.yml
@@ -5,4 +5,18 @@
 #   photo_url: /images/speakers/firstname-lastname.jpg
 #   type: speaker | keynote
 #   bio: |
-
+- id: matz
+  first_name: Yukihiro "Matz"
+  last_name: Matsumoto
+  twitter_handle: matz
+  photo_url: /images/speakers/matz.jpg
+  type: keynote
+  bio: |
+- id: bernard-banta
+  first_name: Bernard
+  last_name: Banta
+  twitter_handle: Bantab
+  photo_url: /images/speakers/banta.jpg
+  type: keynote
+  bio: |
+
diff --git a/src/_data/sponsors.yml b/src/_data/sponsors.yml
@@ -3,4 +3,8 @@
   logo_url: /images/sponsors/appsignal.svg
   url: "https://www.appsignal.com/"
   level: silver
-
+- name: Eventpop
+  about: "Eventpop is an end-to-end event solution that enhances the seamless event experience. Eventpop แพลตฟอร์มจำหน่ายบัตรที่ตอบโจทย์ทุกงานอีเวนต์."
+  logo_url: /images/sponsors/eventpop.png
+  url: "https://www.eventpop.me/"
+  level: gold
diff --git a/src/_layouts/home.liquid b/src/_layouts/home.liquid
@@ -5,7 +5,7 @@
 
     <link rel="stylesheet" href="{% asset_path stylesheets/application.scss %}" type="text/css"/>
     <script src="{% asset_path javascript/application.js %}" defer></script>
-    
+
     {% if bridgetown.environment == "production" %}
       {% render "analytics" %}
     {% endif %}
@@ -21,17 +21,11 @@
 
     <div class="app-hero">
       <div class="container">
-        <small class="app-hero__subheading">Novotel Sukhumvit 20 – Bangkok, Thailand</small>
+        <small class="app-hero__subheading">Novotel Sukhumvit 20 - Bangkok, Thailand</small>
         <div class="app-hero__heading display-1">October 6-7, 2023</div>
 
-        <section class="speaker-lineup">
-          <h2 class="speaker-lineup__heading">Opening Keynote Speaker</h2>
-          <div class="list-speaker__name">Yukihiro "Matz" Matsumoto</div>
-          <img class="list-speaker__photo" src="/images/speakers/opening-speaker.jpg" alt="Matz" />
-        </section>
-
         <div class="app-hero__mailing-list">
-          <p class="app-hero__text">Sign up to receive updates about the speakers, venue, and ticket sales</p>
+          <p class="app-hero__text">Sign up to receive updates about the speakers and ticket sales</p>
           {% render "form_mailing_list" %}
         </div>
       </div>

diff --git a/src/images/speakers/banta.jpg b/src/images/speakers/banta.jpg
diff --git a/src/images/speakers/opening-speaker.jpg → src/images/speakers/matz.jpg b/src/images/speakers/opening-speaker.jpg → src/images/speakers/matz.jpg
diff --git a/src/images/sponsors/eventpop.png b/src/images/sponsors/eventpop.png
diff --git a/src/index.md b/src/index.md
@@ -4,25 +4,35 @@ page_class: home
 title: "Home"
 ---
 
+<section class="speaker-lineup">
+  <h2 class="speaker-lineup__heading">Featured Keynote Speakers</h2>
+
+  {% assign keynote_speakers = site.data.speakers | where: "type", "keynote" %}
+
+  {% render "list_speaker", speakers: keynote_speakers %}
+</section>
+
 <section class="cfp">
   <h3>Want to submit a talk?</h3>
   <p>The call for papers is now open</p>
   <a class="btn btn--primary" href="/cfp" target="_blank">View CFP</a>
 </section>
+
 <section class="sponsors">
   <h3>These sponsors have decided to support the event 💯</h3>
 
+  {% assign all_sponsors = site.data.sponsors %}
+  {% render "list_sponsor", sponsors: all_sponsors, level: 'silver' %}
+
+  <!--
   {% assign gold_sponsors = site.data.sponsors | where: "level", "gold" %}
   {% assign silver_sponsors = site.data.sponsors | where: "level", "silver" %}
   {% assign speaker_sponsors = site.data.sponsors | where: "level", "speaker" %}
-  {% assign community_sponsors = site.data.sponsors | where: "level", "community" %}
-  {% assign other_sponsors = speaker_sponsors | concat: community_sponsors %}
-
-  <!-- {% render "list_sponsor", sponsors: gold_sponsors, level: 'gold' %} -->
+  -->
 
-  {% render "list_sponsor", sponsors: silver_sponsors, level: 'silver' %}
-
-  <!-- {% render "list_sponsor", sponsors: other_sponsors, level: 'speaker' %} -->
+  <!-- {% render "list_sponsor", sponsors: gold_sponsors, level: 'gold' %} -->
+  <!-- {% render "list_sponsor", sponsors: silver_sponsors, level: 'silver' %} -->
+  <!-- {% render "list_sponsor", sponsors: speaker_sponsors, level: 'speaker' %} -->
 
   <h3>Interested in sponsoring the conference?</h3>
   <p>Promote your company to the world's top Ruby developers</p>

diff --git a/yarn.lock b/yarn.lock
@@ -918,6 +918,7 @@ postcss-lab-function@^4.1.2:
 [email protected]:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855"
+  integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==
   dependencies:
     lilconfig "^2.0.5"
     yaml "^1.10.2"
@@ -1294,7 +1295,8 @@ y18n@^5.0.5:
 
 yaml@^1.10.2:
   version "1.10.2"
-  resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
 yargs-parser@^21.0.0:
   version "21.1.1"