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

a-type · Aug 24, 2024 · 851e267 · 851e267
2 parents 7a70d82 + 393797d
commit 851e267
Show file tree

Hide file tree

Showing 29 changed files with 229 additions and 79 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": "^1.1.10",
+    "@a-type/ui": "^1.1.14",
     "@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": "^1.1.10",
+    "@a-type/ui": "^1.1.14",
     "@a-type/utils": "^1.0.8",
     "@biscuits/client": "workspace:*",
     "@biscuits/error": "workspace:*",

diff --git a/apps/gnocchi/web/src/App.tsx b/apps/gnocchi/web/src/App.tsx
@@ -20,7 +20,7 @@ export function App() {
       )}
     >
       <ErrorBoundary fallback={<ErrorFallback />}>
-        <UIProvider>
+        <UIProvider disableViewportOffset>
           <Suspense fallback={<GlobalLoader />}>
             <Provider
               appId="gnocchi"

diff --git a/apps/gnocchi/web/src/components/groceries/GroceryEmptyContent.tsx b/apps/gnocchi/web/src/components/groceries/GroceryEmptyContent.tsx
@@ -5,7 +5,7 @@ import { InfrequentSubscriptionHint, InstallHint } from '@biscuits/client';
 
 export function GroceryEmptyContent() {
   return (
-    <div className="flex flex-col p-4 gap-6 select-none animate-fade-in-up animate-duration-500">
+    <div className="flex flex-col p-4 gap-6 select-none">
       <div className="flex flex-col items-center justify-center flex-grow-1 text-center color-gray7 italic text-sm gap-3 p-4">
         <Cart
           width="15vmax"

diff --git a/apps/gnocchi/web/uno.config.ts b/apps/gnocchi/web/uno.config.ts
@@ -4,20 +4,21 @@ import variantGroup from '@unocss/transformer-variant-group';
 import presetAglio from '@a-type/ui/uno-preset';
 
 export default defineConfig({
-	presets: [presetAglio()],
-	transformers: [variantGroup()],
-	preflights: [
-		{
-			getCSS: () => `
+  presets: [presetAglio()],
+  transformers: [variantGroup()],
+  preflights: [
+    {
+      getCSS: () => `
 			html, body, #root {
 				display: flex;
 				flex-direction: column;
+				overscroll-behavior: none;
 			}
 
 			#root {
 				flex: 1;
 			}
 		`,
-		},
-	],
+    },
+  ],
 });
diff --git a/apps/gnocchi/web/vite.config.ts b/apps/gnocchi/web/vite.config.ts
@@ -23,6 +23,7 @@ export default defineConfig(({ command, mode }) => ({
         description: 'Your grocery list, done better.',
         theme_color: '#fdfdff',
         background_color: '#fdfdff',
+        scope: 'https://gnocchi.biscuits.club/',
         icons: [
           {
             src: 'android-chrome-192x192.png',

diff --git a/apps/humding/web/package.json b/apps/humding/web/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@a-type/ui": "1.1.10",
+    "@a-type/ui": "1.1.14",
     "@a-type/utils": "1.1.3",
     "@biscuits/client": "workspace:*",
     "@humding.biscuits/verdant": "workspace:*",

diff --git a/apps/humding/web/vite.config.ts b/apps/humding/web/vite.config.ts
@@ -25,6 +25,7 @@ export default defineConfig(({ command, mode }) => ({
         icons: icons(),
         categories: [],
         display: 'standalone',
+        scope: 'https://humding.biscuits.club/',
         start_url: '/?directLaunch=true',
       } as any,
       includeAssets: ['fonts/**/*', 'images/**/*'],

diff --git a/apps/marginalia/web/package.json b/apps/marginalia/web/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@a-type/ui": "1.1.10",
+    "@a-type/ui": "1.1.14",
     "@a-type/utils": "1.1.0",
     "@biscuits/client": "workspace:*",
     "@marginalia.biscuits/verdant": "workspace:*",

diff --git a/apps/marginalia/web/vite.config.ts b/apps/marginalia/web/vite.config.ts
@@ -25,6 +25,7 @@ export default defineConfig(({ command, mode }) => ({
         icons: icons(),
         categories: [],
         display: 'standalone',
+        scope: 'https://marginalia.biscuits.club/',
         start_url: '/?directLaunch=true',
       } as any,
       includeAssets: ['fonts/**/*', 'images/**/*'],

diff --git a/apps/palette/web/package.json b/apps/palette/web/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@a-type/ui": "1.1.10",
+    "@a-type/ui": "1.1.14",
     "@a-type/utils": "1.1.3",
     "@biscuits/client": "workspace:*",
     "@palette.biscuits/verdant": "workspace:*",

diff --git a/apps/palette/web/vite.config.ts b/apps/palette/web/vite.config.ts
@@ -26,6 +26,7 @@ export default defineConfig(({ command, mode }) => ({
         icons: icons(),
         categories: [],
         display: 'standalone',
+        scope: 'https://palette.biscuits.club/',
         start_url: '/?directLaunch=true',
       } as any,
       includeAssets: ['fonts/**/*', 'images/**/*'],

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": "1.1.10",
+    "@a-type/ui": "1.1.14",
     "@a-type/utils": "1.1.2",
     "@biscuits/client": "workspace:*",
     "@react-spring/web": "^9.7.3",

diff --git a/apps/star-chart/web/vite.config.ts b/apps/star-chart/web/vite.config.ts
@@ -25,6 +25,7 @@ export default defineConfig(({ command, mode }) => ({
         icons: icons(),
         categories: [],
         display: 'standalone',
+        scope: 'https://star-chart.biscuits.club/',
         start_url: '/?directLaunch=true',
       } as any,
       includeAssets: ['fonts/**/*', 'images/**/*'],

diff --git a/apps/trip-tick/web/package.json b/apps/trip-tick/web/package.json
@@ -4,12 +4,12 @@
   "private": true,
   "type": "module",
   "scripts": {
-    "app-dev": "vite",
+    "app-dev": "vite --host",
     "build": "vite build",
     "preview": "vite preview"
   },
   "dependencies": {
-    "@a-type/ui": "^1.1.10",
+    "@a-type/ui": "^1.1.14",
     "@a-type/utils": "^1.0.6",
     "@biscuits/client": "workspace:*",
     "@radix-ui/react-progress": "^1.0.3",

diff --git a/apps/trip-tick/web/src/App.tsx b/apps/trip-tick/web/src/App.tsx
@@ -10,7 +10,7 @@ export function App() {
   return (
     <div className="flex flex-col flex-1 w-full h-full">
       <Suspense fallback={<FullScreenSpinner />}>
-        <UIProvider>
+        <UIProvider disableViewportOffset>
           <Provider appId="trip-tick" storeDescriptor={clientDescriptor as any}>
             <LofiProvider>
               <Pages />

diff --git a/apps/trip-tick/web/vite.config.ts b/apps/trip-tick/web/vite.config.ts
@@ -25,6 +25,7 @@ export default defineConfig(({ command, mode }) => ({
         icons: icons(),
         categories: [],
         display: 'standalone',
+        scope: 'https://trip-tick.biscuits.club/',
         start_url: '/?directLaunch=true',
       } as any,
       includeAssets: ['fonts/**/*', 'images/**/*'],

diff --git a/apps/wish-wash/hub/package.json b/apps/wish-wash/hub/package.json
@@ -20,7 +20,7 @@
     "typecheck": "tsc --build tsconfig.json"
   },
   "dependencies": {
-    "@a-type/ui": "1.1.10",
+    "@a-type/ui": "^1.1.14",
     "@a-type/utils": "^1.0.8",
     "@biscuits/client": "workspace:*",
     "@wish-wash.biscuits/common": "workspace:*",

diff --git a/apps/wish-wash/web/package.json b/apps/wish-wash/web/package.json
@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@a-type/ui": "1.1.10",
+    "@a-type/ui": "1.1.14",
     "@a-type/utils": "1.1.3",
     "@biscuits/client": "workspace:*",
     "@dnd-kit/core": "^6.1.0",

diff --git a/apps/wish-wash/web/src/App.tsx b/apps/wish-wash/web/src/App.tsx
@@ -12,7 +12,7 @@ export interface AppProps {}
 export function App({}: AppProps) {
   return (
     <ErrorBoundary fallback={<ErrorFallback />}>
-      <UIProvider toastContainerClassName="mb-10 sm:mb-0">
+      <UIProvider toastContainerClassName="mb-10 sm:mb-0" disableViewportOffset>
         <Suspense>
           <Provider appId="wish-wash" storeDescriptor={clientDescriptor as any}>
             <VerdantProvider>

diff --git a/apps/wish-wash/web/vite.config.ts b/apps/wish-wash/web/vite.config.ts
@@ -26,6 +26,7 @@ export default defineConfig(({ command, mode }) => ({
         categories: [],
         display: 'standalone',
         start_url: '/',
+        scope: 'https://wish-wash.biscuits.club/',
         share_target: {
           action: '/share',
           method: 'POST',

diff --git a/blog/package.json b/blog/package.json
@@ -10,7 +10,7 @@
     "astro": "astro"
   },
   "dependencies": {
-    "@a-type/ui": "^1.1.10",
+    "@a-type/ui": "^1.1.14",
     "@astrojs/check": "^0.5.10",
     "@astrojs/mdx": "^2.3.1",
     "@astrojs/rss": "^4.0.5",

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -75,7 +75,7 @@
     "vite-plugin-pwa": "0.19.2"
   },
   "devDependencies": {
-    "@a-type/ui": "^1.1.10",
+    "@a-type/ui": "^1.1.14",
     "@types/react": "18.3.3",
     "@unocss/transformer-variant-group": "^0.58.0",
     "@verdant-web/react-router": "0.6.4",

diff --git a/packages/client/src/components/Explainer.tsx b/packages/client/src/components/Explainer.tsx
@@ -28,8 +28,8 @@ export function Explainer({ stages }: ExplainerProps) {
       }}
     >
       <DialogContent
-        outerClassName="h-screen max-h-none sm:(h-auto max-h-[80vh]) overflow-y-auto"
-        className="h-screen sm:h-auto"
+        outerClassName="h-screen max-h-90vh sm:(h-auto max-h-[80vh]) overflow-y-auto"
+        className="h-full sm:h-auto"
       >
         <div className="col gap-4 flex-1 items-start">{stages[stage]}</div>
         <DialogActions>