diff --git a/conven-docs/color.md b/conven-docs/color.md index 4a4a1f8..f6b01c0 100644 --- a/conven-docs/color.md +++ b/conven-docs/color.md @@ -1,6 +1,6 @@ # Conven Color Defs -[See the CSS definition here](../src/styles/app.css) +[See the CSS definition here](/src/styles/app.css) tailwind atoms are defined in app.css ```css diff --git a/src/routeTree.gen.ts b/src/routeTree.gen.ts index d3dce14..7fc3a10 100644 --- a/src/routeTree.gen.ts +++ b/src/routeTree.gen.ts @@ -19,14 +19,18 @@ import { Route as AboutRouteImport } from './routes/about' import { Route as PathlessLayoutRouteImport } from './routes/_pathlessLayout' import { Route as IndexRouteImport } from './routes/index' import { Route as CallbackIndexRouteImport } from './routes/callback/index' +import { Route as CDidRouteImport } from './routes/c.$did' import { Route as PathlessLayoutNestedLayoutRouteImport } from './routes/_pathlessLayout/_nested-layout' import { Route as ProfileDidIndexRouteImport } from './routes/profile.$did/index' +import { Route as CDidIndexRouteImport } from './routes/c.$did/index' import { Route as ProfileDidFollowsRouteImport } from './routes/profile.$did/follows' import { Route as ProfileDidFollowersRouteImport } from './routes/profile.$did/followers' import { Route as PathlessLayoutNestedLayoutRouteBRouteImport } from './routes/_pathlessLayout/_nested-layout/route-b' import { Route as PathlessLayoutNestedLayoutRouteARouteImport } from './routes/_pathlessLayout/_nested-layout/route-a' import { Route as ProfileDidPostRkeyRouteImport } from './routes/profile.$did/post.$rkey' import { Route as ProfileDidFeedRkeyRouteImport } from './routes/profile.$did/feed.$rkey' +import { Route as CDidProfileDidIndexRouteImport } from './routes/c.$did/profile.$did/index' +import { Route as CDidFeedRkeyIndexRouteImport } from './routes/c.$did/feed.$rkey/index' import { Route as ProfileDidPostRkeyRepostedByRouteImport } from './routes/profile.$did/post.$rkey.reposted-by' import { Route as ProfileDidPostRkeyQuotesRouteImport } from './routes/profile.$did/post.$rkey.quotes' import { Route as ProfileDidPostRkeyLikedByRouteImport } from './routes/profile.$did/post.$rkey.liked-by' @@ -81,6 +85,11 @@ const CallbackIndexRoute = CallbackIndexRouteImport.update({ path: '/callback/', getParentRoute: () => rootRouteImport, } as any) +const CDidRoute = CDidRouteImport.update({ + id: '/c/$did', + path: '/c/$did', + getParentRoute: () => rootRouteImport, +} as any) const PathlessLayoutNestedLayoutRoute = PathlessLayoutNestedLayoutRouteImport.update({ id: '/_nested-layout', @@ -91,6 +100,11 @@ const ProfileDidIndexRoute = ProfileDidIndexRouteImport.update({ path: '/profile/$did/', getParentRoute: () => rootRouteImport, } as any) +const CDidIndexRoute = CDidIndexRouteImport.update({ + id: '/', + path: '/', + getParentRoute: () => CDidRoute, +} as any) const ProfileDidFollowsRoute = ProfileDidFollowsRouteImport.update({ id: '/profile/$did/follows', path: '/profile/$did/follows', @@ -123,6 +137,16 @@ const ProfileDidFeedRkeyRoute = ProfileDidFeedRkeyRouteImport.update({ path: '/profile/$did/feed/$rkey', getParentRoute: () => rootRouteImport, } as any) +const CDidProfileDidIndexRoute = CDidProfileDidIndexRouteImport.update({ + id: '/profile/$did/', + path: '/profile/$did/', + getParentRoute: () => CDidRoute, +} as any) +const CDidFeedRkeyIndexRoute = CDidFeedRkeyIndexRouteImport.update({ + id: '/feed/$rkey/', + path: '/feed/$rkey/', + getParentRoute: () => CDidRoute, +} as any) const ProfileDidPostRkeyRepostedByRoute = ProfileDidPostRkeyRepostedByRouteImport.update({ id: '/reposted-by', @@ -157,17 +181,21 @@ export interface FileRoutesByFullPath { '/root-copy': typeof RootCopyRoute '/search': typeof SearchRoute '/settings': typeof SettingsRoute + '/c/$did': typeof CDidRouteWithChildren '/callback': typeof CallbackIndexRoute '/route-a': typeof PathlessLayoutNestedLayoutRouteARoute '/route-b': typeof PathlessLayoutNestedLayoutRouteBRoute '/profile/$did/followers': typeof ProfileDidFollowersRoute '/profile/$did/follows': typeof ProfileDidFollowsRoute + '/c/$did/': typeof CDidIndexRoute '/profile/$did': typeof ProfileDidIndexRoute '/profile/$did/feed/$rkey': typeof ProfileDidFeedRkeyRoute '/profile/$did/post/$rkey': typeof ProfileDidPostRkeyRouteWithChildren '/profile/$did/post/$rkey/liked-by': typeof ProfileDidPostRkeyLikedByRoute '/profile/$did/post/$rkey/quotes': typeof ProfileDidPostRkeyQuotesRoute '/profile/$did/post/$rkey/reposted-by': typeof ProfileDidPostRkeyRepostedByRoute + '/c/$did/feed/$rkey': typeof CDidFeedRkeyIndexRoute + '/c/$did/profile/$did': typeof CDidProfileDidIndexRoute '/profile/$did/post/$rkey/image/$i': typeof ProfileDidPostRkeyImageIRoute } export interface FileRoutesByTo { @@ -184,12 +212,15 @@ export interface FileRoutesByTo { '/route-b': typeof PathlessLayoutNestedLayoutRouteBRoute '/profile/$did/followers': typeof ProfileDidFollowersRoute '/profile/$did/follows': typeof ProfileDidFollowsRoute + '/c/$did': typeof CDidIndexRoute '/profile/$did': typeof ProfileDidIndexRoute '/profile/$did/feed/$rkey': typeof ProfileDidFeedRkeyRoute '/profile/$did/post/$rkey': typeof ProfileDidPostRkeyRouteWithChildren '/profile/$did/post/$rkey/liked-by': typeof ProfileDidPostRkeyLikedByRoute '/profile/$did/post/$rkey/quotes': typeof ProfileDidPostRkeyQuotesRoute '/profile/$did/post/$rkey/reposted-by': typeof ProfileDidPostRkeyRepostedByRoute + '/c/$did/feed/$rkey': typeof CDidFeedRkeyIndexRoute + '/c/$did/profile/$did': typeof CDidProfileDidIndexRoute '/profile/$did/post/$rkey/image/$i': typeof ProfileDidPostRkeyImageIRoute } export interface FileRoutesById { @@ -204,17 +235,21 @@ export interface FileRoutesById { '/search': typeof SearchRoute '/settings': typeof SettingsRoute '/_pathlessLayout/_nested-layout': typeof PathlessLayoutNestedLayoutRouteWithChildren + '/c/$did': typeof CDidRouteWithChildren '/callback/': typeof CallbackIndexRoute '/_pathlessLayout/_nested-layout/route-a': typeof PathlessLayoutNestedLayoutRouteARoute '/_pathlessLayout/_nested-layout/route-b': typeof PathlessLayoutNestedLayoutRouteBRoute '/profile/$did/followers': typeof ProfileDidFollowersRoute '/profile/$did/follows': typeof ProfileDidFollowsRoute + '/c/$did/': typeof CDidIndexRoute '/profile/$did/': typeof ProfileDidIndexRoute '/profile/$did/feed/$rkey': typeof ProfileDidFeedRkeyRoute '/profile/$did/post/$rkey': typeof ProfileDidPostRkeyRouteWithChildren '/profile/$did/post/$rkey/liked-by': typeof ProfileDidPostRkeyLikedByRoute '/profile/$did/post/$rkey/quotes': typeof ProfileDidPostRkeyQuotesRoute '/profile/$did/post/$rkey/reposted-by': typeof ProfileDidPostRkeyRepostedByRoute + '/c/$did/feed/$rkey/': typeof CDidFeedRkeyIndexRoute + '/c/$did/profile/$did/': typeof CDidProfileDidIndexRoute '/profile/$did/post/$rkey/image/$i': typeof ProfileDidPostRkeyImageIRoute } export interface FileRouteTypes { @@ -228,17 +263,21 @@ export interface FileRouteTypes { | '/root-copy' | '/search' | '/settings' + | '/c/$did' | '/callback' | '/route-a' | '/route-b' | '/profile/$did/followers' | '/profile/$did/follows' + | '/c/$did/' | '/profile/$did' | '/profile/$did/feed/$rkey' | '/profile/$did/post/$rkey' | '/profile/$did/post/$rkey/liked-by' | '/profile/$did/post/$rkey/quotes' | '/profile/$did/post/$rkey/reposted-by' + | '/c/$did/feed/$rkey' + | '/c/$did/profile/$did' | '/profile/$did/post/$rkey/image/$i' fileRoutesByTo: FileRoutesByTo to: @@ -255,12 +294,15 @@ export interface FileRouteTypes { | '/route-b' | '/profile/$did/followers' | '/profile/$did/follows' + | '/c/$did' | '/profile/$did' | '/profile/$did/feed/$rkey' | '/profile/$did/post/$rkey' | '/profile/$did/post/$rkey/liked-by' | '/profile/$did/post/$rkey/quotes' | '/profile/$did/post/$rkey/reposted-by' + | '/c/$did/feed/$rkey' + | '/c/$did/profile/$did' | '/profile/$did/post/$rkey/image/$i' id: | '__root__' @@ -274,17 +316,21 @@ export interface FileRouteTypes { | '/search' | '/settings' | '/_pathlessLayout/_nested-layout' + | '/c/$did' | '/callback/' | '/_pathlessLayout/_nested-layout/route-a' | '/_pathlessLayout/_nested-layout/route-b' | '/profile/$did/followers' | '/profile/$did/follows' + | '/c/$did/' | '/profile/$did/' | '/profile/$did/feed/$rkey' | '/profile/$did/post/$rkey' | '/profile/$did/post/$rkey/liked-by' | '/profile/$did/post/$rkey/quotes' | '/profile/$did/post/$rkey/reposted-by' + | '/c/$did/feed/$rkey/' + | '/c/$did/profile/$did/' | '/profile/$did/post/$rkey/image/$i' fileRoutesById: FileRoutesById } @@ -298,6 +344,7 @@ export interface RootRouteChildren { RootCopyRoute: typeof RootCopyRoute SearchRoute: typeof SearchRoute SettingsRoute: typeof SettingsRoute + CDidRoute: typeof CDidRouteWithChildren CallbackIndexRoute: typeof CallbackIndexRoute ProfileDidFollowersRoute: typeof ProfileDidFollowersRoute ProfileDidFollowsRoute: typeof ProfileDidFollowsRoute @@ -378,6 +425,13 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof CallbackIndexRouteImport parentRoute: typeof rootRouteImport } + '/c/$did': { + id: '/c/$did' + path: '/c/$did' + fullPath: '/c/$did' + preLoaderRoute: typeof CDidRouteImport + parentRoute: typeof rootRouteImport + } '/_pathlessLayout/_nested-layout': { id: '/_pathlessLayout/_nested-layout' path: '' @@ -392,6 +446,13 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof ProfileDidIndexRouteImport parentRoute: typeof rootRouteImport } + '/c/$did/': { + id: '/c/$did/' + path: '/' + fullPath: '/c/$did/' + preLoaderRoute: typeof CDidIndexRouteImport + parentRoute: typeof CDidRoute + } '/profile/$did/follows': { id: '/profile/$did/follows' path: '/profile/$did/follows' @@ -434,6 +495,20 @@ declare module '@tanstack/react-router' { preLoaderRoute: typeof ProfileDidFeedRkeyRouteImport parentRoute: typeof rootRouteImport } + '/c/$did/profile/$did/': { + id: '/c/$did/profile/$did/' + path: '/profile/$did' + fullPath: '/c/$did/profile/$did' + preLoaderRoute: typeof CDidProfileDidIndexRouteImport + parentRoute: typeof CDidRoute + } + '/c/$did/feed/$rkey/': { + id: '/c/$did/feed/$rkey/' + path: '/feed/$rkey' + fullPath: '/c/$did/feed/$rkey' + preLoaderRoute: typeof CDidFeedRkeyIndexRouteImport + parentRoute: typeof CDidRoute + } '/profile/$did/post/$rkey/reposted-by': { id: '/profile/$did/post/$rkey/reposted-by' path: '/reposted-by' @@ -495,6 +570,20 @@ const PathlessLayoutRouteWithChildren = PathlessLayoutRoute._addFileChildren( PathlessLayoutRouteChildren, ) +interface CDidRouteChildren { + CDidIndexRoute: typeof CDidIndexRoute + CDidFeedRkeyIndexRoute: typeof CDidFeedRkeyIndexRoute + CDidProfileDidIndexRoute: typeof CDidProfileDidIndexRoute +} + +const CDidRouteChildren: CDidRouteChildren = { + CDidIndexRoute: CDidIndexRoute, + CDidFeedRkeyIndexRoute: CDidFeedRkeyIndexRoute, + CDidProfileDidIndexRoute: CDidProfileDidIndexRoute, +} + +const CDidRouteWithChildren = CDidRoute._addFileChildren(CDidRouteChildren) + interface ProfileDidPostRkeyRouteChildren { ProfileDidPostRkeyLikedByRoute: typeof ProfileDidPostRkeyLikedByRoute ProfileDidPostRkeyQuotesRoute: typeof ProfileDidPostRkeyQuotesRoute @@ -522,6 +611,7 @@ const rootRouteChildren: RootRouteChildren = { RootCopyRoute: RootCopyRoute, SearchRoute: SearchRoute, SettingsRoute: SettingsRoute, + CDidRoute: CDidRouteWithChildren, CallbackIndexRoute: CallbackIndexRoute, ProfileDidFollowersRoute: ProfileDidFollowersRoute, ProfileDidFollowsRoute: ProfileDidFollowsRoute, diff --git a/src/routes/__root.tsx b/src/routes/__root.tsx index 54c0d30..0ea51ab 100644 --- a/src/routes/__root.tsx +++ b/src/routes/__root.tsx @@ -25,6 +25,7 @@ import { HOST_ADMIN, HOST_DESCRIPTION, HOST_HERO, HOST_LOGIN_BLURB, HOST_MAIN_TI import { Composer } from "~/components/Composer"; import { DefaultCatchBoundary } from "~/components/DefaultCatchBoundary"; import { Import } from "~/components/Import"; +import Login from "~/components/Login"; //import Login from "~/components/Login"; import Logo from "~/components/LogoSvg"; //import { ModerationBatcher } from "~/components/ModerationBatcher"; @@ -93,18 +94,18 @@ function RootComponent() { return ( {/* */} - - {/* + + {/* */} - - - - - - - {/* */} - + + + + + + + {/* */} + {/* */} ); @@ -158,15 +159,15 @@ function Snack(props: ToastProps) { rounded-md px-4 py-3 shadow-sm - dark:bg-gray-300 dark:text-gray-900 - bg-gray-700 text-gray-100 - ring-1 dark:ring-gray-200 ring-gray-800 + dark:bg-base-300 dark:text-base-900 + bg-base-700 text-base-100 + ring-1 dark:ring-base-200 ring-base-800 " >

{title}

{description ? ( -

+

{description}

) : null} @@ -178,10 +179,10 @@ function Snack(props: ToastProps) { className=" text-sm font-medium px-3 py-1 rounded-md - bg-gray-200 text-gray-900 - hover:bg-gray-300 - dark:bg-gray-800 dark:text-gray-100 dark:hover:bg-gray-700 - focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-gray-300 dark:focus:ring-gray-700 + bg-base-200 text-base-900 + hover:bg-base-300 + dark:bg-base-800 dark:text-base-100 dark:hover:bg-base-700 + focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-base-300 dark:focus:ring-base-700 " onClick={() => { button.onClick(); @@ -216,7 +217,32 @@ interface ToastProps { } function RootDocument({ children }: { children: React.ReactNode }) { - useAtomCssVar(hueAtom, "--tw-gray-hue"); + // useAtomCssVar(hueBaseAtom, "--system-hue-base"); + // useAtomCssVar(hueAccentAtom, "--system-hue-accent"); + // useAtomCssVar(hueContrastAtom, "--system-hue-contrast"); + // useAtomCssVar(hueMutedAtom, "--system-hue-muted"); + + return ( + <> +
+ hello i am the persistent top bar ! +
+ {/* Layout */} +
+ +
+ {children} +
+
+ + ) +} + + +function OldRootDocument({ children }: { children: React.ReactNode }) { + useAtomCssVar(hueAtom, "--tw-base-hue"); const location = useLocation(); const navigate = useNavigate(); const { agent } = useAuth(); @@ -262,8 +288,8 @@ function RootDocument({ children }: { children: React.ReactNode }) { <> -
-