From 3447b442991f507e05560a5b3295eef672f0fe01 Mon Sep 17 00:00:00 2001
From: Torsten <torsten@rubydesign.fi>
Date: Mon, 16 Jan 2023 19:23:26 +0200
Subject: [PATCH] fix entiry layouts

---
 app/policies/entity_policy.rb      | 14 +++++++++
 app/views/entities/_form.html.haml | 23 ++++++--------
 app/views/entities/edit.html.haml  | 12 +++-----
 app/views/entities/index.html.haml | 49 ++++++++++++++++--------------
 app/views/entities/new.html.haml   | 12 +++-----
 app/views/entities/show.html.haml  |  2 +-
 6 files changed, 60 insertions(+), 52 deletions(-)
 create mode 100644 app/policies/entity_policy.rb

diff --git a/app/policies/entity_policy.rb b/app/policies/entity_policy.rb
new file mode 100644
index 0000000..652ab53
--- /dev/null
+++ b/app/policies/entity_policy.rb
@@ -0,0 +1,14 @@
+class EntityPolicy < ApplicationPolicy
+
+  def owner?
+    member.admin?
+  end
+  alias :owner? :index?
+  alias :owner? :show?
+  alias :owner? :create?
+  alias :owner? :new?
+  alias :owner? :update?
+  alias :owner? :edit?
+  alias :owner? :destroy?
+
+end
diff --git a/app/views/entities/_form.html.haml b/app/views/entities/_form.html.haml
index 627f9f4..17bac23 100644
--- a/app/views/entities/_form.html.haml
+++ b/app/views/entities/_form.html.haml
@@ -1,16 +1,11 @@
 = simple_form_for @entity do |f|
-  - if @entity.errors.any?
-    #error_explanation
-      %h2= "#{pluralize(@entity.errors.count, "error")} prohibited this entity from being saved:"
-      %ul
-        - @entity.errors.full_messages.each do |message|
-          %li= message
+  = f.error_notification
 
-  .field
-    = f.input :name
-  .field
-    = f.input :ha_id , collection: Entity.ha_entities
-  .field
-    = f.input :member_id , collection: Member.all.collect{|m| [m.name , m.id ]}
-  .actions{class:   button_classes}
-    = f.submit 'Save'
+  = f.input :name
+  = f.input :ha_id , collection: Entity.ha_entities
+  = f.input :member_id , collection: Member.all.collect{|m| [m.email , m.id ]}
+
+  .flex.justify-between.mt-3
+    .actions{class:   button_classes}
+      = f.submit 'Save'
+    = link_to 'Back', entities_path , class: "mt-3"
diff --git a/app/views/entities/edit.html.haml b/app/views/entities/edit.html.haml
index 8ab6b38..cd2cb19 100644
--- a/app/views/entities/edit.html.haml
+++ b/app/views/entities/edit.html.haml
@@ -1,7 +1,5 @@
-%h1 Editing entity
-
-= render 'form'
-
-= link_to 'Show', @entity
-\|
-= link_to 'Back', entities_path
+.flex.justify-center
+  .flex.flex-col
+    .text-xl.m-4
+      New event
+    = render 'form'
diff --git a/app/views/entities/index.html.haml b/app/views/entities/index.html.haml
index 408fef3..5d1918d 100644
--- a/app/views/entities/index.html.haml
+++ b/app/views/entities/index.html.haml
@@ -1,27 +1,30 @@
-%h1 Listing entities
+.flex.justify-center
+  %h1.text-3xl Listing entities
+.flex.justify-center.mt-10
 
-%table
-  %thead
-    %tr
-      %th Name
-      %th Ha
-      %th Type
-      %th Member
-      %th
-      %th
-      %th
-
-  %tbody
-    - @entities.each do |entity|
+  %table.table-auto.border-separate
+    %thead
       %tr
-        %td= entity.name
-        %td= entity.ha_id
-        %td= entity.type
-        %td= entity.member.name
-        %td= link_to 'Show', entity
-        %td= link_to 'Edit', edit_entity_path(entity)
-        %td= link_to 'Destroy', entity, method: :delete, data: { confirm: 'Are you sure?' }
+        %th Name
+        %th Ha
+        %th Type
+        %th Member
+        %th
+        %th
+        %th
 
-%br
+    %tbody
+      - @entities.each do |entity|
+        %tr
+          %td.p-2= entity.name
+          %td.p-2= entity.ha_id
+          %td.p-2= entity.type
+          %td.p-2= entity.member.email
+          %td.p-2= link_to 'Show', entity
+          %td.p-2= link_to 'Edit', edit_entity_path(entity)
+          %td.p-2= link_to 'Destroy', entity, method: :delete, data: { confirm: 'Are you sure?' }
 
-= link_to 'New Entity', new_entity_path
+
+.flex.justify-center.mt-10
+
+  = link_to 'New Entity', new_entity_path
diff --git a/app/views/entities/new.html.haml b/app/views/entities/new.html.haml
index dd490c0..85308ba 100644
--- a/app/views/entities/new.html.haml
+++ b/app/views/entities/new.html.haml
@@ -1,7 +1,5 @@
-%h1 New entity
-
-.grid.grid-cols-3
-  %div
-  = render 'form'
-
-= link_to 'Back', entities_path
+.flex.justify-center
+  .column
+    .text-xl.m-4
+      New entity
+    = render 'form'
diff --git a/app/views/entities/show.html.haml b/app/views/entities/show.html.haml
index a0e4674..21cb46d 100644
--- a/app/views/entities/show.html.haml
+++ b/app/views/entities/show.html.haml
@@ -15,7 +15,7 @@
       = @entity.value
     %p
       %b Member:
-      = @entity.member.name
+      = @entity.member.email
 
     = link_to 'Edit', edit_entity_path(@entity)
     \|