Fix logging in to work and add flashes

Author: cycomachead

app/assets/stylesheets/application.css

@@ -10,7 +10,7 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
- *= require bootstrap/dist/css/bootstrap.min.css
+ *= require flashes.css
  *= require bootstrap/dist/css/bootstrap-theme.min.css
  *= require_self
  */

app/assets/stylesheets/application.css.scss

@@ -4,13 +4,12 @@ class SessionsController < ApplicationController
   def create
     auth_hash = request.env['omniauth.auth']
 
-    render :text => auth_hash.inspect
-
     begin
       @user = User.from_omniauth(request.env['omniauth.auth'])
       session[:user_id] = @user.id
       flash[:success] = "Welcome, #{@user.name}!"
-    rescue
+    rescue Exception => e
+      puts e.message
       flash[:warning] = "There was an error while trying to authenticate you..."
     end
     redirect_to root_path

app/controllers/sessions_controller.rb

@@ -1,9 +1,9 @@
 class User < ActiveRecord::Base
-  def from_omniauth(auth_hash)
+  def self.from_omniauth(auth_hash)
     user = find_or_create_by(uid: auth_hash['uid'], provider: auth_hash['provider'])
     user.name = auth_hash['info']['name']
     user.email = auth_hash['info']['email']
-    #user.location = auth_hash['info']['location']
+    # user.location = auth_hash['info']['location']
     user.image_url = auth_hash['info']['image']
     # user.url = auth_hash['info']['urls']['Twitter']
     user.save!

app/models/user.rb

@@ -1,7 +1,9 @@
+p
+  = 'Flashes go here'
 - if flash.any?
   .flashes
     - user_facing_flashes.each do |key, value|
-      |  <div class="flash-
+      |  <div class="alert alert-dismissible flash flash-
       = key
-      | ">
+      | " role="alert">
       = value

app/views/application/_flashes.html.slim

@@ -29,4 +29,7 @@ h1
               = link_to 'View Starter File', starter_file_question_path(question.id)
 
 .container
-    = link_to 'Admin Login', '/auth/google'
+    - if current_user
+        = link_to 'Logout', '/logout', method: :delete
+    - else
+        = link_to 'Admin Login', '/auth/google'

app/views/questions/index.html.slim

@@ -13,6 +13,7 @@
     "jquery-ujs": "~1.x.x",
     "bootstrap": "~3.x.x",
     "font-awesome": "~4.x.x",
-    "underscore": "^1.8.3"
+    "underscore": "^1.8.3",
+    "bootstrap-sass": "^3.3.6"
   }
 }