Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 47 additions & 25 deletions src/components/CommunityPortal/CPDashboard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import { getUserTimezone, formatEventTimeWithTimezone } from '../../utils/timezoneUtils';
import styles from './CPDashboard.module.css';
import { ENDPOINTS } from '../../utils/URL';
import { Link } from 'react-router-dom';

Check warning on line 20 in src/components/CommunityPortal/CPDashboard.jsx

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this unused import of 'Link'.

See more on https://sonarcloud.io/project/issues?id=OneCommunityGlobal_HighestGoodNetworkApp&issues=AZ2OV2XvfThgDgWw93Mx&open=AZ2OV2XvfThgDgWw93Mx&pullRequest=5148
import DatePicker from 'react-datepicker';
import 'react-datepicker/dist/react-datepicker.css';
import { toast } from 'react-toastify';
Expand Down Expand Up @@ -89,6 +90,7 @@
const [dateFilter, setDateFilter] = useState('');
const [error, setError] = useState(null);
const [failedLogos, setFailedLogos] = useState(new Set());
const [showPastEvents, setShowPastEvents] = useState(false);
const darkMode = useSelector(state => state.theme.darkMode);
const [pagination, setPagination] = useState({
currentPage: 1,
Expand Down Expand Up @@ -236,36 +238,52 @@
return null;
};

const filteredEvents = events.filter(event => {
if (onlineOnly) {
const isOnlineEvent = event.location?.toLowerCase() === 'virtual';
if (!isOnlineEvent) return false;
}
const now = new Date();

if (dateFilter === 'tomorrow') {
if (!isTomorrow(event.date)) return false;
} else if (dateFilter === 'weekend') {
if (!isComingWeekend(event.date)) return false;
}
const isPastEvent = event => {
const ref = event.startTime || event.date;
if (!ref) return false;
return new Date(ref) < now;
};

const eventDate = event.date ? parseEventDate(event.date) : null;
if (selectedDate && eventDate !== selectedDate) {
return false;
}
const filteredEvents = events
.filter(event => {
if (!showPastEvents && isPastEvent(event)) return false;

if (!searchQuery) return true;
const term = searchQuery.toLowerCase();
if (onlineOnly) {
const isOnlineEvent = event.location?.toLowerCase() === 'virtual';
if (!isOnlineEvent) return false;
}

return (
fuzzySearch(event.title, term, 0.6) ||
fuzzySearch(event.location, term, 0.6) ||
fuzzySearch(event.organizer, term, 0.6)
);
});
if (dateFilter === 'tomorrow') {
if (!isTomorrow(event.date)) return false;
} else if (dateFilter === 'weekend') {
if (!isComingWeekend(event.date)) return false;
}

const eventDate = event.date ? parseEventDate(event.date) : null;
if (selectedDate && eventDate !== selectedDate) {
return false;
}

if (!searchQuery) return true;
const term = searchQuery.toLowerCase();

return (
fuzzySearch(event.title, term, 0.6) ||
fuzzySearch(event.location, term, 0.6) ||
fuzzySearch(event.organizer, term, 0.6)
);
})
.sort((a, b) => {
const aTime = new Date(a.startTime || a.date || 0);
const bTime = new Date(b.startTime || b.date || 0);
return aTime - bTime;
});

useEffect(() => {
setPagination(prev => ({ ...prev, currentPage: 1 }));
}, [searchQuery, selectedDate, onlineOnly, dateFilter]);
}, [searchQuery, selectedDate, onlineOnly, dateFilter, showPastEvents]);

const totalPages = Math.ceil(filteredEvents.length / pagination.limit) || 1;

Expand Down Expand Up @@ -521,8 +539,12 @@
<Col md={9} className={`${styles.dashboardMain} ${darkMode ? styles.darkMain : ''}`}>
<div className={styles.eventsHeader}>
<h2 className={styles.sectionTitle}>Events</h2>
<Button color="primary" className={styles.showPastEventsBtn}>
Show Past Events
<Button
color="primary"
className={styles.showPastEventsBtn}
onClick={() => setShowPastEvents(prev => !prev)}
>
{showPastEvents ? 'Hide Past Events' : 'Show Past Events'}
</Button>
</div>

Expand Down
Loading