simplify and consolidate app scaffold

a-type · Jun 14, 2024 · 4c77fb8 · 4c77fb8
1 parent 4da9e20
commit 4c77fb8
Show file tree

Hide file tree

Showing 70 changed files with 1,623 additions and 456 deletions.
diff --git a/apps/gnocchi/hub/package.json b/apps/gnocchi/hub/package.json
@@ -20,7 +20,7 @@
     "typecheck": "tsc --build tsconfig.json"
   },
   "dependencies": {
-    "@a-type/ui": "^0.8.20",
+    "@a-type/ui": "^0.8.21",
     "@a-type/utils": "^1.0.8",
     "@tiptap/core": "^2.2.4",
     "@tiptap/extension-document": "^2.2.4",

diff --git a/apps/gnocchi/web/package.json b/apps/gnocchi/web/package.json
@@ -14,7 +14,7 @@
     "typecheck": "tsc --build tsconfig.json"
   },
   "dependencies": {
-    "@a-type/ui": "^0.8.20",
+    "@a-type/ui": "^0.8.21",
     "@a-type/utils": "^1.0.8",
     "@biscuits/client": "workspace:*",
     "@biscuits/error": "workspace:*",
@@ -59,7 +59,6 @@
     "prosemirror-model": "1.21.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-hot-toast": "^2.3.0",
     "react-lazy-with-preload": "^2.2.1",
     "react-use-measure": "^2.1.1",
     "stopword": "^2.0.8",

diff --git a/apps/gnocchi/web/src/App.tsx b/apps/gnocchi/web/src/App.tsx
@@ -1,31 +1,17 @@
-import classNames from 'classnames';
-import { Suspense, useLayoutEffect, useState } from 'react';
-import { Toaster } from 'react-hot-toast';
-import { Pages } from './pages/Pages.jsx';
-import { Provider as GroceriesProvider } from './stores/groceries/Provider.jsx';
-import { IconSpritesheet } from '@a-type/ui/components/icon';
 import { ReloadButton } from '@/components/sync/ReloadButton.jsx';
 import { GlobalLoader } from '@/GlobalLoader.jsx';
-import { useVisualViewportOffset } from '@a-type/ui/hooks';
 import { ErrorBoundary } from '@a-type/ui/components/errorBoundary';
-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 { AppPreviewNotice, Provider } from '@biscuits/client';
-import { graphqlClient } from './graphql.js';
-import { groceriesDescriptor } from './stores/groceries/index.js';
+import { Provider as UIProvider } from '@a-type/ui/components/provider';
+import { H1, P } from '@a-type/ui/components/typography';
+import { Provider } from '@biscuits/client';
+import classNames from 'classnames';
+import { Suspense } from 'react';
 import { AppMoved } from './components/promotional/AppMoved.jsx';
+import { Pages } from './pages/Pages.jsx';
+import { groceriesDescriptor } from './stores/groceries/index.js';
+import { Provider as GroceriesProvider } from './stores/groceries/Provider.jsx';
 
 export function App() {
-  useLayoutEffect(() => {
-    if (typeof window !== 'undefined') {
-      document.body.className = 'theme-lemon';
-    }
-  }, []);
-
-  useVisualViewportOffset();
-
   return (
     <div
       className={classNames(
@@ -34,26 +20,19 @@ export function App() {
       )}
     >
       <ErrorBoundary fallback={<ErrorFallback />}>
-        <TooltipProvider>
+        <UIProvider>
           <Suspense fallback={<GlobalLoader />}>
             <Provider
-              graphqlClient={graphqlClient}
               appId="gnocchi"
               storeDescriptor={groceriesDescriptor as any}
             >
               <GroceriesProvider>
-                <ParticleLayer>
-                  <AppPreviewNotice />
-                  <Pages />
-                  <Toaster position="top-center" containerClassName="mt-1" />
-                  <IconSpritesheet />
-                  <GlobalSyncingIndicator />
-                  <AppMoved />
-                </ParticleLayer>
+                <Pages />
+                <AppMoved />
               </GroceriesProvider>
             </Provider>
           </Suspense>
-        </TooltipProvider>
+        </UIProvider>
       </ErrorBoundary>
     </div>
   );

diff --git a/apps/gnocchi/web/src/components/foods/FoodNamesEditor.tsx b/apps/gnocchi/web/src/components/foods/FoodNamesEditor.tsx
@@ -16,7 +16,7 @@ import {
 } from '@a-type/ui/components/forms';
 import { Cross2Icon, PlusIcon } from '@radix-ui/react-icons';
 import { useState } from 'react';
-import { toast } from 'react-hot-toast';
+import { toast } from '@a-type/ui';
 
 export interface FoodNamesEditorProps {
   names: FoodAlternateNames;

diff --git a/apps/gnocchi/web/src/components/promotional/AppMoved.tsx b/apps/gnocchi/web/src/components/promotional/AppMoved.tsx
@@ -15,7 +15,7 @@ import {
 } from '@biscuits/client';
 import { Link } from '@verdant-web/react-router';
 import { Icon } from '@a-type/ui/components/icon';
-import { toast } from 'react-hot-toast';
+import { toast } from '@a-type/ui';
 import { Button } from '@a-type/ui/components/button';
 import { ExportDataButton } from '@biscuits/client/storage';
 

diff --git a/apps/gnocchi/web/src/components/recipes/cook/CookingActionBar.tsx b/apps/gnocchi/web/src/components/recipes/cook/CookingActionBar.tsx
@@ -34,7 +34,7 @@ import {
   PopoverTrigger,
 } from '@a-type/ui/components/popover';
 import { Note } from '@a-type/ui/components/note';
-import { HOME_ORIGIN } from 'node_modules/@biscuits/client/src/config.js';
+import { CONFIG } from '@biscuits/client';
 
 export interface CookingActionBarProps {
   recipe: Recipe;
@@ -130,7 +130,7 @@ function AddChefsAction() {
               device sync, grocery collaboration, and web recipe scanning.
             </p>
             <p>
-              <TextLink newTab to={`${HOME_ORIGIN}/join`}>
+              <TextLink newTab to={`${CONFIG.HOME_ORIGIN}/join`}>
                 Learn more about subscription features.
               </TextLink>
             </p>

diff --git a/apps/gnocchi/web/src/components/recipes/viewer/RecipePublishControl.tsx b/apps/gnocchi/web/src/components/recipes/viewer/RecipePublishControl.tsx
@@ -22,7 +22,7 @@ import {
 import { Recipe } from '@gnocchi.biscuits/verdant';
 import { format } from 'date-fns/esm';
 import { useState } from 'react';
-import { toast } from 'react-hot-toast';
+import { toast } from '@a-type/ui';
 
 export interface RecipePublishControlProps {
   recipe: Recipe;

diff --git a/apps/gnocchi/web/src/graphql.ts b/apps/gnocchi/web/src/graphql.ts
diff --git a/apps/gnocchi/web/src/pages/PlanPage.tsx b/apps/gnocchi/web/src/pages/PlanPage.tsx
@@ -29,7 +29,7 @@ import { ArrowRightIcon } from '@radix-ui/react-icons';
 import { ReactNode, useEffect } from 'react';
 import { groceriesDescriptor } from '@/stores/groceries/index.js';
 import { AutoRestoreScroll } from '@/components/nav/AutoRestoreScroll.jsx';
-import { toast } from 'react-hot-toast';
+import { toast } from '@a-type/ui';
 
 const contents = {
   offline: OfflineContents,

diff --git a/apps/gnocchi/web/src/stores/groceries/index.ts b/apps/gnocchi/web/src/stores/groceries/index.ts
@@ -1,6 +1,6 @@
 import { pickBestNameMatch } from '@/components/foods/lookup.jsx';
 import { groceriesState } from '@/components/groceries/state.js';
-import { graphqlClient } from '@/graphql.js';
+import { graphqlClient } from '@biscuits/client';
 import { getVerdantSync, graphql, VerdantContext } from '@biscuits/client';
 import { parseIngredient } from '@gnocchi.biscuits/conversion';
 import { depluralize } from '@gnocchi.biscuits/conversion';
@@ -24,7 +24,7 @@ import { useSearchParams } from '@verdant-web/react-router';
 import cuid from 'cuid';
 import pluralize from 'pluralize';
 import { useCallback } from 'react';
-import { toast } from 'react-hot-toast';
+import { toast } from '@a-type/ui';
 import { getScannedRecipe } from './scanRecipe.js';
 
 export interface Presence {

diff --git a/apps/gnocchi/web/src/stores/groceries/scanRecipe.ts b/apps/gnocchi/web/src/stores/groceries/scanRecipe.ts
@@ -2,13 +2,13 @@ import {
   graphql,
   isClientError,
   showSubscriptionPromotion,
+  graphqlClient,
 } from '@biscuits/client';
 import { detailedInstructionsToDoc, instructionsToDoc } from '@/lib/tiptap.js';
 import { BiscuitsError } from '@biscuits/error';
 import { lookupUnit, parseIngredient } from '@gnocchi.biscuits/conversion';
-import { graphqlClient } from '@/graphql.js';
 import { RecipeInit, Client } from '@gnocchi.biscuits/verdant';
-import { toast } from 'react-hot-toast';
+import { toast } from '@a-type/ui';
 
 const recipeScanQuery = graphql(`
   query RecipeScan($input: RecipeScanInput!) {
@@ -82,7 +82,7 @@ export async function getScannedRecipe(
             comments: [...(i.comments ?? [])],
             text: i.original,
             note: i.note,
-            isSectionHeader: i.isSectionHeader,
+            isSectionHeader: i.isSectionHeader ?? undefined,
           };
         });
       } else if (scanned.rawIngredients?.length) {

diff --git a/apps/marginalia/web/package.json b/apps/marginalia/web/package.json
@@ -4,12 +4,12 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "app-dev": "vite --open --serve",
+    "app-dev": "vite --host --open",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@a-type/ui": "0.8.20",
+    "@a-type/ui": "0.8.21",
     "@a-type/utils": "1.1.0",
     "@biscuits/client": "workspace:*",
     "@marginalia.biscuits/verdant": "workspace:*",
@@ -19,7 +19,6 @@
     "classnames": "^2.5.0",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-hot-toast": "^2.4.1",
     "unocss": "0.60.3",
     "valtio": "^1.13.2",
     "workbox-core": "^7.1.0",

diff --git a/apps/marginalia/web/src/App.tsx b/apps/marginalia/web/src/App.tsx
@@ -1,25 +1,15 @@
-import { clientDescriptor, hooks } from '@/store.js';
-import { ReactNode, Suspense, useLayoutEffect } from 'react';
 import { Pages } from '@/pages/Pages.jsx';
-import { useVisualViewportOffset } from '@a-type/ui/hooks';
-import { Toaster } from 'react-hot-toast';
-import { IconSpritesheet } from '@a-type/ui/components/icon';
+import { clientDescriptor, hooks } from '@/store.js';
 import { ErrorBoundary } from '@a-type/ui/components/errorBoundary';
-import { TooltipProvider } from '@a-type/ui/components/tooltip';
-import { ParticleLayer } from '@a-type/ui/components/particles';
-import { PrereleaseWarning, ReloadButton } from '@biscuits/client';
+import { Provider as UIProvider } from '@a-type/ui/components/provider';
 import { H1, P } from '@a-type/ui/components/typography';
-import {
-  useCanSync,
-  Provider,
-  createGraphQLClient,
-  AppPreviewNotice,
-} from '@biscuits/client';
-import { QueryClientProvider, QueryClient } from '@tanstack/react-query';
+import { useVisualViewportOffset } from '@a-type/ui/hooks';
+import { Provider, ReloadButton, useCanSync } from '@biscuits/client';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { ReactNode, Suspense, useLayoutEffect } from 'react';
 
 export interface AppProps {}
 
-const graphqlClient = createGraphQLClient();
 const queryClient = new QueryClient({
   defaultOptions: {
     queries: {
@@ -39,30 +29,20 @@ export function App({}: AppProps) {
 
   return (
     <ErrorBoundary fallback={<ErrorFallback />}>
-      <TooltipProvider>
+      <UIProvider>
         <Suspense>
           <Provider
             appId="marginalia"
-            graphqlClient={graphqlClient}
             storeDescriptor={clientDescriptor as any}
           >
             <VerdantProvider>
               <QueryClientProvider client={queryClient}>
-                <ParticleLayer>
-                  <AppPreviewNotice />
-                  <PrereleaseWarning />
-                  <Pages />
-                  <Toaster
-                    position="bottom-center"
-                    containerClassName="mb-10 sm:mb-0"
-                  />
-                  <IconSpritesheet />
-                </ParticleLayer>
+                <Pages />
               </QueryClientProvider>
             </VerdantProvider>
           </Provider>
         </Suspense>
-      </TooltipProvider>
+      </UIProvider>
     </ErrorBoundary>
   );
 }

diff --git a/apps/marginalia/web/src/components/nav/TopLoader.tsx b/apps/marginalia/web/src/components/nav/TopLoader.tsx
diff --git a/apps/marginalia/web/src/pages/Pages.tsx b/apps/marginalia/web/src/pages/Pages.tsx
@@ -6,7 +6,6 @@ import { Spinner } from '@a-type/ui/components/spinner';
 import { lazy, useCallback, Suspense } from 'react';
 import { updateApp, updateState } from '@/updateState.js';
 import { Link } from '@verdant-web/react-router';
-import { TopLoader } from '@/components/nav/TopLoader.jsx';
 import { Button } from '@a-type/ui/components/button';
 import { ReloadButton } from '@biscuits/client';
 import { PageRoot } from '@a-type/ui/components/layouts';
@@ -47,7 +46,6 @@ export function Pages() {
     <ErrorBoundary fallback={(props) => <ErrorFallback {...props} />}>
       <Suspense fallback={<Spinner />}>
         <Router routes={routes} onNavigate={handleNavigate}>
-          <TopLoader />
           <PageRoot>
             <Outlet />
           </PageRoot>

diff --git a/apps/star-chart/web/index.html b/apps/star-chart/web/index.html
@@ -39,7 +39,7 @@
     <meta name="apple-mobile-web-app-capable" content="yes" />
   </head>
 
-  <body>
+  <body class="theme-lemon">
     <div id="root"></div>
     <script type="module" src="/src/main.tsx"></script>
   </body>

diff --git a/apps/star-chart/web/package.json b/apps/star-chart/web/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@a-type/ui": "0.8.20",
+    "@a-type/ui": "0.8.21",
     "@a-type/utils": "1.1.2",
     "@biscuits/client": "workspace:*",
     "@react-spring/web": "^9.7.3",
@@ -21,7 +21,6 @@
     "raf": "^3.4.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-hot-toast": "^2.4.1",
     "react-hotkeys-hook": "^4.5.0",
     "rete": "^2.0.3",
     "rete-area-plugin": "^2.0.4",