Docker/Maybe
Docker/Maybe
1
0
Fork 0
mirror of https://github.com/maybe-finance/maybe.git synced 2025-07-19 21:29:38 +02:00
Code Issues Releases Activity Actions 1

Fix initials + profile pictures (#2186)

Browse source 
* Improve initials + profile pictures

* Change to url_options
This commit is contained in:
Alex Hatzenbuhler 2025-05-01 17:43:21 -05:00 • committed by GitHub
parent 17fa5413f6
commit 194dad702d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/components/menu_component.html.erb
View file

@ -6,7 +6,7 @@
<% elsif variant == :avatar %> <% elsif variant == :avatar %>
<button data-menu-target="button"> <button data-menu-target="button">
<div class="w-9 h-9 cursor-pointer"> <div class="w-9 h-9 cursor-pointer">
<%= render "settings/user_avatar", avatar_url: avatar_url %> <%= render "settings/user_avatar", avatar_url: avatar_url, initials: initials %>
</div> </div>
</button> </button>
<% end %> <% end %>

5
app/components/menu_component.rb
View file

@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
class MenuComponent < ViewComponent::Base class MenuComponent < ViewComponent::Base
attr_reader :variant, :avatar_url, :placement, :offset, :icon_vertical, :no_padding, :testid attr_reader :variant, :avatar_url, :initials, :placement, :offset, :icon_vertical, :no_padding, :testid
renders_one :button, ->(**button_options, &block) do renders_one :button, ->(**button_options, &block) do
options_with_target = button_options.merge(data: { menu_target: "button" }) options_with_target = button_options.merge(data: { menu_target: "button" })
@ -23,9 +23,10 @@ class MenuComponent < ViewComponent::Base
VARIANTS = %i[icon button avatar].freeze VARIANTS = %i[icon button avatar].freeze
def initialize(variant: "icon", avatar_url: nil, placement: "bottom-end", offset: 12, icon_vertical: false, no_padding: false, testid: nil) def initialize(variant: "icon", avatar_url: nil, initials: nil, placement: "bottom-end", offset: 12, icon_vertical: false, no_padding: false, testid: nil)
@variant = variant.to_sym @variant = variant.to_sym
@avatar_url = avatar_url @avatar_url = avatar_url
@initials = initials
@placement = placement @placement = placement
@offset = offset @offset = offset
@icon_vertical = icon_vertical @icon_vertical = icon_vertical

9
app/controllers/application_controller.rb
View file

@ -4,6 +4,7 @@ class ApplicationController < ActionController::Base
before_action :detect_os before_action :detect_os
before_action :set_default_chat before_action :set_default_chat
before_action :set_active_storage_url_options
private private
def detect_os def detect_os
@ -23,4 +24,12 @@ class ApplicationController < ActionController::Base
@last_viewed_chat = Current.user&.last_viewed_chat @last_viewed_chat = Current.user&.last_viewed_chat
@chat = @last_viewed_chat @chat = @last_viewed_chat
end end
def set_active_storage_url_options
ActiveStorage::Current.url_options = {
protocol: request.protocol,
host: request.host,
port: request.optional_port
}
end
end end

2
app/models/user.rb
View file

@ -21,7 +21,7 @@ class User < ApplicationRecord
has_one_attached :profile_image do |attachable| has_one_attached :profile_image do |attachable|
attachable.variant :thumbnail, resize_to_fill: [ 300, 300 ], convert: :webp, saver: { quality: 80 } attachable.variant :thumbnail, resize_to_fill: [ 300, 300 ], convert: :webp, saver: { quality: 80 }
attachable.variant :small, resize_to_fill: [ 72, 72 ], convert: :webp, saver: { quality: 80 } attachable.variant :small, resize_to_fill: [ 72, 72 ], convert: :webp, saver: { quality: 80 }, preprocessed: true
end end
validate :profile_image_size validate :profile_image_size

4
app/views/settings/profiles/show.html.erb
View file

@ -41,9 +41,9 @@
<p class="uppercase text-xs text-secondary font-medium"><%= Current.family.name %> &middot; <%= Current.family.users.size %></p> <p class="uppercase text-xs text-secondary font-medium"><%= Current.family.name %> &middot; <%= Current.family.users.size %></p>
</div> </div>
<% @users.each do |user| %> <% @users.each do |user| %>
<div class="flex gap-2 items-center bg-container p-4 border border-alpha-black-25 rounded-lg"> <div class="flex gap-2 mt-2 items-center bg-container p-4 border border-alpha-black-25 rounded-lg">
<div class="w-9 h-9 shrink-0"> <div class="w-9 h-9 shrink-0">
<%= render "settings/user_avatar", avatar_url: user.profile_image.url %> <%= render "settings/user_avatar", avatar_url: user.profile_image&.variant(:small)&.url, initials: user.initials %>
</div> </div>
<p class="text-primary font-medium text-sm"><%= user.display_name %></p> <p class="text-primary font-medium text-sm"><%= user.display_name %></p>
<div class="rounded-md bg-surface px-1.5 py-0.5"> <div class="rounded-md bg-surface px-1.5 py-0.5">

4
app/views/users/_user_menu.html.erb
View file

@ -1,11 +1,11 @@
<%# locals: (user:, placement: "right-start", offset: 16) %> <%# locals: (user:, placement: "right-start", offset: 16) %>
<div data-testid="user-menu"> <div data-testid="user-menu">
<%= render MenuComponent.new(variant: "avatar", avatar_url: user.profile_image&.variant(:small)&.url, placement: placement, offset: offset) do |menu| %> <%= render MenuComponent.new(variant: "avatar", avatar_url: user.profile_image&.variant(:small)&.url, initials: user.initials, placement: placement, offset: offset) do |menu| %>
<%= menu.with_header do %> <%= menu.with_header do %>
<div class="px-4 py-3 flex items-center gap-3"> <div class="px-4 py-3 flex items-center gap-3">
<div class="w-9 h-9 shrink-0"> <div class="w-9 h-9 shrink-0">
<%= render "settings/user_avatar", avatar_url: user.profile_image&.variant(:small)&.url, lazy: true %> <%= render "settings/user_avatar", avatar_url: user.profile_image&.variant(:small)&.url, initials: user.initials, lazy: true %>
</div> </div>
<div class="overflow-hidden text-ellipsis text-sm"> <div class="overflow-hidden text-ellipsis text-sm">