Skip to content

35 differentiate replies bar style #36

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

Merged
merged 14 commits into from
Mar 21, 2025
Merged

35 differentiate replies bar style #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
581224b
WIP: Add chat view and view switching capabilities
benjaminpreiss Mar 19, 2025
8107460
fix: generate posts with different identities
marcus-pousette Mar 19, 2025
0e907ba
feat: enhance chat UI with improved message alignment and identity fe…
benjaminpreiss Mar 19, 2025
23cd284
refactor(frontend): improve Preview and Reply components architecture
benjaminpreiss Mar 21, 2025
c04dfeb
fix: Merge branch 'master' into 29-create-chat-view
marcus-pousette Mar 21, 2025
e89196e
refactor: improve frontend presentation and types
benjaminpreiss Mar 21, 2025
af61663
Merge branch '29-create-chat-view' of github.com:dao-xyz/peerbit-exam…
benjaminpreiss Mar 21, 2025
1aef82f
fix: breadxrumb expanded dark mode
benjaminpreiss Mar 21, 2025
b725806
fix: expanded breadcrumb dark mode orange bg
benjaminpreiss Mar 21, 2025
aa50c5f
Merge branch 'master' into 29-create-chat-view
benjaminpreiss Mar 21, 2025
2505791
fix: make breadcrumb bar always be content high
benjaminpreiss Mar 21, 2025
299f1d3
Merge branch 'master' into 29-create-chat-view
benjaminpreiss Mar 21, 2025
32be292
feat(ui): improve layout and spacing in canvas replies
benjaminpreiss Mar 21, 2025
cabcc57
fix: remove unused isMe function
benjaminpreiss Mar 21, 2025
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
4 changes: 3 additions & 1 deletion packages/social-media-app/frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
"@radix-ui/react-toggle": "^1.0.3",
"axios": "^1.4.0",
"iframe-resizer": "^5",
"mdast-util-from-markdown": "^2.0.2",
"mdast-util-to-string": "^4.0.0",
"peerbit": "^4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand All @@ -35,12 +37,12 @@
},
"devDependencies": {
"@peerbit/vite": "^1",
"@tailwindcss/vite": "^4.0.14",
"@types/react": "^18.2.46",
"@types/react-dom": "^18.2.18",
"@vitejs/plugin-react": "^4",
"autoprefixer": "^10.4.20",
"tailwindcss": "^4.0.14",
"@tailwindcss/vite": "^4.0.14",
"typescript": "^5.6.3",
"vite": "^6.0.6"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/social-media-app/frontend/src/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export const Header = forwardRef((props: HeaderProps, ref) => {
</div>
{/* helper block to cover the distance between overlay and breadcrumb bar */}
{isBreadcrumbExpanded && (
<div className="hidden sm:block absolute top-1/2 bottom-0 inset-x-0 bg-neutral-50 dark:bg-orange-950 border-neutral-950 dark:border-neutral-50 border-x"></div>
<div className="hidden sm:block absolute top-1/2 bottom-0 inset-x-0 bg-neutral-50 dark:bg-neutral-950 border-neutral-950 dark:border-neutral-50 border-x"></div>
)}
</div>

Expand Down
5 changes: 4 additions & 1 deletion packages/social-media-app/frontend/src/Home.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import { CanvasAndReplies } from "./canvas/CanvasAndReplies";
import { ViewProvider } from "./view/View";

export const Home = () => {
return (
<>
<CanvasAndReplies />
<ViewProvider>
<CanvasAndReplies />
</ViewProvider>
</>
);
};
33 changes: 18 additions & 15 deletions packages/social-media-app/frontend/src/canvas/CanvasAndReplies.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ export const CanvasAndReplies = () => {
const { peer } = usePeer();
const { root, path: canvases, loading } = useCanvases();
const [lastCanvas, setLastCanvas] = useState<CanvasDB>(undefined);
const [sortCriteria, setSortCriteria] = useState<"new" | "old" | "best">(
"new"
);
const [sortCriteria, setSortCriteria] = useState<
"new" | "old" | "best" | "chat"
>("new");

// Refs for header, toolbar, and scroll container
const toolbarRef = useRef<HTMLDivElement>(null);
Expand Down Expand Up @@ -122,18 +122,21 @@ export const CanvasAndReplies = () => {
>
{/* Set the scroll container height dynamically */}
<div className=" gap-2.5 w-full flex flex-col items-center">
<div className="max-w-[876px] w-full h-full">
{/* dont show header on root post */}
{canvases.length > 1 && (
<Header
variant="large"
canvas={lastCanvas}
className="mb-2"
/>
)}
<CanvasWrapper canvas={lastCanvas}>
<Canvas bgBlur fitWidth draft={false} />
</CanvasWrapper>
<div className="mt-6 w-full h-full">
<div className="max-w-[876px] mx-auto w-full">
{/* dont show header on root post */}
{canvases.length > 1 && (
<Header
variant="large"
canvas={lastCanvas}
className="mb-2 px-4"
/>
)}
<CanvasWrapper canvas={lastCanvas}>
<Canvas bgBlur fitWidth draft={false} />
</CanvasWrapper>
</div>

<Replies
canvas={lastCanvas}
sortCriteria={sortCriteria}
Expand Down
Loading
Loading