upgrade verdant for private docs

a-type · Jul 10, 2024 · 941cf66 · 941cf66
1 parent 8ef7829
commit 941cf66
Show file tree

Hide file tree

Showing 23 changed files with 398 additions and 426 deletions.
diff --git a/.gitignore b/.gitignore
@@ -138,3 +138,5 @@ backups/
 .DS_Store
 
 *.bak
+
+vite.config.ts.*
diff --git a/apps/gnocchi/verdant/package.json b/apps/gnocchi/verdant/package.json
@@ -24,10 +24,10 @@
   "dependencies": {
     "@0no-co/graphqlsp": "1.12.8",
     "@biscuits/client": "workspace:*",
-    "@verdant-web/cli": "^4.4.1",
-    "@verdant-web/common": "2.3.4",
-    "@verdant-web/react": "34.0.1",
-    "@verdant-web/store": "3.8.4",
+    "@verdant-web/cli": "^4.5.0",
+    "@verdant-web/common": "2.4.0",
+    "@verdant-web/react": "35.0.0",
+    "@verdant-web/store": "3.9.0",
     "cuid": "^2.1.8",
     "stopword": "^2.0.8"
   },

diff --git a/apps/gnocchi/web/package.json b/apps/gnocchi/web/package.json
@@ -40,7 +40,7 @@
     "@use-gesture/react": "^10.2.24",
     "@vercel/analytics": "^0.1.6",
     "@verdant-web/react-router": "^0.6.3",
-    "@verdant-web/store": "^3.8.4",
+    "@verdant-web/store": "^3.9.0",
     "@zip.js/zip.js": "^2.7.6",
     "classnames": "^2.3.2",
     "convert-units": "^3.0.0-beta.4",

diff --git a/apps/gnocchi/web/src/stores/groceries/index.ts b/apps/gnocchi/web/src/stores/groceries/index.ts
@@ -556,7 +556,19 @@ export function createClientDescriptor(options: { namespace: string }) {
     namespace: options.namespace,
     log:
       import.meta.env.DEV || DEBUG
-        ? (...args: any[]) => console.debug('🌿', ...args)
+        ? (level, ...args: any[]) => {
+            if (level === 'debug') {
+              if (DEBUG) {
+                console.debug('🌿', ...args);
+              }
+            } else if (level === 'error' || level === 'critical') {
+              console.error('🌿', ...args);
+            } else if (level === 'warn') {
+              console.warn('🌿', ...args);
+            } else {
+              console.log('🌿', ...args);
+            }
+          }
         : undefined,
     EXPERIMENTAL_weakRefs: true,
   });

diff --git a/apps/humding/verdant/package.json b/apps/humding/verdant/package.json
@@ -13,9 +13,9 @@
     "react": "18.3.1"
   },
   "dependencies": {
-    "@verdant-web/cli": "4.4.1",
-    "@verdant-web/common": "2.3.4",
-    "@verdant-web/react": "34.0.1",
-    "@verdant-web/store": "^3.8.4"
+    "@verdant-web/cli": "4.5.0",
+    "@verdant-web/common": "2.4.0",
+    "@verdant-web/react": "35.0.0",
+    "@verdant-web/store": "^3.9.0"
   }
 }
diff --git a/apps/marginalia/verdant/package.json b/apps/marginalia/verdant/package.json
@@ -13,10 +13,10 @@
     "react": "18.3.1"
   },
   "dependencies": {
-    "@verdant-web/cli": "^4.4.1",
-    "@verdant-web/common": "^2.3.4",
-    "@verdant-web/react": "^34.0.1",
-    "@verdant-web/store": "^3.8.4",
+    "@verdant-web/cli": "^4.5.0",
+    "@verdant-web/common": "^2.4.0",
+    "@verdant-web/react": "^35.0.0",
+    "@verdant-web/store": "^3.9.0",
     "cuid": "^2.1.8"
   }
 }
diff --git a/apps/star-chart/verdant/package.json b/apps/star-chart/verdant/package.json
@@ -13,9 +13,9 @@
     "react": "18.3.1"
   },
   "dependencies": {
-    "@verdant-web/cli": "4.4.1",
-    "@verdant-web/common": "2.3.4",
-    "@verdant-web/react": "34.0.1",
-    "@verdant-web/store": "3.8.4"
+    "@verdant-web/cli": "4.5.0",
+    "@verdant-web/common": "2.4.0",
+    "@verdant-web/react": "35.0.0",
+    "@verdant-web/store": "3.9.0"
   }
 }
diff --git a/apps/trip-tick/verdant/package.json b/apps/trip-tick/verdant/package.json
@@ -12,10 +12,10 @@
     "react": "18.3.1"
   },
   "dependencies": {
-    "@verdant-web/cli": "^4.4.1",
-    "@verdant-web/common": "2.3.4",
-    "@verdant-web/react": "34.0.1",
-    "@verdant-web/store": "3.8.4",
+    "@verdant-web/cli": "^4.5.0",
+    "@verdant-web/common": "2.4.0",
+    "@verdant-web/react": "35.0.0",
+    "@verdant-web/store": "3.9.0",
     "cuid": "^2.1.8"
   }
 }
diff --git a/apps/trip-tick/web/package.json b/apps/trip-tick/web/package.json
@@ -18,9 +18,9 @@
     "@tanstack/react-query": "^4.24.10",
     "@trip-tick.biscuits/verdant": "workspace:*",
     "@unocss/transformer-variant-group": "^0.54.1",
-    "@verdant-web/react": "^34.0.1",
+    "@verdant-web/react": "^35.0.0",
     "@verdant-web/react-router": "^0.6.3",
-    "@verdant-web/store": "^3.8.4",
+    "@verdant-web/store": "^3.9.0",
     "classnames": "^2.3.2",
     "date-fns": "^2.30.0",
     "downshift": "^7.0.1",

diff --git a/apps/wish-wash/verdant/package.json b/apps/wish-wash/verdant/package.json
@@ -13,9 +13,9 @@
     "react": "18.3.1"
   },
   "dependencies": {
-    "@verdant-web/cli": "^4.4.1",
-    "@verdant-web/common": "^2.3.4",
-    "@verdant-web/react": "^34.0.1",
-    "@verdant-web/store": "^3.8.4"
+    "@verdant-web/cli": "4.5.0",
+    "@verdant-web/common": "2.4.0",
+    "@verdant-web/react": "35.0.0",
+    "@verdant-web/store": "3.9.0"
   }
 }
diff --git a/apps/wish-wash/web/src/App.tsx b/apps/wish-wash/web/src/App.tsx
@@ -3,9 +3,8 @@ import { clientDescriptor, hooks } from '@/store.js';
 import { ErrorBoundary } from '@a-type/ui/components/errorBoundary';
 import { Provider as UIProvider } from '@a-type/ui/components/provider';
 import { H1, P } from '@a-type/ui/components/typography';
-import { Provider, ReloadButton } from '@biscuits/client';
+import { Provider, ReloadButton, useCanSync } from '@biscuits/client';
 import { ReactNode, Suspense } from 'react';
-import { privateClientDescriptor, privateHooks } from './privateStore.js';
 
 export interface AppProps {}
 
@@ -14,26 +13,22 @@ export function App({}: AppProps) {
     <ErrorBoundary fallback={<ErrorFallback />}>
       <UIProvider toastContainerClassName="mb-10 sm:mb-0">
         <Suspense>
-          <VerdantProvider>
-            <Provider
-              appId="wish-wash"
-              storeDescriptor={clientDescriptor as any}
-            >
+          <Provider appId="wish-wash" storeDescriptor={clientDescriptor as any}>
+            <VerdantProvider>
               <Pages />
-            </Provider>
-          </VerdantProvider>
+            </VerdantProvider>
+          </Provider>
         </Suspense>
       </UIProvider>
     </ErrorBoundary>
   );
 }
 
 function VerdantProvider({ children }: { children: ReactNode }) {
+  const canSync = useCanSync();
   return (
-    <hooks.Provider value={clientDescriptor}>
-      <privateHooks.Provider value={privateClientDescriptor}>
-        {children}
-      </privateHooks.Provider>
+    <hooks.Provider value={clientDescriptor} sync={canSync}>
+      {children}
     </hooks.Provider>
   );
 }

diff --git a/apps/wish-wash/web/src/components/lists/CreateItem.tsx b/apps/wish-wash/web/src/components/lists/CreateItem.tsx
@@ -5,28 +5,43 @@ import {
 } from '@a-type/ui/components/forms';
 import { useListContext } from './ListContext.jsx';
 import { createdItemState } from './state.js';
+import { hooks } from '@/store.js';
+import { authorization } from '@wish-wash.biscuits/verdant';
 
 export interface CreateItemProps {}
 
 export function CreateItem({}: CreateItemProps) {
-  const { listId, client } = useListContext();
+  const { listId, list } = useListContext();
+  const client = hooks.useClient();
 
   return (
     <FormikForm
       initialValues={{ description: '' }}
       onSubmit={async (values, form) => {
-        const item = await client.items.put({
-          listId,
-          description: values.description,
-        });
+        const item = await client.items.put(
+          {
+            listId,
+            description: values.description,
+          },
+          {
+            access: list.isAuthorized
+              ? authorization.private
+              : authorization.public,
+          },
+        );
         // actually don't need to focus edit on this since we just
         // named it...
         // createdItemState.justCreatedId = item.get('id');
         form.resetForm();
       }}
       className="!row items-center gap-2"
     >
-      <TextField name="description" required className="flex-1" />
+      <TextField
+        name="description"
+        required
+        className="flex-1"
+        variant="primary"
+      />
       <SubmitButton>Add</SubmitButton>
     </FormikForm>
   );

diff --git a/apps/wish-wash/web/src/components/lists/ListContext.tsx b/apps/wish-wash/web/src/components/lists/ListContext.tsx
@@ -1,9 +1,9 @@
-import { Client } from '@wish-wash.biscuits/verdant';
+import { Client, List } from '@wish-wash.biscuits/verdant';
 import { createContext, useContext } from 'react';
 
 export interface ListContextProps {
   listId: string;
-  client: Client;
+  list: List;
 }
 
 const listContext = createContext<ListContextProps | undefined>(undefined);

diff --git a/apps/wish-wash/web/src/components/lists/ListMenu.tsx b/apps/wish-wash/web/src/components/lists/ListMenu.tsx
@@ -1,10 +1,8 @@
-import { privateHooks } from '@/privateStore.js';
 import { hooks } from '@/store.js';
 import { ButtonProps, Button } from '@a-type/ui/components/button';
 import { Icon } from '@a-type/ui/components/icon';
 import { useCanSync } from '@biscuits/client';
 import { useNavigate } from '@verdant-web/react-router';
-import { MouseEvent } from 'react';
 import {
   DropdownMenu,
   DropdownMenuContent,
@@ -13,24 +11,22 @@ import {
   DropdownMenuItem,
   DropdownMenuItemRightSlot,
 } from '@a-type/ui/components/dropdownMenu';
+import { authorization } from '@wish-wash.biscuits/verdant';
 
 export interface ListMenuProps extends ButtonProps {}
 
-export function ListMenu({ children, onClick, ...props }: ListMenuProps) {
+export function ListMenu(props: ListMenuProps) {
   const client = hooks.useClient();
-  const privateClient = privateHooks.useClient();
 
   const navigate = useNavigate();
-  const createPublicList = async (ev: MouseEvent<any>) => {
-    const list = await client.lists.put({ name: 'New list' });
-    navigate(`/shared/${list.get('id')}?listId=${list.get('id')}`);
-    onClick?.(ev);
-  };
-
-  const createPrivateList = async (ev: MouseEvent<any>) => {
-    const list = await privateClient.lists.put({ name: 'New list' });
-    navigate(`/private/${list.get('id')}?listId=${list.get('id')}`);
-    onClick?.(ev);
+  const createList = async (isPrivate?: boolean) => {
+    const list = await client.lists.put(
+      { name: 'New list' },
+      {
+        access: isPrivate ? authorization.private : authorization.public,
+      },
+    );
+    navigate(`/${list.get('id')}?listId=${list.get('id')}`);
   };
 
   const canSync = useCanSync();
@@ -45,14 +41,14 @@ export function ListMenu({ children, onClick, ...props }: ListMenuProps) {
       <DropdownMenuContent>
         <DropdownMenuArrow />
         {canSync && (
-          <DropdownMenuItem onClick={createPublicList}>
+          <DropdownMenuItem onClick={() => createList(false)}>
             New public list
             <DropdownMenuItemRightSlot>
               <Icon name="add_person" />
             </DropdownMenuItemRightSlot>
           </DropdownMenuItem>
         )}
-        <DropdownMenuItem onClick={createPrivateList}>
+        <DropdownMenuItem onClick={() => createList(true)}>
           New private list
           <DropdownMenuItemRightSlot>
             <Icon name="plus" />
Original file line number	Diff line number	Diff line change
Expand Up		@@ -138,3 +138,5 @@ backups/
		.DS_Store

		*.bak

		vite.config.ts.*