Fix side nav

4 years ago · bdfcb462a3
3 changed files with 18 additions and 13 deletions
--- a/app/components/sidenav_component.rb
+++ b/app/components/sidenav_component.rb
@ -1,4 +1,5 @@
 class SidenavComponent < BaseComponent
  def initialize(current_user:)
+    @current_user = current_user
  end
 end
--- a/app/components/sidenav_component/sidenav_component.html.erb
+++ b/app/components/sidenav_component/sidenav_component.html.erb
@ -1,10 +1,12 @@
-<nav class="navbar navbar-light bg-light flex-column align-items-stretch p-3 sidenav">
-  <nav class="nav nav-pills flex-column">
-    <a class="nav-link" href="<%= root_path %>"> Home </a>
-    <a class="nav-link" href="#"> Search </a>
-    <a class="nav-link" href="<%= decisions_path %>"> Desicions </a>
-    <a class="nav-link" href="<%= case_doctrines_path %>"> Case Doctrines </a>
-    <a class="nav-link" href="<%= subject_indexes_path %>"> Subject Indexes </a>
-    <a class="nav-link" href="<%= destroy_user_session_path %>"> Log Out </a>
+<% if @current_user.present? %>
+  <nav class="navbar navbar-light bg-light flex-column align-items-stretch p-3 sidenav">
+    <nav class="nav nav-pills flex-column">
+      <a class="nav-link" href="<%= root_path %>"> Home </a>
+      <a class="nav-link" href="#"> Search </a>
+      <a class="nav-link" href="<%= decisions_path %>"> Desicions </a>
+      <a class="nav-link" href="<%= case_doctrines_path %>"> Case Doctrines </a>
+      <a class="nav-link" href="<%= subject_indexes_path %>"> Subject Indexes </a>
+      <a class="nav-link" href="<%= destroy_user_session_path %>"> Log Out </a>
+    </nav>
  </nav>
-</nav>
+<% end %>
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@ -12,11 +12,13 @@

  <body class="h-100 w-100">
    <div class="row container-fluid h-100 w-100 col-sm-12 p-0">
-      <div class="col-sm-3 p-0">
-        <%= render(SidenavComponent.new(current_user: { username: "admin", email: "[email protected]"}))%>
-      </div>
+      <% if current_user.present? %>
+        <div class="col-sm-3 p-0">
+          <%= render(SidenavComponent.new(current_user: current_user))%>
+        </div>
+      <% end %>

-      <div class="col-sm-9">
+      <div class="col-sm-<%= current_user.present? ? 9 : 12 %>">
        <div class="h-100 w-100 col-sm-12">
          <%= yield %>
        </div>