From 552935f5c76d70468b9961989296e62a5db1dcfc Mon Sep 17 00:00:00 2001 From: Trevor Vallender Date: Sat, 19 Aug 2023 16:41:01 +0100 Subject: [PATCH] Remove turbo_stream views Was barking up the wrong tree introducing these. The solution to the issue of forms not re-rendering was to return the :unprocessable_entity status when errors are encountered. --- app/controllers/sessions_controller.rb | 2 +- app/controllers/users_controller.rb | 4 ++-- app/views/sessions/new.turbo_stream.erb | 17 ----------------- app/views/users/edit.turbo_stream.erb | 12 ------------ app/views/users/new.turbo_stream.erb | 12 ------------ 5 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 app/views/sessions/new.turbo_stream.erb delete mode 100644 app/views/users/edit.turbo_stream.erb delete mode 100644 app/views/users/new.turbo_stream.erb diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb index 5b5d67f..c433184 100644 --- a/app/controllers/sessions_controller.rb +++ b/app/controllers/sessions_controller.rb @@ -12,7 +12,7 @@ class SessionsController < ApplicationController redirect_to @user, notice: t(".logged_in") else flash.now.alert = t(".login_fail") - render :new + render :new, status: :unprocessable_entity end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 87adaec..bccf5a5 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -14,7 +14,7 @@ class UsersController < ApplicationController redirect_to root_path, notice: t(".account_created") else flash.now.alert = t(".create_failed") - render :new + render :new, status: :unprocessable_entity end end @@ -28,7 +28,7 @@ class UsersController < ApplicationController redirect_to @user, notice: t(".account_updated") else flash.now.alert = t(".update_failed") - render :edit + render :edit, status: :unprocessable_entity end end diff --git a/app/views/sessions/new.turbo_stream.erb b/app/views/sessions/new.turbo_stream.erb deleted file mode 100644 index 9ed1f2b..0000000 --- a/app/views/sessions/new.turbo_stream.erb +++ /dev/null @@ -1,17 +0,0 @@ -<% @title = "Log in" %> - -<%= update_flash %> - -<%= turbo_stream.replace "session_form" do %> - <%= form_with url: sessions_path, method: :post, id: "session_form" do |f| %> -

<%= t ".log_in" %>

- - <%= f.label :username %> - <%= f.text_field :username %> - - <%= f.label :password %> - <%= f.password_field :password %> - - <%= f.submit t(".log_in") %> - <% end %> -<% end %> diff --git a/app/views/users/edit.turbo_stream.erb b/app/views/users/edit.turbo_stream.erb deleted file mode 100644 index f8bee01..0000000 --- a/app/views/users/edit.turbo_stream.erb +++ /dev/null @@ -1,12 +0,0 @@ -<% @title = "Edit account details" %> - -<%= update_flash %> - -<%= turbo_stream.replace "user_form" do %> - <%= render partial: "form", - locals: { - user: @user, - button_text: t(".edit"), - title: t(".edit"), - } %> -<% end %> diff --git a/app/views/users/new.turbo_stream.erb b/app/views/users/new.turbo_stream.erb deleted file mode 100644 index e01451a..0000000 --- a/app/views/users/new.turbo_stream.erb +++ /dev/null @@ -1,12 +0,0 @@ -<% @title = "Register" %> - -<%= update_flash %> - -<%= turbo_stream.replace "user_form" do %> - <%= render partial: "form", - locals: { - user: @user, - button_text: t(".register"), - title: t(".register"), - } %> -<% end %>