iron-cms 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 687916dc93a240e583f38cbad26dc23e306bf8bd13ff3c8f7dd51e6b15643672
-  data.tar.gz: d8d6d1ebf7feac09405a53363e775ca004c3f95d246f7f3a7fa520c1766e360d
+  metadata.gz: 7cf5dcee3aab1c40252f69f9314a3f3db2c43b359bd7045264c837856406e260
+  data.tar.gz: 5e0e7f58dfa1630254637185f8e9adce63800fc83b4633a805aae36ac130e742
 SHA512:
-  metadata.gz: 952c317f76c2f810f7f188c5d546e745cbc920738a273479f5fb2381c8bd7d1a9cc264b6e76e1d8431fbee5c000e4b82707d3b60fd0c5603549738afa4c30f6c
-  data.tar.gz: 1cfef442f2eeea1e3df722398424e113efc92c9452640dc0d6db2b882f064d59d9f2e4c92296137c93b67ff33876ac8d21c659e0e963ec0eb5aaf1d68450fe6a
+  metadata.gz: ff9f0219866d562528218a0aa7156947e6c5b813ed1c2faf2142122ff430e23b2bf6e5d1c267c1d3db0ef4d566444ea253c43a0792f4422f944064554112971c
+  data.tar.gz: 186733969e7fdd9f69b1f7ef38391b7985165d29ede268eac7288a4b3f20c0277c39500cbdce85a860fa9a1c7d2c7ddca4cbbe11c42cae0f5de621ad62799139

data/app/assets/builds/iron.css

@@ -4173,6 +4173,14 @@
       }
     }
   }
+  .dark\:bg-red-500\/5 {
+    @media (prefers-color-scheme: dark) {
+      background-color: color-mix(in srgb, oklch(63.7% 0.237 25.331) 5%, transparent);
+      @supports (color: color-mix(in lab, red, red)) {
+        background-color: color-mix(in oklab, var(--color-red-500) 5%, transparent);
+      }
+    }
+  }
   .dark\:bg-red-500\/10 {
     @media (prefers-color-scheme: dark) {
       background-color: color-mix(in srgb, oklch(63.7% 0.237 25.331) 10%, transparent);

data/app/controllers/concerns/iron/admin_locale.rb

@@ -0,0 +1,14 @@
+module Iron
+  module AdminLocale
+    extend ActiveSupport::Concern
+
+    included do
+      around_action :set_admin_locale
+    end
+
+    private
+      def set_admin_locale(&action)
+        I18n.with_locale(Current.user&.language || :en, &action)
+      end
+  end
+end

data/app/controllers/iron/application_controller.rb

@@ -1,7 +1,7 @@
 module Iron
   class ApplicationController < ActionController::Base
     include ActiveStorage::SetCurrent
-    include Authentication, Authorization
+    include AdminLocale, Authentication, Authorization
     default_form_builder FormBuilder
   end
 end

data/app/controllers/iron/users/emails_controller.rb

@@ -0,0 +1,20 @@
+module Iron
+  module Users
+    class EmailsController < ApplicationController
+      before_action :set_user
+
+      def update
+        if @user.update(params.require(:user).permit(:email_address))
+          redirect_to @user, notice: "Email updated."
+        else
+          render "iron/users/show", status: :unprocessable_entity
+        end
+      end
+
+      private
+        def set_user
+          @user = Current.user
+        end
+    end
+  end
+end

data/app/controllers/iron/users/languages_controller.rb

@@ -0,0 +1,20 @@
+module Iron
+  module Users
+    class LanguagesController < ApplicationController
+      before_action :set_user
+
+      def update
+        if @user.update(params.require(:user).permit(:language))
+          redirect_to @user, notice: "Language updated."
+        else
+          render "iron/users/show", status: :unprocessable_entity
+        end
+      end
+
+      private
+        def set_user
+          @user = Current.user
+        end
+    end
+  end
+end

data/app/controllers/iron/users/passwords_controller.rb

@@ -0,0 +1,20 @@
+module Iron
+  module Users
+    class PasswordsController < ApplicationController
+      before_action :set_user
+
+      def update
+        if @user.update(params.require(:user).permit(:password, :password_confirmation))
+          redirect_to @user, notice: "Password changed."
+        else
+          render "iron/users/show", status: :unprocessable_entity
+        end
+      end
+
+      private
+        def set_user
+          @user = Current.user
+        end
+    end
+  end
+end

data/app/controllers/iron/users/roles_controller.rb

@@ -0,0 +1,21 @@
+module Iron
+  module Users
+    class RolesController < ApplicationController
+      before_action :set_user
+      before_action :ensure_can_administer
+
+      def update
+        if @user.update(params.expect(user: [ :role ]))
+          redirect_to @user, notice: "Role updated."
+        else
+          redirect_to @user, alert: @user.errors.full_messages.to_sentence
+        end
+      end
+
+      private
+        def set_user
+          @user = User.find(params.expect(:user_id))
+        end
+    end
+  end
+end

data/app/controllers/iron/users_controller.rb

@@ -3,7 +3,7 @@ module Iron
     layout "iron/authentication", only: %i[ new create ]
     require_unauthenticated_access only: %i[ new create ]
 
-    before_action :set_user, only: %i[ show update destroy ]
+    before_action :set_user, only: %i[ show destroy ]
     before_action :verify_join_code, only: %i[ new create ]
     before_action :ensure_can_administer, only: %i[ index destroy ]
 
@@ -30,14 +30,6 @@ module Iron
       redirect_to sign_in_url(email_address: join_params[:email_address])
     end
 
-    def update
-      if @user.current?
-        update_own_profile
-      else
-        update_user_role
-      end
-    end
-
     def destroy
       if @user.destroy
         redirect_back fallback_location: users_path, notice: "User was successfully removed.", status: :see_other
@@ -55,36 +47,8 @@ module Iron
         params.expect(user: [ :email_address, :password, :password_confirmation ])
       end
 
-      def profile_params
-        params.require(:user).permit(:email_address, :password, :password_confirmation)
-      end
-
-      def role_params
-        params.expect(user: [ :role ])
-      end
-
       def verify_join_code
         head :not_found if Current.account.join_code != params[:join_code]
       end
-
-      def update_own_profile
-        notice = profile_params.key?(:password) ? "Password changed." : "Email updated."
-
-        if @user.update(profile_params)
-          redirect_to @user, notice: notice
-        else
-          render :show, status: :unprocessable_entity
-        end
-      end
-
-      def update_user_role
-        head :forbidden and return unless Current.user.can_administer?
-
-        if @user.update(role_params)
-          redirect_to @user, notice: "Role updated."
-        else
-          redirect_to @user, alert: @user.errors.full_messages.to_sentence
-        end
-      end
   end
 end

data/app/models/iron/user.rb

@@ -3,6 +3,10 @@ module Iron
     include Role
     include Transferable
 
+    ADMIN_LANGUAGES = { "en" => "English", "it" => "Italiano" }.freeze
+
+    validates :language, inclusion: { in: ADMIN_LANGUAGES.keys }
+
     before_destroy :ensure_not_current_user
 
     has_secure_password

data/app/views/iron/users/_change_email_dialog.html.erb

@@ -7,7 +7,7 @@
     <div class="modal-header">
       <h3 class="modal-title">Change email</h3>
     </div>
-    <%= form_with(model: user) do |form| %>
+    <%= form_with(model: user, url: user_email_path(user)) do |form| %>
       <div class="modal-body">
         <div class="field">
           <%= form.label :email_address, "Email" %>

data/app/views/iron/users/_change_language_dialog.html.erb

@@ -0,0 +1,28 @@
+<%# locals: (user:) -%>
+<div data-controller="modal">
+  <button data-action="modal#open" class="button-link button-sm">Edit</button>
+
+  <dialog class="modal" data-modal-target="dialog" data-action="turbo:submit-end->modal#submitEnd" closedby="any">
+    <div class="modal-handle" data-action="touchstart->modal#dragStart touchmove->modal#dragMove touchend->modal#dragEnd"><div></div></div>
+    <div class="modal-header">
+      <h3 class="modal-title">Change language</h3>
+    </div>
+    <%= form_with(model: user, url: user_language_path(user)) do |form| %>
+      <div class="modal-body">
+        <div class="selection-list">
+          <% Iron::User::ADMIN_LANGUAGES.each do |code, name| %>
+            <label class="selection-list-item">
+              <%= form.radio_button :language, code, class: "sr-only" %>
+              <span class="selection-list-name"><%= name %></span>
+              <%= icon "check", class: "selection-list-check" %>
+            </label>
+          <% end %>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" data-action="modal#close" class="button-secondary button-lg sm:button-sm">Cancel</button>
+        <%= form.submit "Save", class: "button-primary button-lg sm:button-sm" %>
+      </div>
+    <% end %>
+  </dialog>
+</div>

data/app/views/iron/users/_change_password_dialog.html.erb

@@ -7,7 +7,7 @@
     <div class="modal-header">
       <h3 class="modal-title">Change password</h3>
     </div>
-    <%= form_with(model: user) do |form| %>
+    <%= form_with(model: user, url: user_password_path(user)) do |form| %>
       <div class="modal-body">
         <div class="field-group">
           <div class="field">

data/app/views/iron/users/_change_role_dialog.html.erb

@@ -7,7 +7,7 @@
     <div class="modal-header">
       <h3 class="modal-title">Change role</h3>
     </div>
-    <%= form_with(model: user) do |form| %>
+    <%= form_with(model: user, url: user_role_path(user)) do |form| %>
       <div class="modal-body">
         <div class="selection-list">
           <% Iron::User.roles.each do |key, _| %>

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

@@ -51,6 +51,14 @@
             </div>
             <%= render "iron/users/change_password_dialog", user: @user %>
           </div>
+
+          <div class="px-5 py-2.5 flex items-center justify-between gap-4">
+            <div class="min-w-0">
+              <div class="text-sm font-medium text-stone-900 dark:text-white">Language</div>
+              <div class="text-sm text-stone-500 dark:text-stone-400"><%= Iron::User::ADMIN_LANGUAGES[@user.language] %></div>
+            </div>
+            <%= render "iron/users/change_language_dialog", user: @user %>
+          </div>
         </div>
       </section>
 
@@ -91,7 +99,7 @@
         <p class="mt-1 text-sm text-stone-500 dark:text-stone-400">Permanent actions that cannot be undone.</p>
 
         <div class="mt-4">
-          <div class="rounded-xl ring-1 ring-red-200 dark:ring-red-500/20 p-5">
+          <div class="rounded-xl ring-1 ring-red-200 bg-red-50 dark:ring-red-500/20 dark:bg-red-500/5 p-5">
             <div class="flex items-center justify-between gap-4">
               <div>
                 <h3 class="text-sm font-medium text-stone-900 dark:text-white">Remove user</h3>

data/config/locales/it.yml

@@ -0,0 +1,36 @@
+it:
+  iron:
+    home:
+      greetings:
+        - "È ora di dare forma ai contenuti."
+        - "Le tue parole ti aspettano."
+        - "Creiamo qualcosa di grande."
+        - "I contenuti freschi partono da qui."
+        - "Cosa pubblicherai oggi?"
+        - "La pagina bianca ti aspetta."
+        - "Crea, pubblica, ripeti."
+        - "I tuoi contenuti, la tua storia."
+        - "Pronto a raccontare la tua storia?"
+        - "Le parole hanno potere. Usale."
+        - "Crea qualcosa che valga la pena leggere."
+        - "Una bozza in meno verso il traguardo."
+        - "Le idee non si pubblicano da sole."
+        - "Rendilo chiaro. Rendilo brillante."
+        - "I buoni contenuti richiedono pratica."
+        - "Pubblica, poi perfeziona."
+        - "Pensa, scrivi, pubblica."
+        - "Ogni grande pagina inizia qui."
+        - "Semplicità e autenticità."
+        - "A cosa stai pensando oggi?"
+        - "Piccole modifiche, grande impatto."
+        - "Il contenuto è un'arte."
+        - "Scrivi una volta, ispira molti."
+        - "Meno fronzoli, più sostanza."
+        - "Pubblica. Sei pronto."
+        - "La struttura porta chiarezza."
+        - "Il tuo pubblico ti aspetta."
+        - "Fai contare ogni parola."
+  pagy:
+    p11n: 'OneOther'
+    previous: "Prec"
+    next: "Succ"

data/config/routes.rb

@@ -27,7 +27,14 @@ Iron::Engine.routes.draw do
   resources :locales, except: %i[ show ]
 
   resource :settings, only: %i[ show update ]
-  resources :users, only: %i[ index show update destroy ]
+  resources :users, only: %i[ index show destroy ] do
+    scope module: :users do
+      resource :email, only: :update
+      resource :password, only: :update
+      resource :language, only: :update
+      resource :role, only: :update
+    end
+  end
 
   # Authentication
   get "join/:join_code", to: "users#new", as: :join

data/db/migrate/20260207103057_add_language_to_iron_users.rb

@@ -0,0 +1,5 @@
+class AddLanguageToIronUsers < ActiveRecord::Migration[8.1]
+  def change
+    add_column :iron_users, :language, :string, null: false, default: "en"
+  end
+end

data/lib/iron/engine.rb

@@ -43,6 +43,12 @@ module Iron
       end
     end
 
+    initializer "iron.admin_locales" do |app|
+      app.config.after_initialize do
+        I18n.available_locales |= Iron::User::ADMIN_LANGUAGES.keys.map(&:to_sym)
+      end
+    end
+
     initializer "iron.global_id_locator" do |app|
       app.config.after_initialize do
         global_id_app = ::GlobalID.app || ::Rails.application.config.try(:global_id)&.app

data/lib/iron/version.rb

@@ -1,3 +1,3 @@
 module Iron
-  VERSION = "0.9.0"
+  VERSION = "0.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Massimo De Marchi
@@ -258,6 +258,7 @@ files:
 - app/assets/tailwind/iron/components/textarea.css
 - app/assets/tailwind/iron/components/toggle.css
 - app/assets/tailwind/iron/lexxy.css
+- app/controllers/concerns/iron/admin_locale.rb
 - app/controllers/concerns/iron/authentication.rb
 - app/controllers/concerns/iron/authorization.rb
 - app/controllers/concerns/iron/locale_aware.rb
@@ -282,6 +283,10 @@ files:
 - app/controllers/iron/sessions/transfers_controller.rb
 - app/controllers/iron/sessions_controller.rb
 - app/controllers/iron/settings_controller.rb
+- app/controllers/iron/users/emails_controller.rb
+- app/controllers/iron/users/languages_controller.rb
+- app/controllers/iron/users/passwords_controller.rb
+- app/controllers/iron/users/roles_controller.rb
 - app/controllers/iron/users_controller.rb
 - app/helpers/iron/application_helper.rb
 - app/helpers/iron/avatar_helper.rb
@@ -472,6 +477,7 @@ files:
 - app/views/iron/shared/_save_bar.html.erb
 - app/views/iron/shared/_select.html.erb
 - app/views/iron/users/_change_email_dialog.html.erb
+- app/views/iron/users/_change_language_dialog.html.erb
 - app/views/iron/users/_change_password_dialog.html.erb
 - app/views/iron/users/_change_role_dialog.html.erb
 - app/views/iron/users/_invite.html.erb
@@ -491,6 +497,7 @@ files:
 - app/views/layouts/iron/authentication.html.erb
 - config/importmap.rb
 - config/locales/en.yml
+- config/locales/it.yml
 - config/routes.rb
 - db/migrate/20250422131656_initial_iron_schema.rb
 - db/migrate/20250427100754_create_iron_accounts.rb
@@ -509,6 +516,7 @@ files:
 - db/migrate/20250908203158_add_instance_token_to_iron_accounts.rb
 - db/migrate/20251209103109_create_iron_account_exports.rb
 - db/migrate/20251209103110_create_iron_account_imports.rb
+- db/migrate/20260207103057_add_language_to_iron_users.rb
 - lib/generators/iron/pages/pages_generator.rb
 - lib/generators/iron/pages/templates/pages_controller.rb
 - lib/generators/iron/pages/templates/show.html.erb