trek 0.1.23 → 0.1.24

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trek
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Mohamed Bengrich
@@ -696,7 +696,6 @@ files:
 - app/models/trek/content_editor/prompt.rb
 - app/models/trek/dashboard/config.rb
 - app/models/trek/feature.rb
-- app/models/trek/user_password_reset.rb
 - app/models/trek/user_session.rb
 - app/policies/concerns/trek/policies/helpers.rb
 - app/policies/concerns/trek/policies/permitted_attributes.rb
@@ -847,6 +846,7 @@ files:
 - lib/generators/trek/templates/controllers/admin/user_password_resets_controller.rb
 - lib/generators/trek/templates/controllers/admin/user_sessions_controller.rb
 - lib/generators/trek/templates/controllers/admin/users_controller.rb
+- lib/generators/trek/templates/controllers/concerns/trek/authentication.rb
 - lib/generators/trek/templates/helpers/application_helper.rb
 - lib/generators/trek/templates/helpers/external_link_path_helper.rb
 - lib/generators/trek/templates/initializers/healthcheck.rb
@@ -860,7 +860,9 @@ files:
 - lib/generators/trek/templates/locales/scaffold/admin.other.yml.tt
 - lib/generators/trek/templates/locales/scaffold/model.en.yml.tt
 - lib/generators/trek/templates/locales/scaffold/model.other.yml.tt
-- lib/generators/trek/templates/mailers/user_mailer.rb
+- lib/generators/trek/templates/mailers/admin/passwords_mailer.rb
+- lib/generators/trek/templates/mailers/admin_mailer.rb
+- lib/generators/trek/templates/migrations/create_users.rb.erb
 - lib/generators/trek/templates/migrations/external_links.rb.erb
 - lib/generators/trek/templates/migrations/fragments.rb.erb
 - lib/generators/trek/templates/migrations/menu_nodes.rb.erb
@@ -870,6 +872,7 @@ files:
 - lib/generators/trek/templates/migrations/tag_categories.rb.erb
 - lib/generators/trek/templates/migrations/taggings.rb.erb
 - lib/generators/trek/templates/migrations/tags.rb.erb
+- lib/generators/trek/templates/migrations/user_sessions.rb.erb
 - lib/generators/trek/templates/migrations/users.rb.erb
 - lib/generators/trek/templates/models/current.rb
 - lib/generators/trek/templates/models/dashboard.rb
@@ -882,6 +885,8 @@ files:
 - lib/generators/trek/templates/models/tag.rb
 - lib/generators/trek/templates/models/tag_category.rb
 - lib/generators/trek/templates/models/tagging.rb
+- lib/generators/trek/templates/models/user.rb
+- lib/generators/trek/templates/models/user_session.rb
 - lib/generators/trek/templates/package.json.tt
 - lib/generators/trek/templates/policies/admin/scaffold_policy.rb.tt
 - lib/generators/trek/templates/policies/admin/tag_category_policy.rb
@@ -906,6 +911,10 @@ files:
 - lib/generators/trek/templates/views/admin/pages/index.html.slim
 - lib/generators/trek/templates/views/admin/pages/index.json.jb
 - lib/generators/trek/templates/views/admin/pages/new.html.slim
+- lib/generators/trek/templates/views/admin/passwords_mailer/reset.en.html.slim
+- lib/generators/trek/templates/views/admin/passwords_mailer/reset.en.text.erb
+- lib/generators/trek/templates/views/admin/passwords_mailer/reset.fr.html.slim
+- lib/generators/trek/templates/views/admin/passwords_mailer/reset.fr.text.erb
 - lib/generators/trek/templates/views/admin/scaffold/_form.html.slim.tt
 - lib/generators/trek/templates/views/admin/scaffold/edit.html.slim
 - lib/generators/trek/templates/views/admin/scaffold/index.html.slim
@@ -919,14 +928,10 @@ files:
 - lib/generators/trek/templates/views/admin/users/index.html.slim
 - lib/generators/trek/templates/views/admin/users/new.html.slim
 - lib/generators/trek/templates/views/admin/users/show.html.slim
-- lib/generators/trek/templates/views/user_mailer/invite_email.en.html.slim
-- lib/generators/trek/templates/views/user_mailer/invite_email.en.text.erb
-- lib/generators/trek/templates/views/user_mailer/invite_email.fr.html.slim
-- lib/generators/trek/templates/views/user_mailer/invite_email.fr.text.erb
-- lib/generators/trek/templates/views/user_mailer/reset_password_email.en.html.slim
-- lib/generators/trek/templates/views/user_mailer/reset_password_email.en.text.erb
-- lib/generators/trek/templates/views/user_mailer/reset_password_email.fr.html.slim
-- lib/generators/trek/templates/views/user_mailer/reset_password_email.fr.text.erb
+- lib/generators/trek/templates/views/admin_mailer/invite.en.html.slim
+- lib/generators/trek/templates/views/admin_mailer/invite.en.text.erb
+- lib/generators/trek/templates/views/admin_mailer/invite.fr.html.slim
+- lib/generators/trek/templates/views/admin_mailer/invite.fr.text.erb
 - lib/trek.rb
 - lib/trek/engine.rb
 - lib/trek/i18n_keys_resolver.rb
@@ -957,7 +962,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.6
+rubygems_version: 4.0.10
 specification_version: 4
 summary: A modern CMS for Ruby on Rails
 test_files: []

data/app/models/trek/user_password_reset.rb

@@ -1,12 +0,0 @@
-module Trek
-  class UserPasswordReset
-    extend ActiveModel::Translation
-    include ActiveModel::Model
-
-    attr_accessor :email
-
-    def user
-      User.find_by(email:)
-    end
-  end
-end

data/lib/generators/trek/templates/mailers/user_mailer.rb

@@ -1,21 +0,0 @@
-class UserMailer < ApplicationMailer
-  helper ApplicationHelper
-
-  def reset_password_email(user)
-    @user = user
-    @url = edit_admin_user_password_reset_url(@user.reset_password_token)
-
-    I18n.with_locale(@user.locale || I18n.default_locale) do
-      mail(to: @user.email)
-    end
-  end
-
-  def invite_email(user)
-    @user = user
-    @url = edit_admin_user_password_reset_url(@user.reset_password_token)
-
-    mail(
-      to: @user.email
-    )
-  end
-end

data/lib/generators/trek/templates/views/user_mailer/invite_email.en.html.slim

@@ -1,29 +0,0 @@
-h1 Hello #{@user},
-p You have been invited to #{admin_full_brand}.
-
-table.body-action(
-  align="center"
-  width="100%"
-  cellpadding="0"
-  cellspacing="0"
-  role="presentation"
-)
-  tr
-    td(align="center")
-      table(
-        width="100%"
-        border="0"
-        cellspacing="0"
-        cellpadding="0"
-        role="presentation"
-      )
-        tr
-          td(align="center")
-            = link_to "Choose your password",
-                      @url,
-                      class: "f-fallback button",
-                      target: "_blank",
-                      rel: "noopener"
-
-p Have a great day!
-p The #{t("application_name")} team

data/lib/generators/trek/templates/views/user_mailer/invite_email.fr.html.slim

@@ -1,29 +0,0 @@
-h1 Bonjour #{@user},
-p Vous avez été invité sur #{admin_full_brand}.
-
-table.body-action(
-  align="center"
-  width="100%"
-  cellpadding="0"
-  cellspacing="0"
-  role="presentation"
-)
-  tr
-    td(align="center")
-      table(
-        width="100%"
-        border="0"
-        cellspacing="0"
-        cellpadding="0"
-        role="presentation"
-      )
-        tr
-          td(align="center")
-            = link_to "Choisir votre mot de passe",
-                      @url,
-                      class: "f-fallback button",
-                      target: "_blank",
-                      rel: "noopener"
-
-p Bonne journée !
-p L'équipe #{t("application_name")}

data/lib/generators/trek/templates/views/user_mailer/reset_password_email.en.html.slim

@@ -1,7 +0,0 @@
-p Hello #{@user},
-p You have requested to reset your password.
-p
-  |
-    To choose a new password, just follow this link:
-    #{link_to @url, @url}
-p Have a great day!

data/lib/generators/trek/templates/views/user_mailer/reset_password_email.fr.html.slim

@@ -1,7 +0,0 @@
-p Bonjour #{@user},
-p Vous avez demandé à réinitialiser votre mot de passe.
-p
-  |
-    Pour choisir votre nouveau mot de passe, suivez ce lien :
-    #{link_to @url, @url}
-p Bonne journée !