From 7af242454a9e14653b0270a46a6ed46ed00fac95 Mon Sep 17 00:00:00 2001 From: sidharth Date: Wed, 23 Feb 2022 15:44:14 +0530 Subject: [PATCH] production fixes --- .env.production | 22 +++++++++++----------- deploy_production.sh | 5 ----- deploy_staging.sh | 9 ++------- src/services/nav.js | 13 ++++++++----- 4 files changed, 21 insertions(+), 28 deletions(-) diff --git a/.env.production b/.env.production index 7334137..ee4c2fe 100644 --- a/.env.production +++ b/.env.production @@ -1,17 +1,17 @@ NODE_ENV=production VUE_APP_BRAINTREE_AUTH_KEY=sandbox_bn48hmp6_cz6p85sw4dr5tp8h -VUE_APP_MAGENTO_API_URL=https://retailer-stg.crane.com +VUE_APP_MAGENTO_API_URL=https://m2.crane.com VUE_APP_CRANE_URL=/shop VUE_APP_GATE_URL=/gate VUE_APP_ME_URL=/b2b VUE_APP_LOGIN_URL=/gate/sign-in -VUE_APP_PERSONALIZE_URL=https://studio-stg.crane.com/personalize -VUE_APP_IMAGE_PATH_URL=https://retailer-stg.crane.com/media/catalog/product +VUE_APP_PERSONALIZE_URL=https://studio.crane.com/personalize +VUE_APP_IMAGE_PATH_URL=https://m2.crane.com/media/catalog/product VUE_APP_RETAILOR_ID=49057567-f789-420c-98b6-2e0443af73f5 -VUE_APP_IMAGE_CATEGORY_PATH_URL=https://retailer-stg.crane.com -VUE_APP_NODESLS_API_URL=https://imagelib-sls-stg.crane.com +VUE_APP_IMAGE_CATEGORY_PATH_URL=https://m2.crane.com +VUE_APP_NODESLS_API_URL=https://imagelib-sls.crane.com -VUE_APP_HOME_PAGE_URL=https://www-stg.crane.com +VUE_APP_HOME_PAGE_URL=https://retailer.crane.com VUE_APP_CC_CONNECTION_URL=https://www.staging.personalized-stationery.com/CranesConnectionRedesign/Personalize.aspx? VUE_APP_MAINTENANCE_MODE=false VUE_APP_MAINTENANCE_PAGE_URL=/maintenance @@ -21,9 +21,9 @@ VUE_APP_IMAGE_CATEGORY_PARAMS=?height=600&width=600 VUE_APP_CRANE_ORDER_URL=https://ordertest.crane.com DEPLOY_S3_REGION=us-east-1 -DEPLOY_S3_BUCKET=retailer-edge-staging-website-bucket -DEPLOY_CLOUDFRONT_ID=E1QLFKCOZUDC8P -VUE_APP_ASSETS_NODESLS_URL=https://assets-stg-sls.crane.com -VUE_APP_IMAGE_LIB_URL=https://imagelib-stg-api.crane.com -VUE_APP_BASE_URL=https://retailer-stg.crane.com +DEPLOY_S3_BUCKET=retailer-edge-production-website-bucket +DEPLOY_CLOUDFRONT_ID=E1WSOW180GVD3S +VUE_APP_ASSETS_NODESLS_URL=https://assets-sls.crane.com +VUE_APP_IMAGE_LIB_URL=https://imagelib-api.crane.com +VUE_APP_BASE_URL=https://retailer.crane.com VUE_APP_RP_AUTH_NAME=rp_auth_prod \ No newline at end of file diff --git a/deploy_production.sh b/deploy_production.sh index 9926611..36e5bf6 100755 --- a/deploy_production.sh +++ b/deploy_production.sh @@ -5,11 +5,6 @@ yarn build:production yarn copy:git-info rm dist/static/js/craneRetailerCatalog.js rm dist/static/js/magentoCmsCache.js -rm dist/static/js/seoRoutes.js -rm dist/static/js/urlRewrites.js # yarn copy:seo-files # yarn copy:cache-files -rm dist/static/js/craneRetailerCatalog.js -rm dist/static/js/craneCategory.js -rm dist/static/js/promotions.js yarn deploy:production \ No newline at end of file diff --git a/deploy_staging.sh b/deploy_staging.sh index 3bc0e78..79e356a 100755 --- a/deploy_staging.sh +++ b/deploy_staging.sh @@ -3,13 +3,8 @@ rm -Rf git_info.json yarn yarn build:staging yarn copy:git-info -# rm dist/static/js/craneRetailerCatalog.js -# rm dist/static/js/magentoCmsCache.js -rm dist/static/js/seoRoutes.js -rm dist/static/js/urlRewrites.js +rm dist/static/js/craneRetailerCatalog.js +rm dist/static/js/magentoCmsCache.js # yarn copy:seo-files # yarn copy:cache-files -rm dist/static/js/craneCatalog.js -rm dist/static/js/craneCategory.js -rm dist/static/js/promotions.js yarn deploy:staging \ No newline at end of file diff --git a/src/services/nav.js b/src/services/nav.js index 6dfeeea..1cd9e91 100644 --- a/src/services/nav.js +++ b/src/services/nav.js @@ -9,12 +9,15 @@ const vueMaintenanceMode = process.env.VUE_APP_MAINTENANCE_MODE; const loginInterrupt = function(current_url, message) { - if(!current_url.includes("gate/sign-in")) - sessionStorage.crinterrupted_page = current_url; - sessionStorage.crinterrupt_message = message; + if (vueMaintenanceMode == "false"){ + if(!current_url.includes("gate/sign-in")) + sessionStorage.crinterrupted_page = current_url; + sessionStorage.crinterrupt_message = message; - if(!current_url.includes("gate/sign-in")) - window.location.href = loginUrl; + if(!current_url.includes("gate/sign-in")) + window.location.href = loginUrl; + } + } const redirectToInterruptedPage = function() {