Mirrors/astuto
1
0
Fork 0
mirror of https://github.com/astuto/astuto.git synced 2025-12-15 19:27:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

switch from url_for to blob.url

Browse Source
This commit is contained in:
riggraz
2025-01-23 12:47:35 +01:00
parent 2e89e3ed67
commit 14caaeb7be
12 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/components/SiteSettings/Authentication/index.scss
View File

@@ -71,7 +71,7 @@
.oAuthLogoPreview.oAuthLogoPreviewShouldDelete {
border: 2px solid red;
.oAuthPreviewImg { filter: grayscale(100%); }
.oAuthLogoPreviewImg { filter: grayscale(100%); }
}
.oAuthLogoActions { @extend .d-flex; }

6
app/controllers/comments_controller.rb
View File

@@ -22,7 +22,7 @@ class CommentsController < ApplicationController
.includes(user: { avatar_attachment: :blob }) # Preload avatars
comments = comments.map do |comment|
user_avatar_url = comment.user.avatar.attached? ? url_for(comment.user.avatar) : nil
user_avatar_url = comment.user.avatar.attached? ? comment.user.avatar.blob.url : nil
comment.attributes.merge(user_avatar: user_avatar_url)
end
@@ -40,7 +40,7 @@ class CommentsController < ApplicationController
{
user_full_name: current_user.full_name,
user_email: current_user.email,
user_avatar: current_user.avatar.attached? ? url_for(current_user.avatar) : nil,
user_avatar: current_user.avatar.attached? ? current_user.avatar.blob.url : nil,
user_role: current_user.role_before_type_cast
}
), status: :created
@@ -60,7 +60,7 @@ class CommentsController < ApplicationController
{
user_full_name: @comment.user.full_name,
user_email: @comment.user.email,
user_avatar: @comment.user.avatar.attached? ? url_for(@comment.user.avatar) : nil,
user_avatar: @comment.user.avatar.attached? ? @comment.user.avatar.blob.url : nil,
user_role: @comment.user.role_before_type_cast
}
)

4
app/controllers/likes_controller.rb
View File

@@ -15,7 +15,7 @@ class LikesController < ApplicationController
.includes(user: { avatar_attachment: :blob }) # Preload avatars
likes = likes.map do |like|
user_avatar_url = like.user.avatar.attached? ? url_for(like.user.avatar) : nil
user_avatar_url = like.user.avatar.attached? ? like.user.avatar.blob.url : nil
like.attributes.merge(user_avatar: user_avatar_url)
end
@@ -30,7 +30,7 @@ class LikesController < ApplicationController
id: like.id,
full_name: current_user.full_name,
email: current_user.email,
user_avatar: current_user.avatar.attached? ? url_for(current_user.avatar) : nil,
user_avatar: current_user.avatar.attached? ? current_user.avatar.blob.url : nil,
}, status: :created
else
render json: {

2
app/controllers/post_status_changes_controller.rb
View File

@@ -14,7 +14,7 @@ class PostStatusChangesController < ApplicationController
.includes(user: { avatar_attachment: :blob }) # Preload avatars
post_status_changes = post_status_changes.map do |post_status_change|
user_avatar_url = post_status_change.user.avatar.attached? ? url_for(post_status_change.user.avatar) : nil
user_avatar_url = post_status_change.user.avatar.attached? ? post_status_change.user.avatar.blob.url : nil
post_status_change.attributes.merge(user_avatar: user_avatar_url)
end

2
app/controllers/posts_controller.rb
View File

@@ -161,7 +161,7 @@ class PostsController < ApplicationController
.includes(user: { avatar_attachment: :blob }) # Preload avatars
posts = posts.map do |post|
user_avatar_url = post.user.avatar.attached? ? url_for(post.user.avatar) : nil
user_avatar_url = post.user.avatar.attached? ? post.user.avatar.blob.url : nil
post.attributes.merge(user_avatar: user_avatar_url)
end

2
app/controllers/tenants_controller.rb
View File

@@ -13,7 +13,7 @@ class TenantsController < ApplicationController
def show
tenant = Current.tenant_or_raise!
tenant.attributes.merge(site_logo_url: tenant.site_logo.attached? ? url_for(tenant.site_logo) : nil)
tenant.attributes.merge(site_logo_url: tenant.site_logo.attached? ? tenant.site_logo.blob.url : nil)
render json: tenant
end

2
app/controllers/users_controller.rb
View File

@@ -9,7 +9,7 @@ class UsersController < ApplicationController
.order(role: :desc, created_at: :desc)
@users = @users.map do |user|
user.attributes.merge(avatar_url: user.avatar.attached? ? url_for(user.avatar) : nil)
user.attributes.merge(avatar_url: user.avatar.attached? ? user.avatar.blob.url : nil)
end
render json: @users

2
app/views/devise/registrations/edit.html.erb
View File

@@ -32,7 +32,7 @@
<p>
<% if resource.avatar.attached? %>
<%= image_tag url_for(resource.avatar), class: 'avatar', size: 48 %>
<%= image_tag resource.avatar.blob.url, class: 'avatar', size: 48 %>
<%=
react_component(

4
app/views/layouts/_header.html.erb
View File

@@ -3,7 +3,7 @@
<%=
link_to get_url_for_logo, class: "brand#{@tenant_setting.logo_links_to == 'nothing' ? ' brandDisabled' : ''}", tabindex: @tenant_setting.logo_links_to == 'nothing' ? -1 : 0 do
app_name = content_tag :span, @tenant.site_name
logo_url = @tenant.site_logo.attached? ? url_for(@tenant.site_logo) : @tenant.old_site_logo
logo_url = @tenant.site_logo.attached? ? @tenant.site_logo.blob.url : @tenant.old_site_logo
logo = image_tag(logo_url || "", class: 'logo', skip_pipeline: true)
@@ -45,7 +45,7 @@
<li class="nav-item dropdown">
<a class="profileToggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<% if current_user.avatar.attached? %>
<%= image_tag url_for(current_user.avatar), class: 'avatar', size: 24 %>
<%= image_tag current_user.avatar.blob.url, class: 'avatar', size: 24 %>
<% else %>
<%= image_tag current_user.gravatar_url, class: 'avatar', alt: current_user.full_name, size: 24 %>
<% end %>

2
app/views/layouts/application.html.erb
View File

@@ -14,7 +14,7 @@
<%= javascript_include_tag "application", "data-turbo-track": "reload" %>
<%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
<%= favicon_link_tag @tenant.site_favicon.attached? ? url_for(@tenant.site_favicon) : asset_path('favicon.png') %>
<%= favicon_link_tag @tenant.site_favicon.attached? ? @tenant.site_favicon.blob.url : asset_path('favicon.png') %>
</head>
<body>

4
app/views/posts/show.html.erb
View File

@@ -8,13 +8,13 @@
originPost: {
post: @post,
likes: @post.likes.select(:id, :full_name, :email).left_outer_joins(:user),
authorAvatar: @post.user ? @post.user.avatar.attached? ? url_for(@post.user.avatar) : nil : nil,
authorAvatar: @post.user ? @post.user.avatar.attached? ? @post.user.avatar.blob.url : nil : nil,
},
isLoggedIn: user_signed_in?,
isPowerUser: user_signed_in? ? current_user.moderator? : false,
currentUserFullName: user_signed_in? ? current_user.full_name : nil,
currentUserEmail: user_signed_in? ? current_user.email : nil,
currentUserAvatar: user_signed_in? ? current_user.avatar.attached? ? url_for(current_user.avatar) : nil : nil,
currentUserAvatar: user_signed_in? ? current_user.avatar.attached? ? current_user.avatar.blob.url : nil : nil,
tenantSetting: @tenant_setting,
authenticityToken: form_authenticity_token,
}

4
app/views/site_settings/general.html.erb
View File

@@ -25,8 +25,8 @@
locale: @tenant.locale,
useBrowserLocale: @tenant_setting.use_browser_locale,
},
siteLogoUrl: @tenant.site_logo.attached? ? url_for(@tenant.site_logo) : nil,
siteFaviconUrl: @tenant.site_favicon.attached? ? url_for(@tenant.site_favicon) : nil,
siteLogoUrl: @tenant.site_logo.attached? ? @tenant.site_logo.blob.url : nil,
siteFaviconUrl: @tenant.site_favicon.attached? ? @tenant.site_favicon.blob.url : nil,
boards: @tenant.boards.order(order: :asc),
isMultiTenant: Rails.application.multi_tenancy?,
authenticityToken: form_authenticity_token