From 2d60ca145fd624151aacb169192e8c4dba89b7b0 Mon Sep 17 00:00:00 2001 From: Jeff Parr Date: Thu, 11 Apr 2024 14:30:21 -0700 Subject: [PATCH 1/5] Replace paperclip with carrierwave for ActionPage images --- .env.test | 4 +- .gitignore | 1 + Gemfile | 2 + Gemfile.lock | 33 +++++++++++++ app/assets/javascripts/application/gallery.js | 6 +-- .../admin/action_pages_controller.rb | 8 +--- app/models/action_page.rb | 17 ++----- app/models/partner.rb | 2 + app/uploaders/action_page_image_uploader.rb | 27 +++++++++++ app/views/action_page/_meta_tags.html.erb | 4 +- app/views/action_page/index.atom.builder | 7 ++- app/views/action_page/index.json.jbuilder | 2 +- .../admin/action_pages/_gallery.html.erb | 2 + config/initializers/carrier_wave.rb | 25 ++++++++++ spec/features/admin/action_creation_spec.rb | 38 +++++++++++++++ spec/models/action_page_spec.rb | 25 ++++++++++ spec/requests/action_pages_spec.rb | 46 +++++++++++++++++++ spec/requests/admin/action_pages_spec.rb | 20 ++++++++ spec/requests/admin/s3_uploads_spec.rb | 16 +++++++ 19 files changed, 256 insertions(+), 29 deletions(-) create mode 100644 app/uploaders/action_page_image_uploader.rb create mode 100644 config/initializers/carrier_wave.rb diff --git a/.env.test b/.env.test index 5c939e805..d479be1ac 100644 --- a/.env.test +++ b/.env.test @@ -8,8 +8,8 @@ call_tool_api_key=xyz storage=s3 amazon_region=us-west-1 -amazon_bucket=actioncenter-staging -amazon_bucket_url=actioncentertest.s3-us-west-1.amazonaws.com +amazon_bucket=actioncenter-test +amazon_bucket_url=actioncenter-testurl.s3-us-west-1.amazonaws.com supporters_api_key=xyz supporters_host=https://civicrm.test diff --git a/.gitignore b/.gitignore index 156f76604..a3e9e0020 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ public/webshims # Ignore dotenv file /.env +/public/uploads diff --git a/Gemfile b/Gemfile index 1549c9190..4a5c5ed31 100644 --- a/Gemfile +++ b/Gemfile @@ -43,6 +43,8 @@ end # File upload gem "kt-paperclip", "~> 6" +gem "carrierwave", "~> 3.0" +gem "fog-aws" # Email preformatting gem "nokogiri", "~> 1" # Required for premailer-rails diff --git a/Gemfile.lock b/Gemfile.lock index 4de5d5578..4c80b9255 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -152,6 +152,13 @@ GEM rack-test (>= 0.6.3) regexp_parser (>= 1.5, < 3.0) xpath (~> 3.2) + carrierwave (3.0.7) + activemodel (>= 6.0.0) + activesupport (>= 6.0.0) + addressable (~> 2.6) + image_processing (~> 1.1) + marcel (~> 1.0.0) + ssrf_filter (~> 1.0) cgi (0.4.1) chartkick (3.4.2) chronic (0.10.2) @@ -196,6 +203,7 @@ GEM email_validator (1.6.0) activemodel erubi (1.12.0) + excon (0.110.0) execjs (2.9.1) factory_bot (6.2.1) activesupport (>= 5.0.0) @@ -211,6 +219,22 @@ GEM activerecord (>= 4.1.0) fastly (2.5.3) ffi (1.16.2) + fog-aws (3.22.0) + fog-core (~> 2.1) + fog-json (~> 1.1) + fog-xml (~> 0.1) + fog-core (2.4.0) + builder + excon (~> 0.71) + formatador (>= 0.2, < 2.0) + mime-types + fog-json (1.2.0) + fog-core + multi_json (~> 1.10) + fog-xml (0.1.4) + fog-core + nokogiri (>= 1.5.11, < 2.0.0) + formatador (1.1.0) friendly_id (5.5.0) activerecord (>= 4.0.0) geocoder (1.8.2) @@ -234,6 +258,9 @@ GEM multi_xml (>= 0.5.2) i18n (1.14.1) concurrent-ruby (~> 1.0) + image_processing (1.12.2) + mini_magick (>= 4.9.5, < 5) + ruby-vips (>= 2.0.17, < 3) invisible_captcha (0.13.0) rails (>= 3.2.0) iso_country_codes (0.7.8) @@ -266,6 +293,7 @@ GEM mimemagic (0.3.10) nokogiri (~> 1) rake + mini_magick (4.12.0) mini_mime (1.1.5) mini_portile2 (2.8.5) minitest (5.22.2) @@ -414,6 +442,8 @@ GEM rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) ruby-progressbar (1.13.0) + ruby-vips (2.2.1) + ffi (~> 1.12) ruby2_keywords (0.0.5) rubyzip (2.3.2) safely_block (0.4.0) @@ -454,6 +484,7 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) + ssrf_filter (1.1.2) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) thor (1.3.0) @@ -505,6 +536,7 @@ DEPENDENCIES bundler (>= 1.8.4) byebug capybara (~> 3) + carrierwave (~> 3.0) chartkick (~> 3) cocoon (~> 1) counter_culture (~> 2.0) @@ -519,6 +551,7 @@ DEPENDENCIES factory_bot_rails (~> 6.2) fast_inserter (~> 2.0) fastly (~> 2) + fog-aws friendly_id (~> 5.0) going_postal (~> 0) gravatar-ultimate (~> 2) diff --git a/app/assets/javascripts/application/gallery.js b/app/assets/javascripts/application/gallery.js index 92ead348d..1e0699e6a 100644 --- a/app/assets/javascripts/application/gallery.js +++ b/app/assets/javascripts/application/gallery.js @@ -24,9 +24,9 @@ $(function() { }); } - attachGalleryImage('#image-gallery', '#action_page_featured_image', '#attached-featured_image'); - attachGalleryImage('#image-gallery', '#action_page_background_image', '#attached-background_image'); - attachGalleryImage('#image-gallery', '#action_page_og_image', '#attached-og_image'); + attachGalleryImage('#image-gallery', '#action_page_remote_featured_image_url', '#attached-featured_image'); + attachGalleryImage('#image-gallery', '#action_page_remote_background_image_url', '#attached-background_image'); + attachGalleryImage('#image-gallery', '#action_page_remote_og_image_url', '#attached-og_image'); $('.tweet-target').each(function(i, target) { attachGalleryImage('#image-gallery', $(target).find('.image-input'), target); diff --git a/app/controllers/admin/action_pages_controller.rb b/app/controllers/admin/action_pages_controller.rb index 296a5678b..7f11f6eed 100644 --- a/app/controllers/admin/action_pages_controller.rb +++ b/app/controllers/admin/action_pages_controller.rb @@ -72,10 +72,6 @@ def edit_partners end def update - @actionPage.background_image = nil if params[:destroy_background_image] - @actionPage.featured_image = nil if params[:destroy_featured_image] - @actionPage.og_image = nil if params[:destroy_og_image] - @actionPage.update(action_page_params) if (institutions_params[:reset] && institutions_params[:reset] == "1") || (institutions_params[:category] && @actionPage.institutions.empty?) @@ -175,9 +171,9 @@ def set_partners def action_page_params params.require(:action_page).permit( - :title, :summary, :description, :category_id, :related_content_url, :featured_image, + :title, :summary, :description, :category_id, :related_content_url, :remote_featured_image_url, :enable_call, :enable_petition, :enable_email, :enable_tweet, - :enable_congress_message, :og_title, :og_image, :share_message, :published, + :enable_congress_message, :og_title, :remote_og_image_url, :share_message, :published, :call_campaign_id, :what_to_say, :redirect_url, :email_text, :enable_redirect, :victory, :victory_message, :archived_redirect_action_page_id, :archived, :status, partner_ids: [], diff --git a/app/models/action_page.rb b/app/models/action_page.rb index 6177e401a..3c1de0d97 100644 --- a/app/models/action_page.rb +++ b/app/models/action_page.rb @@ -1,5 +1,4 @@ class ActionPage < ApplicationRecord - extend AmazonCredentials extend FriendlyId include PgSearch::Model @@ -46,18 +45,10 @@ class ActionPage < ApplicationRecord :call_campaign, :congress_message_campaign, :affiliation_types, :partnerships, reject_if: :all_blank - has_attached_file :featured_image, amazon_credentials.merge(default_url: "missing.png") - has_attached_file :background_image, amazon_credentials - has_attached_file :og_image, amazon_credentials - validates_media_type_spoof_detection :featured_image, - if: -> { featured_image.present? && featured_image_file_name_came_from_user? } - validates_media_type_spoof_detection :background_image, - if: -> { background_image.present? && background_image_file_name_came_from_user? } - validates_media_type_spoof_detection :og_image, - if: -> { og_image.present? && og_image_file_name_came_from_user? } - do_not_validate_attachment_file_type %i[featured_image background_image og_image] - - # validates_length_of :og_title, maximum: 65 + mount_uploader :featured_image, ActionPageImageUploader, mount_on: :featured_image_file_name + mount_uploader :background_image, ActionPageImageUploader, mount_on: :background_image_file_name + mount_uploader :og_image, ActionPageImageUploader, mount_on: :og_image_file_name + after_save :no_drafts_on_homepage after_save :set_congress_tag, if: -> { enable_congress_message } diff --git a/app/models/partner.rb b/app/models/partner.rb index 170b0dadf..b387ced5a 100644 --- a/app/models/partner.rb +++ b/app/models/partner.rb @@ -5,6 +5,8 @@ class Partner < ApplicationRecord has_many :users has_many :partnerships has_many :action_pages, through: :partnerships + + # todo: doesnt appear to be used? has_attached_file :logo, amazon_credentials validates_media_type_spoof_detection :logo, diff --git a/app/uploaders/action_page_image_uploader.rb b/app/uploaders/action_page_image_uploader.rb new file mode 100644 index 000000000..43a5ffa3d --- /dev/null +++ b/app/uploaders/action_page_image_uploader.rb @@ -0,0 +1,27 @@ +class ActionPageImageUploader < CarrierWave::Uploader::Base + storage :fog + # cache_storage :file + + def default_url(*args) + "missing.png" + end + + def store_dir + "#{model.class.to_s.pluralize.underscore}/#{mounted_as.to_s.pluralize}/#{id_partition}/#{style}" + end + + # we could set this here or config/initializers/carrier_wave.rb + def asset_host + Rails.application.secrets.amazon_bucket_url.present? ? "https://#{Rails.application.secrets.amazon_bucket_url}" : super + end + + private + + def style + version_name || "original" + end + + def id_partition # mimics paperclips mapping function + ("%09d" % model.id).scan(/\d{3}/).join("/") + end +end diff --git a/app/views/action_page/_meta_tags.html.erb b/app/views/action_page/_meta_tags.html.erb index 382706cc6..5136ff61d 100644 --- a/app/views/action_page/_meta_tags.html.erb +++ b/app/views/action_page/_meta_tags.html.erb @@ -1,7 +1,7 @@ <% summary = strip_tags stripdown(@actionPage.summary) -%> <% - image_url = if @actionPage.image.try(:exists?) - image_url(@actionPage.image.to_s) + image_url = if @actionPage.image.present? + image_url(@actionPage.image.url) else image_url("og-image-default.png") end diff --git a/app/views/action_page/index.atom.builder b/app/views/action_page/index.atom.builder index 20788a34a..6b300b7ae 100644 --- a/app/views/action_page/index.atom.builder +++ b/app/views/action_page/index.atom.builder @@ -5,8 +5,11 @@ atom_feed do |feed| @actionPages.each do |actionPage| feed.entry(actionPage) do |entry| - entry.link(rel: "enclosure", type: actionPage.featured_image.content_type || "image/png", - href: URI.join(root_url, image_path(actionPage.featured_image))) + entry.link( + rel: "enclosure", + type: (actionPage.featured_image.content_type.presence || "image/png"), + href: URI.join(root_url, image_path(actionPage.featured_image.url)) + ) entry.title(actionPage.title) entry.summary(markdown(actionPage.summary), type: "html") diff --git a/app/views/action_page/index.json.jbuilder b/app/views/action_page/index.json.jbuilder index 761f1f25b..db98d0fbc 100644 --- a/app/views/action_page/index.json.jbuilder +++ b/app/views/action_page/index.json.jbuilder @@ -4,7 +4,7 @@ json.array! @actionPages do |actionPage| json.summary markdown actionPage.summary if actionPage.featured_image_file_name json.featured_image do - json.alt image_alt actionPage.featured_image_file_name + json.alt actionPage.featured_image_file_name.titleize json.url image_url actionPage.featured_image end end diff --git a/app/views/admin/action_pages/_gallery.html.erb b/app/views/admin/action_pages/_gallery.html.erb index 1bb4d0102..5022f32d7 100644 --- a/app/views/admin/action_pages/_gallery.html.erb +++ b/app/views/admin/action_pages/_gallery.html.erb @@ -1,6 +1,8 @@
<% if defined?(f) %> + <%= f.send :hidden_field, field, value: nil %> + <%= f.send :hidden_field, "remote_#{field}_url", value: nil %> <% if current_value = f.object.send(field).presence %>
diff --git a/config/initializers/carrier_wave.rb b/config/initializers/carrier_wave.rb new file mode 100644 index 000000000..f080311cf --- /dev/null +++ b/config/initializers/carrier_wave.rb @@ -0,0 +1,25 @@ +CarrierWave.configure do |config| + config.fog_credentials = { + provider: 'AWS', # required + aws_access_key_id: Rails.application.secrets.amazon_access_key_id, # required unless using use_iam_profile + aws_secret_access_key: Rails.application.secrets.amazon_secret_access_key, # required unless using use_iam_profile + # use_iam_profile: true, # optional, defaults to false + region: Rails.application.secrets.amazon_region, # optional, defaults to 'us-east-1' + # host: 's3.example.com', # optional, defaults to nil + # endpoint: 'https://s3.example.com', # optional, defaults to nil + } + config.fog_directory = Rails.application.secrets.amazon_bucket # required + # config.fog_public = false # optional, defaults to true + # config.fog_attributes = { cache_control: "public, max-age=#{365.days.to_i}" } # optional, defaults to {} + # Use this if you have AWS S3 ACLs disabled. + # config.fog_attributes = { 'x-amz-acl' => 'bucket-owner-full-control' } + # Use this if you have Google Cloud Storage uniform bucket-level access enabled. + # config.fog_attributes = { uniform: true } + # Use if you use a CDN + # config.asset_host = "http://mycdn.cdn.com" + # setting here allows you to setup a local dev env that points to production assets if `amazon_bucket_url` doesnt match the bucket other things will break + # config.asset_host = Rails.application.secrets.amazon_bucket_url.present? ? "https://#{Rails.application.secrets.amazon_bucket_url}" : nil + # For an application which utilizes multiple servers but does not need caches persisted across requests, + # uncomment the line :file instead of the default :storage. Otherwise, it will use AWS as the temp cache store. + config.cache_storage = :file +end diff --git a/spec/features/admin/action_creation_spec.rb b/spec/features/admin/action_creation_spec.rb index 0227cb1ca..748579655 100644 --- a/spec/features/admin/action_creation_spec.rb +++ b/spec/features/admin/action_creation_spec.rb @@ -134,6 +134,44 @@ end end + it "can add images" do + stub_request(:get, %r{uploads/featured-image.png}).to_return(status: 200, body: fixture_file_upload("test-image.png", "image/png").tempfile.to_io, headers: {}) + stub_request(:any, %r{/action_pages/featured_images/000/000/([0-9]+)/original/featured-image.png}).to_return(status: 200, body: "", headers: {}) + stub_request(:get, %r{uploads/og-image.png}).to_return(status: 200, body: fixture_file_upload("test-image.png", "image/png").tempfile.to_io, headers: {}) + stub_request(:any, %r{/action_pages/og_images/000/000/([0-9]+)/original/og-image.png}).to_return(status: 200, body: "", headers: {}) + FactoryBot.create(:source_file, key: "uploads/featured-image.png", file_name: "featured-image.png") + FactoryBot.create(:source_file, key: "uploads/og-image.png", file_name: "og-image.png") + visit new_admin_action_page_path + fill_in_basic_info(title: "Very Important Action", + summary: "A summary", + description: "A description") + next_section + + select_action_type("tweet") + fill_in "Message", with: "A message" + next_section + + expect(page).to have_selector("#images", visible: true, wait: 5) + click_on "featured-image.png" + next_section + + expect(page).to have_selector("#sharing", visible: true, wait: 5) + fill_in "Share Message", with: "Twitter message" + fill_in "Title", with: "A social media title" + click_on "og-image.png" + next_section + + tempermental do + click_button "Save" + expect(page).to have_content("Very Important Action", wait: 10) + end + + # save_and_open_page + # expect(page).to have_xpath("//img[contains(@src,'missing')]") + expect(page).to have_xpath("//img[contains(@src,'featured-image.png')]") + expect(page).to have_xpath("//meta[contains(@content,'og-image.png')]", visible: false) + end + def fill_in_basic_info(title:, summary:, description:) fill_in "Title", with: title fill_in_editor "#action_page_summary", with: summary diff --git a/spec/models/action_page_spec.rb b/spec/models/action_page_spec.rb index ec529d49c..606d51a20 100644 --- a/spec/models/action_page_spec.rb +++ b/spec/models/action_page_spec.rb @@ -167,4 +167,29 @@ expect { ActionPage.status("unknown") }.to raise_error(ArgumentError) end end + + describe "image attachment" do + context "when there is no image" do + it "uses missing" do + page = ActionPage.create!(attr) + expect(page.featured_image.url).to match "missing.png" + end + end + + context "when there is a featured image" do + let(:page_attr) { FactoryBot.attributes_for :action_page, remote_featured_image_url: "https://example.com/fakeimages/test.png" } + let(:test_image_file_upload) { fixture_file_upload("test-image.png", "image/png").tempfile.to_io } + it "creates a new record with image fields" do + stub_request(:get, %r{fakeimages/test.png}).to_return(status: 200, body: test_image_file_upload, headers: { content_type: "image/png" }) + stub_request(:put, %r{/action_pages/featured_images/000/000/([0-9]+)/original/test.png}).to_return(status: 200, body: "", headers: {}) + + page = ActionPage.create!(page_attr) + expect(page.featured_image_file_name).to eq("test.png") + expect(page.featured_image.content_type).to eq("image/png") + expect(WebMock).to have_requested(:put, %r{/action_pages/featured_images/000/000/([0-9]+)/original/test.png}) + expect(page.featured_image.url).to match(%r{/action_pages/featured_images/000/000/([0-9]+)/original/test.png}) + expect(page.image.url).to match(%r{/action_pages/featured_images/000/000/([0-9]+)/original/test.png}) + end + end + end end diff --git a/spec/requests/action_pages_spec.rb b/spec/requests/action_pages_spec.rb index 705523dc2..dbb2bf0f1 100644 --- a/spec/requests/action_pages_spec.rb +++ b/spec/requests/action_pages_spec.rb @@ -33,4 +33,50 @@ expect(response.body).to eq "1000" end end + + describe "json" do + it "returns json" do + FactoryBot.create(:action_page) + get "/action.json" + expect(response.code).to eq "200" + expect(response.parsed_body).to include(a_hash_including({ "title" => "Sample Action Page" })) + end + + it "returns image attributes in json" do + stub_request(:get, %r{fakeimages/test.png}).to_return(status: 200, body: fixture_file_upload("test-image.png", "image/png").tempfile.to_io, headers: { content_type: "image/png" }) + stub_request(:any, %r{/action_pages/featured_images/000/000/([0-9]+)/original/test.png}).to_return(status: 200, body: "", headers: {}) + FactoryBot.create(:action_page, remote_featured_image_url: "https://example.com/fakeimages/test.png") + + get "/action.json" + expect(response.code).to eq "200" + expect(response.parsed_body).to include(a_hash_including({ + "title" => "Sample Action Page", + "featured_image"=> a_hash_including({ + "alt"=>"Test.Png", + "url"=> a_string_matching(%r{/action_pages/featured_images/000/000/([0-9]+)/original/test.png}) + }) + })) + end + end + + describe "atom" do + it "returns atom" do + FactoryBot.create(:action_page) + get "/action.atom" + expect(response.code).to eq "200" + expect(response.body).to match("Sample Action Page") + end + + it "returns image attributes in atom" do + allow_any_instance_of(ActionPageImageUploader).to receive(:content_type).and_return("image/png") + stub_request(:get, %r{fakeimages/test.png}).to_return(status: 200, body: file_fixture("test-image.png").read, headers: {content_type: "image/png"}) + stub_request(:any, %r{/action_pages/featured_images/000/000/([0-9]+)/original/test.png}).to_return(status: 200, body: file_fixture("test-image.png").read, headers: {content_type: "image/png"}) + FactoryBot.create(:action_page, remote_featured_image_url: "https://example.com/fakeimages/test.png") + + get "/action.atom" + expect(response.code).to eq "200" + expect(response.body).to match("Sample Action Page") + expect(response.body).to match(%r{/action_pages/featured_images/000/000/([0-9]+)/original/test.png}) + end + end end diff --git a/spec/requests/admin/action_pages_spec.rb b/spec/requests/admin/action_pages_spec.rb index 5d1292bd3..66a4dab10 100644 --- a/spec/requests/admin/action_pages_spec.rb +++ b/spec/requests/admin/action_pages_spec.rb @@ -38,6 +38,26 @@ expect(ActionPage.count).to eq 1 end + it "should allow them to specify a featured image" do + valid_attributes[:action_page][:remote_featured_image_url] = "https://example.com/fakeimages/test-featured-image.png" + valid_attributes[:action_page][:remote_og_image_url] = "https://example.com/fakeimages/test-og-image.png" + test_image_file_upload = file_fixture("test-image.png").read + stub_request(:get, %r{fakeimages/test-featured-image.png}).to_return(status: 200, body: test_image_file_upload, headers: { content_type: "image/png" }) + stub_request(:any, %r{/action_pages/featured_images/000/000/([0-9]+)/original/test-featured-image.png}).to_return(status: 200, body: "", headers: {}) + stub_request(:get, %r{fakeimages/test-og-image.png}).to_return(status: 200, body: test_image_file_upload, headers: { content_type: "image/png" }) + stub_request(:any, %r{/action_pages/og_images/000/000/([0-9]+)/original/test-og-image.png}).to_return(status: 200, body: "", headers: {}) + + post "/admin/action_pages", params: valid_attributes + + expect(response).to redirect_to(assigns(:actionPage)) + follow_redirect! + + expect(response.code).to eq "200" + expect(ActionPage.count).to eq 1 + expect(response.body).to match("test-featured-image") + expect(response.body).to match("test-og-image") + end + it "should allow them to search action pages" do border = FactoryBot.create( :action_page_with_petition, diff --git a/spec/requests/admin/s3_uploads_spec.rb b/spec/requests/admin/s3_uploads_spec.rb index 3e00c35be..85b103de3 100644 --- a/spec/requests/admin/s3_uploads_spec.rb +++ b/spec/requests/admin/s3_uploads_spec.rb @@ -35,4 +35,20 @@ post "/admin/source_files", params: valid_attributes end.to change { SourceFile.count }.by(1) end + + it "should have valid response" do + @admin = FactoryBot.create(:admin_user) + login @admin + + post "/admin/source_files", params: valid_attributes + + expect(response.parsed_body).to include( + "id" => 1, + "delete_url" => "/admin/source_files/1.json", + "full_url" => a_string_matching(%r{/uploads/3be325f2b4e64d9d92a89405577280a4/img.png}), + "image" => true, + "name" => "img.png", + "size" => 10 + ) + end end From c360cc3d99fe849948fd8cba06ecbf7b4c668cd2 Mon Sep 17 00:00:00 2001 From: Jeff Parr Date: Wed, 17 Apr 2024 13:05:32 -0700 Subject: [PATCH 2/5] remove paperclip helper from actionpage migrations --- ...dd_attachment_featured_image_to_action_pages.rb | 13 +++++-------- ..._attachment_background_image_to_action_pages.rb | 14 ++++++-------- .../20140529220025_add_og_image_to_action_pages.rb | 13 +++++-------- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/db/migrate/20140504080222_add_attachment_featured_image_to_action_pages.rb b/db/migrate/20140504080222_add_attachment_featured_image_to_action_pages.rb index dc3dacef3..e0050ce68 100644 --- a/db/migrate/20140504080222_add_attachment_featured_image_to_action_pages.rb +++ b/db/migrate/20140504080222_add_attachment_featured_image_to_action_pages.rb @@ -1,11 +1,8 @@ class AddAttachmentFeaturedImageToActionPages < ActiveRecord::Migration[5.0] - def self.up - change_table :action_pages do |t| - t.attachment :featured_image - end - end - - def self.down - drop_attached_file :action_pages, :featured_image + def change + add_column :action_pages, :featured_image_file_name, :string + add_column :action_pages, :featured_image_content_type, :string + add_column :action_pages, :featured_image_file_size, :bigint + add_column :action_pages, :featured_image_updated_at, :datetime end end diff --git a/db/migrate/20140515192334_add_attachment_background_image_to_action_pages.rb b/db/migrate/20140515192334_add_attachment_background_image_to_action_pages.rb index 448c2453d..f101087c6 100644 --- a/db/migrate/20140515192334_add_attachment_background_image_to_action_pages.rb +++ b/db/migrate/20140515192334_add_attachment_background_image_to_action_pages.rb @@ -1,11 +1,9 @@ +# todo: ?? class AddAttachmentBackgroundImageToActionPages < ActiveRecord::Migration[5.0] - def self.up - change_table :action_pages do |t| - t.attachment :background_image - end - end - - def self.down - drop_attached_file :action_pages, :background_image + def change + add_column :action_pages, :background_image_file_name, :string + add_column :action_pages, :background_image_content_type, :string + add_column :action_pages, :background_image_file_size, :bigint + add_column :action_pages, :background_image_updated_at, :datetime end end diff --git a/db/migrate/20140529220025_add_og_image_to_action_pages.rb b/db/migrate/20140529220025_add_og_image_to_action_pages.rb index bef964ffc..9cf386113 100644 --- a/db/migrate/20140529220025_add_og_image_to_action_pages.rb +++ b/db/migrate/20140529220025_add_og_image_to_action_pages.rb @@ -1,11 +1,8 @@ class AddOgImageToActionPages < ActiveRecord::Migration[5.0] - def self.up - change_table :action_pages do |t| - t.attachment :og_image - end - end - - def self.down - drop_attached_file :action_pages, :og_image + def change + add_column :action_pages, :og_image_file_name, :string + add_column :action_pages, :og_image_content_type, :string + add_column :action_pages, :og_image_file_size, :bigint + add_column :action_pages, :og_image_updated_at, :datetime end end From 99befaed5f40c9f380d6702f06d65bee8c863597 Mon Sep 17 00:00:00 2001 From: Jeff Parr Date: Wed, 17 Apr 2024 13:22:23 -0700 Subject: [PATCH 3/5] remove logo from partners model --- app/assets/stylesheets/action_page.scss | 19 ------------------- app/models/partner.rb | 7 ------- app/views/action_page/_partner_logos.html.erb | 9 --------- app/views/action_page/show.html.erb | 2 -- .../admin/action_pages/edit_partners.html.erb | 2 +- app/views/admin/partners/_form.html.erb | 5 ----- app/views/admin/partners/index.html.erb | 2 +- .../20191031184958_add_logo_to_partners.rb | 12 +++++------- 8 files changed, 7 insertions(+), 51 deletions(-) delete mode 100644 app/views/action_page/_partner_logos.html.erb diff --git a/app/assets/stylesheets/action_page.scss b/app/assets/stylesheets/action_page.scss index 6ace3a726..7a30dde8c 100644 --- a/app/assets/stylesheets/action_page.scss +++ b/app/assets/stylesheets/action_page.scss @@ -1236,25 +1236,6 @@ html.js #affiliations { } } -.partner-logos { - display: flex; - align-items: center; - justify-content: space-evenly; - flex-wrap: wrap; - @media screen and (min-width: $lg) { - flex-wrap: nowrap; - } - img { - width: 100%; - height: auto; - max-width: 200px; - padding: 1em; - @media screen and (min-width: $md) { - padding: 0 1em; - } - } -} - #congress-message-create { position: relative; diff --git a/app/models/partner.rb b/app/models/partner.rb index b387ced5a..703d73799 100644 --- a/app/models/partner.rb +++ b/app/models/partner.rb @@ -1,17 +1,10 @@ class Partner < ApplicationRecord - extend AmazonCredentials acts_as_paranoid has_many :subscriptions has_many :users has_many :partnerships has_many :action_pages, through: :partnerships - # todo: doesnt appear to be used? - has_attached_file :logo, amazon_credentials - - validates_media_type_spoof_detection :logo, - if: -> { logo.present? && logo_file_name_came_from_user? } - do_not_validate_attachment_file_type [:logo] validates :code, uniqueness: true def to_csv(options = {}) diff --git a/app/views/action_page/_partner_logos.html.erb b/app/views/action_page/_partner_logos.html.erb deleted file mode 100644 index 250bfcb64..000000000 --- a/app/views/action_page/_partner_logos.html.erb +++ /dev/null @@ -1,9 +0,0 @@ -<% if @actionPage.partners.present? && @actionPage.partners.any? { |p| p.logo.present? } %> -

Who We Are

-
- <%= image_tag "EFF_Monogram-red" %> - <% @actionPage.partners.each do |partner| %> - <%= image_tag partner.logo.url if partner.logo.present? %> - <% end %> -
-<% end %> diff --git a/app/views/action_page/show.html.erb b/app/views/action_page/show.html.erb index 8a72a51a8..52fdca997 100644 --- a/app/views/action_page/show.html.erb +++ b/app/views/action_page/show.html.erb @@ -13,8 +13,6 @@ <%= image_tag(@actionPage.featured_image.url) %> <%= markdown @actionPage.summary -%> - <%= render "action_page/partner_logos" %> - <% if @actionPage.enable_petition? && @petition && @petition.description.present? && !@actionPage.description.include?('``` letter') -%> <%= render(partial: "action_page/letter", layout: false) %> <% end -%> diff --git a/app/views/admin/action_pages/edit_partners.html.erb b/app/views/admin/action_pages/edit_partners.html.erb index f2a9aa4a2..78d2e7483 100644 --- a/app/views/admin/action_pages/edit_partners.html.erb +++ b/app/views/admin/action_pages/edit_partners.html.erb @@ -2,7 +2,7 @@

Partners for <%= @actionPage.title %>

-

Add partner logos and email signups to this action.

+

Add partners email signups to this action.

<%= form_for([:admin, @actionPage]) do |f| %>
diff --git a/app/views/admin/partners/_form.html.erb b/app/views/admin/partners/_form.html.erb index 52ffc2e9c..574e40796 100644 --- a/app/views/admin/partners/_form.html.erb +++ b/app/views/admin/partners/_form.html.erb @@ -26,11 +26,6 @@ <%= f.text_field :code -%>
-
- <%= f.label :logo, "Logo" -%> - <%= f.file_field :logo -%> -
-
<%= f.submit "Save", class: "btn btn-primary" %>
diff --git a/app/views/admin/partners/index.html.erb b/app/views/admin/partners/index.html.erb index 953257e60..19e053612 100644 --- a/app/views/admin/partners/index.html.erb +++ b/app/views/admin/partners/index.html.erb @@ -2,7 +2,7 @@

Partners

-

If we are running a joint campaign, we’ll want to include the partner organization’s name and logo on the action. Adding a partner here puts the name and logo into our database so that they can be added to an action from a list.

+

If we are running a joint campaign, we’ll want to include the partner organization’s name on the action. Adding a partner here puts the name into our database so that they can be added to an action from a list.

Partner signups

diff --git a/db/migrate/20191031184958_add_logo_to_partners.rb b/db/migrate/20191031184958_add_logo_to_partners.rb index 5665283de..cee82e686 100644 --- a/db/migrate/20191031184958_add_logo_to_partners.rb +++ b/db/migrate/20191031184958_add_logo_to_partners.rb @@ -1,11 +1,9 @@ class AddLogoToPartners < ActiveRecord::Migration[5.0] - def up - add_attachment :partners, :logo + def change + add_column :action_pages, :logo_file_name, :string + add_column :action_pages, :logo_content_type, :string + add_column :action_pages, :logo_file_size, :bigint + add_column :action_pages, :logo_updated_at, :datetime add_column :partnerships, :enable_mailings, :boolean, default: false, null: false end - - def down - remove_attachment :partners, :logo - remove_column :partnerships, :enable_mailings, :boolean, default: false, null: false - end end From bf186e4d64f4c2d8650c31a6ec735f74a17cc5d0 Mon Sep 17 00:00:00 2001 From: Jeff Parr Date: Wed, 17 Apr 2024 13:36:03 -0700 Subject: [PATCH 4/5] remove TweetTarget attached image --- app/models/tweet_target.rb | 25 ------------------------- app/views/tools/_tweet.html.erb | 3 --- 2 files changed, 28 deletions(-) diff --git a/app/models/tweet_target.rb b/app/models/tweet_target.rb index 7af6dce98..bdb5d43bc 100644 --- a/app/models/tweet_target.rb +++ b/app/models/tweet_target.rb @@ -1,32 +1,7 @@ class TweetTarget < ApplicationRecord - extend AmazonCredentials - require "open-uri" - belongs_to :tweet - has_attached_file :image, amazon_credentials - validates_media_type_spoof_detection :image, if: -> { image_file_name.present? } - do_not_validate_attachment_file_type :image - after_save :attach_twitter_image def url "https://twitter.com/#{twitter_id}" end - - delegate :url, to: :image, prefix: true - - def attach_twitter_image - delay.attach_twitter_image_without_delay if image_file_name.nil? && Twitter.has_api_keys? - end - - def attach_twitter_image_without_delay - access_token = Twitter.prepare_access_token Rails.application.secrets.twitter_oauth_token, Rails.application.secrets.twitter_oauth_token_secret - - # ref: https://dev.twitter.com/overview/general/user-profile-images-and-banners - response = access_token.request(:get, "https://api.twitter.com/1.1/users/show.json?screen_name=#{twitter_id}") - user_info = JSON.parse response.body - user_image_url = user_info["profile_image_url_https"].gsub("_normal.", "_bigger.") - - self.image = URI.parse(user_image_url) - save - end end diff --git a/app/views/tools/_tweet.html.erb b/app/views/tools/_tweet.html.erb index 00a498ac6..e02c28027 100644 --- a/app/views/tools/_tweet.html.erb +++ b/app/views/tools/_tweet.html.erb @@ -15,9 +15,6 @@ <% initial_targets = @tweet.targets.sample(3) %> <% @tweet.targets.each do |target| %>