From 074ce12f111c80a92abed027c56f5dfa7124a4af Mon Sep 17 00:00:00 2001 From: MTG2000 Date: Wed, 5 Oct 2022 13:12:47 +0300 Subject: [PATCH] updates: tagging project QA, general QA --- .../CoverImageInput/CoverImageInput.tsx | 12 ++-- .../PostCard/PostCard/PostCard.Skeleton.tsx | 2 +- .../PostCardHeader/PostCardHeader.tsx | 14 +++-- .../TagProjectInput/TagProjectInput.tsx | 2 +- .../Posts/pages/FeedPage/FeedPage.tsx | 35 ++++++----- .../Posts/pages/FeedPage/styles.module.scss | 5 +- .../PostPageHeader/PostPageHeader.tsx | 13 ++-- .../StoryPageContent/StoryPageContent.tsx | 62 ++++++++++++------- .../ProfilePage/SkillsCard/SkillsCard.tsx | 2 +- 9 files changed, 84 insertions(+), 63 deletions(-) diff --git a/src/Components/Inputs/FilesInputs/CoverImageInput/CoverImageInput.tsx b/src/Components/Inputs/FilesInputs/CoverImageInput/CoverImageInput.tsx index b4975a4..98e0a5b 100644 --- a/src/Components/Inputs/FilesInputs/CoverImageInput/CoverImageInput.tsx +++ b/src/Components/Inputs/FilesInputs/CoverImageInput/CoverImageInput.tsx @@ -34,10 +34,10 @@ export default function CoverImageInput(props: Props) { wrapperClass='h-full' render={({ img, isUploading, isDraggingOnWindow }) =>
- {!img &&
-

-
- Drop a COVER IMAGE here or
Click to browse + {!img &&
+

+
+ Drop a COVER IMAGE here or
Click to browse
} {img && <> @@ -45,10 +45,10 @@ export default function CoverImageInput(props: Props) { {!isUploading &&
- -
diff --git a/src/features/Posts/Components/PostCard/PostCard/PostCard.Skeleton.tsx b/src/features/Posts/Components/PostCard/PostCard/PostCard.Skeleton.tsx index d91584e..8022a91 100644 --- a/src/features/Posts/Components/PostCard/PostCard/PostCard.Skeleton.tsx +++ b/src/features/Posts/Components/PostCard/PostCard/PostCard.Skeleton.tsx @@ -5,7 +5,7 @@ import Card from "src/Components/Card/Card" export default function PostCardSkeleton() { return
- +

diff --git a/src/features/Posts/Components/PostCard/PostCardHeader/PostCardHeader.tsx b/src/features/Posts/Components/PostCard/PostCardHeader/PostCardHeader.tsx index 257c224..76f0893 100644 --- a/src/features/Posts/Components/PostCard/PostCardHeader/PostCardHeader.tsx +++ b/src/features/Posts/Components/PostCard/PostCardHeader/PostCardHeader.tsx @@ -17,10 +17,12 @@ export default function PostCardHeader(props: Props) { const dateToShow = () => { - const passedTime = dayjs().diff(props.date, 'hour'); - if (passedTime === 0) return 'now'; - if (passedTime < 24) return `${dayjs().diff(props.date, 'hour')}h ago` - return dayjs(props.date).format('MMMM DD'); + const passedTimeHrs = dayjs().diff(props.date, 'hour'); + const passedTimesDays = Math.ceil(passedTimeHrs / 24); + if (passedTimeHrs === 0) return 'now'; + if (passedTimeHrs < 24) return `${dayjs().diff(props.date, 'hour')}h ago` + if (passedTimesDays < 29) return `${passedTimesDays} days` + return dayjs(props.date).format('DD MMM'); } if (!props.author) return null @@ -29,10 +31,10 @@ export default function PostCardHeader(props: Props) {
- + {props.project && - + } diff --git a/src/features/Posts/pages/CreatePostPage/Components/TagProjectInput/TagProjectInput.tsx b/src/features/Posts/pages/CreatePostPage/Components/TagProjectInput/TagProjectInput.tsx index 97c9db4..8889d34 100644 --- a/src/features/Posts/pages/CreatePostPage/Components/TagProjectInput/TagProjectInput.tsx +++ b/src/features/Posts/pages/CreatePostPage/Components/TagProjectInput/TagProjectInput.tsx @@ -34,7 +34,7 @@ export default function TagProjectInput({ const query = useMyProjectsQuery() - const placeholder = props.placeholder ??
Tag a project
+ const placeholder = props.placeholder ??
Tag a project
const handleChange = (newValue: OnChangeValue,) => { props.onChange?.(newValue); diff --git a/src/features/Posts/pages/FeedPage/FeedPage.tsx b/src/features/Posts/pages/FeedPage/FeedPage.tsx index 42dc82e..4ae3b6d 100644 --- a/src/features/Posts/pages/FeedPage/FeedPage.tsx +++ b/src/features/Posts/pages/FeedPage/FeedPage.tsx @@ -79,7 +79,7 @@ export default function FeedPage() { filterChanged={setSortByFilter} />
-
+
) diff --git a/src/features/Posts/pages/PostDetailsPage/Components/StoryPageContent/StoryPageContent.tsx b/src/features/Posts/pages/PostDetailsPage/Components/StoryPageContent/StoryPageContent.tsx index 05314bb..d028aeb 100644 --- a/src/features/Posts/pages/PostDetailsPage/Components/StoryPageContent/StoryPageContent.tsx +++ b/src/features/Posts/pages/PostDetailsPage/Components/StoryPageContent/StoryPageContent.tsx @@ -7,10 +7,13 @@ import IconButton from "src/Components/IconButton/IconButton"; import { Menu, MenuItem } from "@szhsin/react-menu"; import { useAppSelector } from "src/utils/hooks"; import { useUpdateStory } from './useUpdateStory' -import { FaPen } from "react-icons/fa"; import DOMPurify from 'dompurify'; import Card from "src/Components/Card/Card"; import PostPageHeader from "../PostPageHeader/PostPageHeader"; +import { FiEdit2, FiLink } from "react-icons/fi"; +import CopyToClipboard from "react-copy-to-clipboard"; +import { createRoute } from "src/utils/routing"; +import { NotificationsService } from "src/services"; interface Props { @@ -30,33 +33,46 @@ export default function StoryPageContent({ story }: Props) { <>
- + +
+ +
+ NotificationsService.info(" Copied share link to clipboard", { icon: "📋" })} + > + + + + + {curUser?.id === story.author.id && }> + + Edit story + + + Delete + + } +
+
{story.cover_image && }
- {curUser?.id === story.author.id && }> - - Edit story - - - Delete - - } +

{story.title}

{story.tags.length > 0 &&
{story.tags.map(tag => diff --git a/src/features/Profiles/pages/ProfilePage/SkillsCard/SkillsCard.tsx b/src/features/Profiles/pages/ProfilePage/SkillsCard/SkillsCard.tsx index e937d72..5975fda 100644 --- a/src/features/Profiles/pages/ProfilePage/SkillsCard/SkillsCard.tsx +++ b/src/features/Profiles/pages/ProfilePage/SkillsCard/SkillsCard.tsx @@ -18,7 +18,7 @@ export default function SkillsCard({ skills, isOwner }: Props) {

No skills added

{isOwner && } } -
    +
      {skills.map((skill) =>
    • {skill.title}
      • )}