Skip to content

Commit

Permalink
Merge pull request #50 from AntaresSimulatorTeam/fix/ANT-2722_v3
Browse files Browse the repository at this point in the history
fix: remove new_project button stylo and avatar in project header
  • Loading branch information
vargastat authored Feb 5, 2025
2 parents ba1807a + afb1706 commit a368870
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 55 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const ProjectDetails = () => {
</div>
) : (
<div className="flex flex-col">
<ProjectDetailsHeader projectName={projectInfo.name} createdBy={projectInfo.createdBy} />
<ProjectDetailsHeader projectName={projectInfo.name} />
<RdsDivider />
<div className="flex flex-col">
<ProjectDetailsContent
Expand Down
47 changes: 18 additions & 29 deletions src/pages/pegase/projects/projectDetails/ProjectDetailsContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
*/

import { formatDateToDDMMYYYY } from '@/shared/utils/dateFormatter';
import { RdsIconButton, RdsIconId } from 'rte-design-system-react';

type ProjectDetailsContentProps = {
description: string;
Expand All @@ -19,36 +18,26 @@ export const ProjectDetailsContent = ({
creationDate,
createdBy,
keywords,
}: ProjectDetailsContentProps) => {
const handleEditClick = () => {
console.log('TO BE DONE');
};

return (
<div className="flex flex-col gap-3 p-3">
<div className="group flex flex-col gap-3 rounded bg-primary-100 p-2" role="banner">
<div className="text-base justify-between text-left font-sans font-normal text-gray-900">{description}</div>

<div className="flex items-center justify-between font-sans font-light text-gray-500">
<div className="flex items-center gap-3">
<span>{description}</span>
<span>{formatDateToDDMMYYYY(creationDate)}</span>
<span>{createdBy}</span>
<span>
{keywords.map((keyword, index) => (
<span key={index}>
{keyword}
{index < keywords.length - 1 ? ', ' : ''}
</span>
))}
</span>
</div>

<RdsIconButton icon={RdsIconId.Edit} size="small" onClick={handleEditClick} />
}: ProjectDetailsContentProps) => (
<div className="flex flex-col gap-3 p-3">
<div className="group flex flex-col gap-3 rounded bg-primary-100 p-2" role="banner">
<div className="text-base justify-between text-left font-sans font-normal text-gray-900">{description}</div>
<div className="flex items-center justify-between font-sans font-light text-gray-500">
<div className="flex items-center gap-3">
<span>{formatDateToDDMMYYYY(creationDate)}</span>
<span>{createdBy}</span>
<span>
{keywords.map((keyword, index) => (
<span key={index}>
{keyword}
{index < keywords.length - 1 ? ', ' : ''}
</span>
))}
</span>
</div>
</div>
</div>
);
};
</div>
);

export default ProjectDetailsContent;
32 changes: 7 additions & 25 deletions src/pages/pegase/projects/projectDetails/ProjectDetailsHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,35 +4,17 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/

import StdAvatar from '@/components/common/layout/stdAvatar/StdAvatar';
import { ProjectCreationModal } from '@/components/common/modal/ProjectCreationModal';
import { useNewStudyModal } from '@/hooks/useNewStudyModal';
import { useTranslation } from 'react-i18next';
import { RdsButton, RdsHeading } from 'rte-design-system-react';
import { RdsHeading } from 'rte-design-system-react';

type ProjectDetailsHeaderProps = {
projectName: string;
createdBy: string;
};

const ProjectDetailsHeader = ({ projectName, createdBy }: ProjectDetailsHeaderProps) => {
const { t } = useTranslation();
const { isModalOpen, toggleModal } = useNewStudyModal();
return (
<div className="flex items-center justify-between px-3 py-2">
<RdsHeading title={projectName} />
<div className="ml-auto flex items-center gap-4">
<RdsButton label={t('home.@buttonNewProject')} variant="contained" color="primary" onClick={toggleModal} />
{isModalOpen && <ProjectCreationModal onClose={toggleModal} />}
<StdAvatar
size="s"
backgroundColor="green"
fullname={createdBy}
initials={createdBy.substring(0, 2)}
></StdAvatar>
</div>
</div>
);
};
const ProjectDetailsHeader = ({ projectName }: ProjectDetailsHeaderProps) => (
<div className="flex items-center justify-between px-3 py-2">
<RdsHeading title={projectName} />
<div className="ml-auto flex items-center gap-4"></div>
</div>
);

export default ProjectDetailsHeader;

0 comments on commit a368870

Please sign in to comment.