From c1e05e6f76ce0c3e2161e5420122fa7936556c2a Mon Sep 17 00:00:00 2001 From: Ilya Date: Wed, 30 Oct 2024 12:48:18 +0100 Subject: [PATCH 1/6] Update CODEOWNERS --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 6573fd121..2fa39dc28 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @AmsterGet @ViktorSoroka07 +* @AmsterGet @ViktorSoroka07 @maria-hambardzumian From 0fba762012705860130217e567ee86467bdb6ba7 Mon Sep 17 00:00:00 2001 From: Viktor Soroka Date: Thu, 31 Oct 2024 14:41:57 +0200 Subject: [PATCH 2/6] Fix blue bg in blog (#561) --- src/containers/BlogPostPage/BlogPostPage.scss | 4 ++++ src/containers/BlogPostPage/constants.tsx | 11 ----------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/containers/BlogPostPage/BlogPostPage.scss b/src/containers/BlogPostPage/BlogPostPage.scss index 93a27fc06..c3dcabc68 100644 --- a/src/containers/BlogPostPage/BlogPostPage.scss +++ b/src/containers/BlogPostPage/BlogPostPage.scss @@ -24,6 +24,10 @@ padding: calc(72px + var(--header-height)) 120px 8px 120px; } + p { + white-space: pre-wrap; + } + &__head { @include m.breakpoint(v.$desktop-sm) { width: 1200px; diff --git a/src/containers/BlogPostPage/constants.tsx b/src/containers/BlogPostPage/constants.tsx index 321bbcaf9..b937647bb 100644 --- a/src/containers/BlogPostPage/constants.tsx +++ b/src/containers/BlogPostPage/constants.tsx @@ -72,15 +72,4 @@ export const OPTIONS = { {children} ), }, - renderText: text => - text - .split('\n') - .reduce( - (children, textSegment, index) => [ - ...children, - index > 0 &&
, - textSegment, - ], - [], - ), }; From 901222b0a0592a411702f5efdcbb973f3a679a4f Mon Sep 17 00:00:00 2001 From: OleksandrDragun <42969419+OleksandrDragun@users.noreply.github.com> Date: Thu, 31 Oct 2024 19:49:02 +0200 Subject: [PATCH 3/6] fix shift+enter contentful combination in the table cell (#562) --- src/containers/BlogPostPage/BlogPostPage.scss | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/containers/BlogPostPage/BlogPostPage.scss b/src/containers/BlogPostPage/BlogPostPage.scss index c3dcabc68..8241e34fc 100644 --- a/src/containers/BlogPostPage/BlogPostPage.scss +++ b/src/containers/BlogPostPage/BlogPostPage.scss @@ -24,10 +24,6 @@ padding: calc(72px + var(--header-height)) 120px 8px 120px; } - p { - white-space: pre-wrap; - } - &__head { @include m.breakpoint(v.$desktop-sm) { width: 1200px; @@ -163,6 +159,10 @@ margin-bottom: 164px; } + p { + white-space: pre-wrap; + } + .blog-post-page__second-heading:first-child, .blog-post-page__paragraph:first-child { margin-top: 0; @@ -390,6 +390,7 @@ margin: 8px 0 0; line-height: 24px; + white-space: pre-wrap; color: var(--dark); &:first-child { From 05facc09a3246e14b7cd30ec8d28aa25053ebf43 Mon Sep 17 00:00:00 2001 From: Viktor Soroka Date: Thu, 31 Oct 2024 19:49:53 +0200 Subject: [PATCH 4/6] Fix `deploy-dev` github action (#563) --- .github/workflows/deploy-dev.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index a6e5fd531..5b52e241d 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -88,8 +88,6 @@ jobs: run: | touch .env.production - CONTENTFUL_ENV_ID=${{ env.CONTENTFUL_ENV_ID }} - CONTENTFUL_HOST=${{ env.CONTENTFUL_HOST }} CONTENTFUL_ACCESS_TOKEN=${{ secrets.CONTENTFUL_ACCESS_TOKEN }} if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then @@ -100,15 +98,10 @@ jobs: CONTENTFUL_ACCESS_TOKEN=${{ secrets.CONTENTFUL_PREVIEW_ACCESS_TOKEN_DEV }} fi fi - + echo CONTENTFUL_ENV_ID=$CONTENTFUL_ENV_ID >> $GITHUB_ENV + echo CONTENTFUL_HOST=$CONTENTFUL_HOST >> $GITHUB_ENV echo CONTENTFUL_ACCESS_TOKEN=$CONTENTFUL_ACCESS_TOKEN >> .env.production - echo CONTENTFUL_ENV_ID=$CONTENTFUL_ENV_ID >> .env.production - echo CONTENTFUL_HOST=$CONTENTFUL_HOST >> .env.production echo CONTENTFUL_SPACE_ID=${{ secrets.CONTENTFUL_SPACE_ID_DEV }} >> .env.production - echo GTM_ID=${{ env.GTM_ID }} >> .env.production - echo CONTACT_US_URL=${{ env.CONTACT_US_URL }} >> .env.production - echo DOCUMENTATION_URL=${{ env.DOCUMENTATION_URL }} >> .env.production - echo GATSBY_MAILCHIMP_LIST_ID=${{ env.GATSBY_MAILCHIMP_LIST_ID }} >> .env.production - name: Build the source code run: npm run build From 6aff8474ac5a6e4ed6d0eeb077f0f654c1ef014f Mon Sep 17 00:00:00 2001 From: Viktor Soroka Date: Thu, 31 Oct 2024 20:45:34 +0200 Subject: [PATCH 5/6] Fix `deploy-dev` github action (#566) --- .github/workflows/deploy-dev.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 5b52e241d..8c17c5cd2 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -102,6 +102,10 @@ jobs: echo CONTENTFUL_HOST=$CONTENTFUL_HOST >> $GITHUB_ENV echo CONTENTFUL_ACCESS_TOKEN=$CONTENTFUL_ACCESS_TOKEN >> .env.production echo CONTENTFUL_SPACE_ID=${{ secrets.CONTENTFUL_SPACE_ID_DEV }} >> .env.production + echo GTM_ID=${{ env.GTM_ID }} >> .env.production + echo CONTACT_US_URL=${{ env.CONTACT_US_URL }} >> .env.production + echo DOCUMENTATION_URL=${{ env.DOCUMENTATION_URL }} >> .env.production + echo GATSBY_MAILCHIMP_LIST_ID=${{ env.GATSBY_MAILCHIMP_LIST_ID }} >> .env.production - name: Build the source code run: npm run build From fb1f94e88012835d33479b30449e951c2538b5e7 Mon Sep 17 00:00:00 2001 From: Viktor Soroka Date: Thu, 31 Oct 2024 21:25:39 +0200 Subject: [PATCH 6/6] Fix `deploy-dev` github action (#567) --- .github/workflows/deploy-dev.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 8c17c5cd2..ea2ad965d 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -15,14 +15,8 @@ name: Deploy to dev (AWS S3) env: AWS_S3_BUCKET_NAME : rpp-landing AWS_REGION_NAME : eu-central-1 - BUILD_DIR : public/ - CONTACT_US_URL: https://testio--partial.sandbox.my.salesforce-sites.com/leadcapture/services/apexrest/leadservice - DOCUMENTATION_URL: //reportportal.io/docs - GTM_ID: GTM-MK7ZHTL CLOUDFRONT_ID: EILUB1IE9EON0 - GATSBY_MAILCHIMP_LIST_ID: ca6d0eec5b - CONTENTFUL_ENV_ID: master - CONTENTFUL_HOST: cdn.contentful.com + BUILD_DIR : public/ on: push: @@ -88,6 +82,12 @@ jobs: run: | touch .env.production + CONTACT_US_URL=https://testio--partial.sandbox.my.salesforce-sites.com/leadcapture/services/apexrest/leadservice + DOCUMENTATION_URL=//reportportal.io/docs + GTM_ID=GTM-MK7ZHTL + GATSBY_MAILCHIMP_LIST_ID=ca6d0eec5b + CONTENTFUL_ENV_ID=master + CONTENTFUL_HOST=cdn.contentful.com CONTENTFUL_ACCESS_TOKEN=${{ secrets.CONTENTFUL_ACCESS_TOKEN }} if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then @@ -98,14 +98,14 @@ jobs: CONTENTFUL_ACCESS_TOKEN=${{ secrets.CONTENTFUL_PREVIEW_ACCESS_TOKEN_DEV }} fi fi - echo CONTENTFUL_ENV_ID=$CONTENTFUL_ENV_ID >> $GITHUB_ENV - echo CONTENTFUL_HOST=$CONTENTFUL_HOST >> $GITHUB_ENV + echo CONTENTFUL_ENV_ID=$CONTENTFUL_ENV_ID >> .env.production + echo CONTENTFUL_HOST=$CONTENTFUL_HOST >> .env.production echo CONTENTFUL_ACCESS_TOKEN=$CONTENTFUL_ACCESS_TOKEN >> .env.production echo CONTENTFUL_SPACE_ID=${{ secrets.CONTENTFUL_SPACE_ID_DEV }} >> .env.production - echo GTM_ID=${{ env.GTM_ID }} >> .env.production - echo CONTACT_US_URL=${{ env.CONTACT_US_URL }} >> .env.production - echo DOCUMENTATION_URL=${{ env.DOCUMENTATION_URL }} >> .env.production - echo GATSBY_MAILCHIMP_LIST_ID=${{ env.GATSBY_MAILCHIMP_LIST_ID }} >> .env.production + echo GTM_ID=$GTM_ID >> .env.production + echo CONTACT_US_URL=$CONTACT_US_URL >> .env.production + echo DOCUMENTATION_URL=$DOCUMENTATION_URL >> .env.production + echo GATSBY_MAILCHIMP_LIST_ID=$GATSBY_MAILCHIMP_LIST_ID >> .env.production - name: Build the source code run: npm run build