Merge pull request #14 from Zilola-Nazarova/review-chenges

Review chenges

app/assets/stylesheets/application.css.scss

@@ -35,7 +35,8 @@ body {
   font-weight: 100;
   display: flex;
   flex-direction: column;
-  min-height: 100vh;
+  /* stylelint-disable-next-line */
+  min-height: 100dvh;
   min-width: 300px;
 }
 

app/controllers/groups_controller.rb

@@ -3,8 +3,6 @@ def index
     @groups = current_user.groups
   end
 
-  def show; end
-
   def new
     @group = Group.new
   end
@@ -46,6 +44,8 @@ def destroy
     end
   end
 
+  private
+
   def group_params
     params.require(:group).permit(:name, :icon)
   end

app/controllers/purchases_controller.rb

@@ -64,6 +64,8 @@ def destroy
     end
   end
 
+  private
+
   def purchase_params
     params.require(:purchase).permit(:name, :amount, group_ids: [])
   end

app/views/devise/registrations/new.html.erb

@@ -2,7 +2,7 @@
   <%= link_to pages_splash_path, data: { turbo: false }  do %>
     <%= inline_svg_tag "chevron_left.svg", class: "chevron" %>
   <% end %>
-  <h1>sing up</h1>
+  <h1>sign up</h1>
   <div id="whatever">
     <%= inline_svg_tag "menu.svg", class: "burger-menu" %>
   </div>

app/views/purchases/index.html.erb

@@ -18,7 +18,7 @@
       <%= image_tag(check_url(@group.icon), class: 'icon', alt: 'group_icon') %>
       <div class="group_info">
         <span class="name"><%= @group.name %></span>
-
+        <span class="amount">$<%= total_amount(@group)%></span>
         <span class="date"><%= @group.created_at.strftime('%d %b %Y') %></span>
       </div>
     <% end %>
@@ -31,7 +31,7 @@
   <% end %>
 
   <ul class="purchase_list">
-    <% @purchases.each do |purchase| %>
+    <% @purchases.includes([:groups]).each do |purchase| %>
       <li>
         <%= link_to group_purchase_url(@group, purchase), data: { turbo: false }, class: "item purchase" do %>
           <div class="group_info no_margin">
@@ -54,10 +54,6 @@
       </li>
     <% end %>
   </ul>
-  <div class="item checkout">
-    <span class="name">total expences:</span>
-    <span class="amount">$<%= total_amount(@group)%></span>
-  </div>
 </main>
 
 <section id="actions">

config/environments/development.rb

@@ -1,6 +1,15 @@
 require "active_support/core_ext/integer/time"
 
 Rails.application.configure do
+  config.after_initialize do
+    Bullet.enable        = true
+    Bullet.alert         = true
+    Bullet.bullet_logger = true
+    Bullet.console       = true
+    Bullet.rails_logger  = true
+    Bullet.add_footer    = true
+  end
+
   # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded any time

config/environments/test.rb

@@ -1,11 +1,18 @@
 require "active_support/core_ext/integer/time"
+require 'bullet'
 
 # The test environment is used exclusively to run your application's
 # test suite. You never need to work with it otherwise. Remember that
 # your test database is "scratch space" for the test suite and is wiped
 # and recreated between test runs. Don't rely on the data there!
 
 Rails.application.configure do
+  config.after_initialize do
+    Bullet.enable        = true
+    Bullet.bullet_logger = true
+    Bullet.raise         = true # raise an error if n+1 query occurs
+  end
+
   # Settings specified here will take precedence over those in config/application.rb.
 
   # While tests run files are not watched, reloading is not necessary.

config/routes.rb

@@ -20,7 +20,7 @@
     end
   end
 
-  resources :groups do
+  resources :groups, only: [:index, :new, :create, :edit, :update, :destroy] do
     resources :purchases
   end