diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 97b83118c..54663720e 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -29,6 +29,8 @@ @use "components/tooltip"; @use "components/like_button"; @use "components/welcome_tour"; +@use "components/inspector"; +@use "components/username_link"; @use "components/markdown_content"; @use "components/guide_content"; @use "components/guide_code"; diff --git a/app/assets/stylesheets/components/_feed.scss b/app/assets/stylesheets/components/_feed.scss index 7fbd8a5ba..01def342f 100644 --- a/app/assets/stylesheets/components/_feed.scss +++ b/app/assets/stylesheets/components/_feed.scss @@ -856,6 +856,55 @@ font-size: calc(var(--font-size-s) * 1.2); } + // Shown only inside the admin_tool box when a deleted devlog is surfaced + // to an admin/fraud_dept viewer (see Posts::CardComponent#deleted_devlog?). + &__deleted-notice { + margin: var(--space-xxs) 0 0; + padding-left: var(--feed-content-offset); + font-size: calc(var(--font-size-s) * 1.2); + color: var(--color-brand-orange); + } + + // Admin-only, lazy-loaded Hackatime project breakdown (see + // Posts::CardComponent#hackatime_breakdown_url). Collapsed by default; + // the turbo-frame inside only fetches once the
is opened. + &__hackatime-summary { + cursor: pointer; + font-size: calc(var(--font-size-s) * 1.2); + color: var(--color-space-text-muted); + + &:hover { + color: var(--color-space-text); + } + } + + &__hackatime-list { + margin: var(--space-xxs) 0 0; + padding: 0; + list-style: none; + } + + &__hackatime-item { + display: flex; + align-items: baseline; + gap: var(--space-xxs); + font-size: calc(var(--font-size-s) * 1.1); + } + + &__hackatime-name { + font-weight: 600; + } + + &__hackatime-percent { + color: var(--color-brand-orange); + } + + &__hackatime-seconds, + &__hackatime-loading, + &__hackatime-empty { + color: var(--color-space-text-muted); + } + &__body { padding-left: var(--feed-content-offset); font-size: calc(var(--font-size-s) * 1.2); diff --git a/app/assets/stylesheets/components/_inspector.scss b/app/assets/stylesheets/components/_inspector.scss new file mode 100644 index 000000000..42ab4281e --- /dev/null +++ b/app/assets/stylesheets/components/_inspector.scss @@ -0,0 +1,18 @@ +.inspector { + display: inline-block; + overflow-x: auto; + max-width: 1000px; + + &__summary { + cursor: pointer; + font-family: var(--font-family-text); + font-weight: 600; + } + + &__body { + margin: 0; + padding: 8px; + font-size: 0.75rem; + color: var(--color-space-text); + } +} diff --git a/app/assets/stylesheets/components/_sidebar.scss b/app/assets/stylesheets/components/_sidebar.scss index 52ff0ad30..a03bdaeb8 100644 --- a/app/assets/stylesheets/components/_sidebar.scss +++ b/app/assets/stylesheets/components/_sidebar.scss @@ -325,10 +325,23 @@ button.sidebar__nav-link { overflow: hidden; } +.sidebar__user-handle-row { + align-items: center; + display: flex; + gap: var(--space-xxs); + min-width: 0; + + .tools-do--inline { + flex-shrink: 0; + } +} + .sidebar__user-meta-handle { + flex-shrink: 1; font-weight: 700; font-size: var(--font-size-m); color: inherit; + min-width: 0; text-decoration: none; overflow: hidden; text-overflow: ellipsis; diff --git a/app/assets/stylesheets/components/_username_link.scss b/app/assets/stylesheets/components/_username_link.scss new file mode 100644 index 000000000..2e0725cb5 --- /dev/null +++ b/app/assets/stylesheets/components/_username_link.scss @@ -0,0 +1,9 @@ +.username-link__admin { + font-size: 0.85em; + text-decoration: none; + opacity: 0.85; + + &:hover { + opacity: 1; + } +} diff --git a/app/assets/stylesheets/pages/projects/_show.scss b/app/assets/stylesheets/pages/projects/_show.scss index e5db5ade1..548b1b44b 100644 --- a/app/assets/stylesheets/pages/projects/_show.scss +++ b/app/assets/stylesheets/pages/projects/_show.scss @@ -208,6 +208,31 @@ turbo-frame#project_hero { } } +.project-show__admin-link { + font-size: 0.85em; + text-decoration: none; + opacity: 0.85; + + &:hover { + opacity: 1; + } +} + +// Admin-editing-someone-else's-project notice. Sits inside an admin_tool +// dashed box, so it only needs its own text color, not the full pill/border +// treatment. Unlike the profile page's equivalent, this doesn't need a +// .profile--editing-style CSS reveal — the whole edit form is only rendered +// server-side when actually in edit mode, so there's no "empty box" case. +.project-show__admin-edit-notice { + margin: 0 0 var(--space-xs); + font-size: 0.85rem; + color: var(--color-brand-orange); + + strong { + font-weight: 700; + } +} + .project-show__title-input { padding: 0; border: 0; diff --git a/app/assets/stylesheets/pages/shop/_suggestions.scss b/app/assets/stylesheets/pages/shop/_suggestions.scss index 63556038d..eb2a05fe3 100644 --- a/app/assets/stylesheets/pages/shop/_suggestions.scss +++ b/app/assets/stylesheets/pages/shop/_suggestions.scss @@ -342,9 +342,10 @@ } } - &__admin-strip { + // Border/color come from the shared .admin.tools-do box (admin_tool helper); + // this only adds the card-specific layout and corner radius. + &__admin-strip.admin.tools-do { background: rgba(255, 176, 122, 0.05); - border: 2px dashed rgba(255, 176, 122, 0.4); border-radius: 0 0 12px 12px; display: flex; flex-direction: column; diff --git a/app/assets/stylesheets/pages/user/_show.scss b/app/assets/stylesheets/pages/user/_show.scss index f3552444e..8318619b4 100644 --- a/app/assets/stylesheets/pages/user/_show.scss +++ b/app/assets/stylesheets/pages/user/_show.scss @@ -599,6 +599,28 @@ turbo-frame#profile_tabs { align-items: center; } +// Wraps the admin-editing-someone-else's-profile notice. The admin_tool box +// itself (border + padding) must stay hidden until edit mode is entered — +// hiding only the text inside it still leaves an empty dashed square visible +// (mirrors .profile__banner-placeholder and friends, which reveal on the +// .profile--editing class). +.profile__admin-edit-tool { + display: none; + + .profile--editing & { + display: inline-block; + } +} + +.profile__admin-edit-notice { + font-size: 0.85rem; + color: var(--color-brand-orange); + + strong { + font-weight: 700; + } +} + // Profile action buttons (Edit / Follow / Save / Cancel). Sits inside the // set-3 profile card, so this uses the light-bg small-action variant per // branding §4.0 / §4.1. Base is the secondary action (transparent + diff --git a/app/assets/stylesheets/utils.scss b/app/assets/stylesheets/utils.scss index 0026723ff..75517f063 100644 --- a/app/assets/stylesheets/utils.scss +++ b/app/assets/stylesheets/utils.scss @@ -1,5 +1,5 @@ :root { - --color-admin: #ff9100; + --color-admin: var(--color-brand-orange); --color-dev: #52d831; } @@ -20,7 +20,7 @@ border: 3px dashed; border-radius: 5px; display: inline-block; - padding: 4px; + padding: 6px; } .admin.tools-do { @@ -32,3 +32,12 @@ background-color: color-mix(in srgb, var(--color-dev) 20%, transparent); border-color: var(--color-dev); } + +.tools-do--inline { + display: inline-flex; + align-items: center; + vertical-align: middle; + margin-left: var(--space-xxxs); + padding: 1px 4px; + border-radius: 4px; +} diff --git a/app/components/posts/card_component.html.erb b/app/components/posts/card_component.html.erb index 5117c79b3..2d4fc62b4 100644 --- a/app/components/posts/card_component.html.erb +++ b/app/components/posts/card_component.html.erb @@ -1,3 +1,4 @@ +<% card_content = capture do %> <% on_card_link_target = card_link_url.present? && request.path == card_link_url %> <% if on_card_link_target %>
@@ -17,9 +18,8 @@
<%= inline_svg_tag "icons/repost.svg", class: "feed-post-card__reposted-by-icon" %> Reposted by - <%= link_to "@#{post.user.display_name.presence || "stardancer"}", - profile_path(post.user.display_name), - class: "feed-post-card__reposted-by-link" %><%= render StreakBadgeComponent.new(user: post.user) %><%= " ⚡" if post.user.admin? %> + <%= render "shared/username_link", user: post.user, link_class: "feed-post-card__reposted-by-link", + text: "@#{post.user.display_name.presence || "stardancer"}" %>
<% end %> @@ -49,8 +49,7 @@

<% if author.present? %> - <%= link_to "@#{author_name}", profile_path(author.display_name), class: "feed-post-card__author" %> - <%= render StreakBadgeComponent.new(user: author) %><%= " ⚡" if author.admin? %> + <%= render "shared/username_link", user: author, link_class: "feed-post-card__author", text: "@#{author_name}" %> <% else %> @stardancer <% end %> @@ -85,6 +84,24 @@

+ <% if deleted_devlog? %> +

This devlog was deleted<% if display_postable.deleted_at.present? %> on <%= l(display_postable.deleted_at.to_date, format: :long) %><% end %>.

+ <% end %> + + <% if devlog? && hackatime_breakdown_url.present? %> + <%= helpers.admin_tool do %> +
+ Hackatime breakdown + <%= helpers.turbo_frame_tag dom_id(postable, :hackatime_breakdown), + src: hackatime_breakdown_url, + loading: :lazy, + class: "feed-post-card__hackatime-frame" do %> +

Loading…

+ <% end %> +
+ <% end %> + <% end %> + <% if fire_event? %>
@@ -293,3 +310,12 @@ <% end %>
+<% end %> + +<% if deleted_devlog? %> + <%= helpers.admin_tool(roles: [ :fraud_dept ]) do %> + <%= card_content %> + <% end %> +<% else %> + <%= card_content %> +<% end %> diff --git a/app/components/posts/card_component.rb b/app/components/posts/card_component.rb index 2ef9a764b..01fcddeb6 100644 --- a/app/components/posts/card_component.rb +++ b/app/components/posts/card_component.rb @@ -34,6 +34,13 @@ def devlog? display_post&.postable_type == "Post::Devlog" end + # True when this card is only visible because the viewer has permission + # to see deleted devlogs (admin/fraud_dept, see ApplicationPolicy#view_deleted_devlogs?) + # — the devlog itself has been soft-deleted. + def deleted_devlog? + devlog? && display_postable.respond_to?(:deleted?) && display_postable.deleted? + end + def repost? post.postable_type == "Post::Repost" end @@ -252,6 +259,12 @@ def delete_url end end + def hackatime_breakdown_url + if devlog? && project.present? + helpers.hackatime_breakdown_project_devlog_path(project, postable) + end + end + def post_menu_data { controller: "post-menu", diff --git a/app/components/sidebar_component.html.erb b/app/components/sidebar_component.html.erb index 059cd7aae..33e163311 100644 --- a/app/components/sidebar_component.html.erb +++ b/app/components/sidebar_component.html.erb @@ -68,9 +68,13 @@ <%= helpers.stardust_icon(extra_class: "sidebar__user-balance-icon") %> <%= number_with_delimiter(user.cached_balance) %> - <%= link_to profile_path(user.display_name), class: "sidebar__user-meta-handle", data: { turbo: true } do %> - @<%= user.display_name %> - <% end %> +
+ <%= link_to profile_path(user.display_name), class: "sidebar__user-meta-handle", data: { turbo: true } do %> + @<%= user.display_name %> + <% end %> + <%= helpers.admin_tool(compact: true) do %><%= link_to "🔨", helpers.admin_user_path(user), class: "username-link__admin", "aria-label": "View #{user.display_name} in admin" %><% end %> + <%= helpers.admin_tool(compact: true) do %>#<%= user.id %><% end %> +
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 6d12f6f6e..3bc9ce5a0 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -9,7 +9,10 @@ def index users = users.where("email ILIKE ? OR display_name ILIKE ? OR slack_id ILIKE ?", q, q, q) end - @pagy, @users = pagy(:offset, users.order(:id)) + # Pin the viewing admin's own row to the top of the (first page of the) list. + users = users.order(Arel.sql(User.sanitize_sql_array([ "(id = ?) DESC", current_user.id ]))).order(:id) + + @pagy, @users = pagy(:offset, users) end def show diff --git a/app/controllers/projects/devlogs_controller.rb b/app/controllers/projects/devlogs_controller.rb index 4a6de33ff..63bcf2641 100644 --- a/app/controllers/projects/devlogs_controller.rb +++ b/app/controllers/projects/devlogs_controller.rb @@ -3,6 +3,7 @@ class Projects::DevlogsController < ApplicationController before_action :set_project before_action :set_devlog, only: %i[show edit update destroy versions] + before_action :set_devlog_including_deleted, only: %i[hackatime_breakdown] before_action :require_hackatime_project, only: %i[create] before_action :sync_hackatime_projects, only: %i[create] @@ -148,6 +149,12 @@ def versions @versions = @devlog.versions.order(version_number: :desc) end + def hackatime_breakdown + authorize @devlog + @breakdown = @devlog.hackatime_project_breakdown + render layout: false + end + private def set_project @@ -161,6 +168,24 @@ def set_devlog .postable end + # Post::Devlog has its own default_scope (SoftDeletable) — .postable on a + # deleted devlog's Post would otherwise silently return nil (default_scope + # applies to the preloader/association fetch regardless of the Post row + # itself being found), which then blows up `authorize` with + # Pundit::NotDefinedError for nil. Only used by hackatime_breakdown, which + # is already admin-only (Post::DevlogPolicy#hackatime_breakdown?) — unlike + # set_devlog's other callers (show, edit, ...), whose policies don't check + # deleted status themselves and rely on set_devlog silently failing to find + # deleted records as their only protection. + def set_devlog_including_deleted + @devlog = Post::Devlog.unscoped do + @project.posts + .where(postable_type: "Post::Devlog") + .find_by!(postable_id: params[:id]) + .postable + end + end + def require_hackatime_project return if test_time_granted? diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 626bb1785..789d72f53 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -39,7 +39,8 @@ def prepare_project_show_context @members = @project.users.where(banned: false).to_a @is_member = current_user && @members.include?(current_user) @active_nav_slug = @is_member ? "projects" : "home" - @can_edit_project = @is_member && policy(@project).update? + @can_edit_project = policy(@project).update? + @admin_editing_project = !@is_member && current_user&.admin? @follower_count = @project.project_follows.size @viewer_follow = current_user && @project.project_follows.find_by(user_id: current_user.id) @total_hours = (@project.duration_seconds / 3600.0).round @@ -90,9 +91,19 @@ def prepare_project_show_context scope = scope.joins("LEFT JOIN post_devlogs ON posts.postable_type = 'Post::Devlog' AND posts.postable_id = post_devlogs.id") .where("posts.postable_type != 'Post::Devlog' OR post_devlogs.deleted_at IS NULL") end - posts = scope.select { |post| post.postable.present? } - preload_timeline_postables(posts, project_context: true) - posts + + build_posts = -> { + posts = scope.select { |post| post.postable.present? } + preload_timeline_postables(posts, project_context: true) + posts + } + + # Post::Devlog has its own default_scope (SoftDeletable), which the + # preloader above respects regardless of the SQL filter toggled just + # above — without unscoping, a deleted devlog's postable silently + # comes back nil and gets dropped, even when the viewer is authorized + # to see it. + include_deleted_devlogs ? Post::Devlog.unscoped(&build_posts) : build_posts.call } @posts = if policy(@project).view_deleted_devlogs? @@ -329,11 +340,16 @@ def edit def update authorize @project - @project.assign_attributes(project_params) - validate_urls - success = @project.errors.empty? && @project.save + whodunnit = impersonating? ? real_user&.id : current_user&.id + success = nil - link_hackatime_projects if success + PaperTrail.request(whodunnit: whodunnit) do + @project.assign_attributes(project_params) + validate_urls + success = @project.errors.empty? && @project.save + + link_hackatime_projects if success + end # 2nd check w/ @project.errors.empty? is not redudant. this is ensures that hackatime is linked! if success && @project.errors.empty? respond_to do |format| diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 784412a41..466ec2159 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -21,24 +21,28 @@ def show end def update - if @user.update(user_params) - respond_to do |format| - format.turbo_stream do - flash.now[:notice] = "Profile updated." - render turbo_stream: turbo_stream.update("flash-region", partial: "shared/flash") + whodunnit = impersonating? ? real_user&.id : current_user&.id + + PaperTrail.request(whodunnit: whodunnit) do + if @user.update(user_params) + respond_to do |format| + format.turbo_stream do + flash.now[:notice] = "Profile updated." + render turbo_stream: turbo_stream.update("flash-region", partial: "shared/flash") + end + format.html { redirect_to profile_path(@user.display_name), notice: "Profile updated." } end - format.html { redirect_to profile_path(@user.display_name), notice: "Profile updated." } - end - else - respond_to do |format| - format.turbo_stream do - flash.now[:alert] = @user.errors.full_messages.to_sentence - render turbo_stream: turbo_stream.update("flash-region", partial: "shared/flash"), status: :unprocessable_entity - end - format.html do - flash.now[:alert] = @user.errors.full_messages.to_sentence - load_profile("feed") - render :show, status: :unprocessable_entity + else + respond_to do |format| + format.turbo_stream do + flash.now[:alert] = @user.errors.full_messages.to_sentence + render turbo_stream: turbo_stream.update("flash-region", partial: "shared/flash"), status: :unprocessable_entity + end + format.html do + flash.now[:alert] = @user.errors.full_messages.to_sentence + load_profile("feed") + render :show, status: :unprocessable_entity + end end end end @@ -91,6 +95,8 @@ def profile_projects end def profile_activity + can_view_deleted_devlogs = policy(@user).view_deleted_devlogs? + scope = Post.left_outer_joins(:project) .where("projects.deleted_at IS NULL OR posts.postable_type = ?", "Post::Repost") .visible_to(current_user) @@ -98,13 +104,21 @@ def profile_activity .preload(:postable) .order(created_at: :desc) - scope = hide_deleted_devlogs(scope) unless policy(@user).view_deleted_devlogs? + scope = hide_deleted_devlogs(scope) unless can_view_deleted_devlogs scope = hide_deleted_reposts(scope) scope = hide_rejected_ships(scope) - @pagy, posts = pagy(:offset, scope, limit: ACTIVITY_LIMIT) - preload_timeline_postables(posts) - posts.select { |post| !post.repost? || post.visible_repost_original_for?(current_user) } + build_posts = -> { + @pagy, posts = pagy(:offset, scope, limit: ACTIVITY_LIMIT) + preload_timeline_postables(posts) + posts.select { |post| !post.repost? || post.visible_repost_original_for?(current_user) } + } + + # Post::Devlog has its own default_scope (SoftDeletable), which the + # preload above respects regardless of hide_deleted_devlogs — without + # unscoping, a deleted devlog's postable silently comes back nil and + # never renders, even when the viewer is authorized to see it. + can_view_deleted_devlogs ? Post::Devlog.unscoped(&build_posts) : build_posts.call end def hide_deleted_devlogs(scope) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 28a1778d0..a0831dca1 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -43,10 +43,27 @@ def onboarding_count_up(n) data: { controller: "count-up", count_up_target_value: n }) end - def admin_tool(&block) - if current_user&.admin? - content_tag(:div, class: "admin tools-do", &block) - end + # compact: true renders an inline with no dashed box, for markers + # that sit inside a line of text (e.g. a username byline) rather than + # wrapping a standalone block of debug content. + # + # roles: lets specific call sites (e.g. the "view in admin" hammer link) + # opt additional roles into an otherwise admin-only marker, without + # loosening every other admin_tool usage (comment delete, super star + # controls, profile/project edit) to those roles too. + # + # Uses real_user rather than current_user while impersonating, so the + # admin retains their own debug tooling instead of losing it to whatever + # role the impersonated account happens to have. + def admin_tool(compact: false, extra_class: nil, roles: [], &block) + acting_user = impersonating? ? real_user : current_user + allowed = acting_user&.admin? || roles.any? { |role| acting_user&.has_role?(role) } + return unless allowed && Flipper.enabled?(:shigimi_eyes, acting_user) + + classes = [ "admin", "tools-do" ] + classes << "tools-do--inline" if compact + classes << extra_class if extra_class.present? + content_tag(compact ? :span : :div, class: classes.join(" "), &block) end def sign(num) diff --git a/app/models/post/devlog.rb b/app/models/post/devlog.rb index 937d57d3b..5c623ca68 100644 --- a/app/models/post/devlog.rb +++ b/app/models/post/devlog.rb @@ -131,6 +131,41 @@ def body_at_version(version_number) result end + # Best-effort per-Hackatime-project time split for this devlog's logged + # window — admin-only debug info (see Posts::CardComponent). There's no + # persisted per-project breakdown (duration_seconds is one aggregate total), + # so this reconstructs it live: one Hackatime API call per project key that + # was linked at devlog-creation time, scoped to the same window duration_seconds + # was originally computed from. Cached indefinitely once computed, since a + # past devlog's time window never changes. + def hackatime_project_breakdown + keys = hackatime_projects_key_snapshot.to_s.split(",").map(&:strip).reject(&:blank?) + return [] if keys.empty? || hackatime_projects_key_snapshot == "test" + + author = post&.user + hackatime_uid = author&.hackatime_identity&.uid + return [] if hackatime_uid.blank? + + project = post.project + return [] unless project + + Rails.cache.fetch([ "devlog_hackatime_breakdown", id ], expires_in: 30.days) do + access_token = author.hackatime_identity&.access_token + window_start = project.devlog_window_start(created_at) + + breakdown = keys.map do |key| + seconds = HackatimeService.fetch_total_seconds_for_projects( + hackatime_uid, [ key ], start_date: window_start.iso8601, end_date: created_at.iso8601, access_token: access_token + ).to_i + { name: key, seconds: seconds } + end + + total = breakdown.sum { |b| b[:seconds] } + breakdown.each { |b| b[:percent] = total.positive? ? (b[:seconds] * 100.0 / total).round(1) : 0.0 } + breakdown.sort_by { |b| -b[:seconds] } + end + end + private def handle_post_creation diff --git a/app/policies/post/devlog_policy.rb b/app/policies/post/devlog_policy.rb index 2209c3692..4e1c7555b 100644 --- a/app/policies/post/devlog_policy.rb +++ b/app/policies/post/devlog_policy.rb @@ -31,6 +31,10 @@ def versions? owns? end + def hackatime_breakdown? + user&.admin? + end + private def owns? diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb index e7ee6ec0f..63dcde7f7 100644 --- a/app/policies/user_policy.rb +++ b/app/policies/user_policy.rb @@ -4,7 +4,7 @@ def show? end def update? - user.present? && user.id == record.id + user.present? && (user.id == record.id || user.admin?) end def follow? diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb index dfbe8e892..2826bf1e0 100644 --- a/app/views/admin/users/index.html.erb +++ b/app/views/admin/users/index.html.erb @@ -33,7 +33,10 @@ <% @users.each do |user| %> <%= user.id %> - <%= link_to user.display_name, admin_certification_reports_path(reporter_id: user.id) %> + + <%= link_to user.display_name, admin_certification_reports_path(reporter_id: user.id) %> + <% if user == current_user %>(you)<% end %> + <% if policy(user).view_email? %> <%= user.email %> <% end %> diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb index 64674c4c4..386c390bb 100644 --- a/app/views/comments/_comment.html.erb +++ b/app/views/comments/_comment.html.erb @@ -4,18 +4,28 @@ <%= image_tag comment.user.avatar, alt: "", class: "devlog-comment__avatar" %> <% end %>
- <%= link_to "@#{comment.user.display_name}", profile_path(comment.user.display_name), class: "devlog-comment__author" %><%= render StreakBadgeComponent.new(user: comment.user) %><%= " ⚡" if comment.user.admin? %> + <%= render "shared/username_link", user: comment.user, link_class: "devlog-comment__author" %>
<% if policy(comment).destroy? %> - <%= button_to devlog_comment_path(comment.commentable, comment), - method: :delete, - class: "devlog-comment__delete", - form: { onsubmit: "return confirm('Delete this comment?')" }, - aria: { label: "Delete comment" } do %> - × + <% delete_button = capture do %> + <%= button_to devlog_comment_path(comment.commentable, comment), + method: :delete, + class: "devlog-comment__delete", + form: { onsubmit: "return confirm('Delete this comment?')" }, + aria: { label: "Delete comment" } do %> + × + <% end %> + <% end %> + + <% if comment.user == current_user %> + <%= delete_button %> + <% else %> + <%= admin_tool do %> + <%= delete_button %> + <% end %> <% end %> <% end %>
diff --git a/app/views/daily_rolls/leaderboard.html.erb b/app/views/daily_rolls/leaderboard.html.erb index 1171c8889..f9badab66 100644 --- a/app/views/daily_rolls/leaderboard.html.erb +++ b/app/views/daily_rolls/leaderboard.html.erb @@ -54,7 +54,7 @@
"> <%= index.zero? ? "★" : "##{index + 1}" %> <%= image_tag roll.user.avatar, alt: "", class: "rng-board__pedestal-avatar" %> - <%= link_to roll.user.display_name, profile_path(roll.user.display_name), class: "rng-board__pedestal-name" %> + <%= render "shared/username_link", user: roll.user, link_class: "rng-board__pedestal-name", text: roll.user.display_name, badge: false %> <% if current_user&.id == roll.user_id %>you<% end %> <%= formatted_roll_value(roll.total) %>
@@ -99,7 +99,7 @@ <% if @record %>

All-time best: - <%= link_to @record.user.display_name, profile_path(@record.user.display_name), class: "rng-board__alltime-name" %> + <%= render "shared/username_link", user: @record.user, link_class: "rng-board__alltime-name", text: @record.user.display_name, badge: false %> <%= formatted_roll_value(@record.total) %> on <%= link_to rng_date_label(@record.rolled_on, today: @today), rng_date_path(@record.rolled_on, today: @today), class: "rng-board__alltime-date" %>

diff --git a/app/views/leaderboard/_row.html.erb b/app/views/leaderboard/_row.html.erb index cc888e93c..8af41b95c 100644 --- a/app/views/leaderboard/_row.html.erb +++ b/app/views/leaderboard/_row.html.erb @@ -10,8 +10,7 @@

- <%= link_to user.display_name, profile_path(user.display_name), - class: "leaderboard-row__name-link" %><%= render StreakBadgeComponent.new(user: user) %><%= " ⚡" if user.admin? %> + <%= render "shared/username_link", user: user, link_class: "leaderboard-row__name-link", text: user.display_name %> <% if is_current_user %> YOU <% end %> diff --git a/app/views/notifications/inbox/_actor.html.erb b/app/views/notifications/inbox/_actor.html.erb index 9e3edb516..004cb24c3 100644 --- a/app/views/notifications/inbox/_actor.html.erb +++ b/app/views/notifications/inbox/_actor.html.erb @@ -1,7 +1,7 @@ <%# The notification's actor as a profile link, or a fallback label when the actor is missing (e.g. a deleted account). Pass `fallback:` to override. %> <% if notification.actor %> - <%= link_to "@#{notification.actor.display_name}", user_path(notification.actor), class: "notifications-item__actor" %><%= render StreakBadgeComponent.new(user: notification.actor) %><%= " ⚡" if notification.actor.admin? %> + <%= render "shared/username_link", user: notification.actor, link_class: "notifications-item__actor" %> <% else %> <%= local_assigns.fetch(:fallback, "Someone") %> <% end %> diff --git a/app/views/projects/_ship_card.html.erb b/app/views/projects/_ship_card.html.erb index 4274fb2dc..8a203d3cc 100644 --- a/app/views/projects/_ship_card.html.erb +++ b/app/views/projects/_ship_card.html.erb @@ -89,10 +89,8 @@

<% if author %> - <%= link_to "@#{author.display_name}", - profile_path(author.display_name), - class: "feed-post-card__author", - data: { turbo_frame: "_top", turbo_prefetch: "true" } %><%= render StreakBadgeComponent.new(user: author) %><%= " ⚡" if author.admin? %> + <%= render "shared/username_link", user: author, link_class: "feed-post-card__author", + data: { turbo_frame: "_top", turbo_prefetch: "true" } %> <% end %> on <%= link_to project.title, project_path(project), class: "feed-post-card__project", data: { turbo_frame: "_top" } %> diff --git a/app/views/projects/_ship_decision_card.html.erb b/app/views/projects/_ship_decision_card.html.erb index 519a21951..40a3d35fa 100644 --- a/app/views/projects/_ship_decision_card.html.erb +++ b/app/views/projects/_ship_decision_card.html.erb @@ -30,10 +30,8 @@

<% if reviewer_name %> - <%= link_to "@#{reviewer_name}", - profile_path(reviewer_name), - class: "feed-post-card__author", - data: { turbo_frame: "_top" } %> + <%= render "shared/username_link", user: reviewer, link_class: "feed-post-card__author", + data: { turbo_frame: "_top" }, badge: false %> <% else %> Shipwrights <% end %> diff --git a/app/views/projects/devlogs/hackatime_breakdown.html.erb b/app/views/projects/devlogs/hackatime_breakdown.html.erb new file mode 100644 index 000000000..23ff1f403 --- /dev/null +++ b/app/views/projects/devlogs/hackatime_breakdown.html.erb @@ -0,0 +1,15 @@ +<%= turbo_frame_tag dom_id(@devlog, :hackatime_breakdown) do %> + <% if @breakdown.blank? %> +

No Hackatime project data available for this devlog.

+ <% else %> +
    + <% @breakdown.each do |entry| %> +
  • + <%= entry[:name] %> + <%= entry[:percent] %>% + (<%= format_seconds(entry[:seconds]) %>) +
    • + <% end %> +
+ <% end %> +<% end %> diff --git a/app/views/projects/devlogs/show.html.erb b/app/views/projects/devlogs/show.html.erb index 4bd2ab6a4..c2a9a6e7f 100644 --- a/app/views/projects/devlogs/show.html.erb +++ b/app/views/projects/devlogs/show.html.erb @@ -11,6 +11,7 @@
+ <%= render "shared/inspector", record: @devlog %>