Fixed analytics errors

Author: jzongker

src/ControlPanel.tsx

@@ -8,7 +8,8 @@ import { Login } from "./Login";
 import { Authenticated } from "./Authenticated";
 import { Logout } from "./Logout";
 import { type ErrorLogInterface, type ErrrorAppDataInterface } from "@churchapps/helpers";
-import { AnalyticsHelper, UserHelper, ErrorHelper } from "@churchapps/apphelper";
+import { AnalyticsHelper } from "./helpers";
+import { UserHelper, ErrorHelper } from "@churchapps/apphelper";
 import { UI } from "./ui/Test";
 import { Pingback } from "./Pingback";
 

src/Login.tsx

@@ -51,6 +51,7 @@ export const Login: React.FC = () => {
         handleRedirect={handleRedirect}
         defaultEmail={process.env.REACT_APP_STAGE === "demo" ? "demo@chums.org" : undefined}
         defaultPassword={process.env.REACT_APP_STAGE === "demo" ? "password" : undefined}
+        showFooter={true}
       />
     </div>
 

src/helpers/AnalyticsHelper.ts

@@ -0,0 +1,32 @@
+import ReactGA4 from "react-ga4";
+import { CommonEnvironmentHelper, UserHelper } from "@churchapps/helpers";
+
+export class AnalyticsHelper {
+
+  static init = () => {
+    if (CommonEnvironmentHelper.GoogleAnalyticsTag !== "" && typeof(window)!=="undefined") {
+      ReactGA4.initialize(CommonEnvironmentHelper.GoogleAnalyticsTag);
+      AnalyticsHelper.logPageView();
+    }
+  }
+
+  static logPageView = () => {
+    if (CommonEnvironmentHelper.GoogleAnalyticsTag !== "" && typeof(window)!=="undefined") {
+      this.setChurchKey();
+      ReactGA4.send({ hitType: "pageview", page: window.location.pathname + window.location.search });
+    }
+  }
+
+  static logEvent = (category: string, action: string, label?:string) => {
+    if (CommonEnvironmentHelper.GoogleAnalyticsTag !== "" && typeof(window)!=="undefined") {
+      this.setChurchKey();
+      ReactGA4.event({ category, action, label });
+    }
+  }
+
+  private static setChurchKey = () => {
+    const churchKey = UserHelper?.currentUserChurch?.church?.subDomain;
+    if (churchKey) ReactGA4.set({church_key: churchKey });
+  }
+
+}

src/helpers/index.ts

@@ -2,13 +2,14 @@ export * from "./Interfaces";
 
 // AppHelper imports (for person components)
 export {
-  ApiHelper, ArrayHelper, CurrencyHelper, DateHelper, PersonHelper, UniqueIdHelper, AnalyticsHelper, ErrorHelper, CommonEnvironmentHelper, Locale, UserHelper 
+  ApiHelper, ArrayHelper, CurrencyHelper, DateHelper, PersonHelper, UniqueIdHelper, ErrorHelper, CommonEnvironmentHelper, Locale, UserHelper 
 } from "@churchapps/apphelper";
 
 // Donation helper from donations package
 export { DonationHelper } from "@churchapps/apphelper-donations";
 
 // Local helpers
+export { AnalyticsHelper } from "./AnalyticsHelper";
 export { ChumsPersonHelper } from "./ChumsPersonHelper";
 export { ConditionHelper } from "./ConditionHelper";
 export { EnvironmentHelper } from "./EnvironmentHelper";