From 75899ae5fdd709125161c681fd71a7b449f3aa3b Mon Sep 17 00:00:00 2001 From: Dhravya Date: Wed, 10 Apr 2024 09:51:56 -0700 Subject: [PATCH] cleanups for production --- apps/extension/src/util.ts | 2 +- apps/web/src/app/MessagePoster.tsx | 2 +- apps/web/src/app/content.tsx | 4 +-- apps/web/src/app/page.tsx | 34 +++++++++++------------ apps/web/src/components/Main.tsx | 1 - apps/web/src/components/Sidebar/index.tsx | 4 +++ 6 files changed, 25 insertions(+), 22 deletions(-) diff --git a/apps/extension/src/util.ts b/apps/extension/src/util.ts index b1085edd..3d01901a 100644 --- a/apps/extension/src/util.ts +++ b/apps/extension/src/util.ts @@ -9,5 +9,5 @@ export const getEnv = () => { // }) // return null - return 'development' + return 'production' } \ No newline at end of file diff --git a/apps/web/src/app/MessagePoster.tsx b/apps/web/src/app/MessagePoster.tsx index 64dc89fd..860be082 100644 --- a/apps/web/src/app/MessagePoster.tsx +++ b/apps/web/src/app/MessagePoster.tsx @@ -15,7 +15,7 @@ function MessagePoster({ jwt }: { jwt: string }) { window.postMessage({ jwt }, '*'); }} > - Send message + Extension Auth ); } diff --git a/apps/web/src/app/content.tsx b/apps/web/src/app/content.tsx index 39f2948d..b6f5e4d9 100644 --- a/apps/web/src/app/content.tsx +++ b/apps/web/src/app/content.tsx @@ -4,13 +4,13 @@ import Sidebar from '@/components/Sidebar/index'; import { SessionProvider } from 'next-auth/react'; import { useState } from 'react'; -export default function Content() { +export default function Content({ jwt }: { jwt: string }) { const [selectedItem, setSelectedItem] = useState(null); return (
- +
diff --git a/apps/web/src/app/page.tsx b/apps/web/src/app/page.tsx index 95e18e83..6f9ca753 100644 --- a/apps/web/src/app/page.tsx +++ b/apps/web/src/app/page.tsx @@ -59,26 +59,26 @@ export default async function Home() { const collectedSpaces = contents.length > 0 ? await transformContent(contents) : []; - collectedSpaces.push({ - id: 2, - title: "Test", - content: [ - { - id: 1, - content: "Test", - title: "Vscode", - description: "Test", - url: "https://vscode-remake.vercel.app/", - savedAt: new Date(), - baseUrl: "https://vscode-remake.vercel.app/", - image: "https://vscode-remake.vercel.app/favicon.svg", - }, - ], - }); + // collectedSpaces.push({ + // id: 2, + // title: "Test", + // content: [ + // { + // id: 1, + // content: "Test", + // title: "Vscode", + // description: "Test", + // url: "https://vscode-remake.vercel.app/", + // savedAt: new Date(), + // baseUrl: "https://vscode-remake.vercel.app/", + // image: "https://vscode-remake.vercel.app/favicon.svg", + // }, + // ], + // }); return ( - + {/* */} ); diff --git a/apps/web/src/components/Main.tsx b/apps/web/src/components/Main.tsx index c621c68f..09703c2f 100644 --- a/apps/web/src/components/Main.tsx +++ b/apps/web/src/components/Main.tsx @@ -315,7 +315,6 @@ export default function Main({ sidebarOpen }: { sidebarOpen: boolean }) { autoFocus: true, onChange: (e) => setValue(e.target.value), onKeyDown: (e) => { - console.log(e.key, e.ctrlKey, e.metaKey); if (e.key === "Enter" && (e.ctrlKey || e.metaKey)) { onSend(); } diff --git a/apps/web/src/components/Sidebar/index.tsx b/apps/web/src/components/Sidebar/index.tsx index 830b0f05..db36f66b 100644 --- a/apps/web/src/components/Sidebar/index.tsx +++ b/apps/web/src/components/Sidebar/index.tsx @@ -7,6 +7,7 @@ import { AnimatePresence, motion } from 'framer-motion'; import { Bin } from '@/assets/Bin'; import { Avatar, AvatarFallback, AvatarImage } from '@radix-ui/react-avatar'; import { useSession } from 'next-auth/react'; +import MessagePoster from '@/app/MessagePoster'; export type MenuItem = { icon: React.ReactNode | React.ReactNode[]; @@ -16,8 +17,10 @@ export type MenuItem = { export default function Sidebar({ selectChange, + jwt }: { selectChange?: (selectedItem: string | null) => void; + jwt: string; }) { const { data: session } = useSession(); const menuItemsTop: Array = [ @@ -117,6 +120,7 @@ export default function Sidebar({ selectedItem={selectedItem} setSelectedItem={setSelectedItem} /> + {selectedItem && {Subbar}}