diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index cb609b2..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/client/.gitignore b/.gitignore similarity index 88% rename from client/.gitignore rename to .gitignore index 4d29575..32841ab 100644 --- a/client/.gitignore +++ b/.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 \ No newline at end of file diff --git a/client/package-lock.json b/client/package-lock.json index 02143f2..93bdf64 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -13,7 +13,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", @@ -7725,14 +7724,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/esm": { - "version": "3.2.25", - "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz", - "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==", - "engines": { - "node": ">=6" - } - }, "node_modules/espree": { "version": "9.6.1", "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", @@ -16302,16 +16293,16 @@ } }, "node_modules/typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" }, "engines": { - "node": ">=14.17" + "node": ">=4.2.0" } }, "node_modules/unbox-primitive": { diff --git a/client/package.json b/client/package.json index 2d1b494..ae2fc1c 100644 --- 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 deleted file mode 100644 index 32fc70c..0000000 Binary files a/server/.DS_Store and /dev/null differ diff --git a/server/.gitignore b/server/.gitignore deleted file mode 100644 index 7af7f04..0000000 --- a/server/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/node_modules -.env \ No newline at end of file diff --git a/server/features/addcheckinLinks.js b/server/features/addcheckinLinks.js index a309788..85f8440 100644 --- 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 index 93d4173..25e1e59 100644 --- 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") }