lesli_audit 0.2.0 → 0.3.0

data/app/views/lesli_audit/accounts/_form.html.erb

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

data/app/views/lesli_audit/accounts/edit.html.erb

@@ -0,0 +1,10 @@
+<h1>Editing account</h1>
+
+<%= render "form", account: @account %>
+
+<br>
+
+<div>
+  <%= link_to "Show this account", @account %> |
+  <%= link_to "Back to accounts", accounts_path %>
+</div>

data/app/views/lesli_audit/accounts/index.html.erb

@@ -0,0 +1,14 @@
+<p style="color: green"><%= notice %></p>
+
+<h1>Accounts</h1>
+
+<div id="accounts">
+  <% @accounts.each do |account| %>
+    <%= render account %>
+    <p>
+      <%= link_to "Show this account", account %>
+    </p>
+  <% end %>
+</div>
+
+<%= link_to "New account", new_account_path %>

data/app/views/lesli_audit/accounts/new.html.erb

@@ -0,0 +1,9 @@
+<h1>New account</h1>
+
+<%= render "form", account: @account %>
+
+<br>
+
+<div>
+  <%= link_to "Back to accounts", accounts_path %>
+</div>

data/app/views/lesli_audit/accounts/show.html.erb

@@ -0,0 +1,10 @@
+<p style="color: green"><%= notice %></p>
+
+<%= render @account %>
+
+<div>
+  <%= link_to "Edit this account", edit_account_path(@account) %> |
+  <%= link_to "Back to accounts", accounts_path %>
+
+  <%= button_to "Destroy this account", @account, method: :delete %>
+</div>

data/app/views/lesli_audit/requests/_form.html.erb

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

data/app/views/lesli_audit/requests/_request.html.erb

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

data/app/views/lesli_audit/requests/edit.html.erb

@@ -0,0 +1,10 @@
+<h1>Editing request</h1>
+
+<%= render "form", request: @request %>
+
+<br>
+
+<div>
+  <%= link_to "Show this request", @request %> |
+  <%= link_to "Back to requests", requests_path %>
+</div>

data/app/views/lesli_audit/requests/index.html.erb

@@ -0,0 +1,14 @@
+<p style="color: green"><%= notice %></p>
+
+<h1>Requests</h1>
+
+<div id="requests">
+  <% @requests.each do |request| %>
+    <%= render request %>
+    <p>
+      <%= link_to "Show this request", request %>
+    </p>
+  <% end %>
+</div>
+
+<%= link_to "New request", new_request_path %>

data/app/views/lesli_audit/requests/new.html.erb

@@ -0,0 +1,9 @@
+<h1>New request</h1>
+
+<%= render "form", request: @request %>
+
+<br>
+
+<div>
+  <%= link_to "Back to requests", requests_path %>
+</div>

data/app/views/lesli_audit/requests/show.html.erb

@@ -0,0 +1,10 @@
+<p style="color: green"><%= notice %></p>
+
+<%= render @request %>
+
+<div>
+  <%= link_to "Edit this request", edit_request_path(@request) %> |
+  <%= link_to "Back to requests", requests_path %>
+
+  <%= button_to "Destroy this request", @request, method: :delete %>
+</div>

data/app/views/lesli_audit/users/_form.html.erb

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

data/app/views/lesli_audit/users/_user.html.erb

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

data/app/views/lesli_audit/users/edit.html.erb

@@ -0,0 +1,10 @@
+<h1>Editing user</h1>
+
+<%= render "form", user: @user %>
+
+<br>
+
+<div>
+  <%= link_to "Show this user", @user %> |
+  <%= link_to "Back to users", users_path %>
+</div>

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

@@ -0,0 +1,14 @@
+<p style="color: green"><%= notice %></p>
+
+<h1>Users</h1>
+
+<div id="users">
+  <% @users.each do |user| %>
+    <%= render user %>
+    <p>
+      <%= link_to "Show this user", user %>
+    </p>
+  <% end %>
+</div>
+
+<%= link_to "New user", new_user_path %>

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

@@ -0,0 +1,9 @@
+<h1>New user</h1>
+
+<%= render "form", user: @user %>
+
+<br>
+
+<div>
+  <%= link_to "Back to users", users_path %>
+</div>

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

@@ -0,0 +1,10 @@
+<p style="color: green"><%= notice %></p>
+
+<%= render @user %>
+
+<div>
+  <%= link_to "Edit this user", edit_user_path(@user) %> |
+  <%= link_to "Back to users", users_path %>
+
+  <%= button_to "Destroy this user", @user, method: :delete %>
+</div>

data/config/locales/translations.en.yml

@@ -0,0 +1,7 @@
+---
+:en:
+  lesli_audit:
+    shared:
+      title_lesli: ":lesli.shared.title_lesli:"
+    users:
+      title_users: Users

data/config/locales/translations.es.yml

@@ -0,0 +1,7 @@
+---
+:es:
+  lesli_audit:
+    shared:
+      title_lesli: 'Lesli en español '
+    users:
+      title_users: Usuarios

data/config/routes.rb

@@ -31,6 +31,9 @@ Building a better future, one line of code at a time.
 =end
 
 LesliAudit::Engine.routes.draw do
+
+
+    # Dashboard alias
     root to: "dashboards#show"
     
 
@@ -41,32 +44,35 @@ LesliAudit::Engine.routes.draw do
     #   Trends
     resource :dashboard, only: [:show]
 
+
     # Users:
     #   Registrations   users grouped by creation date
     #   Working hours   first and last request of the day
     #   Activities      changes on users information
     #   Roles           total users by role
     #   Logs            relevant actions of users
-    # resources :users, only: []
-
-    # Account:
-    #   Activities      changes on account information
-    #   Logs            relevant actions of the account
-    # resources :account, only: []
+    resources :users, only: []
 
-    # Requests:         Raw request data
-    # resources :request, only: []
 
     # Analytics:
-    # 
     resources :analytics, only: [:index] do 
         collection do 
             get :trends
-            get :resourcess
-            get :visitors
             get :controllers
+            get :visitors
             get :devices
             get :users
         end
     end
+
+
+    # Account:
+    #   Activities      changes on account information
+    #   Logs            relevant actions of the account
+    resources :account, only: []
+
+
+    # Requests:         Raw request data
+    resources :request, only: []
+
 end

data/db/migrate/v1.0/0803100010_create_lesli_audit_account_requests.rb

@@ -0,0 +1,44 @@
+=begin
+
+Lesli
+
+Copyright (c) 2023, Lesli Technologies, S. A.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see http://www.gnu.org/licenses/.
+
+Lesli · Ruby on Rails Development Platform.
+
+Made with ♥ by https://www.lesli.tech
+Building a better future, one line of code at a time.
+
+@contact  hello@lesli.tech
+@website  https://www.lesli.tech
+@license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
+
+// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
+// ·
+=end
+
+class CreateLesliAuditAccountRequests < ActiveRecord::Migration[6.0]
+    def change
+        create_table :lesli_audit_account_requests do |t|
+            t.string    :request_controller
+            t.string    :request_action
+            t.integer   :request_count
+            t.date      :created_at
+        end
+        add_reference(:lesli_audit_account_requests, :account, foreign_key: { to_table: :lesli_audit_accounts })
+        add_index(:lesli_audit_account_requests, %i[request_controller request_action created_at account_id], unique: true, name: "lesli_audit_account_requests_index")
+    end
+end

data/db/migrate/v1.0/0803110010_create_lesli_audit_user_requests.rb

@@ -0,0 +1,46 @@
+=begin
+
+Lesli
+
+Copyright (c) 2023, Lesli Technologies, S. A.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see http://www.gnu.org/licenses/.
+
+Lesli · Ruby on Rails Development Platform.
+
+Made with ♥ by https://www.lesli.tech
+Building a better future, one line of code at a time.
+
+@contact  hello@lesli.tech
+@website  https://www.lesli.tech
+@license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
+
+// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
+// ·
+=end
+
+class CreateLesliAuditUserRequests < ActiveRecord::Migration[6.0]
+    def change
+        create_table :lesli_audit_user_requests do |t|
+            t.string  :request_controller
+            t.string  :request_action
+            t.integer :request_count
+            t.date    :created_at
+        end
+        add_reference(:lesli_audit_user_requests, :user, foreign_key: { to_table: :lesli_users })
+        add_reference(:lesli_audit_user_requests, :session, foreign_key: { to_table: :lesli_user_sessions })
+        add_reference(:lesli_audit_user_requests, :account, foreign_key: { to_table: :lesli_audit_accounts })
+        add_index(:lesli_audit_user_requests, %i[request_controller request_action created_at user_id session_id], unique: true, name: "lesli_audit_user_requests_index")
+    end
+end

data/db/seed/development.rb

@@ -40,28 +40,35 @@ start_date = 10.days.ago.to_date
 
 account = Lesli::Account.first
 
-user = Lesli::User.first
-
-session = user.sessions.first
-
-# Iterate through the dates
-(start_date..end_date).each do |date|
-
-    Lesli::Account::Request.create_with(
-        :request_method => "show",
-        :request_count => rand(1..100),
-    ).find_or_create_by(
-        :request_controller => "lesli_audit/dashboards",
-        :request_action => "show",
-        :created_at => date,
-        :account => account
-    )
-
-    Lesli::User::Request.create_with(
-        :request_count => rand(1..100)
-    ).find_or_create_by(
-        :created_at => date,
-        :session => session,
-        :user => user
-    )
+current_user = Lesli::User.first
+
+session = current_user.sessions.first
+
+# controllers to seed
+[
+    "lesli_audit/dashboards", 
+    "lesli_audit/analytics"
+].each do |controller|
+
+    # Iterate through the dates
+    (start_date..end_date).each do |date|
+
+        current_user.account.audit.account_requests.create_with(
+            :request_count => rand(40..80),
+        ).find_or_create_by(
+            :request_controller => controller,
+            :request_action => "show",
+            :created_at => date,
+        )
+
+        current_user.account.audit.user_requests.create_with(
+            :request_count => rand(40..80),
+        ).find_or_create_by(
+            :request_controller => controller,
+            :request_action => "show",
+            :created_at => date,
+            :session => session,
+            :user => current_user
+        )
+    end
 end

data/lib/lesli_audit/version.rb

@@ -1,4 +1,4 @@
 module LesliAudit
-  VERSION = "0.2.0"
-  BUILD = "1696565622"
+  VERSION = "0.3.0"
+  BUILD = "1697000148"
 end

data/lib/vue/apps/analytics/index.vue

@@ -15,7 +15,6 @@ const storeAnalytics = useAnalytics()
 // · 
 import visitors from "../../components/visitors.vue";
 import requests from "../../components/requests.vue";
-import resources from "../../components/resources.vue";
 //import trends from "./trends.vue";
 
 
@@ -28,10 +27,8 @@ function reload() {
 // · initializing
 onMounted(() => {
     storeAnalytics.fetchVisits()
-    setTimeout(() => storeAnalytics.fetchUsers(), 500)
-    setTimeout(() => storeAnalytics.fetchDevices(), 1000)
-    setTimeout(() => storeAnalytics.fetchResources(), 1500)
-    setTimeout(() => storeAnalytics.fetchControllers(), 2000)
+    setTimeout(() => storeAnalytics.fetchUsers(), 600)
+    setTimeout(() => storeAnalytics.fetchControllers(), 1200)
 })
 
 </script>
@@ -53,8 +50,7 @@ onMounted(() => {
             ]">
             </lesli-select>
         </lesli-header>
-        <visitors class="mb-5"></visitors>
-        <resources class="mb-5"></resources>
+        <visitors class="mb-6"></visitors>
         <requests></requests>
     </lesli-application-container>
 </template>

data/lib/vue/components/requests.vue

@@ -51,12 +51,6 @@ const storeAnalytics = useAnalytics()
                 :records="storeAnalytics.users.records">
             </lesli-table>
         </div>
-        <div class="column">
-            <lesli-table
-                :columns="storeAnalytics.devices.columns"
-                :records="storeAnalytics.devices.records">
-            </lesli-table>
-        </div>
         <div class="column">
             <lesli-table
                 :columns="storeAnalytics.controllers.columns"

data/lib/vue/components/visitors.vue

@@ -58,6 +58,9 @@ watch(() => storeAnalytics.visitors.records, () => {
     series.value = [{
         name: "Requests",
         data: storeAnalytics.visitors.records.map(visit => visit.requests)
+    }, {
+        name: "Resources",
+        data: storeAnalytics.visitors.records.map(visit => visit.resources)
     }]
 })
 

data/lib/vue/stores/analytics.js

@@ -39,23 +39,6 @@ export const useAnalytics = defineStore("analytics", {
                     label: 'Requests'
                 }]
             },
-            devices: {
-                loading: false,
-                pagination: {}, 
-                records: [],
-                columns: [{
-                    field: 'device',
-                    label: 'Device'
-                }, {
-                    field: 'visits',
-                    label: 'Visits'
-                }]
-            },
-            resources: {
-                loading: false,
-                pagination: {}, 
-                records: []
-            },
             visitors: {
                 loading: false,
                 pagination: {}, 
@@ -91,15 +74,6 @@ export const useAnalytics = defineStore("analytics", {
             })
         },
 
-        fetchResources() {
-            this.resources.loading = true
-            this.http.get(this.url.audit("analytics/resourcess")).then(result => {
-                this.resources.records = result.reverse()
-            }).finally(() => {
-                this.resources.loading = false
-            })
-        },
-
         fetchUsers() {
             this.users.loading = true
             this.http.get(this.url.audit("analytics/users")).then(result => {
@@ -109,15 +83,6 @@ export const useAnalytics = defineStore("analytics", {
             })
         },
 
-        fetchDevices() {
-            this.devices.loading = true
-            this.http.get(this.url.audit("analytics/devices")).then(result => {
-                this.devices.records = result
-            }).finally(() => {
-                this.devices.loading = false
-            })
-        },
-
         fetchControllers() {
             this.controllers.loading = true
             this.http.get(this.url.audit("analytics/controllers")).then(result => {

data/lib/vue/stores/translations.json

@@ -0,0 +1,38 @@
+{
+  "en": {
+    "lesli": {
+      "shared": {
+        "title_lesli": ":lesli.shared.title_lesli:"
+      },
+      "users": {
+        "title_users": "Users"
+      }
+    },
+    "lesli_audit": {
+      "shared": {
+        "title_lesli": ":lesli.shared.title_lesli:"
+      },
+      "users": {
+        "title_users": "Users"
+      }
+    }
+  },
+  "es": {
+    "lesli": {
+      "shared": {
+        "title_lesli": "Lesli en español "
+      },
+      "users": {
+        "title_users": "Usuarios"
+      }
+    },
+    "lesli_audit": {
+      "shared": {
+        "title_lesli": "Lesli en español "
+      },
+      "users": {
+        "title_users": "Usuarios"
+      }
+    }
+  }
+}