+ <% if users_data_array.any? %>
+ <%
+ hour_label_width = 80
+ grid_width = hour_label_width + (users_data_array.count * (min_column_width_px + gutter_px))
+ grid_height = 120 + (24 * pixels_per_hour)
+ %>
-
- <% if users_data_array.any? %>
-
- <% end %>
-
-
-
- <%# Hour markers and lines (background grid) %>
- <% (timeline_start_hour..timeline_end_hour).each do |hour| %>
-
-
- <%= Time.utc(2000,1,1, hour).strftime("%-l:00 %p") %>
-
-
- <%# The actual line is styled to span the container using absolute positioning from CSS %>
-
+
+ <% (0..23).each do |hour| %>
+ <%
+ hour_top = 120 + (hour * pixels_per_hour)
+ formatted_hour = Time.utc(2000,1,1, hour).strftime("%-l:00 %p")
+ %>
+
+
+ <%= formatted_hour %>
<% end %>
-
- <%# Current Time Line Indicator %>
+
+ <% users_data_array.each_with_index do |data, index| %>
+ <%
+ user = data[:user]
+ total_coded_time_seconds = data[:total_coded_time]
+ column_left = hour_label_width + (index * (min_column_width_px + gutter_px))
+ trust_level_emoji = case user.respond_to?(:trust_level) ? user.trust_level : nil
+ when "red" then "๐ด"
+ when "green" then "๐ข"
+ when "yellow" then "๐ก"
+ else "๐ต"
+ end
+
+ trust_level_bg = case user.respond_to?(:trust_level) ? user.trust_level : nil
+ when "red" then "bg-red-500/20"
+ when "green" then "bg-green-500/20"
+ when "yellow" then "bg-yellow-500/20"
+ when "blue" then "bg-blue-500/20"
+ else "bg-gray-500/20"
+ end
+ %>
+
+
+
+
+ <%= render "shared/user_mention", user: user %>
+
+
+ <% if current_user && user != current_user && user.slack_uid.present? %>
+
+ <%= link_to "Slack", "slack://user?team=T0266FRGM&id=#{user.slack_uid}",
+ target: "_blank",
+ class: "text-xs text-blue-400 hover:text-blue-300 underline" %>
+
+ <% end %>
+ <% if user.respond_to?(:github_profile_url) && user.github_profile_url.present? %>
+
+ <%= link_to "Git", user.github_profile_url,
+ target: "_blank",
+ class: "text-xs text-green-400 hover:text-green-300 underline" %>
+
+ <% end %>
+
+ <%= trust_level_emoji %>
+
+ <% if current_user && current_user.admin? && user != current_user %>
+
+
+
+ <% end %>
+
+
+ <%= total_coded_time_seconds && total_coded_time_seconds > 0 ? "#{short_time_simple(total_coded_time_seconds)} coded" : "No time coded" %>
+
+
+
+ <%= user.timezone %>
+
+
+ <% end %>
+
<%
current_time_in_zone = Time.current.in_time_zone(primary_user_tz)
is_today = @date == Time.current.in_time_zone(primary_user_tz).to_date
show_current_time_line = is_today && current_time_in_zone.hour >= timeline_start_hour && current_time_in_zone.hour < (timeline_end_hour + 1)
if show_current_time_line
- minutes_from_timeline_display_start_for_now = (current_time_in_zone.hour - timeline_start_hour) * 60 + current_time_in_zone.min
- current_time_line_top_px = (minutes_from_timeline_display_start_for_now * pixels_per_minute)
+ minutes_from_timeline_start = (current_time_in_zone.hour - timeline_start_hour) * 60 + current_time_in_zone.min
+ current_time_line_top_px = 120 + (minutes_from_timeline_start * pixels_per_minute)
end
%>
<% if show_current_time_line %>
-
-
NOW
+
<% end %>
-
- <%# Logic for calculating span properties (remains mostly the same) %>
<%
calculate_span_properties = lambda do |span_data, span_user_tz|
return nil unless span_data && span_data[:start_time] && span_data[:duration]
@@ -254,7 +219,7 @@
duration_seconds_in_view = effective_end_time - effective_start_time
height_px = (duration_seconds_in_view / 60.0) * pixels_per_minute
return nil if height_px <= 0.5
- final_top_px = (minutes_from_view_start * pixels_per_minute).round
+ final_top_px = 120 + (minutes_from_view_start * pixels_per_minute).round
title_parts = []
title_parts << "Languages: #{span_data[:languages].join(', ')}" if span_data[:languages]&.any?
project_title_segments = (span_data[:projects_edited_details] || []).map do |proj_detail|
@@ -282,37 +247,31 @@
}
end
%>
-
- <%# Activity Spans %>
+
<% users_data_array.each_with_index do |data, index| %>
<%
user = data[:user]
user_spans = data[:spans]
block_color = user_colors[index % user_colors.length]
-
- # Calculate the base offset for this column (without the hour label padding)
- # This ensures evenly spaced columns considering gutters
- base_offset_px = index * min_column_width_px + (index > 0 ? index * gutter_px : 0)
-
- # Add the hour label padding to get the absolute left position
- current_span_column_left_px = (line_left_rem * 16) + base_offset_px
+ column_left = hour_label_width + (index * (min_column_width_px + gutter_px))
%>
<% Array(user_spans).each do |span_data| %>
<% props = calculate_span_properties.call(span_data, user.timezone || primary_user_tz) %>
<% next unless props %>
-
-
+
+ <% else %>
+
+
+
No users selected
+
Use the search bar above to add users to the timeline
+
+
+ <% end %>
+
+
+
+
+
+
Set Trust Level
+
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+
+
+
diff --git a/app/views/users/_timezone_leaderboard_toggle.html.erb b/app/views/users/_timezone_leaderboard_toggle.html.erb
index 898e929..a6572b9 100644
--- a/app/views/users/_timezone_leaderboard_toggle.html.erb
+++ b/app/views/users/_timezone_leaderboard_toggle.html.erb
@@ -1,11 +1,13 @@
-
-
- Regional & Timezone Leaderboards
- Access regional leaderboards that show users in your timezone region or specific timezone. Choose between timezone-specific, regional (UTC offset), or global competition modes.
-
- <%= form_with model: user, url: (@is_own_settings ? my_settings_path : settings_user_path(user)), method: :patch, local: false do |f| %>
- <%= f.check_box :default_timezone_leaderboard, checked: user.default_timezone_leaderboard, id: "user_default_timezone_leaderboard" %>
- <%= f.label :default_timezone_leaderboard, "Default to Timezone Leaderboard", for: "user_default_timezone_leaderboard" %>
- <%= f.submit "Save", role: "button" %>
- <% end %>
-
+<%= form_with model: user, url: (@is_own_settings ? my_settings_path : settings_user_path(user)), method: :patch, local: false, class: "space-y-4" do |f| %>
+
+ <%= f.check_box :default_timezone_leaderboard,
+ checked: user.default_timezone_leaderboard,
+ id: "user_default_timezone_leaderboard",
+ class: "w-4 h-4 text-primary border-gray-600 rounded focus:ring-primary bg-gray-800" %>
+ <%= f.label :default_timezone_leaderboard, "Default to Timezone Leaderboard",
+ for: "user_default_timezone_leaderboard",
+ class: "text-sm text-gray-200" %>
+
+
Access regional leaderboards that show users in your timezone region or specific timezone. Choose between timezone-specific, regional (UTC offset), or global competition modes.
+ <%= f.submit "Save", class: "w-full px-4 py-2 bg-primary text-white font-medium rounded-lg transition-colors duration-200" %>
+<% end %>
diff --git a/app/views/users/_wakatime_config_display.html.erb b/app/views/users/_wakatime_config_display.html.erb
index e2f6d42..6797825 100644
--- a/app/views/users/_wakatime_config_display.html.erb
+++ b/app/views/users/_wakatime_config_display.html.erb
@@ -1,5 +1,5 @@
<% if @user.api_keys.any? %>
-
+
# put this in your ~/.wakatime.cfg file
[settings]
@@ -7,10 +7,9 @@ api_url = https://<%= request.host_with_port %>/api/hackatime/v1
api_key = <%= @user.api_keys.last.token %>
heartbeat_rate_limit_seconds = 30
-# any other wakatime configs you want to add: https://github.com/wakatime/wakatime-cli/blob/develop/USAGE.md#ini-config-file
-
+# any other wakatime configs you want to add: https://github.com/wakatime/wakatime-cli/blob/develop/USAGE.md#ini-config-file
<% else %>
- No API keys found. Please migrate your keys from waka.hackclub.com below. New API key generation has yet to be implemented.
+No API keys found. Please migrate your keys from waka.hackclub.com below. New API key generation has yet to be implemented.
<% end %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index b3a2dd4..9de3072 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -2,358 +2,385 @@
<%= @is_own_settings ? "My Settings" : "Settings | #{@user.username}" %>
<% end %>
-<% content_for :body_class, "settings-page" %>
-
-
-