Add routes to toolbar tabs. (#56)

* Add routes to toolbar links. * Move toolbar to application level. * Move toolbar to application level. * Route to index pages.
neb417 · Nov 7, 2024 · 8d9b281 · 8d9b281
1 parent bcb75eb
commit 8d9b281
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/app/controllers/incomes_controller.rb b/app/controllers/incomes_controller.rb
@@ -10,11 +10,6 @@ class IncomesController < ApplicationController
   # GET /incomes or /incomes.json
   def index
     @incomes = Income.all
-
-    respond_to do |format|
-      format.html { render :index }
-      format.json { render json: @incomes }
-    end
   end
 
   # GET /incomes/1 or /incomes/1.json

diff --git a/app/views/components/_toolbar.html.erb b/app/views/components/_toolbar.html.erb
@@ -7,13 +7,10 @@
       <%= link_to "Federal Tax Brackets", federal_tax_brackets_path, data: { turbo_stream: true }, class: active_tab == :federal_tax_brackets ? "active-toolbar-tab" : "inactive-toolbar-tab" %>
     </li>
     <li class="mx-auto">
-      <a href="#" class="inline-block p-4 rounded-t-lg hover:text-gray-600 hover:bg-gray-50">State Income Tax</a>
+      <%= link_to "Incomes", incomes_path, data: { turbo: false }, class: active_tab == :incomes ? "active-toolbar-tab" : "inactive-toolbar-tab" %>
     </li>
     <li class="mx-auto">
-      <a href="#" class="inline-block p-4 rounded-t-lg hover:text-gray-600 hover:bg-gray-50">Incomes</a>
-    </li>
-    <li class="mx-auto">
-      <a href="#"  class="inline-block p-4 rounded-t-lg hover:text-gray-600 hover:bg-gray-50">Fixed Expenses</a>
+      <%= link_to "Fixed Expenses", fixed_expenses_path, data: { turbo: false }, class: active_tab == :fixed_expenses ? "active-toolbar-tab" : "inactive-toolbar-tab" %>
     </li>
   </ul>
 <% end %>
diff --git a/app/views/dashboard/index.html.erb b/app/views/dashboard/index.html.erb
@@ -1,2 +1 @@
-<%= render partial: "components/toolbar", locals: { active_tab: :budget_calculator }  %>
 <%= render partial: "dashboard/index" %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -14,6 +14,7 @@
 
   <body class="bg-gray-200">
     <main class="mx-auto px-9 flex flex-container">
+      <%= render partial: "components/toolbar", locals: { active_tab: :budget_calculator } %>
       <%= yield %>
     </main>
   </body>
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		<%= render partial: "components/toolbar", locals: { active_tab: :budget_calculator } %>
		<%= render partial: "dashboard/index" %>