Skip to content

Toast Component + Timeline GET #5

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
jaydee029 merged 3 commits into from
Apr 15, 2025
Merged

Toast Component + Timeline GET #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0bfe1ee
Fixed TL GET Req
kashvigarg Apr 14, 2025
3ef310e
Fixed Toast Component
kashvigarg Apr 15, 2025
5399e9f
Merge branch 'main' into frontend-test
jaydee029 Apr 15, 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
1 change: 1 addition & 0 deletions api/handler/timeline.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ func (cfg *Handler) Timeline(w http.ResponseWriter, r *http.Request) {
Comments: int(k.Comments),
},
})

}
respondWithJson(w, http.StatusOK, timeline)

Expand Down
11 changes: 6 additions & 5 deletions web2/app/api/[...path]/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,14 @@ export async function GET(request: NextRequest, { params }: { params: { path: st
},
});

const text = await response.text(); // Read response as text

if (!text.trim()) {
return NextResponse.json({ error: "Empty response from API" }, { status: 502 });
const responseText = await response.text(); // Read response as text
// console.log("problematic text")
// console.log(responseText)
if (responseText.trim() !== "") {
// return NextResponse.json({ error: "Empty response from API" }, { status: 502 });
return NextResponse.json(JSON.parse(responseText), { status: response.status });
}

return NextResponse.json(JSON.parse(text), { status: response.status });
} catch (error) {
console.error("API error:", error);
return NextResponse.json({ error: "Failed to fetch data" }, { status: 500 });
Expand Down
10 changes: 8 additions & 2 deletions web2/app/api/sse/[...path]/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,13 @@ export async function GET(request: NextRequest) {
);

// Proxy the backend SSE stream directly to the client
return new Response(backendResponse.body, {
console.log(backendResponse.body)
let passedValue = await new Response(backendResponse.body).text();
if (passedValue){
let valueToJson = JSON.parse(passedValue);
console.log("jsonval:", valueToJson)
}
return new Response("", {
status: 200,
headers: {
"Content-Type": "text/event-stream",
Expand All @@ -32,7 +38,7 @@ export async function GET(request: NextRequest) {
},
});
} catch (error) {
console.error("SSE proxy error:", error);
console.log("SSE proxy error:", error);
return new Response("Failed to connect to SSE", { status: 502 });
}
}
9 changes: 6 additions & 3 deletions web2/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,22 @@ export default function RootLayout({
children: React.ReactNode
}>) {
return (
<html lang="en" suppressHydrationWarning>
<body className={`${inter.variable} ${merriweather.variable} font-sans`}>
<html lang="en">
<body suppressHydrationWarning className={`${inter.variable} ${merriweather.variable} font-sans`}>
<ToastProvider>
<ThemeProvider attribute="class" defaultTheme="light" enableSystem disableTransitionOnChange>
<AuthProvider>
{children}
<Toaster />
</AuthProvider>
</ThemeProvider>
</ToastProvider>
</body>
</html>
)
}



import './globals.css'
import './globals.css'
import { ToastProvider } from "@radix-ui/react-toast"
3 changes: 2 additions & 1 deletion web2/app/login/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { Button } from "@/components/ui/button"
import { Input } from "@/components/ui/input"
import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card"
import { Label } from "@/components/ui/label"
import { useToast } from "@/components/ui/use-toast"
import { useToast } from "@/hooks/use-toast"
import { Loader2, BookOpen } from "lucide-react"

export default function LoginPage() {
Expand All @@ -30,6 +30,7 @@ export default function LoginPage() {
router.push("/")
} catch (error) {
toast({
open: true,
title: "Login failed",
description: "Please check your credentials and try again.",
variant: "destructive",
Expand Down
2 changes: 1 addition & 1 deletion web2/app/signup/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { Button } from "@/components/ui/button"
import { Input } from "@/components/ui/input"
import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card"
import { Label } from "@/components/ui/label"
import { useToast } from "@/components/ui/use-toast"
import { useToast } from "@/hooks/use-toast"
import { Loader2, BookOpen } from "lucide-react"

export default function SignupPage() {
Expand Down
2 changes: 1 addition & 1 deletion web2/components/comment-form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { useState } from "react"
import { useAuth } from "@/lib/auth-hooks"
import { Button } from "@/components/ui/button"
import { Textarea } from "@/components/ui/textarea"
import { useToast } from "@/components/ui/use-toast"
import { useToast } from "@/hooks/use-toast"
import { Loader2 } from "lucide-react"

export function CommentForm({ proseId }: { proseId: string }) {
Expand Down
2 changes: 1 addition & 1 deletion web2/components/comments-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Button } from "@/components/ui/button"
import { Card, CardContent, CardFooter, CardHeader } from "@/components/ui/card"
import { Skeleton } from "@/components/ui/skeleton"
import { Heart } from "lucide-react"
import { useToast } from "@/components/ui/use-toast"
import { useToast } from "@/hooks/use-toast"
import { useSSE } from "@/lib/use-sse"
import Link from "next/link"

Expand Down
2 changes: 1 addition & 1 deletion web2/components/compose-prose-dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
DialogTitle,
} from "@/components/ui/dialog"
import { Textarea } from "@/components/ui/textarea"
import { useToast } from "@/components/ui/use-toast"
import { useToast } from "@/hooks/use-toast"
import { Loader2 } from "lucide-react"

type ComposeProseDialogProps = {
Expand Down
2 changes: 1 addition & 1 deletion web2/components/notifications-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { useAuth } from "@/lib/auth-hooks"
import { Button } from "@/components/ui/button"
import { Card, CardHeader } from "@/components/ui/card"
import { Skeleton } from "@/components/ui/skeleton"
import { useToast } from "@/components/ui/use-toast"
import { useToast } from "@/hooks/use-toast"
import { useSSE } from "@/lib/use-sse"
import { Heart, MessageCircle, UserPlus, RefreshCw } from "lucide-react"

Expand Down
2 changes: 1 addition & 1 deletion web2/components/prose-card.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { Card, CardContent, CardFooter, CardHeader } from "@/components/ui/card"
import { Heart, MessageCircle, Share2, MoreHorizontal } from "lucide-react"
import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "@/components/ui/dropdown-menu"
import { useAuth } from "@/lib/auth-hooks"
import { useToast } from "@/components/ui/use-toast"
import { useToast } from "@/hooks/use-toast"

type ProseCardProps = {
prose: {
Expand Down
2 changes: 1 addition & 1 deletion web2/components/prose-detail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { CommentsList } from "@/components/comments-list"
import { CommentForm } from "@/components/comment-form"
import { Button } from "@/components/ui/button"
import { ArrowLeft } from "lucide-react"
import { useToast } from "@/components/ui/use-toast"
import { useToast } from "@/hooks/use-toast"

type ProseDetailProps = {
prose: {
Expand Down
92 changes: 45 additions & 47 deletions web2/components/timeline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useState, useEffect } from "react";
import { useAuth } from "@/lib/auth-hooks";
import { ProseCard } from "@/components/prose-card";
import { Skeleton } from "@/components/ui/skeleton";
import { useToast } from "@/components/ui/use-toast";
import { useToast } from "@/hooks/use-toast";
import { Alert, AlertDescription } from "@/components/ui/alert";
import { AlertCircle, RefreshCw } from "lucide-react";
import { Button } from "@/components/ui/button";
Expand Down Expand Up @@ -35,65 +35,63 @@ export function Timeline() {

// Use SSE to get timeline updates
const { data, error: sseError } = useSSE<TimelineItem>("/api/sse/timeline", token, "timeline",{
// onMessage: (data) => {
// if (data) {
// console.log("SSE CHECK FOR TL")
// console.log(data)
// if (data!=null){
// setTimelineItems(data);
// setIsLoading(false);
// }
// }
// console.log("SSE NO DATA FOR TL")
// },
// fallbackToFetch: true,
// });
onMessage: (newItem) => {
if (newItem) {
console.log("SSE received new timeline item:", newItem);

// Add new item to the timeline without duplicates
setTimelineItems(prevItems => {
// Check if this item already exists in our timeline
const exists = prevItems.some(item => item.id === newItem.id);
if (exists) {
return prevItems;
onMessage: (ndata) => {
if (ndata) {
// console.log("SSE CHECK FOR TL")
// console.log(data)
// if (data!=null){
// setTimelineItems(data);
// setIsLoading(false);
if (ndata) {
console.log("SSE received new timeline item:", ndata);
// Add new item to the timeline without duplicates
setTimelineItems(prevItems => {
// Check if this item already exists in our timeline
const exists = prevItems.some(item => item.id === ndata.id);
if (exists) {
return prevItems;
}
// Add new item to the beginning of the timeline
return [ndata, ...prevItems];
});
setIsLoading(false);
}

// Add new item to the beginning of the timeline
return [newItem, ...prevItems];
});

setIsLoading(false);
}
console.log("sse data maybe")
console.log(data)
// console.log("SSE NO DATA FOR TL")
},
fallbackToFetch: true,
onError: (err) => {
console.error("SSE error:", err);
// Let the useEffect handle errors
}
},
fallbackToFetch: true,
onError: (err) => {
console.error("SSE error:", err);
// Let the useEffect handle errors
}
});
});

// Fetch timeline if SSE fails
useEffect(() => {
fetchTimelineItems();

// Handle SSE errors by falling back to regular fetch
if (sseError) {
console.log("SSE error detected, falling back to regular fetch:", sseError);
fetchTimelineItems();}
// if (data) {
// if (data!=null){
// setTimelineItems(data)} else {
// setTimelineItems([])
// }
// setIsLoading(false)
// }
fetchTimelineItems()
if (sseError) {
console.log("SSE error detected, falling back to regular fetch:", sseError);
fetchTimelineItems();
}

// if (sseError) {
// fetchTimelineItems()
// }
}, [sseError]);

// if (sseError) {
// fetchTimelineItems()
// }
// }, [data, sseError]);

// Fetch timeline function
const fetchTimelineItems = async () => {
Expand All @@ -113,7 +111,7 @@ export function Timeline() {
}

const responseData = await response.json();
console.log("DATA:", responseData);
// console.log("DATA:", responseData);

if (responseData!=null){
setTimelineItems(responseData);
Expand Down
68 changes: 50 additions & 18 deletions web2/components/ui/toaster.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,67 @@
// "use client"

// import { useToast } from "@/hooks/use-toast"
// import {
// Toast,
// ToastClose,
// ToastDescription,
// ToastProvider,
// ToastTitle,
// ToastViewport,
// } from "@/components/ui/toast"

// export function Toaster() {
// const { toasts } = useToast()
// console.log("TOASTER RECEIVED TOASTS:", toasts);

// return (
// <ToastProvider>
// {toasts.map(function ({ id, title, description, action, ...props }) {
// return (
// <Toast key={id} {...props}>
// <div className="grid gap-1">
// {title && <ToastTitle>{title}</ToastTitle>}
// {description && (
// <ToastDescription>{description}</ToastDescription>
// )}
// </div>
// {action}
// <ToastClose />
// </Toast>
// )
// })}
// <ToastViewport />
// </ToastProvider>
// )
// }

"use client"

import { useToast } from "@/hooks/use-toast"
import {
Toast,
ToastClose,
ToastDescription,
ToastProvider,
ToastTitle,
ToastViewport,
} from "@/components/ui/toast"

export function Toaster() {
const { toasts } = useToast()

return (
<ToastProvider>
{toasts.map(function ({ id, title, description, action, ...props }) {
return (
<Toast key={id} {...props}>
<div className="grid gap-1">
{title && <ToastTitle>{title}</ToastTitle>}
{description && (
<ToastDescription>{description}</ToastDescription>
)}
</div>
{action}
<ToastClose />
</Toast>
)
})}
<>
{toasts.map(({ id, title, description, action, ...props }) => (
<Toast key={id} {...props}>
<div className="grid gap-1">
{title && <ToastTitle>{title}</ToastTitle>}
{description && <ToastDescription>{description}</ToastDescription>}
</div>
{action}
<ToastClose />
</Toast>
))}
<ToastViewport />
</ToastProvider>
</>
)
}
Loading
Loading