From 5a924a690cadb7e8de7e836c3676d45535b48a99 Mon Sep 17 00:00:00 2001 From: stevan Date: Thu, 10 Jul 2025 16:42:50 +0200 Subject: [PATCH 1/9] My Activities --- resources/views/event/event_tile.blade.php | 72 ++++++++++++------- resources/views/event/my.blade.php | 82 +++++++++++++++------- 2 files changed, 105 insertions(+), 49 deletions(-) diff --git a/resources/views/event/event_tile.blade.php b/resources/views/event/event_tile.blade.php index 67e22ac71..d88a0ab78 100755 --- a/resources/views/event/event_tile.blade.php +++ b/resources/views/event/event_tile.blade.php @@ -1,30 +1,52 @@ -
- -
+
+
+ {{$event->title}} +
+
+
+
+ + + {{Carbon\Carbon::parse($event->start_date)->format('d/m/Y')}} + + Time: {{Carbon\Carbon::parse($event->start_date)->format('h:i A')}} GMT +
+ @can('approve', $event) + @isset($moderation) + @if($event->owner) +
Organizer: {{$event->owner->email ?? $event->owner->email_display }}
+ @else +
Organizer: Unknown
+ @endif + @endisset + @endcan +

+ {{ $event->title }} +

+

+ {{ $event->location }} +

+
+ {!! $event->description !!} +
+
@can('approve', $event) @isset($moderation) - @if($event->owner) -
Organizer: {{$event->owner->email ?? $event->owner->email_display }}
- @else -
Organizer: Unknown
- @endif + @endisset @endcan -
{{ $event->title }}
-
{{Carbon\Carbon::parse($event->start_date)->isoFormat('llll')}}
-
{!! $event->description !!}
- -
- @can('approve', $event) - @isset($moderation) - - @endisset - @endcan -
- @lang('myevents.view') + + View profile/contact +
+ + +
+
-
+
\ No newline at end of file diff --git a/resources/views/event/my.blade.php b/resources/views/event/my.blade.php index 3eb0a6f8e..904524cd9 100755 --- a/resources/views/event/my.blade.php +++ b/resources/views/event/my.blade.php @@ -1,38 +1,72 @@ -@extends('layout.base') +@extends('layout.new_base') + +@php + $list = [ + (object) ['label' => 'My activities', 'href' => ''], + ]; +@endphp +@section('layout.breadcrumb') + @include('layout.breadcrumb', ['list' => $list]) +@endsection @section('content') -
- -
-

@lang('myevents.created_by') {{ Auth::user()->fullName }}

+
+
+
+
+
+

+ @lang('myevents.created_by') {{ Auth::user()->fullName }} +

+

+ Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero. +

+
+ + Create an activity + + + Guide for organisers +
+ + +
+ +
+
+
+
-
- - @if(!$events || (count($events) == 0)) -
-

+

+
+ @if(!$events || (count($events) == 0)) +

@lang('myevents.no_events.first_call_to_action') @lang('myevents.no_events.first_link') @lang('myevents.no_events.second_call_to_action') @lang('myevents.no_events.second_link')?

-
- @else -
- @foreach($events as $event) - @component('event.event_tile', ['event'=>$event]) - @endcomponent - @endforeach -
-
- {{ $events->links() }} -
- @endif - + @else +
+ @foreach($events as $event) + @component('event.event_tile', ['event'=>$event]) + @endcomponent + @endforeach +
+
+ {{ $events->links('vendor.livewire.pagination') }} +
+ @endif +
-
@endsection From 0bb1b7edbfd9df5306b8e0768856600700af9dad Mon Sep 17 00:00:00 2001 From: stevan Date: Thu, 10 Jul 2025 17:39:48 +0200 Subject: [PATCH 2/9] Report my activities --- .../components/report/form-field.blade.php | 13 +- resources/views/report/index.blade.php | 140 ++++++++------- resources/views/report/list.blade.php | 162 +++++++++--------- 3 files changed, 164 insertions(+), 151 deletions(-) diff --git a/resources/views/components/report/form-field.blade.php b/resources/views/components/report/form-field.blade.php index e00bda45c..fff49fa1a 100644 --- a/resources/views/components/report/form-field.blade.php +++ b/resources/views/components/report/form-field.blade.php @@ -1,18 +1,19 @@ -
-
-