diff --git a/package-lock.json b/package-lock.json index d102934..cb1b452 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18709,6 +18709,12 @@ "node": ">=8" } }, + "node_modules/jquery": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz", + "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==", + "peer": true + }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -50374,6 +50380,12 @@ } } }, + "jquery": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.1.tgz", + "integrity": "sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==", + "peer": true + }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", diff --git a/src/assets/face1.png b/src/assets/face1.png new file mode 100644 index 0000000..0fd896f Binary files /dev/null and b/src/assets/face1.png differ diff --git a/src/assets/face2.png b/src/assets/face2.png new file mode 100644 index 0000000..e825fe7 Binary files /dev/null and b/src/assets/face2.png differ diff --git a/src/assets/face3.png b/src/assets/face3.png new file mode 100644 index 0000000..f8e2969 Binary files /dev/null and b/src/assets/face3.png differ diff --git a/src/components/AdminDashboardHeroSection/EditInfoForm.jsx b/src/components/AdminDashboardHeroSection/EditInfoForm.jsx index 1b4d756..1106a00 100644 --- a/src/components/AdminDashboardHeroSection/EditInfoForm.jsx +++ b/src/components/AdminDashboardHeroSection/EditInfoForm.jsx @@ -14,44 +14,42 @@ function EditInfoForm({ userId }) { const [info, setInfo] = useState([]); const [formValidation, setFormValidation] = useState(false); const [notfication, setNotification] = useState(false); - const [eventImage, setEventImage] = useState(null) // for uploadig the photo - const [profileImage, setProfileImage] = useState(null) // for uploadig the photo + const [eventImage, setEventImage] = useState(null); // for uploadig the photo + const [profileImage, setProfileImage] = useState(null); // for uploadig the photo // Upload Functions START: - function onInputChange1(e) { - // console.log(e.target.value); - // console.log(e.target.files); - setEventImage(e.target.files[0]) -} + function onInputChange1(e) { + // console.log(e.target.value); + // console.log(e.target.files); + setEventImage(e.target.files[0]); + } function onInputChange2(e) { // console.log(e.target.value); // console.log(e.target.files); - setProfileImage(e.target.files[0]) -} - -function handleSubmit(e) { - e.preventDefault(); - - const data = new FormData() - + setProfileImage(e.target.files[0]); + } - data.append('file', eventImage) - data.append('file', profileImage) - alert('data', data) + function handleSubmit(e) { + e.preventDefault(); - axios.post('//localhost:5000/upload', data) - .then((response)=> { - alert('Success') // he adds the toast here and below + const data = new FormData(); - }) - .catch((e) => { - alert('Error', e) - }) + data.append("file", eventImage); + data.append("file", profileImage); + alert("data", data); -} + axios + .post("//localhost:5000/upload", data) + .then((response) => { + alert("Success"); // he adds the toast here and below + }) + .catch((e) => { + alert("Error", e); + }); + } -// END + // END function handleChange(e) { setInfo({ ...info, [e.target.name]: e.target.value }); @@ -73,7 +71,10 @@ function handleSubmit(e) { return axios .patch( `https://reach-capstone.herokuapp.com/api/profile`, - newComment + newComment, + { + withCredentials: true, + } ) .then(function (res) { console.log(res); @@ -182,8 +183,10 @@ function handleSubmit(e) { Select the Event Photo onInputChange1(e)} + accept='image/jpeg' + onChange={(e) => + onInputChange1(e) + } className='text-gray-700 focus:shadow-outline w-full appearance-none rounded border py-2 px-3 leading-tight shadow focus:outline-none' type='file' placeholder='' @@ -194,8 +197,10 @@ function handleSubmit(e) { Select Profile Photo onInputChange2(e)} + accept='image/jpeg' + onChange={(e) => + onInputChange2(e) + } className='text-gray-700 focus:shadow-outline w-full appearance-none rounded border py-2 px-3 leading-tight shadow focus:outline-none' type='file' placeholder='' @@ -316,9 +321,8 @@ function handleSubmit(e) { minLength='50' name='message' onChange={(e) => { - handleChange(e) - } - } + handleChange(e); + }} className=' form-control text-gray-700 border-gray-300 focus:text-gray-700 m-0 block w-full rounded border border-solid bg-white bg-clip-padding px-3 py-1.5 text-base font-normal transition ease-in-out focus:border-blue-600 focus:bg-white focus:outline-none @@ -348,7 +352,7 @@ function handleSubmit(e) { setShowModal(false); addComment.mutate(info); setNotification(true); - handleSubmit(e) + handleSubmit(e); }} > Save Changes diff --git a/src/components/SignIn/SignIn.jsx b/src/components/SignIn/SignIn.jsx index f142b6e..ae067f1 100644 --- a/src/components/SignIn/SignIn.jsx +++ b/src/components/SignIn/SignIn.jsx @@ -1,5 +1,5 @@ -import React, { useState } from 'react'; -import { Link, useNavigate} from "react-router-dom"; +import React, { useState } from "react"; +import { Link, useNavigate } from "react-router-dom"; import SigninPic from "../../assets/SigninPic.png"; import google from "../../assets/google.svg"; import facebook from "../../assets/facebook.svg"; @@ -10,16 +10,16 @@ import Logo from "../../assets/Logo.png"; import close from "../../assets/close-menu.svg"; import { useMutation } from "@tanstack/react-query"; import axios from "axios"; -import Navbar from '../layout/Navbar/Navbar'; -import { useEffect } from 'react'; +import Navbar from "../layout/Navbar/Navbar"; +import { useEffect } from "react"; function SignIn() { const navigate = useNavigate(); - const [name,setnamengo]=useState(""); - const [volunteer,setnamevolunteer]=useState(""); + const [name, setnamengo] = useState(""); + const [volunteer, setnamevolunteer] = useState(""); const navigateHome = () => { - navigate('/'); - }; - + navigate("/"); + }; + const [formData, setFormData] = useState({ email: "", password: "", @@ -41,30 +41,45 @@ function SignIn() { event.preventDefault(); } const GetNameEmail = useMutation(() => { - if(localStorage.getItem("userType") === "Ngo"){ - axios.get(`https://reach-capstone.herokuapp.com/api/ngos/${localStorage.getItem("userId")}`).then(function (data) { - localStorage.setItem("userName", data.data.data.name) - localStorage.setItem("userEmail", data.data.data.email) - }) - } - else if(localStorage.getItem("userType") === "Volunteer"){ - axios.get(`https://reach-capstone.herokuapp.com/api/volunteers/${localStorage.getItem("userId")}`).then(function (data) { - localStorage.setItem("userName", data.data.data.name) - localStorage.setItem("userEmail", data.data.data.email) - }) + if (localStorage.getItem("userType") === "Ngo") { + axios + .get( + `https://reach-capstone.herokuapp.com/api/ngos/${localStorage.getItem( + "userId" + )}` + ) + .then(function (data) { + localStorage.setItem("userName", data.data.data.name); + localStorage.setItem("userEmail", data.data.data.email); + }); + } else if (localStorage.getItem("userType") === "Volunteer") { + axios + .get( + `https://reach-capstone.herokuapp.com/api/volunteers/${localStorage.getItem( + "userId" + )}` + ) + .then(function (data) { + localStorage.setItem("userName", data.data.data.name); + localStorage.setItem("userEmail", data.data.data.email); + }); } - }); const SendtoSignIn = useMutation((SignInData) => { - axios.post( + axios + .post( `https://reach-capstone.herokuapp.com/api/auth/login`, - SignInData + SignInData, + { + withCredentials: true, + } ) .then(function (res) { + console.log(res.data.data); if (res.data.success) { localStorage.setItem("userId", res.data.data._id); localStorage.setItem("userType", res.data.data.type); - localStorage.setItem("NavType",true); + localStorage.setItem("NavType", true); } GetNameEmail.mutate(); navigateHome(); @@ -72,16 +87,15 @@ function SignIn() { .catch(function (error) { let isArray = Array.isArray(error.response.data.errors); if (isArray) { - alert(error.response.data.errors[0].msg) + alert(error.response.data.errors[0].msg); + } else { + alert(error.response.data.error); } - else{ - alert(error.response.data.error); - }; }); }); return (
- +
+ {localStorage.getItem("userType") === "Ngo" ? ( +
  • + setPendingApp(true)} + className='block py-0.5 px-2 hover:bg-blue-dark' + > + Pending Application + + +
    • + ) : ( + "" + )}
  • setSignOut()} @@ -124,6 +140,11 @@ function Navbar() { "transform transition duration-500 ease-in-out block h-0.5 w-5 transform bg-current transition duration-500 ease-in-out "; return (
    +