Merge pull request #20 from Lavish883/lavishBranch

updated critical dependencies
Lavish883 · Jul 19, 2023 · 228b2cb · 228b2cb
2 parents 383896d + 77f7ee8
commit 228b2cb
Show file tree

Hide file tree

Showing 8 changed files with 1,441 additions and 1,365 deletions.
diff --git a/mainJS/pathFunctions.js b/mainJS/pathFunctions.js
@@ -132,6 +132,7 @@ function genreateFormCSS(theme){
             --main-questionBackgroundColor: ${theme.questionBackgroundColor};
             --main-formBackgroundColor: ${theme.formBackgroundColor};
             --main-backgroundColor: ${theme.backgroundColor};
+            --main-formEndTextColor: ${theme.formEndTextColor};
         }
     `
     return css;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "bcrypt": "^5.1.0",
     "dotenv": "^16.0.3",
     "express": "^4.18.2",
-    "mongoose": "^6.8.0",
+    "mongoose": "^6.11.4",
     "nodemailer": "^6.8.0",
     "nodemon": "^2.0.20",
     "pug": "^3.0.2",

diff --git a/views/filterData.pug b/views/filterData.pug
@@ -11,6 +11,8 @@ html
         main
             div.dividePage
                 div#applyFilters
+                    // need to add options so the teachers can see all the pdfs at once
+                    // with all the people who are filtered out
                 div#results
         script 
             include js/filterData.js

diff --git a/views/form.pug b/views/form.pug
@@ -39,4 +39,7 @@ html
         script(src="https://cdnjs.cloudflare.com/ajax/libs/cropperjs/1.5.13/cropper.min.js" integrity="sha512-6lplKUSl86rUVprDIjiW8DuOniNX8UDoRATqZSds/7t6zCQZfaCe3e5zcGaQwxa8Kpn5RTM9Fvl3X2lLV4grPQ==" crossorigin="anonymous" referrerpolicy="no-referrer") 
 
         script
-            include js/form.js
+            include js/form.js
+
+        script. 
+            var formEndText = !{JSON.stringify(formSettings.formEndText).replace(/<\//g, '<\\/')}
diff --git a/views/includes/formSettingsContainer.pug b/views/includes/formSettingsContainer.pug
@@ -9,6 +9,8 @@ mixin formSettingsContainer(formSettings, formName, formId)
             textarea(oninput="autoResize(this)" id="formIntroductionTextArea", placeholder="Form Introduction") #{formSettings.formIntroduction}
         div.textNextToImage
             input(id="textNextToImageInput", type="text", placeholder="Text next to image upload", value=formSettings.textNextToImage)
+        div.formEndText
+            input(id="formEndTextInput", type="text", placeholder="Form End Text", value=formSettings.formEndText)
         div.themeDivider
             div.themeHeader(onclick="toggleThemeOptions()")
                 div(style="display: flex; align-items: center;")
@@ -34,6 +36,9 @@ mixin formSettingsContainer(formSettings, formName, formId)
                 div.backgroundColor.themeOption
                     span Background Color:
                     input(type="color", value=formSettings.theme.backgroundColor)
+                div.formEndTextColor.themeOption
+                    span Form End Text Color:
+                    input(type="color", value=formSettings.theme.formEndTextColor)
         div.pdfImage
             div Logo to display on PDF:
             input(type="file", id="pdfImageInput" accept="image/*")

diff --git a/views/js/editForm.js b/views/js/editForm.js
@@ -449,6 +449,7 @@ function getFormSettingsData(){
         "imageUploadWantedInForm": document.getElementById("imageUploadWantedInFormInput").checked,
         "formIntroduction": document.getElementById("formIntroductionTextArea").value,
         "textNextToImage": document.getElementById("textNextToImageInput").value,
+        "formEndText": document.getElementById("formEndTextInput").value,
         "theme": {}
     }
     // go all find all the theme options and add them to the settings

diff --git a/views/js/form.js b/views/js/form.js
@@ -334,7 +334,7 @@ async function validateForm(event) {
     }
     if (finishedGoingOver){
         await saveFormToServer(true);
-        document.body.innerHTML = '<h1 style="text-align: center; margin-top: 30vh;color:white;">Thank you for filling out the form. You can always come back and edit it before deadline.</h1>';
+        document.body.innerHTML = `<h1 class="formEndTextColor" style="text-align: center; margin-top: 30vh;">${formEndText}</h1>`;
     } else {
         alert('Please go over the form again and make sure everything is correct');
         finishedGoingOver = true;
@@ -371,8 +371,22 @@ async function autoSave() {
 }
 
 // add event listeners
-document.getElementById('personImage').addEventListener('change', intializeCropper);
-document.getElementById('doneWithImage').addEventListener('click', closeCropper);
-document.getElementById('sumbitFormBtn').addEventListener('click', validateForm);
+try {
+    document.getElementById('personImage').addEventListener('change', intializeCropper);
+} catch (error){
+    console.log(error);
+}
+
+try {
+    document.getElementById('doneWithImage').addEventListener('click', closeCropper);
+} catch (error){
+    console.log(error);
+}
+
+try {
+    document.getElementById('sumbitFormBtn').addEventListener('click', validateForm);
+} catch (error){
+    console.log(error);
+}
 
 setTimeout(autoSave, 20 * 1000);