{
return [
new Channel('App.Control'),
- new PrivateChannel('App.Models.User.'.$this->user->id),
+ new PrivateChannel('User.'.$this->user->id),
];
}
$events->where('title', 'LIKE', '%'.$validatedData['phrase'].'%');
}
if (isset($validatedData['with'])) {
+ if (in_array('crews', $validatedData['with'])) {
+ $events->with(['crews', 'crews.user']);
+ }
if (in_array('description', $validatedData['with'])) {
$events->with('description');
}
public function single(Request $request, Event $event) {
$this->authorize('view', $event);
- $event->load('description');
+ $event->load(['crews', 'crews.user', 'description']);
return $event->toArray();
}
+ public function manageCrew(Request $request, Event $event) {
+ $this->authorize('manageCrew', $event);
+
+ $validatedData = $request->validate([
+ 'add_user' => 'numeric|exists:App\Models\User,id',
+ 'modify_user' => 'numeric|exists:App\Models\User,id',
+ 'remove_user' => 'numeric|exists:App\Models\User,id',
+ 'role' => 'string|in:admin,helper',
+ ]);
+
+ if (isset($validatedData['add_user'])) {
+ $event->crews()->create([
+ 'user_id' => $validatedData['add_user'],
+ ]);
+ }
+ if (isset($validatedData['modify_user'], $validatedData['role'])) {
+ $crew = $event->crews()->where('user_id', '=', $validatedData['modify_user'])->firstOrFail();
+ $crew->role = $validatedData['role'];
+ $crew->save();
+ }
+ if (isset($validatedData['remove_user'])) {
+ $crew = $event->crews()->where('user_id', '=', $validatedData['remove_user'])->firstOrFail();
+ $crew->delete();
+ }
+
+ return $event->fresh()->load(['crews', 'crews.user'])->toArray();
+ }
+
public function web(Request $request, string $name) {
$event = Event::where('name', '=', $name)->first();
if ($event) {
namespace App\Models;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Database\Eloquent\BroadcastsEvents;
use Illuminate\Database\Eloquent\Model;
class EventCrew extends Model {
+ use BroadcastsEvents;
+
+ public function broadcastOn(string $event): array {
+ $channels = [
+ new PrivateChannel('User.'.$this->user_id),
+ ];
+ return $channels;
+ }
+
+ public function broadcastWith(string $event): void {
+ $this->load(['event']);
+ }
+
+
public function event() {
return $this->belongsTo(Event::class);
}
'user_id' => 'string',
];
+ protected $fillable = [
+ 'user_id',
+ ];
+
}
->count() > 0;
}
+ public function isEventCrew(Event $event) {
+ return $this->event_crews()
+ ->where('event_id', '=', $event->id)
+ ->count() > 0;
+ }
+
public function isApplicant(Tournament $tournament) {
foreach ($tournament->applications as $applicant) {
if ($applicant->user_id == $this->id) {
*/
public function view(User $user, Episode $episode)
{
- return $episode->event->visible;
+ return $episode->event->visible || $user->isEventCrew($episode->event);
}
/**
* @return \Illuminate\Auth\Access\Response|bool
*/
public function update(User $user, Episode $episode) {
- return $user->isEventAdmin($episode->event);
+ return $user->isEventCrew($episode->event);
}
/**
*/
public function delete(User $user, Episode $episode)
{
- return $user->isEventAdmin($episode->event);
+ return $user->isEventCrew($episode->event);
}
/**
* @return \Illuminate\Auth\Access\Response|bool
*/
public function addEpisode(User $user, Event $event) {
- return $user->isEventAdmin($event);
+ return $user->isEventCrew($event);
+ }
+
+ /**
+ * Determine whether the user manage the crew for the event.
+ *
+ * @param \App\Models\User $user
+ * @param \App\Models\Event $event
+ * @return \Illuminate\Auth\Access\Response|bool
+ */
+ public function manageCrew(User $user, Event $event) {
+ return $user->isAdmin() || $user->isEventAdmin($event);
}
}
Icon.BROWSER_SOURCE = makePreset('BrowserSourceIcon', 'tv');
Icon.CHANGED = makePreset('ChangedIcon', 'pen-to-square');
Icon.CHART = makePreset('ChartIcon', 'chart-line');
+Icon.CREW = makePreset('CrewIcon', 'users');
Icon.CROSSHAIRS = makePreset('CrosshairsIcon', 'crosshairs');
Icon.DELETE = makePreset('DeleteIcon', 'user-xmark');
Icon.DISCORD = makePreset('DiscordIcon', ['fab', 'discord']);
--- /dev/null
+import PropTypes from 'prop-types';
+import React from 'react';
+import { Button, Form } from 'react-bootstrap';
+import { useTranslation } from 'react-i18next';
+
+import UserSelect from '../common/UserSelect';
+import Icon from '../common/Icon';
+import UserBox from '../users/Box';
+import { mayAdminEvent } from '../../helpers/permissions';
+import { compareUsername } from '../../helpers/User';
+import { useUser } from '../../hooks/user';
+
+const sortCrew = (crew) => {
+ const sorted = [...crew];
+ sorted.sort((a, b) => {
+ if (a.role === b.role) {
+ return compareUsername(a.user, b.user);
+ }
+ if (a.role === 'admin' && b.role !== 'admin') {
+ return -1;
+ }
+ if (b.role === 'admin' && a.role !== 'admin') {
+ return 1;
+ }
+ return compareUsername(a.user, b.user);
+ });
+ return sorted;
+};
+
+const Crew = ({ addCrew, editCrew, event, removeCrew }) => {
+ const { t } = useTranslation();
+ const { user } = useUser();
+
+ const mayAdmin = React.useMemo(() => mayAdminEvent(user, event), [event, user]);
+
+ const sortedCrew = React.useMemo(() => sortCrew(event.crews || []), [event]);
+
+ return <div>
+ {mayAdmin ?
+ <Form.Group controlId="crew.addCrew">
+ <Form.Label>{t('events.addCrew')}</Form.Label>
+ <Form.Control
+ as={UserSelect}
+ excludeIds={event.crews.map(c => c.user_id)}
+ onChange={e => addCrew(e.target.value)}
+ value=""
+ />
+ </Form.Group>
+ : null}
+ {sortedCrew.map((crew) => (
+ <div className="d-flex align-items-center justify-content-between my-2" key={crew.id}>
+ <UserBox user={crew.user} />
+ {mayAdmin ?
+ <div className="button-bar d-flex align-items-center">
+ <Form.Select
+ onChange={(e) => editCrew(crew.user_id, { role: e.target.value })}
+ value={crew.role}
+ >
+ {['admin', 'helper'].map((role =>
+ <option key={role} value={role}>{t(`events.roles.${role}`)}</option>
+ ))}
+ </Form.Select>
+ <Button
+ onClick={() => removeCrew(crew.user_id)}
+ size="sm"
+ title={t('button.remove')}
+ variant="outline-danger"
+ >
+ <Icon.DELETE title="" />
+ </Button>
+ </div>
+ :
+ <span>{t(`events.roles.${crew.role}`)}</span>
+ }
+ </div>
+ ))}
+ </div>;
+};
+
+Crew.propTypes = {
+ addCrew: PropTypes.func,
+ editCrew: PropTypes.func,
+ event: PropTypes.shape({
+ crews: PropTypes.arrayOf(PropTypes.shape({
+ })),
+ }),
+ removeCrew: PropTypes.func,
+};
+
+export default Crew;
--- /dev/null
+import PropTypes from 'prop-types';
+import React from 'react';
+import { Button, Modal } from 'react-bootstrap';
+import { useTranslation } from 'react-i18next';
+
+import Crew from './Crew';
+import Loading from '../common/Loading';
+
+const CrewDialog = ({
+ addCrew,
+ editCrew,
+ event,
+ onHide,
+ removeCrew,
+ show,
+}) => {
+ const { t } = useTranslation();
+
+ return <Modal onHide={onHide} show={show} size="md">
+ <Modal.Header closeButton>
+ <Modal.Title>
+ {t('events.manageCrew')}
+ </Modal.Title>
+ </Modal.Header>
+ <Modal.Body>
+ <React.Suspense fallback={<Loading />}>
+ <Crew
+ addCrew={addCrew}
+ editCrew={editCrew}
+ event={event}
+ removeCrew={removeCrew}
+ />
+ </React.Suspense>
+ </Modal.Body>
+ <Modal.Footer>
+ <Button onClick={onHide} variant="secondary">
+ {t('button.close')}
+ </Button>
+ </Modal.Footer>
+ </Modal>;
+};
+
+CrewDialog.propTypes = {
+ addCrew: PropTypes.func,
+ editCrew: PropTypes.func,
+ event: PropTypes.shape({
+ id: PropTypes.number,
+ }),
+ onHide: PropTypes.func,
+ removeCrew: PropTypes.func,
+ show: PropTypes.bool,
+};
+
+export default CrewDialog;
|| event.title}
</h1>
<div className="button-bar">
+ {actions.manageCrew ?
+ <Button
+ onClick={() => actions.manageCrew(event)}
+ size="sm"
+ title={t('button.crew')}
+ variant="outline-secondary"
+ >
+ <Icon.CREW title="" />
+ </Button>
+ : null}
{event.description && actions.editContent ?
<Button
onClick={() => actions.editContent(event.description)}
Detail.propTypes = {
actions: PropTypes.shape({
editContent: PropTypes.func,
+ manageCrew: PropTypes.func,
}),
event: PropTypes.shape({
banner: PropTypes.string,
user && event && user.event_crews &&
user.event_crews.find(c => c.role === 'admin' && c.event_id === event.id);
-export const mayAddEpisodes = (user, event) => isEventAdmin(user, event);
+export const isEventCrew = (user, event) =>
+ user && event && user.event_crews &&
+ user.event_crews.find(c => c.event_id === event.id);
+
+export const mayAddEpisodes = (user, event) => isEventCrew(user, event);
+
+export const mayAdminEvent = (user, event) => isAdmin(user) || isEventAdmin(user, event);
// Tournaments
};
}, []);
+ React.useEffect(() => {
+ if (!user?.id) return;
+ window.Echo.private(`User.${user.id}`)
+ .listen('.EventCrewCreated', ({ model }) => {
+ setUser((u) => ({
+ ...u,
+ event_crews: [
+ ...u.event_crews || [],
+ model,
+ ],
+ }));
+ })
+ .listen('.EventCrewUpdated', ({ model }) => {
+ setUser((u) => ({
+ ...u,
+ event_crews: (u.event_crews || []).map((c) => c.id === model.id ? model : c),
+ }));
+ })
+ .listen('.EventCrewDeleted', ({ model }) => {
+ setUser((u) => ({
+ ...u,
+ event_crews: (u.event_crews || []).filter((c) => c.id !== model.id),
+ }));
+ });
+ return () => {
+ window.Echo.leave(`User.${user.id}`);
+ };
+ }, [user?.id]);
+
const login = React.useCallback(async (creds) => {
try {
await axios.post('/login', {
chart: 'Diagramm',
close: 'Schließen',
confirm: 'Bestätigen',
+ crew: 'Crew',
delete: 'Löschen',
edit: 'Bearbeiten',
exportExcel: 'XLSX Exportieren',
},
},
events: {
+ addCrew: 'Mitglied hinzufügen',
concluded: 'Diese Veranstaltung is abgeschlossen.',
+ crewAddError: 'Fehler beim Hinzufügen',
+ crewEditError: 'Fehler beim Speichern',
+ crewRemoveError: 'Fehler beim Entfernen',
description: 'Speedrun und Randomizer Veranstaltungen für A Link to the Past',
end: 'Ende',
evergreen: 'Ständige Veranstaltungen',
heading: 'Veranstaltungen',
+ manageCrew: 'Crew verwalten',
noPastEpisodes: 'Keine vergangenen Rennen gefunden.',
noUpcomingEpisodes: 'Keine anstehenden Rennen gefunden.',
ongoing: 'Laufende Veranstaltungen',
past: 'Vergangene Veranstaltungen',
pastEpisodes: 'Vergangene Rennen',
+ roles: {
+ admin: 'Admin',
+ helper: 'Aushilfe',
+ },
setFutureMode: 'Anstehende Rennen zeigen',
setPastMode: 'Vergangene Rennen zeigen',
start: 'Start',
chart: 'Chart',
close: 'Close',
confirm: 'Confirm',
+ crew: 'Crew',
delete: 'Delete',
edit: 'Edit',
exportExcel: 'Export XLSX',
},
},
events: {
+ addCrew: 'Add member',
concluded: 'This event has concluded.',
+ crewAddError: 'Error adding member',
+ crewEditError: 'Error saving changes',
+ crewRemoveError: 'Error removing member',
description: 'Speedrun and randomizer events for A Link to the Past',
end: 'End',
evergreen: 'Evergreen events',
heading: 'Events',
+ manageCrew: 'Manage crew',
noPastEpisodes: 'No past races found.',
noUpcomingEpisodes: 'No upcoming races found.',
ongoing: 'Ongoing events',
past: 'Past events',
pastEpisodes: 'Past races',
+ roles: {
+ admin: 'Admin',
+ helper: 'Helper',
+ },
setFutureMode: 'Show upcoming races',
setPastMode: 'Show past races',
start: 'Start',
import Icon from '../components/common/Icon';
import Loading from '../components/common/Loading';
import EpisodeList from '../components/episodes/List';
+import CrewDialog from '../components/events/CrewDialog';
import Detail from '../components/events/Detail';
import Dialog from '../components/techniques/Dialog';
import { getTimeZoneString } from '../helpers/Episode';
import { hasConcluded } from '../helpers/Event';
import {
+ mayAdminEvent,
mayEditContent,
} from '../helpers/permissions';
import { getTranslation } from '../helpers/Technique';
const [episodes, setEpisodes] = React.useState([]);
const [pastMode, setPastMode] = React.useState(false);
const [showContentDialog, setShowContentDialog] = React.useState(false);
+ const [showCrewDialog, setShowCrewDialog] = React.useState(false);
const actions = React.useMemo(() => ({
editContent: mayEditContent(user) ? content => {
setEditContent(content);
setShowContentDialog(true);
} : null,
- }), [user]);
+ manageCrew: mayAdminEvent(user, event) ? () => {
+ setShowCrewDialog(true);
+ } : null,
+ }), [event, user]);
const fetchEpisodes = React.useCallback((controller, event) => {
if (!event) {
});
}, [pastMode]);
+ const addCrew = React.useCallback(async (user_id) => {
+ try {
+ const response = await axios.post(`/api/events/${event.id}/crew`, {
+ add_user: user_id,
+ });
+ setEvent(e => ({ ...e, crews: response.data.crews }));
+ } catch (error) {
+ toastr.error(t('events.crewAddError', { error }));
+ }
+ }, [event?.id, t]);
+
+ const editCrew = React.useCallback(async (user_id, changes) => {
+ try {
+ const response = await axios.post(`/api/events/${event.id}/crew`, {
+ modify_user: user_id,
+ ...changes,
+ });
+ setEvent(e => ({ ...e, crews: response.data.crews }));
+ } catch (error) {
+ toastr.error(t('events.crewEditError', { error }));
+ }
+ }, [event?.id, t]);
+
+ const removeCrew = React.useCallback(async (user_id) => {
+ try {
+ const response = await axios.post(`/api/events/${event.id}/crew`, {
+ remove_user: user_id,
+ });
+ setEvent(e => ({ ...e, crews: response.data.crews }));
+ } catch (error) {
+ toastr.error(t('events.crewRemoveError', { error }));
+ }
+ }, [event?.id, t]);
+
const saveContent = React.useCallback(async values => {
try {
const response = await axios.put(`/api/content/${values.id}`, {
}
</Container>
</EpisodesProvider>
+ <CrewDialog
+ addCrew={addCrew}
+ editCrew={editCrew}
+ event={event}
+ onHide={() => { setShowCrewDialog(false); }}
+ removeCrew={removeCrew}
+ show={showCrewDialog}
+ />
<Dialog
content={editContent}
language={i18n.language}
Route::get('events', 'App\Http\Controllers\EventController@search');
Route::get('events/{event:name}', 'App\Http\Controllers\EventController@single');
Route::post('events/{event}/add-episode', 'App\Http\Controllers\EpisodeController@create');
+Route::post('events/{event}/crew', 'App\Http\Controllers\EventController@manageCrew');
Route::post('group-assignments/{assignment}/change', 'App\Http\Controllers\GroupAssignmentController@changeAssignment');
|
*/
-Broadcast::channel('App.Models.User.{id}', function ($user, $id) {
+Broadcast::channel('User.{id}', function ($user, $id) {
return (int) $user->id === (int) $id;
});
projects / alttp.git / commitdiff