From d3fce41e60b2cdf8af3499228285d2cedd2dccfd Mon Sep 17 00:00:00 2001
From: Joseph Mastey <jmmastey@gmail.com>
Date: Wed, 27 Sep 2017 19:22:44 -0500
Subject: [PATCH] change to idiomatic use of layouts versus regular views

no functional change here, but familiar Rails users will see view files in the
locations they expect. this also slightly simplifies controller code

there is one attendant change in the wiki at `rails_3/A1-SQL-Injection-Interpolation.md`
that I'm happy to make after the PR is merged.
---
 app/controllers/admin_controller.rb                          | 5 ++---
 app/controllers/dashboard_controller.rb                      | 4 ++--
 app/controllers/tutorials_controller.rb                      | 2 +-
 .../admin/_analytics.html.erb => admin/analytics.html.erb}   | 0
 .../_get_all_users.html.erb => admin/get_all_users.html.erb} | 0
 .../admin/_get_user.html.erb => admin/get_user.html.erb}     | 0
 .../_bar_graph.html.erb => dashboard/bar_graph.html.erb}     | 0
 .../dashboard_stats.html.erb}                                | 0
 app/views/dashboard/home.html.erb                            | 2 +-
 .../_creds.html.erb => tutorials/credentials.html.erb}       | 0
 10 files changed, 6 insertions(+), 7 deletions(-)
 rename app/views/{layouts/admin/_analytics.html.erb => admin/analytics.html.erb} (100%)
 rename app/views/{layouts/admin/_get_all_users.html.erb => admin/get_all_users.html.erb} (100%)
 rename app/views/{layouts/admin/_get_user.html.erb => admin/get_user.html.erb} (100%)
 rename app/views/{layouts/dashboard/_bar_graph.html.erb => dashboard/bar_graph.html.erb} (100%)
 rename app/views/{layouts/dashboard/_dashboard_stats.html.erb => dashboard/dashboard_stats.html.erb} (100%)
 rename app/views/{layouts/tutorial/credentials/_creds.html.erb => tutorials/credentials.html.erb} (100%)

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 7302965..7b7c7bd 100755
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -17,19 +17,18 @@ class AdminController < ApplicationController
     else
       @analytics = Analytics.all
     end
-    render "layouts/admin/_analytics"
   end
 
   def get_all_users
     @users = User.all
-    render :partial => "layouts/admin/get_all_users"
+    render layout: false
   end
 
   def get_user
     @user = User.find_by_id(params[:admin_id].to_s)
     arr = ["true", "false"]
     @admin_select = @user.admin ? arr : arr.reverse
-    render :partial => "layouts/admin/get_user"
+    render layout: false
   end
 
   def update_user
diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index cff7eb5..0c19f07 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -15,12 +15,12 @@ class DashboardController < ApplicationController
   end
 
   def bar_graph
-    render :partial => "layouts/dashboard/bar_graph"
+    render :bar_graph, layout: false
   end
 
   def pie_charts
      @user = current_user
-     render :partial => "layouts/dashboard/dashboard_stats"
+     render :dashboard_stats, layout: false
   end
 
 end
diff --git a/app/controllers/tutorials_controller.rb b/app/controllers/tutorials_controller.rb
index e4ff5cf..8f2f69e 100755
--- a/app/controllers/tutorials_controller.rb
+++ b/app/controllers/tutorials_controller.rb
@@ -3,7 +3,7 @@ class TutorialsController < ApplicationController
   skip_before_action :authenticated
 
   def credentials
-    render :partial => "layouts/tutorial/credentials/creds"
+    render layout: false
   end
 
 end
diff --git a/app/views/layouts/admin/_analytics.html.erb b/app/views/admin/analytics.html.erb
similarity index 100%
rename from app/views/layouts/admin/_analytics.html.erb
rename to app/views/admin/analytics.html.erb
diff --git a/app/views/layouts/admin/_get_all_users.html.erb b/app/views/admin/get_all_users.html.erb
similarity index 100%
rename from app/views/layouts/admin/_get_all_users.html.erb
rename to app/views/admin/get_all_users.html.erb
diff --git a/app/views/layouts/admin/_get_user.html.erb b/app/views/admin/get_user.html.erb
similarity index 100%
rename from app/views/layouts/admin/_get_user.html.erb
rename to app/views/admin/get_user.html.erb
diff --git a/app/views/layouts/dashboard/_bar_graph.html.erb b/app/views/dashboard/bar_graph.html.erb
similarity index 100%
rename from app/views/layouts/dashboard/_bar_graph.html.erb
rename to app/views/dashboard/bar_graph.html.erb
diff --git a/app/views/layouts/dashboard/_dashboard_stats.html.erb b/app/views/dashboard/dashboard_stats.html.erb
similarity index 100%
rename from app/views/layouts/dashboard/_dashboard_stats.html.erb
rename to app/views/dashboard/dashboard_stats.html.erb
diff --git a/app/views/dashboard/home.html.erb b/app/views/dashboard/home.html.erb
index cee5c39..36e5d6b 100644
--- a/app/views/dashboard/home.html.erb
+++ b/app/views/dashboard/home.html.erb
@@ -21,7 +21,7 @@
 				  <!-- End Title Buttons-->
 			    </div>
 			    <div id="charts_body" class="widget-body">
-				      <%#= render :partial => "layouts/dashboard/dashboard_stats"%>
+				      <%#= render partial: "dashboard_stats" %>
 			    </div>
 				<div class="clearfix">
 		        </div>
diff --git a/app/views/layouts/tutorial/credentials/_creds.html.erb b/app/views/tutorials/credentials.html.erb
similarity index 100%
rename from app/views/layouts/tutorial/credentials/_creds.html.erb
rename to app/views/tutorials/credentials.html.erb