Merge branch 'develop' into pin-gems

ePages-de · Jan 26, 2018 · eda0f4f · eda0f4f
2 parents c1982bf + abcf1bb
commit eda0f4f
Show file tree

Hide file tree

Showing 51 changed files with 756 additions and 5,930 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -161,4 +161,4 @@ RUBY VERSION
    ruby 2.4.2p198
 
 BUNDLED WITH
-   1.16.1.pre1
+   1.16.0
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -29,6 +29,7 @@ pipeline {
           rbenv local 2.4.2
           gem install bundler
           bundle install
+          bundle update
           rbenv rehash
           rake test_html
           rake test_files

diff --git a/_data/events.yml b/_data/events.yml
@@ -1,8 +1,27 @@
-- title: WIK HTWK Leipzig
-  description: We are exhibiting at this event.
-  link: http://www.wikway.de/wik-leipzig-htwk
-  location: 29. Nov 2017<br>10am - 4pm<br>HTKW Leipzig - Foyer NIEPER-Bau<br>Karl-Liebknecht-Straße 134<br>04277 Leipzig
-- title: academix Thüringen
-  description: We are exhibiting at this event.
-  link: http://www.thaff-thueringen.de/academix-thueringen/
-  location: 2. Dez 2017<br>10am - 6pm<br>Messe Erfurt<br>Gothaer Straße 34<br>99084 Erfurt
+- title: Meet the team
+  image: meet-the-team.png
+  video: https://www.youtube.com/watch?v=FbE2FyqTJCY
+
+- title: Hackathon 2017
+  image: hackathon_2017_2.png
+  video: https://www.youtube.com/watch?v=j-qMUo8_ChQ
+
+- title: R&amp;D day 2016
+  image: rnd_2016_1.jpg
+  video: https://www.youtube.com/watch?v=wNQ7B0rIB3g
+
+- title: Hackathon 2016
+  image: rnd_2016_2.jpg
+  video: https://www.youtube.com/watch?v=2UdyQma76IA
+
+- title: Lunch in the park
+  image: lunch-in-the-park.jpg
+
+- title: Tech meetup & pizzaaaa
+  image: meetup.jpg
+
+- title: Great team workshop
+  image: you_2016_1.jpg
+
+- title: After-work fun
+  image: you_2016_2.jpg
diff --git a/_data/exhibitions.yml b/_data/exhibitions.yml
@@ -0,0 +1,20 @@
+- title: JeffConf Hamburg 2018
+  description: We are participating at this event.
+  link: https://hamburg.jeffconf.com/agenda
+  date: 16. Feb 2018
+  time:
+  address: Altonaer Museum<br>Museumstraße 23<br>22765 Hamburg
+
+- title: Ruby Unconference
+  description: We are sponsoring this event.
+  link:
+  date: 5. - 6. May 2018
+  time:
+  address: Hamburg
+
+- title: Scrum Alliance Gathering
+  description: We are participating at this event.
+  link:
+  date: 8. - 10. Oct 2018
+  time:
+  address: ExCeL London<br>Royal Victoria Dock, 1 Western Gateway<br>London E16 1XL, UK
diff --git a/_includes/head.html b/_includes/head.html
@@ -16,7 +16,19 @@
   {% if site.data.seo.[base_url].description %}<meta name="description" content="{{ site.data.seo.[base_url].description }}">{% endif %}
   {% if site.data.seo.[base_url].keywords %}<meta name="keywords" content="{{ site.data.seo.[base_url].keywords | join: ', ' }}">{% endif %}
 
-  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto+Mono:400,400i,700,700i">
+  {% if site.data.seo.[url_base].description %}
+  <meta name="description" content="{{ site.data.seo.[url_base].description }}" property="og:description" />
+  {% endif %}
+
+  {% if site.data.seo.[url_base].keywords %}
+    <meta name="keywords" content="{{ site.data.seo.[url_base].keywords | join: ', ' }}" />
+  {% endif %}
+
+  {% if page.header_image %}
+    <meta property="og:image" name="twitter:image" content="{{ site.url }}/assets/img/pages/blog/headers/{{ page.header_image }}" />
+  {% endif %}
+
+  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto+Mono:400,400i,700,700i" />
 
   <script defer src="https://use.fontawesome.com/releases/v5.0.2/js/all.js"></script>
 
@@ -27,7 +39,6 @@
   {% assign ga_paths = "['/', 'blog', 'devjobs']" %}
 
   {% if ga_paths contains base_url %}
-
     <script>
       (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
@@ -45,7 +56,6 @@
 
       ga('send', 'pageview');
     </script>
-
   {% endif %}
 
 </head>
diff --git a/_layouts/about.html b/_layouts/about.html
@@ -0,0 +1,15 @@
+<!doctype html>
+
+<html>
+  {% include head.html %}
+  <body class="about">
+    {% include sections/navbar.html %}
+    {% include sections/header.html %}
+    <main>
+      <div class="content-wrapper">
+        {{ content }}
+      </div>
+    </main>
+    {% include sections/footer.html %}
+  </body>
+</html>
diff --git a/_pages/about.html b/_pages/about.html
@@ -0,0 +1,162 @@
+---
+layout: about
+permalink: /about/
+title: About us
+header_image: about.jpg
+---
+
+
+<section class="about">
+
+  <h2 class="section__title">Who we are</h2>
+
+  <div class="card">
+
+    <p class="card__body">As a team of software developers, designers, UX experts, technical writers and scrum masters we are a group of creative minds that strives to provide our customers with a great online shop software.</p>
+
+    <p class="card__body">Our developer portal is a platform from developers for developers, and comprises a combination of REST API documentation for our products, blog posts with topics from our tech stack, as well as job vacancies.</p>
+
+    <a href="/devjobs/" class="cta  cta--beyond">Become an ePages dev ›</a>
+
+  </div>
+
+</section>
+
+
+
+
+
+<section class="channels">
+
+  <h2 class="section__title">Our channels</h2>
+
+  <div class="card">
+
+    <ul>
+      <li>
+        <i class="fab  fa-fw  fa-twitter  fa-2x" aria-hidden="true"></i>
+        <p>Follow us on <a href="https://twitter.com/{{site.twitter_username}}" target="_blank">Twitter</a></p>
+      </li>
+      <li>
+        <i class="fab  fa-fw  fa-youtube  fa-2x" aria-hidden="true"></i>
+        <p>See what we're up to on <a href="https://youtube.com/channel/{{site.youtube_username}}">YouTube</a></p>
+      </li>
+      <li>
+        <i class="fas  fa-fw  fa-globe  fa-2x" aria-hidden="true"></i>
+        <p>Visit our <a href="https://epages.com" target="_blank">company website</a></p>
+      </li>
+    </ul>
+
+  </div>
+
+</section>
+
+
+
+
+
+<section class="events">
+
+  <h2 class="section__title">Great team - Great events!</h2>
+
+  <p class="section__body">Pictures say more than words: Take a sneak peek at some of the videos and pictures we collected from recent events.</p>
+
+  <div class="carousel  js-carousel--about">
+
+    {% for event in site.data.events %}
+
+      <div class="carousel__item">
+
+        {% if event.video %}
+
+          <a href="{{ event.video }}" style="display: block;" class="lightbox__youtube  js-lightbox__youtube">
+
+        {% else %}
+
+          <a href="/assets/img/pages/about/{{ event.image }}" style="display: block;" class="lightbox__image  js-lightbox__image">
+
+        {% endif %}
+
+          <div class="card  card--event">
+
+            {% if event.video %}
+
+              <div class="card--event__play-icon">
+                <i class="fas  fa-play" aria-hidden="true"></i>
+              </div>
+
+            {% endif %}
+
+            <div class="card--event__image" style="background-image: url('/assets/img/pages/about/{{ event.image }}');"></div>
+
+            <div class="card--event__body">
+              <h4 class="card--event__title">{{ event.title }}</h4>
+              <div class="card--event__date">{{ event.date }}</div>
+            </div>
+
+          </div>
+
+        {% if event.video or event.image %}</a>{% endif %}
+
+      </div>
+
+    {% endfor %}
+
+  </div>
+
+  <div class="carousel__paginator">
+    <div class="prev"><i class="fas  fa-3x  fa-angle-left"></i></div>
+    <div class="next"><i class="fas  fa-3x  fa-angle-right"></i></div>
+  </div>
+
+</section>
+
+
+
+
+
+<section class="exhibitions">
+
+  <h2 class="section__title">Let's meet!</h2>
+
+  <p class="section__body">We're at various conferences, meetups and job fairs throughout the year. Get in touch with us!</p>
+
+  <div class="card-container  card-container--exhibition">
+
+    {% for exhibition in site.data.exhibitions %}
+
+      <div class="card--float">
+
+        <div class="card  card--exhibition">
+
+          {% if exhibition.link %}<a target="_blank" href="{{ exhibition.link }}">{% endif %}
+
+          <div class="card--exhibition__upper">
+            <div class="card--exhibition__date">{{ exhibition.date }}{% if exhibition.time %} | {{ exhibition.time }}{% endif %}</div>
+            <div class="card--exhibition__title">{{ exhibition.title }}</div>
+          </div>
+
+          <div class="card--exhibition__lower">
+            <div class="card--exhibition__address">{{ exhibition.address }}</div>
+            <div class="card--exhibition__description">{{ exhibition.description }}</div>
+          </div>
+
+          {% if exhibition.link %}</a>{% endif %}
+
+        </div>
+
+      </div>
+
+    {% endfor %}
+
+  </div>
+
+</section>
+
+
+
+<link rel="stylesheet" href="/assets/slick/slick.css"/>
+<link rel="stylesheet" href="/assets/css/magnific-popup.css">
+<script src="/assets/js/jquery.magnific-popup.min.js"></script>
+<script src="/assets/slick/slick.min.js"></script>
+<script src="/assets/js/about.js"></script>
diff --git a/_pages/about.md b/_pages/about.md