From c6f54412ac276a315254372614202d68314ae7f6 Mon Sep 17 00:00:00 2001
From: Leonard Pepa <leopepp4@gmail.com>
Date: Tue, 30 Nov 2021 17:01:25 +0200
Subject: [PATCH] added confirm modals for delete freind and undo request

---
 package-lock.json                |  5 ++++
 package.json                     |  1 +
 server.config.js                 |  2 ++
 views/components/profileCard.ejs | 44 +++++++++++++++++++++++++++++---
 4 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3066192..0b5af4b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -770,6 +770,11 @@
       "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
       "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="
     },
+    "helmet": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/helmet/-/helmet-4.6.0.tgz",
+      "integrity": "sha512-HVqALKZlR95ROkrnesdhbbZJFi/rIVSoNq6f3jA/9u6MIbTsPh3xZwihjeI5+DO/2sOV6HMHooXcEOuwskHpTg=="
+    },
     "http-cache-semantics": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
diff --git a/package.json b/package.json
index 58b2037..3ccfcb5 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
     "ejs": "^3.1.6",
     "express": "^4.17.1",
     "express-session": "^1.17.2",
+    "helmet": "^4.6.0",
     "jsonwebtoken": "^8.5.1",
     "mongoose": "^6.0.9",
     "mongoose-findorcreate": "^3.0.0",
diff --git a/server.config.js b/server.config.js
index ca7dad5..ce05b9a 100644
--- a/server.config.js
+++ b/server.config.js
@@ -6,6 +6,7 @@ const session = require("express-session");
 const cookieParser  = require('cookie-parser');
 const morgan = require("morgan");
 const http = require("http");
+const helmet = require("helmet");
 
 app.set("view engine", "ejs");
 app.use(express.json());
@@ -23,6 +24,7 @@ app.use(
     },
   })
 );
+// app.use(helmet());
 
 const { passport } = require("./passport.config");
 
diff --git a/views/components/profileCard.ejs b/views/components/profileCard.ejs
index 9505c63..4751e03 100644
--- a/views/components/profileCard.ejs
+++ b/views/components/profileCard.ejs
@@ -27,10 +27,11 @@
       Edit profile
     </button>
     <% } else if(requestFriendship?.status === "pending"){ %>
-    <button onclick="undoFriendRequest('<%= requestedFriendship?._id || requestFriendship?._id %>')"
+    <button 
       id="<%= requestedFriendship?._id || requestFriendship?._id %>"
       type="button"
       class="btn btn-primary undo-friend-btn"
+      data-bs-toggle="modal" data-bs-target="#deleteRequestModal"
     ><i class="fas fa-user-clock"></i>
       Pending
     </button>
@@ -51,10 +52,11 @@
       Add friend
     </button>
     <% } else if (user.friends.includes(profileUser._id)) {%>
-      <button onclick="deleteFriend('<%=  requestedFriendship?._id || requestFriendship?._id %>')"
+      <button
       id="<%=  requestedFriendship?._id || requestFriendship?._id %>"
       type="button"
-      class="btn btn-primary remove-friendship"
+      class="btn btn-primary"
+      data-bs-toggle="modal" data-bs-target="#deleteFriendModal"
     ><i class="fas fa-user-check"></i>
       friends
     </button>
@@ -62,6 +64,42 @@
   </div>
 </div>
 
+<div class="modal" tabindex="-1" id="deleteFriendModal">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">Delete Friend</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <p>Are you sure you want to delete this user from your friend list? </p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+        <button onclick="deleteFriend('<%=  requestedFriendship?._id || requestFriendship?._id %>')"  type="button" class="btn btn-danger" >Delete</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="modal" tabindex="-1" id="deleteRequestModal">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"> Withdraw friend request</h5>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+        <p>Are you sure you want to withdraw your friend request? </p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+        <button onclick="undoFriendRequest('<%= requestedFriendship?._id || requestFriendship?._id %>')"   type="button" class="btn btn-danger" >Withdraw</button>
+      </div>
+    </div>
+  </div>
+</div>
+
 <script>
   // const addFriendButton = document.querySelector(".add-friend-btn");
   // addFriendButton && addFriendButton.addEventListener("click", async (e) => {