lesli_admin 0.1.0 → 0.3.0

data/app/assets/stylesheets/lesli_admin/application.scss

@@ -0,0 +1,33 @@
+/*
+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 SaaS Development Framework.
+
+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
+
+// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
+// · 
+*/
+
+body.lesli-admin-users, 
+body.lesli-admin-profile { @import "users"; }

data/app/assets/stylesheets/lesli_admin/users.scss

@@ -0,0 +1,67 @@
+/*
+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 SaaS Development Framework.
+
+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
+
+// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
+// · 
+*/
+
+
+// · 
+.user-information-card {
+    figure {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border-radius: 50%;
+        background-color: lesli-css-color(silver, 100);
+        border: 2px solid var(--lesli-color-primary, lesli-css-color(blue));
+    }
+    .alternative-avatar {
+        font-weight: 200;
+        font-size: 3rem;
+        color: var(--lesli-color-primary, lesli-css-color(blue));
+    }
+}
+
+form.information {
+    max-width: 80%;
+}
+
+// · roles management cards
+.roles-types {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+    grid-auto-rows: minmax(198px, auto);
+    gap: 20px;
+
+    &-item {
+        width: 100%;
+        height: 135px;
+        border-radius: 8px;
+        margin: 5px;
+    }
+}

data/app/controllers/lesli_admin/profiles_controller.rb

@@ -0,0 +1,56 @@
+=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 SaaS Development Framework.
+
+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
+module LesliAdmin
+    class ProfilesController < ApplicationController
+        before_action :set_profile, only: %i[ show ]
+
+        # GET /profiles/1
+        def show
+            respond_to do |format|
+                format.html 
+                format.json { respond_with_successful(@profile.show) }
+            end
+        end
+
+        private
+
+        # Use callbacks to share common setup or constraints between actions.
+        def set_profile
+            @profile = UserService.new(current_user, query).find(current_user.id)
+        end
+
+        # Only allow a list of trusted parameters through.
+        def profile_params
+            params.fetch(:profile, {})
+        end
+    end
+end

data/app/controllers/lesli_admin/users_controller.rb

@@ -31,7 +31,7 @@ Building a better future, one line of code at a time.
 =end
 
 module LesliAdmin
-    class UsersController < ApplicationController
+    class UsersController < Lesli::ApplicationLesliController
         before_action :set_user, only: [
             :show,
             :update,
@@ -45,23 +45,25 @@ module LesliAdmin
         # GET /users/list
         def list
             respond_to do |format|
-                format.json { respond_with_successful(UserService.new("current_user").list(query, params)) }
+                format.json { 
+                    respond_with_successful(UserService.new("current_user").list(query, params)) 
+                }
             end
         end
 
         # GET /users
         def index
             respond_to do |format|
-                format.html { }
+                format.html 
                 format.json {
-                    return respond_with_pagination(UserService.new("current_user").index(query, params))
+                    return respond_with_pagination(UserService.new(current_user, query).index(params))
                 }
             end
         end
     
         def show
             respond_to do |format|
-                format.html {}
+                format.html
                 format.json {
                     return respond_with_not_found unless @user.found?
                     return respond_with_successful(@user.show)
@@ -69,32 +71,29 @@ module LesliAdmin
             end
         end
 
-        def new; end
-    
         def create
-    
             user = UserService.new(current_user).create(user_params)
             if user.successful?
                 respond_with_successful(user.result)
             else 
                 respond_with_error("Error creating user", user.errors)
             end
-    
         end
     
         def update
-    
-            # validate that user exists
+
+            # check if the user trully exists
             return respond_with_not_found unless @user.found?
-    
+
+            # update the user information
             @user.update(user_params)
-    
+
+            # check saved
             if @user.successful?
                 respond_with_successful(@user.result)
             else 
                 respond_with_error(@user.errors)
             end
-    
         end
     
         def destroy
@@ -235,10 +234,5 @@ module LesliAdmin
                 ]
             )
         end
-
-        # Only allow a list of trusted parameters through.
-        def user_params
-            params.fetch(:user, {})
-        end
     end
 end

data/app/helpers/lesli_admin/profiles_helper.rb

@@ -0,0 +1,4 @@
+module LesliAdmin
+  module ProfilesHelper
+  end
+end

data/app/models/lesli_admin/account.rb

@@ -31,36 +31,8 @@ Building a better future, one line of code at a time.
 =end
 
 module LesliAdmin
-    class Account < Lesli::Account
-
-        # accounts always belongs to a user
-        belongs_to :user, optional: true
-
-        # account resources
-        has_many :users
-
-        has_one :bell, class_name: "LesliBell::Account"
-
-
-
-        # account statuses
-        enum status: [
-            :registered,
-            :onboarding,
-            :active,
-            :suspended
-        ]
-
-
-        # company region (GDPR)
-        enum region: {
-            latin_america: "latin_america",
-            united_states: "united_states",
-            european_union: "european_union"
-        }
-
-
-        # required a name for the lesli account
-        validates :company_name, :presence => true
+    class Account < ApplicationRecord
+        belongs_to :account, class_name: "Lesli::Account"
+        has_many :users, class_name: "Lesli::User"
     end
 end

data/app/services/lesli_admin/user_service.rb

@@ -33,43 +33,10 @@ Building a better future, one line of code at a time.
 module LesliAdmin
     class UserService < Lesli::ApplicationLesliService
 
-
-        # Return a list of users that belongs to the account of the current_user
-        # this list is meant to be used in selectors, autocomplets, etc
-        def list query=nil, params=nil
-            #users = current_user.account.users
-            users = Lesli::Account.first.users
-
-            if params[:role].present?
-                # add simple quotes to the roles so the sql can manage the query
-                roles = params[:role].split(",").map { |role| "'#{role}'" }.join(", ")
-                users = users.joins("
-                    inner join (
-                        select
-                            ur.users_id, string_agg(r.\"name\", ', ') role_names
-                        from user_roles ur
-                        join roles r
-                            on r.id = ur.role_id 
-                            and r.name in ( #{ roles } )
-                        where ur.deleted_at is null
-                        group by ur.users_id
-                    ) roles on roles.users_id = users.id
-                ")
-            end
-
-            users.order(name: :asc).select(
-                :id,
-                :email,
-                "CONCAT_WS(' ', first_name, last_name) as name",
-                :alias
-            ).as_json
-        end
-
-
         # @return [Array] Paginated index of users.
         # @description Return a paginated array of users, used mostly in frontend views
         # TODO: Implement pg_search
-        def index query, params
+        def index params
 
             # sql string to join to user_roles and get all the roles assigned to a user
             sql_string_for_user_roles = "left join (
@@ -129,22 +96,21 @@ module LesliAdmin
                 last_name: user[:last_name],
                 telephone: user[:telephone],
                 
-                locale: user.settings.select(:value).find_by(:name => "locale"),
+                #locale: user.settings.select(:value).find_by(:name => "locale"),
 
-                roles: user.roles.map { |r| { id: r[:id], name: r[:name], permission_level: r[:object_level_permission]} },
+                #roles: user.roles.map { |r| { id: r[:id], name: r[:name], permission_level: r[:object_level_permission]} },
 
-                mfa_enabled: user.mfa_settings[:enabled],
-                mfa_method:  user.mfa_settings[:method],
+                #mfa_enabled: user.mfa_settings[:enabled],
+                #mfa_method:  user.mfa_settings[:method],
 
                 created_at: user[:created_at],
                 updated_at: user[:updated_at],
-                
                 detail_attributes: {
-                    title: user.detail[:title],
-                    address: user.detail[:address],
-                    work_city: user.detail[:work_city],
-                    work_region: user.detail[:work_region],
-                    work_address: user.detail[:work_address]
+                    title: user.detail&[:title] || "",
+                #     address: user.detail[:address],
+                #     work_city: user.detail[:work_city],
+                #     work_region: user.detail[:work_region],
+                #     work_address: user.detail[:work_address]
                 }
             }
         end
@@ -235,16 +201,15 @@ module LesliAdmin
 
         def update params
 
-            old_attributes = resource.detail.attributes.merge({
-                active: resource.active
-            })
+            # old_attributes = resource.detail.attributes.merge({
+            #     active: resource.active
+            # })
 
             if resource.update(params)
-                new_attributes = resource.detail.attributes.merge({
-                    active: resource.active
-                })
-
-                resource.log_activity_update(current_user, resource, old_attributes, new_attributes)
+                # new_attributes = resource.detail.attributes.merge({
+                #     active: resource.active
+                # })
+                #resource.log_activity_update(current_user, resource, old_attributes, new_attributes)
             else
                 self.error(resource.errors.full_messages.to_sentence)
             end

data/app/views/lesli_admin/profiles/show.html.erb

@@ -0,0 +1 @@
+<router-view></router-view>

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

@@ -1,10 +1 @@
-<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>
+<router-view></router-view>

data/config/locales/translations.en.yml

@@ -0,0 +1,5 @@
+---
+:en:
+  lesli_admin:
+    shared:
+      button_save: Save

data/config/locales/translations.es.yml

@@ -0,0 +1,5 @@
+---
+:es:
+  lesli_admin:
+    shared:
+      button_save: Guardar

data/config/routes.rb

@@ -1,13 +1,10 @@
 LesliAdmin::Engine.routes.draw do
+  
     root to: "dashboards#show"
     resource :dashboard, only: [:show]
 
-    resource :account, only: [:show, :update]
-    resources :users, only: [:index, :show, :new, :update, :create, :destroy] do
+    resource :profile, only: [:show]
 
-        # extensions to the users methods
-        collection do
-            get :list
-        end
-    end
+    resource :account, only: [:show]
+    resources :users, only: [:index, :show, :new]
 end

data/db/migrate/0101000110_create_lesli_admin_accounts.rb

@@ -0,0 +1,42 @@
+=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 SaaS Development Framework.
+
+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 CreateLesliAdminAccounts < ActiveRecord::Migration[6.0]
+    def change
+        create_table :lesli_admin_accounts do |t|
+            t.integer   :status
+            t.datetime  :deleted_at, index: true
+            t.timestamps 
+        end
+        add_reference(:lesli_admin_accounts, :account, foreign_key: { to_table: :lesli_accounts })
+    end
+end

data/lib/lesli_admin/engine.rb

@@ -1,3 +1,34 @@
+=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 SaaS Development Framework.
+
+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
 module LesliAdmin
     class Engine < ::Rails::Engine
         isolate_namespace LesliAdmin

data/lib/lesli_admin/version.rb

@@ -1,3 +1,4 @@
 module LesliAdmin
-  VERSION = "0.1.0"
+  VERSION = "0.3.0"
+  BUILD = "1697000148"
 end

data/lib/vue/application.js

@@ -30,21 +30,28 @@ Building a better future, one line of code at a time.
 */
 
 
-// · 
+// · Import Lesli builders
 import application from "Lesli/application"
+import translation from "Lesli/translation"
 
 
-// · 
+// · Import engine translations
+import translations from "LesliAdmin/stores/translations.json"
+
+
+// · Import engine applications
 import applicationDashboardShow from "LesliAdmin/apps/dashboard/show.vue"
 import applicationAccountShow from "LesliAdmin/apps/account/show.vue"
-
-//import applicationUsersProfile from "LesliApp/administration/apps/profile/show.vue"
 import applicationUsersIndex from "LesliAdmin/apps/users/index.vue"
-///import applicationUsersShow from "LesliApp/administration/apps/users/show.vue"
-//import applicationUsersNew from "LesliAdmin/apps/users/new.vue"
+import applicationUsersShow from "LesliAdmin/apps/users/show.vue"
+import applicationProfile from "LesliAdmin/apps/profile/show.vue"
 
 
-// · 
+// · Buil Lesli translations
+translation(translations)
+
+
+// · Build a new Lesli application
 application("LesliAdmin", [{
     path: "/dashboard",
     component: applicationDashboardShow
@@ -54,100 +61,10 @@ application("LesliAdmin", [{
 }, {
     path: "/users",
     component: applicationUsersIndex
-}/*, {
-    path: "/users/new",
-    component: applicationUsersNew
-}*/])
-
-/*
-// · 
-import applicationAccountDashboard from "CloudAdmin/apps/accounts/dashboard.vue"
-
-
-
-import applicationDescriptorsPrivileges from "LesliApp/administration/apps/descriptors/privileges.vue"
-import applicationDescriptorsIndex from "LesliApp/administration/apps/descriptors/index.vue"
-import applicationDescriptorsEdit from "LesliApp/administration/apps/descriptors/edit.vue"
-import applicationDescriptorsShow from "LesliApp/administration/apps/descriptors/show.vue"
-import applicationDescriptorsNew from "LesliApp/administration/apps/descriptors/new.vue"
-
-import applicationRolesIndex from "LesliApp/administration/apps/roles/index.vue"
-import applicationRolesShow from "LesliApp/administration/apps/roles/show.vue"
-import applicationRolesEdit from "LesliApp/administration/apps/roles/edit.vue"
-import applicationRolesNew from "LesliApp/administration/apps/roles/new.vue"
-
-import applicationIntegrationsIndex from "LesliApp/administration/apps/integrations/index.vue"
-import applicationIntegrationsNew from "LesliApp/administration/apps/integrations/new.vue"
-import applicationSecurity from "LesliApp/administration/apps/security/index.vue"
-import applicationDatetime from "LesliApp/administration/apps/date_time/index.vue"
-import applicationBranding from "LesliApp/administration/apps/branding/index.vue"
-import applicationTheme from "LesliApp/administration/apps/theme/index.vue"
-import applicationAccountShow from "LesliApp/administration/apps/accounts/show.vue"
-
-
-// · 
-application("Lesli", [{
-    path: "/",
-    component: applicationAccountDashboard
-}, {
-    path: "/account",
-    component: applicationAccountShow
 }, {
     path: "/users/:id",
     component: applicationUsersShow
 }, {
-    path: "/users/new",
-    component: applicationUsersNew
-},{
     path: "/profile",
-    component: applicationUsersProfile
-}, {
-    path: "/descriptors",
-    component: applicationDescriptorsIndex
-}, {
-    path: "/descriptors/:id/edit",
-    component: applicationDescriptorsEdit
-}, {
-    path: "/descriptors/:id",
-    component: applicationDescriptorsShow
-}, {
-    path: "/descriptors/:id/privileges",
-    component: applicationDescriptorsPrivileges
-}, {
-    path: "/descriptors/new",
-    component: applicationDescriptorsNew
-}, {
-    path: "/roles",
-    component: applicationRolesIndex
-}, {
-    path: "/roles/new",
-    component: applicationRolesNew
-}, {
-    path: "/roles/:id",
-    component: applicationRolesShow
-}, {
-    path: "/roles/:id/edit",
-    component: applicationRolesEdit
-}, {
-    path: "/account/integrations",
-    component: applicationIntegrationsIndex
-}, {
-    path: "/account/integrations/new",
-    component: applicationIntegrationsNew
-}, {
-    path: "/account/settings/security",
-    component: applicationSecurity
-}, {
-    path: "/account/settings/date_time",
-    component: applicationDatetime
-}, {
-    path: "/account/settings/branding",
-    component: applicationBranding
-}, {
-    path: "/account/settings/theme",
-    component: applicationTheme
-}, {
-    path: "/account/settings/theme",
-    component: applicationTheme
+    component: applicationProfile
 }])
-*/

data/lib/vue/apps/account/components/form-information.vue

@@ -36,7 +36,7 @@ import { ref, reactive, onMounted, watch, computed } from "vue"
 
 
 // · import lesli stores
-import { useAccount } from "LesliAdmin/stores/account"
+import { useAccount } from "Lesli/stores/account"
 
 
 // · implement stores