table fix
This commit is contained in:
parent
86ec8c9b2e
commit
1d69230d45
@ -46,7 +46,7 @@ const InteractiveBackground = () => {
|
|||||||
default: 'bounce',
|
default: 'bounce',
|
||||||
},
|
},
|
||||||
random: false,
|
random: false,
|
||||||
speed: 2,
|
speed: 0.5,
|
||||||
straight: false,
|
straight: false,
|
||||||
},
|
},
|
||||||
number: {
|
number: {
|
||||||
|
|||||||
@ -23,7 +23,7 @@ const Dashboard = () => {
|
|||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if(hasPermission(currentUser, 'READ_EVENTS')) {
|
if(hasPermission(currentUser, 'READ_EVENTS')) {
|
||||||
dispatch(fetchEvents({ query: '?sort=createdAt,DESC&limit=5' }));
|
dispatch(fetchEvents({ query: '?sort=start_datetime,ASC&limit=5' }));
|
||||||
}
|
}
|
||||||
if(hasPermission(currentUser, 'READ_GUESTS')) {
|
if(hasPermission(currentUser, 'READ_GUESTS')) {
|
||||||
dispatch(fetchGuests({ query: '' }));
|
dispatch(fetchGuests({ query: '' }));
|
||||||
@ -31,7 +31,7 @@ const Dashboard = () => {
|
|||||||
}, [dispatch, currentUser]);
|
}, [dispatch, currentUser]);
|
||||||
|
|
||||||
const upcomingEvents = events.filter(
|
const upcomingEvents = events.filter(
|
||||||
(event) => new Date(event.date) > new Date()
|
(event) => new Date(event.start_datetime) > new Date()
|
||||||
);
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@ -97,18 +97,18 @@ const Dashboard = () => {
|
|||||||
<tr key={event.id}>
|
<tr key={event.id}>
|
||||||
<td className="px-6 py-4 whitespace-nowrap">{event.name}</td>
|
<td className="px-6 py-4 whitespace-nowrap">{event.name}</td>
|
||||||
<td className="px-6 py-4 whitespace-nowrap">
|
<td className="px-6 py-4 whitespace-nowrap">
|
||||||
{new Date(event.date).toLocaleDateString()}
|
{new Date(event.start_datetime).toLocaleDateString()}
|
||||||
</td>
|
</td>
|
||||||
<td className="px-6 py-4 whitespace-nowrap">{event.location}</td>
|
<td className="px-6 py-4 whitespace-nowrap">{event.location}</td>
|
||||||
<td className="px-6 py-4 whitespace-nowrap">
|
<td className="px-6 py-4 whitespace-nowrap">
|
||||||
<span
|
<span
|
||||||
className={`px-2 inline-flex text-xs leading-5 font-semibold rounded-full ${
|
className={`px-2 inline-flex text-xs leading-5 font-semibold rounded-full ${
|
||||||
new Date(event.date) < new Date()
|
new Date(event.start_datetime) < new Date()
|
||||||
? 'bg-red-100 text-red-800'
|
? 'bg-red-100 text-red-800'
|
||||||
: 'bg-green-100 text-green-800'
|
: 'bg-green-100 text-green-800'
|
||||||
}`}
|
}`}
|
||||||
>
|
>
|
||||||
{new Date(event.date) < new Date() ? 'Past' : 'Upcoming'}
|
{new Date(event.start_datetime) < new Date() ? 'Past' : 'Upcoming'}
|
||||||
</span>
|
</span>
|
||||||
</td>
|
</td>
|
||||||
<td className="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
|
<td className="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user