Shelan

.gitignore

@@ -15,3 +15,4 @@
 
 # Ignore Byebug command history file.
 .byebug_history
+.env

Gemfile

@@ -34,6 +34,9 @@ gem 'jbuilder', '~> 2.5'
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
 
+gem "omniauth"
+gem "omniauth-github"
+
 gem 'bootstrap', '~> 4.1.3'
 
 group :development, :test do
@@ -62,6 +65,7 @@ group :development do
   # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
+  gem 'dotenv-rails'
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem

Gemfile.lock

@@ -70,11 +70,18 @@ GEM
     concurrent-ruby (1.0.5)
     crass (1.0.4)
     debug_inspector (0.0.3)
+    dotenv (2.5.0)
+    dotenv-rails (2.5.0)
+      dotenv (= 2.5.0)
+      railties (>= 3.2, < 6.0)
     erubi (1.7.1)
     execjs (2.7.0)
+    faraday (0.15.3)
+      multipart-post (>= 1.2, < 3)
     ffi (1.9.25)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
+    hashie (3.5.7)
     i18n (1.1.0)
       concurrent-ruby (~> 1.0)
     jbuilder (2.7.0)
@@ -84,6 +91,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
+    jwt (2.1.0)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -113,9 +121,26 @@ GEM
       minitest (~> 5.0)
       rails (>= 4.1)
     multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
     nio4r (2.3.1)
     nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    omniauth (1.8.1)
+      hashie (>= 3.4.6, < 3.6.0)
+      rack (>= 1.6.2, < 3)
+    omniauth-github (1.3.0)
+      omniauth (~> 1.5)
+      omniauth-oauth2 (>= 1.4.0, < 2.0)
+    omniauth-oauth2 (1.5.0)
+      oauth2 (~> 1.1)
+      omniauth (~> 1.2)
     pg (0.21.0)
     popper_js (1.14.3)
     pry (0.11.3)
@@ -207,13 +232,16 @@ DEPENDENCIES
   bootstrap (~> 4.1.3)
   byebug
   coffee-rails (~> 4.2)
+  dotenv-rails
   jbuilder (~> 2.5)
   jquery-rails
   listen (~> 3.0.5)
   minitest-rails
   minitest-reporters
   minitest-skip
   minitest-spec-rails
+  omniauth
+  omniauth-github
   pg (~> 0.18)
   pry-rails
   puma (~> 3.0)

app/controllers/application_controller.rb

@@ -1,7 +1,8 @@
 class ApplicationController < ActionController::Base
-  protect_from_forgery with: :exception
+  protect_from_forgery with: :exception #Raises ActionController::InvalidAuthenticityToken exception.
 
   before_action :find_user
+  before_action :require_login
 
   def render_404
     # DPR: this will actually render a 404 page in production
@@ -14,4 +15,12 @@ def find_user
       @login_user = User.find_by(id: session[:user_id])
     end
   end
+
+  def require_login
+    if @login_user.nil? #if not logged in
+      flash[:status] = :failure
+      flash[:result_text] = "Please log in to view this section."
+      redirect_to root_path
+    end
+  end
 end

app/controllers/sessions_controller.rb

@@ -1,34 +1,74 @@
 class SessionsController < ApplicationController
-  def login_form
-  end
+  skip_before_action :require_login, only: [:create] #skips required login for creating a session
+
+  def create
+    auth_hash = request.env['omniauth.auth']
+    user = User.find_by(uid: auth_hash[:uid], provider: 'github')
+    flash[:success] = "Welcome"
+
 
-  def login
-    username = params[:username]
-    if username and user = User.find_by(username: username)
-      session[:user_id] = user.id
-      flash[:status] = :success
-      flash[:result_text] = "Successfully logged in as existing user #{user.username}"
+    if user
+      # User was found in the database
+      flash[:success] = "Logged in as returning user #{user.name}"
     else
-      user = User.new(username: username)
-      if user.save
-        session[:user_id] = user.id
-        flash[:status] = :success
-        flash[:result_text] = "Successfully created new user #{user.username} with ID #{user.id}"
+      # User doesn't match anything in the DB
+      # Attempt to create a new user
+      user = User.build_from_github(auth_hash)
+      if user.save #if user is saved
+        flash[:success] = "Logged in as new user #{user.name}"
+
       else
-        flash.now[:status] = :failure
-        flash.now[:result_text] = "Could not log in"
-        flash.now[:messages] = user.errors.messages
-        render "login_form", status: :bad_request
-        return
+        # Couldn't save the user for some reason. If we
+        # hit this it probably means there's a bug with the
+        # way we've configured GitHub. Our strategy will
+        # be to display error messages to make future
+        # debugging easier.
+        flash[:status] = :failure
+        flash[:error] = "Could not create new user account: #{user.errors.messages}"
+        # redirect_to root_path
+        # render "login_form", status: :bad_request
       end
     end
-    redirect_to root_path
-  end
 
-  def logout
-    session[:user_id] = nil
-    flash[:status] = :success
-    flash[:result_text] = "Successfully logged out"
+    # If we get here, we have a valid user instance
+    session[:user_id] = user.id
     redirect_to root_path
   end
+
+  def destroy
+   session[:user_id] = nil
+   flash[:success] = "Successfully logged out!"
+
+   redirect_to root_path
+ end
+
+  # def login
+  #   username = params[:username]
+  #   if username and user = User.find_by(username: username)
+  #     session[:user_id] = user.id
+  #     flash[:status] = :success
+  #     flash[:result_text] = "Successfully logged in as existing user #{user.username}"
+  #   else
+  #     user = User.new(username: username)
+  #     if user.save
+  #       session[:user_id] = user.id
+  #       flash[:status] = :success
+  #       flash[:result_text] = "Successfully created new user #{user.username} with ID #{user.id}"
+  #     else
+  #       flash.now[:status] = :failure
+  #       flash.now[:result_text] = "Could not log in"
+  #       flash.now[:messages] = user.errors.messages
+  #       render "login_form", status: :bad_request
+  #       return
+  #     end
+  #   end
+  #   redirect_to root_path
+  # end
+  #
+  # def logout
+  #   session[:user_id] = nil
+  #   flash[:status] = :success
+  #   flash[:result_text] = "Successfully logged out"
+  #   redirect_to root_path
+  # end
 end

app/controllers/users_controller.rb

@@ -1,10 +1,19 @@
 class UsersController < ApplicationController
+  before_action :require_login
+
   def index
     @users = User.all
+    flash[:status] = :success
   end
 
   def show
     @user = User.find_by(id: params[:id])
-    render_404 unless @user
+    if @user
+      flash.now[:success] = "#{@user.name}"
+    else
+      flash[:status] = :failure
+      flash[:result_text] = "Not found"
+      redirect_to root_path
+    end
   end
 end

app/controllers/works_controller.rb

@@ -1,7 +1,8 @@
 class WorksController < ApplicationController
   # We should always be able to tell what category
   # of work we're dealing with
-  before_action :category_from_work, except: [:root, :index, :new, :create]
+  before_action :category_from_work, except: [:root, :index, :new, :create] #category from work
+  skip_before_action :require_login, only: [:root] #user must be logged for all methods except for accessing root page
 
   def root
     @albums = Work.best_albums
@@ -21,6 +22,7 @@ def new
   def create
     @work = Work.new(media_params)
     @media_category = @work.category
+
     if @work.save
       flash[:status] = :success
       flash[:result_text] = "Successfully created #{@media_category.singularize} #{@work.id}"
@@ -34,23 +36,26 @@ def create
   end
 
   def show
+
     @votes = @work.votes.order(created_at: :desc)
   end
 
-  def edit
+  def edit 
   end
 
   def update
     @work.update_attributes(media_params)
+
     if @work.save
+      @media_category = @work.category
       flash[:status] = :success
       flash[:result_text] = "Successfully updated #{@media_category.singularize} #{@work.id}"
       redirect_to work_path(@work)
     else
       flash.now[:status] = :failure
       flash.now[:result_text] = "Could not update #{@media_category.singularize}"
       flash.now[:messages] = @work.errors.messages
-      render :edit, status: :not_found
+      render :edit, status: :bad_request
     end
   end
 
@@ -63,6 +68,7 @@ def destroy
 
   def upvote
     flash[:status] = :failure
+
     if @login_user
       vote = Vote.new(user: @login_user, work: @work)
       if vote.save
@@ -81,7 +87,8 @@ def upvote
     redirect_back fallback_location: work_path(@work)
   end
 
-private
+  private
+
   def media_params
     params.require(:work).permit(:title, :category, :creator, :description, :publication_year)
   end
@@ -91,4 +98,5 @@ def category_from_work
     render_404 unless @work
     @media_category = @work.category.downcase.pluralize
   end
+
 end

app/models/user.rb

@@ -1,6 +1,27 @@
 class User < ApplicationRecord
   has_many :votes
+  has_many :votes, dependent: :destroy
+  has_many :works, dependent: :destroy
   has_many :ranked_works, through: :votes, source: :work
 
-  validates :username, uniqueness: true, presence: true
+  validates :email, presence: true
+  validates :uid, presence: true
+  validates :name, presence: true
+  validates :provider, presence: true
+
+
+
+
+
+
+  #instance of class User
+  def self.build_from_github(auth_hash)
+    user = User.new
+      user.provider = "github"
+      user.name = auth_hash["info"]["name"]
+      user.email = auth_hash["info"]["email"]
+      user.uid = auth_hash["uid"]
+
+    return user
+  end
 end

app/models/vote.rb

@@ -2,5 +2,5 @@ class Vote < ApplicationRecord
   belongs_to :user
   belongs_to :work, counter_cache: :vote_count
 
-  validates :user, uniqueness: { scope: :work, message: "has already voted for this work" }
+  validates :user, uniqueness: { scope: :work, message: "you already voted for this work" }
 end

app/models/work.rb

@@ -1,8 +1,10 @@
 class Work < ApplicationRecord
   CATEGORIES = %w(album book movie)
+  belongs_to :user
   has_many :votes, dependent: :destroy
   has_many :ranking_users, through: :votes, source: :user
 
+
   validates :category,  presence: true,
                         inclusion: { in: CATEGORIES }
 

app/views/layouts/application.html.erb

@@ -36,16 +36,16 @@
         <% if @login_user %>
 
         <li class="nav-item app-header__nav_item">
-          <%= link_to "Logged in as #{@login_user.username}", user_path(@login_user), class: "btn btn-primary" %>
+          <%= link_to "Logged in as #{@login_user.name}", user_path(@login_user), class: "btn btn-primary" %>
         </li>
         <li class="nav-item app-header__nav_item">
-          <%= link_to "Log Out", logout_path, method: :post, class: "btn btn-primary" %>
+          <%= link_to "Log Out", logout_path, method: :delete, class: "btn btn-primary" %>
         </li>
 
         <% else %>
 
         <li class="nav-item app-header__nav_item">
-          <%= link_to "Log In", login_path, class: "btn btn-primary" %>
+          <%= link_to "Login with Github", "/auth/github" %>
         </li>
         <% end %>
 
@@ -69,7 +69,7 @@
       </div>
     </section>
   <% end %>
-
+    
   <main>
     <%= yield %>
   </main>

app/views/users/index.html.erb

@@ -10,7 +10,7 @@
   <tbody>
     <% @users.each do |user| %>
       <tr>
-        <td><%= link_to user.username, user_path(user) %></td>
+        <td><%= link_to user.name, user_path(user) %></td>
         <td><%= user.votes.count %></td>
         <td><%= render_date user.created_at %></td>
       </tr>

app/views/users/show.html.erb

@@ -1,4 +1,4 @@
-<h2>User Summary: <%= link_to @user.username, user_path(@user) %></h2>
+<h2>User Summary: <%= link_to @user.name, user_path(@user) %></h2>
 <p>Joined site <%= render_date @user.created_at %></p>
 
 <section class="user-votes__container">