From 2f3d64b5b96052e37dae32332f6c0bcc36abfb20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20B=C3=B6hm?= <spaceman78@gmx.de>
Date: Tue, 27 Aug 2024 10:36:09 +0200
Subject: [PATCH] Small nav updates and fixes

---
 app/models/user.rb                 |  2 +-
 app/views/home/index.html.erb      |  8 --------
 app/views/layouts/_header.html.erb | 11 +++++++----
 config/routes.rb                   |  5 +++++
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 3adfb72..9f1b082 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -14,7 +14,7 @@ class User < ApplicationRecord
 
   # validates :email, presence: true, uniqueness: true, format: { with: URI::MailTo::EMAIL_REGEXP }
   validates :email, presence: true, uniqueness: true,
-            format: { with: /\b[A-Z0-9._%a-z\-]+@(student\.|)hs\-rm\.de\z/, message: "must be a student.hs-rm.de or hs-rm.de account" }
+            format: { with: /\b[A-Z0-9._%a-z\-]+@(student\.|)hs\-rm\.de\z/, message: "must be a student.hs-rm.de or hs-rm.de email" }
 
   validates :password, allow_nil: true, length: { minimum: 12 }
   validates :password, not_pwned: { message: "might easily be guessed" }
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index 677883d..bfcc9bd 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -1,23 +1,15 @@
 <p style="color: green"><%= notice %></p>
-
 <p>Signed as <%= Current.user.email %></p>
-
 <h2>Login and verification</h2>
-
 <div>
   <%= link_to "Change password", edit_password_path %>
 </div>
-
 <div>
   <%= link_to "Change email address", edit_identity_email_path %>
 </div>
-
 <h2>Access history</h2>
-
 <div>
   <%= link_to "Devices & Sessions", sessions_path %>
 </div>
-
 <br>
-
 <%= button_to "Log out", Current.session, method: :delete %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 65ad76e..53eda24 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,11 +1,11 @@
 <header class="container flex items-center justify-between px-4 py-6 mx-auto border-b-2 border-gray-300">
   <a href="/" class="text-4xl font-bold text-hsrm-gray">Plottservice Fachbereich AB</a>
-  <% if user_signed_in? && current_user&.admin? || current_user&.operator? %>
+  <% if user_signed_in? && current_user.admin? || current_user.operator? %>
     <nav>
       <ul class="flex justify-center font-semibold items-color">
         <li class="relative">
           <button class="px-4 py-2 cursor-default hover:text-hsrm-red">
-            Admin
+            <%= link_to_if current_user.admin?, "Admin", admin_dashboard_path %>
           </button>
         </li>
         <li class="relative">
@@ -19,8 +19,11 @@
   <nav>
     <ul class="flex items-center">
       <% if user_signed_in? %>
-        <li><%= current_user.email %></li>
-        <li><%= button_to 'Abmelden', Current.session, method: :delete, class: "btn btn-primary" %></li>
+        <li><%= button_to Current.session, method: :delete, class: "flex btn btn-primary" do %>
+            <%= current_user.email %>
+            <%= icon "arrow-right-on-rectangle", class: "ml-2 size-6" %>
+          <% end %>
+        </li>
       <% else %>
         <li><%= link_to 'Anmelden', sign_in_path, class: "btn btn-primary" %></li>
       <% end %>
diff --git a/config/routes.rb b/config/routes.rb
index 664e467..acdc43c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -15,6 +15,11 @@ Rails.application.routes.draw do
       patch "cancel"
     end
   end
+  namespace :admin do
+    resource :users
+    resource :jobs
+    resource :dashboard
+  end
   namespace :operator do
     resources :jobs do
       member do