maquina 0.4.0 → 0.5.1

data/app/controllers/maquina/sessions_controller.rb

@@ -2,55 +2,52 @@
 
 module Maquina
   class SessionsController < ApplicationController
+    allow_unauthenticated_access only: [:new, :create]
+
     layout "maquina/sessions"
 
+    before_action :ensure_user_exists, only: :new
+
     def new
-      @return_to = params[:return_to]
-      @return_to = nil if @return_to == "/" || @return_to == "%2F"
+      @user = Maquina::User.new
     end
 
     def create
-      user = Maquina::User.authenticate_by(email: params.dig(:email), password: params.dig(:password))
-
-      @return_to = params.dig(:return_to)
-      result = create_session(user, @return_to)
-      return redirect_to(result, status: :see_other, format: :html) if result.present?
+      reset_session
 
-      response.status = :unprocessable_entity
-      flash.now.alert = t("flash.sessions.create.alert")
+      @user = Maquina::User.authenticate_by(email: params.dig(:email), password: params.dig(:password))
 
-      respond_to do |format|
-        format.html { render :new }
-        format.turbo_stream
+      if @user.present?
+        active_session = start_new_session_for(@user)
+        if active_session.present?
+          return redirect_to(calculate_redirect_path(active_session), notice: t("flash.sessions.create.notice"), status: :see_other)
+        end
       end
+
+      @user = Maquina::User.new(email: params.dig(:email))
+      flash.now.alert = t("flash.sessions.create.alert")
+      render :new, status: :unprocessable_entity
     end
 
     def destroy
-      session["--active_session"] = nil
+      reset_session
       Maquina::Current.reset
 
       flash.notice = t("flash.sessions.destroy.notice")
-      redirect_to main_app.root_path
+      redirect_to main_app.sign_in_path, status: :see_other
     end
 
     private
 
+    def ensure_user_exists
+      redirect_to maquina.first_run_url if Maquina::User.none?
+    end
+
     def calculate_redirect_path(active_session)
       return maquina.new_multifactor_path if active_session.user.multifactor?
       return active_session.return_url if active_session.return_url.present?
 
       active_session.user.management? ? maquina.root_path : main_app.root_path
     end
-
-    def create_session(user, return_to)
-      return nil if user.blank?
-
-      active_session = ActiveSession.create(user: user, user_agent: request.user_agent, remote_addr: request.remote_ip, return_url: return_to)
-      return nil if !active_session.persisted?
-
-      session["--active_session"] = active_session.id
-      flash.notice = t("flash.sessions.create.notice")
-      calculate_redirect_path(active_session)
-    end
   end
 end

data/app/helpers/maquina/application_helper.rb

@@ -2,12 +2,10 @@
 
 module Maquina
   module ApplicationHelper
-    def maquina_importmap_tags(entry_point = "application", shim: true)
+    def maquina_importmap_tags(entry_point = "application", importmap: Maquina.configuration.importmap)
       safe_join [
-        javascript_inline_importmap_tag(Maquina.configuration.importmap.to_json(resolver: self)),
-        javascript_importmap_module_preload_tags(Maquina.configuration.importmap),
-        (javascript_importmap_shim_nonce_configuration_tag if shim),
-        (javascript_importmap_shim_tag if shim),
+        javascript_inline_importmap_tag(importmap.to_json(resolver: self)),
+        javascript_importmap_module_preload_tags(importmap),
         javascript_import_module_tag(entry_point)
       ].compact, "\n"
     end

data/app/models/concerns/maquina/searchable.rb

@@ -19,6 +19,10 @@ module Maquina
 
         pg_search_scope :search_full, against: fields, using: search_options, associated_against: associated_against # , ignoring: :accents
       end
+
+      def searchable?
+        true
+      end
     end
   end
 end

data/app/models/maquina/organization.rb

@@ -2,6 +2,8 @@
 
 module Maquina
   class Organization < ApplicationRecord
+    # include Maquina::Searchable
+
     belongs_to :plan, class_name: "Maquina::Plan", foreign_key: :maquina_plan_id, optional: true
   end
 end

data/app/models/maquina/user.rb

@@ -6,11 +6,13 @@ module Maquina
     include Maquina::AuthenticateBy
     include Maquina::Blockeable
     include Maquina::Multifactor
+    # include Maquina::Searchable
 
     PASSWORD_COMPLEXITY_REGEX = /\A(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[@$!%*?&#-=+])[A-Za-z\d@$!%*?&#-=+]{8,}\z/
     has_secure_password
 
     has_many :memberships, class_name: "Maquina::Membership", foreign_key: :maquina_user_id, inverse_of: :user
+    has_many :active_sessions, class_name: "Maquina::ActiveSession", foreign_key: :maquina_user_id, dependent: :destroy
 
     validates :email, presence: true, uniqueness: true, format: {with: URI::MailTo::EMAIL_REGEXP}
     validates :password, format: {with: PASSWORD_COMPLEXITY_REGEX}, unless: ->(user) { user.password.blank? }

data/app/views/layouts/maquina/sessions.html.erb

@@ -3,18 +3,20 @@
   <head>
     <title><%= t("application_name") %></title>
     <meta name="viewport" content="width=device-width,initial-scale=1">
+    <meta name="apple-mobile-web-app-capable" content="yes">
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
 
-    <%= stylesheet_link_tag "tailwind", "inter-font", "data-turbo-track": "reload" %>
+    <%= yield :head %>
 
+    <%= stylesheet_link_tag "tailwind", "inter-font", "data-turbo-track": "reload" %>
     <%= maquina_importmap_tags %>
+
+    <%= turbo_refreshes_with method: :morph, scroll: :preserve %>
   </head>
 
   <body class="h-full">
-    <%= turbo_frame_tag :alert do %>
-      <%= render Maquina::Application::Alert.new(flash) %>
-    <% end %>
+    <%= render Maquina::Application::Alert.new(flash) %>
 
     <main class="container mx-auto">
       <%= yield %>

data/app/views/maquina/accept_invitations/new_view.rb

@@ -12,7 +12,7 @@ module Maquina
         @resource = resource
       end
 
-      def template
+      def view_template
         div(class: "mt-8 sm:mx-auto sm:w-full sm:max-w-md") do
           div(class: "bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10") do
             @resource.new_record? ? invalid_invitation : build_form

data/app/views/maquina/application/alert.rb

@@ -6,17 +6,17 @@ module Maquina
       include Maquina::ApplicationView
 
       def initialize(flash)
-        notice = flash.notice
-        alert = flash.alert
+        notice = flash.notice || flash.now[:notice]
+        alert = flash.alert || flash.now[:alert]
 
         @flash = notice || alert
         @success = notice.present?
       end
 
-      def template
+      def view_template
         return if @flash.blank?
 
-        div(aria_live: "assertive", class: "pointer-events-none fixed inset-0 flex items-end px-4 py-6 sm:items-start sm:p-6 z-30", data: {controller: "alert", "turbo-cache": false}) do
+        div(aria_live: "assertive", class: "pointer-events-none fixed inset-0 flex items-end px-4 py-6 sm:items-start sm:p-6 z-30", data: {controller: "alert"}) do
           div(class: "flex w-full flex-col items-center space-y-4 sm:items-end hidden", data: transition_attributes) do
             div(class: "pointer-events-auto w-full max-w-sm overflow-hidden rounded-lg bg-white shadow-lg ring-1 ring-black ring-opacity-5") do
               div(class: "p-4") do

data/app/views/maquina/application/components/action_text_component.rb

@@ -4,7 +4,7 @@ module Maquina
   module Application
     module Components
       class ActionTextComponent < ComponentBase
-        def template
+        def view_template
           div(**control_html) do
             @form.label attribute_name, class: "label #{label_css_class}"
             div(class: "mt-1") do

data/app/views/maquina/application/components/checkbox_component.rb

@@ -4,7 +4,7 @@ module Maquina
   module Application
     module Components
       class CheckboxComponent < ComponentBase
-        def template
+        def view_template
           div(**control_html) do
             div(class: "flex h-5 items-center") do
               @form.check_box attribute_name, **input_html

data/app/views/maquina/application/components/date_component.rb

@@ -4,7 +4,7 @@ module Maquina
   module Application
     module Components
       class DateComponent < ComponentBase
-        def template
+        def view_template
           div(**control_html) do
             @form.label attribute_name, class: "label #{label_css_class}"
             div(class: "mt-1") do

data/app/views/maquina/application/components/file_component.rb

@@ -9,7 +9,7 @@ module Maquina
 
         delegate :main_app, to: :helpers
 
-        def template
+        def view_template
           div(**extend_control_options(control_html)) do
             @form.label attribute_name, class: "label #{label_css_class}"
             div(class: "mt-1") do

data/app/views/maquina/application/components/input_component.rb

@@ -4,7 +4,7 @@ module Maquina
   module Application
     module Components
       class InputComponent < ComponentBase
-        def template
+        def view_template
           div(**control_html) do
             @form.label attribute_name, class: "label #{label_css_class}"
             div(class: "mt-1") do

data/app/views/maquina/application/components/select_component.rb

@@ -6,7 +6,7 @@ module Maquina
       class SelectComponent < ComponentBase
         delegate :controller, :options_for_select, to: :helpers
 
-        def template
+        def view_template
           options = input_html(no_helpers: true).deep_dup
 
           div(**control_html) do

data/app/views/maquina/application/components/text_area_component.rb

@@ -4,7 +4,7 @@ module Maquina
   module Application
     module Components
       class TextAreaComponent < ComponentBase
-        def template
+        def view_template
           div(**control_html) do
             @form.label attribute_name, class: "label #{label_css_class}"
             div(class: "mt-1") do

data/app/views/maquina/application/edit.rb

@@ -9,7 +9,7 @@ module Maquina
         @resource = resource
       end
 
-      def template
+      def view_template
         render Maquina::Application::Form.new(resource: @resource)
       end
     end

data/app/views/maquina/application/form.rb

@@ -13,7 +13,7 @@ module Maquina
         @modal = modal
       end
 
-      def template
+      def view_template
         form_with(model: @resource, url: if @resource.persisted?
                                            resource_path(@resource)
                                          else

data/app/views/maquina/application/index_header.rb

@@ -10,7 +10,7 @@ module Maquina
         @filter = filter
       end
 
-      def template
+      def view_template
         div(class: "sm:flex sm:items-center") do
           div(class: "sm:flex-auto") do
             h1(class: "text-xl font-semibold text-skin-base") { model_human_name(plural: true) }

data/app/views/maquina/application/index_modal.rb

@@ -6,7 +6,7 @@ module Maquina
       include ApplicationView
       register_element :turbo_frame
 
-      def template
+      def view_template
         div(data_controller: "modal", class: "modal", data_modal_backdrop_outlet: ".modal-backdrop") do
           div(class: "hidden fixed inset-0 z-30 overflow-y-auto", aria_labelledby: "modal-title", role: "dialog",
             aria_modal: "true", data_modal_target: "container") do

data/app/views/maquina/application/index_table.rb

@@ -13,7 +13,7 @@ module Maquina
         @pagination = pagination
       end
 
-      def template
+      def view_template
         div(class: "mt-8 flex flex-col") do
           div(class: "-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8") do
             div(class: "inline-block min-w-full py-2 align-middle md:px-6 lg:px-8") do

data/app/views/maquina/application/new.rb

@@ -10,7 +10,7 @@ module Maquina
         @modal = modal
       end
 
-      def template
+      def view_template
         render Maquina::Application::Form.new(resource: @resource, modal: @modal)
       end
     end

data/app/views/maquina/application/sessions_header.rb

@@ -5,15 +5,17 @@ module Maquina
     class SessionsHeader < Phlex::HTML
       include Maquina::ApplicationView
       include Phlex::DeferredRender
+      include Phlex::Rails::Helpers::Translate
 
-      def initialize(brand_icon:)
+      def initialize(brand_icon:, translation_key: "maquina.application.sessions_header")
         @brand_icon = brand_icon
+        @translation_key = translation_key
       end
 
-      def template
+      def view_template
         div(class: "sm:mx-auto sm:w-full sm:max-w-md") do
           image_tag(@brand_icon, class: "mx-auto h-12 w-auto", alt: t("application_name"))
-          h2(class: "mt-6 text-center text-3xl font-bold tracking-tight text-skin-base") { t(".title") }
+          h2(class: "mt-6 text-center text-3xl font-bold tracking-tight text-skin-base") { t("#{@translation_key}.title") }
 
           if @description.present?
             p(class: "mt-2 text-center text-sm text-skin-dimmed") do

data/app/views/maquina/application_view.rb

@@ -3,7 +3,7 @@
 module Maquina
   module ApplicationView
     include Maquina::Engine.routes.url_helpers
-    include Phlex::Rails::Helpers::T
+    include Phlex::Rails::Helpers::Translate
 
     delegate :resource_class, :l, :default_url_options, :policy_class, :show_link, :allowed_to?, to: :helpers
 

data/app/views/maquina/first_runs/form.rb

@@ -0,0 +1,28 @@
+module Maquina
+  module FirstRuns
+    class Form < Phlex::HTML
+      include Maquina::ApplicationView
+      include Maquina::Form
+
+      def initialize(resource)
+        @resource = resource
+        @scope = "first_runs"
+      end
+
+      def view_template
+        div(class: "mt-8 sm:mx-auto sm:w-full sm:max-w-md") do
+          div(class: "bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10") do
+            p(class: "text-center text-skin-muted") { t("maquina.application.first_runs_header.description") }
+            form_with(model: @resource, url: first_run_path, method: :post, class: "space-y-6") do |form|
+              text_field(form, field_name: :email, required: true)
+              password_field(form, field_name: :password, required: true)
+              div do
+                form.submit t("helpers.submit.first_runs.create"), class: "flex w-full justify-center button button-accented"
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/views/maquina/first_runs/show.html.erb

@@ -0,0 +1,5 @@
+<div class="flex min-h-full flex-col justify-center py-12 sm:px-6 lg:px-8">
+
+  <%= render Maquina::Application::SessionsHeader.new(brand_icon: brand_icon, translation_key: "maquina.application.first_runs_header") %>
+  <%= render Maquina::FirstRuns::Form.new(@user) %>
+</div>

data/app/views/maquina/form.rb

@@ -0,0 +1,44 @@
+module Maquina
+  module Form
+    include Phlex::Rails::Helpers::FormWith
+
+    protected
+
+    def text_field(form, field_name:, required: false, label_class: "block label", input_class: "w-full block input", **options)
+      div do
+        form.label field_name, class: label_class
+        div(class: "mt-1") do
+          form.text_field field_name, required: required, class: input_class,
+            **options.merge(field_attributes(field_name))
+          field_help(field_name)
+        end
+      end
+    end
+
+    def password_field(form, field_name:, required: false, label_class: "block label", input_class: "w-full block input", **options)
+      div do
+        form.label field_name, class: label_class
+        div(class: "mt-1") do
+          form.password_field field_name, required: required, class: input_class,
+            **options.merge(field_attributes(field_name))
+          field_help(field_name)
+        end
+      end
+    end
+
+    def field_attributes(field_name)
+      @scope ||= ""
+      {
+        maxlength: t("helpers.maxlength.#{@scope}.#{field_name}", default: t("helpers.maxlength.default")),
+        placeholder: t("placeholder.#{@scope}.#{field_name}", default: "")
+      }
+    end
+
+    def field_help(field_name)
+      help = t("help.#{@scope}.#{field_name}", default: "")
+      if help.present?
+        div(class: "mt-2 text-sm text-skin-dimmed") { help }
+      end
+    end
+  end
+end

data/app/views/maquina/navbar/menu.rb

@@ -37,7 +37,7 @@ module Maquina
         @desktop = desktop
       end
 
-      def template
+      def view_template
         div class: "#{link_type}-menu" do
           secure_menu_options.each_pair do |option, path|
             render(Maquina::Navbar::MenuItemLink.new(option, path, desktop: @desktop))

data/app/views/maquina/navbar/menu_item_link.rb

@@ -13,7 +13,7 @@ module Maquina
         @desktop = desktop
       end
 
-      def template
+      def view_template
         a(href: @path, **classes("#{link_type}-menu-item", active?: "#{link_type}-menu-item__active")) { t("menu.main.#{@option}") }
       end
 

data/app/views/maquina/navbar/mobile_button.rb

@@ -5,7 +5,7 @@ module Maquina
     class MobileButton < Phlex::HTML
       include ApplicationView
 
-      def template(&block)
+      def view_template(&block)
         div class: "flex items-center lg:hidden" do
           button type: "button", class: "mobile-button", "aria-controls": "mobile-menu", "aria-expanded": false, "data-action": "mobile-menu#toggle" do
             span(class: "sr-only") { "Open main menu" }

data/app/views/maquina/navbar/mobile_menu.rb

@@ -5,7 +5,7 @@ module Maquina
     class MobileMenu < Phlex::HTML
       include ApplicationView
 
-      def template
+      def view_template
         div class: "hidden lg:hidden", **data_attributes do
           render Maquina::Navbar::Menu.new(desktop: false)
 

data/app/views/maquina/navbar/notification.rb

@@ -9,7 +9,7 @@ module Maquina
         @desktop = desktop
       end
 
-      def template(&block)
+      def view_template(&block)
         button(**button_attributes) do
           span(class: "sr-only") { "View notifications" }
           svg_icon(:fill, icon: notification_icon)

data/app/views/maquina/navbar/profile.rb

@@ -5,7 +5,7 @@ module Maquina
     class Profile < Phlex::HTML
       include ApplicationView
 
-      def template
+      def view_template
         div class: "ml-4 relative flex-shrink-0", "data-controller": "popup-menu" do
           render Maquina::Navbar::ProfileButton.new
           render Maquina::Navbar::ProfileMenu.new

data/app/views/maquina/navbar/profile_button.rb

@@ -5,7 +5,7 @@ module Maquina
     class ProfileButton < Phlex::HTML
       include ApplicationView
 
-      def template
+      def view_template
         div do
           button type: "button", class: "bg-white rounded-full hidden lg:flex text-sm focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500", id: "user-menu-button", "aria-expanded": false, "aria-haspopup": true, "data-action": "popup-menu#toggleTransition" do
             span(class: "sr-only") { "Open user menu" }

data/app/views/maquina/navbar/profile_menu.rb

@@ -42,7 +42,7 @@ module Maquina
         @desktop = desktop
       end
 
-      def template
+      def view_template
         div(**menu_attributes) do
           secure_menu_options.each_pair do |option, path|
             link_path, attributes = path_options(path)

data/app/views/maquina/navbar/profile_menu_item_link.rb

@@ -14,7 +14,7 @@ module Maquina
         @active = active
       end
 
-      def template
+      def view_template
         link_method = link_attributes.dig(:method)
         if link_method == :delete
           button_to t("menu.profile.#{@option}"), @path, method: :delete, **link_attributes

data/app/views/maquina/navbar/search.rb

@@ -13,7 +13,7 @@ module Maquina
         @query = query
       end
 
-      def template
+      def view_template
         div class: "flex-1 flex items-center justify-center px-2 lg:ml-6 lg:justify-end" do
           div class: "max-w-lg w-full lg:max-w-xs" do
             form_with(url: @url, method: :get, data: {controller: "submit-form"}) do |form|

data/app/views/maquina/navbar/title.rb

@@ -9,7 +9,7 @@ module Maquina
         @brand_icon = brand_icon
       end
 
-      def template
+      def view_template
         div class: "flex-shrink-0 flex items-center" do
           if @brand_icon.present?
             img(src: @brand_icon, class: "hidden lg:block mx-auto h-8 w-auto")

data/app/views/maquina/sessions/form.rb

@@ -10,11 +10,10 @@ module Maquina
         @resource = resource
       end
 
-      def template
+      def view_template
         div(class: "mt-8 sm:mx-auto sm:w-full sm:max-w-md") do
           div(class: "bg-white py-8 px-4 shadow sm:rounded-lg sm:px-10") do
-            form_with(url: sessions_path, method: :post, class: "space-y-6", data: {turbo_frame: :_top, "turbo-cache": false}) do |form|
-              form.hidden_field :return_to, value: @resource.return_to
+            form_with(url: sessions_path, method: :post, class: "space-y-6") do |form|
               div do
                 form.label t("form.sessions.email"), for: :email, class: "block label"
                 div(class: "mt-1") do
@@ -31,7 +30,7 @@ module Maquina
                 div do
                 end
                 div(class: "text-sm") do
-                  a(href: "#", class: "link", data: {turbo_frame: :_top}) { t("form.sessions.forgot_password") }
+                  a(href: "#", class: "link") { t("form.sessions.forgot_password") }
                 end
               end
               div do

data/app/views/maquina/sessions/new.html.erb

@@ -2,8 +2,5 @@
 
   <%= render Maquina::Application::SessionsHeader.new(brand_icon: brand_icon) %>
 
-  <%= turbo_frame_tag :form do %>
-    <%= render Maquina::Sessions::Form.new(OpenStruct.new(params.slice(:email, :password, :return_to))) %>
-  <% end %>
-
+  <%= render Maquina::Sessions::Form.new(@user) %>
 </div>

data/config/importmap.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
+pin "application" # , to: "maquina/application.js", preload: true
+
 # Stimulus & Turbo
-pin "@hotwired/turbo-rails", to: "turbo.min.js", preload: true
-pin "@hotwired/stimulus", to: "stimulus.min.js", preload: true
-pin "@hotwired/stimulus-loading", to: "stimulus-loading.js", preload: true
-pin "stimulus-use", to: "https://ga.jspm.io/npm:stimulus-use@0.52.2/dist/index.js"
+pin "@hotwired/turbo-rails", to: "turbo.min.js"
+pin "@hotwired/stimulus", to: "@hotwired--stimulus.js" # @3.2.2
+pin "@hotwired/stimulus-loading", to: "stimulus-loading.js"
+pin "stimulus-use" # , to: "https://ga.jspm.io/npm:stimulus-use@0.52.2/dist/index.js"
 
 # Maquina entrypoint
-pin "application", to: "maquina/application.js", preload: true
 
-pin_all_from Maquina::Engine.root.join("app/assets/javascripts/maquina/controllers"), under: "controllers", to: "maquina/controllers"
+pin_all_from Maquina::Engine.root.join("app/assets/javascripts/maquina/controllers"), under: "controllers" # , to: "maquina/controllers"