Merge branch 'master' of github.com:ZeusWPI/Tab

This commit is contained in:
Tom Naessens 2015-09-08 15:22:31 +02:00
commit ef9ca50b01
13 changed files with 57 additions and 0 deletions

View file

@ -73,3 +73,5 @@ end
group :production do group :production do
gem 'mysql2' gem 'mysql2'
end end
gem 'high_voltage', '~> 2.4.0'

View file

@ -92,6 +92,7 @@ GEM
globalid (0.3.6) globalid (0.3.6)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
hashie (3.4.2) hashie (3.4.2)
high_voltage (2.4.0)
i18n (0.7.0) i18n (0.7.0)
jbuilder (2.3.1) jbuilder (2.3.1)
activesupport (>= 3.0.0, < 5) activesupport (>= 3.0.0, < 5)
@ -241,6 +242,7 @@ DEPENDENCIES
devise devise
factory_girl_rails factory_girl_rails
faker faker
high_voltage (~> 2.4.0)
jbuilder (~> 2.0) jbuilder (~> 2.0)
jquery-datatables-rails (~> 3.3.0) jquery-datatables-rails (~> 3.3.0)
jquery-rails jquery-rails

View file

@ -12,5 +12,6 @@
// //
//= require jquery //= require jquery
//= require jquery_ujs //= require jquery_ujs
//= require dataTables/jquery.dataTables
//= require turbolinks //= require turbolinks
//= require_tree . //= require_tree .

View file

@ -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/

View file

@ -11,5 +11,7 @@
* file per style scope. * file per style scope.
* *
*= require_tree . *= require_tree .
*= require dataTables/jquery.dataTables
*= require_self *= require_self
*= require purecss
*/ */

View file

@ -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
*/

View file

@ -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/

View file

@ -0,0 +1,2 @@
class UsersController < ApplicationController
end

View file

@ -0,0 +1,2 @@
module UsersHelper
end

View file

@ -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 %>

View file

@ -3,6 +3,8 @@ Rails.application.routes.draw do
omniauth_callbacks: 'callbacks' omniauth_callbacks: 'callbacks'
} }
root to: 'high_voltage/pages#show', id: "landing"
# The priority is based upon order of creation: first created -> highest priority. # The priority is based upon order of creation: first created -> highest priority.
# See how all your routes lay out with "rake routes". # See how all your routes lay out with "rake routes".

View file

@ -0,0 +1,5 @@
require 'rails_helper'
RSpec.describe UsersController, type: :controller do
end

View file

@ -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