diff --git a/.eslintrc.json b/.eslintrc.json
index 86532d85..f9f1f781 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -13,6 +13,7 @@
"globals": {
"React": true
},
+
"rules": {
"no-use-before-define": [
"warn",
diff --git a/middleware.js b/middleware.js
index 105ef110..0d15c06e 100644
--- a/middleware.js
+++ b/middleware.js
@@ -95,6 +95,6 @@ export async function middleware(request) {
export const config = {
matcher: [
- "/((?!api/action|api/signup|api/signin|api/reset-password|api/provider-details|idp-auth|api/sign-in-with-idp|privacy-policy|terms-of-use|favicon.ico|_next/image|_next/static|static|validate-token).*)",
+ "/((?!api/action|api/signup|api/signin|api/reset-password|api/provider-details|idp-auth|api/sign-in-with-idp|privacy-policy|cookie-policy|terms-of-use|favicon.ico|_next/image|_next/static|static|validate-token).*)",
],
};
diff --git a/pages/_app.js b/pages/_app.js
index 3f346d2b..066aa071 100644
--- a/pages/_app.js
+++ b/pages/_app.js
@@ -24,6 +24,9 @@ import EnvironmentTypeProvider from "src/context/EnvironmentTypeProvider";
import { ENVIRONMENT_TYPES } from "src/constants/environmentTypes";
import { PAGE_TITLE_MAP } from "src/constants/pageTitleMap";
import Head from "next/head";
+import CookieConsentProvider from "src/context/cookieConsentContext";
+import { getProviderOrgDetails } from "src/server/api/customer-user";
+import OrgDetailsProvider from "src/context/OrgDetailsProvider";
NProgress.configure({
trickleSpeed: 50,
@@ -173,7 +176,15 @@ export default function App(props) {
theme={isDashboardRoute ? dashboardTheme : nonDashboardTheme}
>
-
+
+
+
+
+
@@ -196,6 +207,23 @@ export default function App(props) {
}
App.getInitialProps = async () => {
+ let orgName = "";
+ let orgLogoURL = "";
+ let orgSupportEmail = "";
+
+ try {
+ await getProviderOrgDetails().then((response) => {
+ orgName = response.data.orgName;
+ orgLogoURL = response.data.orgLogoURL;
+ orgSupportEmail = response.data.orgSupportEmail || response.data.email;
+ });
+ } catch (err) {}
+
//check for environment type in environment variables, default to prod
- return { envType: process.env.ENVIRONMENT_TYPE || ENVIRONMENT_TYPES.PROD };
+ return {
+ envType: process.env.ENVIRONMENT_TYPE || ENVIRONMENT_TYPES.PROD,
+ orgName,
+ orgLogoURL,
+ orgSupportEmail,
+ };
};
diff --git a/pages/_document.js b/pages/_document.js
index c9bdf830..01db7a1c 100644
--- a/pages/_document.js
+++ b/pages/_document.js
@@ -2,13 +2,13 @@ import * as React from "react";
import Document, { Html, Head, Main, NextScript } from "next/document";
import createEmotionServer from "@emotion/server/create-instance";
import createEmotionCache from "../src/createEmotionCache";
-import Script from "next/script";
+// import Script from "next/script";
export default class MyDocument extends Document {
render() {
return (
- {process.env.GOOGLE_ANALYTICS_TAG_ID && (
+ {/* {process.env.GOOGLE_ANALYTICS_TAG_ID && (