Skip to content
Merged

Dev #2936

Show file tree
Hide file tree
Changes from all commits
Commits
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

Large diffs are not rendered by default.

237 changes: 0 additions & 237 deletions public/build/assets/app-CYhibInC.js

This file was deleted.

1 change: 0 additions & 1 deletion public/build/assets/app-DPSMvogr.css

This file was deleted.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions public/build/assets/app-rguKvbSB.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

303 changes: 0 additions & 303 deletions public/build/assets/php_en-hSRkEOjH.js

This file was deleted.

8 changes: 4 additions & 4 deletions public/build/manifest.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"resources/assets/sass/app.scss": {
"file": "assets/app-B44hSfhu.css",
"file": "assets/app-B8QIQfc7.css",
"src": "resources/assets/sass/app.scss",
"isEntry": true
},
"resources/css/app.css": {
"file": "assets/app-DPSMvogr.css",
"file": "assets/app-rguKvbSB.css",
"src": "resources/css/app.css",
"isEntry": true
},
"resources/js/app.js": {
"file": "assets/app-BAFDKbij.js",
"file": "assets/app-DxYtHnOh.js",
"name": "app",
"src": "resources/js/app.js",
"isEntry": true,
Expand Down Expand Up @@ -93,7 +93,7 @@
"isDynamicEntry": true
},
"resources/lang/php_en.json": {
"file": "assets/php_en-hSRkEOjH.js",
"file": "assets/php_en-B_o6m2VO.js",
"name": "php_en",
"src": "resources/lang/php_en.json",
"isDynamicEntry": true
Expand Down
4 changes: 2 additions & 2 deletions resources/lang/en/event.php
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,9 @@
'your-changes-have-been-saved' => 'Your changes have been saved',
'edit-your-codeweek-activity' => 'Edit your Codeweek activity',
'view-activity' => 'View Activity',
'add-another-activity' => 'Add another Activity'
'add-another-activity' => 'Add another Activity',
'event.view-activity' => 'View activity',
'event.add-another-activity' => 'Add another activity',
'event.audience.Pre-primary education' => 'Pre-primary education',
'event.your-changes-have-been-saved' => 'Your CHnages have been saved',
'event.your-changes-have-been-saved' => 'Your changes have been saved',
];
18 changes: 9 additions & 9 deletions resources/views/event/event_tile_approval.blade.php
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
<div class="flex flex-col rounded-lg bg-white overflow-hidden">
<div class="flex overflow-hidden flex-col bg-white rounded-lg">
<div class="relative">
<img src="{{$event->picture_path()}}" class="w-full object-cover h-[200px]" alt="{{$event->title}}" />
</div>
<div class="flex-grow px-6 py-4 flex flex-col justify-start">
<div class="flex flex-col flex-grow justify-start px-6 py-4">
@can('approve', $event)
@isset($moderation)
@if($event->owner)
<div class="text-default text-slate-500 mb-2 flex items-center font-semibold">Organizer: <span class="text-sm font-semibold ml-1 w-fit px-4 py-1.5 bg-[#CCF0F9] rounded-full flex items-center">{{$event->owner->email ?? $event->owner->email_display }}</span></div>
<div class="flex items-center mb-2 font-semibold text-default text-slate-500">Organizer: <span class="text-sm font-semibold ml-1 w-fit px-4 py-1.5 bg-[#CCF0F9] rounded-full flex items-center">{{$event->owner->email ?? $event->owner->email_display }}</span></div>
@else
<div class="text-default text-slate-500 mb-2 flex items-center font-semibold">Organizer: <span class="text-sm font-semibold ml-1 w-fit px-4 py-1.5 bg-[#CCF0F9] rounded-full flex items-center">Unknown</span></div>
<div class="flex items-center mb-2 font-semibold text-default text-slate-500">Organizer: <span class="text-sm font-semibold ml-1 w-fit px-4 py-1.5 bg-[#CCF0F9] rounded-full flex items-center">Unknown</span></div>
@endif
@endisset
@endcan
<p class="text-dark-blue text-lg p-0 font-semibold mb-2 font-['Montserrat']">
{{ $event->title }}
</p>
<div class="text-slate-500 text-default p-0 font-semibold mb-2">
<div class="p-0 mb-2 font-semibold text-slate-500 text-default">
Updated at: {{Carbon\Carbon::parse($event->updated_at)->isoFormat('llll')}}
</div>
<div class="text-slate-500 text-default p-0 font-semibold mb-2">
<div class="p-0 mb-2 font-semibold text-slate-500 text-default">
Activity Date: {{Carbon\Carbon::parse($event->start_date)->isoFormat('llll')}}
</div>
<div class="[&_p]:p-0 [&_p]:empty:hidden space-y-1 text-slate-500 font-normal text-default max-h-60 overflow-hidden">
Expand All @@ -36,9 +36,9 @@ class="flex justify-center items-center gap-2 text-[#1C4DA1] border-solid border
href="{{$event->path()}}"
>
<span>@lang('myevents.view')</span>
<div class="flex gap-2 w-4 overflow-hidden">
<img src="/images/arrow-right-icon.svg" class="min-w-4 duration-500 transform -translate-x-6 group-hover:translate-x-0" />
<img src="/images/arrow-right-icon.svg" class="min-w-4 duration-500 transform -translate-x-6 group-hover:translate-x-0" />
<div class="flex overflow-hidden gap-2 w-4">
<img src="/images/arrow-right-icon.svg" class="duration-500 transform -translate-x-6 min-w-4 group-hover:translate-x-0" />
<img src="/images/arrow-right-icon.svg" class="duration-500 transform -translate-x-6 min-w-4 group-hover:translate-x-0" />
</div>
</a>
</div>
Expand Down
Loading