Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

Quite a nice post-details without page reload

Matt Robertsdaf8930335cc
diff --git a/public/assets/images/heroicons-arrowleft-rectangle.svg b/public/assets/images/heroicons-arrowleft-rectangle.svg
new file mode 100644
index 000000000..738666894
--- /dev/null
+++ b/public/assets/images/heroicons-arrowleft-rectangle.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
+ <path stroke-linecap="round" stroke-linejoin="round" d="M8.25 9V5.25A2.25 2.25 0 0 1 10.5 3h6a2.25 2.25 0 0 1 2.25 2.25v13.5A2.25 2.25 0 0 1 16.5 21h-6a2.25 2.25 0 0 1-2.25-2.25V15m-3 0-3-3m0 0 3-3m-3 3H15" />
+</svg>
diff --git a/public/assets/images/heroicons-arrowleft.svg b/public/assets/images/heroicons-arrowleft.svg
index 738666894..5df40ef75 100644
--- a/public/assets/images/heroicons-arrowleft.svg
+++ b/public/assets/images/heroicons-arrowleft.svg
@@ -1,3 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-6">
- <path stroke-linecap="round" stroke-linejoin="round" d="M8.25 9V5.25A2.25 2.25 0 0 1 10.5 3h6a2.25 2.25 0 0 1 2.25 2.25v13.5A2.25 2.25 0 0 1 16.5 21h-6a2.25 2.25 0 0 1-2.25-2.25V15m-3 0-3-3m0 0 3-3m-3 3H15" />
+ <path stroke-linecap="round" stroke-linejoin="round" d="M10.5 19.5 3 12m0 0 7.5-7.5M3 12h18" />
</svg>
diff --git a/public/components/PostDetails/PostDetails.tsx b/public/components/PostDetails/PostDetails.tsx
index 461e4de74..c215e51a7 100644
--- a/public/components/PostDetails/PostDetails.tsx
+++ b/public/components/PostDetails/PostDetails.tsx
@@ -31,7 +31,6 @@ import { useAttachments } from "@fider/hooks/useAttachments"
interface PostDetailsProps {
postNumber: number
- onClose?: () => void
// Optional initial data for SSR
initialPost?: Post
initialSubscribed?: boolean
@@ -96,7 +95,8 @@ export const PostDetails: React.FC<PostDetailsProps> = (props) => {
setComments(commentsResult || [])
setTags(tagsResult || [])
- setVotes(votesResult.ok ? votesResult.data : [])
+ // Limit votes to 24 to match SSR behavior
+ setVotes(votesResult.ok ? votesResult.data.slice(0, 24) : [])
// Fetch subscription status if authenticated
if (Fider.session.isAuthenticated) {
@@ -247,12 +247,7 @@ export const PostDetails: React.FC<PostDetailsProps> = (props) => {
<RSSModal isOpen={isRSSModalOpen} onClose={hideRSSModal} url={`${fider.settings.baseURL}/feed/posts/${post.number}.atom`} />
{!editMode && (
- <HStack>
- {props.onClose && (
- <Button onClick={props.onClose}>
- <Icon sprite={IconX} />
- </Button>
- )}
+ <HStack spacing={4}>
<Dropdown position="left" renderHandle={<Icon sprite={IconDotsHorizontal} width="24" height="24" />}>
<Dropdown.ListItem onClick={onActionSelected("copy")} icon={IconDuplicate}>
<Trans id="action.copylink">Copy link</Trans>
diff --git a/public/components/UserMenu.tsx b/public/components/UserMenu.tsx
index 18979b662..6256112f1 100644
--- a/public/components/UserMenu.tsx
+++ b/public/components/UserMenu.tsx
@@ -4,7 +4,7 @@ import { Avatar, Dropdown } from "./common"
import { Trans } from "@lingui/react/macro"
import IconCog from "@fider/assets/images/heroicons-cog.svg"
import IconWrench from "@fider/assets/images/heroicons-wrenchscrewdriver.svg"
-import IconLeft from "@fider/assets/images/heroicons-arrowleft.svg"
+import IconLeft from "@fider/assets/images/heroicons-arrowleft-rectangle.svg"
export const UserMenu = () => {
const fider = useFider()
diff --git a/public/components/common/AvatarStack.scss b/public/components/common/AvatarStack.scss
index 758a2a27f..57c966f80 100644
--- a/public/components/common/AvatarStack.scss
+++ b/public/components/common/AvatarStack.scss
@@ -1,6 +1,8 @@
@use "~@fider/assets/styles/variables.scss" as *;
.c-avatar-stack {
+ opacity: 0;
+
> * {
border: 1px solid var(--colors-gray-300);
}
@@ -8,4 +10,8 @@
&--overlap & > * + * {
margin-inline-start: spacing(-3);
}
+
+ &--loaded {
+ opacity: 1;
+ }
}
diff --git a/public/components/common/AvatarStack.tsx b/public/components/common/AvatarStack.tsx
index c7d475d61..841ba783f 100644
--- a/public/components/common/AvatarStack.tsx
+++ b/public/components/common/AvatarStack.tsx
@@ -1,8 +1,7 @@
import "./AvatarStack.scss"
-import React from "react"
+import React, { useState, useEffect } from "react"
import { UserRole } from "@fider/models"
-import { Avatar } from "./Avatar"
import { classSet } from "@fider/services"
interface AvatarStackProps {
@@ -15,15 +14,57 @@ interface AvatarStackProps {
}
export const AvatarStack = (props: AvatarStackProps) => {
+ const [loadedCount, setLoadedCount] = useState(0)
+ const [errorCount, setErrorCount] = useState(0)
+ const [allLoaded, setAllLoaded] = useState(false)
+ const totalCount = props.users.length
+
+ useEffect(() => {
+ // Reset when users change
+ setLoadedCount(0)
+ setErrorCount(0)
+ setAllLoaded(false)
+
+ // Fallback: show avatars after 2 seconds regardless of load state
+ const fallbackTimer = setTimeout(() => {
+ setAllLoaded(true)
+ }, 2000)
+
+ return () => clearTimeout(fallbackTimer)
+ }, [props.users])
+
+ useEffect(() => {
+ // Check if all images are loaded or errored
+ if (loadedCount + errorCount === totalCount && totalCount > 0) {
+ setAllLoaded(true)
+ }
+ }, [loadedCount, errorCount, totalCount])
+
+ const handleImageLoad = () => {
+ setLoadedCount((prev) => prev + 1)
+ }
+
+ const handleImageError = () => {
+ setErrorCount((prev) => prev + 1)
+ }
+
const classes = classSet({
"c-avatar-stack": true,
"c-avatar-stack--overlap": props.overlap ?? true,
+ "c-avatar-stack--loaded": allLoaded,
})
return (
<div className={classes}>
{props.users.map((x, i) => (
- <Avatar key={i} user={x} />
+ <img
+ key={i}
+ className="c-avatar h-8 w-8"
+ alt={x.name}
+ src={`${x.avatarURL}?size=50`}
+ onLoad={handleImageLoad}
+ onError={handleImageError}
+ />
))}
</div>
)
diff --git a/public/pages/Home/Home.page.tsx b/public/pages/Home/Home.page.tsx
index 313155ede..d6f0793f9 100644
--- a/public/pages/Home/Home.page.tsx
+++ b/public/pages/Home/Home.page.tsx
@@ -1,17 +1,18 @@
import "./Home.page.scss"
import NoDataIllustration from "@fider/assets/images/undraw-no-data.svg"
+import IconArrowLeft from "@fider/assets/images/heroicons-arrowleft.svg"
import React, { useEffect, useState } from "react"
import { Post, Tag, PostStatus } from "@fider/models"
import { Markdown, Hint, PoweredByFider, Icon, Header, Button } from "@fider/components"
import { PostsContainer } from "./components/PostsContainer"
import { useFider } from "@fider/hooks"
-import { VStack } from "@fider/components/layout"
+import { HStack, VStack } from "@fider/components/layout"
import { ShareFeedback } from "./components/ShareFeedback"
import { i18n } from "@lingui/core"
import { Trans } from "@lingui/react/macro"
import { isPostPending, setPostPending } from "./components/PostCache"
-import { PostDetails, PostDetailsOverlay } from "@fider/components/PostDetails"
+import { PostDetails } from "@fider/components/PostDetails"
export interface HomePageProps {
posts: Post[]
@@ -138,35 +139,44 @@ What can we do better? This is the place for you to vote, discuss and share idea
isOpen={isShareFeedbackOpen && !fider.isReadOnly}
onClose={() => setIsShareFeedbackOpen(false)}
/>
- <div style={{ display: selectedPostId ? "none" : "block" }}>
+ <div>
<Header hasInert={isShareFeedbackOpen && !fider.isReadOnly} />
- <div id="p-home" className="page container" {...(isShareFeedbackOpen && !fider.isReadOnly && { inert: "true" })}>
- <div className="p-home__welcome-col">
- <VStack spacing={2} className="p-4">
- <Markdown text={fider.session.tenant.welcomeMessage || defaultWelcomeMessage} style="full" />
- <Button className="c-input" type="submit" variant="secondary" onClick={handleNewPost}>
- {fider.session.tenant.invitation || defaultInvitation}
- </Button>
- </VStack>
- <div onClick={() => setIsShareFeedbackOpen(true)}>
- <PoweredByFider slot="home-input" className="sm:hidden md:hidden lg:block mt-3" />
+ {selectedPostId === null ? (
+ <div id="p-home" className="page container" {...(isShareFeedbackOpen && !fider.isReadOnly && { inert: "true" })}>
+ <div className="p-home__welcome-col">
+ <VStack spacing={2} className="p-4">
+ <Markdown text={fider.session.tenant.welcomeMessage || defaultWelcomeMessage} style="full" />
+ <Button className="c-input" type="submit" variant="secondary" onClick={handleNewPost}>
+ {fider.session.tenant.invitation || defaultInvitation}
+ </Button>
+ </VStack>
+ <div onClick={() => setIsShareFeedbackOpen(true)}>
+ <PoweredByFider slot="home-input" className="sm:hidden md:hidden lg:block mt-3" />
+ </div>
+ </div>
+ <div className="p-home__posts-col p-4">
+ {isLonely() ? (
+ <Lonely />
+ ) : (
+ <PostsContainer posts={props.posts} tags={props.tags} countPerStatus={props.countPerStatus} onPostClick={handlePostClick} />
+ )}
+ <PoweredByFider slot="home-footer" className="lg:hidden xl:hidden mt-8" />
</div>
</div>
- <div className="p-home__posts-col p-4">
- {isLonely() ? <Lonely /> : <PostsContainer posts={props.posts} tags={props.tags} countPerStatus={props.countPerStatus} onPostClick={handlePostClick} />}
- <PoweredByFider slot="home-footer" className="lg:hidden xl:hidden mt-8" />
- </div>
- </div>
- </div>
-
- {selectedPostId && (
- <PostDetailsOverlay onClose={handleCloseOverlay}>
- <Header />
+ ) : (
<div className="page container">
- <PostDetails postNumber={selectedPostId} onClose={handleCloseOverlay} />
+ <Button onClick={handleCloseOverlay} variant="link">
+ <HStack spacing={2}>
+ <Icon sprite={IconArrowLeft} />
+ <span className="text-body clickable text-blue-600 hover">
+ <Trans id="postdetails.backtoall">Back to all suggestions</Trans>
+ </span>
+ </HStack>
+ </Button>
+ <PostDetails postNumber={selectedPostId} />
</div>
- </PostDetailsOverlay>
- )}
+ )}
+ </div>
</>
)
}