Friends Page Frontend

backend/models/User.js

@@ -9,9 +9,9 @@ const userSchema = new mongoose.Schema({
   tasks: [{ type: mongoose.Schema.Types.ObjectId, ref: "Task" }],
   groups: [{ type: mongoose.Schema.Types.ObjectId, ref: "Group" }],
   evidenceImages: [{ type: mongoose.Schema.Types.ObjectId, ref: "Image" }],
-  friends: [{ type: mongoose.Schema.Types.ObjectId, ref: "User" }],
-  friendsRequests: [{ type: mongoose.Schema.Types.ObjectId, ref: "User" }],
-  sentFriendRequests: [{ type: mongoose.Schema.Types.ObjectId, ref: "User" }],
+  friends: [{ type: mongoose.Schema.Types.String, ref: "User" }],
+  friendsRequests: [{ type: mongoose.Schema.Types.String, ref: "User" }],
+  sentFriendRequests: [{ type: mongoose.Schema.Types.String, ref: "User" }],
   lastReset: { type: Date },
   resetToken : {type: String},
   resetTokenExpiry: {type: Date},

backend/routes/friends.js

@@ -6,35 +6,40 @@ const {
   sendFriendRequest,
   getFriendRequest,
   acceptFriendRequest,
-  addFriends,
   removeFriend,
-  deleteFriendRequest,
+  // friendNamesLookup,
+  // deleteFriendRequest,
+  removeFriendRequest,
   declineFriendRequest,
+  getSentFriendRequest,
 } = require("../controllers/friendsController");
 
 // look up users current friends
-router.get("/friends/:id", friendsLookup);
-
-// adding friends
-router.post("/add-friends/:id", addFriends);
+router.get("/:id", friendsLookup);
 
 // sending friend request
 router.post("/send-req/:id", sendFriendRequest);
 
-// available friend requests
+// available friend requests for reciever
 router.get("/friend-requests/:id", getFriendRequest);
 
 // accepting friend request
 router.post("/accept-req/:id", acceptFriendRequest);
 
 //declining friend request
-router.delete("/decline-req/:id", declineFriendRequest);
+router.delete("/decline-req/:id/:requestId", declineFriendRequest);
 
 //remove a friend
-router.delete("/friend/remove/:id", removeFriend);
+router.delete("/remove/:id/:friendName", removeFriend);
 
 //remove a friend from a friend request
-router.delete("/request/remove/:id", deleteFriendRequest);
+router.delete("/request/remove/:id/:friendname", removeFriendRequest);
+
+// available friend requests for sender
+router.get("/sentfriend-requests/:id", getSentFriendRequest);
+
+// get friend names for sent requests
+// router.get("/sentfriend-request-names/:id", friendNamesLookup);