Merge pull request #1077 from jhuopensource/develop

jhuopensource · Feb 13, 2024 · 73f83e9 · 73f83e9
2 parents 8b4de8c + ae7c26e
commit 73f83e9
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 16 deletions.
diff --git a/manifests/prod/cronjob.yml b/manifests/prod/cronjob.yml
@@ -14,7 +14,7 @@ spec:
           containers:
             - image: semesterly.azurecr.io/semesterly:Version
               name: gunicorn-cron
-              command: ["/bin/bash","/code/run_parser.sh"]
+              command: ["/bin/bash", "/code/run_parser.sh"]
               workingDir: /code
               envFrom:
                 - secretRef:

diff --git a/package-lock.json b/package-lock.json
diff --git a/static/js/redux/state/slices/newsModalSlice.ts b/static/js/redux/state/slices/newsModalSlice.ts
@@ -16,6 +16,7 @@ const newsModalSlice = createSlice({
       state.isVisible = false;
     },
     showNewsModal: (state) => {
+      localStorage.setItem("lastViewedNewsDate", new Date(Date.now()).toISOString()); // !
       state.isVisible = true;
     },
   },

diff --git a/static/js/redux/ui/Semesterly.tsx b/static/js/redux/ui/Semesterly.tsx
@@ -128,13 +128,55 @@ const Semesterly = () => {
     // DataLastUpdated Input example-  2021-05-02 14:42 UTC
     // Params: How the backend sends a timestamp
     // dateString: of the form yyyy-mm-dd hh:mm
-    const dateString = dataLastUpdated.toString().slice(0, -4); // exclude UTC
+    const dateString = dataLastUpdated.toString();
 
     if (!dateString || dateString.length === 0) return "";
 
     // Convert given datetime to local datetime of user
-    // in form yyyy-mm-dd hh:mm TZ (Timezone full name)
-    return new Date(dateString).toString();
+    // in form (month) dd, yyyy
+
+    const curDate: Date = new Date(dateString);
+
+    const months = [
+      "January",
+      "February",
+      "March",
+      "April",
+      "May",
+      "June",
+      "July",
+      "August",
+      "September",
+      "October",
+      "November",
+      "December",
+    ];
+
+    let dayEnding: String;
+    const curDay = curDate.getDay();
+    if (curDay >= 11 && curDay <= 13) {
+      dayEnding = "th";
+    }
+
+    switch (curDay % 10) {
+      case 1:
+        dayEnding = "st";
+        break;
+      case 2:
+        dayEnding = "nd";
+        break;
+      case 3:
+        dayEnding = "rd";
+        break;
+      default:
+        dayEnding = "th";
+    }
+
+    const monthIndex: number = curDate.getMonth();
+
+    return `${
+      months[monthIndex]
+    } ${curDate.getUTCDate()}${dayEnding}, ${curDate.getFullYear()}`;
   };
 
   const mobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(

diff --git a/static/js/redux/ui/SideBar.tsx b/static/js/redux/ui/SideBar.tsx
@@ -79,6 +79,9 @@ const SideBar = () => {
 
   const hideDropdown = () => {
     setShowDropdown(false);
+
+    // * Set hoveredCourse to -1 if user clicks out
+    setHoveredCourse(-1);
   };
 
   const toggleDropdown = () => {

diff --git a/static/js/redux/ui/modals/NewsModal.tsx b/static/js/redux/ui/modals/NewsModal.tsx
@@ -26,23 +26,21 @@ const NewsModal = () => {
 
   useEffect(() => {
     const tutorialData = JSON.parse(localStorage.getItem("tutorial"));
-    if (!tutorialData || !tutorialData.modalTutShown || isSigningUp) {
-      return;
-    }
+    const displayCriteria = tutorialData && tutorialData.modalTutShown && !isSigningUp;
 
     const fetchData = async () => {
       const response = await fetch(getNewsEndpoint());
       const data = await response.json();
 
       // Only display modal if the news was posted after the last viewed time
-      if (data.date && new Date(data.date) > lastViewedTime) {
+      if (data.date && new Date(data.date) > lastViewedTime && displayCriteria) {
         dispatch(newsModalActions.showNewsModal());
         // Set to current date and time
         localStorage.setItem("lastViewedNewsDate", new Date(Date.now()).toISOString());
       }
 
-      setNewsTitle(data.title);
-      setNewsBody(data.body);
+      setNewsTitle(data.title === "" ? "No news at the moment!" : data.title);
+      setNewsBody(data.body === "" ? "Please check back again later." : data.body);
     };
 
     fetchData();