fix eventdetailpage time and badgemask

Author: tonyqiu123

.github/workflows/send-newsletter.yml

@@ -65,3 +65,5 @@ jobs:
             backend/scripts/*.log
           retention-days: 30
 
+
+

backend/apps/events/migrations/0025_add_events_query_optimization_index.py

@@ -19,3 +19,5 @@ class Migration(migrations.Migration):
         ),
     ]
 
+
+

backend/apps/events/views.py

@@ -221,7 +221,7 @@ def get_event(request, event_id):
         # Get upcoming event dates
         event_data["upcoming_dates"] = list(
             EventDates.objects.filter(event_id=event_id, dtstart_utc__gte=timezone.now())
-            .order_by('dtstart_utc')[:10].values("dtstart_utc", "dtend_utc")
+            .order_by('dtstart_utc').values("dtstart_utc", "dtend_utc")
         )
 
         return Response(event_data)

backend/tests/test_submission_utils.py

@@ -138,3 +138,5 @@ def test_duration_calculation(self):
         # Duration should be 2 hours
         assert result["duration"] == timedelta(hours=2)
 
+
+

backend/utils/event_dates_utils.py

@@ -165,10 +165,14 @@ def create_event_dates_from_event_data(event, event_data=None):
     event_dates_list = []
 
     for occurrence in occurrences:
-        # Calculate end time for this occurrence
-        occurrence_utc = occurrence.astimezone(pytz.UTC)
         occurrence_end = calculate_end_time(dtstart, dtend, duration, occurrence)
-        occurrence_end_utc = occurrence_end.astimezone(pytz.UTC) if occurrence_end else None
+        
+        if not event.rrule and not event.rdate:
+            occurrence_utc = dtstart_utc
+            occurrence_end_utc = dtend_utc
+        else:
+            occurrence_utc = occurrence.astimezone(pytz.UTC)
+            occurrence_end_utc = occurrence_end.astimezone(pytz.UTC) if occurrence_end else None
 
         event_date = EventDates(
             event=event,

backend/utils/submission_utils.py

@@ -197,3 +197,5 @@ def compute_event_fields(event_data: Dict[str, Any], screenshot_url: str = None)
 
     return computed_data
 
+
+

frontend/src/features/events/pages/EventDetailPage.tsx

@@ -231,19 +231,6 @@ function EventDetailPage() {
           </Button>
         </div>
 
-        {/* Original Screenshot (if available for submitter/admin) */}
-        {(event as any)?.screenshot_url && (
-          <div className="mb-6 bg-white dark:bg-gray-800 rounded-lg shadow-lg p-6">
-            <h2 className="text-xl font-bold text-gray-900 dark:text-white mb-4">Original Screenshot</h2>
-            <div className="relative w-full max-w-2xl mx-auto">
-              <img
-                src={(event as any).screenshot_url}
-                alt="Original event screenshot"
-                className="w-full h-auto rounded-lg shadow-lg"
-              />
-            </div>
-          </div>
-        )}
 
         {/* Edit Mode */}
         <div className="mb-6 bg-white dark:bg-gray-800 rounded-lg shadow-lg p-6">
@@ -467,22 +454,22 @@ function EventDetailPage() {
         className="relative max-w-lg mx-auto"
       >
         {/* Polaroid Frame */}
-        <div className="bg-white dark:bg-gray-800 rounded-2xl shadow-2xl p-4">
+        <div className="bg-white dark:bg-gray-900 rounded-xl shadow-lg dark:shadow-gray-700 p-4">
           {/* Image Section */}
           <div className="relative mb-4">
             {event.source_image_url ? (
               <div className="relative">
                 <img
                   src={event.source_image_url}
                   alt={event.title}
-                  className="w-full h-48 object-cover rounded-lg shadow-lg aspect-square"
+                  className="w-full h-48 object-cover rounded-lg aspect-square"
                 />
                 <EventStatusBadge event={event} />
                 <NewEventBadge event={event} />
                 <OrganizationBadge event={event} />
               </div>
             ) : (
-              <div className="w-full h-48 bg-gradient-to-br from-blue-100 to-purple-100 dark:from-gray-700 dark:to-gray-600 rounded-lg shadow-lg flex items-center justify-center aspect-square">
+              <div className="w-full h-48 bg-gradient-to-br from-blue-100 to-purple-100 dark:from-gray-700 dark:to-gray-600 rounded-lg flex items-center justify-center aspect-square">
                 <div className="text-center">
                   <Calendar className="h-16 w-16 text-gray-400 dark:text-gray-500 mx-auto mb-4" />
                   <p className="text-gray-500 dark:text-gray-400 text-lg">
@@ -691,29 +678,6 @@ function EventDetailPage() {
           </div>
         </div>
       </motion.div>
-
-      {/* Original Screenshot (if available for submitter/admin) */}
-      {(event as any)?.screenshot_url && (
-        <motion.div
-          initial={{ opacity: 0, y: 20 }}
-          animate={{ opacity: 1, y: 0 }}
-          transition={{ duration: 0.5, delay: 0.2 }}
-          className="mt-8 max-w-lg mx-auto"
-        >
-          <div className="bg-white dark:bg-gray-800 rounded-2xl shadow-2xl p-4">
-            <h3 className="text-lg font-bold text-gray-900 dark:text-white mb-4 text-center">
-              Original Screenshot
-            </h3>
-            <div className="relative w-full">
-              <img
-                src={(event as any).screenshot_url}
-                alt="Original event screenshot"
-                className="w-full h-auto rounded-lg shadow-lg"
-              />
-            </div>
-          </div>
-        </motion.div>
-      )}
     </div>
   );
 }

frontend/src/shared/hooks/useAdmin.ts

@@ -8,3 +8,4 @@ export function useAdmin() {
 }
 
 
+