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

Jump to bottom

Fix comments intructions UI enhancement #1384

Merged
merged 5 commits into from
Mar 25, 2024
Merged

Fix comments intructions UI enhancement #1384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
82a3a49
fix editor: style fix
NSUWAL123 Mar 25, 2024
191d95b
fix projectDetails: comments & instructions css fix
NSUWAL123 Mar 25, 2024
23e7480
fix projectDetails: mobile UI fix for comments & instructions
NSUWAL123 Mar 25, 2024
0e0c1c3
fix comments: UI fix
NSUWAL123 Mar 25, 2024
037da76
Merge branch 'development' of github.com:hotosm/fmtm into fix-comment…
NSUWAL123 Mar 25, 2024
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
42 changes: 32 additions & 10 deletions src/frontend/src/components/ProjectDetailsV2/Comments.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,41 @@ const Comments = () => {
{projectCommentsList?.length > 0 ? (
<div className="fmtm-flex fmtm-flex-col fmtm-gap-4 fmtm-mb-1">
{projectCommentsList?.map((projectComment, i) => (
<div key={i} className="fmtm-flex fmtm-w-full fmtm-gap-4 fmtm-px-2">
<div
key={i}
className="fmtm-flex fmtm-w-full fmtm-gap-4 fmtm-px-2 fmtm-border-b fmtm-border-[#e9e9e9] sm:fmtm-border-white fmtm-pb-3"
>
<div className="fmtm-h-8 fmtm-w-8 fmtm-rounded-full fmtm-flex fmtm-justify-center fmtm-items-center fmtm-bg-white">
<AssetModules.PersonIcon color="success" sx={{ fontSize: '30px' }} />
</div>
<div className=" fmtm-flex-1">
<div className="fmtm-flex-1 fmtm-flex fmtm-flex-col fmtm-gap-1">
<div className="fmtm-flex fmtm-gap-3 fmtm-items-center">
<p>{projectComment?.commented_by}</p>
<p className="fmtm-text-sm fmtm-text-gray-600">
{projectComment?.created_at?.split('T')[0]} {projectComment?.created_at?.split('T')[1]}
</p>
</div>
<div className="fmtm-mt-2">
<RichTextEditor editorHtmlContent={projectComment?.comment} editable={false} />
<div>
<RichTextEditor
editorHtmlContent={projectComment?.comment}
editable={false}
className="sm:!fmtm-bg-[#f5f5f5] !fmtm-rounded-none !fmtm-border-none"
/>
</div>
<div className="fmtm-flex fmtm-items-center fmtm-justify-between">
<p className="fmtm-font-archivo fmtm-text-sm fmtm-text-[#7A7676]">#{selectedTask}</p>
<div className="fmtm-flex fmtm-items-center fmtm-gap-2">
<div className="fmtm-flex fmtm-items-center fmtm-mb-1">
<AssetModules.AccessTimeIcon
className="fmtm-text-primaryRed"
style={{ fontSize: '20px' }}
/>
</div>
<p className="fmtm-font-archivo fmtm-text-sm fmtm-text-[#7A7676] fmtm-flex fmtm-gap-2">
<span>{projectComment?.created_at?.split('T')[0]}</span>
<span>
{projectComment?.created_at?.split('T')[1].split(':')[0]}:
{projectComment?.created_at?.split('T')[1].split(':')[1]}
</span>
</p>
</div>
</div>
</div>
</div>
Expand All @@ -96,7 +118,7 @@ const Comments = () => {
</div>
)}
</div>
<div className="fmtm-pt-2">
<div className="fmtm-pt-2 sm:fmtm-max-h-[235px] sm:fmtm-overflow-scroll sm:scrollbar">
<RichTextEditor
editorHtmlContent={comment}
setEditorHtmlContent={(content) => setComment(content)}
Expand All @@ -108,7 +130,7 @@ const Comments = () => {
<div className="fmtm-w-1/2">
<Button
type="button"
btnText="Cancel"
btnText="CLEAR COMMENT"
btnType="other"
className="!fmtm-rounded !fmtm-py-[3px] fmtm-w-full fmtm-flex fmtm-justify-center"
onClick={() => {
Expand All @@ -120,7 +142,7 @@ const Comments = () => {
<div className="fmtm-w-1/2">
<Button
type="button"
btnText="Save Comment"
btnText="SAVE COMMENT"
btnType="primary"
className="!fmtm-rounded fmtm-w-full fmtm-flex fmtm-justify-center"
onClick={handleComment}
Expand Down
6 changes: 5 additions & 1 deletion src/frontend/src/components/ProjectDetailsV2/Instructions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ const Instructions = ({ instructions }: { instructions: string }) => {
return (
<div className="fmtm-overflow-y-scroll scrollbar">
{instructions ? (
<RichTextEditor editorHtmlContent={instructions} editable={false} />
<RichTextEditor
editorHtmlContent={instructions}
editable={false}
className="fmtm-p-2 sm:fmtm-p-0 sm:!fmtm-bg-[#f5f5f5] !fmtm-rounded-none !fmtm-border-none"
/>
) : (
<p className="fmtm-mt-5 fmtm-text-center fmtm-text-xl fmtm-text-gray-400">No Instructions!</p>
)}
Expand Down
13 changes: 10 additions & 3 deletions src/frontend/src/components/common/Editor/Editor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ type RichTextEditorProps = {
setEditorHtmlContent?: (content: string) => any;
editable: boolean;
isEditorEmpty?: (status: boolean) => void;
className?: string;
};

const extensions = [
Expand All @@ -40,7 +41,13 @@ const extensions = [
}),
];

const RichTextEditor = ({ editorHtmlContent, setEditorHtmlContent, editable, isEditorEmpty }: RichTextEditorProps) => {
const RichTextEditor = ({
editorHtmlContent,
setEditorHtmlContent,
editable,
isEditorEmpty,
className,
}: RichTextEditorProps) => {
const dispatch = useDispatch();
const editor = useEditor({
extensions,
Expand Down Expand Up @@ -74,9 +81,9 @@ const RichTextEditor = ({ editorHtmlContent, setEditorHtmlContent, editable, isE
}

return (
<div className="fmtm-border-[1px] fmtm-border-gray-300 fmtm-rounded-md fmtm-bg-white">
<div className={`fmtm-border-[1px] fmtm-border-gray-300 fmtm-rounded-md fmtm-bg-white ${className}`}>
{editable && <Toolbar editor={editor} />}
<EditorContent editor={editor} className={`${editable ? 'fmtm-min-h-[150px]' : 'fmtm-min-h-[50px]'}`} />
<EditorContent editor={editor} className={`${editable ? 'fmtm-min-h-[150px] fmtm-p-4' : 'fmtm-min-h-[50px]'}`} />
</div>
);
};
Expand Down
1 change: 0 additions & 1 deletion src/frontend/src/components/common/Editor/editorStyles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
&:focus-visible {
outline: none;
}
padding: 15px;

> * + * {
margin-top: 0.75em;
Expand Down
Loading