From 289839d1098f06c1fdf819cf94641fe320cc7463 Mon Sep 17 00:00:00 2001 From: Sherange Date: Thu, 21 Mar 2024 19:03:03 +0530 Subject: [PATCH] changes --- micro-service/package.json | 3 +- micro-service/public/index.html | 56 +++++++++++++++++++-------------- micro-service/src/App.js | 24 +++++++------- 3 files changed, 45 insertions(+), 38 deletions(-) diff --git a/micro-service/package.json b/micro-service/package.json index cd0f8e6f..370147fb 100644 --- a/micro-service/package.json +++ b/micro-service/package.json @@ -13,13 +13,13 @@ "@apollosproject/web-shared": "link:../packages/web-shared", "@babel/preset-react": "^7.22.5", "@craco/craco": "^7.0.0", - "@phosphor-icons/react": "^2.0.15", "@segment/analytics-next": "^1.62.0", "@sentry/react": "^7.40.0", "@styled-system/theme-get": "^5.1.2", "@testing-library/jest-dom": "^5.11.4", "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^12.1.10", + "@phosphor-icons/react": "2.0.15", "algoliasearch": "^4.17.0", "amplitude-js": "^8.21.9", "apollo-upload-client": "^17.0.0", @@ -36,7 +36,6 @@ "prop-types": "^15.8.1", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-helmet-async": "^2.0.4", "react-image-crop": "^10.0.11", "react-instantsearch-dom": "^6.40.0", "react-instantsearch-hooks-web": "^6.44.0", diff --git a/micro-service/public/index.html b/micro-service/public/index.html index f8112976..bffdf834 100644 --- a/micro-service/public/index.html +++ b/micro-service/public/index.html @@ -1,18 +1,19 @@ - - - - - - - - - - - Apollos Web Embeds - - - - - - - - - -
- - - + + + \ No newline at end of file diff --git a/micro-service/src/App.js b/micro-service/src/App.js index 7e71241b..8e5ccb3a 100644 --- a/micro-service/src/App.js +++ b/micro-service/src/App.js @@ -11,7 +11,6 @@ import Styled from './App.styles'; import ErrorPage from './error-page'; import { parseSlugToIdAndType } from '@apollosproject/web-shared/utils'; -import { Helmet, HelmetProvider } from 'react-helmet-async'; Sentry.init({ dsn: process.env.REACT_APP_SENTRY_DSN, @@ -31,6 +30,14 @@ function ChurchLogo(props) { function App(props) { let subdomain = 'cedar_creek'; + // let subdomain = + // process.env.NODE_ENV === 'production' + // ? window.location.hostname.split('.').slice(0, -2).join('.') + // : window.location.hostname.split('.').slice(0, -1).join('.'); + + // if (process.env.NODE_ENV !== 'production' && !subdomain) { + // subdomain = 'apollos-demo'; + // } const churchSlug = subdomain.replace(/-/g, '_'); const searchParams = new URLSearchParams(window.location.search); const _root = searchParams.get('root'); @@ -52,17 +59,10 @@ function App(props) { // Widgets require a church slug to get the correct data if (churchSlug) { return ( - - - - Test title - - - - - - - + + + + ); }