+6 -3

actions/getIdentityData.ts

··· 2 2 3 3 import { cookies } from "next/headers"; 4 4 import { supabaseServerClient } from "supabase/serverClient"; 5 5 - 6 6 - export async function getIdentityData() { 5 5 + import { cache } from "react"; 6 6 + export const getIdentityData = cache(uncachedGetIdentityData); 7 7 + export async function uncachedGetIdentityData() { 7 8 let cookieStore = await cookies(); 8 9 let auth_token = 9 10 cookieStore.get("auth_token")?.value || ··· 18 19 bsky_profiles(*), 19 20 publication_subscriptions(*), 20 21 custom_domains!custom_domains_identity_id_fkey(publication_domains(*), *), 21 21 - home_leaflet:permission_tokens!identities_home_page_fkey(*, permission_token_rights(*)), 22 22 + home_leaflet:permission_tokens!identities_home_page_fkey(*, permission_token_rights(*, 23 23 + entity_sets(entities(facts(*))) 24 24 + )), 22 25 permission_token_on_homepage( 23 26 created_at, 24 27 permission_tokens!inner(

+43

app/(home-pages)/home/page.tsx

··· 1 1 + import { getIdentityData } from "actions/getIdentityData"; 2 2 + import { getFactsFromHomeLeaflets } from "app/api/rpc/[command]/getFactsFromHomeLeaflets"; 3 3 + import { supabaseServerClient } from "supabase/serverClient"; 4 4 + 5 5 + import { HomeLayout } from "./HomeLayout"; 6 6 + 7 7 + export default async function Home() { 8 8 + let auth_res = await getIdentityData(); 9 9 + 10 10 + let [allLeafletFacts] = await Promise.all([ 11 11 + auth_res 12 12 + ? getFactsFromHomeLeaflets.handler( 13 13 + { 14 14 + tokens: auth_res.permission_token_on_homepage.map( 15 15 + (r) => r.permission_tokens.root_entity, 16 16 + ), 17 17 + }, 18 18 + { supabase: supabaseServerClient }, 19 19 + ) 20 20 + : undefined, 21 21 + ]); 22 22 + 23 23 + let home_docs_initialFacts = allLeafletFacts?.result || {}; 24 24 + 25 25 + return ( 26 26 + <HomeLayout 27 27 + titles={{ 28 28 + ...home_docs_initialFacts.titles, 29 29 + ...auth_res?.permission_token_on_homepage.reduce( 30 30 + (acc, tok) => { 31 31 + let title = 32 32 + tok.permission_tokens.leaflets_in_publications[0]?.title; 33 33 + if (title) acc[tok.permission_tokens.root_entity] = title; 34 34 + return acc; 35 35 + }, 36 36 + {} as { [k: string]: string }, 37 37 + ), 38 38 + }} 39 39 + entityID={auth_res?.home_leaflet?.root_entity || null} 40 40 + initialFacts={home_docs_initialFacts.facts || {}} 41 41 + /> 42 42 + ); 43 43 + }

+38

app/(home-pages)/layout.tsx

··· 1 1 + import { getIdentityData } from "actions/getIdentityData"; 2 2 + import { EntitySetProvider } from "components/EntitySetProvider"; 3 3 + import { 4 4 + ThemeProvider, 5 5 + ThemeBackgroundProvider, 6 6 + } from "components/ThemeManager/ThemeProvider"; 7 7 + import { ReplicacheProvider, type Fact } from "src/replicache"; 8 8 + 9 9 + export default async function HomePagesLayout(props: { 10 10 + children: React.ReactNode; 11 11 + }) { 12 12 + let identityData = await getIdentityData(); 13 13 + if (!identityData?.home_leaflet) return <>{props.children}</>; 14 14 + let facts = 15 15 + (identityData?.home_leaflet?.permission_token_rights[0].entity_sets?.entities.flatMap( 16 16 + (e) => e.facts, 17 17 + ) || []) as Fact<any>[]; 18 18 + 19 19 + let root_entity = identityData.home_leaflet.root_entity; 20 20 + return ( 21 21 + <ReplicacheProvider 22 22 + rootEntity={identityData.home_leaflet.root_entity} 23 23 + token={identityData.home_leaflet} 24 24 + name={identityData.home_leaflet.root_entity} 25 25 + initialFacts={facts} 26 26 + > 27 27 + <EntitySetProvider 28 28 + set={identityData.home_leaflet.permission_token_rights[0].entity_set} 29 29 + > 30 30 + <ThemeProvider entityID={root_entity}> 31 31 + <ThemeBackgroundProvider entityID={root_entity}> 32 32 + {props.children} 33 33 + </ThemeBackgroundProvider> 34 34 + </ThemeProvider> 35 35 + </EntitySetProvider> 36 36 + </ReplicacheProvider> 37 37 + ); 38 38 + }

+3

app/(home-pages)/notifications/page.tsx

··· 1 1 + export default async function Notifications() { 2 2 + return <div>Notifications</div>; 3 3 + }

+38

app/(home-pages)/reader/page.tsx

··· 1 1 + import { getIdentityData } from "actions/getIdentityData"; 2 2 + 3 3 + import { DashboardLayout } from "components/PageLayouts/DashboardLayout"; 4 4 + import { ReaderContent } from "./ReaderContent"; 5 5 + import { SubscriptionsContent } from "./SubscriptionsContent"; 6 6 + import { getReaderFeed } from "./getReaderFeed"; 7 7 + import { getSubscriptions } from "./getSubscriptions"; 8 8 + 9 9 + export default async function Reader(props: {}) { 10 10 + let posts = await getReaderFeed(); 11 11 + let publications = await getSubscriptions(); 12 12 + return ( 13 13 + <DashboardLayout 14 14 + id="reader" 15 15 + cardBorderHidden={false} 16 16 + currentPage="reader" 17 17 + defaultTab="Read" 18 18 + actions={null} 19 19 + tabs={{ 20 20 + Read: { 21 21 + controls: null, 22 22 + content: ( 23 23 + <ReaderContent nextCursor={posts.nextCursor} posts={posts.posts} /> 24 24 + ), 25 25 + }, 26 26 + Subscriptions: { 27 27 + controls: null, 28 28 + content: ( 29 29 + <SubscriptionsContent 30 30 + publications={publications.subscriptions} 31 31 + nextCursor={publications.nextCursor} 32 32 + /> 33 33 + ), 34 34 + }, 35 35 + }} 36 36 + /> 37 37 + ); 38 38 + }

+1 -1

app/discover/PubListing.tsx app/(home-pages)/discover/PubListing.tsx

··· 1 1 "use client"; 2 2 import { AtUri } from "@atproto/syntax"; 3 3 - import { PublicationSubscription } from "app/reader/getSubscriptions"; 3 3 + import { PublicationSubscription } from "app/(home-pages)/reader/getSubscriptions"; 4 4 import { PubIcon } from "components/ActionBar/Publications"; 5 5 import { Separator } from "components/Layout"; 6 6 import { usePubTheme } from "components/ThemeManager/PublicationThemeProvider";

app/discover/SortButtons.tsx app/(home-pages)/discover/SortButtons.tsx

app/discover/SortedPublicationList.tsx app/(home-pages)/discover/SortedPublicationList.tsx

+13 -15

app/discover/page.tsx app/(home-pages)/discover/page.tsx

··· 37 37 let publications = await getPublications(); 38 38 39 39 return ( 40 40 - <div className="w-full h-full mx-auto bg-[#FDFCFA]"> 41 41 - <DashboardLayout 42 42 - id="discover" 43 43 - cardBorderHidden={false} 44 44 - currentPage="discover" 45 45 - defaultTab="default" 46 46 - actions={null} 47 47 - tabs={{ 48 48 - default: { 49 49 - controls: null, 50 50 - content: <DiscoverContent order={order} />, 51 51 - }, 52 52 - }} 53 53 - /> 54 54 - </div> 40 40 + <DashboardLayout 41 41 + id="discover" 42 42 + cardBorderHidden={false} 43 43 + currentPage="discover" 44 44 + defaultTab="default" 45 45 + actions={null} 46 46 + tabs={{ 47 47 + default: { 48 48 + controls: null, 49 49 + content: <DiscoverContent order={order} />, 50 50 + }, 51 51 + }} 52 52 + /> 55 53 ); 56 54 } 57 55

app/home/Actions/AccountSettings.tsx app/(home-pages)/home/Actions/AccountSettings.tsx

app/home/Actions/Actions.tsx app/(home-pages)/home/Actions/Actions.tsx

app/home/Actions/CreateNewButton.tsx app/(home-pages)/home/Actions/CreateNewButton.tsx

app/home/Actions/HomeHelp.tsx app/(home-pages)/home/Actions/HomeHelp.tsx

app/home/HomeEmpty/DiscoverIllo.tsx app/(home-pages)/home/HomeEmpty/DiscoverIllo.tsx

app/home/HomeEmpty/HomeEmpty.tsx app/(home-pages)/home/HomeEmpty/HomeEmpty.tsx

app/home/HomeEmpty/WelcomeToLeafletIllo.tsx app/(home-pages)/home/HomeEmpty/WelcomeToLeafletIllo.tsx

+1 -1

app/home/HomeLayout.tsx app/(home-pages)/home/HomeLayout.tsx

··· 63 63 }; 64 64 65 65 export const HomeLayout = (props: { 66 66 - entityID: string; 66 66 + entityID: string | null; 67 67 titles: { [root_entity: string]: string }; 68 68 initialFacts: { 69 69 [root_entity: string]: Fact<Attribute>[];

app/home/IdentitySetter.tsx app/(home-pages)/home/IdentitySetter.tsx

app/home/LeafletList/LeafletContent.tsx app/(home-pages)/home/LeafletList/LeafletContent.tsx

app/home/LeafletList/LeafletInfo.tsx app/(home-pages)/home/LeafletList/LeafletInfo.tsx

app/home/LeafletList/LeafletListItem.tsx app/(home-pages)/home/LeafletList/LeafletListItem.tsx

app/home/LeafletList/LeafletOptions.tsx app/(home-pages)/home/LeafletList/LeafletOptions.tsx

app/home/LeafletList/LeafletPreview.module.css app/(home-pages)/home/LeafletList/LeafletPreview.module.css

app/home/LeafletList/LeafletPreview.tsx app/(home-pages)/home/LeafletList/LeafletPreview.tsx

app/home/LoggedOutWarning.tsx app/(home-pages)/home/LoggedOutWarning.tsx

+1 -1

app/home/icon.tsx app/(home-pages)/home/icon.tsx

··· 1 1 import { ImageResponse } from "next/og"; 2 2 import type { Fact } from "src/replicache"; 3 3 import type { Attribute } from "src/replicache/attributes"; 4 4 - import { Database } from "../../supabase/database.types"; 4 4 + import { Database } from "supabase/database.types"; 5 5 import { createServerClient } from "@supabase/ssr"; 6 6 import { parseHSBToRGB } from "src/utils/parseHSB"; 7 7 import { cookies } from "next/headers";

-124

app/home/page.tsx

··· 1 1 - import { cookies } from "next/headers"; 2 2 - import { Fact, ReplicacheProvider, useEntity } from "src/replicache"; 3 3 - import type { Attribute } from "src/replicache/attributes"; 4 4 - import { 5 5 - ThemeBackgroundProvider, 6 6 - ThemeProvider, 7 7 - } from "components/ThemeManager/ThemeProvider"; 8 8 - import { EntitySetProvider } from "components/EntitySetProvider"; 9 9 - import { createIdentity } from "actions/createIdentity"; 10 10 - import { drizzle } from "drizzle-orm/node-postgres"; 11 11 - import { IdentitySetter } from "./IdentitySetter"; 12 12 - 13 13 - import { getIdentityData } from "actions/getIdentityData"; 14 14 - import { getFactsFromHomeLeaflets } from "app/api/rpc/[command]/getFactsFromHomeLeaflets"; 15 15 - import { supabaseServerClient } from "supabase/serverClient"; 16 16 - import { pool } from "supabase/pool"; 17 17 - 18 18 - import { NotFoundLayout } from "components/PageLayouts/NotFoundLayout"; 19 19 - import { HomeLayout } from "./HomeLayout"; 20 20 - 21 21 - export default async function Home() { 22 22 - let cookieStore = await cookies(); 23 23 - let auth_res = await getIdentityData(); 24 24 - let identity: string | undefined; 25 25 - if (auth_res) identity = auth_res.id; 26 26 - else identity = cookieStore.get("identity")?.value; 27 27 - let needstosetcookie = false; 28 28 - if (!identity) { 29 29 - const client = await pool.connect(); 30 30 - const db = drizzle(client); 31 31 - let newIdentity = await createIdentity(db); 32 32 - client.release(); 33 33 - identity = newIdentity.id; 34 34 - needstosetcookie = true; 35 35 - } 36 36 - 37 37 - async function setCookie() { 38 38 - "use server"; 39 39 - 40 40 - (await cookies()).set("identity", identity as string, { 41 41 - sameSite: "strict", 42 42 - }); 43 43 - } 44 44 - 45 45 - let permission_token = auth_res?.home_leaflet; 46 46 - if (!permission_token) { 47 47 - let res = await supabaseServerClient 48 48 - .from("identities") 49 49 - .select( 50 50 - `*, 51 51 - permission_tokens!identities_home_page_fkey(*, permission_token_rights(*)) 52 52 - `, 53 53 - ) 54 54 - .eq("id", identity) 55 55 - .single(); 56 56 - permission_token = res.data?.permission_tokens; 57 57 - } 58 58 - 59 59 - if (!permission_token) 60 60 - return ( 61 61 - <NotFoundLayout> 62 62 - <p className="font-bold">Sorry, we can't find this home!</p> 63 63 - <p> 64 64 - This may be a glitch on our end. If the issue persists please{" "} 65 65 - <a href="mailto:contact@leaflet.pub">send us a note</a>. 66 66 - </p> 67 67 - </NotFoundLayout> 68 68 - ); 69 69 - let [homeLeafletFacts, allLeafletFacts] = await Promise.all([ 70 70 - supabaseServerClient.rpc("get_facts", { 71 71 - root: permission_token.root_entity, 72 72 - }), 73 73 - auth_res 74 74 - ? getFactsFromHomeLeaflets.handler( 75 75 - { 76 76 - tokens: auth_res.permission_token_on_homepage.map( 77 77 - (r) => r.permission_tokens.root_entity, 78 78 - ), 79 79 - }, 80 80 - { supabase: supabaseServerClient }, 81 81 - ) 82 82 - : undefined, 83 83 - ]); 84 84 - let initialFacts = 85 85 - (homeLeafletFacts.data as unknown as Fact<Attribute>[]) || []; 86 86 - 87 87 - let root_entity = permission_token.root_entity; 88 88 - let home_docs_initialFacts = allLeafletFacts?.result || {}; 89 89 - 90 90 - return ( 91 91 - <ReplicacheProvider 92 92 - rootEntity={root_entity} 93 93 - token={permission_token} 94 94 - name={root_entity} 95 95 - initialFacts={initialFacts} 96 96 - > 97 97 - <IdentitySetter cb={setCookie} call={needstosetcookie} /> 98 98 - <EntitySetProvider 99 99 - set={permission_token.permission_token_rights[0].entity_set} 100 100 - > 101 101 - <ThemeProvider entityID={root_entity}> 102 102 - <ThemeBackgroundProvider entityID={root_entity}> 103 103 - <HomeLayout 104 104 - titles={{ 105 105 - ...home_docs_initialFacts.titles, 106 106 - ...auth_res?.permission_token_on_homepage.reduce( 107 107 - (acc, tok) => { 108 108 - let title = 109 109 - tok.permission_tokens.leaflets_in_publications[0]?.title; 110 110 - if (title) acc[tok.permission_tokens.root_entity] = title; 111 111 - return acc; 112 112 - }, 113 113 - {} as { [k: string]: string }, 114 114 - ), 115 115 - }} 116 116 - entityID={root_entity} 117 117 - initialFacts={home_docs_initialFacts.facts || {}} 118 118 - /> 119 119 - </ThemeBackgroundProvider> 120 120 - </ThemeProvider> 121 121 - </EntitySetProvider> 122 122 - </ReplicacheProvider> 123 123 - ); 124 124 - }

app/home/storage.ts app/(home-pages)/home/storage.ts

+1 -1

app/lish/[did]/[publication]/dashboard/DraftList.tsx

··· 3 3 import { NewDraftSecondaryButton } from "./NewDraftButton"; 4 4 import React from "react"; 5 5 import { usePublicationData } from "./PublicationSWRProvider"; 6 6 - import { LeafletList } from "app/home/HomeLayout"; 6 6 + import { LeafletList } from "app/(home-pages)/home/HomeLayout"; 7 7 8 8 export function DraftList(props: { 9 9 searchValue: string;

+1 -1

app/login/LoginForm.tsx

··· 5 5 } from "actions/emailAuth"; 6 6 import { loginWithEmailToken } from "actions/login"; 7 7 import { ActionAfterSignIn } from "app/api/oauth/[route]/afterSignInActions"; 8 8 - import { getHomeDocs } from "app/home/storage"; 8 8 + import { getHomeDocs } from "app/(home-pages)/home/storage"; 9 9 import { ButtonPrimary } from "components/Buttons"; 10 10 import { ArrowRightTiny } from "components/Icons/ArrowRightTiny"; 11 11 import { BlueskySmall } from "components/Icons/BlueskySmall";

+1 -2

app/reader/ReaderContent.tsx app/(home-pages)/reader/ReaderContent.tsx

··· 23 23 import { useLocalizedDate } from "src/hooks/useLocalizedDate"; 24 24 25 25 export const ReaderContent = (props: { 26 26 - root_entity: string; 27 26 posts: Post[]; 28 27 nextCursor: Cursor | null; 29 28 }) => { ··· 205 204 year: "numeric", 206 205 month: "short", 207 206 day: "numeric", 208 208 - } 207 207 + }, 209 208 ); 210 209 211 210 return (

+1 -1

app/reader/SubscriptionsContent.tsx app/(home-pages)/reader/SubscriptionsContent.tsx

··· 1 1 "use client"; 2 2 - import { PubListing } from "app/discover/PubListing"; 2 2 + import { PubListing } from "app/(home-pages)/discover/PubListing"; 3 3 import { ButtonPrimary } from "components/Buttons"; 4 4 import { DiscoverSmall } from "components/Icons/DiscoverSmall"; 5 5 import { Json } from "supabase/database.types";

app/reader/getReaderFeed.ts app/(home-pages)/reader/getReaderFeed.ts

app/reader/getSubscriptions.ts app/(home-pages)/reader/getSubscriptions.ts

app/reader/idResolver.ts app/(home-pages)/reader/idResolver.ts

-104

app/reader/page.tsx

··· 1 1 - import { cookies } from "next/headers"; 2 2 - import { Fact, ReplicacheProvider } from "src/replicache"; 3 3 - import type { Attribute } from "src/replicache/attributes"; 4 4 - import { 5 5 - ThemeBackgroundProvider, 6 6 - ThemeProvider, 7 7 - } from "components/ThemeManager/ThemeProvider"; 8 8 - import { EntitySetProvider } from "components/EntitySetProvider"; 9 9 - import { getIdentityData } from "actions/getIdentityData"; 10 10 - import { supabaseServerClient } from "supabase/serverClient"; 11 11 - 12 12 - import { NotFoundLayout } from "components/PageLayouts/NotFoundLayout"; 13 13 - import { DashboardLayout } from "components/PageLayouts/DashboardLayout"; 14 14 - import { ReaderContent, ReaderEmpty } from "./ReaderContent"; 15 15 - import { 16 16 - SubscriptionsContent, 17 17 - SubscriptionsEmpty, 18 18 - } from "./SubscriptionsContent"; 19 19 - import { getReaderFeed } from "./getReaderFeed"; 20 20 - import { getSubscriptions } from "./getSubscriptions"; 21 21 - 22 22 - export default async function Reader(props: {}) { 23 23 - let cookieStore = await cookies(); 24 24 - let auth_res = await getIdentityData(); 25 25 - let identity: string | undefined; 26 26 - let permission_token = auth_res?.home_leaflet; 27 27 - if (!permission_token) 28 28 - return ( 29 29 - <DashboardLayout 30 30 - id="reader" 31 31 - cardBorderHidden={false} 32 32 - currentPage="reader" 33 33 - defaultTab="Read" 34 34 - actions={null} 35 35 - tabs={{ 36 36 - Read: { 37 37 - controls: null, 38 38 - content: <ReaderEmpty />, 39 39 - }, 40 40 - Subscriptions: { 41 41 - controls: null, 42 42 - content: <SubscriptionsEmpty />, 43 43 - }, 44 44 - }} 45 45 - /> 46 46 - ); 47 47 - let [homeLeafletFacts] = await Promise.all([ 48 48 - supabaseServerClient.rpc("get_facts", { 49 49 - root: permission_token.root_entity, 50 50 - }), 51 51 - ]); 52 52 - let initialFacts = 53 53 - (homeLeafletFacts.data as unknown as Fact<Attribute>[]) || []; 54 54 - let root_entity = permission_token.root_entity; 55 55 - 56 56 - if (!auth_res?.atp_did) return; 57 57 - let posts = await getReaderFeed(); 58 58 - let publications = await getSubscriptions(); 59 59 - return ( 60 60 - <ReplicacheProvider 61 61 - rootEntity={root_entity} 62 62 - token={permission_token} 63 63 - name={root_entity} 64 64 - initialFacts={initialFacts} 65 65 - > 66 66 - <EntitySetProvider 67 67 - set={permission_token.permission_token_rights[0].entity_set} 68 68 - > 69 69 - <ThemeProvider entityID={root_entity}> 70 70 - <ThemeBackgroundProvider entityID={root_entity}> 71 71 - <DashboardLayout 72 72 - id="reader" 73 73 - cardBorderHidden={false} 74 74 - currentPage="reader" 75 75 - defaultTab="Read" 76 76 - actions={null} 77 77 - tabs={{ 78 78 - Read: { 79 79 - controls: null, 80 80 - content: ( 81 81 - <ReaderContent 82 82 - root_entity={root_entity} 83 83 - nextCursor={posts.nextCursor} 84 84 - posts={posts.posts} 85 85 - /> 86 86 - ), 87 87 - }, 88 88 - Subscriptions: { 89 89 - controls: null, 90 90 - content: ( 91 91 - <SubscriptionsContent 92 92 - publications={publications.subscriptions} 93 93 - nextCursor={publications.nextCursor} 94 94 - /> 95 95 - ), 96 96 - }, 97 97 - }} 98 98 - /> 99 99 - </ThemeBackgroundProvider> 100 100 - </ThemeProvider> 101 101 - </EntitySetProvider> 102 102 - </ReplicacheProvider> 103 103 - ); 104 104 - }

+1 -1

components/Pages/useCardBorderHidden.ts

··· 2 2 import { PubLeafletPublication } from "lexicons/api"; 3 3 import { useEntity, useReplicache } from "src/replicache"; 4 4 5 5 - export function useCardBorderHidden(entityID: string) { 5 5 + export function useCardBorderHidden(entityID: string | null) { 6 6 let { rootEntity } = useReplicache(); 7 7 let { data: pub } = useLeafletPublicationData(); 8 8 let rootCardBorderHidden = useEntity(rootEntity, "theme/card-border-hidden");

+1 -1

components/ShareOptions/index.tsx

··· 6 6 import { Menu, MenuItem } from "components/Layout"; 7 7 import { ActionButton } from "components/ActionBar/ActionButton"; 8 8 import useSWR from "swr"; 9 9 - import { useTemplateState } from "app/home/Actions/CreateNewButton"; 9 9 + import { useTemplateState } from "app/(home-pages)/home/Actions/CreateNewButton"; 10 10 import LoginForm from "app/login/LoginForm"; 11 11 import { CustomDomainMenu } from "./DomainOptions"; 12 12 import { useIdentityData } from "components/IdentityProvider";

+1 -1

components/ThemeManager/ThemeProvider.tsx

··· 38 38 39 39 // define the color defaults for everything 40 40 export const ThemeDefaults = { 41 41 - "theme/page-background": "#F0F7FA", 41 41 + "theme/page-background": "#FDFCFA", 42 42 "theme/card-background": "#FFFFFF", 43 43 "theme/primary": "#272727", 44 44 "theme/highlight-1": "#FFFFFF",

+1 -1

components/utils/AddLeafletToHomepage.tsx

··· 1 1 "use client"; 2 2 3 3 - import { addDocToHome } from "app/home/storage"; 3 3 + import { addDocToHome } from "app/(home-pages)/home/storage"; 4 4 import { useIdentityData } from "components/IdentityProvider"; 5 5 import { useEffect } from "react"; 6 6 import { useReplicache } from "src/replicache";