fixed error during rebase
This commit is contained in:
parent
50585e1fbd
commit
39f0908fc0
@ -81,22 +81,9 @@ const ProjectDetails = () => {
|
|||||||
switch (activePill) {
|
switch (activePill) {
|
||||||
case "profile": {
|
case "profile": {
|
||||||
return (
|
return (
|
||||||
<>
|
<div className="row">
|
||||||
<div className="row ">
|
<div className="col-xl-4 col-lg-5 col-md-5 mt-5">
|
||||||
<div className="col-lg-4 col-md-5 mt-5">
|
<AboutProject ></AboutProject>
|
||||||
{/* About User */}
|
|
||||||
<AboutProject data={projectDetails}></AboutProject>
|
|
||||||
<ProjectOverview project={projectId} />
|
|
||||||
{/* About User */}
|
|
||||||
</div>
|
|
||||||
<div className="col-lg-8 col-md-5 mt-5">
|
|
||||||
{/* Profile Overview */}
|
|
||||||
<ProjectProgressChart
|
|
||||||
ShowAllProject="false"
|
|
||||||
DefaultRange="1M"
|
|
||||||
/>
|
|
||||||
{/* Profile Overview */}
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
<div className="col-xl-4 col-lg-5 col-md-5 mt-5">
|
<div className="col-xl-4 col-lg-5 col-md-5 mt-5">
|
||||||
<ProjectOverview project={projectId} />
|
<ProjectOverview project={projectId} />
|
||||||
@ -136,8 +123,8 @@ const ProjectDetails = () => {
|
|||||||
}
|
}
|
||||||
case "directory": {
|
case "directory": {
|
||||||
return (
|
return (
|
||||||
<div className="row mt-2">
|
<div className="row">
|
||||||
<Directory IsPage={false} prefernceContacts={projectDetails.id} />
|
<Directory IsPage={false} prefernceContacts={projects_Details.id} />
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@ -177,7 +164,7 @@ const ProjectDetails = () => {
|
|||||||
]}
|
]}
|
||||||
></Breadcrumb>
|
></Breadcrumb>
|
||||||
|
|
||||||
<div className="row ">
|
<div className="row">
|
||||||
{projectLoading && <p>Loading....</p>}
|
{projectLoading && <p>Loading....</p>}
|
||||||
{/* {!projectLoading && project && (
|
{/* {!projectLoading && project && (
|
||||||
<ProjectBanner project_data={project}></ProjectBanner>
|
<ProjectBanner project_data={project}></ProjectBanner>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user