From dd08fd777eeab867eee5fc69769f2e10bb3fea04 Mon Sep 17 00:00:00 2001 From: "Babanazar Kamyljanov [SSW]" <138548013+babakamyljanovssw@users.noreply.github.com> Date: Mon, 25 Nov 2024 08:33:02 +0800 Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Upgraded=20latest=20rules?= =?UTF-8?q?=20widget=20package=20(#704)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * upgraded widget package * added new env variable * refactored widget component --- .env.template | 3 ++- .github/workflows/template-build.yml | 1 + package.json | 2 +- src/templates/person.js | 8 +++++++- yarn.lock | 10 +++++----- 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.env.template b/.env.template index 6d13163..28fd233 100644 --- a/.env.template +++ b/.env.template @@ -1,3 +1,4 @@ +SITE_URL=#{SITE_URL} GOOGLE_GTM_ID=#{GOOGLE_GTM_ID} GOOGLE_ANALYTICS=#{GOOGLE_ANALYTICS} YOUTUBE_API_KEY=#{YOUTUBE_API_KEY} @@ -11,4 +12,4 @@ CRM_APP_SECRET=#{CRM_APP_SECRET} CRM_SCOPE=#{CRM_SCOPE} CRM_VIEW_CURRENT=#{CRM_VIEW_CURRENT} CRM_VIEW_PAST=#{CRM_VIEW_PAST} -APPLICATIONINSIGHTS_CONNECTION_STRING=#{APPLICATIONINSIGHTS_CONNECTION_STRING} +APPLICATIONINSIGHTS_CONNECTION_STRING=#{APPLICATIONINSIGHTS_CONNECTION_STRING} \ No newline at end of file diff --git a/.github/workflows/template-build.yml b/.github/workflows/template-build.yml index 0b0ff65..a901a5c 100644 --- a/.github/workflows/template-build.yml +++ b/.github/workflows/template-build.yml @@ -29,6 +29,7 @@ jobs: tokenSuffix: '}' files: .env.template env: + SITE_URL: ${{ vars.SITE_URL }} GOOGLE_GTM_ID: ${{ secrets.GOOGLE_GTM_ID }} GOOGLE_ANALYTICS: ${{ secrets.GOOGLE_ANALYTICS }} YOUTUBE_API_KEY: ${{ secrets.YOUTUBE_API_KEY }} diff --git a/package.json b/package.json index fe80623..aa6ae69 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "react-responsive-modal": "^6.4.2", "react-youtube": "^10.1.0", "ssw.megamenu": "^4.6.2", - "ssw.rules.widget": "^2.0.5", + "ssw.rules.widget": "^2.0.8", "stream-browserify": "^3.0.0", "stream-http": "^3.2.0", "styled-components": "^6.1.13", diff --git a/src/templates/person.js b/src/templates/person.js index 16878ce..76fdffd 100644 --- a/src/templates/person.js +++ b/src/templates/person.js @@ -68,7 +68,13 @@ const Person = ({ pageContext }) => { const [WidgetComponent, setWidgetComponent] = useState(); const initWidget = () => { - return ; + return ( + + ); }; useEffect(() => { diff --git a/yarn.lock b/yarn.lock index d24e905..b37c72e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -21477,7 +21477,7 @@ __metadata: react-responsive-modal: "npm:^6.4.2" react-youtube: "npm:^10.1.0" ssw.megamenu: "npm:^4.6.2" - ssw.rules.widget: "npm:^2.0.5" + ssw.rules.widget: "npm:^2.0.8" stream-browserify: "npm:^3.0.0" stream-http: "npm:^3.2.0" styled-components: "npm:^6.1.13" @@ -21506,9 +21506,9 @@ __metadata: languageName: node linkType: hard -"ssw.rules.widget@npm:^2.0.5": - version: 2.0.5 - resolution: "ssw.rules.widget@npm:2.0.5" +"ssw.rules.widget@npm:^2.0.8": + version: 2.0.8 + resolution: "ssw.rules.widget@npm:2.0.8" dependencies: "@tanstack/react-query": "npm:^5.14.1" date-fns: "npm:^2.30.0" @@ -21517,7 +21517,7 @@ __metadata: react-icons: "npm:^4.12.0" style-inject: "npm:^0.3.0" vite-plugin-css-injected-by-js: "npm:^3.3.0" - checksum: 10c0/1a56e610d079f59feb58c33d8de27ff38ed9b1e69b41de3b13731b6a058b81227a472ea6e84e6da5c00a1053cfb6999c33017e177ea226316d6bedecda8cb68f + checksum: 10c0/4e6e7371b3072c254f02af8809d95e9ba6ddd6c58cbe84c9c3a2ec756dd968cc9689d488427d3ced65bf230c1a8abd624b57812eb0aa8110dfaf79419508cef6 languageName: node linkType: hard