Skip to content

Update home page design #413

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

Open
FogadOg wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update home page design #413

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
9 changes: 6 additions & 3 deletions app/views/layouts/application.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@
</main>
<%= content_tag(:footer, class: class_names("print:hidden bottom-0 h-16 items-center flex flex-col gap-y-4 space-x-2 justify-center w-full text-center z-0", "fixed pb-8": user_signed_in?)) do %>
<%# TODO: Let's configure this the same way `flash_messages` are used in `base.html.erb`, let it be a shareable banner and trigger it with turbo %>
<%- if @active_time_reg %>
<%= render BannerComponent.new(title: "Notice", message: t("time_regs.active_timer_description"), variant: :warning, dismissible: false, action: { url: root_path(date: @active_time_reg.date_worked), method: :get }) %>
<% end %>

<div class="hidden md:flex">
<%- if @active_time_reg %>
<%= render BannerComponent.new(title: "Notice", message: t("time_regs.active_timer_description"), variant: :warning, dismissible: false, action: { url: root_path(date: @active_time_reg.date_worked), method: :get }) %>
<% end %>
</div>
<%= content_tag(:div, class: class_names("flex flex-row justify-between items-start lg:items-center w-full section-container py-4 gap-y-4": !user_signed_in?)) do %>
<span class="font-regular text-sm text-gray-600">Stemplin <%= Date.current.year %></span>
<%= content_tag(:div, class: class_names("flex flex-col lg:flex-row items-start justify-center gap-x-4", "hidden": user_signed_in?)) do %>
Expand Down
13 changes: 11 additions & 2 deletions app/views/time_regs/_time_reg.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<%= turbo_stream_from time_reg %>
<%= content_tag(:div, id: dom_id(time_reg), data: { controller: "refresh-minutes", refresh_minutes_active_value: time_reg.active?, refresh_minutes_minutes_value: time_reg.current_minutes, refresh_minutes_format_value: "H:mm" }, class: "shadow-sm rounded-md p-4 flex flex-col lg:flex-row lg:items-center lg:justify-between gap-y-4") do %>
<div class="flex flex-row gap-x-4">
<div class="bg-gray-50 border border-gray-100 rounded flex justify-center items-center w-12 h-12 relative">
<div class="bg-gray-50 border border-gray-100 rounded justify-center items-center w-12 h-12 relative hidden md:flex">
<i class="uc-icon text-lg text-gray-400">&#xe8bb;</i>
<% if time_reg.active? %>
<div class="absolute -bottom-2 -right-2 bg-yellow-500 rounded-full w-4 h-4 flex justify-center items-center">
Expand All @@ -18,7 +18,7 @@
<span class="font-bold text-lg"><%= time_reg.project.client.name %></span>
</div>
</div>
<div class="flex flex-row-reverse lg:flex-row items-center h-fit gap-2">
<div class="hidden md:flex flex-row-reverse lg:flex-row items-center h-fit gap-2">
<%= render RubyUI::Badge.new(variant: time_reg.is_zero_minutes? ? :red : :gray, class: "!rounded-full flex gap-x-1") do %>
<i class="uc-icon text-sm">&#xe8bb;</i>
<span data-refresh-minutes-target="minutes">
Expand Down Expand Up @@ -50,6 +50,15 @@
</div>
</div>
<div class="flex gap-x-4 justify-end">
<div class="flex md:hidden flex-row-reverse lg:flex-row items-center h-fit gap-2">
<%= render RubyUI::Badge.new(variant: time_reg.is_zero_minutes? ? :red : :gray, class: "!rounded-full flex gap-x-1") do %>
<i class="uc-icon text-sm">&#xe8bb;</i>
<span data-refresh-minutes-target="minutes">
<%= convert_time_int(time_reg.current_minutes) %>
</span>
<% end %>
</div>

<% if time_reg.date_worked != Date.today && !time_reg.active? %>
<%= render ButtonComponent.new(path: new_modal_time_regs_path(date: Date.today, assigned_task_id: time_reg.assigned_task_id, notes: time_reg.notes), method: :post, class: "gap-x-2", variant: :outline) do %>
<i class="uc-icon text-base">&#xe9c7;</i>
Expand Down
5 changes: 5 additions & 0 deletions app/views/time_regs/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<% content_for :title, t("common.home") %>

<%= render partial: "time_regs/top_nav" %>
<div class="md:hidden flex mt-2">
<%- if @active_time_reg %>
<%= render BannerComponent.new(title: "Notice", message: t("time_regs.active_timer_description"), variant: :warning, dismissible: false, action: { url: root_path(date: @active_time_reg.date_worked), method: :get }) %>
<% end %>
</div>
<%= render partial: "time_regs/main", locals: { chosen_date: @chosen_date } %>