From ac8ec0019c8192c85d605e7241ed2ac40256ba2d Mon Sep 17 00:00:00 2001 From: Lucian Ghinda <1407869+lucianghinda@users.noreply.github.com> Date: Wed, 17 Jan 2024 08:57:51 +0200 Subject: [PATCH 1/3] Ignore files/folders generated by Rubymine/Jetbrains --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 50fcfb5..1c76067 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,7 @@ /db/**/*.sqlite3-* .envrc + +# Ignore files generated by Rubymine +.idea +.idea/* From 21babf755a48bfc90c3e6bff8557da110924b370 Mon Sep 17 00:00:00 2001 From: Lucian Ghinda <1407869+lucianghinda@users.noreply.github.com> Date: Wed, 17 Jan 2024 09:00:30 +0200 Subject: [PATCH 2/3] Add platform for Apple M architecture and MacOS Sonoma --- Gemfile.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile.lock b/Gemfile.lock index 4106f4b..8fa2c37 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -381,6 +381,7 @@ GEM PLATFORMS aarch64-linux arm64-darwin-22 + arm64-darwin-23 x86_64-linux DEPENDENCIES From e2181c7e1b6059d701601eb5494a33cd2752a46e Mon Sep 17 00:00:00 2001 From: Lucian Ghinda <1407869+lucianghinda@users.noreply.github.com> Date: Wed, 17 Jan 2024 09:00:53 +0200 Subject: [PATCH 3/3] Improve wording on subscribers --- app/controllers/videos/subscribers_controller.rb | 10 ++++++++-- config/locales/en.yml | 6 ++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/controllers/videos/subscribers_controller.rb b/app/controllers/videos/subscribers_controller.rb index b6b85ec..3f4b061 100644 --- a/app/controllers/videos/subscribers_controller.rb +++ b/app/controllers/videos/subscribers_controller.rb @@ -6,9 +6,9 @@ class Videos::SubscribersController < ApplicationController def create case subscribers_create.call when Dry::Monads::Success - flash.now[:notice] = "You've subscribed successfully!" + add_success_message when Dry::Monads::Failure - flash.now[:error] = "There was a problem subscribing you! #{subscriber.errors.full_messages.join(', ')}" + add_error_message end end @@ -16,6 +16,12 @@ def create def subscribers_create = Subscribers::Create.new(subscriber:, list:, unsubscribe_url:) + def add_success_message = flash.now[:notice] = t(".success_message") + + def add_error_message = flash.now[:error] = t(".error_message", error_messages:) + + def error_messages = subscriber.errors.full_messages.join(", ") + def unsubscribe_url = new_videos_unsubscribe_url def subscriber = @_subscriber ||= Subscriber.new(subscriber_params) diff --git a/config/locales/en.yml b/config/locales/en.yml index 6c349ae..2d8b84c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -29,3 +29,9 @@ en: hello: "Hello world" + + videos: + subscribers: + create: + success_message: "You've subscribed successfully!" + error_message: "There was a problem subscribing you! %{error_messages}"