lesli_shield 1.0.2 → 1.0.4

data/app/views/lesli_shield/partials/_navigation.html.erb

@@ -1,5 +1,4 @@
-<%
-=begin
+<%#
 
 Lesli
 
@@ -29,11 +28,10 @@ Building a better future, one line of code at a time.
 
 // · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
 // · 
-=end
 %>
 
 <%= navigation_item(lesli_shield.dashboard_path, "Dashboard", "ri-dashboard-3-line"); %>
 <%= navigation_item(lesli_shield.users_path, "Users", "ri-user-line"); %>
 <%= navigation_item(lesli_shield.sessions_path, "Sessions", "ri-lock-line") %>
 <%= navigation_item(lesli_shield.roles_path, "Roles", "ri-shield-user-line") %>
-<%= navigation_item(lesli_shield.settings_path, "Settings", "ri-settings-3-line") %>
+<%= navigation_item(lesli_shield.invites_path, "Invites", "ri-user-add-line") %>

data/app/views/lesli_shield/{roles/_form-privileges.html.erb → role/actions/_form.html.erb}

@@ -55,7 +55,8 @@ columns = [{
 }
 </style>
 
-<%= render LesliView::Elements::Table.new(:columns => columns) do |table| %>
+<section id="shield-role-actions-form">
+<%= render(LesliView::Elements::Table.new(:columns => columns)) do |table| %>
     <% @role_actions.each do |controller_name, actions| %>
         <% table.with_row do |row| %>
             <% row.with_cell do %>
@@ -65,9 +66,8 @@ columns = [{
                 <% row.with_cell do %>
                     <% if action %>
                         <%= button_to role_action_path(action),
-                            method: (action[:active] == 1 ? :delete : :patch),
-                            class: "mini-toggle #{action[:active] == 1 ? 'active' : ''}",
-                            form: { "x-data" => "toggleForm", "x-on:submit.prevent" => "submit($el)" } do %>
+                            class: "mini-toggle #{'active' if action[:active] == 1}",
+                            method: (action[:active] == 1 ? :delete : :patch) do %>
                             <span class="mini-toggle-slider"></span>
                         <% end %>
                     <% end %>
@@ -76,29 +76,4 @@ columns = [{
         <% end %>
     <% end %>
 <% end %>
-<script>
-    document.addEventListener('alpine:init', () => {
-        Alpine.data('toggleForm', () => ({
-            submit(form) {
-                const method = form.querySelector('input[name="_method"]')?.value?.toUpperCase() || form.method.toUpperCase();
-                fetch(form.action, {
-                    method: method,
-                    headers: {
-                        'X-CSRF-Token': document.querySelector('meta[name="csrf-token"]').content,
-                        'Accept': 'text/vnd.turbo-stream.html' // or 'application/json'
-                    },
-                    //body: new URLSearchParams(new FormData(form))
-                }).then(response => {
-                    if (!response.ok) throw new Error("Request failed");
-                    return response.text();
-                }).then(() => {
-                    // Success! Toggle the class
-                    form.querySelector('button')?.classList.toggle('active');
-                }).catch(err => {
-                    console.error("Error:", err);
-                    alert("Something went wrong");
-                });
-            }
-        }))
-    });
-</script>
+</section>

data/app/views/lesli_shield/role/actions/index.html.erb

@@ -0,0 +1,14 @@
+<%= render LesliView::Layout::Container.new("shield-role-actions") do %>
+    <%= render LesliView::Components::Header.new("#{@role.name} privileges", :back => role_path(@role)) do %>
+        <%= render(LesliView::Elements::Button.new('Deploy privileges', 
+            solid:true, 
+            danger:true,
+            icon: 'shield', 
+            css_class: 'is-light is-hovered',
+            url: deploy_role_path(@role.id),
+            method: :post
+
+        )) %>
+    <% end %>
+    <%= render "form" %>
+<% end %> 

data/app/views/lesli_shield/roles/index.html.erb

@@ -29,12 +29,8 @@ columns = [{
 %>
 <%= render LesliView::Layout::Container.new("shield-roles") do %>
     <%= render LesliView::Components::Header.new("Roles") do %>
-        <%= render(LesliView::Elements::Button.new(icon: "add", solid:true)) do %>
-            Add new
-        <% end %>
-        <%= render(LesliView::Elements::Button.new(icon: "refresh")) do %>
-            Reload
-        <% end %>
+        <%= render(LesliView::Elements::Button.new('Add new', icon: "add", solid:true)) %>
+        <%= render(LesliView::Elements::Button.new('Reload', icon: "refresh")) %>
     <% end %>
     <%= render LesliView::Components::Toolbar.new() %>
     <%= render(LesliView::Elements::Table.new(

data/app/views/lesli_shield/roles/new.html.erb

@@ -1,11 +0,0 @@
-<% content_for :title, "New session" %>
-
-<h1>New session</h1>
-
-<%= render "form", session: @session %>
-
-<br>
-
-<div>
-  <%= link_to "Back to sessions", sessions_path %>
-</div>

data/app/views/lesli_shield/roles/show.html.erb

@@ -1,13 +1,10 @@
 <%= render LesliView::Layout::Container.new("shield-roles-show") do %>
     <%= render LesliView::Components::Header.new(@role.name) do %>
+        <%= render(LesliView::Elements::Button.new('Privileges', 
+            url: role_actions_path(@role), 
+            icon: 'security'
+        )) %>
     <% end %>
 
-    <%= render LesliView::Components::Tabs.new() do |tabs| %>
-        <% tabs.with_tab(title:"privileges", icon:"security") do %>
-            <%= render "form-privileges" %>
-        <% end %>
-        <% tabs.with_tab(title:"information", icon:"info_outline") do %>
-            <%= render "form-information" %>
-        <% end %>
-    <% end %>
+    <%= render "form" %>
 <% end %>

data/app/views/lesli_shield/user/roles/_form.html.erb

@@ -0,0 +1,17 @@
+<%= form_with(model: user_role) do |form| %>
+  <% if user_role.errors.any? %>
+    <div style="color: red">
+      <h2><%= pluralize(user_role.errors.count, "error") %> prohibited this user_role from being saved:</h2>
+
+      <ul>
+        <% user_role.errors.each do |error| %>
+          <li><%= error.full_message %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div>
+    <%= form.submit %>
+  </div>
+<% end %>

data/app/views/lesli_shield/user/roles/_role.html.erb

@@ -0,0 +1,2 @@
+<div id="<%= dom_id role %>">
+</div>

data/app/views/lesli_shield/user/roles/edit.html.erb

@@ -0,0 +1,12 @@
+<% content_for :title, "Editing role" %>
+
+<h1>Editing role</h1>
+
+<%= render "form", user_role: @user_role %>
+
+<br>
+
+<div>
+  <%= link_to "Show this role", @user_role %> |
+  <%= link_to "Back to roles", user_roles_path %>
+</div>

data/app/views/lesli_shield/user/roles/index.html.erb

@@ -0,0 +1,16 @@
+<p style="color: green"><%= notice %></p>
+
+<% content_for :title, "Roles" %>
+
+<h1>Roles</h1>
+
+<div id="user_roles">
+  <% @user_roles.each do |user_role| %>
+    <%= render user_role %>
+    <p>
+      <%= link_to "Show this role", user_role %>
+    </p>
+  <% end %>
+</div>
+
+<%= link_to "New role", new_user_role_path %>

data/app/views/lesli_shield/user/roles/new.html.erb

@@ -0,0 +1,11 @@
+<% content_for :title, "New role" %>
+
+<h1>New role</h1>
+
+<%= render "form", user_role: @user_role %>
+
+<br>
+
+<div>
+  <%= link_to "Back to roles", user_roles_path %>
+</div>

data/app/views/lesli_shield/user/roles/show.html.erb

@@ -0,0 +1,10 @@
+<p style="color: green"><%= notice %></p>
+
+<%= render @user_role %>
+
+<div>
+  <%= link_to "Edit this role", edit_user_role_path(@user_role) %> |
+  <%= link_to "Back to roles", user_roles_path %>
+
+  <%= button_to "Destroy this role", @user_role, method: :delete %>
+</div>

data/app/views/lesli_shield/users/{_viewer-activities.html.erb → _activities-viewer.html.erb}

@@ -1,5 +1,3 @@
-
-
-
-<%#= dd @activities %>
+<div class="box">
 <%= render(LesliView::Components::Timeline.new(:activities => @activities)) %>
+</div>

data/app/views/lesli_shield/users/_information-card.html.erb

@@ -10,11 +10,11 @@
                 <h5 class="title is-size-5 mb-0">
                     <%= @user.full_name %>
                 </h5>
-                <p><%= @user.title %></p>
+                <p class="mb-1"><%= @user.title %></p>
                 <div class="level is-mobile">
                     <div class="level-left">
                         <a  class="level-item"
-                            href="'mailto:'+storeUser.user.email">
+                            href="mailto:<%= @user.email %>">
                             <span class="icon is-small mr-2">
                                 <span class="material-symbols">
                                     email
@@ -23,7 +23,7 @@
                             <%= @user.email %>
                         </a>
                         <a  class="level-item mx-2"
-                            href="'tel:'+storeUser.user.telephone">
+                            href="tel:<%= @user.telephone %>">
                             <span class="icon is-small mr-2">
                                 <span class="material-symbols">
                                     phone

data/app/views/lesli_shield/users/_management-privileges.html.erb

@@ -0,0 +1,74 @@
+<%
+columns = [{
+    label: "ID"
+}, {
+    label: "Name"
+}, {
+    label: "status"
+}]
+%>
+
+<% roles = @user.account.roles.joins("
+    LEFT JOIN lesli_shield_user_roles
+    ON lesli_shield_user_roles.role_id = lesli_roles.id
+    AND lesli_shield_user_roles.user_id = #{@user.id}
+  ").select(
+    "lesli_roles.*",
+    "lesli_shield_user_roles.id AS user_role_id"
+  )
+%>
+
+<%= render(LesliView::Elements::Table.new(:columns => columns)) do |table| %>
+    <% roles.each do |role| %>
+        <% table.with_row do |row| %>
+            <% row.with_cell do %>
+                <%= role[:id] %>
+            <% end %>
+            <% row.with_cell do %>
+                <%= role[:name] %>
+            <% end %>
+            <% row.with_cell do %>
+                <%= button_to user_role_path(role),
+                    class: "mini-toggle #{'active' if role[:user_role_id].present?}",
+                    method: (role[:user_role_id].present? ? :delete : :patch) do %>
+                    <span class="mini-toggle-slider"></span>
+                <% end %>
+            <% end %>
+        <% end %>
+    <% end %>
+<% end %>
+
+<style>
+.mini-toggle {
+    position: relative;
+    width: 40px;
+    height: 20px;
+    background: #ccc;
+    border-radius: 9999px;
+    border: none;
+    cursor: pointer;
+    padding: 0;
+    transition: background 0.25s ease;
+    display: inline-block;
+}
+
+.mini-toggle.active {
+    background: #22c55e; /* green */
+    background: var(--lesli-color-primary)
+}
+
+.mini-toggle-slider {
+    position: absolute;
+    top: 2px;
+    left: 2px;
+    width: 16px;
+    height: 16px;
+    background: white;
+    border-radius: 50%;
+    transition: transform 0.25s ease;
+}
+
+.mini-toggle.active .mini-toggle-slider {
+    transform: translateX(20px);
+}
+</style>

data/app/views/lesli_shield/users/_management-security.html.erb

@@ -0,0 +1,5 @@
+<div class="box">
+    <%= render(LesliView::Elements::Button.new('Revoke access')) %>
+    <%= render(LesliView::Elements::Button.new('Set password as expired')) %>
+    <%= render(LesliView::Elements::Button.new('Force password update')) %>
+</div>

data/app/views/lesli_shield/users/index.html.erb

@@ -17,7 +17,7 @@ columns = [{
     label: "roles",
     sort: true
 }, {
-    field: "active",
+    field: "status",
     label: "status",
     sort: true,
     custom: true
@@ -29,12 +29,8 @@ columns = [{
 %>
 <%= render LesliView::Layout::Container.new("shield-sessions") do %>
     <%= render LesliView::Components::Header.new("Users") do %>
-        <%= render(LesliView::Elements::Button.new(icon: "add", solid:true)) do %>
-            Add new
-        <% end %>
-        <%= render(LesliView::Elements::Button.new(icon: "refresh")) do %>
-            Reload
-        <% end %>
+        <%= render(LesliView::Elements::Button.new('Add user', url: new_user_path, icon: "add", solid:true)) %>
+        <%= render(LesliView::Elements::Button.new('Refresh', icon: 'refresh')) %>
     <% end %>
     <%= render LesliView::Components::Toolbar.new() %>
     <%= render(LesliView::Elements::Table.new(

data/app/views/lesli_shield/users/new.html.erb

@@ -1,11 +1,5 @@
-<% content_for :title, "New user" %>
-
-<h1>New user</h1>
-
-<%= render "form", user: @user %>
-
-<br>
-
-<div>
-  <%= link_to "Back to users", users_path %>
-</div>
+<%= render LesliView::Layout::Container.new("shield-users-show") do %>
+    <%= render LesliView::Components::Header.new('Add new user') do %>        
+    <% end %>
+    <%= render "information-form" %>
+<% end %>

data/app/views/lesli_shield/users/show.html.erb

@@ -2,26 +2,28 @@
 
     <%= render "information-card" %>
 
-    <%= render LesliView::Components::Tabs.new() do |tabs| %>
+    <%= render LesliView::Components::Tabs.new(active_tab: 'information') do |tabs| %>
 
         <% tabs.with_tab(title:"information", icon:"info") do %>
-            <%= render "information-form" %>
+            <%= render("information-form") %>
         <% end %>
         <% tabs.with_tab(title:"Privileges", icon:"security") do %>
+            <%= render("management-privileges") %>
         <% end %>
 
         <% tabs.with_tab(title:"Security", icon:"lock_outline") do %>
+            <%= render("management-security") %>
         <% end %>
 
         <% tabs.with_tab(title:"Sessions", icon:"devices") do %>
-            <%= render "management-sessions" %>
+            <%= render("management-sessions") %>
         <% end %>
 
         <% tabs.with_tab(title:"Settings", icon:"settings") do %>
         <% end %>
 
-        <% tabs.with_tab(title:"Activities", icon:"history") do %>
-            <%= render "viewer-activities" %>
+        <% tabs.with_tab(title:"Audit logs", icon:"history") do %>
+            <%= render("activities-viewer") %>
         <% end %>
     <% end %>
 <% end %>