From e8375ac617d52c570898300cf377438807e316bc Mon Sep 17 00:00:00 2001 From: phaneendra <58028287+cricket-lover@users.noreply.github.com> Date: Wed, 1 Feb 2023 18:05:14 +0530 Subject: [PATCH 01/40] add route for webengage push notification --- run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run b/run index 930cb0a23..4f4500de7 100755 --- a/run +++ b/run @@ -1,6 +1,6 @@ #!/bin/bash -e -npm install +# npm install npm run compile supervisord -n -c <(cat < Date: Wed, 1 Feb 2023 18:24:21 +0530 Subject: [PATCH 02/40] update framework version --- package-lock.json | 275 +++++++++++++++++----------------------------- package.json | 2 +- 2 files changed, 104 insertions(+), 173 deletions(-) diff --git a/package-lock.json b/package-lock.json index 903de0c05..362b8b1b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.7.7", + "@quintype/framework": "^7.18.2-webengage.0", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", @@ -532,18 +532,6 @@ "@babel/core": "^7.0.0" } }, - "node_modules/@babel/helper-define-map": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.18.6.tgz", - "integrity": "sha512-XSOjXUDG7KODvtURN1p29hGHa4RFgqBQELuBowUOBt3alf2Ny/oNFJygS4yCXwM0vMoqLDjE1O7wSmocUmQ3Kg==", - "dependencies": { - "@babel/helper-function-name": "^7.18.6", - "@babel/types": "^7.18.6" - }, - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/helper-define-polyfill-provider": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.0.tgz", @@ -763,9 +751,9 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.6.tgz", - "integrity": "sha512-gvZnm1YAAxh13eJdkb9EWHBnF3eAub3XTLCZEehHT2kWxiKVRL64+ae5Y6Ivne0mVHmMYKT+xWgZO+gQhuLUBg==", + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", + "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==", "engines": { "node": ">=6.9.0" } @@ -2068,12 +2056,11 @@ } }, "node_modules/@babel/plugin-transform-property-mutators": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-mutators/-/plugin-transform-property-mutators-7.18.6.tgz", - "integrity": "sha512-30BjBu2xyai0GivUBMeFmHlFxeZtJXHcTUUrRRIZ9u0Mihk0qzREWicLUjDO/hcQOfya1I0pQ7eAcKKNt0BKug==", + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-mutators/-/plugin-transform-property-mutators-7.20.7.tgz", + "integrity": "sha512-Jq14o707UCRcGrdWa3qyA9TMoa/dMi9GfrphmwsppuZ3jxbDqRXHrQkjLN87sopIV3Zlp8SRZS48+S9ABcmC7g==", "dependencies": { - "@babel/helper-define-map": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.20.2" }, "engines": { "node": ">=6.9.0" @@ -4933,12 +4920,12 @@ "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" }, "node_modules/@quintype/amp": { - "version": "2.4.28", - "resolved": "https://registry.npmjs.org/@quintype/amp/-/amp-2.4.28.tgz", - "integrity": "sha512-LAta0Bt8fthHxORK1232kTrp516ZAJCR9ixqNmvj911bi7cP6It9eDesCDO+O4jP8rcVDqROc1ns/MZwDFGeyg==", + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/@quintype/amp/-/amp-2.9.1.tgz", + "integrity": "sha512-9DDsxP1I40u18Otm51+HXP+VAxcersYExhEQAIsIUPUPFqMpk/jr8PiTkm1U/aHhL9V7Qwa1Y7P7i0gEbZgosA==", "dependencies": { "@rvgpl/get-youtube-id": "^1.0.0", - "atob": "^2.1.2", + "atob-utf-8": "^1.0.4", "babel-preset-airbnb": "^5.0.0", "date-fns": "^2.11.0", "date-fns-tz": "^1.0.10", @@ -4959,9 +4946,9 @@ } }, "node_modules/@quintype/backend": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@quintype/backend/-/backend-2.3.1.tgz", - "integrity": "sha512-z6DVASwl+TwmTtrjqJ3G9fzakpjQaFiN74inKornAgHYlJgqP5+irgEUnmwCVg8a4UCCcWqAJams4bkA7qu2kQ==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@quintype/backend/-/backend-2.3.3.tgz", + "integrity": "sha512-tpzH5gzBvPDCK03yX0uZoHF5s/ZX6JehW9Y+xA2O0bMX88kRPtB2weu/tv7sp+vuaoU/SjgK6owHNDC/EQcXZw==", "dependencies": { "axios": "^0.21.1", "bluebird": "^3.7.2", @@ -4978,25 +4965,6 @@ "follow-redirects": "^1.14.0" } }, - "node_modules/@quintype/backend/node_modules/follow-redirects": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz", - "integrity": "sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==", - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], - "engines": { - "node": ">=4.0" - }, - "peerDependenciesMeta": { - "debug": { - "optional": true - } - } - }, "node_modules/@quintype/bridgekeeper-js": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/@quintype/bridgekeeper-js/-/bridgekeeper-js-2.8.1.tgz", @@ -5243,12 +5211,11 @@ } }, "node_modules/@quintype/components": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@quintype/components/-/components-3.0.2.tgz", - "integrity": "sha512-QhfDexSof8oU3yenG9m4SB9qKuph/qKTtz7a2dDroPDKecul/Ig/jrwRNiOpZd/Mcicwyhb2LMigIoaJf0OmWw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@quintype/components/-/components-3.3.0.tgz", + "integrity": "sha512-fNGdpvnof3MRFlbZl6d82EDekYnv4eebw1OQAyq1adR+ON1iQ1yRGUjhYLF0DYOYsXX4is8rcAnx+zDb7t1Ylw==", "dependencies": { "@babel/runtime": "^7.16.3", - "atob": "^2.1.2", "classnames": "^2.3.1", "empty-web-gif": "^1.0.1", "get-video-id": "^3.4.3", @@ -5293,14 +5260,14 @@ "integrity": "sha512-N2sYGNRaianJZJROz31vNoGo7Sd+2ElX9g+qwiOQ8/+3oJVCEOkFxVMSYT/8QQqTrWs5bmMbDyxrOleALhUMCA==" }, "node_modules/@quintype/framework": { - "version": "7.7.7", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.7.7.tgz", - "integrity": "sha512-FGIkT2PVdJBR5UbarU97kArIZBfOMUiHugELGscxM6R3yzUrP0wEzzLmqhu9caWWJ2ZD/ThFaE2E3dUhRYViXQ==", + "version": "7.18.2-webengage.0", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.0.tgz", + "integrity": "sha512-sLzMhOzwY6n9GMB3BhSY3zhhGT7j+PKFJcBhSMecLuKWQbg5u5XCZc+2GjESxvjfe3Mpp3bDwp/FJo+kbPhBXQ==", "dependencies": { "@ampproject/toolbox-optimizer": "2.8.3", - "@quintype/amp": "^2.4.28", - "@quintype/backend": "^2.3.1", - "@quintype/components": "^3.0.0", + "@quintype/amp": "^2.9.1", + "@quintype/backend": "^2.3.3", + "@quintype/components": "^3.3.0", "@quintype/prerender-node": "^3.2.26", "@quintype/seo": "^1.39.0", "atob": "^2.1.2", @@ -7051,6 +7018,17 @@ "node": ">= 4.5.0" } }, + "node_modules/atob-utf-8": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/atob-utf-8/-/atob-utf-8-1.0.4.tgz", + "integrity": "sha512-URuOY6Qtmeu51HqXgIO/osI2MAY6kiJ5WwXMo3hqTlaGn28AexlyPvJFy5fsfcpc3EgnglbaHkkDZ5ibFKWLww==", + "bin": { + "atob": "bin/atob.js" + }, + "engines": { + "node": ">= 8.0.0" + } + }, "node_modules/autocompleter": { "version": "6.1.2", "resolved": "https://registry.npmjs.org/autocompleter/-/autocompleter-6.1.2.tgz", @@ -7130,25 +7108,6 @@ "follow-redirects": "^1.14.4" } }, - "node_modules/axios/node_modules/follow-redirects": { - "version": "1.14.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", - "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==", - "funding": [ - { - "type": "individual", - "url": "https://github.com/sponsors/RubenVerborgh" - } - ], - "engines": { - "node": ">=4.0" - }, - "peerDependenciesMeta": { - "debug": { - "optional": true - } - } - }, "node_modules/babel-code-frame": { "version": "6.26.0", "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", @@ -8520,9 +8479,12 @@ } }, "node_modules/camelize": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz", - "integrity": "sha512-W2lPwkBkMZwFlPCXhIlYgxu+7gC/NUlCtdK652DAJ1JdgV0sTrvuPFshNPrFa1TY2JOkLhgdeEBplB4ezEa+xg==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz", + "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/caniuse-api": { "version": "3.0.0", @@ -9950,9 +9912,9 @@ } }, "node_modules/css-to-react-native": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.0.0.tgz", - "integrity": "sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.1.0.tgz", + "integrity": "sha512-AryfkFA29b4I3vG7N4kxFboq15DxwSXzhXM37XNEjwJMgjYIc8BcqfiprpAqX0zadI5PMByEIwAMzXxk5Vcc4g==", "dependencies": { "camelize": "^1.0.0", "css-color-keywords": "^1.0.0", @@ -13264,22 +13226,22 @@ "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==" }, "node_modules/follow-redirects": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", - "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", - "dependencies": { - "debug": "=3.1.0" - }, + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], "engines": { "node": ">=4.0" - } - }, - "node_modules/follow-redirects/node_modules/debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dependencies": { - "ms": "2.0.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } } }, "node_modules/fontfaceobserver": { @@ -27607,7 +27569,7 @@ "node_modules/stealthy-require": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", - "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", + "integrity": "sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==", "engines": { "node": ">=0.10.0" } @@ -28044,9 +28006,9 @@ "dev": true }, "node_modules/styled-components": { - "version": "5.3.5", - "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.5.tgz", - "integrity": "sha512-ndETJ9RKaaL6q41B69WudeqLzOpY1A/ET/glXkNZ2T7dPjPqpPCXXQjDFYZWwNnE5co0wX+gTCqx9mfxTmSIPg==", + "version": "5.3.6", + "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.6.tgz", + "integrity": "sha512-hGTZquGAaTqhGWldX7hhfzjnIYBZ0IXQXkCYdvF1Sq3DsUaLx6+NTHC5Jj1ooM2F68sBiVz3lvhfwQs/S3l6qg==", "hasInstallScript": true, "dependencies": { "@babel/helper-module-imports": "^7.0.0", @@ -33029,15 +32991,6 @@ "regexpu-core": "^4.7.1" } }, - "@babel/helper-define-map": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.18.6.tgz", - "integrity": "sha512-XSOjXUDG7KODvtURN1p29hGHa4RFgqBQELuBowUOBt3alf2Ny/oNFJygS4yCXwM0vMoqLDjE1O7wSmocUmQ3Kg==", - "requires": { - "@babel/helper-function-name": "^7.18.6", - "@babel/types": "^7.18.6" - } - }, "@babel/helper-define-polyfill-provider": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.0.tgz", @@ -33200,9 +33153,9 @@ } }, "@babel/helper-plugin-utils": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.6.tgz", - "integrity": "sha512-gvZnm1YAAxh13eJdkb9EWHBnF3eAub3XTLCZEehHT2kWxiKVRL64+ae5Y6Ivne0mVHmMYKT+xWgZO+gQhuLUBg==" + "version": "7.20.2", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz", + "integrity": "sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==" }, "@babel/helper-remap-async-to-generator": { "version": "7.16.4", @@ -34064,12 +34017,11 @@ } }, "@babel/plugin-transform-property-mutators": { - "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-mutators/-/plugin-transform-property-mutators-7.18.6.tgz", - "integrity": "sha512-30BjBu2xyai0GivUBMeFmHlFxeZtJXHcTUUrRRIZ9u0Mihk0qzREWicLUjDO/hcQOfya1I0pQ7eAcKKNt0BKug==", + "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-mutators/-/plugin-transform-property-mutators-7.20.7.tgz", + "integrity": "sha512-Jq14o707UCRcGrdWa3qyA9TMoa/dMi9GfrphmwsppuZ3jxbDqRXHrQkjLN87sopIV3Zlp8SRZS48+S9ABcmC7g==", "requires": { - "@babel/helper-define-map": "^7.18.6", - "@babel/helper-plugin-utils": "^7.18.6" + "@babel/helper-plugin-utils": "^7.20.2" } }, "@babel/plugin-transform-react-display-name": { @@ -36343,12 +36295,12 @@ "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==" }, "@quintype/amp": { - "version": "2.4.28", - "resolved": "https://registry.npmjs.org/@quintype/amp/-/amp-2.4.28.tgz", - "integrity": "sha512-LAta0Bt8fthHxORK1232kTrp516ZAJCR9ixqNmvj911bi7cP6It9eDesCDO+O4jP8rcVDqROc1ns/MZwDFGeyg==", + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/@quintype/amp/-/amp-2.9.1.tgz", + "integrity": "sha512-9DDsxP1I40u18Otm51+HXP+VAxcersYExhEQAIsIUPUPFqMpk/jr8PiTkm1U/aHhL9V7Qwa1Y7P7i0gEbZgosA==", "requires": { "@rvgpl/get-youtube-id": "^1.0.0", - "atob": "^2.1.2", + "atob-utf-8": "^1.0.4", "babel-preset-airbnb": "^5.0.0", "date-fns": "^2.11.0", "date-fns-tz": "^1.0.10", @@ -36365,9 +36317,9 @@ } }, "@quintype/backend": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@quintype/backend/-/backend-2.3.1.tgz", - "integrity": "sha512-z6DVASwl+TwmTtrjqJ3G9fzakpjQaFiN74inKornAgHYlJgqP5+irgEUnmwCVg8a4UCCcWqAJams4bkA7qu2kQ==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/@quintype/backend/-/backend-2.3.3.tgz", + "integrity": "sha512-tpzH5gzBvPDCK03yX0uZoHF5s/ZX6JehW9Y+xA2O0bMX88kRPtB2weu/tv7sp+vuaoU/SjgK6owHNDC/EQcXZw==", "requires": { "axios": "^0.21.1", "bluebird": "^3.7.2", @@ -36383,11 +36335,6 @@ "requires": { "follow-redirects": "^1.14.0" } - }, - "follow-redirects": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.0.tgz", - "integrity": "sha512-aExlJShTV4qOUOL7yF1U5tvLCB0xQuudbf6toyYA0E/acBNw71mvjFTnLaRp50aQaYocMR0a/RMMBIHeZnGyjQ==" } } }, @@ -36578,12 +36525,11 @@ } }, "@quintype/components": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@quintype/components/-/components-3.0.2.tgz", - "integrity": "sha512-QhfDexSof8oU3yenG9m4SB9qKuph/qKTtz7a2dDroPDKecul/Ig/jrwRNiOpZd/Mcicwyhb2LMigIoaJf0OmWw==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@quintype/components/-/components-3.3.0.tgz", + "integrity": "sha512-fNGdpvnof3MRFlbZl6d82EDekYnv4eebw1OQAyq1adR+ON1iQ1yRGUjhYLF0DYOYsXX4is8rcAnx+zDb7t1Ylw==", "requires": { "@babel/runtime": "^7.16.3", - "atob": "^2.1.2", "classnames": "^2.3.1", "empty-web-gif": "^1.0.1", "get-video-id": "^3.4.3", @@ -36624,14 +36570,14 @@ } }, "@quintype/framework": { - "version": "7.7.7", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.7.7.tgz", - "integrity": "sha512-FGIkT2PVdJBR5UbarU97kArIZBfOMUiHugELGscxM6R3yzUrP0wEzzLmqhu9caWWJ2ZD/ThFaE2E3dUhRYViXQ==", + "version": "7.18.2-webengage.0", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.0.tgz", + "integrity": "sha512-sLzMhOzwY6n9GMB3BhSY3zhhGT7j+PKFJcBhSMecLuKWQbg5u5XCZc+2GjESxvjfe3Mpp3bDwp/FJo+kbPhBXQ==", "requires": { "@ampproject/toolbox-optimizer": "2.8.3", - "@quintype/amp": "^2.4.28", - "@quintype/backend": "^2.3.1", - "@quintype/components": "^3.0.0", + "@quintype/amp": "^2.9.1", + "@quintype/backend": "^2.3.3", + "@quintype/components": "^3.3.0", "@quintype/prerender-node": "^3.2.26", "@quintype/seo": "^1.39.0", "atob": "^2.1.2", @@ -38064,6 +38010,11 @@ "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, + "atob-utf-8": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/atob-utf-8/-/atob-utf-8-1.0.4.tgz", + "integrity": "sha512-URuOY6Qtmeu51HqXgIO/osI2MAY6kiJ5WwXMo3hqTlaGn28AexlyPvJFy5fsfcpc3EgnglbaHkkDZ5ibFKWLww==" + }, "autocompleter": { "version": "6.1.2", "resolved": "https://registry.npmjs.org/autocompleter/-/autocompleter-6.1.2.tgz", @@ -38118,13 +38069,6 @@ "integrity": "sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==", "requires": { "follow-redirects": "^1.14.4" - }, - "dependencies": { - "follow-redirects": { - "version": "1.14.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", - "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==" - } } }, "babel-code-frame": { @@ -39269,9 +39213,9 @@ } }, "camelize": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz", - "integrity": "sha512-W2lPwkBkMZwFlPCXhIlYgxu+7gC/NUlCtdK652DAJ1JdgV0sTrvuPFshNPrFa1TY2JOkLhgdeEBplB4ezEa+xg==" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.1.tgz", + "integrity": "sha512-dU+Tx2fsypxTgtLoE36npi3UqcjSSMNYfkqgmoEhtZrraP5VWq0K7FkWVTYa8eMPtnU/G2txVsfdCJTn9uzpuQ==" }, "caniuse-api": { "version": "3.0.0", @@ -40416,9 +40360,9 @@ } }, "css-to-react-native": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.0.0.tgz", - "integrity": "sha512-Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/css-to-react-native/-/css-to-react-native-3.1.0.tgz", + "integrity": "sha512-AryfkFA29b4I3vG7N4kxFboq15DxwSXzhXM37XNEjwJMgjYIc8BcqfiprpAqX0zadI5PMByEIwAMzXxk5Vcc4g==", "requires": { "camelize": "^1.0.0", "css-color-keywords": "^1.0.0", @@ -42994,22 +42938,9 @@ "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==" }, "follow-redirects": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", - "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", - "requires": { - "debug": "=3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - } - } + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", + "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==" }, "fontfaceobserver": { "version": "2.1.0", @@ -54051,7 +53982,7 @@ "stealthy-require": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", - "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=" + "integrity": "sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==" }, "stream-browserify": { "version": "2.0.2", @@ -54395,9 +54326,9 @@ "dev": true }, "styled-components": { - "version": "5.3.5", - "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.5.tgz", - "integrity": "sha512-ndETJ9RKaaL6q41B69WudeqLzOpY1A/ET/glXkNZ2T7dPjPqpPCXXQjDFYZWwNnE5co0wX+gTCqx9mfxTmSIPg==", + "version": "5.3.6", + "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-5.3.6.tgz", + "integrity": "sha512-hGTZquGAaTqhGWldX7hhfzjnIYBZ0IXQXkCYdvF1Sq3DsUaLx6+NTHC5Jj1ooM2F68sBiVz3lvhfwQs/S3l6qg==", "requires": { "@babel/helper-module-imports": "^7.0.0", "@babel/traverse": "^7.4.5", diff --git a/package.json b/package.json index eb92acad7..188f421df 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.7.7", + "@quintype/framework": "^7.18.2-webengage.0", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", From 7e4a89918736d517315eb4747f9bc7021229952b Mon Sep 17 00:00:00 2001 From: phaneendra <58028287+cricket-lover@users.noreply.github.com> Date: Thu, 2 Feb 2023 12:10:44 +0530 Subject: [PATCH 03/40] add data in response --- package-lock.json | 14 +++++++------- package.json | 2 +- run | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 362b8b1b8..e5f1868bd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.0", + "@quintype/framework": "^7.18.2-webengage.1", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", @@ -5260,9 +5260,9 @@ "integrity": "sha512-N2sYGNRaianJZJROz31vNoGo7Sd+2ElX9g+qwiOQ8/+3oJVCEOkFxVMSYT/8QQqTrWs5bmMbDyxrOleALhUMCA==" }, "node_modules/@quintype/framework": { - "version": "7.18.2-webengage.0", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.0.tgz", - "integrity": "sha512-sLzMhOzwY6n9GMB3BhSY3zhhGT7j+PKFJcBhSMecLuKWQbg5u5XCZc+2GjESxvjfe3Mpp3bDwp/FJo+kbPhBXQ==", + "version": "7.18.2-webengage.1", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.1.tgz", + "integrity": "sha512-3gjS3+WiLJ02MGX2B/gU0dxfRXNL0XwjiVx+9rfk6YKWYybklqQ+yyle7b1RDw55MuyYr9H0kNDsh6018UbZFw==", "dependencies": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", @@ -36570,9 +36570,9 @@ } }, "@quintype/framework": { - "version": "7.18.2-webengage.0", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.0.tgz", - "integrity": "sha512-sLzMhOzwY6n9GMB3BhSY3zhhGT7j+PKFJcBhSMecLuKWQbg5u5XCZc+2GjESxvjfe3Mpp3bDwp/FJo+kbPhBXQ==", + "version": "7.18.2-webengage.1", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.1.tgz", + "integrity": "sha512-3gjS3+WiLJ02MGX2B/gU0dxfRXNL0XwjiVx+9rfk6YKWYybklqQ+yyle7b1RDw55MuyYr9H0kNDsh6018UbZFw==", "requires": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", diff --git a/package.json b/package.json index 188f421df..68c533db5 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.0", + "@quintype/framework": "^7.18.2-webengage.1", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", diff --git a/run b/run index 4f4500de7..930cb0a23 100755 --- a/run +++ b/run @@ -1,6 +1,6 @@ #!/bin/bash -e -# npm install +npm install npm run compile supervisord -n -c <(cat < Date: Fri, 3 Feb 2023 10:40:33 +0530 Subject: [PATCH 04/40] add req.body in console.log --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index e5f1868bd..8d1b0846b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.1", + "@quintype/framework": "^7.18.2-webengage.2", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", @@ -5260,9 +5260,9 @@ "integrity": "sha512-N2sYGNRaianJZJROz31vNoGo7Sd+2ElX9g+qwiOQ8/+3oJVCEOkFxVMSYT/8QQqTrWs5bmMbDyxrOleALhUMCA==" }, "node_modules/@quintype/framework": { - "version": "7.18.2-webengage.1", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.1.tgz", - "integrity": "sha512-3gjS3+WiLJ02MGX2B/gU0dxfRXNL0XwjiVx+9rfk6YKWYybklqQ+yyle7b1RDw55MuyYr9H0kNDsh6018UbZFw==", + "version": "7.18.2-webengage.2", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.2.tgz", + "integrity": "sha512-qGpF1X6IhqDHypnFkDFVE9DWeREK9HQlnANwPdlXyJO5Z9fj2TMpBlmJGDF+GthzYWePkizuQADYx72MZ1B6uw==", "dependencies": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", @@ -36570,9 +36570,9 @@ } }, "@quintype/framework": { - "version": "7.18.2-webengage.1", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.1.tgz", - "integrity": "sha512-3gjS3+WiLJ02MGX2B/gU0dxfRXNL0XwjiVx+9rfk6YKWYybklqQ+yyle7b1RDw55MuyYr9H0kNDsh6018UbZFw==", + "version": "7.18.2-webengage.2", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.2.tgz", + "integrity": "sha512-qGpF1X6IhqDHypnFkDFVE9DWeREK9HQlnANwPdlXyJO5Z9fj2TMpBlmJGDF+GthzYWePkizuQADYx72MZ1B6uw==", "requires": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", diff --git a/package.json b/package.json index 68c533db5..39861b745 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.1", + "@quintype/framework": "^7.18.2-webengage.2", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", From 49dddde9f3f2a56074be6ac01ef1e5ef8a2d58b2 Mon Sep 17 00:00:00 2001 From: phaneendra <58028287+cricket-lover@users.noreply.github.com> Date: Fri, 3 Feb 2023 15:56:38 +0530 Subject: [PATCH 05/40] update framework version --- app/server/app.js | 63 +++++++++++++++++++++++++++-------------------- package-lock.json | 14 +++++------ package.json | 2 +- 3 files changed, 44 insertions(+), 35 deletions(-) diff --git a/app/server/app.js b/app/server/app.js index d9158abc4..a49488f49 100644 --- a/app/server/app.js +++ b/app/server/app.js @@ -7,7 +7,7 @@ import { isomorphicRoutes, staticRoutes, ampRoutes, - getWithConfig + getWithConfig, } from "@quintype/framework/server/routes"; import { generateRoutes, STATIC_ROUTES } from "./routes"; import { renderLayout } from "./handlers/render-layout"; @@ -19,44 +19,51 @@ export const app = createApp(); upstreamQuintypeRoutes(app, {}); -const redirectCollectionHandler = () => async (req, res, next, { client, config }) => { - const response = await Collection.getCollectionBySlug(client, req.params.collectionSlug, { limit: 20 }, { depth: 2 }); - if (!response) { - return next(); - } - const collection = response && response.collection; - if (collection.template === "section") { - const sectionId = collection.metadata.section[0].id; - const section = config.sections.find(section => section.id === sectionId) || {}; - return res.redirect(301, `${section["section-url"]}`); - } +const redirectCollectionHandler = + () => + async (req, res, next, { client, config }) => { + const response = await Collection.getCollectionBySlug( + client, + req.params.collectionSlug, + { limit: 20 }, + { depth: 2 } + ); + if (!response) { + return next(); + } + const collection = response && response.collection; + if (collection.template === "section") { + const sectionId = collection.metadata.section[0].id; + const section = config.sections.find((section) => section.id === sectionId) || {}; + return res.redirect(301, `${section["section-url"]}`); + } - if (collection.template === "author") { - return res.redirect(301, `/author/${req.params.collectionSlug}`); - } - return next(); -}; + if (collection.template === "author") { + return res.redirect(301, `/author/${req.params.collectionSlug}`); + } + return next(); + }; -const logError = error => logger.error(error); +const logError = (error) => logger.error(error); getWithConfig(app, "/collection/:collectionSlug", redirectCollectionHandler(), { - logError + logError, }); function returnConfig(req) { return getClient(req.hostname) .getConfig() - .then(res => res.config || []); + .then((res) => res.config || []); } app.get("*", (req, res, next) => { if (req.hostname.includes("auth")) { const whitelistedUrls = ["user-login", "route-data.json", "manifest.json"]; - const isPathPresent = element => req.params[0].includes(element); + const isPathPresent = (element) => req.params[0].includes(element); if (whitelistedUrls.some(isPathPresent)) { return next(); } else { - returnConfig(req).then(response => { + returnConfig(req).then((response) => { const sketchesHost = response["sketches-host"]; res.redirect(301, sketchesHost); }); @@ -72,21 +79,21 @@ function generateSeo(config, pageType) { structuredData: Object.assign(generateStructuredData(config), { enableLiveBlog: true, enableVideo: true, - enableNewsArticle: true + enableNewsArticle: true, }), enableTwitterCards: true, enableOgTags: true, - enableNews: true + enableNews: true, }); } ampRoutes(app, { - seo: generateSeo + seo: generateSeo, }); isomorphicRoutes(app, { appVersion: require("../isomorphic/app-version"), - logError: error => logger.error(error), + logError: (error) => logger.error(error), generateRoutes: generateRoutes, loadData: loadData, pickComponent: pickComponent, @@ -97,5 +104,7 @@ isomorphicRoutes(app, { seo: generateSeo, preloadJs: true, oneSignalServiceWorkers: true, - prerenderServiceUrl: "https://prerender.quintype.io" + prerenderServiceUrl: "https://prerender.quintype.io", + webengageLicenseCode: "311c5229", + webengageApiKey: "2d5cb58e-7160-4f2a-b423-0c0d8007dd9c", }); diff --git a/package-lock.json b/package-lock.json index 8d1b0846b..0ff49f4a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.2", + "@quintype/framework": "^7.18.2-webengage.3", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", @@ -5260,9 +5260,9 @@ "integrity": "sha512-N2sYGNRaianJZJROz31vNoGo7Sd+2ElX9g+qwiOQ8/+3oJVCEOkFxVMSYT/8QQqTrWs5bmMbDyxrOleALhUMCA==" }, "node_modules/@quintype/framework": { - "version": "7.18.2-webengage.2", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.2.tgz", - "integrity": "sha512-qGpF1X6IhqDHypnFkDFVE9DWeREK9HQlnANwPdlXyJO5Z9fj2TMpBlmJGDF+GthzYWePkizuQADYx72MZ1B6uw==", + "version": "7.18.2-webengage.3", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.3.tgz", + "integrity": "sha512-QOMSn1hDhN9Ljd/mHQa7JsyJAwFZlHsklINug3VqreC4J/CCBmOUHhEIAfUgwALWG3Yn1+y3G4cfx1NW+i0rmw==", "dependencies": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", @@ -36570,9 +36570,9 @@ } }, "@quintype/framework": { - "version": "7.18.2-webengage.2", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.2.tgz", - "integrity": "sha512-qGpF1X6IhqDHypnFkDFVE9DWeREK9HQlnANwPdlXyJO5Z9fj2TMpBlmJGDF+GthzYWePkizuQADYx72MZ1B6uw==", + "version": "7.18.2-webengage.3", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.3.tgz", + "integrity": "sha512-QOMSn1hDhN9Ljd/mHQa7JsyJAwFZlHsklINug3VqreC4J/CCBmOUHhEIAfUgwALWG3Yn1+y3G4cfx1NW+i0rmw==", "requires": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", diff --git a/package.json b/package.json index 39861b745..97058065a 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.2", + "@quintype/framework": "^7.18.2-webengage.3", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", From 84a4ab57aeba497dbb320a6e4ec9a95490f9f7b7 Mon Sep 17 00:00:00 2001 From: phaneendra <58028287+cricket-lover@users.noreply.github.com> Date: Fri, 3 Feb 2023 18:32:24 +0530 Subject: [PATCH 06/40] add script for webengage --- views/pages/layout.ejs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/views/pages/layout.ejs b/views/pages/layout.ejs index a7cd92d9f..13120f7cf 100644 --- a/views/pages/layout.ejs +++ b/views/pages/layout.ejs @@ -79,6 +79,10 @@ <%- styleTags %> <%_ } _%> + From 7951dc18442b564f36adf8b3256e1a63d6f7d36c Mon Sep 17 00:00:00 2001 From: phaneendra <58028287+cricket-lover@users.noreply.github.com> Date: Mon, 6 Feb 2023 00:01:38 +0530 Subject: [PATCH 07/40] add script in service-worker.js --- views/js/service-worker.ejs | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/views/js/service-worker.ejs b/views/js/service-worker.ejs index c15c30a51..60a0b6548 100644 --- a/views/js/service-worker.ejs +++ b/views/js/service-worker.ejs @@ -1,24 +1,8 @@ -<%- serviceWorkerHelper %>; - -const shellUrl = "/shell.html?revision=<%= assetHash("app.js") %>-<%= configVersion %>"; - -const REQUIRED_ASSETS = [ - <%_ getFilesForChunks("app", "list", "story").map(x => { _%> - "<%= x %>", - <%_ }) _%> - // Put fonts here - shellUrl -]; - -initializeQServiceWorker({ - routes: <%- JSON.stringify(routes) %>, - assets: REQUIRED_ASSETS, - shell: shellUrl, - hostname: <%- JSON.stringify(hostname) %> -}); - -workbox.routing.registerRoute(new RegExp('/route-data.json*'), new workbox.strategies.NetworkFirst()); - -if("<%= config["public-integrations"]["one-signal"] && config["public-integrations"]["one-signal"]["app-id"] %>") { - importScripts('https://cdn.onesignal.com/sdks/OneSignalSDKWorker.js'); -} +<%- serviceWorkerHelper %>; const shellUrl = "/shell.html?revision=<%= assetHash("app.js") %>-<%= configVersion %>"; +const REQUIRED_ASSETS = [ <%_ getFilesForChunks("app", "list", "story").map(x => { _%> "<%= x %>", <%_ }) _%> // Put +fonts here shellUrl ]; initializeQServiceWorker({ routes: <%- JSON.stringify(routes) %>, assets: REQUIRED_ASSETS, shell: +shellUrl, hostname: <%- JSON.stringify(hostname) %> }); workbox.routing.registerRoute(new RegExp('/route-data.json*'), +new workbox.strategies.NetworkFirst()); if("<%= config["public-integrations"]["one-signal"] && +config["public-integrations"]["one-signal"]["app-id"] %>") { +importScripts('https://cdn.onesignal.com/sdks/OneSignalSDKWorker.js'); } +importScripts('https://ssl.widgets.webengage.com/js/service-worker.js'); From 4cefbee2231b59171e09b99c036192ecdadc7967 Mon Sep 17 00:00:00 2001 From: phaneendra <58028287+cricket-lover@users.noreply.github.com> Date: Mon, 6 Feb 2023 00:58:53 +0530 Subject: [PATCH 08/40] revert service-worker.js --- views/js/service-worker.ejs | 1 - 1 file changed, 1 deletion(-) diff --git a/views/js/service-worker.ejs b/views/js/service-worker.ejs index 60a0b6548..7f345b7a5 100644 --- a/views/js/service-worker.ejs +++ b/views/js/service-worker.ejs @@ -5,4 +5,3 @@ shellUrl, hostname: <%- JSON.stringify(hostname) %> }); workbox.routing.register new workbox.strategies.NetworkFirst()); if("<%= config["public-integrations"]["one-signal"] && config["public-integrations"]["one-signal"]["app-id"] %>") { importScripts('https://cdn.onesignal.com/sdks/OneSignalSDKWorker.js'); } -importScripts('https://ssl.widgets.webengage.com/js/service-worker.js'); From d8fc958f765b13785447636c056050b88bda51f5 Mon Sep 17 00:00:00 2001 From: phaneendra <58028287+cricket-lover@users.noreply.github.com> Date: Mon, 6 Feb 2023 11:03:35 +0530 Subject: [PATCH 09/40] add new service-worker.js in the root directory --- service-worker.js | 2 ++ views/js/service-worker.ejs | 31 ++++++++++++++++++++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 service-worker.js diff --git a/service-worker.js b/service-worker.js new file mode 100644 index 000000000..fd7ca4341 --- /dev/null +++ b/service-worker.js @@ -0,0 +1,2 @@ +// eslint-disable-next-line no-undef +importScripts("https://ssl.widgets.webengage.com/js/service-worker.js"); diff --git a/views/js/service-worker.ejs b/views/js/service-worker.ejs index 7f345b7a5..c15c30a51 100644 --- a/views/js/service-worker.ejs +++ b/views/js/service-worker.ejs @@ -1,7 +1,24 @@ -<%- serviceWorkerHelper %>; const shellUrl = "/shell.html?revision=<%= assetHash("app.js") %>-<%= configVersion %>"; -const REQUIRED_ASSETS = [ <%_ getFilesForChunks("app", "list", "story").map(x => { _%> "<%= x %>", <%_ }) _%> // Put -fonts here shellUrl ]; initializeQServiceWorker({ routes: <%- JSON.stringify(routes) %>, assets: REQUIRED_ASSETS, shell: -shellUrl, hostname: <%- JSON.stringify(hostname) %> }); workbox.routing.registerRoute(new RegExp('/route-data.json*'), -new workbox.strategies.NetworkFirst()); if("<%= config["public-integrations"]["one-signal"] && -config["public-integrations"]["one-signal"]["app-id"] %>") { -importScripts('https://cdn.onesignal.com/sdks/OneSignalSDKWorker.js'); } +<%- serviceWorkerHelper %>; + +const shellUrl = "/shell.html?revision=<%= assetHash("app.js") %>-<%= configVersion %>"; + +const REQUIRED_ASSETS = [ + <%_ getFilesForChunks("app", "list", "story").map(x => { _%> + "<%= x %>", + <%_ }) _%> + // Put fonts here + shellUrl +]; + +initializeQServiceWorker({ + routes: <%- JSON.stringify(routes) %>, + assets: REQUIRED_ASSETS, + shell: shellUrl, + hostname: <%- JSON.stringify(hostname) %> +}); + +workbox.routing.registerRoute(new RegExp('/route-data.json*'), new workbox.strategies.NetworkFirst()); + +if("<%= config["public-integrations"]["one-signal"] && config["public-integrations"]["one-signal"]["app-id"] %>") { + importScripts('https://cdn.onesignal.com/sdks/OneSignalSDKWorker.js'); +} From 11851c2f5cf141658fb7580516d86f4cf6dacb6e Mon Sep 17 00:00:00 2001 From: phaneendra <58028287+cricket-lover@users.noreply.github.com> Date: Mon, 6 Feb 2023 12:02:07 +0530 Subject: [PATCH 10/40] move service-worker.js into public folder --- service-worker.js => public/service-worker.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename service-worker.js => public/service-worker.js (100%) diff --git a/service-worker.js b/public/service-worker.js similarity index 100% rename from service-worker.js rename to public/service-worker.js From dd3ceca0f132de6e2026a1e6bcf0b3cdc9297805 Mon Sep 17 00:00:00 2001 From: phaneendra <58028287+cricket-lover@users.noreply.github.com> Date: Mon, 6 Feb 2023 12:58:19 +0530 Subject: [PATCH 11/40] update framework version --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0ff49f4a9..8ed353006 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.3", + "@quintype/framework": "^7.18.2-webengage.4", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", @@ -5260,9 +5260,9 @@ "integrity": "sha512-N2sYGNRaianJZJROz31vNoGo7Sd+2ElX9g+qwiOQ8/+3oJVCEOkFxVMSYT/8QQqTrWs5bmMbDyxrOleALhUMCA==" }, "node_modules/@quintype/framework": { - "version": "7.18.2-webengage.3", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.3.tgz", - "integrity": "sha512-QOMSn1hDhN9Ljd/mHQa7JsyJAwFZlHsklINug3VqreC4J/CCBmOUHhEIAfUgwALWG3Yn1+y3G4cfx1NW+i0rmw==", + "version": "7.18.2-webengage.4", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.4.tgz", + "integrity": "sha512-E9qLI+dK7pjBahjd1E8DyIIZAFQGb0kXhAz6uu6dCITncvFOt1lxq8LX7vBzyeVanylsa5paF0G3tyAoPzSxpQ==", "dependencies": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", @@ -36570,9 +36570,9 @@ } }, "@quintype/framework": { - "version": "7.18.2-webengage.3", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.3.tgz", - "integrity": "sha512-QOMSn1hDhN9Ljd/mHQa7JsyJAwFZlHsklINug3VqreC4J/CCBmOUHhEIAfUgwALWG3Yn1+y3G4cfx1NW+i0rmw==", + "version": "7.18.2-webengage.4", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.4.tgz", + "integrity": "sha512-E9qLI+dK7pjBahjd1E8DyIIZAFQGb0kXhAz6uu6dCITncvFOt1lxq8LX7vBzyeVanylsa5paF0G3tyAoPzSxpQ==", "requires": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", diff --git a/package.json b/package.json index 97058065a..c6d595e40 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.3", + "@quintype/framework": "^7.18.2-webengage.4", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", From 5930f8176a9f3bac85f8c6ef9409867da5d81ec6 Mon Sep 17 00:00:00 2001 From: phaneendra <58028287+cricket-lover@users.noreply.github.com> Date: Mon, 6 Feb 2023 13:21:04 +0530 Subject: [PATCH 12/40] update framework version --- app/server/app.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/server/app.js b/app/server/app.js index a49488f49..e56adf862 100644 --- a/app/server/app.js +++ b/app/server/app.js @@ -105,6 +105,7 @@ isomorphicRoutes(app, { preloadJs: true, oneSignalServiceWorkers: true, prerenderServiceUrl: "https://prerender.quintype.io", + enableWebengage: true, webengageLicenseCode: "311c5229", webengageApiKey: "2d5cb58e-7160-4f2a-b423-0c0d8007dd9c", }); From a31fb297dc06c01f58c6039987223f437694fd63 Mon Sep 17 00:00:00 2001 From: phaneendra <58028287+cricket-lover@users.noreply.github.com> Date: Mon, 6 Feb 2023 14:14:27 +0530 Subject: [PATCH 13/40] update framework version --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8ed353006..0ff49f4a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.4", + "@quintype/framework": "^7.18.2-webengage.3", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", @@ -5260,9 +5260,9 @@ "integrity": "sha512-N2sYGNRaianJZJROz31vNoGo7Sd+2ElX9g+qwiOQ8/+3oJVCEOkFxVMSYT/8QQqTrWs5bmMbDyxrOleALhUMCA==" }, "node_modules/@quintype/framework": { - "version": "7.18.2-webengage.4", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.4.tgz", - "integrity": "sha512-E9qLI+dK7pjBahjd1E8DyIIZAFQGb0kXhAz6uu6dCITncvFOt1lxq8LX7vBzyeVanylsa5paF0G3tyAoPzSxpQ==", + "version": "7.18.2-webengage.3", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.3.tgz", + "integrity": "sha512-QOMSn1hDhN9Ljd/mHQa7JsyJAwFZlHsklINug3VqreC4J/CCBmOUHhEIAfUgwALWG3Yn1+y3G4cfx1NW+i0rmw==", "dependencies": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", @@ -36570,9 +36570,9 @@ } }, "@quintype/framework": { - "version": "7.18.2-webengage.4", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.4.tgz", - "integrity": "sha512-E9qLI+dK7pjBahjd1E8DyIIZAFQGb0kXhAz6uu6dCITncvFOt1lxq8LX7vBzyeVanylsa5paF0G3tyAoPzSxpQ==", + "version": "7.18.2-webengage.3", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.3.tgz", + "integrity": "sha512-QOMSn1hDhN9Ljd/mHQa7JsyJAwFZlHsklINug3VqreC4J/CCBmOUHhEIAfUgwALWG3Yn1+y3G4cfx1NW+i0rmw==", "requires": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", diff --git a/package.json b/package.json index c6d595e40..97058065a 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.4", + "@quintype/framework": "^7.18.2-webengage.3", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", From e74d43da8386b1e4b669ce4df6743a474277c5ab Mon Sep 17 00:00:00 2001 From: phaneendra <58028287+cricket-lover@users.noreply.github.com> Date: Mon, 6 Feb 2023 14:43:02 +0530 Subject: [PATCH 14/40] update framework version --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0ff49f4a9..b3ec5413b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.3", + "@quintype/framework": "^7.18.2-webengage.5", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", @@ -5260,9 +5260,9 @@ "integrity": "sha512-N2sYGNRaianJZJROz31vNoGo7Sd+2ElX9g+qwiOQ8/+3oJVCEOkFxVMSYT/8QQqTrWs5bmMbDyxrOleALhUMCA==" }, "node_modules/@quintype/framework": { - "version": "7.18.2-webengage.3", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.3.tgz", - "integrity": "sha512-QOMSn1hDhN9Ljd/mHQa7JsyJAwFZlHsklINug3VqreC4J/CCBmOUHhEIAfUgwALWG3Yn1+y3G4cfx1NW+i0rmw==", + "version": "7.18.2-webengage.5", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.5.tgz", + "integrity": "sha512-2irKwko2szYVGKP2bTuC/IGjV877kUVW1pXYVOprEhnx1kEAJ3b5yK/MIO8kmQX6OOMXsFDf6w9MF22LfX6ZBw==", "dependencies": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", @@ -36570,9 +36570,9 @@ } }, "@quintype/framework": { - "version": "7.18.2-webengage.3", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.3.tgz", - "integrity": "sha512-QOMSn1hDhN9Ljd/mHQa7JsyJAwFZlHsklINug3VqreC4J/CCBmOUHhEIAfUgwALWG3Yn1+y3G4cfx1NW+i0rmw==", + "version": "7.18.2-webengage.5", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.5.tgz", + "integrity": "sha512-2irKwko2szYVGKP2bTuC/IGjV877kUVW1pXYVOprEhnx1kEAJ3b5yK/MIO8kmQX6OOMXsFDf6w9MF22LfX6ZBw==", "requires": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", diff --git a/package.json b/package.json index 97058065a..4058a49ef 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.3", + "@quintype/framework": "^7.18.2-webengage.5", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", From 6dfea03040c711e5d6dc1c9039a7a178e07ae88a Mon Sep 17 00:00:00 2001 From: phaneendra <58028287+cricket-lover@users.noreply.github.com> Date: Mon, 6 Feb 2023 15:18:46 +0530 Subject: [PATCH 15/40] remove toggle for the route --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index b3ec5413b..eb4b9082f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.5", + "@quintype/framework": "^7.18.2-webengage.6", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", @@ -5260,9 +5260,9 @@ "integrity": "sha512-N2sYGNRaianJZJROz31vNoGo7Sd+2ElX9g+qwiOQ8/+3oJVCEOkFxVMSYT/8QQqTrWs5bmMbDyxrOleALhUMCA==" }, "node_modules/@quintype/framework": { - "version": "7.18.2-webengage.5", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.5.tgz", - "integrity": "sha512-2irKwko2szYVGKP2bTuC/IGjV877kUVW1pXYVOprEhnx1kEAJ3b5yK/MIO8kmQX6OOMXsFDf6w9MF22LfX6ZBw==", + "version": "7.18.2-webengage.6", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.6.tgz", + "integrity": "sha512-QjJpA+fVQJ+Kfm0NHJZVZz2jZarebqMlfk5IMFOEGXd9IYcMjklrIqGugJBBzbdTtTHE+B8TtHE6/4sbPeskng==", "dependencies": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", @@ -36570,9 +36570,9 @@ } }, "@quintype/framework": { - "version": "7.18.2-webengage.5", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.5.tgz", - "integrity": "sha512-2irKwko2szYVGKP2bTuC/IGjV877kUVW1pXYVOprEhnx1kEAJ3b5yK/MIO8kmQX6OOMXsFDf6w9MF22LfX6ZBw==", + "version": "7.18.2-webengage.6", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.6.tgz", + "integrity": "sha512-QjJpA+fVQJ+Kfm0NHJZVZz2jZarebqMlfk5IMFOEGXd9IYcMjklrIqGugJBBzbdTtTHE+B8TtHE6/4sbPeskng==", "requires": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", diff --git a/package.json b/package.json index 4058a49ef..ec4826a8b 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.5", + "@quintype/framework": "^7.18.2-webengage.6", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", From 31e7bcb55c5f7bfa2403c922fb359a74bc42cd64 Mon Sep 17 00:00:00 2001 From: phaneendra <58028287+cricket-lover@users.noreply.github.com> Date: Wed, 8 Feb 2023 15:55:47 +0530 Subject: [PATCH 16/40] modify event api endpoint --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index eb4b9082f..aaf89ca74 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.6", + "@quintype/framework": "^7.18.2-webengage.7", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", @@ -5260,9 +5260,9 @@ "integrity": "sha512-N2sYGNRaianJZJROz31vNoGo7Sd+2ElX9g+qwiOQ8/+3oJVCEOkFxVMSYT/8QQqTrWs5bmMbDyxrOleALhUMCA==" }, "node_modules/@quintype/framework": { - "version": "7.18.2-webengage.6", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.6.tgz", - "integrity": "sha512-QjJpA+fVQJ+Kfm0NHJZVZz2jZarebqMlfk5IMFOEGXd9IYcMjklrIqGugJBBzbdTtTHE+B8TtHE6/4sbPeskng==", + "version": "7.18.2-webengage.7", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.7.tgz", + "integrity": "sha512-792gQ2VOjlIOEQmV4BDa39LfFBWAVODMm68frx0rn8RzkybYdt9QzoSOeHPnErmtMjiQSZSe5Xf0+hGh6a3enA==", "dependencies": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", @@ -36570,9 +36570,9 @@ } }, "@quintype/framework": { - "version": "7.18.2-webengage.6", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.6.tgz", - "integrity": "sha512-QjJpA+fVQJ+Kfm0NHJZVZz2jZarebqMlfk5IMFOEGXd9IYcMjklrIqGugJBBzbdTtTHE+B8TtHE6/4sbPeskng==", + "version": "7.18.2-webengage.7", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.7.tgz", + "integrity": "sha512-792gQ2VOjlIOEQmV4BDa39LfFBWAVODMm68frx0rn8RzkybYdt9QzoSOeHPnErmtMjiQSZSe5Xf0+hGh6a3enA==", "requires": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", diff --git a/package.json b/package.json index ec4826a8b..a9e7a3bc1 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.6", + "@quintype/framework": "^7.18.2-webengage.7", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", From c3775a1dab23a8f0de4e344483ba501aff43a2d2 Mon Sep 17 00:00:00 2001 From: phaneendra <58028287+cricket-lover@users.noreply.github.com> Date: Tue, 14 Feb 2023 17:48:40 +0530 Subject: [PATCH 17/40] modify event api endpoint --- package-lock.json | 14 +++++++------- package.json | 2 +- views/pages/layout.ejs | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index aaf89ca74..04619237f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.7", + "@quintype/framework": "^7.18.2-webengage.8", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", @@ -5260,9 +5260,9 @@ "integrity": "sha512-N2sYGNRaianJZJROz31vNoGo7Sd+2ElX9g+qwiOQ8/+3oJVCEOkFxVMSYT/8QQqTrWs5bmMbDyxrOleALhUMCA==" }, "node_modules/@quintype/framework": { - "version": "7.18.2-webengage.7", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.7.tgz", - "integrity": "sha512-792gQ2VOjlIOEQmV4BDa39LfFBWAVODMm68frx0rn8RzkybYdt9QzoSOeHPnErmtMjiQSZSe5Xf0+hGh6a3enA==", + "version": "7.18.2-webengage.8", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.8.tgz", + "integrity": "sha512-mGEQNQoRPjKA2BdtwUZxkG4B50IOV40SnWxJuq0g0a5yQlVAcs22ls7KmKLhrmCamihOFbY3FLFDQsQqN0ZbSg==", "dependencies": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", @@ -36570,9 +36570,9 @@ } }, "@quintype/framework": { - "version": "7.18.2-webengage.7", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.7.tgz", - "integrity": "sha512-792gQ2VOjlIOEQmV4BDa39LfFBWAVODMm68frx0rn8RzkybYdt9QzoSOeHPnErmtMjiQSZSe5Xf0+hGh6a3enA==", + "version": "7.18.2-webengage.8", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.8.tgz", + "integrity": "sha512-mGEQNQoRPjKA2BdtwUZxkG4B50IOV40SnWxJuq0g0a5yQlVAcs22ls7KmKLhrmCamihOFbY3FLFDQsQqN0ZbSg==", "requires": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", diff --git a/package.json b/package.json index a9e7a3bc1..a767f9052 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.7", + "@quintype/framework": "^7.18.2-webengage.8", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", diff --git a/views/pages/layout.ejs b/views/pages/layout.ejs index 13120f7cf..c7d094c95 100644 --- a/views/pages/layout.ejs +++ b/views/pages/layout.ejs @@ -81,8 +81,8 @@ + webengage.init('~10a5cb515'); + From e073acd49a508ce3ca3848a792bd964ece2f58c5 Mon Sep 17 00:00:00 2001 From: phaneendra <58028287+cricket-lover@users.noreply.github.com> Date: Wed, 15 Feb 2023 12:14:32 +0530 Subject: [PATCH 18/40] modify webengageApi --- app/server/app.js | 4 ++-- package-lock.json | 14 +++++++------- package.json | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/server/app.js b/app/server/app.js index e56adf862..a871c0dad 100644 --- a/app/server/app.js +++ b/app/server/app.js @@ -106,6 +106,6 @@ isomorphicRoutes(app, { oneSignalServiceWorkers: true, prerenderServiceUrl: "https://prerender.quintype.io", enableWebengage: true, - webengageLicenseCode: "311c5229", - webengageApiKey: "2d5cb58e-7160-4f2a-b423-0c0d8007dd9c", + webengageLicenseCode: "~10a5cb515", + webengageApiKey: "2bdc2d5d-583f-4937-bd5a-4dff207a59c3", }); diff --git a/package-lock.json b/package-lock.json index 04619237f..00e92c677 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.8", + "@quintype/framework": "^7.18.2-webengage.9", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", @@ -5260,9 +5260,9 @@ "integrity": "sha512-N2sYGNRaianJZJROz31vNoGo7Sd+2ElX9g+qwiOQ8/+3oJVCEOkFxVMSYT/8QQqTrWs5bmMbDyxrOleALhUMCA==" }, "node_modules/@quintype/framework": { - "version": "7.18.2-webengage.8", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.8.tgz", - "integrity": "sha512-mGEQNQoRPjKA2BdtwUZxkG4B50IOV40SnWxJuq0g0a5yQlVAcs22ls7KmKLhrmCamihOFbY3FLFDQsQqN0ZbSg==", + "version": "7.18.2-webengage.9", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.9.tgz", + "integrity": "sha512-5WFJXJeZVDjhi6qptRbZyRuTIiA/loZA9IFZI8cKXN08TrkHZ0EHiyoEEZ0SrWePogsvpn53jaSVFF3q7zvgpQ==", "dependencies": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", @@ -36570,9 +36570,9 @@ } }, "@quintype/framework": { - "version": "7.18.2-webengage.8", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.8.tgz", - "integrity": "sha512-mGEQNQoRPjKA2BdtwUZxkG4B50IOV40SnWxJuq0g0a5yQlVAcs22ls7KmKLhrmCamihOFbY3FLFDQsQqN0ZbSg==", + "version": "7.18.2-webengage.9", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.9.tgz", + "integrity": "sha512-5WFJXJeZVDjhi6qptRbZyRuTIiA/loZA9IFZI8cKXN08TrkHZ0EHiyoEEZ0SrWePogsvpn53jaSVFF3q7zvgpQ==", "requires": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", diff --git a/package.json b/package.json index a767f9052..db59bc804 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.8", + "@quintype/framework": "^7.18.2-webengage.9", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", From 9648fb098dd2d797066bfdf9f5ab2c7bc24b976c Mon Sep 17 00:00:00 2001 From: phaneendra <58028287+cricket-lover@users.noreply.github.com> Date: Wed, 15 Feb 2023 17:49:58 +0530 Subject: [PATCH 19/40] added toggle --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 00e92c677..f5426a8ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.9", + "@quintype/framework": "^7.18.2-webengage.10", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", @@ -5260,9 +5260,9 @@ "integrity": "sha512-N2sYGNRaianJZJROz31vNoGo7Sd+2ElX9g+qwiOQ8/+3oJVCEOkFxVMSYT/8QQqTrWs5bmMbDyxrOleALhUMCA==" }, "node_modules/@quintype/framework": { - "version": "7.18.2-webengage.9", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.9.tgz", - "integrity": "sha512-5WFJXJeZVDjhi6qptRbZyRuTIiA/loZA9IFZI8cKXN08TrkHZ0EHiyoEEZ0SrWePogsvpn53jaSVFF3q7zvgpQ==", + "version": "7.18.2-webengage.10", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.10.tgz", + "integrity": "sha512-HbAdKuFrLzXgXiS1VmFcVytiEAW+zFvmJeqqYwxRrH1jea6IBh6l+ogcDBryCo/xqVKyPWG0Pd6khvLNrVkjhw==", "dependencies": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", @@ -36570,9 +36570,9 @@ } }, "@quintype/framework": { - "version": "7.18.2-webengage.9", - "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.9.tgz", - "integrity": "sha512-5WFJXJeZVDjhi6qptRbZyRuTIiA/loZA9IFZI8cKXN08TrkHZ0EHiyoEEZ0SrWePogsvpn53jaSVFF3q7zvgpQ==", + "version": "7.18.2-webengage.10", + "resolved": "https://registry.npmjs.org/@quintype/framework/-/framework-7.18.2-webengage.10.tgz", + "integrity": "sha512-HbAdKuFrLzXgXiS1VmFcVytiEAW+zFvmJeqqYwxRrH1jea6IBh6l+ogcDBryCo/xqVKyPWG0Pd6khvLNrVkjhw==", "requires": { "@ampproject/toolbox-optimizer": "2.8.3", "@quintype/amp": "^2.9.1", diff --git a/package.json b/package.json index db59bc804..a0846beaf 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@loadable/server": "^5.14.2", "@quintype/bridgekeeper-js": "^2.8.1", "@quintype/components": "^3.0.2", - "@quintype/framework": "^7.18.2-webengage.9", + "@quintype/framework": "^7.18.2-webengage.10", "@quintype/seo": "^1.40.10", "axios": "^0.24.0", "fontfaceobserver": "^2.1.0", From 0a89776fda36077535d0755ae5e319a7ca0e48a1 Mon Sep 17 00:00:00 2001 From: phaneendra <58028287+cricket-lover@users.noreply.github.com> Date: Thu, 16 Feb 2023 10:36:14 +0530 Subject: [PATCH 20/40] add webengage import in service-worker.ejs --- public/service-worker.js | 2 -- views/js/service-worker.ejs | 29 +++++------------------------ 2 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 public/service-worker.js diff --git a/public/service-worker.js b/public/service-worker.js deleted file mode 100644 index fd7ca4341..000000000 --- a/public/service-worker.js +++ /dev/null @@ -1,2 +0,0 @@ -// eslint-disable-next-line no-undef -importScripts("https://ssl.widgets.webengage.com/js/service-worker.js"); diff --git a/views/js/service-worker.ejs b/views/js/service-worker.ejs index c15c30a51..ab4235deb 100644 --- a/views/js/service-worker.ejs +++ b/views/js/service-worker.ejs @@ -1,24 +1,5 @@ -<%- serviceWorkerHelper %>; - -const shellUrl = "/shell.html?revision=<%= assetHash("app.js") %>-<%= configVersion %>"; - -const REQUIRED_ASSETS = [ - <%_ getFilesForChunks("app", "list", "story").map(x => { _%> - "<%= x %>", - <%_ }) _%> - // Put fonts here - shellUrl -]; - -initializeQServiceWorker({ - routes: <%- JSON.stringify(routes) %>, - assets: REQUIRED_ASSETS, - shell: shellUrl, - hostname: <%- JSON.stringify(hostname) %> -}); - -workbox.routing.registerRoute(new RegExp('/route-data.json*'), new workbox.strategies.NetworkFirst()); - -if("<%= config["public-integrations"]["one-signal"] && config["public-integrations"]["one-signal"]["app-id"] %>") { - importScripts('https://cdn.onesignal.com/sdks/OneSignalSDKWorker.js'); -} +<%- serviceWorkerHelper %>; const shellUrl = "/shell.html?revision=<%= assetHash("app.js") %>-<%= configVersion %>"; +const REQUIRED_ASSETS = [ <%_ getFilesForChunks("app", "list", "story").map(x => { _%> "<%= x %>", <%_ }) _%> // Put +fonts here shellUrl ]; initializeQServiceWorker({ routes: <%- JSON.stringify(routes) %>, assets: REQUIRED_ASSETS, shell: +shellUrl, hostname: <%- JSON.stringify(hostname) %> }); workbox.routing.registerRoute(new RegExp('/route-data.json*'), +new workbox.strategies.NetworkFirst()); importScripts("https://ssl.widgets.webengage.com/js/service-worker.js"); From f86c308e6f8ff75145e952ba920a440d06efc8fd Mon Sep 17 00:00:00 2001 From: phaneendra <58028287+cricket-lover@users.noreply.github.com> Date: Thu, 16 Feb 2023 10:55:25 +0530 Subject: [PATCH 21/40] remove onesignal configuration --- app/client/app.js | 8 +------- app/server/app.js | 1 - app/server/handlers/render-layout.js | 16 +++------------- app/server/helpers/index.js | 1 - views/pages/layout.ejs | 4 ---- 5 files changed, 4 insertions(+), 26 deletions(-) diff --git a/app/client/app.js b/app/client/app.js index f300bedf5..118543d12 100644 --- a/app/client/app.js +++ b/app/client/app.js @@ -9,7 +9,7 @@ import "../../app/assets/stylesheets/app.scss"; const opts = { enableServiceWorker: process.env.NODE_ENV === "production", appVersion: require("../isomorphic/app-version"), - preRenderApplication + preRenderApplication, }; function enableHotReload(store) { @@ -21,12 +21,6 @@ function enableHotReload(store) { } } -if (window.OneSignal) { - Object.assign(opts, { - serviceWorkerLocation: "/OneSignalSDKWorker.js" - }); -} - global.wretch = wretch; startApp(renderApplication, REDUCERS, opts).then(enableHotReload); diff --git a/app/server/app.js b/app/server/app.js index a871c0dad..312f8a723 100644 --- a/app/server/app.js +++ b/app/server/app.js @@ -103,7 +103,6 @@ isomorphicRoutes(app, { staticRoutes: STATIC_ROUTES, seo: generateSeo, preloadJs: true, - oneSignalServiceWorkers: true, prerenderServiceUrl: "https://prerender.quintype.io", enableWebengage: true, webengageLicenseCode: "~10a5cb515", diff --git a/app/server/handlers/render-layout.js b/app/server/handlers/render-layout.js index 984b3daa7..de1f0c613 100644 --- a/app/server/handlers/render-layout.js +++ b/app/server/handlers/render-layout.js @@ -17,17 +17,9 @@ const fontJsContent = assetPath("font.js") ? readAsset("font.js") : ""; const allChunks = getAllChunks("list", "story", "home"); export async function renderLayout(res, params) { - const { - gtmId, - gaId, - cdnImage, - isOnesignalEnable, - isGtmEnable, - isGaEnable, - enableAds, - loadAdsSynchronously, - pageType, - } = getConfig(params.store.getState()); + const { gtmId, gaId, cdnImage, isGtmEnable, isGaEnable, enableAds, loadAdsSynchronously, pageType } = getConfig( + params.store.getState() + ); const chunk = params.shell ? null : allChunks[getChunkName(params.pageType)]; const criticalCss = await getCriticalCss(); const styleTags = await getStyleTags(); @@ -72,8 +64,6 @@ export async function renderLayout(res, params) { serialize, isGtmEnable, isGaEnable, - isOnesignalEnable, - oneSignalScript: params.oneSignalScript, enableAds: enableAds && params.pageType !== "profile-page", loadAdsSynchronously, placeholderDelay, diff --git a/app/server/helpers/index.js b/app/server/helpers/index.js index 33bbfbed8..d41607a9c 100644 --- a/app/server/helpers/index.js +++ b/app/server/helpers/index.js @@ -94,7 +94,6 @@ export const getConfig = (state) => { gaId: get(state, ["qt", "config", "publisher-attributes", "google_analytics", "id"], ""), isGaEnable: get(state, ["qt", "config", "publisher-attributes", "google_analytics", "is_enable"], false), cdnImage: get(state, ["qt", "config", "cdn-image"], ""), - isOnesignalEnable: get(state, ["qt", "config", "publisher-attributes", "onesignal", "is_enable"], false), enableAds: get(state, ["qt", "config", "ads-config", "dfp_ads", "enable_ads"]), loadAdsSynchronously: get(state, ["qt", "config", "ads-config", "dfp_ads", "load_ads_synchronously"]), pageType: get(state, ["qt", "pageType"], ""), diff --git a/views/pages/layout.ejs b/views/pages/layout.ejs index c7d094c95..8072e634f 100644 --- a/views/pages/layout.ejs +++ b/views/pages/layout.ejs @@ -64,10 +64,6 @@ <%_ }) _%> <%_ } _%> - - <%_ if(isOnesignalEnable) { _%> - <%- oneSignalScript -%> - <%_ } _%>