Merge pull request #161 from joyofrails/feat/email-admin-new-user

Thanks page and email admin new user

Author: rossta

app/controllers/concerns/erroring.rb

@@ -1,5 +1,5 @@
 module Erroring
   def not_found!
-    raise ActionController::RoutingError, "Not Found"
+    raise ActionController::RoutingError, "Route not found #{request.path}"
   end
 end

app/controllers/users/newsletter_subscriptions_controller.rb

@@ -1,5 +1,5 @@
 class Users::NewsletterSubscriptionsController < ApplicationController
-  invisible_captcha only: [:create]
+  # invisible_captcha only: [:create]
 
   before_action :authenticate_user_or_not_found!, only: [:index, :subscribe]
   before_action :authenticate_user!, only: [:subscribe]
@@ -26,10 +26,8 @@ def new
 
   def create
     create_user_params = params.require(:user).permit(:email)
-    @user = User.find_or_initialize_by(email: create_user_params[:email]) do |u|
-      u.subscribing = true
-    end
-
+    @user = User.find_or_initialize_by(email: create_user_params[:email])
+    @user.subscribing = true
     @newsletter_subscription = @user.newsletter_subscription || @user.build_newsletter_subscription
 
     @user.save
@@ -38,10 +36,12 @@ def create
       return render Users::NewsletterSubscriptions::NewView.new(newsletter_subscription: @newsletter_subscription), status: :unprocessable_entity
     end
 
+    if @user.previously_new_record?
+      NewUserNotifier.deliver_to(AdminUser.all, user: @user)
+    end
+
     if @user.needs_confirmation?
       EmailConfirmationNotifier.deliver_to(@user)
-    else
-      # TODO: Send already subscribed email
     end
 
     redirect_to users_newsletter_subscription_path(@newsletter_subscription)

app/controllers/users/registrations_controller.rb

@@ -8,44 +8,47 @@ class Users::RegistrationsController < ApplicationController
   before_action :authenticate_user!, only: [:edit, :update, :destroy]
 
   def new
-    @user = User.new
-    render Users::Registrations::NewView.new(user: @user)
+    user = User.new
+    render Users::Registrations::NewView.new(user: user)
   end
 
   def create
     create_user_params = params.require(:user).permit(:email, :password, :password_confirmation)
-    @user = User.new(create_user_params)
-    if @user.save
-      EmailConfirmationNotifier.deliver_to(@user)
-      redirect_to root_path, notice: "Welcome to Joy of Rails! Please check your email for confirmation instructions"
+    user = User.new(create_user_params)
+    if user.save
+      NewUserNotifier.deliver_to(AdminUser.all, user: user)
+      EmailConfirmationNotifier.deliver_to(user)
+
+      redirect_to users_thank_you_path, notice: "Welcome to Joy of Rails! Please check your email for confirmation instructions"
     else
-      render Users::Registrations::NewView.new(user: @user), status: :unprocessable_entity
+      render Users::Registrations::NewView.new(user: user), status: :unprocessable_entity
     end
   end
 
   def edit
-    @user = current_user
-    @user.email_exchanges.build
+    user = current_user
+    user.email_exchanges.build
 
-    render Users::Registrations::EditView.new(user: @user)
+    render Users::Registrations::EditView.new(user: user)
   end
 
   def update
     update_user_params = params.require(:user).permit(:password_challenge, :password, :password_confirmation, email_exchanges_attributes: [:email])
 
-    @user = current_user
+    user = current_user
 
-    if !@user.authenticate(params[:user][:password_challenge])
+    if user.password_digest_was.present? && !user.authenticate(params[:user][:password_challenge])
       flash.now[:error] = "Incorrect password"
-      return render Users::Registrations::EditView.new(user: @user), status: :unprocessable_entity
+      return render Users::Registrations::EditView.new(user: user), status: :unprocessable_entity
     end
 
-    if !@user.update(update_user_params)
-      return render Users::Registrations::EditView.new(user: @user), status: :unprocessable_entity
+    if !user.update(update_user_params)
+      flash.now[:error] = user.errors.full_messages.to_sentence
+      return render Users::Registrations::EditView.new(user: user), status: :unprocessable_entity
     end
 
     if update_user_params[:email_exchanges_attributes].present?
-      EmailConfirmationNotifier.deliver_to(@user)
+      EmailConfirmationNotifier.deliver_to(user)
       redirect_to users_dashboard_path, notice: "Check your email for confirmation instructions"
     else
       redirect_to users_dashboard_path, notice: "Account updated"

app/controllers/users/thank_yous_controller.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class Users::ThankYousController < ApplicationController
+  def show
+    render Users::ThankYous::ShowView.new
+  end
+end

app/javascript/css/utilities/tailwind.css

@@ -937,3 +937,15 @@ focus\:ring-0:focus {
 .max-w-sm {
   max-width: 24rem;
 }
+
+.list-disc {
+  list-style-type: disc;
+}
+
+.list-inside {
+  list-style-position: inside;
+}
+
+.list-outside {
+  list-style-position: outside;
+}

app/mailers/emails/admin_user_mailer.rb

@@ -0,0 +1,8 @@
+class Emails::AdminUserMailer < ApplicationMailer
+  def new_user(admin_user:, user:)
+    @admin_user = admin_user
+    @user = user
+
+    mail to: @admin_user.email, subject: "New Joy of Rails User"
+  end
+end

app/notifiers/new_user_notifier.rb

@@ -0,0 +1,12 @@
+class NewUserNotifier < NotificationEvent
+  def self.deliver_to(admin_user, user:, **)
+    new(params: {user_id: user.id}).deliver(admin_user, **)
+  end
+
+  def deliver_notification(notification)
+    admin_user = notification.recipient
+    user = User.find(params[:user_id])
+
+    Emails::AdminUserMailer.new_user(admin_user: admin_user, user: user).deliver_later
+  end
+end

app/views/emails/admin_user_mailer/new_user.html.erb

@@ -0,0 +1,5 @@
+<h2>New User</h2>
+
+<%= mail_to @user.confirmable_email %> just registered for Joy of Rails!
+
+Woo hoo!

app/views/emails/admin_user_mailer/new_user.text.erb

@@ -0,0 +1,5 @@
+New User
+
+<%= @user.confirmable_email %> just registered for Joy of Rails!
+
+Woo hoo!

app/views/users/dashboard/index_view.rb

@@ -4,37 +4,50 @@ class Users::Dashboard::IndexView < ApplicationView
   include Phlex::Rails::Helpers::LinkTo
 
   def view_template
-    div(class: "container lg:mt-12 md:mt-8") do
-      h1 { "Welcome to Joy of Rails!" }
-      p { "Thank you for signing up." }
-      p { "Here's what you can do next:" }
-      ul(class: "list-disc list-inside") do
-        li do
-          plain "Check out"
-          whitespace
-          strong { link_to("articles", "/articles") }
-          whitespace
-          plain "I’ve written on Ruby, Rails, and Hotwire."
-        end
-        li do
-          plain "If you’re interested in learning how this app is built or even contributing to it, check out the"
-          whitespace
-          link_to("source code", "https://github.com/joyofrails/joyofrails")
-          whitespace
-          plain "on GitHub."
-        end
-        li do
-          plain "Connect with me on"
-          whitespace
-          link_to("Twitter", "https://twitter.com/rossta", target: "_blank")
-          plain ","
-          whitespace
-          link_to("Mastodon", "https://ruby.social/rossta", target: "_blank")
-          whitespace
-          plain ", and"
-          whitespace
-          link_to("LinkedIn", "https://www.linkedin.com/in/rosskaffenberger", target: "_blank")
-          whitespace
+    article do
+      render Pages::Header.new(
+        title: "Welcome to Joy of Rails!",
+        description: "Thank you for signing up 😂"
+      )
+
+      div(class: "container article-content") do
+        p { "Here's what you can do next:" }
+        ul(class: "list-disc list-outside px-4") do
+          li do
+            plain "Check your your email for a confirmation link to activate your account."
+            whitespace
+            plain "If you don’t see it, check your spam folder, or you can"
+            whitespace
+            link_to("resend the confirmation email", new_users_confirmation_path)
+            plain "."
+          end
+          li do
+            plain "Check out"
+            whitespace
+            strong { link_to("articles", "/articles") }
+            whitespace
+            plain "I’ve written on Ruby, Rails, and Hotwire."
+          end
+          li do
+            plain "If you’re interested in learning how this app is built or even contributing to it, check out the"
+            whitespace
+            link_to("source code", "https://github.com/joyofrails/joyofrails")
+            whitespace
+            plain "on GitHub."
+          end
+          li do
+            plain "Connect with me on"
+            whitespace
+            link_to("Twitter", "https://twitter.com/rossta", target: "_blank")
+            plain ","
+            whitespace
+            link_to("Mastodon", "https://ruby.social/rossta", target: "_blank")
+            whitespace
+            plain ", and"
+            whitespace
+            link_to("LinkedIn", "https://www.linkedin.com/in/rosskaffenberger", target: "_blank")
+            whitespace
+          end
         end
       end
     end