From fe496a64dcc9e9ccfd78c621f2220f4c7ffdba17 Mon Sep 17 00:00:00 2001
From: Eugene Burmakin <iamfrey@gmail.com>
Date: Sat, 23 Mar 2024 21:17:23 +0100
Subject: [PATCH] Move sidebar to points index page

---
 app/views/layouts/application.html.erb |  9 +---
 app/views/points/index.html.erb        | 63 ++++++++++++++------------
 2 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 51bb9310..0c9fe90f 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -18,13 +18,8 @@
     <div class='container mx-auto'>
       <%= render 'shared/navbar' %>
       <%= render 'shared/flash' %>
-      <div class="flex flex-row gap-5">
-        <div class='w-3/4 mt-10'>
-          <%= yield %>
-        </div>
-        <div class='w-1/4 mt-10'>
-          <%= render 'shared/right_sidebar' %>
-        </div>
+      <div class="flex flex-row gap-5 w-full">
+        <%= yield %>
       </div>
     </div>
   </body>
diff --git a/app/views/points/index.html.erb b/app/views/points/index.html.erb
index ba64ea6a..544c5f0a 100644
--- a/app/views/points/index.html.erb
+++ b/app/views/points/index.html.erb
@@ -1,32 +1,39 @@
+<div class='w-3/4 mt-10'>
+  <div class="flex flex-col space-y-4 mb-4 w-full">
+    <%= form_with url: points_path, method: :get do |f| %>
+      <div class="flex flex-col md:flex-row md:space-x-4 md:items-end">
+        <div class="w-full md:w-1/3">
+          <div class="flex flex-col space-y-2">
+            <%= f.label :start_at, class: "text-sm font-semibold" %>
+            <%= f.datetime_local_field :start_at, class: "rounded-md w-full", value: @start_at %>
+          </div>
+        </div>
+        <div class="w-full md:w-1/3">
+          <div class="flex flex-col space-y-2">
+            <%= f.label :end_at, class: "text-sm font-semibold" %>
+            <%= f.datetime_local_field :end_at, class: "rounded-md w-full", value: @end_at %>
+          </div>
+        </div>
+        <div class="w-full md:w-1/3">
+          <div class="flex flex-col space-y-2">
+            <%= f.submit "Search", class: "px-4 py-2 bg-blue-500 text-white rounded-md" %>
+          </div>
+        </div>
+      </div>
+    <% end %>
 
-<div class="flex flex-col space-y-4 mb-4 w-full">
-  <%= form_with url: points_path, method: :get do |f| %>
-    <div class="flex flex-col md:flex-row md:space-x-4 md:items-end">
-      <div class="w-full md:w-1/3">
-        <div class="flex flex-col space-y-2">
-          <%= f.label :start_at, class: "text-sm font-semibold" %>
-          <%= f.datetime_local_field :start_at, class: "rounded-md w-full", value: @start_at %>
-        </div>
-      </div>
-      <div class="w-full md:w-1/3">
-        <div class="flex flex-col space-y-2">
-          <%= f.label :end_at, class: "text-sm font-semibold" %>
-          <%= f.datetime_local_field :end_at, class: "rounded-md w-full", value: @end_at %>
-        </div>
-      </div>
-      <div class="w-full md:w-1/3">
-        <div class="flex flex-col space-y-2">
-          <%= f.submit "Search", class: "px-4 py-2 bg-blue-500 text-white rounded-md" %>
-        </div>
-      </div>
+    <div
+      class="w-full"
+      data-controller="maps"
+      data-coordinates="<%= @coordinates %>"
+      data-center="<%= MAP_CENTER %>">
+      <div data-maps-target="container" class="h-[25rem] w-auto min-h-screen"></div>
     </div>
-  <% end %>
-
-  <div
-    class="w-full"
-    data-controller="maps"
-    data-coordinates="<%= @coordinates %>"
-    data-center="<%= MAP_CENTER %>">
-    <div data-maps-target="container" class="h-[25rem] w-auto min-h-screen"></div>
   </div>
+
 </div>
+<div class='w-1/4 mt-10'>
+  <%= render 'shared/right_sidebar' %>
+</div>
+
+