remove view helper and singleton

compassionprojects · Mar 12, 2024 · 892b8b7 · 892b8b7
1 parent d977e59
commit 892b8b7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -2,8 +2,4 @@ module ApplicationHelper
   def time_ago(time)
     time_ago_in_words(time, scope: "datetime.distance_in_words.short")
   end
-
-  def contact_email
-    Settings.instance.contact_email
-  end
 end
diff --git a/app/views/includes/_footer.html.erb b/app/views/includes/_footer.html.erb
@@ -11,7 +11,7 @@
             <%= link_to t('.home'), root_path %>
           </li>
           <li class="mt-3 mt-sm-2">
-            <%= link_to t('.contact'), "mailto:#{contact_email}" %>
+            <%= link_to t('.contact'), "mailto:#{Settings.contact_email}" %>
           </li>
           <li class="mt-3 mt-sm-2">
             <%= link_to t('.stories'), stories_path %>

diff --git a/config/initializers/settings.rb b/config/initializers/settings.rb
@@ -1,7 +1,7 @@
 class Settings
-  include Singleton
-
-  def contact_email
-    ENV["DOMAIN_EMAIL_ADDRESS"]
+  class << self
+    def contact_email
+      ENV["DOMAIN_EMAIL_ADDRESS"]
+    end
   end
 end