From 92ea1441166d0a5a9842deb7366c323b89bf000a Mon Sep 17 00:00:00 2001
From: Ilion Beyst <ilion.beyst@gmail.com>
Date: Tue, 8 Sep 2015 15:14:46 +0200
Subject: [PATCH 1/4] Add user controller and views

---
 Gemfile.lock                              |  6 ++++++
 app/assets/javascripts/users.coffee       |  3 +++
 app/assets/stylesheets/users.scss         |  3 +++
 app/controllers/users_controller.rb       |  2 ++
 app/helpers/users_helper.rb               |  2 ++
 spec/controllers/users_controller_spec.rb |  5 +++++
 spec/helpers/users_helper_spec.rb         | 15 +++++++++++++++
 7 files changed, 36 insertions(+)
 create mode 100644 app/assets/javascripts/users.coffee
 create mode 100644 app/assets/stylesheets/users.scss
 create mode 100644 app/controllers/users_controller.rb
 create mode 100644 app/helpers/users_helper.rb
 create mode 100644 spec/controllers/users_controller_spec.rb
 create mode 100644 spec/helpers/users_helper_spec.rb

diff --git a/Gemfile.lock b/Gemfile.lock
index 7304f1a..2bb2b88 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -96,6 +96,11 @@ GEM
     jbuilder (2.3.1)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
+    jquery-datatables-rails (3.3.0)
+      actionpack (>= 3.1)
+      jquery-rails
+      railties (>= 3.1)
+      sass-rails
     jquery-rails (4.0.5)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
@@ -237,6 +242,7 @@ DEPENDENCIES
   factory_girl_rails
   faker
   jbuilder (~> 2.0)
+  jquery-datatables-rails (~> 3.3.0)
   jquery-rails
   mysql2 (~> 0.3.0)
   omniauth-oauth2
diff --git a/app/assets/javascripts/users.coffee b/app/assets/javascripts/users.coffee
new file mode 100644
index 0000000..24f83d1
--- /dev/null
+++ b/app/assets/javascripts/users.coffee
@@ -0,0 +1,3 @@
+# Place all the behaviors and hooks related to the matching controller here.
+# All this logic will automatically be available in application.js.
+# You can use CoffeeScript in this file: http://coffeescript.org/
diff --git a/app/assets/stylesheets/users.scss b/app/assets/stylesheets/users.scss
new file mode 100644
index 0000000..1efc835
--- /dev/null
+++ b/app/assets/stylesheets/users.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the users controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
new file mode 100644
index 0000000..3e74dea
--- /dev/null
+++ b/app/controllers/users_controller.rb
@@ -0,0 +1,2 @@
+class UsersController < ApplicationController
+end
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
new file mode 100644
index 0000000..2310a24
--- /dev/null
+++ b/app/helpers/users_helper.rb
@@ -0,0 +1,2 @@
+module UsersHelper
+end
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
new file mode 100644
index 0000000..e2c3d3b
--- /dev/null
+++ b/spec/controllers/users_controller_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe UsersController, type: :controller do
+
+end
diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb
new file mode 100644
index 0000000..b2e3444
--- /dev/null
+++ b/spec/helpers/users_helper_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+# Specs in this file have access to a helper object that includes
+# the UsersHelper. For example:
+#
+# describe UsersHelper do
+#   describe "string concat" do
+#     it "concats two strings with spaces" do
+#       expect(helper.concat_strings("this","that")).to eq("this that")
+#     end
+#   end
+# end
+RSpec.describe UsersHelper, type: :helper do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 9a7c9686cc84c8904ce9364cb3543f3f4c8e83d1 Mon Sep 17 00:00:00 2001
From: Ilion Beyst <ilion.beyst@gmail.com>
Date: Tue, 8 Sep 2015 15:15:17 +0200
Subject: [PATCH 2/4] Install datatables

---
 app/assets/javascripts/application.js  | 1 +
 app/assets/stylesheets/application.css | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index e07c5a8..6a254ee 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,5 +12,6 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require dataTables/jquery.dataTables
 //= require turbolinks
 //= require_tree .
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index f9cd5b3..28c16f8 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -11,5 +11,6 @@
  * file per style scope.
  *
  *= require_tree .
+ *= require dataTables/jquery.dataTables
  *= require_self
  */

From 5df3327e722d33ce13b80fe330657e863861a117 Mon Sep 17 00:00:00 2001
From: benji <benj_cous@hotmail.com>
Date: Tue, 8 Sep 2015 15:16:08 +0200
Subject: [PATCH 3/4] Add landing page

---
 Gemfile                          | 2 ++
 Gemfile.lock                     | 2 ++
 app/views/pages/landing.html.erb | 9 +++++++++
 config/routes.rb                 | 2 ++
 4 files changed, 15 insertions(+)
 create mode 100644 app/views/pages/landing.html.erb

diff --git a/Gemfile b/Gemfile
index f254794..22d93c5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -67,3 +67,5 @@ end
 group :production do
   gem 'mysql2'
 end
+
+gem 'high_voltage', '~> 2.4.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 56694dc..ee4a0a7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -92,6 +92,7 @@ GEM
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     hashie (3.4.2)
+    high_voltage (2.4.0)
     i18n (0.7.0)
     jbuilder (2.3.1)
       activesupport (>= 3.0.0, < 5)
@@ -234,6 +235,7 @@ DEPENDENCIES
   devise
   factory_girl_rails
   faker
+  high_voltage (~> 2.4.0)
   jbuilder (~> 2.0)
   jquery-rails
   mysql2
diff --git a/app/views/pages/landing.html.erb b/app/views/pages/landing.html.erb
new file mode 100644
index 0000000..31184f6
--- /dev/null
+++ b/app/views/pages/landing.html.erb
@@ -0,0 +1,9 @@
+<h1>Hallo</h1>
+
+<% if user_signed_in? %>
+  <p>Yeah! Je bent ingelogd.</p>
+<% else %>
+  Log een keer in!
+  <p><%= link_to "Log in met Zeus WPI", user_omniauth_authorize_path(:zeuswpi) %></p>
+<% end %>
+
diff --git a/config/routes.rb b/config/routes.rb
index 6547aea..c800bae 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -3,6 +3,8 @@ Rails.application.routes.draw do
     omniauth_callbacks: 'callbacks'
   }
 
+  root to: 'high_voltage/pages#show', id: "landing"
+
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".
 

From cbb3284622be6f4809b12bc3ffc3ec7375e60132 Mon Sep 17 00:00:00 2001
From: benji <benj_cous@hotmail.com>
Date: Tue, 8 Sep 2015 15:20:28 +0200
Subject: [PATCH 4/4] Install purecss

---
 app/assets/stylesheets/application.css | 1 +
 app/assets/stylesheets/purecss.css     | 9 +++++++++
 2 files changed, 10 insertions(+)
 create mode 100644 app/assets/stylesheets/purecss.css

diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 28c16f8..f03067c 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -13,4 +13,5 @@
  *= require_tree .
  *= require dataTables/jquery.dataTables
  *= require_self
+ *= require purecss
  */
diff --git a/app/assets/stylesheets/purecss.css b/app/assets/stylesheets/purecss.css
new file mode 100644
index 0000000..a8615b6
--- /dev/null
+++ b/app/assets/stylesheets/purecss.css
@@ -0,0 +1,9 @@
+/*
+  =require purecss/base
+  =require purecss/buttons
+  =require purecss/forms
+  =require purecss/grids
+  =require purecss/grids-responsive
+  =require purecss/menus
+  =require purecss/tables
+*/