Merge branches 'main' and 'main' of github.com:a-type/biscuits

a-type · Mar 26, 2024 · 7d12126 · 7d12126
2 parents 9c7dd8e + bb4fad7
commit 7d12126
Show file tree

Hide file tree

Showing 42 changed files with 3,088 additions and 1,526 deletions.
diff --git a/apps/gnocchi/verdant/package.json b/apps/gnocchi/verdant/package.json
@@ -25,9 +25,9 @@
     "@0no-co/graphqlsp": "^1.3.4",
     "@biscuits/client": "workspace:*",
     "@verdant-web/cli": "^4.3.2",
-    "@verdant-web/common": "2.2.0",
-    "@verdant-web/react": "28.0.1",
-    "@verdant-web/store": "3.3.0",
+    "@verdant-web/common": "2.3.0",
+    "@verdant-web/react": "29.0.0",
+    "@verdant-web/store": "3.4.0",
     "cuid": "^2.1.8",
     "stopword": "^2.0.8"
   },

diff --git a/apps/gnocchi/web/package.json b/apps/gnocchi/web/package.json
@@ -38,11 +38,7 @@
     "@tiptap/starter-kit": "^2.2.4",
     "@use-gesture/react": "^10.2.24",
     "@vercel/analytics": "^0.1.6",
-    "@verdant-web/cli": "^4.3.1",
-    "@verdant-web/common": "2.2.0",
-    "@verdant-web/react": "28.0.1",
     "@verdant-web/react-router": "^0.6.1",
-    "@verdant-web/store": "3.3.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/App.tsx b/apps/gnocchi/web/src/App.tsx
@@ -12,7 +12,7 @@ import { TooltipProvider } from '@a-type/ui/components/tooltip';
 import { P, H1 } from '@a-type/ui/components/typography';
 import { ParticleLayer } from '@a-type/ui/components/particles';
 import { GlobalSyncingIndicator } from '@/components/sync/GlobalSyncingIndicator.jsx';
-import { Provider } from '@biscuits/client';
+import { AppPreviewNotice, Provider } from '@biscuits/client';
 import { graphqlClient } from './graphql.js';
 
 export function App() {
@@ -37,6 +37,7 @@ export function App() {
             <Provider graphqlClient={graphqlClient} appId="gnocchi">
               <GroceriesProvider>
                 <ParticleLayer>
+                  <AppPreviewNotice />
                   <Pages />
                   <Toaster
                     position="bottom-center"

diff --git a/apps/gnocchi/web/src/components/groceries/items/GroceryListItem.tsx b/apps/gnocchi/web/src/components/groceries/items/GroceryListItem.tsx
@@ -13,7 +13,7 @@ import { useListId } from '@/contexts/ListContext.jsx';
 import useMergedRef from '@/hooks/useMergedRef.js';
 import { useIsFirstRender, usePrevious } from '@/hooks/usePrevious.js';
 import { categorizeOnboarding } from '@/onboarding/categorizeOnboarding.js';
-import { Presence, Profile, hooks } from '@/stores/groceries/index.js';
+import { Person, Presence, Profile, hooks } from '@/stores/groceries/index.js';
 import { Button } from '@a-type/ui/components/button';
 import {
   CheckboxIndicator,
@@ -48,7 +48,6 @@ import {
   Pencil1Icon,
   TrashIcon,
 } from '@radix-ui/react-icons';
-import { UserInfo } from '@verdant-web/store';
 import classNames from 'classnames';
 import {
   CSSProperties,
@@ -355,7 +354,7 @@ function RecentPeople({ item }: { item: Item }) {
 
 function usePeopleWhoLastEditedThis(itemId: string) {
   const groceries = hooks.useClient();
-  const [people, setPeople] = useState<UserInfo<Profile, Presence>[]>(() => {
+  const [people, setPeople] = useState<Person[]>(() => {
     return Object.values(groceries.sync.presence.peers).filter(
       (p) => p.presence.lastInteractedItem === itemId,
     );

diff --git a/apps/gnocchi/web/src/components/sync/collaborationMenu/RecipePresenceNotification.tsx b/apps/gnocchi/web/src/components/sync/collaborationMenu/RecipePresenceNotification.tsx
@@ -1,8 +1,7 @@
 import { makeRecipeLink } from '@/components/recipes/makeRecipeLink.js';
-import { Presence, Profile, hooks } from '@/stores/groceries/index.js';
+import { Person, Presence, Profile, hooks } from '@/stores/groceries/index.js';
 import { Button } from '@a-type/ui/components/button';
 import { PageNowPlaying } from '@a-type/ui/components/layouts';
-import { UserInfo } from '@verdant-web/common';
 import { Cross2Icon } from '@radix-ui/react-icons';
 import { Suspense, useState } from 'react';
 import { PersonAvatar } from '../people/PersonAvatar.jsx';
@@ -55,7 +54,7 @@ function RecipePresenceLink({
   onDismiss,
 }: {
   recipeId: string;
-  person: UserInfo<Profile, Presence>;
+  person: Person;
   onDismiss: () => void;
 }) {
   const recipe = hooks.useRecipe(recipeId);

diff --git a/apps/gnocchi/web/src/pages/Pages.tsx b/apps/gnocchi/web/src/pages/Pages.tsx
@@ -170,21 +170,19 @@ const routes = makeRoutes([
 ]);
 
 function LayoutWithNavBar() {
-  const big = useMediaQuery('(min-width: 640px)');
-  if (big) {
-    return (
-      <PageRoot>
-        <Outlet />
-        <NavBar />
-      </PageRoot>
-    );
-  }
   return (
     <PageRoot>
-      <SwipeOutlet scroll className="[grid-area:content]" />
+      <Outlet />
       <NavBar />
     </PageRoot>
   );
+
+  // return (
+  //   <PageRoot>
+  //     <SwipeOutlet scroll className="[grid-area:content]" />
+  //     <NavBar />
+  //   </PageRoot>
+  // );
 }
 
 export function Pages() {

diff --git a/apps/gnocchi/web/src/pages/groceries/GroceriesPage.tsx b/apps/gnocchi/web/src/pages/groceries/GroceriesPage.tsx
@@ -1,5 +1,6 @@
 import { ListEdit } from '@/components/groceries/lists/ListEdit.jsx';
 import { ListSelect } from '@/components/groceries/lists/ListSelect.jsx';
+import { Icon } from '@/components/icons/Icon.jsx';
 import { RecipeSavePrompt } from '@/components/recipes/savePrompt/RecipeSavePrompt.jsx';
 import { OfflineIndicator } from '@/components/sync/OfflineIndicator.jsx';
 import { RecipePresenceNotification } from '@/components/sync/collaborationMenu/RecipePresenceNotification.jsx';
@@ -64,13 +65,19 @@ export function GroceriesPage() {
             <Suspense>
               <ChangelogDisplay className="sm:hidden" hideOnSeen />
             </Suspense>
+            <Suspense>
+              <OfflineIndicator />
+            </Suspense>
             <InstallButton />
-            <UserMenu>
-              <Suspense>
-                <PresencePeople />
-              </Suspense>
-            </UserMenu>
-            <OfflineIndicator />
+            <Suspense>
+              <UserMenu>
+                <Suspense
+                  fallback={<Icon className="w-32px h-32px" name="profile" />}
+                >
+                  <PresencePeople />
+                </Suspense>
+              </UserMenu>
+            </Suspense>
           </div>
         </TopControls>
         <AddBar />

diff --git a/apps/gnocchi/web/vite.config.ts b/apps/gnocchi/web/vite.config.ts
@@ -28,6 +28,7 @@ export default defineConfig(({ command, mode }) => ({
       srcDir: 'src',
       filename: 'service-worker.ts',
       manifest: {
+        id: 'gnocchi-main',
         name: 'Gnocchi',
         short_name: 'Gnocchi',
         description: 'Your grocery list, done better.',
@@ -70,7 +71,7 @@ export default defineConfig(({ command, mode }) => ({
         ],
         categories: ['food'],
         display: 'standalone',
-        start_url: '/',
+        start_url: '/?directLaunch=true',
         share_target: {
           action: 'share',
           method: 'POST',

diff --git a/apps/trip-tick/verdant/package.json b/apps/trip-tick/verdant/package.json
@@ -12,10 +12,10 @@
     "react": "^18.2.0"
   },
   "dependencies": {
-    "@verdant-web/cli": "^4.1.0",
-    "@verdant-web/common": "^1.16.1",
-    "@verdant-web/react": "^24.0.1",
-    "@verdant-web/store": "^2.8.4",
+    "@verdant-web/cli": "^4.3.2",
+    "@verdant-web/common": "2.3.0",
+    "@verdant-web/react": "29.0.0",
+    "@verdant-web/store": "3.4.0",
     "cuid": "^2.1.8"
   }
 }
diff --git a/apps/trip-tick/web/package.json b/apps/trip-tick/web/package.json
@@ -12,15 +12,15 @@
     "@a-type/ui": "^0.6.17",
     "@a-type/utils": "^1.0.6",
     "@biscuits/client": "workspace:*",
-    "@trip-tick.biscuits/verdant": "workspace:*",
     "@radix-ui/react-progress": "^1.0.3",
     "@radix-ui/react-toggle-group": "^1.0.4",
     "@react-spring/web": "^9.7.3",
     "@tanstack/react-query": "^4.24.10",
+    "@trip-tick.biscuits/verdant": "workspace:*",
     "@unocss/transformer-variant-group": "^0.54.1",
-    "@verdant-web/react": "^24.0.1",
-    "@verdant-web/react-router": "^0.5.4",
-    "@verdant-web/store": "^2.8.4",
+    "@verdant-web/react": "^29.0.0",
+    "@verdant-web/react-router": "^0.6.1",
+    "@verdant-web/store": "^3.4.0",
     "classnames": "^2.3.2",
     "date-fns": "^2.30.0",
     "react": "^18.2.0",

diff --git a/apps/trip-tick/web/src/App.tsx b/apps/trip-tick/web/src/App.tsx
@@ -1,7 +1,12 @@
 import { Pages } from '@/pages/Pages.jsx';
 import { clientDescriptor, hooks } from '@/store.js';
 import { IconSpritesheet } from '@a-type/ui/components/icon';
-import { useIsLoggedIn, Provider, createGraphQLClient } from '@biscuits/client';
+import {
+  useIsLoggedIn,
+  Provider,
+  createGraphQLClient,
+  AppPreviewNotice,
+} from '@biscuits/client';
 import { ReactNode, Suspense } from 'react';
 import { Toaster } from 'react-hot-toast';
 
@@ -12,6 +17,7 @@ export function App() {
     <Suspense>
       <Provider appId="trip-tick" graphqlClient={graphqlClient}>
         <LofiProvider>
+          <AppPreviewNotice />
           <Pages />
           <IconSpritesheet />
           <Toaster

diff --git a/apps/trip-tick/web/src/pages/Pages.tsx b/apps/trip-tick/web/src/pages/Pages.tsx
@@ -5,6 +5,7 @@ import { updateApp, updateState } from '@/updateState.js';
 import { PageRoot } from '@a-type/ui/components/layouts';
 import { TopLoader } from '@/components/nav/TopLoader.jsx';
 import { Navigation } from '@/components/nav/Navigation.jsx';
+import { LogoutNotice } from '@biscuits/client';
 
 // dynamically import pages that may not be visited
 const ListsPage = lazy(() => import('./ListsPage.jsx'));
@@ -52,6 +53,7 @@ export function Pages() {
       <Router routes={routes} onNavigate={onNavigate}>
         <Outlet />
         <TopLoader />
+        <LogoutNotice />
       </Router>
       <Navigation />
     </PageRoot>

diff --git a/apps/trip-tick/web/vite.config.ts b/apps/trip-tick/web/vite.config.ts
@@ -15,9 +15,10 @@ export default defineConfig({
       srcDir: 'src',
       filename: 'service-worker.ts',
       manifest: {
-        name: 'packing-list',
-        short_name: 'packing-list',
-        description: '',
+        id: 'trip-tick-main',
+        name: 'Trip Tick',
+        short_name: 'Trip Tick',
+        description: 'Stress-free trip packing',
         theme_color: '#ffffff',
         background_color: '#ffffff',
         icons: [
@@ -34,7 +35,7 @@ export default defineConfig({
         ],
         categories: [],
         display: 'standalone',
-        start_url: '/',
+        start_url: '/?directLaunch=true',
       } as any,
       includeAssets: ['fonts/**/*', 'images/**/*'],
 

diff --git a/apps/trip-tick/web/vite.config.ts.timestamp-1710171524420.mjs b/apps/trip-tick/web/vite.config.ts.timestamp-1710171524420.mjs
diff --git a/packages/apps/src/index.ts b/packages/apps/src/index.ts
@@ -37,3 +37,7 @@ export const appIds = apps.map((app) => app.id) as AppId[];
 export function isValidAppId(appId: string): appId is AppId {
   return appIds.includes(appId as AppId);
 }
+
+export const appsById = Object.fromEntries(
+  apps.map((app) => [app.id, app]),
+) as Record<AppId, (typeof apps)[number]>;
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -24,14 +24,14 @@
   "type": "module",
   "dependencies": {
     "@0no-co/graphqlsp": "^1.3.4",
+    "@biscuits/apps": "workspace:*",
     "@biscuits/error": "workspace:*",
     "@biscuits/libraries": "workspace:*",
-    "@biscuits/apps": "workspace:*",
     "@urql/exchange-refocus": "^1.0.2",
     "@urql/exchange-retry": "^1.2.1",
+    "clsx": "2.1.0",
     "gql.tada": "^1.2.1",
-    "urql": "^4.0.6",
-    "clsx": "2.1.0"
+    "urql": "^4.0.6"
   },
   "peerDependencies": {
     "@a-type/ui": "^0.6.17",
@@ -41,9 +41,9 @@
     "vite-plugin-pwa": "0.19.2"
   },
   "devDependencies": {
-    "@types/react": "18.0.14",
     "@a-type/ui": "^0.6.17",
-    "@verdant-web/store": "^3.2.2",
+    "@types/react": "18.0.14",
+    "@verdant-web/store": "^3.4.0",
     "react": "^18.2.0",
     "vite-plugin-pwa": "0.19.2"
   }