fixes conflicts

esl · Nov 11, 2023 · bd52917 · bd52917
2 parents 15faa05 + 5951f5f
commit bd52917
Show file tree

Hide file tree

Showing 52 changed files with 126 additions and 100 deletions.
diff --git a/Aeternity-300.png b/Aeternity-300.png
diff --git a/CloudAMQP-300.png b/CloudAMQP-300.png
diff --git a/Erlang Solutions-300.png b/Erlang Solutions-300.png
diff --git a/Onextel-300.png b/Onextel-300.png
diff --git a/_config.yml b/_config.yml
@@ -1,6 +1,6 @@
 title: Code BEAM Europe
 description: > # this means to ignore newlines until "baseurl:"
-  The Erlang and Elixir conference in Europe: 2 days of talks,discussions and networking for the BEAM community.
+  The Erlang and Elixir conference in Europe - 2 days of talks,discussions and networking for the BEAM community.
 baseurl: "" # the subpath of your site, e.g. /blog
 url: "https://codebeameurope.com" # the base hostname & protocol for your site
 

diff --git a/_data/navigation.yml b/_data/navigation.yml
@@ -2,34 +2,34 @@
   #  link: "cover"
   #- name: Welcome
   #  link: "welcome"
-  - name: Register
-    link: "register"
-  # name: Newsletter
-  #  link: "newsletter"
+  #- name: TICKETS
+  #  link: "register"
+  - name: 2024 Waiting List
+    link: "newsletter"
   # name: Call for Talks
   #  link: "cft"
   #- name: Call for Training
   #  link: "call-for-training"
-  #- name: All Recordings
+  #- name: Recordings
   #  link: "recordings"
   #- name: Students
   # link: "student"
-  #- name: Public videos
+  #- name: Public Videos
   #  link: "video"
   #- name: Schedule
-  #  link: schedule
+  #  link: "schedule"
   - name: Speakers
     link: "keynotes"
   - name: Trainers
     link: "trainers"
-  - name: Training
-    link: "training"
+  # - name: Training
+  #  link: "training"
   #- name: Programme Committee
   #  link: "members"
-  - name: Diversity
-    link: "diversity"
-  - name: Volunteer
-    link: "volunteer"
+  #- name: Diversity
+  #  link: "diversity"
+  # - name: Volunteer
+  #  link: "volunteer"
   - name: Venue
     link: "venue"
   #- name: Hotels
@@ -42,7 +42,7 @@
   #  link: "shop"
   #- name: Blog
   #  link: "blog"
-  #- name: Sponsors
-  #  link: "sponsors"
+  - name: Sponsors
+    link: "sponsors"
   - name: Contact
     link: "contact"
diff --git a/_data/speaker-list.yml b/_data/speaker-list.yml
@@ -4,7 +4,6 @@ speakers:
 - _participants/quinn-wilton.md
 - _participants/andrea-leopardi.md
 - _participants/sasa-juric.md
-- _participants/sanne-kalkman.md
 - _participants/jade-allen.md
 - _participants/alejandro-ramallo.md
 - _participants/robin-morisset.md
@@ -17,6 +16,7 @@ speakers:
 - _participants/pawel-chrzaszcz.md
 - _participants/ingela-andin.md
 - _participants/lucas-sifoni.md
+- _participants/tonci-galic.md
 - _participants/sigu-magwa.md
 - _participants/njoki-kiarie.md
 - _participants/natalia-chechina.md

diff --git a/_data/trainers-list.yml b/_data/trainers-list.yml
@@ -2,9 +2,4 @@
 trainers:
 - _participants/natalia-chechina.md
 - _participants/francesco-cesarini-new.md
-- _participants/dominik-artur-wolek.md
-- _participants/robert-virding.md
-- _participants/lukasz-kita.md
-- _participants/dominic-letz.md
-- _participants/paulo-valente.md
-- _participants/lukasz-pauszek.md
+- _participants/paulo-valente.md
diff --git a/_data/training-list.yml b/_data/training-list.yml
@@ -3,18 +3,6 @@ trainings:
 - training: _trainings/the-nx-ecosystem-from-zero-to-hero.md
   start: 2023-10-17T08:00:00.000+00:00
   end: 2023-10-17T16:00:00.000+00:00
-- training: _trainings/from-basics-to-RTMP-and-HLS-broadcasting.md
-  start: 2023-10-18T07:00:00.000+00:00
-  end: 2023-10-18T15:00:00.000+00:00
 - training: _trainings/observability-and-debugging-on-the-beam.md
-  start: 2023-10-18T07:00:00.000+00:00
-  end: 2023-10-18T15:00:00.000+00:00
-- training: _trainings/deepdive-into-liveview-for-phoenix-developers.md
-  start: 2023-10-18T07:00:00.000+00:00
-  end: 2023-10-18T15:00:00.000+00:00
-- training: _trainings/from-liveview-to-appstore.md
-  start: 2023-10-18T07:00:00.000+00:00
-  end: 2023-10-18T15:00:00.000+00:00
-- training: _trainings/secure-coding-on-the-beam.md
   start: 2023-10-18T07:00:00.000+00:00
   end: 2023-10-18T15:00:00.000+00:00
diff --git a/_includes/banner-4.html b/_includes/banner-4.html
@@ -1,6 +1,6 @@
 <div class="banner-2" id="volunteer">
     <h3 class="text">
-        Become a volunteer and join the conference free of charge...
+        Become a volunteer: join the crew and attend the event for free!
     </h3>
-    <a class="page-scroll btn-outline btn-blue ml-1" href="https://forms.gle/DTMARY8Dkahz7nDz6">APPLY</a>
+    <a class="page-scroll btn-outline btn-blue ml-1" href="https://forms.gle/DTMARY8Dkahz7nDz6">CLOSED</a>
 </div>
diff --git a/_includes/banner-5.html b/_includes/banner-5.html
@@ -1,5 +1,5 @@
 <div class="banner-1" id="student">
     <h3 class="text">
-        As part of our efforts to grow the community, the Erlang Ecosystem Foundation would like to invite students & underrepresented groups in tech to attend the <strong>virtual</strong> conference for free. </h3>
-    <a class="page-scroll btn-outline btn-purple ml-1" href="https://forms.gle/tYp4ZNdahVFgwvyRA">APPLY</a>
+        For students and underrepresented groups: the Erlang Ecosystem Foundation invites you to attend the <strong>virtual</strong> conference for free. </h3>
+    <a class="page-scroll btn-outline btn-blue ml-1" href="https://forms.gle/tYp4ZNdahVFgwvyRA">APPLY</a>
 </div>
diff --git a/_includes/cover.html b/_includes/cover.html
@@ -14,12 +14,12 @@
 
   <div class="col-right">
     <h4 class="date" style="color: #19f5ff">
-      THE ERLANG & ELIXIR CONFERENCE ARRIVES IN BERLIN!<br />
-      <span style="color: #fff; font-size: 22px">CONF 19-20 OCTOBER / TUTORIALS  17 & 18 OCTOBER</span><br />
-      <span style="color: #fff; font-size: 18px">ESTREL BERLIN & online</span>
+      THANK YOU FOR BEING WITH US THIS YEAR AND SEE YOU IN 2024!<br />
+      <span style="color: #fff; font-size: 22px">Save the date: 14-15 OCTOBER 2024 </span><br />
+      <span style="color: #fff; font-size: 18px">BERLIN, ESTREL HOTEL</span>
     </h4>
     <p class="text-content mb-1">
-      <p>Bringing the Erlang and Elixir communities together to Learn, Share and be Inspired.
+      <p>Code BEAM Europe 2023 in numbers:
 
         <!--  <br /><br />
         Conference and Tutorial Highlights:
@@ -46,7 +46,7 @@ <h4 class="call-for-talks">
                     <span>SPEAKERS</span>
                 </div>
                 <div class="highlight-item-row">
-                    <span>300+</span>
+                    <span>400+</span>
                     <span>ATTENDEES</span>
                 </div>
             </div>

diff --git a/_includes/newsletter.html b/_includes/newsletter.html
@@ -1,11 +1,12 @@
 <div class="section newsletter" id="newsletter">
-    <h2 class="title">NEWSLETTER</h2>
+    <h2 class="title">JOIN 2024 WAITING LIST</h2>
     <hr/>
     <p class="section-text mb-3">
-        Subscribe to the newsletter
+        Get access to exclusive Very Early Bird tickets and be the first to get news about the event! Just subscribe to the event mailing list.
+
     </p>
     <div class="form-container">
-        <iframe allowtransparency="true" frameborder="0" height="500" src="https://www2.elixirconf.eu/l/23452/2020-01-20/6tlvh4" style="border: 0" type="text/html" width="100%"></iframe>
+        <iframe allowtransparency="true" frameborder="0" height="650" src="https://www2.codesync.global/l/23452/2023-10-19/7lsqbk" style="border: 0" type="text/html" width="100%"></iframe>
 
 
     </div>

diff --git a/_includes/sponsors.html b/_includes/sponsors.html
@@ -2,7 +2,7 @@
     <h2 class="title">SPONSORS</h2>
     <hr/>
     <!-- <p class="section-text">
-        Nulla a tellus at turpis gravida congue non interdum et malesuada fames ac
+        Nulla a tellus at turpis gravida congue non  et malesuada fames ac
                                                                                             ante ipsum primis
     </p> -->
 
@@ -14,24 +14,42 @@ <h2 class="sponsor-title">Diversity & Inclusion Sponsor</h2>
                 <img src="{{site.baseurl}}/assets/images/erlang-solutions-logo_erlang-solutions-logo-black.png" alt="erlang solutions" />
             </a>
 
-            <h2 class="sponsor-title">Platinum Sponsor</h2>
+            <h2 class="sponsor-title">Platinum Sponsors</h2>
 
-            <a href="https://aeternity.com/" target="_blank">
-                <img src="{{site.baseurl}}/assets/images/aeternity logo.png" alt="Aeternity" style="height: 5em"/> 
+            <a href="https://www.aeternity.com" target="_blank">
+                <img src="{{site.baseurl}}/assets/images/sponsors/Aeternity-525.png" alt="Aeternity"/>
             </a>
 
+            <a href="https://www.cloudamqp.com" target="_blank">
+                <img src="{{site.baseurl}}/assets/images/sponsors/CloudAMQP-525.png" alt="cloudamqp"/>
+            </a>
+
+
+        <a href="https://www.onextel.com/" target="_blank">
+                <img src="{{site.baseurl}}/assets/images/sponsors/Onextel-525.png" alt="onextel" />
+            </a>
+        <a href="https://www.bitcrowd.net/" target="_blank">
+                <img src="{{site.baseurl}}/assets/images/sponsors/bitcrowd-525.png" alt="onextel" />
+            </a>
+
         <h2 class="sponsor-title">Gold Sponsor</h2>
 
              <a href="https://www.emqx.com/en" target="_blank">
-                <img src="{{site.baseurl}}/assets/images/EMQ-Logo- White.png" alt="EMQ" />
+                <img src="{{site.baseurl}}/assets/images/sponsors/emq-525.png" alt="EMQ" />
+            </a>
+         <a href="https://aws.amazon.com/" target="_blank">
+                <img src="{{site.baseurl}}/assets/images/sponsors/aws.png" alt="AWS" />
+            </a>
+         <a href="https://vmware.com" target="_blank">
+                <img src="{{site.baseurl}}/assets/images/sponsors/vm ware - 525.png" alt="VM Ware" />
             </a>
 
         <h2 class="sponsor-title">Supporting Sponsor</h2>
 
                 <a href="https://erlef.org/" target="_blank">
-               <img src="{{site.baseurl}}/assets/images/EEF logo blk 2021.png" alt="EEF" />
+               <img src="{{site.baseurl}}/assets/images/sponsors/EEF-300.png" alt="EEF" />
                 </a>
-                
+
                <h2 class="sponsor-title">Media Partner</h2>
 
             <a href="https://germantechjobs.de/en" target="_blank">

diff --git a/_includes/venue.html b/_includes/venue.html
@@ -29,9 +29,13 @@ <h2 class="venue-subtitle">
                     </div>
                 </div>
             </div>
-
+<!--
             <h2 class="venue-subtitle">Accommodation</h2><br>
-            <p>We have secured rooms at the Estrel from €138, to book please follow <a href="https://bookings.travelclick.com/17417?groupID=3611647#/guestsandrooms">this link.</a> (currently experiencing some technical issues, the rooms will be available again shortly) </p>
+            <p>We have secured rooms at Estrel at €138 for a single room and €150 for a double room (plus €25 breakfast), to book please call +49 30 6831 22522 or email [email protected] and mention it is for Code BEAM Europe (code: BEAMRabbit 2023) to receive the discount.</p>
+            <br> -->
+
+            <h2 class="venue-subtitle">Neighbourhood Guide</h2><br>
+            <p> You can view the pocketguide to Neukölln <a href="https://github.com/esl/code-beam-europe/blob/master/assets/images/Pocketguide_Neuko%CC%88lln_2020.pdf" style="color: #e32dfd">here</a>.
 
         </div>
         <div class="right-content">

diff --git a/_includes/welcome.html b/_includes/welcome.html
@@ -1,28 +1,19 @@
 <div class="section welcome" id="welcome">
-     <h2 class="title">WELCOME</h2>
+     <h2 class="title">Learn. Share. Inspire.</h2>
      <hr/>
 
      <div class="row align-center">
          <div class="left-content flex-end">
-             <iframe allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen frameborder="0" height="400" src="https://www.youtube.com/embed/JVl2x5K1iXY" data-cookieconsent="marketing" width="100%"></iframe>
-         </div>
+<iframe width="560" height="315" src="https://www.youtube.com/embed/oMfRhvti734?si=BXsWFu65MznlCCzg" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>         </div>
          <div class="right-content">
              <h3 class="text-title mb-1">Join the major European event for Erlang and Elixir users</h3>
-              <p> Erlang and Elixir share the same Virtual Machine, the BEAM. This ingenious little bit of technology is perfect for fault-tolerant, resilient applications that scale to billions of users, which is one of the biggest challenges facing developers and companies today. Code BEAM has united Erlang & Elixir developers for years to grow and progress the community in the spirit of Share. Learn. Inspire.
+              <p> Erlang and Elixir share the same Virtual Machine, the BEAM. This ingenious little bit of technology is perfect for fault-tolerant, resilient applications that scale to billions of users, which is one of the biggest challenges facing developers and companies today. <br>Code BEAM has united Erlang & Elixir developers for years to grow and progress the community in the spirit of Share. Learn. Inspire.
           <br><br>
-
-          Share <br>
-          Code BEAM is an event where leading developers in Erlang, Elixir and other BEAM based technologies like RabbitMQ share their use cases and success stories to allow us to grow together.
+          Meet people and companies using and developing high performance, fault-tolerant and resilient applications that scale to billions of users in production in areas like Fintech, eCommerce, IoT, Gaming, Blockchain, Security, Machine Learning and more.
 
           <br><br>
 
-          Learn <br>
-          We pride ourselves on our connection with community and industry leaders. At Code BEAM events you’ll be the first to learn about new frameworks and applications for the BEAM VM that can increase your productivity and help make your life easier.
-          <br>
-          <br>
-          Inspire <br>
-          We believe that now, more than ever, conferences are a great opportunity to bring your team together to meet in person and connect with like-minded people to inspire the next big idea.
-          <br>
+
               </p>
          </div>
      </div>

diff --git a/_keynotes/from-awareness-to-action.md b/_keynotes/from-awareness-to-action.md
@@ -1,12 +1,12 @@
 ---
 audience: Everyone.
 tags:
-- Imposter syndrome 
-- Celebrating accomplishments 
-- Advocating for oneself 
+- Imposter syndrome
+- Celebrating accomplishments
+- Advocating for oneself
 title: 'From Awareness to Action: Speaking Openly about Accomplishments and Overcoming Imposter Syndrome'
 speakers:
 - _participants/ioana-rosu.md
 
 ---
-Description will be available shortly.
+Imposter syndrome, a common psychological phenomenon characterized by self-doubt and an inability to internalize one's accomplishments, affects individuals across various domains. The talk seeks to explore the journey from awareness to action in addressing imposter syndrome giving the participants the actionable insights needed to leave the conference equipped with a renewed sense of confidence, enabling them to navigate their professional journeys with authenticity and resilience.
diff --git a/_keynotes/making-software-and-data-architectures-more-sustainable.md b/_keynotes/making-software-and-data-architectures-more-sustainable.md
@@ -5,4 +5,13 @@ speakers:
 - _participants/madeleine-malmsten.md
 
 ---
-Description will be available shortly.
+The rising threat of climate change is leading countries to commit to ambitious carbon-reduction goals. Concurrently, a significant portion of Fortune 500 companies are targeting carbon emission cuts by 2030.
+
+As digital integration grows, Technology represents a huge opportunity, yet, the energy footprint of software is often overlooked. Each application transaction, interaction and dnew data asset adds to the energy demand, making sustainable software and data practices crucial.
+
+While improving sustainability in data and software alone won't solve climate change, with an understanding of technology's contribution to carbon emissions, a focus on tech's foundational elements at multiple levels can pave the way for more substantial reductions in the future:
+- Software engineers can reduce the carbon emissions from their software and data by being aware of the effects of their choices.
+- CTOs can make environmental sustainability a non-functional requirement for all software development.
+- Companies can incorporate the environmental effects of software as a metric when gauging the quality of a solution.
+
+The goal is to cultivate a culture that embeds environmental sustainability into standard software and data engineering practices. Now is the perfect time to start!
diff --git a/_participants/tonci-galic.md b/_participants/tonci-galic.md
@@ -1,9 +1,9 @@
 ---
-pic_url: "/assets/images/Tonci-Galic.jpg"
+pic_url: "/assets/images/tonci-galic.png"
 name: Tonći Galić
-tagline: Fullsnack Software Developer, Amsterdam |> Elixir
+tagline: "[:alchemist, :polyglot, :rower, :beerlover, :father] |> Stream.cycle"
 twitter: tuxified
 github: tuxified
 
 ---
-Tonći is a polyglot web developer with a broad range of interests and also a broad range of experiences. He started out with Perl/CGI around 1999, but worked with various languages/tools throughout the years. In the last few years, he has focused on Elixir as he is in love with the language. Since his new love, he enjoys discovering functional aspects of programming languages. He is the organiser of the Amsterdam Elixir meetup, Elixir Bootcamp and is a co-organiser of Code BEAM lite Amsterdam.
+Tonći is a polyglot webdeveloper with broad range of interests & also a broad range of experience. Started out with Perl/CGI around 1999, throughout the years worked with Java, PHP & C#/.NET. Last few years focused on Ruby/Rails but now in love with Elixir/Phoenix and functional aspects of programming languages. Organizer for the Amsterdam Elixir meetup.
diff --git a/_participants/vincent-liu.md b/_participants/vincent-liu.md
@@ -1,6 +1,6 @@
 ---
 pic_url: "/assets/images/shuntian-liu.png"
-name: Vinctent Liu
+name: Vincent Liu
 tagline: Master Student @ University Of Cambridge
 github: Vincent-lau
 twitter: Incipit0

diff --git a/_talks/automating-the-automator.md b/_talks/automating-the-automator.md
@@ -4,7 +4,7 @@ audience:
 tags: []
 title: Automating the automator
 speakers:
-- _participants/tonci-galic.md
+
 
 ---
 As software engineers we often automate other people's tasks, but how far can we go to automate our own tasks, like refactoring? With Elixir 1.13 and the Sourceror library, it might be easier than you think.

diff --git a/_talks/learn-you-some-datalog.md b/_talks/learn-you-some-datalog.md
@@ -0,0 +1,16 @@
+---
+tags:	
+- pragmatic problem solving
+level: Beginner and Overview
+title: 	"Learn you some Datalog"
+speakers:
+- _participants/tonci-galic.md
+
+---
+Whether you're a seasoned Erlang or Elixir developer or new to the languages, this talk aims to equip you with the knowledge and inspiration to harness the power of Datalog. Expand your programming horizons and join us on a quest to discover the remarkable benefits that Datalog can bring to your Erlang and Elixir projects.
+
+**Key Takeaways:**
+- Datalog, a logic programming language rooted in formal logic and database theory, has gained recognition for its ability to simplify complex querying and reasoning tasks. In this enlightening talk, tailored specifically for Erlang and Elixir developers, we dive into the world of Datalog and explore how it can be a valuable tool in your programming arsenal.
+
+**Target Audience:**
+- Folks not familiar to Datalog, curious to expand their toolset.
diff --git a/_talks/prototyping-a-remote-controlled-telescope-with-elixir.md b/_talks/prototyping-a-remote-controlled-telescope-with-elixir.md
@@ -6,7 +6,7 @@ title: 	"Prototyping A Remote-Controlled Telescope with Elixir"
 speakers: _participants/lucas-sifoni.md
 
 ---
-The different facets of Elixir enabled me to design, prototype, and build a physical device, from initial exploration of the problem domain with written research interleaved with code, to software prototypes that help grasp the actual problems a physical device can have, to a built terrestrial telescope, driven by a low-end RISC-V SoC running Elixir and Rust code.
+The different facets of Elixir enabled me to design, prototype, and build a physical device, from initial exploration of the problem domain with written research interleaved with code, to software prototypes that help grasp the actual problems a physical device can have, to a built terrestrial telescope, driven by a low-end RISC-V SbC running Elixir and Rust code.
 By the end, you'll also have a quick introduction to optics and the inner workings of telescopes!
 
 **Key Takeaways:**
@@ -16,4 +16,4 @@ By the end, you'll also have a quick introduction to optics and the inner workin
 - Simple hardware devices do not have to be hard to think about
 
 **Target Audience:**
-- People having experience in software, or web development, who would like to have a first go at controlling physical devices with Elixir. The goal of the talk is to make them feel that this is within reach and actually fun.
+- People having experience in software, or web development, who would like to have a first go at controlling physical devices with Elixir. The goal of the talk is to make them feel that this is within reach and actually fun.