Merge pull request #186 from ePages-de/develop

Release v0.3.0
ePages-de · Jan 26, 2018 · 599e97a · 599e97a
2 parents 24f16cf + 83898dd
commit 599e97a
Show file tree

Hide file tree

Showing 319 changed files with 5,594 additions and 15,561 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ _site
 .bundle
 _config_write.yml
 log/
+.DS_Store
diff --git a/Gemfile b/Gemfile
@@ -1,21 +1,21 @@
 source 'https://rubygems.org'
 ruby RUBY_VERSION
 
-gem 'jekyll'
-gem 'rake'
-gem 'colorize'
-gem 'html-proofer'
+gem 'jekyll', '3.7.2'
+gem 'rake', '12.3.0'
+gem 'colorize', '0.8.1'
+gem 'html-proofer', '3.8.0'
 gem 'capistrano', '3.8.1', require: false
-gem 'capistrano-rbenv', require: false
-gem 'capistrano-bundler', require: false
+gem 'capistrano-rbenv', '2.1.3', require: false
+gem 'capistrano-bundler', '1.3.0', require: false
 
 group :jekyll_plugins do
-  gem 'jekyll-feed'
-  gem 'jekyll-admin'
-  gem 'bourbon'
-  gem 'neat'
-  gem 'rouge'
-  gem 'jekyll-twitter-plugin'
+  gem 'jekyll-feed', '0.9.2'
+  gem 'jekyll-admin', '0.7.0'
+  gem 'bourbon', '5.0.0'
+  gem 'neat', '2.1.0'
+  gem 'rouge', '3.1.0'
+  gem 'jekyll-twitter-plugin', '2.0.0'
   gem 'jekyll-paginate-v2', '1.9.0'
 end
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -10,7 +10,7 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     airbrussh (1.3.0)
       sshkit (>= 1.6.1, != 1.7.0)
-    backports (3.11.0)
+    backports (3.11.1)
     bourbon (5.0.0)
       sass (~> 3.4)
       thor (~> 0.19)
@@ -46,9 +46,9 @@ GEM
       typhoeus (~> 1.3)
       yell (~> 2.0)
     http_parser.rb (0.6.0)
-    i18n (0.9.1)
+    i18n (0.9.3)
       concurrent-ruby (~> 1.0)
-    jekyll (3.7.0)
+    jekyll (3.7.2)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -83,7 +83,7 @@ GEM
       ruby_dep (~> 1.2)
     mercenary (0.3.6)
     mini_portile2 (2.3.0)
-    minitest (5.11.1)
+    minitest (5.11.2)
     multi_json (1.13.1)
     neat (2.1.0)
       sass (~> 3.4)
@@ -141,20 +141,20 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bourbon
+  bourbon (= 5.0.0)
   capistrano (= 3.8.1)
-  capistrano-bundler
-  capistrano-rbenv
-  colorize
-  html-proofer
-  jekyll
-  jekyll-admin
-  jekyll-feed
+  capistrano-bundler (= 1.3.0)
+  capistrano-rbenv (= 2.1.3)
+  colorize (= 0.8.1)
+  html-proofer (= 3.8.0)
+  jekyll (= 3.7.2)
+  jekyll-admin (= 0.7.0)
+  jekyll-feed (= 0.9.2)
   jekyll-paginate-v2 (= 1.9.0)
-  jekyll-twitter-plugin
-  neat
-  rake
-  rouge
+  jekyll-twitter-plugin (= 2.0.0)
+  neat (= 2.1.0)
+  rake (= 12.3.0)
+  rouge (= 3.1.0)
   tzinfo-data
 
 RUBY VERSION

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -37,7 +37,24 @@ pipeline {
         '''
       }
     }
-    stage('Deploy') {
+    stage('Deploy Staging') {
+      when { branch 'develop' }
+      steps {
+        sh '''
+          source ~/.bash_profile
+          export PATH=$PATH:/usr/local/bin:$HOME/.rbenv/bin:$HOME/.rbenv/shims
+          eval "$(rbenv init -)"
+          rbenv local 2.4.2
+          gem install bundler
+          bundle install
+          rbenv rehash
+          eval `ssh-agent -s`
+          ssh-add
+          bundle exec cap staging deploy --trace
+        '''
+      }
+    }
+    stage('Deploy Live') {
       when { branch 'master' }
       steps {
         sh '''

diff --git a/Rakefile b/Rakefile
@@ -269,7 +269,7 @@ task :test_files do
                                './.sass_cache',
                                './.tweet-cache',
                                './assets/font-awesome',
-                               './assets/fonts_new',
+                               './assets/fonts',
                                './vendor']).run
 end
 

diff --git a/_config.yml b/_config.yml
@@ -46,6 +46,10 @@ exclude:
   - Capfile
   - _pages/url-map
   - resources
+  - README.md
+  - run_tests.sh
+  - config/
+  - log/
 
 feed:
   path: /blog/feed.xml

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/components/arrow-up.html b/_includes/components/arrow-up.html
@@ -1 +1,3 @@
-<span class="arrow-up"></span>
+<span class="arrow-up">
+    <i class="fas  fa-fw  fa-2x  fa-angle-up"></i>
+</span>
diff --git a/_includes/components/post-card.html b/_includes/components/post-card.html
@@ -1,13 +1,21 @@
-<div class="card  card--post">
-  <a href="{{ include.url }}" class="card--post__post-link">
-    <div class="card--post__header" style="background-image: url(/assets/img/pages/blog/headers/{% post_header include.header_image %}); background-position: center {{ include.header_position }}"></div>
-    <div class="card--post__body">
-      <h3 class="card--post__title">{{ include.title }}</h3>
-      <div class="card--post__footer">
-        <div class="card--post__author">{{ include.authors | join: ", "}}</div>
-        <div class="card--post__date">{{ include.date | date: "%b %d, %Y" }}</div>
+{% comment %}
+
+  IMPORTANT!!
+
+  DON'T USE DOUBLE QUOTATION MARKS on this file. It will break the infinite scroll functionality.
+
+{% endcomment %}
+
+<div class='card  card--post'>
+  <a href='{{ include.url }}' class='card--post__post-link'>
+    <div class='card--post__header' style='background-image: url(/assets/img/pages/blog/headers/{% post_header include.header_image %}); background-position: center {{ include.header_position }}'></div>
+    <div class='card--post__body'>
+      <h3 class='card--post__title'>{{ include.title }}</h3>
+      <div class='card--post__footer'>
+        <div class='card--post__author'>{{ include.authors | join: ', '}}</div>
+        <div class='card--post__date'>{{ include.date | date: '%b %d, %Y' }}</div>
       </div>
     </div>
   </a>
-  <a href="/blog/{{ include.category }}" class="card--post__category  card--post__category--{{ include.category }}">{{ include.category | category_name }}</a>
+  <a href='/blog/{{ include.category }}' class='card--post__category  card--post__category--{{ include.category }}'>{{ include.category | category_name }}</a>
 </div>
diff --git a/_includes/components/post-share.html b/_includes/components/post-share.html
@@ -1,8 +1,11 @@
 <div class="post-share">
+
   <a href="https://twitter.com/intent/tweet?text={{ page.title | cgi_escape }}&amp;url={{ site.url }}{{ page.url }}&amp;via={{ site.twitter_username }}&amp;related={{ site.twitter_username }}" rel="nofollow" target="_blank" title="Share on Twitter">
-    <img src="/assets/img/icons/twitter_color.svg" alt="Twitter Icon" class="icon-share">
+    <i class="fab  fa-fw  fa-2x  fa-twitter-square"></i>
   </a>
+
   <a href="https://www.facebook.com/sharer/sharer.php?u={{ site.url }}{{ page.url }}" rel="nofollow" target="_blank" title="Share on Facebook">
-    <img src="/assets/img/icons/facebook_color.svg" alt="Facebook Icon" class="icon-share">
+    <i class="fab  fa-fw  fa-2x  fa-facebook-square"></i>
   </a>
+
 </div>
diff --git a/_includes/components/search-bar.html b/_includes/components/search-bar.html
@@ -1,3 +1,6 @@
 <form action="/blog/search/" method="get" class="search-form">
-  <input type="text" class="search-input" placeholder="Search for tags, keywords, etc." name="query" id="search-box">
+  <div class="input-wrapper">
+    <i class="fas  fa-fw  fa-search"></i>
+    <input type="text" class="search-input" placeholder="Search for tags, keywords, etc." name="query" id="search-box">
+  </div>
 </form>
diff --git a/_includes/components/signup-form.html b/_includes/components/signup-form.html
@@ -1,4 +1,4 @@
-<div class="card  modal">
+<div class="modal">
 
   {% include components/load-spinner.html %}
 

diff --git a/_includes/head.html b/_includes/head.html
@@ -2,31 +2,40 @@
   <meta charset="UTF-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
-  <link rel="icon" type="image/png" href="/assets/img/favicon.ico" sizes="32x32">
+  <link rel="icon" type="image/png" href="/assets/img/logos/favicon.ico" sizes="32x32">
 
   <title>{% if page.permalink == '/' %}{{ site.title }}{% else %}{{ page.title }} | {{ site.title }}{% endif %}</title>
 
-  {% capture url_base %}{{ page.url | split: '/' | second }}{% endcapture %}
-  {% if site.data.seo.[url_base].description %}<meta name="description" content="{{ site.data.seo.[url_base].description }}">{% endif %}
-  {% if site.data.seo.[url_base].keywords %}<meta name="keywords" content="{{ site.data.seo.[url_base].keywords | join: ', ' }}">{% endif %}
+  {% if page.url == '/' %}
+    {% assign base_url = '/' %}
+  {% else %}
+    {% assign base_url = page.url | split: '/' %}
+    {% assign base_url = base_url[1] %}
+  {% endif %}
+
+  {% 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.layout == 'devjobs' %}
-    <link rel="stylesheet" href="/assets/font-awesome/css/font-awesome.min.css">
+  {% 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>
+
   <link rel="stylesheet" href="/assets/css/main.css" />
 
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
 
-  {% if page.url == '/' %}
-    {% assign base_url = '/' %}
-  {% else %}
-    {% assign base_url = page.url | split: '/' %}
-    {% assign base_url = base_url[1] %}
-  {% endif %}
-
   {% assign ga_paths = "['/', 'blog', 'devjobs']" %}
 
   {% if ga_paths contains base_url %}

diff --git a/_includes/sections/footer.html b/_includes/sections/footer.html
@@ -3,24 +3,24 @@
 
     <div class="row  row--logo">
       <a href="https://epages.com" target="_blank">
-        <img src="/assets/img/logo_epages_white.svg" alt="ePages Logo" class="logo  logo--epages">
+        <img src="/assets/img/logos/logo_epages_white.svg" alt="ePages Logo" class="logo  logo--epages">
       </a>
     </div>
 
     <div class="row  row--social">
       <a href="https://twitter.com/{{site.twitter_username}}" target="_blank">
-        <img src="/assets/img/icons/twitter_white.svg" alt="Twitter Icon" class="icon  icon--twitter">
+        <i class="fab  fa-fw  fa-2x  fa-twitter  icon  icon--twitter"></i>
       </a>
       <a href="https://github.com/{{site.github_username}}" target="_blank">
-        <img src="/assets/img/icons/github_white.svg" alt="Github Icon" class="icon  icon--github">
+        <i class="fab  fa-fw  fa-2x  fa-github  icon  icon--github"></i>
       </a>
       <a href="https://youtube.com/channel/{{site.youtube_username}}" target="_blank">
-        <img src="/assets/img/icons/youtube_white.svg" alt="YouTube Icon" class="icon  icon--youtube">
+        <i class="fab  fa-fw  fa-2x  fa-youtube  icon  icon--youtube"></i>
       </a>
       {% assign url = page.url | split: '/' %}
       {% if url[1] == 'blog' %}
         <a href="/blog/feed.xml" target="_blank">
-          <img src="/assets/img/icons/rss_white.svg" alt="RSS Icon" class="icon  icon--rss">
+          <i class="fas  fa-fw  fa-2x  fa-rss  icon  icon--rss"></i>
         </a>
       {% endif %}
     </div>

diff --git a/_includes/sections/navbar.html b/_includes/sections/navbar.html
@@ -2,7 +2,7 @@
   <div class="navbar-wrapper">
 
     <a href="/">
-      <img src="/assets/img/logo_developer_portal_white.svg" alt="ePages Logo"  class="logo  logo--devportal">
+      <img src="/assets/img/logos/logo_developer_portal_white.svg" alt="ePages Logo"  class="logo  logo--devportal">
     </a>
 
     <nav class="navigation">
@@ -26,7 +26,7 @@
     </nav>
 
     <div class="navigation__button">
-      <img src="/assets/img/icons/menu_white.svg" alt="Menu Icon">
+      <i class="fas  fa-fw  fa-2x  fa-bars"></i>
     </div>
 
     <div class="navigation__background"></div>

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>
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,4 @@ _site @@
     .bundle
     _config_write.yml
     log/
+    .DS_Store