Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed some issues #216

Merged
merged 1 commit into from
Dec 31, 2022
Merged

Fixed some issues #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions src/Components/ConfirmEmail/ConfirmEmail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
function ConfirmEmail({ request,status }) {
function ConfirmEmail({ request, status }) {
return (
<>
<div>
Expand All @@ -18,7 +18,7 @@ function ConfirmEmail({ request,status }) {
their team for the project{" "}
<i>
<a
href={`https://iedc-collab-frontend.pages.dev/${request.project_id}`}
href={`https://iedc-collab-frontend.pages.dev/projects/${request.project_id}`}
target="_blank"
rel="noreferrer"
>
Expand All @@ -39,9 +39,6 @@ function ConfirmEmail({ request,status }) {
</a>
</p>
</div>
<br />
<p>Thank You</p>
<br />
<p>Regards</p>
<p>IEDC MEC Collab Team</p>
<br />
Expand Down
61 changes: 40 additions & 21 deletions src/Components/DescriptionDetails/DescriptionDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,28 +126,47 @@ const DescriptionDetails = (props) => {
) : (
""
)}
<div className="description__tag_phone">
<i className="fa fa-phone"></i>
<span className="ml-2">{props.selectedProject.contactNo}</span>
</div>
{currentUser ? (
<div className="description__tag_phone">
<i className="fa fa-phone"></i>
<span className="ml-2">{props.selectedProject.contactNo}</span>
</div>
) : (
""
)}

<div className="description-container__controls">
<a
href={`tel:${props.selectedProject.contactNo}`}
className="description__tag_phone_mobile"
>
<FaPhoneAlt
color="white"
size={40}
style={{
backgroundColor: "#9e0000",
borderRadius: "50%",
padding: "8px",
}}
/>
</a>
<a href={`mailto: ${props.selectedProject.leaderEmail}`}>
<IoMdMail color="#9e0000" size={49} style={{ marginTop: "3px" }} />
</a>
{currentUser ? (
<a
href={`tel:${props.selectedProject.contactNo}`}
className="description__tag_phone_mobile"
>
<FaPhoneAlt
color="white"
size={40}
style={{
backgroundColor: "#9e0000",
borderRadius: "50%",
padding: "8px",
}}
/>
</a>
) : (
""
)}

{currentUser ? (
<a href={`mailto: ${props.selectedProject.leaderEmail}`}>
<IoMdMail
color="#9e0000"
size={49}
style={{ marginTop: "3px" }}
/>
</a>
) : (
""
)}

{props.selectedProject.githubLink.length ? (
<a
href={props.selectedProject.githubLink}
Expand Down
12 changes: 6 additions & 6 deletions src/Components/Email/Email.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable react/jsx-no-target-blank */
function Email({ request }) {
return (
<>
Expand All @@ -17,8 +16,9 @@ function Email({ request }) {
join their team for the project{" "}
<i>
<a
href={`https://iedc-collab-frontend.pages.dev/${request.project_id}`}
href={`https://iedc-collab-frontend.pages.dev/projects/${request.project_id}`}
target="_blank"
rel="noreferrer"
>
{request.project}
</a>
Expand Down Expand Up @@ -55,14 +55,12 @@ function Email({ request }) {
<a
href="https://iedc-collab-frontend.pages.dev"
target="_blank"
rel="noreferrer"
>
https://iedc-collab-frontend.pages.dev
</a>
</p>
</div>
<br />
<p>Thank You</p>
<br />
<p>Regards</p>
<p>IEDC MEC Collab Team</p>
<br />
Expand All @@ -73,7 +71,9 @@ function Email({ request }) {
<p>
<i>
For any queries please visit{" "}
<a href="https://iedcmec.in" target="_blank">https://iedcmec.in</a>
<a href="https://iedcmec.in" target="_blank" rel="noreferrer">
https://iedcmec.in
</a>
</i>
</p>
</div>
Expand Down
29 changes: 12 additions & 17 deletions src/Components/NavigateBar/NavigateBar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ const Navbar = () => {
const [showProjectModal, setShowProjectModal] = useState(false);
const { currentUser } = useContext(AuthContext);
const { handleSearch, handleSearchDevelopers } = useContext(ProjectContext);
const [query, setQuery] = useState("");
const [query1, setQuery1] = useState("");
const history = useHistory();
const [open1, setOpen1] = useState(false);
const location = useLocation();
Expand All @@ -34,16 +32,6 @@ const Navbar = () => {
alert("Please Login to Continue.");
}
};
useEffect(() => {
const timeOutId = setTimeout(() => handleSearch(query), 500);
return () => clearTimeout(timeOutId);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [query]);
useEffect(() => {
const timeOutId = setTimeout(() => handleSearchDevelopers(query1), 500);
return () => clearTimeout(timeOutId);
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [query1]);
const [selectedUser, setSelectedUser] = useState(null);
const getDev = async (id) => {
if (id) {
Expand Down Expand Up @@ -132,8 +120,10 @@ const Navbar = () => {
>
<input
placeholder="Search projects..."
value={query}
onChange={(e) => setQuery(e.target.value)}
onChange={(e) => {
e.preventDefault();
handleSearch(e.target.value);
}}
style={{ borderStyle: "none", outline: "none", width: "95%" }}
></input>
<i
Expand All @@ -152,8 +142,10 @@ const Navbar = () => {
>
<input
placeholder="Search developers..."
value={query1}
onChange={(e1) => setQuery1(e1.target.value)}
onChange={(e1) => {
e1.preventDefault();
handleSearchDevelopers(e1.target.value);
}}
style={{ borderStyle: "none", outline: "none", width: "95%" }}
></input>
<i
Expand All @@ -172,7 +164,10 @@ const Navbar = () => {
>
<input
placeholder="Search projects..."
onChange={(e) => handleSearch(e.target.value)}
onChange={(e) => {
history.push(`/projects`);
handleSearch(e.target.value);
}}
style={{ borderStyle: "none", outline: "none", width: "95%" }}
></input>
<i
Expand Down
135 changes: 111 additions & 24 deletions src/Components/RequirementDetails/RequirementDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,87 @@ import "./RequirementDetails.scss";
import { FaPhoneAlt } from "react-icons/fa";
import { IoMdMail } from "react-icons/io";
import { GoMarkGithub } from "react-icons/go";
// import { ProjectContext } from "../../contexts/ProjectContext";
import { useHistory } from "react-router-dom";
import { doDeleteProject } from "../../Firebase/firebase";
import { toast } from "react-toastify";
import { useContext, useEffect, useState } from "react";
import { RiDeleteBin7Line } from "react-icons/ri";
import { FiEdit } from "react-icons/fi";
import { AuthContext } from "../../Firebase/Auth/Auth";
import { ProjectContext } from "../../contexts/ProjectContext";
import ProjectModal from "../ProjectModal/ProjectModal";
import DeleteConfirmation from "../DeleteConfirmationModal/DeleteConfirmation";
// import { useContext } from "react";

const RequirementDetails = ({ selectedProject }) => {
const RequirementDetails = (props) => {
const { fetchData } = useContext(ProjectContext);
const { currentUser } = useContext(AuthContext);
const [canModifyProject, setCanModifyProject] = useState(false);
const [showNewProjectModal, setShowNewProjectModal] = useState(false);
const [displayConfirmationModal, setDisplayConfirmationModal] = useState(
false
);
const history = useHistory();
const submitDelete = (id) => {
doDeleteProject(id, () => {
toast("Project deleted successfully");
fetchData();
});
setDisplayConfirmationModal(false);
history.go(0);
};

const hideConfirmationModal = () => {
setDisplayConfirmationModal(false);
};
useEffect(() => {
if (currentUser?.uid === props.selectedProject.leader_id) {
setCanModifyProject(true);
} else {
setCanModifyProject(false);
}
}, [currentUser?.uid, props.selectedProject.leader_id]);
function deleteProj() {
setDisplayConfirmationModal(true);
}
return (
<>
<div className="requirement__container">
<div className="description-details__headcontrols">
{canModifyProject && (
<RiDeleteBin7Line
size={38}
style={{ cursor: "pointer" }}
onClick={() => {
deleteProj();
}}
alt="delete project"
/>
)}
{canModifyProject && (
<FiEdit
size={36}
style={{ cursor: "pointer" }}
onClick={() => {
setShowNewProjectModal(true);
}}
/>
)}
</div>
<div className="requirement__title">PROJECT REQUIREMENTS</div>
<div className="requirement__content">
{selectedProject?.req || "No Details Entered..."}
{props.selectedProject?.req || "No Details Entered..."}
</div>
</div>
<div className="requirement__other">
{selectedProject?.hiring?.length === 0 || !selectedProject.hiring ? (
{props.selectedProject?.hiring?.length === 0 ||
!props.selectedProject.hiring ? (
""
) : (
<>
<div className="requirement__other-hiring">HIRING</div>
<div className="requirement__other-skills">
{selectedProject?.hiring?.map((role, index) => {
{props.selectedProject?.hiring?.map((role, index) => {
return (
<div className="requirement__other-skill" key={index}>
o {role}
Expand All @@ -33,26 +94,39 @@ const RequirementDetails = ({ selectedProject }) => {
)}

<div className="requirement-container__controls">
<a
href={`tel:${selectedProject.contactNo}`}
className="description__tag_phone_mobile"
>
<FaPhoneAlt
color="white"
size={40}
style={{
backgroundColor: "#9e0000",
borderRadius: "50%",
padding: "8px",
}}
/>
</a>
<a href={`mailto: ${selectedProject.leaderEmail}`}>
<IoMdMail color="#9e0000" size={49} style={{ marginTop: "3px" }} />
</a>
{selectedProject.githubLink.length ? (
{currentUser ? (
<a
href={`tel:${props.selectedProject.contactNo}`}
className="description__tag_phone_mobile"
>
<FaPhoneAlt
color="white"
size={40}
style={{
backgroundColor: "#9e0000",
borderRadius: "50%",
padding: "8px",
}}
/>
</a>
) : (
""
)}
{currentUser ? (
<a href={`mailto: ${props.selectedProject.leaderEmail}`}>
<IoMdMail
color="#9e0000"
size={49}
style={{ marginTop: "3px" }}
/>
</a>
) : (
""
)}

{props.selectedProject.githubLink.length ? (
<a
href={selectedProject.githubLink}
href={props.selectedProject.githubLink}
target="_blank"
rel="noreferrer"
>
Expand All @@ -63,6 +137,19 @@ const RequirementDetails = ({ selectedProject }) => {
)}
</div>
</div>
<ProjectModal
show={showNewProjectModal}
onHide={() => setShowNewProjectModal(false)}
project={props.selectedProject}
setVariable={props.setVariable}
variable={props.variable}
/>
<DeleteConfirmation
showModal={displayConfirmationModal}
confirmModal={submitDelete}
hideModal={hideConfirmationModal}
id={props.selectedProject.id}
/>
</>
);
};
Expand Down
Loading