Skip to content

Commit

Permalink
UI fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergio-e committed Jul 24, 2024
1 parent fc8767f commit 6bdd4ff
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 47 deletions.
3 changes: 0 additions & 3 deletions app/assets/images/Intersect.svg

This file was deleted.

File renamed without changes
File renamed without changes
2 changes: 1 addition & 1 deletion app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<div class="flex justify-center w-full py-6 mx-auto border-b border-b-white bg-purple-dark">
<div class="flex max-w-screen-sm px-5">
<%= link_to homepage_link do %>
<%= inline_svg_tag("main-logo.svg", class: "w-full") %>
<%= inline_svg_tag("main_logo.svg", class: "w-full") %>
<% end %>
</div>
</div>
Expand Down
84 changes: 42 additions & 42 deletions app/views/profiles/show.html.erb
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
<div class="flex flex-col items-center bg-gray-8 relative min-h-screen justify-between ">
<div class="flex flex-col items-center bg-cover bg-bottom bg-no-repeat max-h-[430px] w-full pt-6 px-5 pb-12 max-w-screen-sm" style="background-image: url(<%= asset_path 'background_design.svg' %>)">
<div class="flex flex-col items-start z-10">
<div class="flex flex-row items-center">
<% if @profile.image.attached? %>
<div class="flex flex-col items-center justify-center relative w-[120px] h-[120px] rounded-full">
<%= image_tag url_for(@profile.image), class: "absolute" %>
</div>
<% else %>
<div class="w-[120px] h-[120px] rounded-full bg-slate-300 p-5 flex flex-row items-center justify-center">
<%= image_tag url_for("user_avatar.svg") %>
</div>
<% end %>
<div class="flex flex-col items-start ml-5">
<div class="text-red text-xl font-black"> <%= @profile.name.presence || "Anonymous" %> </div>
<% if @profile.location.present? %>
<div class="text-lg"><%= @profile.location %></div>
<% end %>
</div>
</div>
<% if @profile.bio.present? %>
<p class="text-base font-medium mt-6"><%= @profile.bio %></p>
<% end %>
<div class="flex flex-row items-center justify-center gap-4">
<% if @profile.github_url.present? %>
<a href="<%= @profile.github_url %>" class="flex flex-row items-center justify-center w-28 h-14 rounded-lg bg-red mt-6">
<img src="<%= asset_path 'github.svg' %>" alt="github" class="w-6 h-6">
</a>
<% end %>
<% if @profile.linkedin_url.present? %>
<a href="<%= @profile.linkedin_url %>" class="flex flex-row items-center justify-center w-28 h-14 rounded-lg bg-red mt-6">
<img src="<%= asset_path 'linkedin.svg' %>" alt="linkedin" class="w-6 h-6">
</a>
<% end %>
<% if @profile.twitter_url.present? %>
<a href="<%= @profile.twitter_url %>" class="flex flex-row items-center justify-center w-28 h-14 rounded-lg bg-red mt-6">
<img src="<%= asset_path 'twitter.svg' %>" alt="twitter" class="w-6 h-6">
</a>
<% end %>
</div>
<div class="flex flex-col items-center bg-cover bg-bottom bg-no-repeat max-h-[430px] w-full pt-6 px-5 pb-12 max-w-screen-sm" style="background-image: url(<%= asset_path 'background_design.svg' %>)">
<div class="flex flex-col items-start z-10">
<div class="flex flex-row items-center">
<% if @profile.image.attached? %>
<div class="flex flex-col items-center justify-center relative w-[120px] h-[120px] rounded-full">
<%= image_tag url_for(@profile.image), class: "absolute" %>
</div>
<% else %>
<div class="w-[120px] h-[120px] rounded-full bg-slate-300 p-5 flex flex-row items-center justify-center">
<%= image_tag url_for("user_avatar.svg") %>
</div>
<% end %>
<div class="flex flex-col items-start ml-5">
<div class="text-red text-xl font-black italic"> <%= @profile.name.presence || "Anonymous" %> </div>
<% if @profile.location.present? %>
<div class="text-lg"><%= @profile.location %></div>
<% end %>
</div>
</div>
<% if @profile.bio.present? %>
<p class="text-base font-medium mt-6"><%= @profile.bio %></p>
<% end %>
<div class="flex flex-row items-center justify-center gap-4">
<% if @profile.github_url.present? %>
<a href="<%= @profile.github_url %>" class="flex flex-row items-center justify-center w-28 h-14 rounded-lg bg-red mt-6">
<img src="<%= asset_path 'github.svg' %>" alt="github" class="w-6 h-6">
</a>
<% end %>
<% if @profile.linkedin_url.present? %>
<a href="<%= @profile.linkedin_url %>" class="flex flex-row items-center justify-center w-28 h-14 rounded-lg bg-red mt-6">
<img src="<%= asset_path 'linkedin.svg' %>" alt="linkedin" class="w-6 h-6">
</a>
<% end %>
<% if @profile.twitter_url.present? %>
<a href="<%= @profile.twitter_url %>" class="flex flex-row items-center justify-center w-28 h-14 rounded-lg bg-red mt-6">
<img src="<%= asset_path 'twitter.svg' %>" alt="twitter" class="w-6 h-6">
</a>
<% end %>
</div>
</div>
<div class="p-4 flex flex-col items-center gap-4 w-full">
<%= link_to 'Edit Profile', edit_profile_path, class: "text-red font-bold rounded-sm underline italic text-lg" %>
</div>
</div>
<div class="p-4 flex flex-col items-center gap-4 w-full">
<%= link_to 'Edit Profile', edit_profile_path, class: "text-red font-bold rounded-sm underline italic text-lg" %>
</div>
</div>
2 changes: 1 addition & 1 deletion app/views/sessions/new.html.erb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="flex flex-col items-center flex-1 px-5 py-10 bg-purple-dark">
<%= form_with model: @user, url: session_path, class: "flex flex-col h-full justify-between w-full max-w-screen-sm" do |form| %>
<div class="flex flex-col items-center">
<%= inline_svg_tag("main-logo-with-date.svg", class: "w-full mb-10") %>
<%= inline_svg_tag("main_logo_with_date.svg", class: "w-full mb-10") %>
<div class="flex flex-col items-center mb-10">
<h1 class="mb-4 text-4xl italic font-black text-white">Welcome!</h1>
<h3 class="text-lg font-bold text-white">Please log in to continue</h3>
Expand Down

0 comments on commit 6bdd4ff

Please sign in to comment.