Merge pull request #28 from AAP9002/changes-after-merging-check-in-link

Changes after merging check in link
AAP9002 · Nov 18, 2023 · 0ac6f1a · 0ac6f1a
2 parents f187827 + 3fd4f24
commit 0ac6f1a
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 30 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/client/.gitignore → .gitignore b/client/.gitignore → .gitignore
@@ -1,15 +1,15 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
 # dependencies
-/node_modules
-/.pnp
+*/node_modules
+*/.pnp
 .pnp.js
 
 # testing
 /coverage
 
 # production
-/build
+*/build
 
 # misc
 .DS_Store
@@ -21,3 +21,5 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+*.env
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -9,7 +9,6 @@
     "@testing-library/user-event": "^13.5.0",
     "add-to-calendar-button-react": "^2.4.3",
     "bootstrap": "^5.3.2",
-    "esm": "^3.2.25",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-scripts": "^5.0.1",

diff --git a/server/.DS_Store b/server/.DS_Store
diff --git a/server/.gitignore b/server/.gitignore
diff --git a/server/features/addcheckinLinks.js b/server/features/addcheckinLinks.js
@@ -11,7 +11,7 @@
  */
 
 function insertCheckInLink(cal) {
-    console.log("test")
+    //console.log("test")
 
     /*
     const eventDescriptionPattern = /(DESCRIPTION:Event type:.*?\\n)(Location:.*?\\n)/gs;
@@ -26,7 +26,7 @@ function insertCheckInLink(cal) {
     if (cal.match(descriptionPattern)) {
       //return cal.replace(eventDescriptionPattern, `$1\n${checkInLink}$2`);
       cal = cal.replace(descriptionPattern, `${checkInLink}`);
-      console.log(cal);
+      //console.log(cal);
     } else {
       console.warn("No event description match found!");
     }

diff --git a/server/index.js b/server/index.js
@@ -37,17 +37,12 @@ function performModifications(cal, stepsString) {
       case "01": // replace course code with course code and course name
         cal = replaceTitle.replaceCourseCodesWithCodeAndNames(cal, courses);
         break;
-      case "02": // add a checkin link in description
-        cal = addcheckinLinks.insertCheckInLink(cal);
-        break;
-      case "03": // force restyling of calender every 24 hours
+      case "02": // force restyling of calender every 24 hours
         cal = syncForcedBreakpoint.run(cal);
         break;
-      // Add a new feature here.
-      // I just submit first. Actually I am not sure if this featured is better used directly with other features or seperated with other features
-      //case "03": // add a checkin link in description
-      //  cal = addcheckinLinks.insertCheckInLink(cal);
-      //  break;
+      case "03": // add a checkin link in description
+        cal = addcheckinLinks.insertCheckInLink(cal);
+        break;
       default:
         console.log("step "+ step + " called but not defined in performModifications switch")
     }