Remove meeting templates and show Events programme on Meet rooms.
Deploy Ladill Meet / deploy (push) Successful in 42s
Deploy Ladill Meet / deploy (push) Successful in 42s
Templates duplicated create-form settings without edit/delete flows; drop the feature and table. Conference and webinar pages render synced programme snapshots and link back to Ladill Events. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -6,14 +6,12 @@ use App\Http\Controllers\Controller;
|
|||||||
use App\Http\Controllers\Meet\Concerns\ScopesToAccount;
|
use App\Http\Controllers\Meet\Concerns\ScopesToAccount;
|
||||||
use App\Models\Member;
|
use App\Models\Member;
|
||||||
use App\Models\Room;
|
use App\Models\Room;
|
||||||
use App\Models\Template;
|
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
use App\Services\Meet\CalendarService;
|
use App\Services\Meet\CalendarService;
|
||||||
use App\Services\Meet\ConferenceService;
|
use App\Services\Meet\ConferenceService;
|
||||||
use App\Services\Meet\InvitationService;
|
use App\Services\Meet\InvitationService;
|
||||||
use App\Services\Meet\RoomService;
|
use App\Services\Meet\RoomService;
|
||||||
use App\Services\Meet\SessionService;
|
use App\Services\Meet\SessionService;
|
||||||
use App\Services\Meet\TemplateService;
|
|
||||||
use App\Services\Meet\TownHallService;
|
use App\Services\Meet\TownHallService;
|
||||||
use Illuminate\Http\RedirectResponse;
|
use Illuminate\Http\RedirectResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
@@ -26,7 +24,6 @@ class ConferenceController extends Controller
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
protected RoomService $rooms,
|
protected RoomService $rooms,
|
||||||
protected SessionService $sessions,
|
protected SessionService $sessions,
|
||||||
protected TemplateService $templates,
|
|
||||||
protected InvitationService $invitations,
|
protected InvitationService $invitations,
|
||||||
protected CalendarService $calendar,
|
protected CalendarService $calendar,
|
||||||
protected TownHallService $townHalls,
|
protected TownHallService $townHalls,
|
||||||
@@ -55,11 +52,6 @@ class ConferenceController extends Controller
|
|||||||
$this->authorizeAbility($request, 'meetings.create');
|
$this->authorizeAbility($request, 'meetings.create');
|
||||||
$organization = $this->organization($request);
|
$organization = $this->organization($request);
|
||||||
|
|
||||||
$templates = Template::owned($this->ownerRef($request))
|
|
||||||
->where('organization_id', $organization->id)
|
|
||||||
->orderBy('name')
|
|
||||||
->get();
|
|
||||||
|
|
||||||
$members = Member::owned($this->ownerRef($request))
|
$members = Member::owned($this->ownerRef($request))
|
||||||
->where('organization_id', $organization->id)
|
->where('organization_id', $organization->id)
|
||||||
->where('user_ref', '!=', $this->ownerRef($request))
|
->where('user_ref', '!=', $this->ownerRef($request))
|
||||||
@@ -68,7 +60,6 @@ class ConferenceController extends Controller
|
|||||||
|
|
||||||
return view('meet.conferences.create', [
|
return view('meet.conferences.create', [
|
||||||
'organization' => $organization,
|
'organization' => $organization,
|
||||||
'templates' => $templates,
|
|
||||||
'members' => $members,
|
'members' => $members,
|
||||||
'timezones' => timezone_identifiers_list(),
|
'timezones' => timezone_identifiers_list(),
|
||||||
'defaultSettings' => config('meet.default_settings'),
|
'defaultSettings' => config('meet.default_settings'),
|
||||||
@@ -87,7 +78,6 @@ class ConferenceController extends Controller
|
|||||||
'duration_minutes' => ['nullable', 'integer', 'min:15', 'max:480'],
|
'duration_minutes' => ['nullable', 'integer', 'min:15', 'max:480'],
|
||||||
'timezone' => ['nullable', 'timezone'],
|
'timezone' => ['nullable', 'timezone'],
|
||||||
'passcode' => ['nullable', 'string', 'max:20'],
|
'passcode' => ['nullable', 'string', 'max:20'],
|
||||||
'template_id' => ['nullable', 'integer', 'exists:meet_templates,id'],
|
|
||||||
'invite_emails' => ['nullable', 'string'],
|
'invite_emails' => ['nullable', 'string'],
|
||||||
'presenter_refs' => ['nullable', 'array'],
|
'presenter_refs' => ['nullable', 'array'],
|
||||||
'presenter_refs.*' => ['string', 'max:64'],
|
'presenter_refs.*' => ['string', 'max:64'],
|
||||||
@@ -129,11 +119,6 @@ class ConferenceController extends Controller
|
|||||||
'status' => 'scheduled',
|
'status' => 'scheduled',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if (! empty($validated['template_id'])) {
|
|
||||||
$template = Template::findOrFail($validated['template_id']);
|
|
||||||
$data = $this->templates->applyToRoomData($template, $data);
|
|
||||||
}
|
|
||||||
|
|
||||||
$room = $this->rooms->create($request->user(), $organization, $data);
|
$room = $this->rooms->create($request->user(), $organization, $data);
|
||||||
|
|
||||||
if ($emails = trim((string) ($validated['invite_emails'] ?? ''))) {
|
if ($emails = trim((string) ($validated['invite_emails'] ?? ''))) {
|
||||||
@@ -184,6 +169,8 @@ class ConferenceController extends Controller
|
|||||||
$canManageSpeakers = app(\App\Services\Meet\MeetPermissions::class)
|
$canManageSpeakers = app(\App\Services\Meet\MeetPermissions::class)
|
||||||
->can($this->member($request), 'meetings.manage');
|
->can($this->member($request), 'meetings.manage');
|
||||||
|
|
||||||
|
$eventsEventUrl = \App\Support\EventsSourceLink::eventAdminUrl($room);
|
||||||
|
|
||||||
return view('meet.conferences.show', compact(
|
return view('meet.conferences.show', compact(
|
||||||
'room',
|
'room',
|
||||||
'speakers',
|
'speakers',
|
||||||
@@ -192,6 +179,7 @@ class ConferenceController extends Controller
|
|||||||
'memberUsers',
|
'memberUsers',
|
||||||
'presenterRefs',
|
'presenterRefs',
|
||||||
'canManageSpeakers',
|
'canManageSpeakers',
|
||||||
|
'eventsEventUrl',
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Meet;
|
|||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use App\Http\Controllers\Meet\Concerns\ScopesToAccount;
|
use App\Http\Controllers\Meet\Concerns\ScopesToAccount;
|
||||||
use App\Models\Room;
|
use App\Models\Room;
|
||||||
use App\Models\Template;
|
|
||||||
use App\Services\Meet\AttendanceService;
|
use App\Services\Meet\AttendanceService;
|
||||||
use App\Services\Meet\AvailabilityService;
|
use App\Services\Meet\AvailabilityService;
|
||||||
use App\Services\Meet\CalendarService;
|
use App\Services\Meet\CalendarService;
|
||||||
@@ -14,7 +13,6 @@ use App\Services\Meet\InvitationService;
|
|||||||
use App\Services\Meet\RecurringMeetingService;
|
use App\Services\Meet\RecurringMeetingService;
|
||||||
use App\Services\Meet\RoomService;
|
use App\Services\Meet\RoomService;
|
||||||
use App\Services\Meet\SessionService;
|
use App\Services\Meet\SessionService;
|
||||||
use App\Services\Meet\TemplateService;
|
|
||||||
use chillerlan\QRCode\QRCode;
|
use chillerlan\QRCode\QRCode;
|
||||||
use chillerlan\QRCode\QROptions;
|
use chillerlan\QRCode\QROptions;
|
||||||
use Illuminate\Http\RedirectResponse;
|
use Illuminate\Http\RedirectResponse;
|
||||||
@@ -29,7 +27,6 @@ class RoomController extends Controller
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
protected RoomService $rooms,
|
protected RoomService $rooms,
|
||||||
protected SessionService $sessions,
|
protected SessionService $sessions,
|
||||||
protected TemplateService $templates,
|
|
||||||
protected RecurringMeetingService $recurring,
|
protected RecurringMeetingService $recurring,
|
||||||
protected InvitationService $invitations,
|
protected InvitationService $invitations,
|
||||||
protected CalendarService $calendar,
|
protected CalendarService $calendar,
|
||||||
@@ -58,14 +55,8 @@ class RoomController extends Controller
|
|||||||
$this->authorizeAbility($request, 'meetings.create');
|
$this->authorizeAbility($request, 'meetings.create');
|
||||||
$organization = $this->organization($request);
|
$organization = $this->organization($request);
|
||||||
|
|
||||||
$templates = Template::owned($this->ownerRef($request))
|
|
||||||
->where('organization_id', $organization->id)
|
|
||||||
->orderBy('name')
|
|
||||||
->get();
|
|
||||||
|
|
||||||
return view('meet.rooms.create', [
|
return view('meet.rooms.create', [
|
||||||
'organization' => $organization,
|
'organization' => $organization,
|
||||||
'templates' => $templates,
|
|
||||||
'timezones' => timezone_identifiers_list(),
|
'timezones' => timezone_identifiers_list(),
|
||||||
'recurrenceRules' => config('meet.recurrence_rules'),
|
'recurrenceRules' => config('meet.recurrence_rules'),
|
||||||
'defaultSettings' => config('meet.default_settings'),
|
'defaultSettings' => config('meet.default_settings'),
|
||||||
@@ -85,7 +76,6 @@ class RoomController extends Controller
|
|||||||
'duration_minutes' => ['nullable', 'integer', 'min:15', 'max:480'],
|
'duration_minutes' => ['nullable', 'integer', 'min:15', 'max:480'],
|
||||||
'timezone' => ['nullable', 'timezone'],
|
'timezone' => ['nullable', 'timezone'],
|
||||||
'passcode' => ['nullable', 'string', 'max:20'],
|
'passcode' => ['nullable', 'string', 'max:20'],
|
||||||
'template_id' => ['nullable', 'integer', 'exists:meet_templates,id'],
|
|
||||||
'recurrence_rule' => ['nullable', 'string', 'in:'.implode(',', array_keys(config('meet.recurrence_rules')))],
|
'recurrence_rule' => ['nullable', 'string', 'in:'.implode(',', array_keys(config('meet.recurrence_rules')))],
|
||||||
'recurrence_interval' => ['nullable', 'integer', 'min:1', 'max:12'],
|
'recurrence_interval' => ['nullable', 'integer', 'min:1', 'max:12'],
|
||||||
'recurrence_until' => ['nullable', 'date'],
|
'recurrence_until' => ['nullable', 'date'],
|
||||||
@@ -113,11 +103,6 @@ class RoomController extends Controller
|
|||||||
'timezone' => $validated['timezone'] ?? $organization->timezone,
|
'timezone' => $validated['timezone'] ?? $organization->timezone,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if (! empty($validated['template_id'])) {
|
|
||||||
$template = Template::findOrFail($validated['template_id']);
|
|
||||||
$data = $this->templates->applyToRoomData($template, $data);
|
|
||||||
}
|
|
||||||
|
|
||||||
$isInstant = empty($validated['scheduled_at']);
|
$isInstant = empty($validated['scheduled_at']);
|
||||||
|
|
||||||
if (! empty($validated['recurrence_rule']) && ! $isInstant) {
|
if (! empty($validated['recurrence_rule']) && ! $isInstant) {
|
||||||
|
|||||||
@@ -6,13 +6,11 @@ use App\Http\Controllers\Controller;
|
|||||||
use App\Http\Controllers\Meet\Concerns\ScopesToAccount;
|
use App\Http\Controllers\Meet\Concerns\ScopesToAccount;
|
||||||
use App\Models\Member;
|
use App\Models\Member;
|
||||||
use App\Models\Room;
|
use App\Models\Room;
|
||||||
use App\Models\Template;
|
|
||||||
use App\Services\Meet\CalendarService;
|
use App\Services\Meet\CalendarService;
|
||||||
use App\Services\Meet\InvitationService;
|
use App\Services\Meet\InvitationService;
|
||||||
use App\Services\Meet\RoomService;
|
use App\Services\Meet\RoomService;
|
||||||
use App\Services\Meet\SessionService;
|
use App\Services\Meet\SessionService;
|
||||||
use App\Services\Meet\SpaceService;
|
use App\Services\Meet\SpaceService;
|
||||||
use App\Services\Meet\TemplateService;
|
|
||||||
use Illuminate\Http\RedirectResponse;
|
use Illuminate\Http\RedirectResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\View\View;
|
use Illuminate\View\View;
|
||||||
@@ -24,7 +22,6 @@ class SpaceController extends Controller
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
protected RoomService $rooms,
|
protected RoomService $rooms,
|
||||||
protected SessionService $sessions,
|
protected SessionService $sessions,
|
||||||
protected TemplateService $templates,
|
|
||||||
protected InvitationService $invitations,
|
protected InvitationService $invitations,
|
||||||
protected CalendarService $calendar,
|
protected CalendarService $calendar,
|
||||||
protected SpaceService $spaces,
|
protected SpaceService $spaces,
|
||||||
@@ -53,11 +50,6 @@ class SpaceController extends Controller
|
|||||||
$organization = $this->organization($request);
|
$organization = $this->organization($request);
|
||||||
$owner = $this->ownerRef($request);
|
$owner = $this->ownerRef($request);
|
||||||
|
|
||||||
$templates = Template::owned($owner)
|
|
||||||
->where('organization_id', $organization->id)
|
|
||||||
->orderBy('name')
|
|
||||||
->get();
|
|
||||||
|
|
||||||
$members = Member::owned($owner)
|
$members = Member::owned($owner)
|
||||||
->where('organization_id', $organization->id)
|
->where('organization_id', $organization->id)
|
||||||
->where('user_ref', '!=', $owner)
|
->where('user_ref', '!=', $owner)
|
||||||
@@ -66,7 +58,6 @@ class SpaceController extends Controller
|
|||||||
|
|
||||||
return view('meet.spaces.create', [
|
return view('meet.spaces.create', [
|
||||||
'organization' => $organization,
|
'organization' => $organization,
|
||||||
'templates' => $templates,
|
|
||||||
'members' => $members,
|
'members' => $members,
|
||||||
'timezones' => timezone_identifiers_list(),
|
'timezones' => timezone_identifiers_list(),
|
||||||
'defaultSettings' => config('meet.default_settings'),
|
'defaultSettings' => config('meet.default_settings'),
|
||||||
@@ -85,7 +76,6 @@ class SpaceController extends Controller
|
|||||||
'duration_minutes' => ['nullable', 'integer', 'min:15', 'max:480'],
|
'duration_minutes' => ['nullable', 'integer', 'min:15', 'max:480'],
|
||||||
'timezone' => ['nullable', 'timezone'],
|
'timezone' => ['nullable', 'timezone'],
|
||||||
'passcode' => ['nullable', 'string', 'max:20'],
|
'passcode' => ['nullable', 'string', 'max:20'],
|
||||||
'template_id' => ['nullable', 'integer', 'exists:meet_templates,id'],
|
|
||||||
'invite_emails' => ['nullable', 'string'],
|
'invite_emails' => ['nullable', 'string'],
|
||||||
'speaker_refs' => ['nullable', 'array'],
|
'speaker_refs' => ['nullable', 'array'],
|
||||||
'speaker_refs.*' => ['string', 'max:64'],
|
'speaker_refs.*' => ['string', 'max:64'],
|
||||||
@@ -120,11 +110,6 @@ class SpaceController extends Controller
|
|||||||
|
|
||||||
unset($data['speaker_refs'], $data['invite_only'], $data['mute_listeners']);
|
unset($data['speaker_refs'], $data['invite_only'], $data['mute_listeners']);
|
||||||
|
|
||||||
if (! empty($validated['template_id'])) {
|
|
||||||
$template = Template::findOrFail($validated['template_id']);
|
|
||||||
$data = $this->templates->applyToRoomData($template, $data);
|
|
||||||
}
|
|
||||||
|
|
||||||
$room = $this->rooms->create($request->user(), $organization, $data);
|
$room = $this->rooms->create($request->user(), $organization, $data);
|
||||||
|
|
||||||
if ($emails = trim((string) ($validated['invite_emails'] ?? ''))) {
|
if ($emails = trim((string) ($validated['invite_emails'] ?? ''))) {
|
||||||
|
|||||||
@@ -1,68 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Http\Controllers\Meet;
|
|
||||||
|
|
||||||
use App\Http\Controllers\Controller;
|
|
||||||
use App\Http\Controllers\Meet\Concerns\ScopesToAccount;
|
|
||||||
use App\Models\Template;
|
|
||||||
use App\Services\Meet\TemplateService;
|
|
||||||
use Illuminate\Http\RedirectResponse;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Illuminate\View\View;
|
|
||||||
|
|
||||||
class TemplateController extends Controller
|
|
||||||
{
|
|
||||||
use ScopesToAccount;
|
|
||||||
|
|
||||||
public function __construct(
|
|
||||||
protected TemplateService $templates,
|
|
||||||
) {}
|
|
||||||
|
|
||||||
public function index(Request $request): View
|
|
||||||
{
|
|
||||||
$this->authorizeAbility($request, 'meetings.manage');
|
|
||||||
$organization = $this->organization($request);
|
|
||||||
|
|
||||||
$templates = Template::owned($this->ownerRef($request))
|
|
||||||
->where('organization_id', $organization->id)
|
|
||||||
->orderBy('name')
|
|
||||||
->get();
|
|
||||||
|
|
||||||
return view('meet.templates.index', compact('templates', 'organization'));
|
|
||||||
}
|
|
||||||
|
|
||||||
public function create(Request $request): View
|
|
||||||
{
|
|
||||||
$this->authorizeAbility($request, 'meetings.manage');
|
|
||||||
|
|
||||||
return view('meet.templates.create', [
|
|
||||||
'defaultSettings' => config('meet.default_settings'),
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function store(Request $request): RedirectResponse
|
|
||||||
{
|
|
||||||
$this->authorizeAbility($request, 'meetings.manage');
|
|
||||||
$organization = $this->organization($request);
|
|
||||||
|
|
||||||
$validated = $request->validate([
|
|
||||||
'name' => ['required', 'string', 'max:255'],
|
|
||||||
'description' => ['nullable', 'string'],
|
|
||||||
'duration_minutes' => ['nullable', 'integer', 'min:15', 'max:480'],
|
|
||||||
'is_default' => ['sometimes', 'boolean'],
|
|
||||||
'waiting_room' => ['sometimes', 'boolean'],
|
|
||||||
'auto_record' => ['sometimes', 'boolean'],
|
|
||||||
'live_captions' => ['sometimes', 'boolean'],
|
|
||||||
]);
|
|
||||||
|
|
||||||
$this->templates->create($request->user(), $organization, array_merge($validated, [
|
|
||||||
'settings' => [
|
|
||||||
'waiting_room' => $request->boolean('waiting_room', true),
|
|
||||||
'auto_record' => $request->boolean('auto_record'),
|
|
||||||
'live_captions' => $request->boolean('live_captions'),
|
|
||||||
],
|
|
||||||
]));
|
|
||||||
|
|
||||||
return redirect()->route('meet.templates.index')->with('success', 'Template saved.');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -5,12 +5,10 @@ namespace App\Http\Controllers\Meet;
|
|||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use App\Http\Controllers\Meet\Concerns\ScopesToAccount;
|
use App\Http\Controllers\Meet\Concerns\ScopesToAccount;
|
||||||
use App\Models\Room;
|
use App\Models\Room;
|
||||||
use App\Models\Template;
|
|
||||||
use App\Services\Meet\CalendarService;
|
use App\Services\Meet\CalendarService;
|
||||||
use App\Services\Meet\InvitationService;
|
use App\Services\Meet\InvitationService;
|
||||||
use App\Services\Meet\RoomService;
|
use App\Services\Meet\RoomService;
|
||||||
use App\Services\Meet\SessionService;
|
use App\Services\Meet\SessionService;
|
||||||
use App\Services\Meet\TemplateService;
|
|
||||||
use Illuminate\Http\RedirectResponse;
|
use Illuminate\Http\RedirectResponse;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use Illuminate\View\View;
|
use Illuminate\View\View;
|
||||||
@@ -22,7 +20,6 @@ class WebinarController extends Controller
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
protected RoomService $rooms,
|
protected RoomService $rooms,
|
||||||
protected SessionService $sessions,
|
protected SessionService $sessions,
|
||||||
protected TemplateService $templates,
|
|
||||||
protected InvitationService $invitations,
|
protected InvitationService $invitations,
|
||||||
protected CalendarService $calendar,
|
protected CalendarService $calendar,
|
||||||
) {}
|
) {}
|
||||||
@@ -49,14 +46,8 @@ class WebinarController extends Controller
|
|||||||
$this->authorizeAbility($request, 'meetings.create');
|
$this->authorizeAbility($request, 'meetings.create');
|
||||||
$organization = $this->organization($request);
|
$organization = $this->organization($request);
|
||||||
|
|
||||||
$templates = Template::owned($this->ownerRef($request))
|
|
||||||
->where('organization_id', $organization->id)
|
|
||||||
->orderBy('name')
|
|
||||||
->get();
|
|
||||||
|
|
||||||
return view('meet.webinars.create', [
|
return view('meet.webinars.create', [
|
||||||
'organization' => $organization,
|
'organization' => $organization,
|
||||||
'templates' => $templates,
|
|
||||||
'timezones' => timezone_identifiers_list(),
|
'timezones' => timezone_identifiers_list(),
|
||||||
'defaultSettings' => config('meet.default_settings'),
|
'defaultSettings' => config('meet.default_settings'),
|
||||||
]);
|
]);
|
||||||
@@ -74,7 +65,6 @@ class WebinarController extends Controller
|
|||||||
'duration_minutes' => ['nullable', 'integer', 'min:15', 'max:480'],
|
'duration_minutes' => ['nullable', 'integer', 'min:15', 'max:480'],
|
||||||
'timezone' => ['nullable', 'timezone'],
|
'timezone' => ['nullable', 'timezone'],
|
||||||
'passcode' => ['nullable', 'string', 'max:20'],
|
'passcode' => ['nullable', 'string', 'max:20'],
|
||||||
'template_id' => ['nullable', 'integer', 'exists:meet_templates,id'],
|
|
||||||
'invite_emails' => ['nullable', 'string'],
|
'invite_emails' => ['nullable', 'string'],
|
||||||
'waiting_room' => ['sometimes', 'boolean'],
|
'waiting_room' => ['sometimes', 'boolean'],
|
||||||
'join_before_host' => ['sometimes', 'boolean'],
|
'join_before_host' => ['sometimes', 'boolean'],
|
||||||
@@ -105,11 +95,6 @@ class WebinarController extends Controller
|
|||||||
'status' => 'scheduled',
|
'status' => 'scheduled',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if (! empty($validated['template_id'])) {
|
|
||||||
$template = Template::findOrFail($validated['template_id']);
|
|
||||||
$data = $this->templates->applyToRoomData($template, $data);
|
|
||||||
}
|
|
||||||
|
|
||||||
$room = $this->rooms->create($request->user(), $organization, $data);
|
$room = $this->rooms->create($request->user(), $organization, $data);
|
||||||
|
|
||||||
if ($emails = trim((string) ($validated['invite_emails'] ?? ''))) {
|
if ($emails = trim((string) ($validated['invite_emails'] ?? ''))) {
|
||||||
@@ -135,7 +120,9 @@ class WebinarController extends Controller
|
|||||||
|
|
||||||
$room->load(['sessions.participants', 'invitations', 'sessions.recordings', 'sessions.aiSummaries', 'sessionFiles', 'webinarRegistrations']);
|
$room->load(['sessions.participants', 'invitations', 'sessions.recordings', 'sessions.aiSummaries', 'sessionFiles', 'webinarRegistrations']);
|
||||||
|
|
||||||
return view('meet.webinars.show', compact('room'));
|
$eventsEventUrl = \App\Support\EventsSourceLink::eventAdminUrl($room);
|
||||||
|
|
||||||
|
return view('meet.webinars.show', compact('room', 'eventsEventUrl'));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function start(Request $request, Room $room): RedirectResponse
|
public function start(Request $request, Room $room): RedirectResponse
|
||||||
|
|||||||
@@ -37,11 +37,6 @@ class Organization extends Model
|
|||||||
return $this->hasMany(Member::class, 'organization_id');
|
return $this->hasMany(Member::class, 'organization_id');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function templates(): HasMany
|
|
||||||
{
|
|
||||||
return $this->hasMany(Template::class, 'organization_id');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function securitySetting(string $key, mixed $default = null): mixed
|
public function securitySetting(string $key, mixed $default = null): mixed
|
||||||
{
|
{
|
||||||
return data_get($this->security_policy, $key, data_get(config('meet.security_defaults'), $key, $default));
|
return data_get($this->security_policy, $key, data_get(config('meet.security_defaults'), $key, $default));
|
||||||
|
|||||||
+1
-6
@@ -19,7 +19,7 @@ class Room extends Model
|
|||||||
'uuid', 'owner_ref', 'organization_id', 'branch_id', 'host_user_ref',
|
'uuid', 'owner_ref', 'organization_id', 'branch_id', 'host_user_ref',
|
||||||
'title', 'description', 'type', 'status', 'slug', 'scheduled_at',
|
'title', 'description', 'type', 'status', 'slug', 'scheduled_at',
|
||||||
'duration_minutes', 'timezone', 'passcode', 'settings', 'source', 'calendar_event_id',
|
'duration_minutes', 'timezone', 'passcode', 'settings', 'source', 'calendar_event_id',
|
||||||
'template_id', 'recurring_series_id', 'recurrence_rule', 'recurrence_interval', 'recurrence_until',
|
'recurring_series_id', 'recurrence_rule', 'recurrence_interval', 'recurrence_until',
|
||||||
];
|
];
|
||||||
|
|
||||||
protected function casts(): array
|
protected function casts(): array
|
||||||
@@ -144,11 +144,6 @@ class Room extends Model
|
|||||||
return $this->type === 'town_hall';
|
return $this->type === 'town_hall';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function template(): BelongsTo
|
|
||||||
{
|
|
||||||
return $this->belongsTo(Template::class, 'template_id');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function isRecurring(): bool
|
public function isRecurring(): bool
|
||||||
{
|
{
|
||||||
return filled($this->recurrence_rule);
|
return filled($this->recurrence_rule);
|
||||||
|
|||||||
@@ -1,50 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Models;
|
|
||||||
|
|
||||||
use App\Models\Concerns\BelongsToOwner;
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
|
||||||
use Illuminate\Database\Eloquent\Relations\BelongsTo;
|
|
||||||
use Illuminate\Database\Eloquent\SoftDeletes;
|
|
||||||
use Illuminate\Support\Str;
|
|
||||||
|
|
||||||
class Template extends Model
|
|
||||||
{
|
|
||||||
use BelongsToOwner, SoftDeletes;
|
|
||||||
|
|
||||||
protected $table = 'meet_templates';
|
|
||||||
|
|
||||||
protected $fillable = [
|
|
||||||
'uuid', 'owner_ref', 'organization_id', 'name', 'description',
|
|
||||||
'duration_minutes', 'settings', 'is_default',
|
|
||||||
];
|
|
||||||
|
|
||||||
protected function casts(): array
|
|
||||||
{
|
|
||||||
return ['settings' => 'array', 'is_default' => 'boolean'];
|
|
||||||
}
|
|
||||||
|
|
||||||
protected static function booted(): void
|
|
||||||
{
|
|
||||||
static::creating(function (Template $template) {
|
|
||||||
if (empty($template->uuid)) {
|
|
||||||
$template->uuid = (string) Str::uuid();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getRouteKeyName(): string
|
|
||||||
{
|
|
||||||
return 'uuid';
|
|
||||||
}
|
|
||||||
|
|
||||||
public function organization(): BelongsTo
|
|
||||||
{
|
|
||||||
return $this->belongsTo(Organization::class, 'organization_id');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function mergedSettings(): array
|
|
||||||
{
|
|
||||||
return array_merge(config('meet.default_settings'), $this->settings ?? []);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -72,7 +72,6 @@ class RecurringMeetingService
|
|||||||
'timezone' => $parent->timezone,
|
'timezone' => $parent->timezone,
|
||||||
'passcode' => $parent->passcode,
|
'passcode' => $parent->passcode,
|
||||||
'settings' => $parent->settings,
|
'settings' => $parent->settings,
|
||||||
'template_id' => $parent->template_id,
|
|
||||||
'recurring_series_id' => $parent->recurring_series_id,
|
'recurring_series_id' => $parent->recurring_series_id,
|
||||||
'recurrence_rule' => $parent->recurrence_rule,
|
'recurrence_rule' => $parent->recurrence_rule,
|
||||||
'recurrence_interval' => $parent->recurrence_interval,
|
'recurrence_interval' => $parent->recurrence_interval,
|
||||||
|
|||||||
@@ -1,42 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace App\Services\Meet;
|
|
||||||
|
|
||||||
use App\Models\Organization;
|
|
||||||
use App\Models\Template;
|
|
||||||
use App\Models\User;
|
|
||||||
use Illuminate\Support\Str;
|
|
||||||
|
|
||||||
class TemplateService
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* @param array<string, mixed> $data
|
|
||||||
*/
|
|
||||||
public function create(User $user, Organization $organization, array $data): Template
|
|
||||||
{
|
|
||||||
if ($data['is_default'] ?? false) {
|
|
||||||
Template::owned($user->ownerRef())
|
|
||||||
->where('organization_id', $organization->id)
|
|
||||||
->update(['is_default' => false]);
|
|
||||||
}
|
|
||||||
|
|
||||||
return Template::create([
|
|
||||||
'owner_ref' => $user->ownerRef(),
|
|
||||||
'organization_id' => $organization->id,
|
|
||||||
'name' => $data['name'],
|
|
||||||
'description' => $data['description'] ?? null,
|
|
||||||
'duration_minutes' => $data['duration_minutes'] ?? 60,
|
|
||||||
'settings' => array_merge(config('meet.default_settings'), $data['settings'] ?? []),
|
|
||||||
'is_default' => (bool) ($data['is_default'] ?? false),
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function applyToRoomData(Template $template, array $data): array
|
|
||||||
{
|
|
||||||
return array_merge($data, [
|
|
||||||
'duration_minutes' => $data['duration_minutes'] ?? $template->duration_minutes,
|
|
||||||
'settings' => array_merge($template->mergedSettings(), $data['settings'] ?? []),
|
|
||||||
'template_id' => $template->id,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Support;
|
||||||
|
|
||||||
|
use App\Models\Room;
|
||||||
|
|
||||||
|
class EventsSourceLink
|
||||||
|
{
|
||||||
|
public static function eventAdminUrl(Room $room): ?string
|
||||||
|
{
|
||||||
|
$source = (array) ($room->source ?? []);
|
||||||
|
|
||||||
|
if (($source['app'] ?? '') !== 'events') {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$eventId = (int) ($source['event_id'] ?? 0);
|
||||||
|
if ($eventId <= 0) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
$base = rtrim((string) config('meet.events_app_url', 'https://events.ladill.com'), '/');
|
||||||
|
|
||||||
|
return $base.'/events/'.$eventId.'/attendees';
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -27,9 +27,6 @@ return Application::configure(basePath: dirname(__DIR__))
|
|||||||
\Illuminate\Support\Facades\Route::bind('summary', function (string $value) {
|
\Illuminate\Support\Facades\Route::bind('summary', function (string $value) {
|
||||||
return \App\Models\AiSummary::where('uuid', $value)->firstOrFail();
|
return \App\Models\AiSummary::where('uuid', $value)->firstOrFail();
|
||||||
});
|
});
|
||||||
\Illuminate\Support\Facades\Route::bind('template', function (string $value) {
|
|
||||||
return \App\Models\Template::where('uuid', $value)->firstOrFail();
|
|
||||||
});
|
|
||||||
\Illuminate\Support\Facades\Route::bind('invitation', function (string $value) {
|
\Illuminate\Support\Facades\Route::bind('invitation', function (string $value) {
|
||||||
return \App\Models\Invitation::where('uuid', $value)->firstOrFail();
|
return \App\Models\Invitation::where('uuid', $value)->firstOrFail();
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -160,6 +160,8 @@ return [
|
|||||||
'recording.ready',
|
'recording.ready',
|
||||||
],
|
],
|
||||||
|
|
||||||
|
'events_app_url' => env('LADILL_EVENTS_APP_URL', 'https://events.ladill.com'),
|
||||||
|
|
||||||
'calendar' => [
|
'calendar' => [
|
||||||
'google' => [
|
'google' => [
|
||||||
'client_id' => env('GOOGLE_CALENDAR_CLIENT_ID'),
|
'client_id' => env('GOOGLE_CALENDAR_CLIENT_ID'),
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
Schema::table('meet_rooms', function (Blueprint $table) {
|
||||||
|
$table->dropConstrainedForeignId('template_id');
|
||||||
|
});
|
||||||
|
|
||||||
|
Schema::dropIfExists('meet_templates');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
Schema::create('meet_templates', function (Blueprint $table) {
|
||||||
|
$table->id();
|
||||||
|
$table->uuid('uuid')->unique();
|
||||||
|
$table->string('owner_ref')->index();
|
||||||
|
$table->foreignId('organization_id')->constrained('meet_organizations')->cascadeOnDelete();
|
||||||
|
$table->string('name');
|
||||||
|
$table->text('description')->nullable();
|
||||||
|
$table->unsignedSmallInteger('duration_minutes')->default(60);
|
||||||
|
$table->json('settings')->nullable();
|
||||||
|
$table->boolean('is_default')->default(false);
|
||||||
|
$table->timestamps();
|
||||||
|
$table->softDeletes();
|
||||||
|
});
|
||||||
|
|
||||||
|
Schema::table('meet_rooms', function (Blueprint $table) {
|
||||||
|
$table->foreignId('template_id')->nullable()->after('source')->constrained('meet_templates')->nullOnDelete();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -6,18 +6,6 @@
|
|||||||
<form method="POST" action="{{ route('meet.conferences.store') }}" class="mt-6 space-y-5 rounded-2xl border border-slate-200 bg-white p-6">
|
<form method="POST" action="{{ route('meet.conferences.store') }}" class="mt-6 space-y-5 rounded-2xl border border-slate-200 bg-white p-6">
|
||||||
@csrf
|
@csrf
|
||||||
|
|
||||||
@if ($templates->isNotEmpty())
|
|
||||||
<div>
|
|
||||||
<label class="block text-sm font-medium text-slate-700">Template</label>
|
|
||||||
<select name="template_id" class="mt-1 w-full rounded-lg border-slate-300 text-sm">
|
|
||||||
<option value="">None</option>
|
|
||||||
@foreach ($templates as $template)
|
|
||||||
<option value="{{ $template->id }}" @selected(old('template_id') == $template->id)>{{ $template->name }}</option>
|
|
||||||
@endforeach
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
@endif
|
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-slate-700">Title</label>
|
<label class="block text-sm font-medium text-slate-700">Title</label>
|
||||||
<input type="text" name="title" value="{{ old('title') }}" required class="mt-1 w-full rounded-lg border-slate-300 text-sm">
|
<input type="text" name="title" value="{{ old('title') }}" required class="mt-1 w-full rounded-lg border-slate-300 text-sm">
|
||||||
|
|||||||
@@ -4,6 +4,11 @@
|
|||||||
<p class="text-xs font-semibold uppercase tracking-wide text-violet-600">Conference</p>
|
<p class="text-xs font-semibold uppercase tracking-wide text-violet-600">Conference</p>
|
||||||
<h1 class="text-2xl font-semibold text-slate-900">{{ $room->title }}</h1>
|
<h1 class="text-2xl font-semibold text-slate-900">{{ $room->title }}</h1>
|
||||||
<p class="mt-1 text-sm text-slate-500">{{ config('meet.room_statuses')[$room->status] ?? $room->status }}</p>
|
<p class="mt-1 text-sm text-slate-500">{{ config('meet.room_statuses')[$room->status] ?? $room->status }}</p>
|
||||||
|
@if(! empty($eventsEventUrl))
|
||||||
|
<a href="{{ $eventsEventUrl }}" target="_blank" rel="noopener" class="mt-2 inline-flex text-sm font-medium text-violet-600 hover:text-violet-800">
|
||||||
|
View in Ladill Events →
|
||||||
|
</a>
|
||||||
|
@endif
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@if ($errors->any())
|
@if ($errors->any())
|
||||||
@@ -130,6 +135,8 @@
|
|||||||
@endif
|
@endif
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@include('meet.partials.programme-agenda', ['room' => $room])
|
||||||
|
|
||||||
@if ($room->sessions->isNotEmpty())
|
@if ($room->sessions->isNotEmpty())
|
||||||
<div class="mt-6 rounded-2xl border border-slate-200 bg-white p-6">
|
<div class="mt-6 rounded-2xl border border-slate-200 bg-white p-6">
|
||||||
<h2 class="text-sm font-medium text-slate-700">Sessions</h2>
|
<h2 class="text-sm font-medium text-slate-700">Sessions</h2>
|
||||||
|
|||||||
@@ -0,0 +1,65 @@
|
|||||||
|
@php
|
||||||
|
$programme = $room->setting('programme_snapshot');
|
||||||
|
$linkedItems = (array) $room->setting('linked_programme_items', []);
|
||||||
|
@endphp
|
||||||
|
|
||||||
|
@if(is_array($programme) && ! empty($programme['days']))
|
||||||
|
<div class="mt-6 rounded-2xl border border-slate-200 bg-white p-6">
|
||||||
|
<h2 class="text-sm font-medium text-slate-700">Agenda</h2>
|
||||||
|
@if(! empty($programme['title']))
|
||||||
|
<p class="mt-1 text-xs text-slate-500">{{ $programme['title'] }}</p>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
@if($linkedItems !== [])
|
||||||
|
<p class="mt-2 text-xs font-semibold uppercase tracking-wide text-violet-600">Linked to this session</p>
|
||||||
|
<ul class="mt-2 space-y-2 text-sm text-slate-700">
|
||||||
|
@foreach($linkedItems as $item)
|
||||||
|
<li class="rounded-lg border border-violet-100 bg-violet-50/50 px-3 py-2">
|
||||||
|
@if(! empty($item['time']))
|
||||||
|
<span class="font-mono text-xs text-slate-500">{{ $item['time'] }}</span>
|
||||||
|
@endif
|
||||||
|
<span class="font-medium">{{ $item['title'] ?? 'Item' }}</span>
|
||||||
|
@if(! empty($item['host']))
|
||||||
|
<span class="text-slate-500"> · {{ $item['host'] }}</span>
|
||||||
|
@endif
|
||||||
|
</li>
|
||||||
|
@endforeach
|
||||||
|
</ul>
|
||||||
|
@endif
|
||||||
|
|
||||||
|
<div class="mt-4 space-y-4">
|
||||||
|
@foreach((array) ($programme['days'] ?? []) as $day)
|
||||||
|
<div>
|
||||||
|
@if(! empty($day['label']) || ! empty($day['date']))
|
||||||
|
<h3 class="text-xs font-semibold uppercase tracking-wide text-slate-500">
|
||||||
|
{{ trim(($day['label'] ?? '').' '.($day['date'] ?? '')) }}
|
||||||
|
</h3>
|
||||||
|
@endif
|
||||||
|
<ul class="mt-2 divide-y divide-slate-100 text-sm">
|
||||||
|
@foreach((array) ($day['items'] ?? []) as $item)
|
||||||
|
<li class="py-2">
|
||||||
|
<div class="flex gap-3">
|
||||||
|
@if(! empty($item['time']))
|
||||||
|
<span class="w-14 shrink-0 font-mono text-xs text-slate-400">{{ $item['time'] }}</span>
|
||||||
|
@endif
|
||||||
|
<div>
|
||||||
|
<p class="font-medium text-slate-800">{{ $item['title'] ?? '' }}</p>
|
||||||
|
@if(! empty($item['description']))
|
||||||
|
<p class="mt-0.5 text-xs text-slate-500">{{ $item['description'] }}</p>
|
||||||
|
@endif
|
||||||
|
@if(! empty($item['location']) || ! empty($item['host']))
|
||||||
|
<p class="mt-0.5 text-xs text-slate-400">
|
||||||
|
@if(! empty($item['location'])){{ $item['location'] }}@endif
|
||||||
|
@if(! empty($item['host'])) · {{ $item['host'] }}@endif
|
||||||
|
</p>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
@endforeach
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
@endforeach
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
@endif
|
||||||
@@ -5,18 +5,6 @@
|
|||||||
<form method="POST" action="{{ route('meet.rooms.store') }}" class="mt-6 space-y-5 rounded-2xl border border-slate-200 bg-white p-6">
|
<form method="POST" action="{{ route('meet.rooms.store') }}" class="mt-6 space-y-5 rounded-2xl border border-slate-200 bg-white p-6">
|
||||||
@csrf
|
@csrf
|
||||||
|
|
||||||
@if ($templates->isNotEmpty())
|
|
||||||
<div>
|
|
||||||
<label class="block text-sm font-medium text-slate-700">Template</label>
|
|
||||||
<select name="template_id" class="mt-1 w-full rounded-lg border-slate-300 text-sm">
|
|
||||||
<option value="">None</option>
|
|
||||||
@foreach ($templates as $template)
|
|
||||||
<option value="{{ $template->id }}" @selected(old('template_id') == $template->id)>{{ $template->name }}</option>
|
|
||||||
@endforeach
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
@endif
|
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-slate-700">Title</label>
|
<label class="block text-sm font-medium text-slate-700">Title</label>
|
||||||
<input type="text" name="title" value="{{ old('title') }}" required class="mt-1 w-full rounded-lg border-slate-300 text-sm">
|
<input type="text" name="title" value="{{ old('title') }}" required class="mt-1 w-full rounded-lg border-slate-300 text-sm">
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
<x-app-layout title="New template">
|
|
||||||
<div class="mx-auto max-w-lg">
|
|
||||||
<h1 class="text-xl font-semibold text-slate-900">New meeting template</h1>
|
|
||||||
<form method="POST" action="{{ route('meet.templates.store') }}" class="mt-6 space-y-4 rounded-2xl border border-slate-200 bg-white p-6">
|
|
||||||
@csrf
|
|
||||||
<div>
|
|
||||||
<label class="block text-sm font-medium text-slate-700">Name</label>
|
|
||||||
<input type="text" name="name" required class="mt-1 w-full rounded-lg border-slate-300 text-sm">
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label class="block text-sm font-medium text-slate-700">Duration (minutes)</label>
|
|
||||||
<input type="number" name="duration_minutes" value="60" min="15" max="480" class="mt-1 w-full rounded-lg border-slate-300 text-sm">
|
|
||||||
</div>
|
|
||||||
<label class="flex items-center gap-2 text-sm"><input type="checkbox" name="is_default" value="1" class="rounded border-slate-300"> Default template</label>
|
|
||||||
<label class="flex items-center gap-2 text-sm"><input type="checkbox" name="waiting_room" value="1" checked class="rounded border-slate-300"> Waiting room (host admits guests)</label>
|
|
||||||
<label class="flex items-center gap-2 text-sm"><input type="checkbox" name="auto_record" value="1" class="rounded border-slate-300"> Auto-record</label>
|
|
||||||
<label class="flex items-center gap-2 text-sm"><input type="checkbox" name="live_captions" value="1" class="rounded border-slate-300"> Live captions</label>
|
|
||||||
<button type="submit" class="btn-primary w-full">Save template</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</x-app-layout>
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
<x-app-layout title="Meeting templates">
|
|
||||||
<div class="flex items-center justify-between">
|
|
||||||
<h1 class="text-xl font-semibold text-slate-900">Meeting templates</h1>
|
|
||||||
<a href="{{ route('meet.templates.create') }}" class="btn-primary">New template</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="mt-4 grid gap-3 sm:grid-cols-2">
|
|
||||||
@forelse ($templates as $template)
|
|
||||||
<div class="rounded-2xl border border-slate-200 bg-white p-4">
|
|
||||||
<h3 class="font-medium text-slate-900">{{ $template->name }}</h3>
|
|
||||||
<p class="mt-1 text-sm text-slate-500">{{ $template->duration_minutes }} min @if($template->is_default) · Default @endif</p>
|
|
||||||
</div>
|
|
||||||
@empty
|
|
||||||
<p class="col-span-full rounded-2xl border border-dashed border-slate-200 bg-white p-8 text-center text-sm text-slate-500">No templates yet.</p>
|
|
||||||
@endforelse
|
|
||||||
</div>
|
|
||||||
</x-app-layout>
|
|
||||||
@@ -6,18 +6,6 @@
|
|||||||
<form method="POST" action="{{ route('meet.webinars.store') }}" class="mt-6 space-y-5 rounded-2xl border border-slate-200 bg-white p-6">
|
<form method="POST" action="{{ route('meet.webinars.store') }}" class="mt-6 space-y-5 rounded-2xl border border-slate-200 bg-white p-6">
|
||||||
@csrf
|
@csrf
|
||||||
|
|
||||||
@if ($templates->isNotEmpty())
|
|
||||||
<div>
|
|
||||||
<label class="block text-sm font-medium text-slate-700">Template</label>
|
|
||||||
<select name="template_id" class="mt-1 w-full rounded-lg border-slate-300 text-sm">
|
|
||||||
<option value="">None</option>
|
|
||||||
@foreach ($templates as $template)
|
|
||||||
<option value="{{ $template->id }}" @selected(old('template_id') == $template->id)>{{ $template->name }}</option>
|
|
||||||
@endforeach
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
@endif
|
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium text-slate-700">Title</label>
|
<label class="block text-sm font-medium text-slate-700">Title</label>
|
||||||
<input type="text" name="title" value="{{ old('title') }}" required class="mt-1 w-full rounded-lg border-slate-300 text-sm">
|
<input type="text" name="title" value="{{ old('title') }}" required class="mt-1 w-full rounded-lg border-slate-300 text-sm">
|
||||||
|
|||||||
@@ -5,6 +5,11 @@
|
|||||||
<p class="text-xs font-semibold uppercase tracking-wide text-indigo-600">Webinar</p>
|
<p class="text-xs font-semibold uppercase tracking-wide text-indigo-600">Webinar</p>
|
||||||
<h1 class="text-2xl font-semibold text-slate-900">{{ $room->title }}</h1>
|
<h1 class="text-2xl font-semibold text-slate-900">{{ $room->title }}</h1>
|
||||||
<p class="mt-1 text-sm text-slate-500">{{ config('meet.room_statuses')[$room->status] ?? $room->status }}</p>
|
<p class="mt-1 text-sm text-slate-500">{{ config('meet.room_statuses')[$room->status] ?? $room->status }}</p>
|
||||||
|
@if(! empty($eventsEventUrl))
|
||||||
|
<a href="{{ $eventsEventUrl }}" target="_blank" rel="noopener" class="mt-2 inline-flex text-sm font-medium text-indigo-600 hover:text-indigo-800">
|
||||||
|
View in Ladill Events →
|
||||||
|
</a>
|
||||||
|
@endif
|
||||||
</div>
|
</div>
|
||||||
@if ($room->canRestart())
|
@if ($room->canRestart())
|
||||||
<form method="POST" action="{{ route('meet.webinars.start', $room) }}">
|
<form method="POST" action="{{ route('meet.webinars.start', $room) }}">
|
||||||
@@ -84,6 +89,8 @@
|
|||||||
@endif
|
@endif
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@include('meet.partials.programme-agenda', ['room' => $room])
|
||||||
|
|
||||||
@php
|
@php
|
||||||
$recordings = $room->sessions->flatMap->recordings->sortByDesc('created_at');
|
$recordings = $room->sessions->flatMap->recordings->sortByDesc('created_at');
|
||||||
$summaries = $room->sessions->flatMap->aiSummaries->where('status', 'ready')->sortByDesc('created_at');
|
$summaries = $room->sessions->flatMap->aiSummaries->where('status', 'ready')->sortByDesc('created_at');
|
||||||
|
|||||||
@@ -31,11 +31,6 @@
|
|||||||
'icon' => '<path stroke-linecap="round" stroke-linejoin="round" d="M8.625 9.75a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Zm0 0H8.25m4.125 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Zm0 0H12m4.125 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Zm0 0h-.375m-13.5 3.01c0 1.6 1.123 2.994 2.707 3.227 1.087.16 2.185.283 3.293.369V21l4.184-4.183a1.14 1.14 0 0 1 .778-.332 48.294 48.294 0 0 0 7.83-.498c1.585-.233 2.708-1.626 2.708-3.228V6.741c0-1.602-1.123-2.995-2.707-3.228A48.394 48.394 0 0 0 12 2.25a48.394 48.394 0 0 0-8.25 1.07C2.123 3.546 1 4.939 1 6.541v6.018Z" />'],
|
'icon' => '<path stroke-linecap="round" stroke-linejoin="round" d="M8.625 9.75a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Zm0 0H8.25m4.125 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Zm0 0H12m4.125 0a.375.375 0 1 1-.75 0 .375.375 0 0 1 .75 0Zm0 0h-.375m-13.5 3.01c0 1.6 1.123 2.994 2.707 3.227 1.087.16 2.185.283 3.293.369V21l4.184-4.183a1.14 1.14 0 0 1 .778-.332 48.294 48.294 0 0 0 7.83-.498c1.585-.233 2.708-1.626 2.708-3.228V6.741c0-1.602-1.123-2.995-2.707-3.228A48.394 48.394 0 0 0 12 2.25a48.394 48.394 0 0 0-8.25 1.07C2.123 3.546 1 4.939 1 6.541v6.018Z" />'],
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($permissions->isAdmin($member)) {
|
|
||||||
$nav[] = ['name' => 'Templates', 'route' => route('meet.templates.index'), 'active' => request()->routeIs('meet.templates.*'),
|
|
||||||
'icon' => '<path stroke-linecap="round" stroke-linejoin="round" d="M19.5 14.25v-2.625a3.375 3.375 0 0 0-3.375-3.375h-1.5A1.125 1.125 0 0 1 13.5 7.125v-1.5a3.375 3.375 0 0 0-3.375-3.375H8.25m0 12.75h7.5m-7.5 3H12M10.5 2.25H5.625c-.621 0-1.125.504-1.125 1.125v17.25c0 .621.504 1.125 1.125 1.125h12.75c.621 0 1.125-.504 1.125-1.125V11.25a9 9 0 0 0-9-9Z" />'];
|
|
||||||
}
|
|
||||||
|
|
||||||
$adminNav = [];
|
$adminNav = [];
|
||||||
if ($permissions->isAdmin($member)) {
|
if ($permissions->isAdmin($member)) {
|
||||||
$adminNav[] = ['name' => 'Usage', 'route' => route('meet.admin.usage'), 'active' => request()->routeIs('meet.admin.*'),
|
$adminNav[] = ['name' => 'Usage', 'route' => route('meet.admin.usage'), 'active' => request()->routeIs('meet.admin.*'),
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ use App\Http\Controllers\Meet\RoomController;
|
|||||||
use App\Http\Controllers\Meet\SpaceController;
|
use App\Http\Controllers\Meet\SpaceController;
|
||||||
use App\Http\Controllers\Meet\SettingsController;
|
use App\Http\Controllers\Meet\SettingsController;
|
||||||
use App\Http\Controllers\Meet\SummaryController;
|
use App\Http\Controllers\Meet\SummaryController;
|
||||||
use App\Http\Controllers\Meet\TemplateController;
|
|
||||||
use App\Http\Controllers\Meet\WebinarRegistrationController;
|
use App\Http\Controllers\Meet\WebinarRegistrationController;
|
||||||
use App\Http\Controllers\Meet\WebinarController;
|
use App\Http\Controllers\Meet\WebinarController;
|
||||||
use App\Http\Controllers\Meet\WebhookSettingsController;
|
use App\Http\Controllers\Meet\WebhookSettingsController;
|
||||||
@@ -198,10 +197,6 @@ Route::middleware(['auth', 'platform.session'])->group(function () {
|
|||||||
|
|
||||||
Route::get('/summaries/{summary}', [SummaryController::class, 'show'])->name('meet.summaries.show');
|
Route::get('/summaries/{summary}', [SummaryController::class, 'show'])->name('meet.summaries.show');
|
||||||
|
|
||||||
Route::get('/templates', [TemplateController::class, 'index'])->name('meet.templates.index');
|
|
||||||
Route::get('/templates/create', [TemplateController::class, 'create'])->name('meet.templates.create');
|
|
||||||
Route::post('/templates', [TemplateController::class, 'store'])->name('meet.templates.store');
|
|
||||||
|
|
||||||
Route::get('/settings/security', [SettingsController::class, 'security'])->name('meet.settings.security');
|
Route::get('/settings/security', [SettingsController::class, 'security'])->name('meet.settings.security');
|
||||||
Route::put('/settings/security', [SettingsController::class, 'updateSecurity'])->name('meet.settings.security.update');
|
Route::put('/settings/security', [SettingsController::class, 'updateSecurity'])->name('meet.settings.security.update');
|
||||||
Route::get('/settings', [SettingsController::class, 'edit'])->name('meet.settings');
|
Route::get('/settings', [SettingsController::class, 'edit'])->name('meet.settings');
|
||||||
|
|||||||
@@ -423,22 +423,6 @@ class MeetWebTest extends TestCase
|
|||||||
->assertSee('Recordings');
|
->assertSee('Recordings');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function test_admin_can_create_template(): void
|
|
||||||
{
|
|
||||||
$this->actingAs($this->user)
|
|
||||||
->post('/templates', [
|
|
||||||
'name' => 'Weekly standup',
|
|
||||||
'duration_minutes' => 30,
|
|
||||||
'waiting_room' => '1',
|
|
||||||
])
|
|
||||||
->assertRedirect(route('meet.templates.index'));
|
|
||||||
|
|
||||||
$this->assertDatabaseHas('meet_templates', [
|
|
||||||
'name' => 'Weekly standup',
|
|
||||||
'organization_id' => $this->organization->id,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
public function test_admin_can_update_security_policy(): void
|
public function test_admin_can_update_security_policy(): void
|
||||||
{
|
{
|
||||||
$this->actingAs($this->user)
|
$this->actingAs($this->user)
|
||||||
|
|||||||
Reference in New Issue
Block a user