css fix

Dereje24 · Mar 6, 2018 · 4ca6a49 · 4ca6a49
1 parent ebf8f9b
commit 4ca6a49
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 5 deletions.
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -1,4 +1,4 @@
-  
+
 // This is a manifest file that'll be compiled into application.js, which will include all the files
 // listed below.
 //
@@ -247,12 +247,16 @@ $(document).on('turbolinks:load', function () {
   }
   if (map_id) {
     map();
+    $('#user_nav').addClass('active')
+
   }
   if (user_map) {
     reservation_map();
+    $('#user_nav').addClass('active')
   }
   if (show_history) {
     history();
+    $('#history_nav').addClass('active')
   }
 
   var slideIndex = 0;

diff --git a/app/controllers/rentals_controller.rb b/app/controllers/rentals_controller.rb
@@ -19,9 +19,10 @@ def create
 end
 end
 def current
+  @user=User.find(session[:user_id])
   @rental=Rental.new
   @locals=Local.all
-  @current_rental=User.find(session[:user_id]).rental.where("drop_date = 'nill'")
+  @current_rental=@user.rental.where("drop_date = 'nill'")
   @vehicle=@current_rental[0].vehicle
   @local=@current_rental[0].local
 end
@@ -45,10 +46,13 @@ def drop
     @rental.update(local_drop:params_drop[:local_id])
   redirect_to user_path
 else
+  flash[:error_current]='error try again'
   redirect_to current_path
 end
 else
-flash[:error]='pick another location this one is full'
+flash[:error_current]='pick another location this one is full'
+redirect_to current_path
+
 end
 end
 
@@ -67,6 +71,9 @@ def reserved?
     @rental
   end
 end
+def history
+@user=User.find(session[:user_id])
+end
 
 
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -34,6 +34,9 @@
 
   <body>
     <!--begin header -->
+    <% s=controller.controller_name+'#'+controller.action_name %>
+  <% if ["users#show","rentals#history","rentals#current"].include? s %>
+
     <header class="header">
 
         <!--begin nav -->
@@ -53,7 +56,49 @@
                     </button>
 
                     <!--logo -->
-                    <a href="index.html" class="navbar-brand" id="logo">ScootWee</a>
+                    <a href="/" class="navbar-brand" id="logo">ScootWee</a>
+
+                </div>
+
+                <div id="navbar-collapse-02" class="collapse navbar-collapse">
+                    <ul class="nav navbar-nav navbar-right">
+                        <li id='user_nav'><a href="/user"><%= @user.first_name%></a></li>
+                        <li id='history_nav'><a href="/user/history">History</a></li>
+                        <li><a href="/logout">log_out</a></li>
+
+
+                    </ul>
+                </div>
+                <!--end navbar -->
+
+            </div>
+    		<!--end container -->
+
+        </nav>
+    	<!--end nav -->
+
+    </header>
+    <% else %>
+    <header class="header">
+
+        <!--begin nav -->
+        <nav class="navbar navbar-default navbar-fixed-top">
+
+            <!--begin container -->
+            <div class="container">
+
+                <!--begin navbar -->
+                <div class="navbar-header">
+
+                    <button data-target="#navbar-collapse-02" data-toggle="collapse" class="navbar-toggle" type="button">
+                        <span class="sr-only">Toggle navigation</span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                    </button>
+
+                    <!--logo -->
+                    <a href="/" class="navbar-brand" id="logo">ScootWee</a>
 
                 </div>
 
@@ -78,7 +123,9 @@
     	<!--end nav -->
 
     </header>
+      <% end %>
     <div class='container'>
+
   <%= yield %>
     </div>
 

diff --git a/app/views/rentals/current.html.erb b/app/views/rentals/current.html.erb
@@ -1,5 +1,10 @@
 
 <div class='contaner'>
+  <% if flash[:error_current] %>
+  <div class='alert alert-danger'>
+    <p><%=flash[:error_current] %></p>
+  </div>
+  <% end %>
 <div class=' col-lg-3 col-md-offset-2' id='reservation'>
 <p><img src='https://thescooterfarm.com/wp-content/uploads/2017/07/Chilli-Pro-Scooter-Reaper-Wave1.jpg' style='width:60%' ><br> <%= @vehicle.description %> @ <%= @local.street %> , <%= @local.city %> , <%= @local.state %> | <%= @local.zip_code %> Show this acces code</p>
 <p><strong><img src=" https://api.qrserver.com/v1/create-qr-code/?size=150x150&data=<%=@vehicle.sn%>"></strong><button class="btn btn-primary btn-lg" id='drop' style="margin-left:2em">Drop </button> </p>

diff --git a/app/views/session/new.html.erb b/app/views/session/new.html.erb
@@ -30,5 +30,5 @@
 <% end %>
 </div>
 
-</div
+</div>
 </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,5 +30,5 @@ @@
     <% end %>
     </div>
-    </div
+    </div>
     </div>