From 01c7c65e47b0aa3562447113afbf9b7fdabce4ed Mon Sep 17 00:00:00 2001
From: JohnnyZhou <yza90127@gmail.com>
Date: Fri, 2 Dec 2016 11:38:26 -0800
Subject: [PATCH] add my game

---
 app/controllers/games_controller.rb   | 7 ++++++-
 app/helpers/application_helper.rb     | 2 +-
 app/views/layouts/_nav_gamer.html.erb | 6 +++++-
 config/routes.rb                      | 4 +++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index 7c31c57..ed6bd86 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -8,7 +8,12 @@ def index
     @states = Game.aasm.states.map(&:name)
     @state = params[:search_state]
     @tags = Tag.all
-    @games = search(game_subset)
+    if params[:user_id]
+      user = User.find params[:user_id]
+      @games = user.games
+    else
+      @games = search(game_subset)
+    end
     @games = @games.page(params[:page]).per(GAMES_PER_PAGE)
   end
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 03c72a9..dad75d0 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,6 +1,6 @@
 module ApplicationHelper
   def display_picture(game)
-    if game&.picture.nil?
+    if game&.pictures[0].nil?
       image_tag(image_path('fallback/default'))
     else
       image_tag(game.pictures[0].url)
diff --git a/app/views/layouts/_nav_gamer.html.erb b/app/views/layouts/_nav_gamer.html.erb
index 1841225..d9c449f 100644
--- a/app/views/layouts/_nav_gamer.html.erb
+++ b/app/views/layouts/_nav_gamer.html.erb
@@ -49,7 +49,11 @@
               <% end %>
               </ul>
             <ul class="nav navbar-nav navbar-right">
-
+              <% if user_signed_in? %>
+              <li>
+                <%= link_to "My Games", user_games_path(current_user), class: "btn btn-primary small nav-btn" %>
+              </li>
+              <% end %>
               <li>
                 <%= link_to "Games", games_path, class: "btn btn-primary small nav-btn" %>
               </li>
diff --git a/config/routes.rb b/config/routes.rb
index 4ac6a7f..a44c251 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,7 @@
 Rails.application.routes.draw do
-  resources :users, only: [:index, :new, :create, :show]
+  resources :users, only: [:index, :new, :create, :show] do
+    resources :games, only: [:index]
+  end
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
   resources :messages
   resources :games do