Add city and country fields

src/components/ConferenceCard.tsx

@@ -1,6 +1,6 @@
 import { CalendarDays, Globe, Tag, Clock, AlarmClock } from "lucide-react";
 import { Conference } from "@/types/conference";
-import { formatDistanceToNow, parseISO, isValid } from "date-fns";
+import { formatDistanceToNow, parseISO, isValid, isPast } from "date-fns";
 import ConferenceDialog from "./ConferenceDialog";
 import { useState } from "react";
 
@@ -15,12 +15,21 @@ const ConferenceCard = ({
   link,
   note,
   abstract_deadline,
+  city,
+  country,
+  venue,
   ...conferenceProps
 }: Conference) => {
   const [dialogOpen, setDialogOpen] = useState(false);
   const deadlineDate = deadline && deadline !== 'TBD' ? parseISO(deadline) : null;
-  const daysLeft = deadlineDate && isValid(deadlineDate) ? formatDistanceToNow(deadlineDate, { addSuffix: true }) : 'TBD';
-  
+  const isPastDeadline = deadlineDate ? isPast(deadlineDate) : false;
+  const timeRemaining = deadlineDate && !isPastDeadline
+    ? formatDistanceToNow(deadlineDate, { addSuffix: true })
+    : null;
+
+  // Create location string by concatenating city and country
+  const location = [city, country].filter(Boolean).join(", ");
+
   // Determine countdown color based on days remaining
   const getCountdownColor = () => {
     if (!deadlineDate || !isValid(deadlineDate)) return "text-neutral-600";
@@ -86,10 +95,12 @@ const ConferenceCard = ({
             <CalendarDays className="h-4 w-4 mr-2 flex-shrink-0" />
             <span className="text-sm truncate">{date}</span>
           </div>
-          <div className="flex items-center text-neutral">
-            <Globe className="h-4 w-4 mr-2 flex-shrink-0" />
-            <span className="text-sm truncate">{place}</span>
-          </div>
+          {location && (
+            <div className="flex items-center text-neutral">
+              <Globe className="h-4 w-4 mr-2 flex-shrink-0" />
+              <span className="text-sm truncate">{location}</span>
+            </div>
+          )}
           <div className="flex items-center text-neutral">
             <Clock className="h-4 w-4 mr-2 flex-shrink-0" />
             <span className="text-sm truncate">
@@ -99,7 +110,7 @@ const ConferenceCard = ({
           <div className="flex items-center">
             <AlarmClock className={`h-4 w-4 mr-2 flex-shrink-0 ${getCountdownColor()}`} />
             <span className={`text-sm font-medium truncate ${getCountdownColor()}`}>
-              {daysLeft}
+              {timeRemaining}
             </span>
           </div>
         </div>
@@ -121,7 +132,22 @@ const ConferenceCard = ({
       </div>
 
       <ConferenceDialog
-        conference={{ title, full_name, date, place, deadline, timezone, tags, link, note, abstract_deadline, ...conferenceProps }}
+        conference={{
+          title,
+          full_name,
+          date,
+          place,
+          deadline,
+          timezone,
+          tags,
+          link,
+          note,
+          abstract_deadline,
+          city,
+          country,
+          venue,
+          ...conferenceProps
+        }}
         open={dialogOpen}
         onOpenChange={setDialogOpen}
       />

src/components/ConferenceDialog.tsx

@@ -24,9 +24,32 @@ interface ConferenceDialogProps {
 }
 
 const ConferenceDialog = ({ conference, open, onOpenChange }: ConferenceDialogProps) => {
+  console.log('Conference object:', conference);
   const deadlineDate = conference.deadline && conference.deadline !== 'TBD' ? parseISO(conference.deadline) : null;
   const [countdown, setCountdown] = useState<string>('');
 
+  // Replace the current location string creation with this more verbose version
+  const getLocationString = () => {
+    console.log('Venue:', conference.venue);
+    console.log('City:', conference.city);
+    console.log('Country:', conference.country);
+
+    if (conference.venue) {
+      return conference.venue;
+    }
+
+    const cityCountryArray = [conference.city, conference.country].filter(Boolean);
+    console.log('City/Country array after filter:', cityCountryArray);
+    
+    const cityCountryString = cityCountryArray.join(", ");
+    console.log('Final location string:', cityCountryString);
+
+    return cityCountryString || "Location TBD"; // Fallback if everything is empty
+  };
+
+  // Use the function result
+  const location = getLocationString();
+
   useEffect(() => {
     const calculateTimeLeft = () => {
       if (!deadlineDate || !isValid(deadlineDate)) {
@@ -110,12 +133,12 @@ const ConferenceDialog = ({ conference, open, onOpenChange }: ConferenceDialogPr
       const formatDateForApple = (date: Date) => format(date, "yyyyMMdd'T'HHmmss'Z'");
 
       const title = encodeURIComponent(`${conference.title} deadline`);
-      const location = encodeURIComponent(conference.place);
+      const locationStr = encodeURIComponent(location);
       const description = encodeURIComponent(
         `Paper Submission Deadline for ${conference.full_name || conference.title}\n` +
         (conference.abstract_deadline ? `Abstract Deadline: ${conference.abstract_deadline}\n` : '') +
         `Dates: ${conference.date}\n` +
-        `Location: ${conference.place}\n` +
+        `Location: ${location}\n` +
         (conference.link ? `Website: ${conference.link}` : '')
       );
 
@@ -124,7 +147,7 @@ const ConferenceDialog = ({ conference, open, onOpenChange }: ConferenceDialogPr
           `&text=${title}` +
           `&dates=${formatDateForGoogle(deadlineDate)}/${formatDateForGoogle(endDate)}` +
           `&details=${description}` +
-          `&location=${location}` +
+          `&location=${locationStr}` +
           `&sprop=website:${encodeURIComponent(conference.link || '')}`;
         window.open(url, '_blank');
       } else {
@@ -159,91 +182,92 @@ END:VCALENDAR`;
 
   return (
     <Dialog open={open} onOpenChange={onOpenChange}>
-      <DialogContent className="max-w-xl">
+      <DialogContent className="max-w-2xl max-h-[90vh] overflow-y-auto">
         <DialogHeader>
-          <DialogTitle>{conference.title} {conference.year}</DialogTitle>
-          <DialogDescription>
+          <DialogTitle className="text-2xl font-bold text-blue-600">{conference.title}</DialogTitle>
+          <DialogDescription className="text-base text-gray-700">
             {conference.full_name}
           </DialogDescription>
         </DialogHeader>
+        
+        <div className="space-y-6 mt-4">
+          <div className="space-y-4">
+            <div className="flex items-start gap-2">
+              <CalendarDays className="h-5 w-5 mt-0.5 text-gray-500" />
+              <div>
+                <p className="font-medium">Dates</p>
+                <p className="text-sm text-gray-500">{conference.date}</p>
+              </div>
+            </div>
 
-        <div className="space-y-4">
-          <div className="flex items-start gap-2">
-            <CalendarDays className="h-5 w-5 mt-0.5 text-gray-500" />
-            <div>
-              <p className="font-medium">Dates</p>
-              <p className="text-sm text-gray-500">{conference.date}</p>
+            <div className="flex items-start gap-2">
+              <Globe className="h-5 w-5 mt-0.5 text-gray-500" />
+              <div>
+                <p className="font-medium">Location</p>
+                <p className="text-sm text-gray-500">
+                  {conference.venue || [conference.city, conference.country].filter(Boolean).join(", ")}
+                </p>
+              </div>
             </div>
-          </div>
 
-          <div className="flex items-start gap-2">
-            <Clock className="h-5 w-5 mt-0.5 text-gray-500" />
-            <div className="space-y-2 flex-1">
-              <p className="font-medium">Important Deadlines</p>
-              <div className="text-sm text-gray-500 space-y-2">
-                {conference.abstract_deadline && (
+            <div className="flex items-start gap-2">
+              <Clock className="h-5 w-5 mt-0.5 text-gray-500" />
+              <div className="space-y-2 flex-1">
+                <p className="font-medium">Important Deadlines</p>
+                <div className="text-sm text-gray-500 space-y-2">
+                  {conference.abstract_deadline && (
+                    <div className="bg-gray-100 rounded-md p-2">
+                      <p>Abstract: {parseISO(conference.abstract_deadline) && isValid(parseISO(conference.abstract_deadline)) 
+                        ? format(parseISO(conference.abstract_deadline), "MMMM d, yyyy")
+                        : conference.abstract_deadline}
+                      </p>
+                    </div>
+                  )}
                   <div className="bg-gray-100 rounded-md p-2">
-                    <p>Abstract: {parseISO(conference.abstract_deadline) && isValid(parseISO(conference.abstract_deadline)) 
-                      ? format(parseISO(conference.abstract_deadline), "MMMM d, yyyy")
-                      : conference.abstract_deadline}
+                    <p>Submission: {conference.deadline && conference.deadline !== 'TBD' && isValid(parseISO(conference.deadline))
+                      ? format(parseISO(conference.deadline), "MMMM d, yyyy")
+                      : conference.deadline}
                     </p>
                   </div>
-                )}
-                <div className="bg-gray-100 rounded-md p-2">
-                  <p>Submission: {conference.deadline && conference.deadline !== 'TBD' && isValid(parseISO(conference.deadline))
-                    ? format(parseISO(conference.deadline), "MMMM d, yyyy")
-                    : conference.deadline}
-                  </p>
+                  {conference.commitment_deadline && (
+                    <div className="bg-gray-100 rounded-md p-2">
+                      <p>Commitment: {isValid(parseISO(conference.commitment_deadline))
+                        ? format(parseISO(conference.commitment_deadline), "MMMM d, yyyy")
+                        : conference.commitment_deadline}
+                      </p>
+                    </div>
+                  )}
+                  {conference.review_release_date && (
+                    <div className="bg-gray-100 rounded-md p-2">
+                      <p>Reviews Released: {isValid(parseISO(conference.review_release_date))
+                        ? format(parseISO(conference.review_release_date), "MMMM d, yyyy")
+                        : conference.review_release_date}
+                      </p>
+                    </div>
+                  )}
+                  {(conference.rebuttal_period_start || conference.rebuttal_period_end) && (
+                    <div className="bg-gray-100 rounded-md p-2">
+                      <p>Rebuttal Period: {conference.rebuttal_period_start && isValid(parseISO(conference.rebuttal_period_start))
+                        ? format(parseISO(conference.rebuttal_period_start), "MMMM d, yyyy")
+                        : conference.rebuttal_period_start} - {conference.rebuttal_period_end && isValid(parseISO(conference.rebuttal_period_end))
+                        ? format(parseISO(conference.rebuttal_period_end), "MMMM d, yyyy")
+                        : conference.rebuttal_period_end}
+                      </p>
+                    </div>
+                  )}
+                  {conference.final_decision_date && (
+                    <div className="bg-gray-100 rounded-md p-2">
+                      <p>Final Decision: {isValid(parseISO(conference.final_decision_date))
+                        ? format(parseISO(conference.final_decision_date), "MMMM d, yyyy")
+                        : conference.final_decision_date}
+                      </p>
+                    </div>
+                  )}
                 </div>
-                {conference.commitment_deadline && (
-                  <div className="bg-gray-100 rounded-md p-2">
-                    <p>Commitment: {isValid(parseISO(conference.commitment_deadline))
-                      ? format(parseISO(conference.commitment_deadline), "MMMM d, yyyy")
-                      : conference.commitment_deadline}
-                    </p>
-                  </div>
-                )}
-                {conference.review_release_date && (
-                  <div className="bg-gray-100 rounded-md p-2">
-                    <p>Reviews Released: {isValid(parseISO(conference.review_release_date))
-                      ? format(parseISO(conference.review_release_date), "MMMM d, yyyy")
-                      : conference.review_release_date}
-                    </p>
-                  </div>
-                )}
-                {(conference.rebuttal_period_start || conference.rebuttal_period_end) && (
-                  <div className="bg-gray-100 rounded-md p-2">
-                    <p>Rebuttal Period: {conference.rebuttal_period_start && isValid(parseISO(conference.rebuttal_period_start))
-                      ? format(parseISO(conference.rebuttal_period_start), "MMMM d, yyyy")
-                      : conference.rebuttal_period_start} - {conference.rebuttal_period_end && isValid(parseISO(conference.rebuttal_period_end))
-                      ? format(parseISO(conference.rebuttal_period_end), "MMMM d, yyyy")
-                      : conference.rebuttal_period_end}
-                    </p>
-                  </div>
-                )}
-                {conference.final_decision_date && (
-                  <div className="bg-gray-100 rounded-md p-2">
-                    <p>Final Decision: {isValid(parseISO(conference.final_decision_date))
-                      ? format(parseISO(conference.final_decision_date), "MMMM d, yyyy")
-                      : conference.final_decision_date}
-                    </p>
-                  </div>
-                )}
               </div>
             </div>
           </div>
 
-          <div className="flex items-start gap-2">
-            <Globe className="h-5 w-5 mt-0.5 text-gray-500" />
-            <div>
-              <p className="font-medium">Location</p>
-              <p className="text-sm text-gray-500">{conference.place}</p>
-              {conference.venue && (
-                <p className="text-sm text-gray-500">{conference.venue}</p>
-              )}
-            </div>
-          </div>
-
           <div className="flex items-center">
             <AlarmClock className={`h-5 w-5 mr-3 flex-shrink-0 ${getCountdownColor()}`} />
             <div>

src/data/conferences.yml

@@ -39,7 +39,7 @@
 - title: ICRA
   year: 2025
   id: icra25
-  full_name: IEEE International Conference on Robotics and Automation
+  full_name: International Conference on Robotics and Automation
   link: https://2025.ieee-icra.org
   deadline: '2024-07-15 12:00:00'
   timezone: UTC-4
@@ -57,7 +57,7 @@
 - title: WACV
   year: 2025
   id: wacv25
-  full_name: IEEE/CVF Winter Conference on Applications of Computer Vision
+  full_name: Winter Conference on Applications of Computer Vision
   link: https://wacv2025.thecvf.com/
   deadline: '2024-07-15 23:59:59'
   timezone: UTC-7
@@ -114,7 +114,7 @@
 - title: ICASSP
   year: 2025
   id: icassp25
-  full_name: IEEE International Conference on Acoustics, Speech and Signal Processing
+  full_name: International Conference on Acoustics, Speech and Signal Processing
   link: https://2025.ieeeicassp.org/
   deadline: '2024-09-09 23:59:59'
   timezone: UTC-12
@@ -290,7 +290,7 @@
 - title: CVPR
   year: 2025
   id: cvpr25
-  full_name: IEEE/CVF Conference on Computer Vision and Pattern Recognition
+  full_name: Conference on Computer Vision and Pattern Recognition
   link: https://cvpr.thecvf.com/Conferences/2025/CallForPapers
   deadline: '2024-11-14 23:59:00'
   timezone: UTC-8
@@ -339,7 +339,7 @@
 - title: CEC
   year: 2025
   id: cec2025
-  full_name: IEEE Congress on Evolutionary Computation
+  full_name: Congress on Evolutionary Computation
   link: https://www.cec2025.org/
   deadline: '2025-01-15 23:59:59'
   timezone: UTC-12
@@ -533,7 +533,7 @@
 - title: IROS
   year: 2025
   id: iros25
-  full_name: IEEE\RSJ International Conference on Intelligent Robots and Systems
+  full_name: International Conference on Intelligent Robots and Systems
   link: http://www.iros25.org/
   deadline: '2025-03-01 23:59:59'
   timezone: UTC-8
@@ -576,12 +576,12 @@
 - title: ICCV
   year: 2025
   id: iccv25
-  full_name: IEEE International Conference on Computer Vision
+  full_name: International Conference on Computer Vision
   link: https://iccv.thecvf.com/Conferences/2025
   deadline: '2025-03-08 09:59:59'
   timezone: UTC+0
   city: Honolulu
-  country: USA
+  country: Hawaii
   date: October 19-25, 2025
   tags:
   - machine-learning
@@ -696,7 +696,7 @@
 - title: ICDM
   year: 2025
   id: icdm25
-  full_name: IEEE International Conference on Data Mining
+  full_name: International Conference on Data Mining
   link: https://www3.cs.stonybrook.edu/~icdm2025/index.html
   deadline: '2025-06-06 23:59:59'
   timezone: AoE

src/pages/Index.tsx

@@ -10,7 +10,7 @@ import { extractCountry } from "@/utils/countryExtractor";
 import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
 import { Button } from "@/components/ui/button";
 import { Checkbox } from "@/components/ui/checkbox";
-import { X, ChevronRight, Filter } from "lucide-react";
+import { X, ChevronRight, Filter, Globe } from "lucide-react";
 import { getAllCountries } from "@/utils/countryExtractor";
 
 const Index = () => {
@@ -177,16 +177,15 @@ const Index = () => {
               <Popover>
                 <PopoverTrigger asChild>
                   <Button variant="outline" size="sm" className="h-8 gap-1">
-                    <Filter className="h-4 w-4" />
+                    <Globe className="h-4 w-4" />
                     Filter by Country
                   </Button>
                 </PopoverTrigger>
-                <PopoverContent className="w-80 p-4 bg-white" align="start">
+                <PopoverContent className="w-64 p-4 bg-white" align="start">
                   <div className="space-y-4">
                     <div>
-                      <div className="flex items-center justify-between mb-4">
+                      <div className="mb-4">
                         <h4 className="text-sm font-medium text-gray-800">Country</h4>
-                        <ChevronRight className="h-4 w-4 text-gray-500" />
                       </div>
                       <div className="max-h-60 overflow-y-auto space-y-2 bg-white">
                         {getAllCountries(conferencesData as Conference[]).map(country => (