From b75be9f0b56784f85f204f67cf0b30b7f19b2853 Mon Sep 17 00:00:00 2001 From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com> Date: Mon, 26 Jun 2023 21:07:51 +0900 Subject: [PATCH 1/7] Update room.js --- app/assets/javascripts/room.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/room.js b/app/assets/javascripts/room.js index 213410901b..70c638388f 100644 --- a/app/assets/javascripts/room.js +++ b/app/assets/javascripts/room.js @@ -344,7 +344,7 @@ function displaySharedUsers(path) { users.forEach(function(user) { listName = document.createElement("li"), - spanAvatar = document.createElement("span"), + spanAvatar = undefined, spanName = document.createElement("span"), spanUid = document.createElement("span"), spanRemove = document.createElement("span"), @@ -352,8 +352,16 @@ function displaySharedUsers(path) { listName.setAttribute('class', 'list-group-item text-left') listName.setAttribute('data-uid', user.uid) - spanAvatar.innerText = user.name.charAt(0) - spanAvatar.setAttribute('class', 'avatar float-left mr-2') + if (user.image) { + spanAvatar = document.createElement("img") + spanAvatar.setAttribute('id', 'user-image') + spanAvatar.setAttribute('class', 'avatar float-left mr-2') + spanAvatar.setAttribute('src', user.image) + } else { + spanAvatar = document.createElement("span") + spanAvatar.innerText = user.name.charAt(0) + spanAvatar.setAttribute('class', 'avatar float-left mr-2') + } spanName.setAttribute('class', 'shared-user') spanName.innerText = user.name spanUid.setAttribute('class', 'text-muted ml-1') From 9fa5cd4a3a61dc7cb83dfb47cfab28f37e40aa49 Mon Sep 17 00:00:00 2001 From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com> Date: Mon, 26 Jun 2023 21:08:46 +0900 Subject: [PATCH 2/7] Update joiner.rb --- app/controllers/concerns/joiner.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/concerns/joiner.rb b/app/controllers/concerns/joiner.rb index f887ed43ec..3132eb0cc0 100644 --- a/app/controllers/concerns/joiner.rb +++ b/app/controllers/concerns/joiner.rb @@ -70,6 +70,7 @@ def join_room(opts) opts[:mute_on_start] = room_setting_with_config("muteOnStart") if current_user + opts[:avatarURL] = current_user.image if current_user.image.present? && valid_avatar?(current_user.image) redirect_to join_path(@room, current_user.name, opts, current_user.uid) else join_name = params[:join_name] || params[@room.invite_path][:join_name] From 6fd72dedff4d85ab9dd0e3c0fec104aeeecc3f9a Mon Sep 17 00:00:00 2001 From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com> Date: Mon, 26 Jun 2023 21:09:10 +0900 Subject: [PATCH 3/7] Update rooms_controller.rb --- app/controllers/rooms_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb index 934eab058d..ed21bcdcb6 100644 --- a/app/controllers/rooms_controller.rb +++ b/app/controllers/rooms_controller.rb @@ -181,6 +181,7 @@ def start opts[:mute_on_start] = room_setting_with_config("muteOnStart") opts[:require_moderator_approval] = room_setting_with_config("requireModeratorApproval") opts[:record] = record_meeting + opts[:avatarURL] = current_user.image if current_user.image.present? && valid_avatar?(current_user.image) begin redirect_to join_path(@room, current_user.name, opts, current_user.uid) From 4582021672846ef2385b09199d8cd0510c9403a9 Mon Sep 17 00:00:00 2001 From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com> Date: Mon, 26 Jun 2023 21:10:17 +0900 Subject: [PATCH 4/7] Update cant_create_rooms.html.erb --- app/views/rooms/cant_create_rooms.html.erb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app/views/rooms/cant_create_rooms.html.erb b/app/views/rooms/cant_create_rooms.html.erb index 2d9f356ff8..cb661fa60f 100644 --- a/app/views/rooms/cant_create_rooms.html.erb +++ b/app/views/rooms/cant_create_rooms.html.erb @@ -20,11 +20,15 @@
- <%= current_user.name.first %> -

<%= current_user.name %>

- <%= link_to edit_user_path(current_user), class: "btn btn-outline-primary mt-2" do %> - <%= t("room.no_room.edit_profile") %> - <% end %> + <% if current_user.image.blank? || !valid_url?(current_user.image) %> + <%= current_user.name.first %> + <% else %> + <%= image_tag(current_user.image, class: "avatar avatar-xxxl card-profile-img") %> + <% end %> +

<%= current_user.name %>

+ <%= link_to edit_user_path(current_user), class: "btn btn-outline-primary mt-2" do %> + <%= t("room.no_room.edit_profile") %> + <% end %>
From 4ada010a8bdad7604ee2ddef6ebdf9b7fd3e24ec Mon Sep 17 00:00:00 2001 From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com> Date: Mon, 26 Jun 2023 21:11:08 +0900 Subject: [PATCH 5/7] Update _room_event.html.erb --- app/views/rooms/components/_room_event.html.erb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/views/rooms/components/_room_event.html.erb b/app/views/rooms/components/_room_event.html.erb index 2482c4657a..a218e37a82 100644 --- a/app/views/rooms/components/_room_event.html.erb +++ b/app/views/rooms/components/_room_event.html.erb @@ -25,7 +25,11 @@
- <%= @room.owner.name.first %> + <% if @room.owner.image.blank? %> + <%= @room.owner.name.first %> + <% else %> + + <% end %>
<%= @room.owner.name %> (<%= t("room.owner") %>)
From 9ee79839952d2af7cd632078659b1ff8789c70b9 Mon Sep 17 00:00:00 2001 From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com> Date: Mon, 26 Jun 2023 21:11:49 +0900 Subject: [PATCH 6/7] Update _header.html.erb --- app/views/shared/_header.html.erb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb index 73d9de9c42..2ada39c2cf 100755 --- a/app/views/shared/_header.html.erb +++ b/app/views/shared/_header.html.erb @@ -40,7 +40,12 @@
- <%= current_user.name.first %> + <% if current_user.image.blank? || !valid_url?(current_user.image) %> + <%= current_user.name.first %> + <% else %> + <%= current_user.name.first %> + <%= image_tag(current_user.image, id: "user-image", class: "avatar") %> + <% end %> <%= current_user.name %> From b379091fe780c5ea31f75af1e5cc92ab93818245 Mon Sep 17 00:00:00 2001 From: hiroshisuga <45039819+hiroshisuga@users.noreply.github.com> Date: Mon, 26 Jun 2023 21:12:45 +0900 Subject: [PATCH 7/7] Update _account.html.erb --- app/views/users/components/_account.html.erb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/app/views/users/components/_account.html.erb b/app/views/users/components/_account.html.erb index 77ad5eac1e..30a31bfa98 100644 --- a/app/views/users/components/_account.html.erb +++ b/app/views/users/components/_account.html.erb @@ -60,6 +60,20 @@ <%= translated_role_name(@user.role) %> <% end %> + + <%= f.label :image, t("settings.account.image"), class: "form-label mt-5" %> +
+
+ <% if @user.image.blank? || !valid_url?(@user.image) %> + <%= @user.name.first %> + <% else %> + <%= image_tag(@user.image, class: "avatar avatar-xxl mr-5 mt-2") %> + <% end %> +
+
+ <%= f.text_field :image, class: "form-control #{form_is_invalid?(@user, :image)}", placeholder: t("settings.account.image_url") %> +
+
<%= f.submit t("update"), class: "btn btn-primary float-right ml-4" %>