Skip to content

[Follower] Condense followers & following UI #11845

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 4, 2025
Merged

[Follower] Condense followers & following UI #11845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3e982e1
Improve followers ui
manuthecoder Oct 12, 2025
f25be0d
Refactor followers modal to simplify iteration over event_follows
manuthecoder Oct 12, 2025
7af0821
Update app/views/events/_followers_modal.html.erb
manuthecoder Oct 23, 2025
bece717
Merge branch 'main' into improve-followers-ui
manuthecoder Oct 23, 2025
2089c44
Refactor followers and following modals for consistent styling and ad…
manuthecoder Oct 23, 2025
f8036d4
Merge branch 'main' into improve-followers-ui
manuthecoder Oct 23, 2025
6654fe9
Merge branch 'main' into improve-followers-ui
manuthecoder Oct 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/views/events/_followers_modal.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

<section class="modal modal--scroll bg-snow" data-behavior="modal" role="dialog" id="edit_followers">
<%= modal_header "Followers" %>
<ul class="grid grid-cols-<%= event_follows.size == 1 ? "1" : "2" %> text-left w-full mt-2">
<ul class="grid gap-0 grid-cols-1 text-left w-full mt-2">
<% event_follows.each do |event_follow| %>
<li class="overflow-visible card card--hover flex flex-row justify-between items-center gap-2">
<li class="overflow-visible flex flex-row justify-between items-center gap-2 last:!border-none py-1" style="border-bottom: 1px solid var(--smoke); ">
<span class="w-full flex gap-2 items-center align-middle">
<%= user_mention event_follow.user %>
<div class="flex-grow"></div>
<%= pop_icon_to "member-remove",
follow_path(event_follow),
class: "error",
class: "error bg-transparent",
data: {
turbo_frame: "_top",
turbo_method: :delete,
Expand Down
6 changes: 3 additions & 3 deletions app/views/my/_following_modal.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@

<section class="modal modal--scroll bg-snow" data-behavior="modal" role="dialog" id="edit_following">
<%= modal_header "Following" %>
<ul class="grid grid-cols-1 text-left w-full mt-2">
<ul class="grid gap-0 grid-cols-1 text-left w-full mt-2">
<% event_follows.each do |event_follow| %>
<li class="overflow-visible card card--hover flex flex-row justify-between items-center gap-2">
<li class="overflow-visible flex flex-row justify-between items-center gap-2 last:!border-none py-1" style="border-bottom: 1px solid var(--smoke); ">
<span class="w-full flex gap-2 items-center align-middle">
<% if event_follow.event.logo.attached? %>
<%= image_tag event_follow.event.logo, height: 24, width: 24, class: "rounded align-bottom" %>
<% end %>
<strong class="flex-grow"><%= link_to event_follow.event.name, event_announcement_overview_path(event_follow.event) %></strong>
<%= pop_icon_to "member-remove",
follow_path(event_follow),
class: "error",
class: "error bg-transparent",
data: {
turbo_frame: "_top",
turbo_method: :delete,
Expand Down