Commit `bac7abe`

mo khan <mo@mokhan.ca>

2016-07-13 02:39:17

fix map.

master

1 parent d72bbe7

Changed files (3)

app

views

gyms

show.html.erb

layouts

application.html.erb

.env.example

@@ -1,5 +1,5 @@
 <div class="row">
-  <div class="large-12 columns">
+  <div class="columns">
     <h1><%= @gym.name %></h1>
     <p>
     <%= @gym.full_address %>
@@ -11,7 +11,7 @@
 </div>
 
 <div class="row">
-  <div class="col-sm-12 map no-padding">
+  <div class="columns map no-padding">
     <div id="googleMap" style="width:100%;height:500px;"></div>
   </div>
 </div>

@@ -9,7 +9,7 @@
     <%= javascript_include_tag "https://www.google.com/jsapi", "chartkick" %>
     <%= javascript_include_tag "https://apis.google.com/js/api.js" %>
     <%= javascript_include_tag "https://apis.google.com/js/client.js" %>
-    <%= javascript_include_tag "https://maps.googleapis.com/maps/api/js" %>
+    <%= javascript_include_tag "https://maps.googleapis.com/maps/api/js?key=#{ENV['GOOGLE_MAPS_API_KEY']}" %>
     </script>
     <%= csrf_meta_tags %>
   </head>
@@ -28,11 +28,9 @@
         <!-- off-canvas left menu -->
         <div class="off-canvas position-left" id="offCanvas" data-off-canvas>
           <ul class="vertical dropdown menu" data-dropdown-menu>
-            <li><%= link_to t(".nav.user.workouts"), workouts_path %></li>
-            <% if feature_enabled?(:gym) %>
             <li> <%= search_form %> </li>
+            <li><%= link_to t(".nav.user.workouts"), workouts_path %></li>
             <li><%= link_to t(".gyms"), gyms_path %></li>
-            <% end %>
             <li><%= link_to t(".nav.user.profile_edit"), edit_profile_path(current_user) %></li>
             <li><%= link_to t(".nav.user.profile_view"), profile_path(current_user) %></li>
             <li><%= link_to t(".nav.user.log_out"), session_path('me'), method: :delete %></li>
@@ -44,11 +42,9 @@
           <div class="top-bar-left">
             <ul class="dropdown menu" data-dropdown-menu>
               <li class="title-bar-title"><%= link_to t(".title"), dashboard_path %></li>
-              <li><%= link_to t(".nav.user.workouts"), workouts_path %></li>
-              <% if feature_enabled?(:gym) %>
               <li> <%= search_form %> </li>
+              <li><%= link_to t(".nav.user.workouts"), workouts_path %></li>
               <li><%= link_to t(".gyms"), gyms_path %></li>
-              <% end %>
               <li><%= link_to t(".nav.user.profile_edit"), edit_profile_path(current_user) %></li>
               <li><%= link_to t(".nav.user.profile_view"), profile_path(current_user) %></li>
               <li><%= link_to t(".nav.user.log_out"), session_path('me'), method: :delete %></li>

@@ -1,4 +1,5 @@
 DEFAULT_FROM_ADDRESS=''
+GOOGLE_MAPS_API_KEY=''
 SMTP_DOMAIN='stronglifters.com'
 SMTP_HOST=''
 SMTP_PASSWORD=''

Commit bac7abe

Commit `bac7abe`