Skip to content

Commit

Permalink
kanban cards optimization
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelfolaron committed Jan 16, 2025
1 parent 84b2a96 commit 000c1a3
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 19 deletions.
31 changes: 16 additions & 15 deletions app/Domain/Tickets/Templates/components/cards/ticket-card.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
'statuses' => [],
'id' => '',
'showProject' => true,
'type' => 'full'
])

@if(empty($id) === false)
Expand All @@ -26,10 +27,10 @@
<x-global::content.card>
<div class="flex">
<div class="ticket-title leading-none">
@if(filter_var($showProject, FILTER_VALIDATE_BOOLEAN))
@if($type !== 'kanban')
<small>{{ $ticket['projectName'] }}</small><br/>
@endif
<div class="join">
<div class="join pt-sm">
@if ($ticket['dependingTicketId'] > 0)
<a href="#/tickets/showTicket/{{ $ticket['dependingTicketId'] }}"
class="join-item link link-primary link-hover">{{ $ticket['parentHeadline'] }}</a>
Expand All @@ -41,19 +42,21 @@ class="join-item link link-primary link-hover"><strong>{{ $ticket['headline'] }}
</div>
</div>
<div class="timerContainer flex flex-auto justify-end" id="timerContainer-{{ $ticket['id'] }}">
<div class="scheduler btn btn-sm btn-ghost btn-circle">
@if( $ticket['editFrom'] != "0000-00-00 00:00:00" && $ticket['editFrom'] != "1969-12-31 00:00:00")
<x-global::content.icon icon="event_available" class="text-accent text-lg" data-tippy-content="{{ __('text.schedule_to_start_on') }} {{ format($ticket['editFrom'])->date() }}"/>
@else
<x-global::content.icon icon="event_busy" class="text-accent text-lg" data-tippy-content="{{ __('text.not_scheduled_drag_ai') }}" />
@endif
</div>
@if($type !== 'kanban')
<div class="scheduler btn btn-sm btn-ghost btn-circle">
@if( $ticket['editFrom'] != "0000-00-00 00:00:00" && $ticket['editFrom'] != "1969-12-31 00:00:00")
<x-global::content.icon icon="event_available" class="text-accent text-lg" data-tippy-content="{{ __('text.schedule_to_start_on') }} {{ format($ticket['editFrom'])->date() }}"/>
@else
<x-global::content.icon icon="event_busy" class="text-accent text-lg" data-tippy-content="{{ __('text.not_scheduled_drag_ai') }}" />
@endif
</div>
@endif
@include("tickets::includes.ticketsubmenu", ["ticket" => $ticket, "onTheClock" => $timer])
</div>
</div>

<div class="row">
<div class="col-md-4">
<div class="flex {{ ($type === 'kanban') ? 'flex-col' : '' }} ">
<div class="flex flex-grow justify-start">

<x-tickets::chips.duedate :ticket="(object)$ticket" variant="chip" content-role="link" />

Expand All @@ -64,8 +67,8 @@ class="join-item link link-primary link-hover"><strong>{{ $ticket['headline'] }}
{{-- value="{{ format($ticket['dateToFinish'])->date(__('text.anytime')) }}"--}}
{{-- class="duedates secretInput" data-id="{{ $ticket['id'] }}" name="date" />--}}
</div>
<div class="col-md-8 mt-[3px]">
<div class="flex justify-end gap-x-xs">

<div class="flex flex-grow flex-wrap {{ ($type === 'kanban') ? 'justify-start' : 'justify-end' }} gap-x-xs">

<x-tickets::chips.priority-select
:priorities="$priorities"
Expand Down Expand Up @@ -167,8 +170,6 @@ class="join-item link link-primary link-hover"><strong>{{ $ticket['headline'] }}
{{-- @endforeach--}}
{{-- </x-slot:menu>--}}
{{-- </x-global::actions.dropdown>--}}

</div>
</div>
</div>
</x-global::content.card>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
:milestones="$milestones"
:users="$users"
:onTheClock="$onTheClock"
show-project="false" />
type="kanban" />
@endif
@endforeach
</div>
Expand Down
3 changes: 1 addition & 2 deletions app/Domain/Tickets/Templates/showKanban.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@
">
@foreach ($allKanbanColumns as $key => $statusRow)
<div class="column">
<h4
class="flex justify-between items-center widgettitle title-primary title-border-{{ $statusRow['class'] }}">
<h4 class="flex justify-between items-center widgettitle title-primary title-border-{{ $statusRow['class'] }}">
<div>
<strong class="count">0</strong>
{{ $tpl->e($statusRow['name']) }}
Expand Down
1 change: 0 additions & 1 deletion public/assets/css/components/kanban.css
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,6 @@ body .maincontent .priority-border-5 {
background: var(--kanban-col-title-bg) !important;
color: var( --kanban-col-title-color);
padding: 5px 10px;

line-height:17px;
font-weight: 500;
border-bottom-width:3px;
Expand Down

0 comments on commit 000c1a3

Please sign in to comment.