Merge branch 'master' of https://codefirst.iut.uca.fr/git/noan.randon/Favor

Site Web/client/src/components/Configurations/ConfigurationDuCompte.js

@@ -1,3 +1,6 @@
+import React from 'react';
+import { NavLink } from "react-router-dom";
+
 import React, { useState } from 'react';
 import { useSelector } from 'react-redux';
 /*import PolitiqueDeConfidentialite from '../components/';

Site Web/controllers/auth.controller.js

@@ -14,6 +14,8 @@ const createToken = (id) => {
 
 //gestion des erreurs
 module.exports.signUp = async (req, res) => {
+    console.log(req.body);
+
     //Attention à enlever
     
     const {pseudo, email, password} = req.body
@@ -29,7 +31,7 @@ module.exports.signUp = async (req, res) => {
 }
 
 module.exports.signIn = async (req, res) => {
-    //console.log(req.body);
+    console.log(req.body);
     const {email, password} = req.body
     try {
         const user = await UserModel.login({email, password});

Site Web/controllers/post.controller.js

@@ -7,20 +7,9 @@ const ObjectID = require("mongoose").Types.ObjectId;
 const fs = require("fs");
 const { promisify } = require("util");
 
-//import { addNotification } from "./notifFonction";
+const addNotification = require('./notifFonction');
-const {addNotification} = require("./notifFonction");
+
-//const UserModel = require("../models/user.model");
+
-
-/*const addNotification = (userId, notification) => {
-  UserModel.findById(userId, (err, user) => {
-    if (err) {
-      console.log(err);
-    } else {
-      user.notif.push(notification);
-      user.save();
-    }
-  });
-};*/
 
 module.exports.readPost = (req, res) => {
   PostModel.find((err, docs) => {
@@ -77,13 +66,18 @@ module.exports.deletePost = (req, res) => {
 
 
 module.exports.likePost = async (req, res) => {
-  addNotification("63b835de3f9be509b614df36", {
+  //notif
+  const idUser = await PostModel.findOne({ _id: ObjectID( req.params.id) });
+  console.log(idUser);
+  addNotification.addNotification(idUser.postedId, {
     typeNotif: "like",
-    id_user: "5f1a32c2f9f9ab74a1b7a6c8",
+    id_user: req.body.id,
-    id_post1: "5f1a32c2f9f9ab74a1b7a6c8",
+    id_post1: req.params.id,
-    id_post2: ""
+    id_post2: "null"
   });
 
+
+
   if (!ObjectID.isValid(req.params.id))
     return res.status(400).send("ID unknown : " + req.params.id);