diff --git a/apps/web/public/marketing/.gitkeep b/apps/web/public/marketing/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/apps/web/public/marketing/journl-interface.png b/apps/web/public/marketing/journl-interface.png deleted file mode 100644 index 965983c..0000000 Binary files a/apps/web/public/marketing/journl-interface.png and /dev/null differ diff --git a/apps/web/src/app/(app)/@appSidebar/_components/app-sidebar-devtools.tsx b/apps/web/src/app/(app)/@appSidebar/_components/app-sidebar-devtools.tsx index 4610041..80ce0a0 100644 --- a/apps/web/src/app/(app)/@appSidebar/_components/app-sidebar-devtools.tsx +++ b/apps/web/src/app/(app)/@appSidebar/_components/app-sidebar-devtools.tsx @@ -19,7 +19,12 @@ function ReactQueryDevtoolsDialog() { diff --git a/apps/web/src/app/(app)/@appSidebar/_components/app-sidebar-pages.tsx b/apps/web/src/app/(app)/@appSidebar/_components/app-sidebar-pages.tsx index 5a70226..6ab7854 100644 --- a/apps/web/src/app/(app)/@appSidebar/_components/app-sidebar-pages.tsx +++ b/apps/web/src/app/(app)/@appSidebar/_components/app-sidebar-pages.tsx @@ -84,7 +84,7 @@ export const AppSidebarPages = ({ - + -
- -
+
); diff --git a/apps/web/src/app/(app)/@chatSidebar/_components/chat-sidebar-trigger.tsx b/apps/web/src/app/(app)/@chatSidebar/_components/chat-sidebar-trigger.tsx index a2d3506..279275a 100644 --- a/apps/web/src/app/(app)/@chatSidebar/_components/chat-sidebar-trigger.tsx +++ b/apps/web/src/app/(app)/@chatSidebar/_components/chat-sidebar-trigger.tsx @@ -27,7 +27,7 @@ export default function ChatSidebarTrigger() { Toggle Chat Sidebar - + Open Journl assistant diff --git a/apps/web/src/app/(app)/globals.css b/apps/web/src/app/(app)/globals.css index e8ab8a1..4f55045 100644 --- a/apps/web/src/app/(app)/globals.css +++ b/apps/web/src/app/(app)/globals.css @@ -46,9 +46,12 @@ The rest of the components are set by the Tailwind CSS classes, or by our editor } /* Tanstack Query Devtools */ +.tsqd-parent-container { + border: 1px solid var(--border) !important; +} .tsqd-main-panel { - background: transparent; + background: transparent !important; } .tsqd-queries-container { - border-radius: 1rem; + border-radius: 1rem !important; } diff --git a/apps/web/src/app/(app)/pages/_components/page-title-textarea.tsx b/apps/web/src/app/(app)/pages/_components/page-title-textarea.tsx index 63285c8..96800ef 100644 --- a/apps/web/src/app/(app)/pages/_components/page-title-textarea.tsx +++ b/apps/web/src/app/(app)/pages/_components/page-title-textarea.tsx @@ -108,7 +108,7 @@ export function PageTitleTextarea({ onKeyDown={handleKeyDown} placeholder={placeholder} className={cn( - "!bg-transparent !h-auto !outline-none !ring-0 !text-3xl !border-none !font-bold md:!text-4xl lg:!text-5xl placeholder:text-muted-foreground/60", + "!bg-transparent !h-auto !outline-none !ring-0 !text-3xl !border-none !font-bold md:!text-4xl lg:!text-5xl shadow-none placeholder:text-muted-foreground/60", className, )} {...rest} diff --git a/apps/web/src/app/(dashboard)/account/[pathname]/_components/account-view.tsx b/apps/web/src/app/(dashboard)/account/[pathname]/_components/account-view.tsx index 30028ea..37d33d1 100644 --- a/apps/web/src/app/(dashboard)/account/[pathname]/_components/account-view.tsx +++ b/apps/web/src/app/(dashboard)/account/[pathname]/_components/account-view.tsx @@ -23,9 +23,10 @@ export async function AuthView({ pathname }: { pathname: string }) { }, sidebar: { base: "gap-y-2", - button: "cursor-pointer text-primary", + button: + "cursor-pointer bg-card text-card-foreground border-secondary", buttonActive: - "cursor-pointer border bg-background shadow-xs hover:bg-accent hover:text-accent-foreground dark:bg-input/30 dark:border-input dark:hover:bg-input/50", + "cursor-pointer border shadow-xs bg-secondary text-secondary-foreground border-primary", }, }} pathname={pathname} diff --git a/apps/web/src/app/(marketing)/_components/hero-floating-shapes.tsx b/apps/web/src/app/(marketing)/_components/hero-floating-shapes.tsx index 6a4b158..2c39798 100644 --- a/apps/web/src/app/(marketing)/_components/hero-floating-shapes.tsx +++ b/apps/web/src/app/(marketing)/_components/hero-floating-shapes.tsx @@ -22,6 +22,7 @@ export function HeroFloatingShapes() { shapes.forEach((shape, index) => { const randomType = types[Math.floor(Math.random() * types.length)]; const element = document.createElement("div"); + element.className = "absolute opacity-5 animate-pulse"; element.style.left = `${shape.x}%`; element.style.top = `${shape.y}%`; diff --git a/apps/web/src/app/(marketing)/_components/secondary-cta-button.tsx b/apps/web/src/app/(marketing)/_components/secondary-cta-button.tsx deleted file mode 100644 index afd6226..0000000 --- a/apps/web/src/app/(marketing)/_components/secondary-cta-button.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import Link from "next/link"; -import { useAuthModal } from "~/components/auth/auth-modal-provider"; -import { Button } from "~/components/ui/button"; - -const SECONDARY_CANCEL_URL = "/"; - -export function SecondaryCtaButton() { - const { setCancelUrl } = useAuthModal(); - return ( - - ); -} diff --git a/apps/web/src/app/(marketing)/_components/sticky-journl-header.tsx b/apps/web/src/app/(marketing)/_components/sticky-journl-header.tsx index d13c06b..fd1671a 100644 --- a/apps/web/src/app/(marketing)/_components/sticky-journl-header.tsx +++ b/apps/web/src/app/(marketing)/_components/sticky-journl-header.tsx @@ -32,20 +32,23 @@ export function StickyJournlHeader() { diff --git a/apps/web/src/app/(marketing)/layout.tsx b/apps/web/src/app/(marketing)/layout.tsx index 5676c1f..e9696fe 100644 --- a/apps/web/src/app/(marketing)/layout.tsx +++ b/apps/web/src/app/(marketing)/layout.tsx @@ -7,7 +7,7 @@ type AppLayoutProps = { function MarketingLayout({ children }: AppLayoutProps) { return ( - + {children} ); diff --git a/apps/web/src/app/(marketing)/page.tsx b/apps/web/src/app/(marketing)/page.tsx index 05537a9..355c197 100644 --- a/apps/web/src/app/(marketing)/page.tsx +++ b/apps/web/src/app/(marketing)/page.tsx @@ -41,7 +41,7 @@ export default withoutAuth(function RootPage() { return ( {/* Hero Section */} -
+
@@ -51,7 +51,7 @@ export default withoutAuth(function RootPage() {
@@ -59,7 +59,7 @@ export default withoutAuth(function RootPage() { @@ -71,42 +71,18 @@ export default withoutAuth(function RootPage() {
- {/* TODO: When we have a video of Journl, we can add these sections back in. */} - {/* */} - {/* Product Showcase */} - {/*
-
-

- See Journl in action -

-

- Experience the perfect blend of structured journaling and - AI-powered insights -

-
-
- Journl Interface -
-
*/} - {/* Footer */} -