Merge pull request #113 from loftwah/dl/users-fix-2

Dl/users fix 2
loftwah · Sep 6, 2024 · 15736df · 15736df
2 parents 68e7244 + 91a595b
commit 15736df
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
@@ -5,28 +5,24 @@
     <% @users.each do |user| %>
       <div class="bg-gray-800 rounded-lg p-6 text-center shadow-md">
         <div class="mb-4">
-          <% avatar_path = "/avatars/#{user.username}_avatar#{File.extname(user.avatar || '')}" %>
-
-          <!-- Use local avatar if it exists, otherwise use the URL -->
           <%= link_to user_links_path(user.username), target: "_blank" do %>
-            <% if File.exist?(Rails.root.join('public' + avatar_path)) %>
-              <%= image_tag avatar_path, alt: user.email, class: "rounded-full object-cover w-24 h-24 mx-auto" %>
-            <% elsif user.avatar.present? %>
+            <% if user.avatar.present? %>
               <%= image_tag user.avatar, alt: user.email, class: "rounded-full object-cover w-24 h-24 mx-auto" %>
+            <% else %>
+              <%= image_tag "greg.jpg", alt: "Default Avatar", class: "rounded-full object-cover w-24 h-24 mx-auto" %>
             <% end %>
           <% end %>
         </div>
 
-        <!-- Link the username to the user's profile -->
         <h2 class="text-xl font-bold text-lime-300">
           <%= link_to user.full_name, user_links_path(user.username), target: "_blank", class: "hover:underline" %>
         </h2>
         <p class="text-gray-400">@<%= user.username %></p>
 
         <% if user.parsed_tags.any? %>
-          <div class="flex flex-wrap justify-center mt-4 space-x-2 space-y-2">
+          <div class="flex flex-wrap justify-center mt-4 -mx-1 -my-1">
             <% user.parsed_tags.each do |tag| %>
-              <span class="bg-gray-700 text-white rounded px-2 py-1 text-xs"><%= tag %></span>
+              <span class="bg-gray-700 text-white rounded px-2 py-1 text-xs m-1 inline-block min-w-[80px]"><%= tag %></span>
             <% end %>
           </div>
         <% end %>
@@ -39,4 +35,4 @@
       </div>
     <% end %>
   </div>
-</div>
+</div>
diff --git a/config/routes.rb b/config/routes.rb
@@ -38,5 +38,9 @@
   get '/:username/analytics', to: 'analytics#index', as: :user_analytics
 
   # Dynamic user-specific routes must be last to avoid conflicts with static routes
-  get '/:username(/:theme)', to: 'links#user_links', as: :user_links, constraints: { username: /(?!users).*/, theme: /retro|win95|win98/ }
-end
+  get '/:username(/:theme)', to: 'links#user_links', as: :user_links, 
+      constraints: { 
+        username: /(?!users|analytics|achievements|links|up|sidekiq)[a-zA-Z0-9_]+/, 
+        theme: /retro|win95|win98/ 
+      }
+end