STEMMechanics/Website
1
0
Fork 0
Code Issues 4 Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

bts update

Browse Source
This commit is contained in:
James Collins
2024-09-27 10:27:54 +10:00
parent 8f8d12065d
commit 659ae2e3ac
18 changed files with 1415 additions and 1862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

261
app/Http/Controllers/EventController.php
View File

@@ -1,261 +0,0 @@
<?php
namespace App\Http\Controllers;
use App\Models\Event;
use Carbon\Carbon;
use Illuminate\Http\Request;
class EventController extends Controller
{
/**
* Display a listing of the resource.
*/
public function index(Request $request)
{
$homeView = true;
$search = $request->get('search', '');
$query = Event::query();
if(!auth()->user()?->admin) {
$query = $query->where('status', '!=', 'draft');
}
if($request->has('search') && $request->search !== '') {
$homeView = false;
$query = $query->where(function ($query) use ($request) {
$query->where('title', 'like', '%' . $request->search . '%')
->orWhere('content', 'like', '%' . $request->search . '%');
});
}
if($request->has('location') && $request->location !== '') {
$homeView = false;
$query = $query->whereHas('location', function ($query) use ($request) {
$query->where('name', 'like', '%' . $request->location . '%');
});
}
if($request->has('date') && $request->date !== '') {
$homeView = false;
$dates = explode('-', $request->date);
$dates = array_map('trim', $dates);
$dates = array_map(function($date) {
$date = trim($date);
if(preg_match('/^\d{4}-\d{2}-\d{2}$/', $date)) {
return $date;
}
if(preg_match('/^(\d{2})-(\d{2})-(\d{2})$/', $date, $matches)) {
return '20' . $matches[1] . '-' . $matches[2] . '-' . $matches[3];
}
if(preg_match('/^\d{4}-\d{2}$/', $date)) {
return $date . '-01';
}
if(preg_match('/^\d{4}$/', $date)) {
return $date . '-01-01';
}
if(preg_match('/^(\d{2})\/(\d{2})\/(\d{2})$/', $date, $matches)) {
return '20' . $matches[3] . '-' . $matches[2] . '-' . $matches[1];
}
if(preg_match('/^(\d{2})\/(\d{2})\/(\d{4})$/', $date, $matches)) {
return $matches[3] . '-' . $matches[2] . '-' . $matches[1];
}
return '';
}, $dates);
if(count($dates) == 2) {
// If there are two dates, filter between starts_at and ends_at
$query = $query->whereDate('starts_at', '>=', $dates[0])
->whereDate('ends_at', '<=', $dates[1]);
} else {
// If there is one date, filter starts_at that date or newer
$query = $query->whereDate('starts_at', '>=', $dates[0]);
}
}
if($homeView) {
$query = $query->where('starts_at', '>=', Carbon::now()->subDays(8))
->orderBy('starts_at', 'asc');
} else {
$query = $query->orderBy('starts_at', 'asc');
}
$events = $query->paginate(12);
return view('event.index', [
'events' => $events,
'search' => $search,
]);
}
/**
* Display a listing of the resource.
*/
public function admin_index(Request $request)
{
$query = Event::query();
if($request->has('search')) {
$query->where('title', 'like', '%' . $request->search . '%');
$query->orWhere('content', 'like', '%' . $request->search . '%');
}
$events = $query->orderBy('starts_at', 'desc')->paginate(12)->onEachSide(1);
return view('admin.event.index', [
'events' => $events
]);
}
/**
* Show the form for creating a new resource.
*/
public function admin_create()
{
return view('admin.event.edit');
}
/**
* Store a newly created resource in storage.
*/
public function admin_store(Request $request)
{
$request->validate([
'title' => 'required',
'content' => 'required',
'starts_at' => 'required',
'ends_at' => 'required|after:starts_at',
'publish_at' => 'required',
'closes_at' => 'required',
'status' => 'required',
'hero_media_name' => 'required|exists:media,name',
'registration_data' => 'required_unless:registration,none',
], [
'title.required' => __('validation.custom_messages.title_required'),
'content.required' => __('validation.custom_messages.content_required'),
'starts_at.required' => __('validation.custom_messages.starts_at_required'),
'ends_at.required' => __('validation.custom_messages.ends_at_required'),
'ends_at.after' => __('validation.custom_messages.ends_at_after'),
'publish_at.required' => __('validation.custom_messages.publish_at_required'),
'closes_at.required' => __('validation.custom_messages.closes_at_required'),
'status.required' => __('validation.custom_messages.status_required'),
'hero_media_name.required' => __('validation.custom_messages.hero_media_name_required'),
'hero_media_name.exists' => __('validation.custom_messages.hero_media_name_exists'),
'registration_data.required_unless' => __('validation.custom_messages.registration_data_required_unless'),
]);
$eventData = $request->all();
$eventData['user_id'] = auth()->user()->id;
if($eventData['status'] === 'open' && Carbon::parse($eventData['starts_at'])->lt(Carbon::now())) {
$eventData['status'] = 'closed';
}
$event = Event::create($eventData);
$event->updateFiles($request->input('files'));
session()->flash('message', 'Event has been created');
session()->flash('message-title', 'Event created');
session()->flash('message-type', 'success');
return redirect()->route('admin.event.index');
}
/**
* Display the specified resource.
*/
public function show(Event $event)
{
if(!auth()->user()?->admin && $event->status == 'draft') {
abort(404);
}
return view('event.show', ['event' => $event]);
}
/**
* Show the form for editing the specified resource.
*/
public function admin_edit(Event $event)
{
return view('admin.event.edit', ['event' => $event]);
}
/**
* Update the specified resource in storage.
*/
public function admin_update(Request $request, Event $event)
{
$request->validate([
'title' => 'required',
'content' => 'required',
'starts_at' => 'required',
'ends_at' => 'required|after:starts_at',
'publish_at' => 'required',
'closes_at' => 'required',
'status' => 'required',
'hero_media_name' => 'required|exists:media,name',
'registration_data' => 'required_unless:registration,none',
], [
'title.required' => __('validation.custom_messages.title_required'),
'content.required' => __('validation.custom_messages.content_required'),
'starts_at.required' => __('validation.custom_messages.starts_at_required'),
'ends_at.required' => __('validation.custom_messages.ends_at_required'),
'ends_at.after' => __('validation.custom_messages.ends_at_after'),
'publish_at.required' => __('validation.custom_messages.publish_at_required'),
'closes_at.required' => __('validation.custom_messages.closes_at_required'),
'status.required' => __('validation.custom_messages.status_required'),
'hero_media_name.required' => __('validation.custom_messages.hero_media_name_required'),
'hero_media_name.exists' => __('validation.custom_messages.hero_media_name_exists'),
'registration_data.required_unless' => __('validation.custom_messages.registration_data_required_unless'),
]);
$eventData = $request->all();
if($eventData['status'] === 'open' && Carbon::parse($eventData['starts_at'])->lt(Carbon::now())) {
$eventData['status'] = 'closed';
}
$event->update($eventData);
$event->updateFiles($request->input('files'));
session()->flash('message', 'Event has been updated');
session()->flash('message-title', 'Event updated');
session()->flash('message-type', 'success');
return redirect()->route('admin.event.index');
}
/**
* Remove the specified resource from storage.
*/
public function admin_destroy(Event $event)
{
$event->delete();
session()->flash('message', 'Event has been deleted');
session()->flash('message-title', 'Event deleted');
session()->flash('message-type', 'danger');
return redirect()->route('admin.event.index');
}
/**
* Duplicate the specified resource.
*/
public function admin_duplicate(Event $event)
{
$newWorkshop = $event->replicate();
$newWorkshop->title = $newWorkshop->title . ' (copy)';
$newWorkshop->status = 'draft';
$newWorkshop->save();
foreach($event->files as $file) {
$newWorkshop->files()->attach($file->name);
}
session()->flash('message', 'Event has been duplicated');
session()->flash('message-title', 'Event duplicated');
session()->flash('message-type', 'success');
return redirect()->route('admin.event.edit', $newWorkshop);
}
}

6
app/Http/Controllers/HomeController.php
View File

@@ -3,18 +3,18 @@
namespace App\Http\Controllers;
use App\Models\Post;
use App\Models\Event;
use App\Models\Workshop;
class HomeController extends Controller
{
public function index()
{
$posts = Post::query()->orderBy('created_at', 'desc')->limit(4)->get();
$events = Event::query()->where('starts_at', '>', now())->where('status', '!=', 'private')->orderBy('starts_at', 'asc')->limit(4)->get();
$workshops = Workshop::query()->where('starts_at', '>', now())->where('status', '!=', 'private')->orderBy('starts_at', 'asc')->limit(4)->get();
return view('home', [
'posts' => $posts,
'events' => $events,
'workshops' => $workshops,
]);
}
}

52
app/Models/Event.php
View File

@@ -1,52 +0,0 @@
<?php
namespace App\Models;
use App\Traits\HasFiles;
use App\Traits\Slug;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class Event extends Model
{
use HasFactory, Slug, HasFiles;
protected $fillable = [
'title',
'content',
'starts_at',
'ends_at',
'publish_at',
'closes_at',
'status',
'price',
'ages',
'registration',
'registration_data',
'location_id',
'user_id',
'hero_media_name'
];
protected $casts = [
'starts_at' => 'datetime',
'ends_at' => 'datetime',
'publish_at' => 'datetime',
'closes_at' => 'datetime',
];
public function author()
{
return $this->belongsTo(User::class, 'user_id');
}
public function hero()
{
return $this->belongsTo(Media::class, 'hero_media_name');
}
public function location()
{
return $this->belongsTo(Location::class, 'location_id');
}
}

0
artisan Executable file → Normal file
View File

1188
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

4
database/factories/WorkshopFactory.php
View File

@@ -3,13 +3,13 @@
namespace Database\Factories;
use App\Models\Location;
use App\Models\Event;
use App\Models\Workshop;
use DateInterval;
use Illuminate\Database\Eloquent\Factories\Factory;
class WorkshopFactory extends Factory
{
protected $model = Event::class;
protected $model = Workshop::class;
public function definition(): array
{

37
database/migrations/2024_05_07_143834_rename_workshops_table_to_events.php
View File

@@ -1,37 +0,0 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::rename('workshops', 'events');
Schema::table('tickets', function (Blueprint $table) {
$table->dropForeign(['workshop_id']);
$table->renameColumn('workshop_id', 'event_id');
$table->foreign('event_id')->references('id')->on('events');
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::rename('events', 'workshops');
Schema::table('tickets', function (Blueprint $table) {
$table->dropForeign(['event_id']);
$table->renameColumn('event_id', 'workshop_id');
$table->foreign('workshops_id')->references('id')->on('workshops');
});
}
};

2
database/seeders/DatabaseSeeder.php
View File

@@ -7,7 +7,7 @@ use App\Models\Media;
use App\Models\Post;
use App\Models\User;
// use Illuminate\Database\Console\Seeds\WithoutModelEvents;
use App\Models\Event;
use App\Models\Workshop;
use Database\Factories\LocationFactory;
use Illuminate\Database\Seeder;
use Illuminate\Support\Facades\Storage;

1315
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

172
resources/views/admin/event/edit.blade.php
View File

@@ -1,172 +0,0 @@
@php
$eventContent = isset($event) ? $event->content : '';
@endphp
<x-layout>
<x-mast backRoute="admin.event.index" backTitle="Workshops">{{ isset($event) ? 'Edit' : 'Create' }} Workshop</x-mast>
<x-container class="mt-4">
<form x-data="{type:'physical',registration:'{{old('registration', $event->registration ?? 'none')}}'}" method="POST" action="{{ route('admin.event.' . (isset($event) ? 'update' : 'store'), $event ?? []) }}">
@isset($event)
@method('PUT')
@endisset
@csrf
<div class="mb-4">
<x-ui.input label="Title" name="title" value="{!! isset($event) ? $event->title : '' !!}" />
</div>
<div class="mb-4">
<x-ui.media label="Image" name="hero_media_name" value="{{ $event->hero_media_name ?? '' }}" allow_uploads="true" />
</div>
<div class="flex flex-col sm:flex-row sm:gap-8">
<div class="flex-1">
<x-ui.select label="Type" name="type" x-model="type">
<option value="physical" {{ ($event->location_id ?? '') !== '' || !isset($event) ? 'selected' : '' }}>Physical</option>
<option value="online" {{ ($event->location_id ?? '') === null ? 'selected' : '' }}>Online</option>
</x-ui.select>
</div>
<div class="flex-1">
<span x-show="type==='physical'">
<x-ui.select label="Location" name="location_id">
@foreach(\App\Models\Location::orderByRaw("name = 'Online' DESC, name ASC")->get() as $location)
<option value="{{ $location->id }}" {{ ($event->location_id ?? '') === $location->id ? 'selected' : '' }}>{{ $location->name }}</option>
@endforeach
</x-ui.select>
</span>
</div>
</div>
<div class="flex flex-col sm:flex-row sm:gap-8">
<div class="flex-1">
<x-ui.input type="datetime-local" label="Start Date" name="starts_at" value="{{ \App\Helpers::timestampNoSeconds($event->starts_at ?? '') }}" onchange="updatedStartsAt()"/>
</div>
<div class="flex-1">
<x-ui.input type="datetime-local" label="End Date" name="ends_at" value="{{ \App\Helpers::timestampNoSeconds($event->ends_at ?? '') }}" />
</div>
</div>
<div class="flex flex-col sm:flex-row sm:gap-8">
<div class="flex-1">
<x-ui.select label="Status" name="status">
<option value="draft" {{ ($event->status ?? '') === 'draft' ? 'selected' : '' }}>Draft</option>
<option value="open" {{ ($event->status ?? '') === 'open' ? 'selected' : '' }}>Open</option>
<option value="private" {{ ($event->status ?? '') === 'private' ? 'selected' : '' }}>Private</option>
<option value="full" {{ ($event->status ?? '') === 'full' ? 'selected' : '' }}>Full</option>
<option value="scheduled" {{ ($event->status ?? '') === 'scheduled' ? 'selected' : '' }}>Scheduled</option>
<option value="closed" {{ ($event->status ?? '') === 'closed' ? 'selected' : '' }}>Closed</option>
<option value="cancelled" {{ ($event->status ?? '') === 'cancelled' ? 'selected' : '' }}>Cancelled</option>
</x-ui.select>
</div>
<div class="flex-1">
<x-ui.input type="datetime-local" label="Publish Date" name="publish_at" value="{{ \App\Helpers::timestampNoSeconds($event->publish_at ?? '') }}" onchange="updatedPublishAt()" />
</div>
</div>
<div class="flex flex-col sm:flex-row sm:gap-8">
<div class="hidden sm:block flex-1">
&nbsp;
</div>
<div class="flex-1">
<x-ui.input type="datetime-local" label="Closes Date" name="closes_at" value="{{ \App\Helpers::timestampNoSeconds($event->closes_at ?? '') }}" />
</div>
</div>
<div class="flex flex-col sm:flex-row sm:gap-8">
<div class="flex-1">
<x-ui.input label="Price" name="price" info="Leave blank to hide from public. Also supports Free, TBD or TBC" value="{{ $event->price ?? '' }}" />
</div>
<div class="flex-1">
<x-ui.input label="Ages" name="ages" info="Leave blank to hide from public" value="{{ $event->ages ?? '8+' }}" />
</div>
</div>
<div class="flex flex-col sm:flex-row sm:gap-8">
<div class="flex-1">
<x-ui.select label="Registration" name="registration" x-model="registration" onchange="document.getElementsByName('registration_data').forEach((e)=>e.value='')">
<option value="none" {{ (old('registration', $event->registration ?? '')) === 'none' ? 'selected' : '' }}>None</option>
<option value="link" {{ (old('registration', $event->registration ?? '')) === 'link' ? 'selected' : '' }}>External Link</option>
<option value="email" {{ (old('registration', $event->registration ?? '')) === 'email' ? 'selected' : '' }}>External Email</option>
<option value="message" {{ (old('registration', $event->registration ?? '')) === 'message' ? 'selected' : '' }}>Custom Message</option>
</x-ui.select>
</div>
<div class="flex-1">
<span x-show="registration==='link'">
<x-ui.input label="Registration URL" name="registration_url" id="registration_url" value="{{ $event->registration_data ?? '' }}" error="{{ $errors->first('registration_data') }}" />
</span>
<span x-show="registration==='email'">
<x-ui.input label="Registration Email" name="registration_email" id="registration_email" value="{{ $event->registration_data ?? '' }}" error="{{ $errors->first('registration_data') }}" />
</span>
<span x-show="registration==='message'">
<x-ui.input label="Registration Message" name="registration_message" id="registration_message" value="{{ $event->registration_data ?? '' }}" error="{{ $errors->first('registration_data') }}" />
</span>
<input type="hidden" name="registration_data" id="registration_data" value="{{ $event->registration_data ?? '' }}">
</div>
</div>
<div class="mb-4">
<x-ui.editor
label="Content"
name="content"
value="{!! $eventContent !!}"
></x-ui.editor>
</div>
<div class="mb-4">
<x-ui.filelist
label="Files"
name="files"
editor="true"
value="{!! isset($event) ? $event->files()->orderBy('name')->get() : '' !!}"
></x-ui.filelist>
</div>
<div class="flex justify-end gap-4 mt-8">
@isset($event)
<x-ui.button type="button" color="danger" x-data x-on:click.prevent="SM.confirmDelete('{{ csrf_token() }}', 'Delete workshop?', 'Are you sure you want to delete this workshop? This action cannot be undone', '{{ route('admin.event.destroy', $event) }}')">Delete</x-ui.button>
@endisset
<x-ui.button type="submit">{{ isset($event) ? 'Save' : 'Create' }}</x-ui.button>
</div>
</form>
</x-container>
</x-layout>
<script>
function updatedStartsAt() {
const startsAt = document.getElementsByName('starts_at')[0].value;
console.log(startsAt);
const elemEndsAt = document.getElementsByName('ends_at')[0];
if(elemEndsAt.value === '') {
let endsAt = new Date(startsAt);
endsAt.setHours(endsAt.getHours() + 1);
document.getElementsByName('ends_at')[0].value = SM.toLocalISOString(endsAt);
}
let closesAt = new Date(startsAt);
closesAt.setHours(closesAt.getHours() - 2);
document.getElementsByName('closes_at')[0].value = SM.toLocalISOString(closesAt);
}
function updatedPublishAt() {
const publishAt = document.getElementsByName('publish_at')[0].value;
const now = new Date();
if (publishAt > now) {
document.getElementsByName('status')[0].value = 'scheduled';
}
}
document.addEventListener('DOMContentLoaded', function() {
const elementIds = ['registration_url', 'registration_email', 'registration_message'];
const registrationElem = document.getElementById('registration_data');
if(registrationElem) {
elementIds.forEach(id => {
const elem = document.getElementById(id);
if (elem) {
elem.addEventListener('change', function(event) {
registrationElem.value = event.target.value;
});
}
})
}
});
/* Initalize */
const elemPublishAt = document.getElementsByName('publish_at')[0];
if(elemPublishAt && elemPublishAt.value === '') {
let publishAt = new Date();
document.getElementsByName('publish_at')[0].value = SM.toLocalISOString(publishAt);
}
</script>

55
resources/views/admin/event/index.blade.php
View File

@@ -1,55 +0,0 @@
<x-layout>
<x-mast>Workshops</x-mast>
<x-container>
<div class="flex my-4 items-center">
<div class="flex-1">
<x-ui.button type="link" href="{{ route('admin.event.create') }}">Create</x-ui.button>
</div>
<div class="flex-1">
<x-ui.search name="search" label="Search" />
</div>
</div>
@if($events->isEmpty())
<x-none-found item="workshops" search="{{ request()->get('search') }}" />
@else
<x-ui.table>
<x-slot:header>
<th>Title</th>
<th class="hidden lg:table-cell">Status</th>
<th class="hidden lg:table-cell">Location</th>
<th class="hidden md:table-cell">Starts</th>
<th>Action</th>
</x-slot:header>
<x-slot:body>
@foreach ($events as $event)
<tr>
<td class="flex items-center">
<img src="{{ $event->hero->thumbnail }}" class="max-h-12 max-w-12 -ml-2 -my-3 mr-3 inline rounded" alt="{{ $event->hero->title }}" />
<div>
<div class="whitespace-normal">{{ $event->title }}</div>
<div class="lg:hidden text-xs text-gray-500">{{ $event->location->name }} ({{ ucwords($event->status) }})</div>
<div class="md:hidden text-xs text-gray-500">{{ \Carbon\Carbon::parse($event->starts_at)->format('j/m/Y g:i a') }}</div>
</div>
</td>
<td class="hidden lg:table-cell">{{ ucwords($event->status) }}</td>
<td class="hidden lg:table-cell">{{ $event->location->name }}</td>
<td class="hidden md:table-cell">{{ \Carbon\Carbon::parse($event->starts_at)->format('M j Y, g:i a') }}</td>
<td>
<div class="flex justify-center gap-3">
<a href="{{ route('admin.event.edit', $event) }}" class="hover:text-primary-color" title="Edit"><i class="fa-solid fa-pen-to-square"></i></a>
<a href="{{ route('admin.event.duplicate', $event) }}" class="hover:text-primary-color" title="Duplicate"><i class="fa-regular fa-copy"></i></a>
<a href="#" class="hover:text-red-600" x-data x-on:click.prevent="SM.confirmDelete('{{ csrf_token() }}', 'Delete workshop?', 'Are you sure you want to delete this workshop? This action cannot be undone', '{{ route('admin.event.destroy', $event) }}')" title="Delete"><i class="fa-solid fa-trash"></i></a>
</div>
</td>
</tr>
@endforeach
</x-slot:body>
</x-ui.table>
{{ $events->appends(request()->query())->links() }}
@endif
</x-container>
</x-layout>

6
resources/views/components/navbar.blade.php
View File

@@ -20,7 +20,7 @@
<div class="hidden sm:ml-6 sm:block mr-4">
<div class="flex space-x-2">
<a href="{{ route('post.index') }}" class="text-gray-900 hover:text-sky-500 px-3 py-2 text-sm font-medium transition duration-300 ease-in-out transform hover:-translate-y-0.5" aria-current="page">Blog</a>
<a href="{{ route('event.index') }}" class="text-gray-900 hover:text-sky-500 px-3 py-2 text-sm font-medium transition duration-300 ease-in-out transform hover:-translate-y-0.5">Workshops</a>
<a href="{{ route('workshop.index') }}" class="text-gray-900 hover:text-sky-500 px-3 py-2 text-sm font-medium transition duration-300 ease-in-out transform hover:-translate-y-0.5">Workshops</a>
</div>
</div>
<div class="ml-3">
@@ -37,7 +37,7 @@
</div>
<div x-show="open" @click.away="open=false" x-cloak class="absolute w-full right-0 sm:right-5 sm:top-9 z-50 sm:mt-2 sm:w-48 origin-top-right sm:rounded-md bg-white py-3 px-2 shadow-lg border-t sm:ring-1 ring-black ring-opacity-25 focus:outline-none" role="menu" aria-orientation="vertical" aria-labelledby="user-menu-button" tabindex="-1">
<a href="{{ route('post.index') }}" class="sm:hidden block px-4 py-2 text-sm text-gray-700 rounded transition hover:bg-sky-600 hover:text-white" role="menuitem" tabindex="-1"><i class="fa-regular fa-newspaper w-4 mr-2"></i>Blog</a>
<a href="{{ route('event.index') }}" class="sm:hidden block px-4 py-2 text-sm text-gray-700 rounded transition hover:bg-sky-600 hover:text-white" role="menuitem" tabindex="-1"><i class="fa-solid fa-bullhorn w-4 mr-2"></i>Workshops</a>
<a href="{{ route('workshop.index') }}" class="sm:hidden block px-4 py-2 text-sm text-gray-700 rounded transition hover:bg-sky-600 hover:text-white" role="menuitem" tabindex="-1"><i class="fa-solid fa-bullhorn w-4 mr-2"></i>Workshops</a>
<div class="sm:hidden border-t border-gray-200 my-2"></div>
@if(auth()->guest())
<a href="{{ route('register') }}" class="block px-4 py-2 text-sm text-gray-700 rounded transition hover:bg-sky-600 hover:text-white" role="menuitem" tabindex="-1"><i class="fa-solid fa-pen-to-square w-4 mr-2"></i>Register</a>
@@ -49,7 +49,7 @@
<a href="{{ route('admin.media.index') }}" class="block px-4 py-2 text-sm text-gray-700 rounded transition hover:bg-sky-600 hover:text-white" role="menuitem" tabindex="-1"><i class="fa-solid fa-photo-film w-4 mr-2"></i>Media</a>
<a href="{{ route('admin.post.index') }}" class="block px-4 py-2 text-sm text-gray-700 rounded transition hover:bg-sky-600 hover:text-white" role="menuitem" tabindex="-1"><i class="fa-regular fa-newspaper w-4 mr-2"></i>Posts</a>
<a href="{{ route('admin.user.index') }}" class="block px-4 py-2 text-sm text-gray-700 rounded transition hover:bg-sky-600 hover:text-white" role="menuitem" tabindex="-1"><i class="fa-solid fa-users w-4 mr-2"></i>Users</a>
<a href="{{ route('admin.event.index') }}" class="block px-4 py-2 text-sm text-gray-700 rounded transition hover:bg-sky-600 hover:text-white" role="menuitem" tabindex="-1"><i class="fa-regular fa-calendar w-4 mr-2"></i>Events</a>
<a href="{{ route('admin.workshop.index') }}" class="block px-4 py-2 text-sm text-gray-700 rounded transition hover:bg-sky-600 hover:text-white" role="menuitem" tabindex="-1"><i class="fa-solid fa-bullhorn w-4 mr-2"></i>Workshops</a>
<div class="border-t border-gray-200 my-2"></div>
@endif
<a href="{{ route('account.show') }}" class="block px-4 py-2 text-sm text-gray-700 rounded transition hover:bg-sky-600 hover:text-white" role="menuitem" tabindex="-1"><i class="fa-solid fa-user-pen w-4 mr-2"></i>Account</a>

45
resources/views/components/panel-event.blade.php
View File

@@ -1,45 +0,0 @@
@props(['event'])
@php
$statusClass = $event->status;
$statusTitle = $event->status;
if($event->status === 'scheduled') {
$statusClass = 'soon';
$statusTitle = 'Open soon';
}
@endphp
<a href="{{ route('event.show', $event) }}" class="flex flex-col bg-white border rounded-lg overflow-hidden hover:shadow-lg hover:scale-[101%] transition-all relative {{ $attributes->get('class') }}">
<div class="shadow border rounded px-3 py-2 absolute top-2 left-2 flex flex-col justify-center items-center bg-white">
<div class="text-gray-600 font-bold leading-none">{{ $event->starts_at->format('j') }}</div>
<div class="text-gray-600 text-xs uppercase">{{ $event->starts_at->format('M') }}</div>
</div>
<div class="border border-white border-opacity-50 absolute flex items-center justify-center top-5 -right-9 bg-gray-500 w-36 text-sm text-white font-bold uppercase py-1 rotate-45 h-8 sm-banner-{{ strtolower($statusClass) }}">{{ $statusTitle }}</div>
<img src="{{ $event->hero?->url }}?md" alt="{{ $event->title }}" class="w-full h-64 object-cover object-center">
<div class="flex-grow p-4 flex flex-col">
<h2 class="flex-grow {{ strlen($event->title) > 25 ? 'text-lg' : 'text-xl' }} font-bold mb-2">{{ $event->title }}</h2>
<div class="text-gray-600 text-sm mb-1 flex gap-2">
<div class="w-6 flex items-center justify-center">
<i class="fa-regular fa-calendar"></i>
</div>{{ $event->starts_at->format('j/m/Y @ g:i a') }}
</div>
<div class="text-gray-600 text-sm mb-1 flex gap-2">
<div class="w-6 flex items-center justify-center">
<i class="fa-solid fa-location-dot"></i>
</div>{{ $event->location->name }}
</div>
@if($event->ages)
<div class="text-gray-600 text-sm mb-1 flex gap-2">
<div class="w-6 flex items-center justify-center">
<i class="fa-regular fa-face-smile"></i>
</div>{{ isset($event->ages) && $event->ages !== '' ? 'Ages ' . $event->ages : 'All ages' }}
</div>
@endif
<div class="text-gray-600 text-sm mb-1 flex gap-2">
<div class="w-6 flex items-center justify-center">
<i class="fa-solid fa-dollar-sign"></i>
</div>{{ isset($event->price) && $event->price !== '' && $event->price !== '0' ? $event->price : 'Free' }}
</div>
</div>
</a>

30
resources/views/event/index.blade.php
View File

@@ -1,30 +0,0 @@
<x-layout>
<x-slot name="title">Workshops</x-slot>
<x-mast>Workshops</x-mast>
<section class="bg-gray-100">
<x-container class="my-4">
<x-ui.search class="md:hidden" name="search" label="Search" value="{{ request()->get('search') }}" />
<form class="hidden md:flex gap-4" method="GET" action="{{ request()->url() }}">
<x-ui.input no-label class="my-0 flex-1" type="text" name="search" label="Keywords" value="{{ request()->get('search') }}"/>
<x-ui.input no-label class="my-0 flex-1" type="text" name="location" label="Location" value="{{ request()->get('location') }}"/>
<x-ui.input no-label class="my-0 flex-1" type="text" name="date" label="Date Range" value="{{ request()->get('date') }}"/>
<x-ui.button type="submit"><i class="fa-solid fa-magnifying-glass"></i></x-ui.button>
</form>
</x-container>
@if($events->isEmpty())
<x-container class="mt-8">
<x-none-found item="workshops" search="{{ request()->get('search') }}" />
</x-container>
@else
<x-container class="mt-4" inner-class="grid md:grid-cols-2 lg:grid-cols-3 gap-8 w-full">
@foreach ($events as $event)
<x-panel-event :event="$event" />
@endforeach
</x-container>
<x-container>
{{ $events->appends(request()->query())->links() }}
</x-container>
@endif
</section>
</x-layout>

64
resources/views/event/show.blade.php
View File

@@ -1,64 +0,0 @@
<x-layout>
<x-container>
<x-ui.image-hero :image="$event->hero?->url" class="my-8" />
<div class="flex sm:gap-16 gap-4 flex-col sm:flex-row">
<div class="flex flex-col flex-1">
<h1 class="text-3xl font-bold mb-6">{!! $event->title !!}</h1>
<article class="content mb-4">{!! $event->content !!}</article>
<x-ui.filelist class="mt-16" value="{!! $event->files()->orderBy('name')->get() !!}" />
</div>
<div class="flex flex-col sm:pt-8 basis-64 flex-grow-0 flex-shrink-0">
@if($event->status === 'closed')
<div class="sm-registration-closed">Registration for this event has closed.</div>
@elseif($event->status === 'full')
<div class="sm-registration-full">This workshop is currently full.</div>
@elseif($event->status === 'private')
<div class="sm-registration-private">This is a private event. Please contact the organiser for details.</div>
@elseif($event->status === 'scheduled')
<div class="sm-registration-scheduled">Registration for this workshop will open soon.</div>
@elseif($event->status === 'cancelled')
<div class="sm-registration-cancelled">This workshop has been cancelled.</div>
@elseif($event->registration === 'none')
<div class="sm-registration-none">Registration not required for this event. Arrive early to avoid disappointment as seating maybe limited.</div>
@elseif($event->registration === 'link')
<x-ui.button href="{{ $event->registration_data }}" class="my-4">Register for Event</x-ui.button>
@elseif($event->registration === 'email')
<div class="sm-registration-email">Registration for this event by emailing <a href="mailto:{{ $event->registration_data }}" class="link">{{ $event->registration_data }}</a>.</div>
@elseif($event->registration === 'message')
<div class="sm-registration-message">{{ $event->registration_data }}</div>
@endif
@if(auth()->user()?->admin)
<x-ui.button class="mb-4" color="primary-outline" href="{{ route('admin.event.edit', $event) }}">Edit Workshop</x-ui.button>
@endif
<h2 class="text-gray-600 text-lg font-bold mt-4 mb-2"><i class="mr-1 fa-regular fa-calendar"></i> Date/Time</h2>
<p class="text-gray-600 text-sm pl-6 mb-6">{!! implode('<br />', \App\Helpers::createTimeDurationStr($event->starts_at, $event->ends_at)) !!}</p>
<h2 class="text-gray-600 text-lg font-bold mb-2"><i class="mr-1 fa-solid fa-location-dot"></i> Location</h2>
<div class="text-gray-600 text-sm pl-6 mb-6">
@if($event->location->url)
<a href="{{ $event->location->url }}" class="link">
@endif
<p>{{ $event->location->name }}</p>
@if($event->location->url)
</a>
@endif
@if($event->location->address_url)
<a href="{{ $event->location->address_url }}" class="link" target="_blank">
@endif
<p class="text-xs">{{ $event->location->address }}</p>
@if($event->location->address_url)
</a>
@endif
</div>
<h2 class="text-gray-600 text-lg font-bold mb-2"><i class="mr-1 fa-regular fa-face-smile"></i> {{ isset($event->ages) && $event->ages !== '' ? 'Ages ' . $event->ages : 'All ages' }}</h2>
@if(\App\Helpers::isUnderAge($event->ages))
<p class="text-gray-600 text-xs pl-3 ml-2 mb-6 border-l-4 border-l-yellow-400">Parental supervision may be required for children 8 years of age and under.</p>
@endif
<h2 class="text-gray-600 text-lg font-bold mb-2"><i class="mr-1 fa-solid fa-dollar-sign"></i> {{ isset($event->price) && $event->price !== '' && $event->price !== '0' ? $event->price : 'Free' }}</h2>
{{-- @if(isset($event->price) && $event->price !== '' && $event->price !== '0' && strtolower($event->price) !== 'free')--}}
{{-- <p class="text-gray-600 text-xs pl-3 ml-2 mb-6 border-l-4 border-l-green-500">Payment by cash or EFTPOS accepted. Please ensure correct change.</p>--}}
{{-- @endif--}}
</div>
</div>
</x-container>
</x-layout>

8
resources/views/home.blade.php
View File

@@ -33,7 +33,7 @@
<div class="self-center">
<p class="mb-6 text-left">To keep up with our ever-changing world, it's important to encourage and support a new generation of curious minds who love science, engineering, art, and leadership.</p>
<div class="flex flex-grow justify-center items-center">
<x-ui.button color="success" href="{{ route('event.index') }}" class="font-normal">Explore Workshops</x-ui.button>
<x-ui.button color="success" href="{{ route('workshop.index') }}" class="font-normal">Explore Workshops</x-ui.button>
</div>
</div>
<div class="ml-8 hidden sm:block md:hidden">
@@ -46,12 +46,12 @@
<section id="events" class="pt-4 pb-8">
<x-container>
<h2 class="text-2xl font-bold mb-6">Upcoming workshops</h2>
@if($events->isEmpty())
@if($workshops->isEmpty())
<x-none-found item="workshops" message="No workshops have been scheduled at this time" title="" />
@else
<div class="grid md:grid-cols-2 lg:grid-cols-3 gap-8 w-full">
@foreach($events as $index => $event)
<x-panel-event :event="$event" class="{{ $index === 3 ? 'lg:hidden' : '' }}" />
@foreach($workshops as $index => $workshop)
<x-panel-workshop :workshop="$workshop" class="{{ $index === 3 ? 'lg:hidden' : '' }}" />
@endforeach
</div>
@endif

4
routes/console.php
View File

@@ -19,13 +19,13 @@ Artisan::command('cleanup', function() {
->update(['status' => 'published']);
// Open scheduled workshops
DB::table('events')
DB::table('workshops')
->where('status', 'scheduled')
->where('publish_at', '<', now())
->update(['status' => 'open']);
// Close workshops
DB::table('events')
DB::table('workshops')
->whereIn('status', ['open', 'full', 'private'])
->where('closes_at', '<', now())
->update(['status' => 'closed']);

28
routes/web.php
View File

@@ -7,18 +7,15 @@ use App\Http\Controllers\LocationController;
use App\Http\Controllers\MediaController;
use App\Http\Controllers\PostController;
use App\Http\Controllers\UserController;
use App\Http\Controllers\EventController;
use App\Http\Controllers\WorkshopController;
use Illuminate\Support\Facades\Route;
Route::get('/', [HomeController::class, 'index'])->name('index');
Route::redirect('/events', '/workshops', 301);
Route::redirect('/events/{event}', '/workshops/{event}', 301);
Route::get('/posts', [PostController::class, 'index'])->name('post.index');
Route::get('/posts/{post}', [PostController::class, 'show'])->name('post.show');
Route::get('/workshops', [EventController::class, 'index'])->name('event.index');
Route::get('/workshops/{event}', [EventController::class, 'show'])->name('event.show');
Route::get('posts', [PostController::class, 'index'])->name('post.index');
Route::get('posts/{post}', [PostController::class, 'show'])->name('post.show');
Route::get('workshops', [WorkshopController::class, 'index'])->name('workshop.index');
Route::get('workshops/{workshop}', [WorkshopController::class, 'show'])->name('workshop.show');
Route::middleware('auth')->group(function () {
Route::get('/account', [AccountController::class, 'show'])->name('account.show');
@@ -81,11 +78,12 @@ Route::middleware('admin')->group(function () {
Route::put('/admin/users/{user}', [UserController::class, 'update'])->name('admin.user.update');
Route::delete('/admin/users/{user}', [UserController::class, 'destroy'])->name('admin.user.destroy');
Route::get('/admin/events', [EventController::class, 'admin_index'])->name('admin.event.index');
Route::get('/admin/events/create', [EventController::class, 'admin_create'])->name('admin.event.create');
Route::get('/admin/events/{event}/duplicate', [EventController::class, 'admin_duplicate'])->name('admin.event.duplicate');
Route::post('/admin/events', [EventController::class, 'admin_store'])->name('admin.event.store');
Route::get('/admin/events/{event}', [EventController::class, 'admin_edit'])->name('admin.event.edit');
Route::put('/admin/events/{event}', [EventController::class, 'admin_update'])->name('admin.event.update');
Route::delete('/admin/events/{event}', [EventController::class, 'admin_destroy'])->name('admin.event.destroy');
Route::get('/admin/workshops', [WorkshopController::class, 'admin_index'])->name('admin.workshop.index');
Route::get('/admin/workshops/create', [WorkshopController::class, 'admin_create'])->name('admin.workshop.create');
Route::get('/admin/workshops/{workshop}/duplicate', [WorkshopController::class, 'admin_duplicate'])->name('admin.workshop.duplicate');
Route::post('/admin/workshops', [WorkshopController::class, 'admin_store'])->name('admin.workshop.store');
Route::get('/admin/workshops/{workshop}', [WorkshopController::class, 'admin_edit'])->name('admin.workshop.edit');
Route::put('/admin/workshops/{workshop}', [WorkshopController::class, 'admin_update'])->name('admin.workshop.update');
Route::delete('/admin/workshops/{workshop}', [WorkshopController::class, 'admin_destroy'])->name('admin.workshop.destroy');
});