Skip to content
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

attempt something #84

Merged
merged 1 commit into from
Sep 2, 2024
Merged

attempt something #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 21 additions & 21 deletions app/views/achievements/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
<%= form_with(model: achievement, local: true) do |form| %>
<%= form_with(model: achievement, local: true, class: "max-w-md mx-auto p-4 bg-gray-800 rounded-lg shadow-md") do |form| %>
<% if achievement.errors.any? %>
<div id="error_explanation" class="bg-red-100 border-l-4 border-red-500 text-red-700 p-4 mb-4">
<h2 class="font-bold"><%= pluralize(achievement.errors.count, 'error') %> prohibited this achievement from being saved:</h2>
<ul>
<div id="error_explanation" class="bg-red-100 border-l-4 border-red-500 text-red-700 p-4 mb-4 rounded">
<h2 class="font-bold mb-2"><%= pluralize(achievement.errors.count, 'error') %> prohibited this achievement from being saved:</h2>
<ul class="list-disc pl-5">
<% achievement.errors.full_messages.each do |message| %>
<li><%= message %></li>
<% end %>
</ul>
</div>
<% end %>

<div class="mb-4">
<%= form.label :title, class: 'block text-lime-200 mb-2' %>
<%= form.text_field :title, class: 'block w-full px-3 py-2 text-black' %>
<div class="mb-6">
<%= form.label :title, class: 'block text-lime-200 font-semibold mb-2' %>
<%= form.text_field :title, class: 'block w-full px-4 py-2 border border-gray-700 rounded bg-gray-900 text-white focus:outline-none focus:border-lime-500' %>
</div>

<div class="mb-4">
<%= form.label :date, class: 'block text-lime-200 mb-2' %>
<%= form.date_field :date, class: 'block w-full px-3 py-2 text-black' %>
<div class="mb-6">
<%= form.label :date, class: 'block text-lime-200 font-semibold mb-2' %>
<%= form.date_field :date, class: 'block w-full px-4 py-2 border border-gray-700 rounded bg-gray-900 text-white focus:outline-none focus:border-lime-500' %>
</div>

<div class="mb-4">
<%= form.label :url, class: 'block text-lime-200 mb-2' %>
<%= form.text_field :url, class: 'block w-full px-3 py-2 text-black' %>
<div class="mb-6">
<%= form.label :url, class: 'block text-lime-200 font-semibold mb-2' %>
<%= form.text_field :url, class: 'block w-full px-4 py-2 border border-gray-700 rounded bg-gray-900 text-white focus:outline-none focus:border-lime-500' %>
</div>

<div class="mb-4">
<%= form.label :description, class: 'block text-lime-200 mb-2' %>
<%= form.text_area :description, class: 'block w-full px-3 py-2 text-black' %>
<div class="mb-6">
<%= form.label :description, class: 'block text-lime-200 font-semibold mb-2' %>
<%= form.text_area :description, rows: 3, class: 'block w-full px-4 py-2 border border-gray-700 rounded bg-gray-900 text-white focus:outline-none focus:border-lime-500' %>
</div>

<div class="mb-4">
<%= form.label :icon, class: 'block text-lime-200 mb-2' %>
<%= form.text_field :icon, class: 'block w-full px-3 py-2 text-black' %>
<div class="mb-6">
<%= form.label :icon, class: 'block text-lime-200 font-semibold mb-2' %>
<%= form.text_field :icon, class: 'block w-full px-4 py-2 border border-gray-700 rounded bg-gray-900 text-white focus:outline-none focus:border-lime-500' %>
</div>

<div class="actions">
<%= form.submit 'Save', class: 'bg-lime-500 hover:bg-lime-700 text-white font-bold py-2 px-4 rounded' %>
<div class="actions text-center">
<%= form.submit 'Save', class: 'bg-lime-500 hover:bg-lime-700 text-white font-bold py-2 px-4 rounded transition duration-300 ease-in-out' %>
</div>
<% end %>
12 changes: 6 additions & 6 deletions app/views/links/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@
<% end %>
<ul class="space-y-4">
<% @links.each do |link| %>
<li class="bg-gray-800 p-4 rounded shadow-md">
<li class="bg-gray-800 p-4 rounded shadow-md max-w-full overflow-hidden">
<h2 class="text-xl text-lime-300 font-bold">
<%= link_to link, class: 'hover:underline' do %>
<% if link.icon.present? %>
<% if link.icon.present? %>
<i class="<%= link.icon %>"></i>
<% end %>
<%= link.title %>
<% end %>
</h2>
<p class="text-gray-400"><%= link.description %></p>
<p class="text-gray-500">URL: <a href="<%= link.url %>" class="text-lime-300 hover:underline" target="_blank"><%= link.url %></a></p>
<p class="text-gray-400 break-words"><%= link.description %></p>
<p class="text-gray-500 break-all">URL: <a href="<%= link.url %>" class="text-lime-300 hover:underline" target="_blank"><%= link.url %></a></p>
<p class="text-gray-500">Position: <%= link.position %></p>
<p class="text-gray-500">Created at: <%= link.created_at.strftime("%d %b %Y %H:%M") %></p>
<div class="mt-2">
<% if user_signed_in? && link.user == current_user %>
<%= link_to 'Edit', edit_link_path(link), class: 'text-lime-300 hover:text-lime-500' %> |
<%= form_with(model: link, method: :delete, class: 'inline') do |form| %>
<%= form.submit 'Delete', class: 'text-lime-300 hover:text-lime-500 bg-transparent border-none cursor-pointer', data: { confirm: 'Are you sure?' } %>
<% end %>
<%= form.submit 'Delete', class: 'text-lime-300 hover:text-lime-500 bg-transparent border-none cursor-pointer', data: { confirm: 'Are you sure?' } %>
<% end %>
<% end %>
</div>
</li>
Expand Down
60 changes: 30 additions & 30 deletions app/views/links/user_links.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,45 +2,46 @@

<div class="profile-header max-w-2xl mx-auto px-4 text-center">
<% if @user.banner_enabled && @user.banner.present? %>
<div class="w-full h-16 md:h-20 lg:h-24 relative overflow-hidden mb-2">
<%= image_tag @user.banner, class: "w-full h-full object-cover object-center" %>
<div class="w-full h-auto md:h-auto lg:h-auto relative overflow-hidden mb-2">
<%= image_tag @user.banner, class: "w-full h-full object-contain object-center" %>
</div>
<% end %>
<div class="avatar-container flex flex-col items-center <%= @user.banner_enabled && @user.banner.present? ? '-mt-16' : 'mt-8' %>">
<div class="avatar">
<% local_avatar_path = "/avatars/#{@user.username}_avatar#{File.extname(@user.avatar)}" %>
<% if File.exist?(Rails.root.join('public' + local_avatar_path)) %>
<%= image_tag local_avatar_path, alt: @user.email, class: "rounded-full object-cover #{avatar_border_class(@user.avatar_border)}", style: "width: 8rem; height: 8rem;" %>
<% elsif @user.avatar.present? %>
<%= image_tag @user.avatar, alt: @user.email, class: "rounded-full object-cover #{avatar_border_class(@user.avatar_border)}", style: "width: 8rem; height: 8rem;" %>
<% else %>
<%= image_tag "greg.jpg", alt: @user.email, class: "rounded-full object-cover #{avatar_border_class(@user.avatar_border)}", style: "width: 8rem; height: 8rem;" %>
<% end %>
<div class="flex flex-col items-center <%= @user.banner_enabled && @user.banner.present? ? '-mt-16' : 'mt-8' %>">
<div class="relative">
<% local_avatar_path = "/avatars/#{@user.username}_avatar#{File.extname(@user.avatar)}" %>
<% if File.exist?(Rails.root.join('public' + local_avatar_path)) %>
<%= image_tag local_avatar_path, alt: @user.email, class: "rounded-full object-cover border-4 #{avatar_border_class(@user.avatar_border)}", style: "width: 8rem; height: 8rem;" %>
<% elsif @user.avatar.present? %>
<%= image_tag @user.avatar, alt: @user.email, class: "rounded-full object-cover border-4 #{avatar_border_class(@user.avatar_border)}", style: "width: 8rem; height: 8rem;" %>
<% else %>
<%= image_tag "greg.jpg", alt: @user.email, class: "rounded-full object-cover border-4 #{avatar_border_class(@user.avatar_border)}", style: "width: 8rem; height: 8rem;" %>
<% end %>
</div>
</div>
</div>
<div class="user-info mt-4">
<h1 class="text-2xl font-bold text-white text-stroke"><%= @user.full_name %></h1>
<h2 class="text-xl font-bold text-white text-stroke"><%= @user.username %></h2>
<div class="tags flex flex-wrap justify-center mt-2">
<% @user.tags.each do |tag| %>
<span class="tag bg-gray-700 text-white rounded px-2 py-1 m-1"><%= tag %></span>
<% end %>
</div>

<div class="mt-4 text-center">
<h1 class="text-2xl font-bold text-white"><%= @user.full_name %></h1>
<h2 class="text-xl font-bold text-white"><%= @user.username %></h2>
<div class="flex flex-wrap justify-center mt-2">
<% @user.tags.each do |tag| %>
<span class="bg-gray-700 text-white rounded px-2 py-1 m-1"><%= tag %></span>
<% end %>
</div>
</div>

<% if @pinned_links.any? %>
<div class="pinned-links-section mt-4">
<div class="pinned-links flex flex-wrap justify-center">
<div class="mt-4">
<div class="flex flex-wrap justify-center">
<% @pinned_links.each do |link| %>
<%= link_to track_click_link_path(link), target: "_blank", class: 'icon-link bg-gray-800 p-3 m-1' do %>
<%= link_to track_click_link_path(link), target: "_blank", class: 'bg-gray-800 p-3 m-1 rounded' do %>
<i class="<%= link.icon %> text-lime-300"></i>
<% end %>
<% end %>
</div>
</div>
<% end %>
<div class="description pb-4 text-center">

<div class="pb-4 text-center">
<p class="text-lg text-white"><%= auto_link_urls(@user.description) %></p>
</div>
</div>
Expand All @@ -61,11 +62,10 @@
</ul>
</div>

<!-- Hidden data for JavaScript to access -->
<div id="hidden-links-data" style="display: none;" data-hidden-links="<%= @hidden_links.to_json %>"></div>

<% if @achievements.present? %>
<div class="achievements-section max-w-4xl mx-auto mt-12 text-center">
<div class="max-w-4xl mx-auto mt-12 text-center">
<h2 class="text-2xl font-bold pt-2 pb-2 text-white">Achievements</h2>
<ul class="space-y-4">
<% @achievements.each do |achievement| %>
Expand All @@ -87,15 +87,15 @@
</ul>
</div>
<% else %>
<div class="achievements-section max-w-4xl mx-auto mt-12 text-center">
<div class="max-w-4xl mx-auto mt-12 text-center">
<p class="text-gray-500">No achievements to display.</p>
</div>
<% end %>

<% if @user.public_analytics %>
<div class="analytics-link text-center mt-8 mb-4">
<div class="text-center mt-8 mb-4">
<%= link_to user_analytics_path(@user.username), class: 'text-gray-400 hover:text-lime-300 text-sm' do %>
<i class="fas fa-chart-line"></i> View Analytics
<% end %>
</div>
<% end %>
<% end %>
Loading