diff --git a/www/public/mockServiceWorker.js b/www/public/mockServiceWorker.js index 76bfad7..e781514 100644 --- a/www/public/mockServiceWorker.js +++ b/www/public/mockServiceWorker.js @@ -8,128 +8,128 @@ * - Please do NOT serve this file on production. */ -const PACKAGE_VERSION = "2.3.5"; -const INTEGRITY_CHECKSUM = "26357c79639bfa20d64c0efca2a87423"; -const IS_MOCKED_RESPONSE = Symbol("isMockedResponse"); -const activeClientIds = new Set(); +const PACKAGE_VERSION = '2.4.1' +const INTEGRITY_CHECKSUM = '26357c79639bfa20d64c0efca2a87423' +const IS_MOCKED_RESPONSE = Symbol('isMockedResponse') +const activeClientIds = new Set() -self.addEventListener("install", () => { - self.skipWaiting(); -}); +self.addEventListener('install', function () { + self.skipWaiting() +}) -self.addEventListener("activate", (event) => { - event.waitUntil(self.clients.claim()); -}); +self.addEventListener('activate', function (event) { + event.waitUntil(self.clients.claim()) +}) -self.addEventListener("message", async (event) => { - const clientId = event.source.id; +self.addEventListener('message', async function (event) { + const clientId = event.source.id if (!clientId || !self.clients) { - return; + return } - const client = await self.clients.get(clientId); + const client = await self.clients.get(clientId) if (!client) { - return; + return } const allClients = await self.clients.matchAll({ - type: "window", - }); + type: 'window', + }) switch (event.data) { - case "KEEPALIVE_REQUEST": { + case 'KEEPALIVE_REQUEST': { sendToClient(client, { - type: "KEEPALIVE_RESPONSE", - }); - break; + type: 'KEEPALIVE_RESPONSE', + }) + break } - case "INTEGRITY_CHECK_REQUEST": { + case 'INTEGRITY_CHECK_REQUEST': { sendToClient(client, { - type: "INTEGRITY_CHECK_RESPONSE", + type: 'INTEGRITY_CHECK_RESPONSE', payload: { packageVersion: PACKAGE_VERSION, checksum: INTEGRITY_CHECKSUM, }, - }); - break; + }) + break } - case "MOCK_ACTIVATE": { - activeClientIds.add(clientId); + case 'MOCK_ACTIVATE': { + activeClientIds.add(clientId) sendToClient(client, { - type: "MOCKING_ENABLED", + type: 'MOCKING_ENABLED', payload: true, - }); - break; + }) + break } - case "MOCK_DEACTIVATE": { - activeClientIds.delete(clientId); - break; + case 'MOCK_DEACTIVATE': { + activeClientIds.delete(clientId) + break } - case "CLIENT_CLOSED": { - activeClientIds.delete(clientId); + case 'CLIENT_CLOSED': { + activeClientIds.delete(clientId) const remainingClients = allClients.filter((client) => { - return client.id !== clientId; - }); + return client.id !== clientId + }) // Unregister itself when there are no more clients if (remainingClients.length === 0) { - self.registration.unregister(); + self.registration.unregister() } - break; + break } } -}); +}) -self.addEventListener("fetch", (event) => { - const { request } = event; +self.addEventListener('fetch', function (event) { + const { request } = event // Bypass navigation requests. - if (request.mode === "navigate") { - return; + if (request.mode === 'navigate') { + return } // Opening the DevTools triggers the "only-if-cached" request // that cannot be handled by the worker. Bypass such requests. - if (request.cache === "only-if-cached" && request.mode !== "same-origin") { - return; + if (request.cache === 'only-if-cached' && request.mode !== 'same-origin') { + return } // Bypass all requests when there are no active clients. // Prevents the self-unregistered worked from handling requests // after it's been deleted (still remains active until the next reload). if (activeClientIds.size === 0) { - return; + return } // Generate unique request ID. - const requestId = crypto.randomUUID(); - event.respondWith(handleRequest(event, requestId)); -}); + const requestId = crypto.randomUUID() + event.respondWith(handleRequest(event, requestId)) +}) async function handleRequest(event, requestId) { - const client = await resolveMainClient(event); - const response = await getResponse(event, client, requestId); + const client = await resolveMainClient(event) + const response = await getResponse(event, client, requestId) // Send back the response clone for the "response:*" life-cycle events. // Ensure MSW is active and ready to handle the message, otherwise // this message will pend indefinitely. if (client && activeClientIds.has(client.id)) { - (async () => { - const responseClone = response.clone(); + ;(async function () { + const responseClone = response.clone() sendToClient( client, { - type: "RESPONSE", + type: 'RESPONSE', payload: { requestId, isMockedResponse: IS_MOCKED_RESPONSE in response, @@ -141,11 +141,11 @@ async function handleRequest(event, requestId) { }, }, [responseClone.body], - ); - })(); + ) + })() } - return response; + return response } // Resolve the main client for the given event. @@ -153,49 +153,49 @@ async function handleRequest(event, requestId) { // that registered the worker. It's with the latter the worker should // communicate with during the response resolving phase. async function resolveMainClient(event) { - const client = await self.clients.get(event.clientId); + const client = await self.clients.get(event.clientId) - if (client?.frameType === "top-level") { - return client; + if (client?.frameType === 'top-level') { + return client } const allClients = await self.clients.matchAll({ - type: "window", - }); + type: 'window', + }) return allClients .filter((client) => { // Get only those clients that are currently visible. - return client.visibilityState === "visible"; + return client.visibilityState === 'visible' }) .find((client) => { // Find the client ID that's recorded in the // set of clients that have registered the worker. - return activeClientIds.has(client.id); - }); + return activeClientIds.has(client.id) + }) } async function getResponse(event, client, requestId) { - const { request } = event; + const { request } = event // Clone the request because it might've been already used // (i.e. its body has been read and sent to the client). - const requestClone = request.clone(); + const requestClone = request.clone() function passthrough() { - const headers = Object.fromEntries(requestClone.headers.entries()); + const headers = Object.fromEntries(requestClone.headers.entries()) // Remove internal MSW request header so the passthrough request // complies with any potential CORS preflight checks on the server. // Some servers forbid unknown request headers. - headers["x-msw-intention"] = undefined; + delete headers['x-msw-intention'] - return fetch(requestClone, { headers }); + return fetch(requestClone, { headers }) } // Bypass mocking when the client is not active. if (!client) { - return passthrough(); + return passthrough() } // Bypass initial page load requests (i.e. static assets). @@ -203,15 +203,15 @@ async function getResponse(event, client, requestId) { // means that MSW hasn't dispatched the "MOCK_ACTIVATE" event yet // and is not ready to handle requests. if (!activeClientIds.has(client.id)) { - return passthrough(); + return passthrough() } // Notify the client that a request has been intercepted. - const requestBuffer = await request.arrayBuffer(); + const requestBuffer = await request.arrayBuffer() const clientMessage = await sendToClient( client, { - type: "REQUEST", + type: 'REQUEST', payload: { id: requestId, url: request.url, @@ -230,38 +230,38 @@ async function getResponse(event, client, requestId) { }, }, [requestBuffer], - ); + ) switch (clientMessage.type) { - case "MOCK_RESPONSE": { - return respondWithMock(clientMessage.data); + case 'MOCK_RESPONSE': { + return respondWithMock(clientMessage.data) } - case "PASSTHROUGH": { - return passthrough(); + case 'PASSTHROUGH': { + return passthrough() } } - return passthrough(); + return passthrough() } function sendToClient(client, message, transferrables = []) { return new Promise((resolve, reject) => { - const channel = new MessageChannel(); + const channel = new MessageChannel() channel.port1.onmessage = (event) => { - if (event.data?.error) { - return reject(event.data.error); + if (event.data && event.data.error) { + return reject(event.data.error) } - resolve(event.data); - }; + resolve(event.data) + } client.postMessage( message, [channel.port2].concat(transferrables.filter(Boolean)), - ); - }); + ) + }) } async function respondWithMock(response) { @@ -270,15 +270,15 @@ async function respondWithMock(response) { // instance will have status code set to 0. Since it's not possible to create // a Response instance with status code 0, handle that use-case separately. if (response.status === 0) { - return Response.error(); + return Response.error() } - const mockedResponse = new Response(response.body, response); + const mockedResponse = new Response(response.body, response) Reflect.defineProperty(mockedResponse, IS_MOCKED_RESPONSE, { value: true, enumerable: true, - }); + }) - return mockedResponse; + return mockedResponse } diff --git a/www/src/app/chat/layout.tsx b/www/src/app/chat/layout.tsx new file mode 100644 index 0000000..217cfdc --- /dev/null +++ b/www/src/app/chat/layout.tsx @@ -0,0 +1,24 @@ +"use client"; + +import { ChatHeader } from "@/components/chat/chat-header"; +import ChatSidebar from "@/components/chat/chat-sidebar"; +import type React from "react"; + +export default function ChatLayout({ + children, +}: { + children: React.ReactNode; +}) { + return ( +
+ +
+
+ +
+ +
{children}
+
+
+ ); +} diff --git a/www/src/app/chat/page.tsx b/www/src/app/chat/page.tsx new file mode 100644 index 0000000..434bf06 --- /dev/null +++ b/www/src/app/chat/page.tsx @@ -0,0 +1,17 @@ +"use client"; + +import ChatBottombar from "@/components/chat/chat-bottombar"; +import { ChatList } from "@/components/chat/chat-list"; +import React from "react"; + +export default function Chat() { + + return ( +
+
+ +
+ +
+ ); +} diff --git a/www/src/app/data.tsx b/www/src/app/data.tsx index ca40c60..9908aac 100644 --- a/www/src/app/data.tsx +++ b/www/src/app/data.tsx @@ -1,26 +1,11 @@ -export interface BaseMessage { +export interface Data { + answer: string; + url_supporting: string[]; +} +export interface Message { id: string; name: string; + data: Data; timestamp: number; isLoading?: boolean; } - -export interface TextMessage extends BaseMessage { - message: string; -} - -export interface StructuredMessage extends BaseMessage { - message: { - answer: string; - url_supporting: string[]; - }; -} - -export type Message = TextMessage | StructuredMessage; - -// Type guard to check if a message is a StructuredMessage -export function isStructuredMessage( - message: Message, -): message is StructuredMessage { - return typeof message.message === "object" && "answer" in message.message; -} diff --git a/www/src/app/forum/layout.tsx b/www/src/app/forum/layout.tsx index 6b6fc79..8530ab9 100644 --- a/www/src/app/forum/layout.tsx +++ b/www/src/app/forum/layout.tsx @@ -1,17 +1,17 @@ -import { Header } from "@/components/forum/Header"; +import { Header } from "@/components/Header"; import { DesktopSidebar } from "@/components/forum/Sidebar"; import type { PropsWithChildren } from "react"; export default function Layout({ children }: PropsWithChildren<{}>) { return ( -
+
-
+
{children}
diff --git a/www/src/app/forum/topic/[topicId]/page.tsx b/www/src/app/forum/topic/[topicId]/page.tsx index 76e54ca..b06e64e 100644 --- a/www/src/app/forum/topic/[topicId]/page.tsx +++ b/www/src/app/forum/topic/[topicId]/page.tsx @@ -2,7 +2,6 @@ import prisma from "@/lib/prisma"; import type { Prisma } from "@prisma/client"; import { TopicPage } from "./(components)/topic-page"; -import { useUserAccessedTopicPosthogTracker } from "./(components)/useUserAccessedTopicPosthogTracker"; export type TopicPageProps = { topic: Prisma.TopicGetPayload<{ diff --git a/www/src/app/layout.tsx b/www/src/app/layout.tsx index 120f8d4..d64464d 100644 --- a/www/src/app/layout.tsx +++ b/www/src/app/layout.tsx @@ -1,13 +1,21 @@ -import { GeistSans } from "geist/font/sans"; import type { Metadata } from "next"; import "./globals.css"; +import { Header } from "@/components/Header"; import { CSPostHogProvider } from "@/components/posthog"; import { Toaster } from "@/components/ui/toaster"; +import { cn } from "@/lib/utils"; import dynamic from "next/dynamic"; +import { Roboto_Flex } from "next/font/google"; const PostHogPageView = dynamic(() => import("@/components/posthog-pageview"), { ssr: false, }); + +const robotoFlex = Roboto_Flex({ + subsets: ["latin"], + display: "swap", +}); + export const metadata: Metadata = { title: "Optimism GovGPT", description: "Ask me anything about Optimism Governance!", @@ -30,16 +38,17 @@ export default function RootLayout({ children: React.ReactNode; }>) { return ( - + {/* TODO OP-67: fix - this is requesting the route for a logo */} - - - - - {children} + +
+ + + {children} +
diff --git a/www/src/app/page.tsx b/www/src/app/page.tsx index b96a071..0dd7680 100644 --- a/www/src/app/page.tsx +++ b/www/src/app/page.tsx @@ -1,36 +1,5 @@ -import { ChatLayout } from "@/components/chat/chat-layout"; -import { buttonVariants } from "@/components/ui/button"; -import { cn } from "@/lib/utils"; -import { GitHubLogoIcon } from "@radix-ui/react-icons"; -import { cookies } from "next/headers"; -import Link from "next/link"; +import { redirect } from "next/navigation"; export default function Home() { - return ( -
-
- - Optimism GovGPT - - - - -
- -
- -
- -
-
- ); + return redirect("/chat"); } diff --git a/www/src/components/forum/Header.tsx b/www/src/components/Header.tsx similarity index 53% rename from www/src/components/forum/Header.tsx rename to www/src/components/Header.tsx index 81a9125..30cf1d4 100644 --- a/www/src/components/forum/Header.tsx +++ b/www/src/components/Header.tsx @@ -1,9 +1,8 @@ -import { Search } from "lucide-react"; +"use client"; -import { Input } from "@/components/ui/input"; import Image from "next/image"; import Link from "next/link"; -import { MobileSidebar } from "./Sidebar"; +import { MobileSidebar } from "./forum/Sidebar"; export function Header() { return ( @@ -23,17 +22,8 @@ export function Header() { height={100} className="w-[100px] md:w-[150px]" /> - GovSummarizer + GovSummarizer - {/*
-
- - -
-
*/}
); diff --git a/www/src/components/chat/chat-bottombar.tsx b/www/src/components/chat/chat-bottombar.tsx index b4b61aa..a8d4ff5 100644 --- a/www/src/components/chat/chat-bottombar.tsx +++ b/www/src/components/chat/chat-bottombar.tsx @@ -1,18 +1,14 @@ import { generateMessageParams } from "@/lib/chat-utils"; import { cn } from "@/lib/utils"; +import { getCurrentChat, useChatStore } from "@/states/use-chat-state"; import { SendHorizontal } from "lucide-react"; import Link from "next/link"; import type React from "react"; import { useEffect, useRef } from "react"; import { buttonVariants } from "../ui/button"; import { Textarea } from "../ui/textarea"; -import { getCurrentChat, useChatStore } from "./use-chat-state"; -interface ChatBottombarProps { - isMobile: boolean; -} - -export default function ChatBottombar({ isMobile }: ChatBottombarProps) { +export default function ChatBottombar() { const inputMessage = useChatStore.use.inputMessage(); const setInputMessage = useChatStore.use.setInputMessage(); const isStreaming = useChatStore.use.isStreaming(); @@ -34,7 +30,7 @@ export default function ChatBottombar({ isMobile }: ChatBottombarProps) { if (inputMessage.trim() && !isStreaming && currentChat) { const newMessage = generateMessageParams( currentChat.id, - inputMessage.trim(), + { answer: inputMessage.trim(), url_supporting: [] }, "anonymous", ); @@ -60,8 +56,8 @@ export default function ChatBottombar({ isMobile }: ChatBottombarProps) { }; return ( -
-
+
+