✂️✂️✂️ Part 1: Remove Sponsorship (forem#18512)

* feat: remove initializeSponsorshipVisibility and related code * feat: remove sponsorships from sidebar * feat: remove sponsorships from the admin - route, controller, view, spec * feat: remove the admin menu item * feat: remove the i8n for admin sponsors controller * feat: sponsorship decorator was not being used anywhere * feat: sponsorship slack messenger was not being used anywhere * feat: remove the sponsorship_headline that gets configures on the admin * feat: remove the /sponsors page * feat: remove renedring of single_sponsor partial and associated partials * feat: remove the navigation link rake task for sponsors * feat: remove sponsorship from tags * feat: remove i8n constants used * remove sponsor references in text to the privacy page * feat: remove the sponsorship detail from the organization page * feat: remove the sponsors css that was used for app/views/pages/sponsors.html.erb * feat: remove the sponsorship i8n that was used in the slack messengers * feat: swap out the decorators to use Article as an example * feat: remove spec to show sponsors on home page * feat: update the specs to use Article Decorator instead of the Sponsorship Decorator * fix: use direct and not all * fix: remove tests for tag sponsorship * fix: remove organization sponsorship test * feat: remove more i8n
800a7b32 · Oct 3, 2022 · 9361d24 · 9361d24
1 parent e5e36a2
commit 9361d24
Show file tree

Hide file tree

Showing 48 changed files with 17 additions and 911 deletions.
diff --git a/app/assets/javascripts/.eslintrc.js b/app/assets/javascripts/.eslintrc.js
@@ -26,7 +26,6 @@ module.exports = {
     initializeBaseUserData: false,
     initializeDisplayAdVisibility: false,
     initializeReadingListIcons: false,
-    initializeSponsorshipVisibility: false,
     ActiveXObject: false,
     AndroidBridge: false,
   },

diff --git a/app/assets/javascripts/initializePage.js b/app/assets/javascripts/initializePage.js
@@ -49,7 +49,6 @@ function initializePage() {
       }
       initializeBroadcast();
       initializeReadingListIcons();
-      initializeSponsorshipVisibility();
       initializeDisplayAdVisibility();
       if (document.getElementById('sidebar-additional')) {
         document.getElementById('sidebar-additional').classList.add('showing');

diff --git a/app/assets/javascripts/initializers/initializeLocalStorageRender.js b/app/assets/javascripts/initializers/initializeLocalStorageRender.js
@@ -6,7 +6,6 @@ function initializeLocalStorageRender() {
       initializeBaseUserData();
       initializeReadingListIcons();
       initializeDisplayAdVisibility();
-      initializeSponsorshipVisibility();
     }
   } catch (err) {
     browserStoreCache('remove');

diff --git a/app/assets/javascripts/initializers/initializeSponsorshipVisibility.js b/app/assets/javascripts/initializers/initializeSponsorshipVisibility.js
diff --git a/app/assets/stylesheets/views.scss b/app/assets/stylesheets/views.scss
@@ -10,4 +10,3 @@
 @import 'views/mod-center';
 @import 'views/signin';
 @import 'views/signup-modal';
-@import 'views/sponsors';
diff --git a/app/assets/stylesheets/views/sponsors.scss b/app/assets/stylesheets/views/sponsors.scss
diff --git a/app/controllers/admin/sponsorships_controller.rb b/app/controllers/admin/sponsorships_controller.rb
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
@@ -51,7 +51,7 @@ def update
       flash[:success] = I18n.t("tags_controller.tag_successfully_updated")
       redirect_to "#{URL.tag_path(@tag)}/edit"
     else
-      flash[:error] = @tag.errors.full_messages
+      flash.now[:error] = @tag.errors.full_messages
       render :edit
     end
   end
@@ -80,7 +80,7 @@ def suggest
   private
 
   def tags
-    @tags ||= Tag.direct.includes(:sponsorship).limit(100)
+    @tags ||= Tag.direct.order("hotness_score DESC").limit(100)
   end
 
   def convert_empty_string_to_nil

diff --git a/app/decorators/sponsorship_decorator.rb b/app/decorators/sponsorship_decorator.rb
diff --git a/app/lib/constants/settings/general.rb b/app/lib/constants/settings/general.rb
@@ -99,10 +99,6 @@ def self.details
             description: I18n.t("lib.constants.settings.general.sidebar.description"),
             placeholder: I18n.t("lib.constants.settings.general.sidebar.placeholder")
           },
-          sponsor_headline: {
-            description: I18n.t("lib.constants.settings.general.sponsor.description"),
-            placeholder: I18n.t("lib.constants.settings.general.sponsor.placeholder")
-          },
           stripe_api_key: {
             description: I18n.t("lib.constants.settings.general.stripe_api.description"),
             placeholder: "sk_live_...."

diff --git a/app/models/admin_menu.rb b/app/models/admin_menu.rb
@@ -46,7 +46,6 @@ class AdminMenu
     scope :advanced, "flashlight-line", [
       item(name: "broadcasts"),
       item(name: "response templates"),
-      item(name: "sponsorships"),
       item(name: "developer tools", controller: "tools", children: [
              item(name: "tools"),
              item(name: "vault secrets", controller: "secrets"),

diff --git a/app/models/settings/general.rb b/app/models/settings/general.rb
@@ -93,9 +93,6 @@ class General < Base
     }
     setting :twitter_hashtag, type: :string
 
-    # Sponsors
-    setting :sponsor_headline, default: -> { I18n.t("models.settings.general.community_sponsors") }
-
     # Tags
     setting :sidebar_tags, type: :array, default: %w[]
 

diff --git a/app/services/slack/messengers/sponsorship.rb b/app/services/slack/messengers/sponsorship.rb
diff --git a/app/views/admin/settings/forms/_sponsors.html.erb b/app/views/admin/settings/forms/_sponsors.html.erb
diff --git a/app/views/admin/settings/show.html.erb b/app/views/admin/settings/show.html.erb
@@ -22,7 +22,6 @@
   <%= render partial: "forms/newsletter" %>
   <%= render partial: "forms/onboarding" %>
   <%= render partial: "forms/rate_limit" %>
-  <%= render partial: "forms/sponsors" %>
   <%= render partial: "forms/tags" %>
   <%= render partial: "forms/user_experience" %>
 </div>