Merge for production (TheThingsNetwork#106)

Author: FokkeZB

.eslintrc.json

@@ -3,7 +3,8 @@
         "browser": true,
         "commonjs": true,
         "es6": true,
-        "node": true
+        "node": true,
+        "jquery": true
     },
     "parserOptions": {
         "ecmaFeatures": {

.gitignore

@@ -1,6 +1,7 @@
 # Generated site
-_site
-_test
+/_site
+/_test
+/_scp
 
 # Logs
 logs
@@ -13,7 +14,6 @@ npm-debug.log*
 # Do include Sass since GitHub Pages needs it to build the Jekyll site
 !/node_modules/font-awesome
 !/node_modules/stylebook
-!/node_modules/smooth-scroll
 
 # Cache
 .npm
@@ -25,4 +25,4 @@ npm-debug.log*
 
 # Private
 /.env
-/_local
+/_local

.spelling

@@ -1,16 +1,19 @@
+branches:
+  only: master
 language: ruby
 rvm: 2.2.0
-sudo: false
+sudo: false # speeds up builds by using the container-based infrastructure
 env:
   global:
-  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-  - TRAVIS_NODE_VERSION="4"
-  - SOURCE_BRANCH="master"
-  - secure: YLSAvt/O0rqAyTIYo4Rc2xJzq/IsI1oujhBajR/KAxjNvd9L7An2Qv66SS2v6VzQ2KqTua/ZdWWO0lLnVgchADN9dUDlHgGK8ZAyu/eEd5/9zId7CNntg3CwrWVLUyAxWQqOo4hvo5BZpkn5QCKsvoIA9Kvb9FvXc8ipZ/9nCgThAY2xiJuO/69RphGc+10DBRekkZSrGdH7T/0b25gDiNDvvwEU1XVVnV3HSBAONYlDgPzUMK6lfSsflNL3NKDfBtcnPXTPn/FOVSJGGOBkMlRpuNasS2tT7wrsYCprpSIe4OK0CsFrl+MkcaifhVVfXYhmqy7k0KjBoIEJueNdoSM1yc9rglpUCIXWTE4hG+BfC3fLkNEZB/gDkLV6uOifu2aNjZQ19WpcG+Q8WSjnBXId7sREUU3sJ1HS9UuPDLd7l+fh2zS/ti9KQDYLf/h2s0MRgO8zYoqRteutqqU2dyk34ih41rpx1cTp0RmT+nsy6ppqAPZmZrc+YkA8WitVILWykeP5vw/242PU6nbg5pcpJ9eg2EvwZ8yqLuKxBYCek5khr/PjaYM/Uz82HXy4vAy2RGQSxsDrIyN4dx0VkIghpuLmDq/d16MPbdpeYkRg7rhf1BZ/qZPRg5AavtxN1Q0X5MqNxzLkiXNHe+QdsjvNechosB2M9un7wcTUJM0=
+  - NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer
+  - TRAVIS_NODE_VERSION="6"
+  - SOURCE_BRANCH="master" # only deploy from master
+  - secure: PiWLpQoluWMoZHM+lWXgHKUs9ez3o07xiUKEohppGWhlC1k0y2qHu9C906r5YWGESZ2Okr22n1G+ToisW+CJ5Dd7CHzaDrJBt3SY9ZTfUxrg9pleAZF5EM/9DfhS7i4YnunYrrUooCYdT6UNvLS5FlWutNKueEeC9ACAXSgFG8IdN8WrEv3nUi+l10ORZEMlCQrndorxq2JvqBsZjdjVQciDzUv4SQ0AVUQT0d9JCT4OP/+TvcAwhcmAkAaM2NanAikdFq//7wccuAY+77S+lnm2m2NDNvbeHp4/mManBP+gtUQgk+GoWOmY8GOTyz8qUZuFzKDC0RI4XrHFgrcGmBq0dHXIpbbihTksJQowP6SC8qz4RBI1IWR4/yUzrOaIVyJpT49SHShLpx8inmb0cDt5c0pWpwY0JOIAHPWddfu74Uzi82RI4Ff1jVCcCHWKckdM6YJlB8YMimBslmKKYDNNwhWY+03n77nZihWx5uXjF8t8GW2YPl1jTDxtACTEzrUwgOaYxd6qrk6t6bSVFOMQC1b6RklvYYjWuAcr6C/4N1MUf2jTjRS63CTq3nDTd3/z19mv1gXTXjMOChCdebSEgxE1sF9tVZuhZsA2d0QcwSE0rHEzPZgflpYMrNxmWq5eTtFXQf3U0QG8fzKbn/LIz968bsW2gR4HvVIx4Fg=
 install:
 - bundle install
 - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm
   && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm
   install $TRAVIS_NODE_VERSION
 - npm install
-script: npm test && bundle exec rake deploy
+# disabling tests until production is up: npm test && bundle exec rake deploy
+script: bundle exec rake deploy

.travis.yml

@@ -1,6 +1,15 @@
 source 'https://rubygems.org'
 
-gem 'github-pages', '104', group: :jekyll_plugins
+gem 'jekyll'
+
+group :jekyll_plugins do
+    gem 'jekyll-seo-tag'
+    gem 'jekyll-sitemap'
+    gem 'jekyll-redirect-from'
+    gem 'jemoji'
+end
+
 gem 'html-proofer'
+
 gem 'rake'
 gem 'rake-jekyll'

Gemfile

@@ -1,61 +1,25 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.7)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
-    coffee-script (2.4.1)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.11.1)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     colorator (1.1.0)
     colored (1.2)
-    ethon (0.9.0)
+    ethon (0.10.1)
       ffi (>= 1.3.0)
-    execjs (2.7.0)
-    faraday (0.10.0)
-      multipart-post (>= 1.2, < 3)
     ffi (1.9.14)
     forwardable-extended (2.6.0)
     gemoji (2.1.0)
-    github-pages (104)
-      activesupport (= 4.2.7)
-      github-pages-health-check (= 1.2.0)
-      jekyll (= 3.3.0)
-      jekyll-avatar (= 0.4.2)
-      jekyll-coffeescript (= 1.0.1)
-      jekyll-feed (= 0.8.0)
-      jekyll-gist (= 1.4.0)
-      jekyll-github-metadata (= 2.2.0)
-      jekyll-mentions (= 1.2.0)
-      jekyll-paginate (= 1.1.0)
-      jekyll-redirect-from (= 0.11.0)
-      jekyll-sass-converter (= 1.3.0)
-      jekyll-seo-tag (= 2.1.0)
-      jekyll-sitemap (= 0.12.0)
-      jekyll-swiss (= 0.4.0)
-      jemoji (= 0.7.0)
-      kramdown (= 1.11.1)
-      liquid (= 3.0.6)
-      listen (= 3.0.6)
-      mercenary (~> 0.3)
-      minima (= 2.0.0)
-      rouge (= 1.11.1)
-      terminal-table (~> 1.4)
-    github-pages-health-check (1.2.0)
-      addressable (~> 2.3)
-      net-dns (~> 0.8)
-      octokit (~> 4.0)
-      public_suffix (~> 1.4)
-      typhoeus (~> 0.7)
     html-pipeline (2.4.2)
       activesupport (>= 2)
       nokogiri (>= 1.4)
-    html-proofer (3.1.0)
+    html-proofer (3.3.1)
       activesupport (>= 4.2, < 6.0)
       addressable (~> 2.3)
       colored (~> 1.2)
@@ -65,7 +29,7 @@ GEM
       typhoeus (~> 0.7)
       yell (~> 2.0)
     i18n (0.7.0)
-    jekyll (3.3.0)
+    jekyll (3.3.1)
       addressable (~> 2.4)
       colorator (~> 1.0)
       jekyll-sass-converter (~> 1.0)
@@ -76,31 +40,14 @@ GEM
       pathutil (~> 0.9)
       rouge (~> 1.7)
       safe_yaml (~> 1.0)
-    jekyll-avatar (0.4.2)
-      jekyll (~> 3.0)
-    jekyll-coffeescript (1.0.1)
-      coffee-script (~> 2.2)
-    jekyll-feed (0.8.0)
-      jekyll (~> 3.3)
-    jekyll-gist (1.4.0)
-      octokit (~> 4.2)
-    jekyll-github-metadata (2.2.0)
-      jekyll (~> 3.1)
-      octokit (~> 4.0, != 4.4.0)
-    jekyll-mentions (1.2.0)
-      activesupport (~> 4.0)
-      html-pipeline (~> 2.3)
-      jekyll (~> 3.0)
-    jekyll-paginate (1.1.0)
     jekyll-redirect-from (0.11.0)
       jekyll (>= 2.0)
-    jekyll-sass-converter (1.3.0)
-      sass (~> 3.2)
+    jekyll-sass-converter (1.5.0)
+      sass (~> 3.4)
     jekyll-seo-tag (2.1.0)
       jekyll (~> 3.3)
     jekyll-sitemap (0.12.0)
       jekyll (~> 3.3)
-    jekyll-swiss (0.4.0)
     jekyll-watch (1.5.0)
       listen (~> 3.0, < 3.1)
     jemoji (0.7.0)
@@ -109,27 +56,20 @@ GEM
       html-pipeline (~> 2.2)
       jekyll (>= 3.0)
     json (1.8.3)
-    kramdown (1.11.1)
+    kramdown (1.13.1)
     liquid (3.0.6)
-    listen (3.0.6)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9.7)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
     mercenary (0.3.6)
     mini_portile2 (2.1.0)
-    minima (2.0.0)
-    minitest (5.9.0)
-    multipart-post (2.0.0)
-    net-dns (0.8.0)
-    nokogiri (1.6.8)
+    minitest (5.10.1)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    octokit (4.6.2)
-      sawyer (~> 0.8.0, >= 0.5.3)
-    parallel (1.9.0)
+    parallel (1.10.0)
     pathutil (0.14.0)
       forwardable-extended (~> 2.6)
-    pkg-config (1.1.7)
-    public_suffix (1.5.3)
+    public_suffix (2.0.4)
     rake (10.5.0)
     rake-jekyll (1.1.0)
       rake (~> 10.0)
@@ -139,25 +79,23 @@ GEM
     rouge (1.11.1)
     safe_yaml (1.0.4)
     sass (3.4.22)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
-    terminal-table (1.7.3)
-      unicode-display_width (~> 1.1.1)
     thread_safe (0.3.5)
     typhoeus (0.8.0)
       ethon (>= 0.8.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    unicode-display_width (1.1.1)
-    yell (2.0.6)
+    yell (2.0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  github-pages (= 104)
   html-proofer
+  jekyll
+  jekyll-redirect-from
+  jekyll-seo-tag
+  jekyll-sitemap
+  jemoji
   rake
   rake-jekyll