Merge branch 'dev' into main

chuckdries · chuckdries · commit 71ae7b3cd03e · 2022-08-15T12:35:08.000-07:00
diff --git a/client/index.html b/client/index.html
@@ -44,7 +44,7 @@
       async
       defer
       data-domain="buzzwords.gg"
-      src="https://analytics.chuckdries.com/js/plausible.js"
+      src="https://analytics.chuckdries.com/js/plausible.local.js"
     ></script>
   </head>
   <body>
diff --git a/client/src/features/canvas/Wrap3d.tsx b/client/src/features/canvas/Wrap3d.tsx
@@ -46,6 +46,11 @@ const Wrap3d = ({ children }: { children: ReactNode }) => {
           setZoom(groupRef.current, width, height, boundingBox, camera);
         }
       }, 10);
+      setTimeout(() => {
+        if (groupRef.current) {
+          setZoom(groupRef.current, width, height, boundingBox, camera);
+        }
+      }, 200);
     }
   }, [progress, width, height, groupRef, boundingBox, camera]);
   return (
diff --git a/client/src/features/settings/settingsActions.ts b/client/src/features/settings/settingsActions.ts
@@ -25,6 +25,13 @@ export const getColorSchemeSetting = () =>
 export const setColorSchemeSetting =
   (scheme: ColorScheme): AppThunk =>
   (dispatch) => {
+    try {
+      window.plausible?.("PickScheme", {
+        props: { scheme },
+      });
+    } catch (e) {
+      // do nothing
+    }
     localStorage.setItem("colorScheme", scheme);
     dispatch(setColorScheme(scheme));
   };
@@ -35,6 +42,13 @@ export const getPreferredDarkThemeSetting = () =>
 export const setPreferredDarkThemeSetting =
   (preferredDarkTheme: ThemeNames): AppThunk =>
   (dispatch) => {
+    try {
+      window.plausible?.("PickDarkTheme", {
+        props: { preferredDarkTheme },
+      });
+    } catch (e) {
+      // do nothing
+    }
     localStorage.setItem("preferredDarkTheme", preferredDarkTheme);
     dispatch(setPreferredDarkTheme(preferredDarkTheme));
   };
diff --git a/client/src/global.d.ts b/client/src/global.d.ts
@@ -0,0 +1,3 @@
+declare interface Window {
+  plausible?: any;
+}

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,11 @@ const Wrap3d = ({ children }: { children: ReactNode }) => {`
`46`	`46`	`setZoom(groupRef.current, width, height, boundingBox, camera);`
`47`	`47`	`}`
`48`	`48`	`}, 10);`
	`49`	`+ setTimeout(() => {`
	`50`	`+ if (groupRef.current) {`
	`51`	`+ setZoom(groupRef.current, width, height, boundingBox, camera);`
	`52`	`+ }`
	`53`	`+ }, 200);`
`49`	`54`	`}`
`50`	`55`	`}, [progress, width, height, groupRef, boundingBox, camera]);`
`51`	`56`	`return (`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+declare interface Window {`
	`2`	`+ plausible?: any;`
	`3`	`+}`