user sign in page and navbar

thejonroberts · thejonroberts · commit 11f928b44c68 · 2024-07-04T23:29:55.000-04:00
diff --git a/app/assets/stylesheets/application.sass.scss b/app/assets/stylesheets/application.sass.scss
@@ -13,6 +13,7 @@
 @import "components/visually_hidden";
 @import "components/quote";
 @import "components/turbo_progress_bar";
+@import "components/navbar";
 
 // Layouts
 @import "layouts/container";
diff --git a/app/assets/stylesheets/components/_navbar.scss b/app/assets/stylesheets/components/_navbar.scss
@@ -0,0 +1,25 @@
+.navbar {
+  display: flex;
+  align-items: center;
+  box-shadow: var(--shadow-large);
+  padding: var(--space-xs) var(--space-m);
+  margin-bottom: var(--space-xxl);
+  background-color: (var(--color-white));
+
+  &__brand {
+    font-weight: bold;
+    font-size: var(--font-size-xl);
+    color: var(--color-text-header);
+  }
+
+  &__name {
+    font-weight: bold;
+    margin-left: auto;
+    margin-right: var(--space-s);
+    color: var(--color-text-header);
+  }
+
+  &__right {
+    margin-left: auto;
+  }
+}
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,2 +1,10 @@
 class ApplicationController < ActionController::Base
+  before_action :authenticate_user!, unless: :devise_controller?
+
+  private
+
+  def current_company
+    @current_company ||= current_user.company if user_signed_in?
+  end
+  helper_method :current_company
 end
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
@@ -0,0 +1,6 @@
+class PagesController < ApplicationController
+  skip_before_action :authenticate_user!
+
+  def home
+  end
+end
diff --git a/app/controllers/quotes_controller.rb b/app/controllers/quotes_controller.rb
@@ -2,7 +2,8 @@ class QuotesController < ApplicationController
   before_action :set_quote, only: [:show, :edit, :update, :destroy]
 
   def index
-    @quotes = Quote.desc_id_ordered
+    # @quotes = Quote.desc_id_ordered
+    @quotes = current_company.quotes.desc_id_ordered
   end
 
   def show
@@ -13,7 +14,8 @@ def new
   end
 
   def create
-    @quote = Quote.new(quote_params)
+    # @quote = Quote.new(quote_params)
+    @quote = current_company.quotes.build(quote_params)
 
     if @quote.save
     respond_to do |format|
@@ -47,7 +49,8 @@ def destroy
   private
 
   def set_quote
-    @quote = Quote.find(params[:id])
+    # @quote = Quote.find(params[:id])
+    @quote = current_company.quotes.find(params[:id])
   end
 
   def quote_params
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -2,4 +2,8 @@ class User < ApplicationRecord
   devise :database_authenticatable, :validatable
 
   belongs_to :company
+
+  def name
+    email.split("@").first.capitalize
+  end
 end
diff --git a/app/views/layouts/_navbar.html.erb b/app/views/layouts/_navbar.html.erb
@@ -0,0 +1,18 @@
+<header class="navbar">
+  <% if user_signed_in? %>
+    <div class="navbar__brand">
+      <%= current_company.name %>
+    </div>
+    <div class="navbar__name">
+      <%= current_user.name %>
+    </div>
+    <%= button_to "Sign out",
+                  destroy_user_session_path,
+                  method: :delete,
+                  class: "btn btn--dark" %>
+  <% else %>
+    <%= link_to "Sign in",
+                new_user_session_path,
+                class: "btn btn--dark navbar__right" %>
+  <% end %>
+</header>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -11,6 +11,8 @@
   </head>
 
   <body>
+    <%= render "layouts/navbar" %>
     <%= yield %>
+    <% console if Rails.env == 'development' %>
   </body>
 </html>
diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb
@@ -0,0 +1,10 @@
+<main class="container">
+  <h1>Quote editor</h1>
+  <p>A blazing fast quote editor built with Hotwire</p>
+
+  <% if user_signed_in? %>
+    <%= link_to "View quotes", quotes_path, class: "btn btn--dark" %>
+  <% else %>
+    <%= link_to "Sign in", new_user_session_path, class: "btn btn--dark" %>
+  <% end %>
+</main>
diff --git a/config/routes.rb b/config/routes.rb
@@ -6,8 +6,7 @@
   # Can be used by load balancers and uptime monitors to verify that the app is live.
   get "up" => "rails/health#show", as: :rails_health_check
 
-  # Defines the root path route ("/")
-  root "quotes#index"
+  root to: "pages#home"
 
   resources :quotes
 end
diff --git a/test/controllers/pages_controller_test.rb b/test/controllers/pages_controller_test.rb
@@ -0,0 +1,7 @@
+require "test_helper"
+
+class PagesControllerTest < ActionDispatch::IntegrationTest
+  # test "the truth" do
+  #   assert true
+  # end
+end
diff --git a/test/controllers/quotes_controller_test.rb b/test/controllers/quotes_controller_test.rb
@@ -2,6 +2,7 @@
 
 class QuotesControllerTest < ActionDispatch::IntegrationTest
   setup do
+    sign_in users(:accountant)
     @quote = quotes(:one)
   end
 
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
@@ -1,7 +1,7 @@
 require "test_helper"
 
 class UserTest < ActiveSupport::TestCase
-  # test "the truth" do
-  #   assert true
-  # end
+  test "name" do
+    assert_equal "Accountant", users(:accountant).name
+  end
 end
diff --git a/test/system/quotes_test.rb b/test/system/quotes_test.rb
@@ -2,6 +2,7 @@
 
 class QuotesTest < ApplicationSystemTestCase
   setup do
+    sign_in users(:accountant)
     @quote = quotes(:one) # Reference to the first fixture quote
   end
 
diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -4,6 +4,8 @@
 
 module ActiveSupport
   class TestCase
+    include Devise::Test::IntegrationHelpers
+
     # Run tests in parallel with specified workers
     parallelize(workers: :number_of_processors)
 
