diff --git a/apps/desktop2/src/components/col.tsx b/apps/desktop2/src/components/col.tsx index cf3bc9e4..f952324c 100644 --- a/apps/desktop2/src/components/col.tsx +++ b/apps/desktop2/src/components/col.tsx @@ -56,7 +56,7 @@ export function Col({ const rect = container.current.getBoundingClientRect(); const name = `column-${column.name.toLowerCase().replace(/\W/g, "")}`; - const url = column.name + `?account=${account}&name=${column.name}`; + const url = column.content + `?account=${account}&name=${column.name}`; // create new webview initialRect.current = rect; diff --git a/apps/desktop2/src/routes/$account.home.tsx b/apps/desktop2/src/routes/$account.home.tsx index a41207c8..7061a691 100644 --- a/apps/desktop2/src/routes/$account.home.tsx +++ b/apps/desktop2/src/routes/$account.home.tsx @@ -10,8 +10,8 @@ export const Route = createFileRoute("/$account/home")({ pendingComponent: Pending, loader: async () => { const columns = [ - { name: "Newsfeed", content: "/columns/newsfeed" }, - { name: "Default", content: "/columns/default" }, + { name: "Newsfeed", content: "/newsfeed" }, + { name: "Lume Store", content: "/store/official" }, ]; return columns; }, diff --git a/apps/desktop2/src/routes/$account.tsx b/apps/desktop2/src/routes/$account.tsx index 60a9a78e..624f1c71 100644 --- a/apps/desktop2/src/routes/$account.tsx +++ b/apps/desktop2/src/routes/$account.tsx @@ -1,9 +1,4 @@ -import { - ArrowLeftIcon, - ArrowRightIcon, - ComposeFilledIcon, - PlusIcon, -} from "@lume/icons"; +import { ComposeFilledIcon, HorizontalDotsIcon } from "@lume/icons"; import { Outlet, createFileRoute } from "@tanstack/react-router"; import { cn } from "@lume/utils"; import { Accounts } from "@/components/accounts"; @@ -30,10 +25,9 @@ function App() {
@@ -43,7 +37,7 @@ function App() { className="inline-flex h-8 w-max items-center justify-center gap-1 rounded-full bg-blue-500 px-3 text-sm font-medium text-white hover:bg-blue-600" > - New post + New Post
diff --git a/apps/desktop2/src/routes/default.lazy.tsx b/apps/desktop2/src/routes/default.lazy.tsx deleted file mode 100644 index 24a785a9..00000000 --- a/apps/desktop2/src/routes/default.lazy.tsx +++ /dev/null @@ -1,16 +0,0 @@ -import { Column } from "@lume/ui"; -import { createLazyFileRoute } from "@tanstack/react-router"; - -export const Route = createLazyFileRoute("/default")({ - component: Screen, -}); - -function Screen() { - return ( - - -

TODO

-
-
- ); -} diff --git a/apps/desktop2/src/routes/store.community.tsx b/apps/desktop2/src/routes/store.community.tsx new file mode 100644 index 00000000..ab8e488e --- /dev/null +++ b/apps/desktop2/src/routes/store.community.tsx @@ -0,0 +1,13 @@ +import { createFileRoute } from "@tanstack/react-router"; + +export const Route = createFileRoute("/store/community")({ + component: Screen, +}); + +function Screen() { + return ( +
+

Coming Soon

+
+ ); +} diff --git a/apps/desktop2/src/routes/store.official.tsx b/apps/desktop2/src/routes/store.official.tsx new file mode 100644 index 00000000..dff0b7e1 --- /dev/null +++ b/apps/desktop2/src/routes/store.official.tsx @@ -0,0 +1,48 @@ +import { createFileRoute } from "@tanstack/react-router"; + +export const Route = createFileRoute("/store/official")({ + component: Screen, +}); + +function Screen() { + return ( +
+
+
+
+
+

Group Feeds

+

+ Collective of people you're interested in. +

+
+ +
+
+
+
+
+
+
+

Antenas

+

+ Keep track to specific content. +

+
+ +
+
+
+
+ ); +} diff --git a/apps/desktop2/src/routes/store.tsx b/apps/desktop2/src/routes/store.tsx new file mode 100644 index 00000000..ca562681 --- /dev/null +++ b/apps/desktop2/src/routes/store.tsx @@ -0,0 +1,48 @@ +import { Column } from "@lume/ui"; +import { cn } from "@lume/utils"; +import { Link } from "@tanstack/react-router"; +import { Outlet, createFileRoute } from "@tanstack/react-router"; + +export const Route = createFileRoute("/store")({ + component: Screen, +}); + +function Screen() { + return ( + + +
+ + {({ isActive }) => ( +
+ Official +
+ )} + + + {({ isActive }) => ( +
+ Community +
+ )} + +
+ +
+
+ ); +} diff --git a/packages/icons/src/arrowLeft.tsx b/packages/icons/src/arrowLeft.tsx index d81b773d..129e1908 100644 --- a/packages/icons/src/arrowLeft.tsx +++ b/packages/icons/src/arrowLeft.tsx @@ -5,8 +5,8 @@ export function ArrowLeftIcon(props: JSX.IntrinsicElements["svg"]) { stroke="currentColor" strokeLinecap="round" strokeLinejoin="round" - strokeWidth="2" - d="m10 6-6 6 6 6m-5-6h15" + strokeWidth="1.5" + d="M10 5.75 3.75 12 10 18.25M4.5 12h15.75" /> ); diff --git a/packages/icons/src/arrowRight.tsx b/packages/icons/src/arrowRight.tsx index 99ffaa37..0e94960c 100644 --- a/packages/icons/src/arrowRight.tsx +++ b/packages/icons/src/arrowRight.tsx @@ -5,8 +5,8 @@ export function ArrowRightIcon(props: JSX.IntrinsicElements["svg"]) { stroke="currentColor" strokeLinecap="round" strokeLinejoin="round" - strokeWidth="2" - d="m14 6 6 6-6 6m5-6H4" + strokeWidth="1.5" + d="M14 5.75 20.25 12 14 18.25M19.5 12H3.75" /> ); diff --git a/packages/icons/src/horizontalDots.tsx b/packages/icons/src/horizontalDots.tsx index 6475277e..89c59da1 100644 --- a/packages/icons/src/horizontalDots.tsx +++ b/packages/icons/src/horizontalDots.tsx @@ -1,12 +1,16 @@ export function HorizontalDotsIcon(props: JSX.IntrinsicElements["svg"]) { return ( + ); diff --git a/packages/icons/src/settings.tsx b/packages/icons/src/settings.tsx index 4c343e87..64e0cf70 100644 --- a/packages/icons/src/settings.tsx +++ b/packages/icons/src/settings.tsx @@ -7,15 +7,15 @@ export function SettingsIcon( ); diff --git a/packages/ui/src/column/root.tsx b/packages/ui/src/column/root.tsx index e9a01b9c..428c2bd7 100644 --- a/packages/ui/src/column/root.tsx +++ b/packages/ui/src/column/root.tsx @@ -3,16 +3,19 @@ import { ReactNode } from "react"; export function ColumnRoot({ children, + shadow = true, className, }: { children: ReactNode; + shadow?: boolean; className?: string; }) { return (