From 6303343c17201815fc8919679ffb9f8a36029423 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sun, 14 Feb 2021 22:13:27 +0100 Subject: [PATCH] JSON output migrated to Paperclip style URLs --- app/views/json/package.json.jbuilder | 5 +++-- app/views/json/screenshots.json.jbuilder | 5 +++-- app/views/my/uploads.slim | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/views/json/package.json.jbuilder b/app/views/json/package.json.jbuilder index 90b1c1f..130f0af 100644 --- a/app/views/json/package.json.jbuilder +++ b/app/views/json/package.json.jbuilder @@ -1,7 +1,8 @@ json.package @p.name json.screenshots @p.screenshots do |s| - json.small_image_url "https://#{request.host_with_port}#{s.image.variant(resize_to_limit: [160,120], timestamp: false)}" - json.large_image_url "https://#{request.host_with_port}#{s.image.variant(resize_to_limit: [800,600], timestamp: false)}" + json.thumb_image_url "#{request.protocol}#{request.host_with_port}#{s.simage_url(:thumb)}" + json.small_image_url "#{request.protocol}#{request.host_with_port}#{s.simage_url(:small)}" + json.large_image_url "#{request.protocol}#{request.host_with_port}#{s.simage_url(:large)}" json.version s.version end diff --git a/app/views/json/screenshots.json.jbuilder b/app/views/json/screenshots.json.jbuilder index 9a6b010..255093d 100644 --- a/app/views/json/screenshots.json.jbuilder +++ b/app/views/json/screenshots.json.jbuilder @@ -4,7 +4,8 @@ json.cache! ['json_screenshots'], expires_in: 1.hour do json.extract! s, :version json.extract! p, :maintainer, :name, :section, :maintainer_email, :homepage, :description json.url package_url(p.name, protocol: 'https') - json.small_image_url "https://#{request.host_with_port}#{s.image.variant(resize_to_limit: [160,120])}" - json.large_image_url "https://#{request.host_with_port}#{s.image.variant(resize_to_limit: [800,600])}" + json.thumb_image_url "#{request.protocol}#{request.host_with_port}#{s.simage_url(:thumb)}" + json.small_image_url "#{request.protocol}#{request.host_with_port}#{s.simage_url(:small)}" + json.large_image_url "#{request.protocol}#{request.host_with_port}#{s.simage_url(:large)}" end end diff --git a/app/views/my/uploads.slim b/app/views/my/uploads.slim index d2ce240..f54d875 100644 --- a/app/views/my/uploads.slim +++ b/app/views/my/uploads.slim @@ -15,7 +15,7 @@ .grid-x.small-up-1.medium-up-3.large-up-4.grid-thumbnails - @current_users_screenshots.each do |screenshot| .column - + / TODO: old Paperclip style a.black.fancybox href=screenshot.image.variant(resize_to_limit: [800,600], timestamp: false) div.grid-thumbnail = image_tag(screenshot.image.variant(resize_to_limit: [160,120]), alt: screenshot.caption, class: 'thumbnail')