Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

Some semblence of a working post listing

Matt Robertsbf428e90814b
diff --git a/public/assets/styles/utility/display.scss b/public/assets/styles/utility/display.scss
index 527acd1ed..0b58e6d89 100644
--- a/public/assets/styles/utility/display.scss
+++ b/public/assets/styles/utility/display.scss
@@ -98,6 +98,10 @@
align-self: start;
}
+.align-self-center {
+ align-self: center;
+}
+
.flex-items-center {
align-items: center;
}
@@ -146,7 +150,7 @@
.flex-x.flex--divide-#{$i} > * + * {
padding-right: spacing($i);
padding-left: spacing($i);
- border: 0 solid get("colors.gray.100");
+ border: 0 solid get("colors.gray.200");
border-left-width: 1px;
}
.flex-x.flex--divide-#{$i} > *:last-child {
@@ -158,7 +162,7 @@
.flex-y.flex--divide-#{$i} > * + * {
padding-top: spacing($i);
padding-bottom: spacing($i);
- border: 0 solid get("colors.gray.100");
+ border: 0 solid get("colors.gray.200");
border-top-width: 1px;
}
.flex-y.flex--divide-#{$i} > *:last-child {
@@ -199,6 +203,10 @@
border-top: 1px solid;
}
+.bl {
+ border-left: 1px solid;
+}
+
.overflow-scroll {
overflow: scroll;
}
diff --git a/public/components/ShowPostResponse.tsx b/public/components/ShowPostResponse.tsx
index e5c6a0129..72eb7256f 100644
--- a/public/components/ShowPostResponse.tsx
+++ b/public/components/ShowPostResponse.tsx
@@ -5,31 +5,12 @@ import HeroIconDuplicate from "@fider/assets/images/heroicons-duplicate.svg"
import HeroIconCheck from "@fider/assets/images/heroicons-check-circle.svg"
import HeroIconSparkles from "@fider/assets/images/heroicons-sparkles-outline.svg"
import HeroIconThumbsUp from "@fider/assets/images/heroicons-thumbsup.svg"
+import HeroIconThumbsDown from "@fider/assets/images/heroicons-thumbsdown.svg"
import { t } from "@lingui/macro"
import { HStack } from "./layout"
import { timeSince } from "@fider/services"
-// const DuplicateDetails = (props: PostResponseProps): JSX.Element | null => {
-// if (!props.response) {
-// return null
-// }
-
-// const original = props.response.original
-// if (!original) {
-// return null
-// }
-
-// return (
-// <HStack>
-// <Icon sprite={HeroIconDuplicate} className="h-6 text-gray-500" />
-// <a className="text-link" href={`/posts/${original.number}/${original.slug}`}>
-// {original.title}
-// </a>
-// </HStack>
-// )
-// }
-
interface PostResponseProps {
status: string
response: PostResponse | null
@@ -70,22 +51,24 @@ export const ResponseDetails = (props: PostResponseProps): JSX.Element | null =>
)
}
-const getStatusIcon = (status: PostStatus): SpriteSymbol => {
+const getLozengeProps = (status: PostStatus): { icon: SpriteSymbol; bg: string; color: string; border: string } => {
switch (status) {
+ case PostStatus.Declined:
+ return { icon: HeroIconThumbsDown, bg: "bg-red-100", color: "text-red-800", border: "border-red-300" }
case PostStatus.Duplicate:
- return HeroIconDuplicate
+ return { icon: HeroIconDuplicate, bg: "bg-yellow-100", color: "text-yellow-800", border: "border-yellow-400" }
case PostStatus.Completed:
- return HeroIconCheck
+ return { icon: HeroIconCheck, bg: "bg-green-300", color: "text-green-800", border: "border-green-500" }
case PostStatus.Planned:
- return HeroIconThumbsUp
- case PostStatus.Started:
- return HeroIconSparkles
+ return { icon: HeroIconThumbsUp, bg: "bg-blue-100", color: "text-blue-700", border: "border-blue-400" }
+ default:
+ return { icon: HeroIconSparkles, bg: "bg-green-100", color: "text-green-700", border: "border-green-400" }
}
- return HeroIconThumbsUp
}
export const ResponseLozenge = (props: PostResponseProps): JSX.Element | null => {
const status = PostStatus.Get(props.status)
+ const { icon, bg, color, border } = getLozengeProps(status)
if (status === PostStatus.Open) {
return <div />
@@ -93,8 +76,8 @@ export const ResponseLozenge = (props: PostResponseProps): JSX.Element | null =>
return (
<>
- <HStack align="start" className="align-self-start bg-blue-100 border border-blue-300 rounded-full p-1 px-3 mb-4">
- <Icon sprite={getStatusIcon(status)} className={`h-5 c-status-col--${status.value}`} />
+ <HStack align="start" className={`align-self-start ${color} ${bg} border ${border} rounded-full p-1 px-3`}>
+ <Icon sprite={icon} className={`h-5 c-status-col--${status.value}`} />
<span className={`text-semibold c-status-col--${status.value}`}>{status.title}</span>
</HStack>
</>
diff --git a/public/components/ShowPostStatus.scss b/public/components/ShowPostStatus.scss
deleted file mode 100644
index 86dbdd1ba..000000000
--- a/public/components/ShowPostStatus.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-@import "~@fider/assets/styles/variables.scss";
-
-.c-status-col {
-
- &--open {
- color: get("colors.blue.600");
- }
-
- &--planned {
- color: #6435c9;
- }
-
- &--started {
- color: #2185d0;
- }
-
- &--completed {
- color: #21ba45;
- }
-
- &--declined {
- color: #db2828;
- }
-
- &--duplicate {
- color: #d6a100;
- }
-}
diff --git a/public/components/ShowPostStatus.tsx b/public/components/ShowPostStatus.tsx
index b41765fc0..aa3190c7e 100644
--- a/public/components/ShowPostStatus.tsx
+++ b/public/components/ShowPostStatus.tsx
@@ -1,4 +1,4 @@
-import "./ShowPostStatus.scss"
+// import "./ShowPostStatus.scss"
import React from "react"
import { PostStatus } from "@fider/models"
diff --git a/public/components/VoteCounter.tsx b/public/components/VoteCounter.tsx
index 88f658570..bab60a2ee 100644
--- a/public/components/VoteCounter.tsx
+++ b/public/components/VoteCounter.tsx
@@ -38,6 +38,7 @@ export const VoteCounter = (props: VoteCounterProps) => {
const isDisabled = status.closed || fider.isReadOnly
const className = classSet({
+ "border-gray-200 border rounded-md bg-gray-100": true,
"c-vote-counter__button": true,
"c-vote-counter__button--voted": !status.closed && hasVoted,
"c-vote-counter__button--disabled": isDisabled,
diff --git a/public/pages/Home/components/ListPosts.tsx b/public/pages/Home/components/ListPosts.tsx
index 3c0758428..01c50c35d 100644
--- a/public/pages/Home/components/ListPosts.tsx
+++ b/public/pages/Home/components/ListPosts.tsx
@@ -12,11 +12,16 @@ interface ListPostsProps {
const ListPostItem = (props: { post: Post; user?: CurrentUser; tags: Tag[] }) => {
return (
- <HStack align="center">
- <div className="align-self-start">
+ <HStack spacing={4}>
+ <div>
<VoteCounter post={props.post} />
</div>
<VStack className="w-full" spacing={2}>
+ {props.post.status !== "open" && (
+ <div className="mb-2 align-self-start">
+ <ResponseLozenge status={props.post.status} response={props.post.response} />
+ </div>
+ )}
<HStack justify="between">
<a className="text-title hover:text-primary-base" href={`/posts/${props.post.number}/${props.post.slug}`}>
{props.post.title}
@@ -27,8 +32,7 @@ const ListPostItem = (props: { post: Post; user?: CurrentUser; tags: Tag[] }) =>
</HStack>
)}
</HStack>
- <Markdown className="text-gray-600" maxLength={300} text={props.post.description} style="plainText" />
- <ResponseLozenge status={props.post.status} response={props.post.response} />
+ <Markdown className="text-gray-700" maxLength={300} text={props.post.description} style="plainText" />
{props.tags.length >= 1 && (
<HStack className="flex-wrap">
{props.tags.map((tag) => (
@@ -51,7 +55,7 @@ export const ListPosts = (props: ListPostsProps) => {
}
return (
- <VStack spacing={4} divide={true} align="center">
+ <VStack spacing={4} align="center" divide>
{props.posts.map((post) => (
<ListPostItem key={post.id} post={post} tags={props.tags.filter((tag) => post.tags.indexOf(tag.slug) >= 0)} />
))}