maquina 0.5.2 → 0.7.1

data/config/locales/models.en.yml

@@ -13,6 +13,7 @@ en:
     attributes:
       maquina/plan:
         name: Name
+        organizations_count: Organizations
         trial: Trial days
         price: Price
         free: Free
@@ -32,3 +33,12 @@ en:
             email:
               blank: please provide an email to send invitation
               invalid: user already accepted the invitation
+        maquina/plan:
+          attributes:
+            name:
+              blank: "Name is required for the subscription plan"
+              taken: "A plan with this name already exists"
+            price:
+              greater_than: "Price must be greater than %{count} for paid plans"
+              greater_than_or_equal_to: "Price needs to be %{count} for for free plans"
+              not_a_number: "Price must be a valid amount"

data/config/locales/models.es.yml

@@ -14,6 +14,7 @@ es:
     attributes:
       maquina/plan:
         name: Nombre
+        organizations_count: Organizaciones
         trial: Prueba
         price: Precio
         free: Gratuito
@@ -37,3 +38,12 @@ es:
             email:
               blank: se necesita el correo electrónico a enviar invitación
               invalid: invitación ya aceptada
+        maquina/plan:
+          attributes:
+            name:
+              blank: "Se necesita un nombre para el plan de suscripción"
+              taken: "Ya existe un plan con este nombre"
+            price:
+              greater_than: "El precio debe ser mayor que %{count} para planes de pago"
+              greater_than_or_equal_to: "El precio debe ser {%count} para planes gratuitos"
+              not_a_number: "El precio debe ser un importe válido"

data/config/locales/views.en.yml

@@ -1,5 +1,5 @@
 en:
-  application_name: Maquina
+  application_name: maquina
   yes_value: "Yes"
   no_value: "No"
 
@@ -8,7 +8,8 @@ en:
     no_items: There are currently no %{model} to display
     edit: Edit
     maquina/plan:
-      description: List of customer's plans.
+      title: Subscription %{model} management
+      description: View and manage all active subscription plans. Monitor usage and update configurations.
     maquina/user:
       add_new: Invite %{model}
       description: List of users.
@@ -29,13 +30,40 @@ en:
 
   search:
     search: Search
+  filters:
+    clear: Remove filters
 
   maquina:
+    first_runs:
+      show:
+        title: Welcome to maquina
+        subtitle: Create your first admin account
+
+      sessions_header:
+
     sessions:
       new:
-        title: Sign in to your account
-        or: Or
-        trial: start your 14-day free trial
+        title: Welcome back
+        subtitle: Sign in to your account to continue your journey
+
+    dashboard:
+      index:
+        stats:
+          title: Statistics
+          total_plans: Plans
+          total_organizations: Organizations
+        tasks:
+          title: "Administrative Tasks"
+          subtitle: "Manage your customers' plans, users, and organization settings"
+          create_plan:
+            title: "Create Customer Plan"
+            description: "Set up and configure new subscription plans"
+          manage_users:
+            title: "Manage Users"
+            description: "Invite team members and manage access permissions"
+          organization_settings:
+            title: "Organization Settings"
+            description: "Configure organizations preferences and billing"
 
     accept_invitations:
       new:

data/config/locales/views.es.yml

@@ -9,7 +9,8 @@ es:
     edit: Modificar
 
     maquina/plan:
-      description: Listado de planes.
+      title: Planes de Suscripción
+      description: Ver y administrar todos los planes de suscripción activos. Monitorear el uso y actualizar configuraciones.
     maquina/user:
       add_new: Invitar %{model}
       description: Listado de usuarios.
@@ -29,21 +30,38 @@ es:
 
   search:
     search: Buscar
+  filters:
+    clear: Eliminar filtros
 
   maquina:
-    application:
-      first_runs_header:
+    first_runs:
+      show:
         title: Bienvenido a maquina
-        description: Crea tu primera cuenta de administrador
-
-      sessions_header:
-        title: Iniciar sesión
+        subtitle: Crea tu primera cuenta de administrador
 
     sessions:
       new:
-        title: Iniciar sesión a tu cuenta
-        or: O
-        trial: iniciar tu prueba
+        title: Bienvenido de nuevo
+        subtitle: Inicia sesión para continuar tu viaje
+
+    dashboard:
+      index:
+        stats:
+          title: Estadísticas
+          total_plans: Planes
+          total_organizations: Organizaciones
+        tasks:
+          title: "Tareas Administrativas"
+          subtitle: "Administre sus planes de suscripción, usuarios y configuraciones de la organización"
+          create_plan:
+            title: "Crear Plan de Cliente"
+            description: "Configure y cree nuevos planes de suscripción"
+          manage_users:
+            title: "Gestionar Usuarios"
+            description: "Invite miembros del equipo y gestione permisos de acceso"
+          organization_settings:
+            title: "Configuración de la Organización"
+            description: "Configure las preferencias y facturación de organizaciones"
 
     accept_invitations:
       new:

data/config/routes.rb

@@ -14,5 +14,6 @@ Maquina::Engine.routes.draw do
   resources :users, path: I18n.t("routes.users"), only: [:index]
   resources :invitations, path: I18n.t("routes.invitations"), only: [:new, :create]
 
+  get "/dashboard", to: "dashboard#index", as: :dashboard
   root to: "dashboard#index"
 end

data/db/migrate/20221109010726_create_maquina_plans.rb

@@ -1,4 +1,4 @@
-class CreateMaquinaPlans < ActiveRecord::Migration[7.0]
+class CreateMaquinaPlans < ActiveRecord::Migration[7.2]
   def change
     create_table :maquina_plans do |t|
       t.string :name, null: false

data/db/migrate/20221113000409_create_maquina_users.rb

@@ -1,4 +1,4 @@
-class CreateMaquinaUsers < ActiveRecord::Migration[7.0]
+class CreateMaquinaUsers < ActiveRecord::Migration[7.2]
   def change
     create_table :maquina_users do |t|
       t.string :email, null: false

data/db/migrate/20221113020108_create_maquina_used_passwords.rb

@@ -1,4 +1,4 @@
-class CreateMaquinaUsedPasswords < ActiveRecord::Migration[7.0]
+class CreateMaquinaUsedPasswords < ActiveRecord::Migration[7.2]
   def change
     create_table :maquina_used_passwords do |t|
       t.string :password_digest

data/db/migrate/20221115223414_create_maquina_active_sessions.rb

@@ -1,6 +1,4 @@
-# frozen_string_literal: true
-
-class CreateMaquinaActiveSessions < ActiveRecord::Migration[7.0]
+class CreateMaquinaActiveSessions < ActiveRecord::Migration[7.2]
   def change
     create_table :maquina_active_sessions do |t|
       t.references :maquina_user, null: false, foreign_key: true

data/db/migrate/20230201203922_create_maquina_invitations.rb

@@ -1,4 +1,4 @@
-class CreateMaquinaInvitations < ActiveRecord::Migration[7.0]
+class CreateMaquinaInvitations < ActiveRecord::Migration[7.2]
   def change
     create_table :maquina_invitations do |t|
       t.string :email, null: false

data/db/migrate/20230829183530_create_maquina_organizations.rb

@@ -1,4 +1,4 @@
-class CreateMaquinaOrganizations < ActiveRecord::Migration[7.0]
+class CreateMaquinaOrganizations < ActiveRecord::Migration[7.2]
   def change
     create_table :maquina_organizations do |t|
       t.string :name

data/db/migrate/20230829192656_create_maquina_memberships.rb

@@ -1,12 +1,10 @@
-class CreateMaquinaMemberships < ActiveRecord::Migration[7.0]
+class CreateMaquinaMemberships < ActiveRecord::Migration[7.2]
   def change
-    create_enum :maquina_role, %w[admin member]
-
     create_table :maquina_memberships do |t|
       t.references :maquina_organization, null: false, foreign_key: true
       t.references :maquina_user, null: false, foreign_key: true
       t.boolean :owner, default: false
-      t.enum :role, enum_type: :maquina_role, default: "member", null: false
+      t.string :role, default: "member", null: false
       t.timestamp :blocked_at
 
       t.timestamps

data/db/migrate/20241109191405_add_counter_cache_to_plans.rb

@@ -0,0 +1,5 @@
+class AddCounterCacheToPlans < ActiveRecord::Migration[7.2]
+  def change
+    add_column :maquina_plans, :organizations_count, :integer, null: false, default: 0
+  end
+end

data/lib/generators/maquina/install_generator.rb

@@ -4,13 +4,21 @@ module Maquina
   class InstallGenerator < Rails::Generators::Base
     source_root File.expand_path("../templates", __FILE__)
 
+    # TODO: Add this to application.rb
+    # insert_into_file "config/application.rb", before: "  end" do
+    #    <<EOF
+    #      # Disable Rails' field_with_errors functionality
+    #      config.action_view.field_error_proc = proc { |html_tag, instance| html_tag.html_safe }
+    #    EOF
+    #  end
+
     def create_initializer_file
       template "config/initializers/maquina.rb"
     end
 
     def add_route
       return if Rails.application.routes.routes.detect { |route| route.app.app == Maquina::Engine }
-      route %(mount Maquina::Engine => "/m")
+      route %(mount Maquina::Engine => "/")
     end
 
     def add_concerns
@@ -21,8 +29,66 @@ module Maquina
       end
     end
 
+    def copy_layout
+      empty_directory "app/views/layouts/maquina"
+      directory File.join(engine_views_path, "layouts", "maquina"),
+        File.join(app_views_path, "layouts", "maquina")
+
+      gsub_file "app/views/layouts/maquina/application.html.erb",
+        "maquina_importmap_tags",
+        "javascript_importmap_tags"
+
+      gsub_file "app/views/layouts/maquina/sessions.html.erb",
+        "maquina_importmap_tags",
+        "javascript_importmap_tags"
+    end
+
+    def copy_controllers
+      empty_directory "app/controllers/maquina"
+      copy_file File.join(engine_controllers_path, "maquina", "dashboard_controller.rb"),
+        File.join(app_controllers_path, "maquina", "dashboard_controller.rb")
+    end
+
+    def copy_views
+      empty_directory "app/views/maquina/dashboard"
+      directory File.join(engine_views_path, "maquina", "dashboard"),
+        File.join(app_views_path, "maquina", "dashboard")
+    end
+
+    # def copy_stimulus_controllers
+    #   Dir.glob(File.join(engine_stimulus_path, "*_controller.js")) do |file|
+    #     copy_file file, File.join(app_stimulus_path, File.basename(file))
+    #   end
+    # end
+
     def copy_migrations
       rake "maquina:install:migrations"
     end
+
+    private
+
+    def engine_views_path
+      @engine_views_path ||= File.join(Maquina::Engine.root, "app", "views")
+    end
+
+    def app_views_path
+      @app_views_path ||= File.join(Rails.root, "app", "views")
+    end
+
+    def engine_controllers_path
+      @engine_controllers_path ||= File.join(Maquina::Engine.root, "app", "controllers")
+    end
+
+    def app_controllers_path
+      @app_controllers_path ||= File.join(Rails.root, "app", "controllers")
+    end
+
+    # def engine_stimulus_path
+    #   @engine_stimulus_path ||= File.join(Maquina::Engine.root, "app", "assets", "javascripts", "maquina", "controllers")
+    # end
+    #
+    # def app_stimulus_path
+    #   @app_stimulus_path ||= File.join(Rails.root, "app", "javascript", "controllers")
+    # end
   end
 end

data/lib/generators/maquina/tailwind_config/templates/lib/generators/tailwind_config/templates/config/tailwind.config.js.tt

@@ -22,11 +22,17 @@ module.exports = {
           muted: 'rgb(var(--color-muted) / <alpha-value>)',
           dimmed: 'rgb(var(--color-dimmed) / <alpha-value>)',
           error: 'rgb(var(--color-error) / <alpha-value>)',
+          alternate: 'rgb(var(--color-alternate) / <alpha-value>)',
+          'alternate-1'': 'rgb(var(--color-alternate-1) / <alpha-value>)',
+          'alternate-2': 'rgb(var(--color-alternate-2) / <alpha-value>)'
         }
       },
       textDecorationColor: {
         skin: {
           accented: 'rgb(var(--color-accented) / <alpha-value>)',
+          alternate: 'rgb(var(--color-alternate) / <alpha-value>)',
+          'alternate-1'': 'rgb(var(--color-alternate-1) / <alpha-value>)',
+          'alternate-2': 'rgb(var(--color-alternate-2) / <alpha-value>)'
         }
       },
       backgroundColor: {
@@ -41,6 +47,9 @@ module.exports = {
           dimmed: 'rgb(var(--color-dimmed) / <alpha-value>)',
           accented: 'rgb(var(--color-accented) / <alpha-value>)',
           'accented-hover': 'rgb(var(--color-accented-hover) / <alpha-value>)',
+          alternate: 'rgb(var(--color-alternate) / <alpha-value>)',
+          'alternate-1'': 'rgb(var(--color-alternate-1) / <alpha-value>)',
+          'alternate-2': 'rgb(var(--color-alternate-2) / <alpha-value>)'
         }
       },
       ringColor: {
@@ -57,11 +66,6 @@ module.exports = {
           accented: 'rgb(var(--color-border-accented) / <alpha-value>)',
         }
       },
-      textDecorationColor: {
-        skin: {
-          accented: 'rgb(var(--color-border-accented) / <alpha-value>)'
-        }
-      }
     },
   },
   plugins: [

data/lib/generators/maquina/tailwind_config/templates/lib/tasks/tailwind.rake.tt

@@ -3,6 +3,8 @@
 namespace :tailwindcss do
   desc "Generates your tailwind config file"
   task :config do
+    require "rails/generators"
+
     Rails::Generators.invoke("tailwind_config", ["--force"])
   end
 end

data/lib/generators/maquina/templates/config/initializers/maquina.rb.tt

@@ -2,5 +2,6 @@
 
 Maquina.configure do |config|
   # Configure membership roles.
-  config.membership_roles = Maquina.postgresql? ? {admin: "admin", member: "member"} : {admin: 0, member: 1}
+  config.membership_roles = ["admin", "member"].index_by(&:itself)
+  # config.search_adapter = null # Search adapter to use. Default is null. Allowed values are: :sqlite, :pg_search
 end

data/lib/maquina/engine.rb

@@ -1,13 +1,16 @@
 # frozen_string_literal: true
 
-require "importmap-rails"
-require "turbo-rails"
-require "stimulus-rails"
 require "phlex-rails"
 
 module Maquina
   class Engine < ::Rails::Engine
     config.autoload_paths += %W[#{Engine.root}/app/views]
     isolate_namespace Maquina
+
+    initializer "maquina.importmap", before: "importmap" do |app|
+      puts "Maquina: Importmap"
+      puts Engine.root.join("config/importmap.rb")
+      app.config.importmap.paths << Engine.root.join("config/importmap.rb")
+    end
   end
 end

data/lib/maquina/version.rb

@@ -1,3 +1,3 @@
 module Maquina
-  VERSION = "0.5.2"
+  VERSION = "0.7.1"
 end

data/lib/maquina.rb

@@ -2,7 +2,6 @@
 
 require_relative "maquina/version"
 require_relative "maquina/engine"
-require "importmap-rails"
 require "money-rails"
 require "turbo-rails"
 require "action_policy"
@@ -11,15 +10,11 @@ require "pagy"
 module Maquina
   class << self
     attr_accessor :configuration
-
-    def postgresql?
-      ActiveRecord::Base.connection_db_config.configuration_hash[:adapter].downcase == "postgresql"
-    end
   end
 
   class Configuration
     attr_accessor :password_retain_count, :temporary_block, :session_expiration, :signin_attempts, :tailwind_content,
-      :importmap, :root_app_path, :membership_roles
+      :importmap, :root_app_path, :membership_roles, :search_adapter
 
     def initialize
       @password_retain_count = 3
@@ -29,9 +24,7 @@ module Maquina
       @root_app_path = "/"
 
       @membership_roles = %w[admin member].index_by(&:itself)
-
-      @importmap = Importmap::Map.new
-      @importmap.draw(Engine.root.join("config/importmap.rb"))
+      @search_adapter = nil
 
       @tailwind_content = [
         "#{Maquina::Engine.root}/app/views/**/*.{rb,erb}",

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: maquina
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.7.1
 platform: ruby
 authors:
 - Mario Alberto Chávez
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-15 00:00:00.000000000 Z
+date: 2025-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,48 +51,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.15.0
-- !ruby/object:Gem::Dependency
-  name: turbo-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: stimulus-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-- !ruby/object:Gem::Dependency
-  name: importmap-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: tailwindcss-rails
   requirement: !ruby/object:Gem::Requirement
@@ -192,20 +149,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: solargraph
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: brakeman
   requirement: !ruby/object:Gem::Requirement
@@ -251,17 +194,15 @@ files:
 - Rakefile
 - app/assets/images/maquina/.keep
 - app/assets/images/maquina/maquina.svg
-- app/assets/javascripts/maquina/application.js
-- app/assets/javascripts/maquina/controllers/alert_controller.js
-- app/assets/javascripts/maquina/controllers/application.js
-- app/assets/javascripts/maquina/controllers/backdrop_controller.js
-- app/assets/javascripts/maquina/controllers/file_controller.js
-- app/assets/javascripts/maquina/controllers/index.js
-- app/assets/javascripts/maquina/controllers/mobile_menu_controller.js
-- app/assets/javascripts/maquina/controllers/modal_controller.js
-- app/assets/javascripts/maquina/controllers/modal_open_controller.js
-- app/assets/javascripts/maquina/controllers/popup_menu_controller.js
-- app/assets/javascripts/maquina/controllers/submit_form_controller.js
+- app/assets/javascripts/controllers/alert_controller.js
+- app/assets/javascripts/controllers/backdrop_controller.js
+- app/assets/javascripts/controllers/file_controller.js
+- app/assets/javascripts/controllers/mobile_menu_controller.js
+- app/assets/javascripts/controllers/modal_controller.js
+- app/assets/javascripts/controllers/modal_open_controller.js
+- app/assets/javascripts/controllers/popup_menu_controller.js
+- app/assets/javascripts/controllers/submit_form_controller.js
+- app/assets/stylesheets/maquina.css
 - app/assets/stylesheets/maquina/application.css
 - app/assets/stylesheets/maquina/application.tailwind.css
 - app/controllers/concerns/.keep
@@ -290,11 +231,11 @@ files:
 - app/mailers/maquina/application_mailer.rb
 - app/mailers/maquina/user_notifications_mailer.rb
 - app/models/concerns/.keep
-- app/models/concerns/maquina/authenticate_by.rb
 - app/models/concerns/maquina/blockeable.rb
 - app/models/concerns/maquina/multifactor.rb
 - app/models/concerns/maquina/organization_scoped.rb
 - app/models/concerns/maquina/retain_passwords.rb
+- app/models/concerns/maquina/sqlite_search.rb
 - app/models/concerns/maquina/user_scoped.rb
 - app/models/maquina/active_session.rb
 - app/models/maquina/application_record.rb
@@ -306,6 +247,7 @@ files:
 - app/models/maquina/used_password.rb
 - app/models/maquina/user.rb
 - app/policies/maquina/application_policy.rb
+- app/policies/maquina/dashboard_policy.rb
 - app/policies/maquina/invitation_policy.rb
 - app/policies/maquina/navigation_policy.rb
 - app/policies/maquina/plan_policy.rb
@@ -329,18 +271,23 @@ files:
 - app/views/maquina/application/create.turbo_stream.erb
 - app/views/maquina/application/edit.html.erb
 - app/views/maquina/application/edit.rb
+- app/views/maquina/application/filters.rb
 - app/views/maquina/application/form.rb
 - app/views/maquina/application/index.html.erb
 - app/views/maquina/application/index_header.rb
 - app/views/maquina/application/index_modal.rb
 - app/views/maquina/application/index_table.rb
+- app/views/maquina/application/index_tools.rb
 - app/views/maquina/application/new.html.erb
 - app/views/maquina/application/new.rb
+- app/views/maquina/application/search.rb
 - app/views/maquina/application/sessions_header.rb
 - app/views/maquina/application/show.html.erb
 - app/views/maquina/application/update.turbo_stream.erb
 - app/views/maquina/application_view.rb
 - app/views/maquina/dashboard/index.html.erb
+- app/views/maquina/dashboard/stats.rb
+- app/views/maquina/dashboard/tasks.rb
 - app/views/maquina/first_runs/form.rb
 - app/views/maquina/first_runs/show.html.erb
 - app/views/maquina/form.rb
@@ -355,7 +302,6 @@ files:
 - app/views/maquina/navbar/profile_button.rb
 - app/views/maquina/navbar/profile_menu.rb
 - app/views/maquina/navbar/profile_menu_item_link.rb
-- app/views/maquina/navbar/search.rb
 - app/views/maquina/navbar/title.rb
 - app/views/maquina/sessions/form.rb
 - app/views/maquina/sessions/new.html.erb
@@ -384,10 +330,10 @@ files:
 - db/migrate/20230201203922_create_maquina_invitations.rb
 - db/migrate/20230829183530_create_maquina_organizations.rb
 - db/migrate/20230829192656_create_maquina_memberships.rb
+- db/migrate/20241109191405_add_counter_cache_to_plans.rb
 - db/schema.rb
 - lib/generators/maquina/install_generator.rb
 - lib/generators/maquina/install_stimulus_controllers/install_stimulus_controllers_generator.rb
-- lib/generators/maquina/install_templates/install_templates_generator.rb
 - lib/generators/maquina/tailwind_config/USAGE
 - lib/generators/maquina/tailwind_config/tailwind_config_generator.rb
 - lib/generators/maquina/tailwind_config/templates/app/assets/stylesheets/maquina.css
@@ -407,7 +353,6 @@ metadata:
   homepage_uri: https://mariochavez.io
   source_code_uri: https://github.com/mariochavez/maquina
   changelog_uri: https://github.com/mariochavez/maquina
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -422,8 +367,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Rails engine for building Rails applications.
 test_files: []

data/app/assets/javascripts/maquina/application.js

@@ -1,4 +0,0 @@
-// Configure your import map in config/importmap.rb. Read more: https://github.com/rails/importmap-rails
-import "@hotwired/turbo-rails"
-
-import "controllers"