Skip to content
This repository has been archived by the owner on Sep 26, 2024. It is now read-only.

Commit

Permalink
Update translators branch with master (#5865)
Browse files Browse the repository at this point in the history
* Konstantinos / Konstantinos / [SEO] Re-optimisation of Deriv homepage (#5817)

* fix: seo updates

* fix: seo updates translations

* fix: german

* chore: vercel

---------

Co-authored-by: “konstantinosG-deriv” <“[email protected]”>
Co-authored-by: DerivFE <[email protected]>

* auto-pull-translation (#5848)

* auto-pull-translation

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

---------

Co-authored-by: Fasih Ali <[email protected]>
Co-authored-by: DerivFE <[email protected]>

* added missed image to help centre (#5847)

* fix

* chore: empty commit

* Habib/disable whatsapp (#5854)

* chore: disable whatsapp

* chore: fixes

---------

Co-authored-by: yashim-deriv <[email protected]>

* Revert "Habib/disable whatsapp (#5854)" (#5856)

This reverts commit 37f5a63.

* chore: capture cf pages preview url to run lighthouse and smoke test (#5853)

* fix: table update (#5843)

* fix: table update

* fix: min size change

* fix: 🏷️ fix trackjs issue (#5826)

* fix: 🏷️ fix trackjs issue

* empty: 🚀 to redeploy and trigger build

* Mitra/Update the faq for dbot (#5813)

* feat: 💬 update the faq for dbot

* feat: 💚 update message json

* text: 💬 add space

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

---------

Co-authored-by: DerivFE <[email protected]>

* Translation 00 affiliate ib 4 (#5835)

* feat: updated earn text

* feat: updated affilate programme subtext

* feat: updated revenue share content

* feat: updated turnover content

* fix: height issue

* feat: updated cpa content

* feat: how it calculated button

* feat: signup button

* feat: created a different component for revenue share card

* feat: created a different component for turnover card

* feat: created a different component for cpa eu only card

* fix: cleanup

* feat: splited revenue card into two and added toggle functionality

* feat: splited turnover card into two and added toggle functionality

* feat: splited cpa card into two and added toggle functionality

* feat: updated cpa content

* fix: height issue

* feat: added master affiliate card

* feat: affilate card calculate data

* feat: cpa calculate data added

* fix: cleanup

* feat: cpa eu card added

* fix: replace all text component

* feat: update faq data

* feat: update faq links

* fix: headers margin

* fix: height issue

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* auto-pull-translation

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* fix: earn and subtext contnet

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* fix: eu  issues

* fix: spacing issues

* fix: spacing issues

* fix: calculate button

* fix: spacing issues

* fix: 100 USD

* fix: 100 USD

* fix: increase heights

* fix: cpa row dir name changed

* fix: usd value

* fix: usd value

* fix: responsive align

* auto-pull-translation

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* empty: 🚀 to redeploy and trigger build

* fix: will revert it

* fix: revert

* fix: links

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* empty: 🚀 to redeploy and trigger build

* auto-pull-translation

* empty: 🚀 to redeploy and trigger build

* auto-pull-translation

* auto-pull-translation

* fix: 💬 fetch master translation (#5833)

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* fix: 💬 fetch master translation (#5833)

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

---------

Co-authored-by: DerivFE <[email protected]>
Co-authored-by: mitra-deriv <[email protected]>
Co-authored-by: mitra-deriv <[email protected]>

* Prince/create a workflow to update translators branch (#5859)

* chore: create a workflow to update translators branch

* chore: remove crowdin command

* chore: updated emoji

* fix: updated plugins version

* chore: fetch crowdin master (#5862)

* fix: added title on pr create (#5863)

* Aswathy/auto-pull-translation (#5861)

* auto-pull-translation

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

---------

Co-authored-by: DerivFE <[email protected]>

---------

Co-authored-by: konstantinosG-deriv <[email protected]>
Co-authored-by: “konstantinosG-deriv” <“[email protected]”>
Co-authored-by: DerivFE <[email protected]>
Co-authored-by: fasihali-deriv <[email protected]>
Co-authored-by: Fasih Ali <[email protected]>
Co-authored-by: Eduard Hrachou <[email protected]>
Co-authored-by: Habib Deriv <[email protected]>
Co-authored-by: yashim-deriv <[email protected]>
Co-authored-by: balakrishna-deriv <[email protected]>
Co-authored-by: mayuran-deriv <[email protected]>
Co-authored-by: mitra-deriv <[email protected]>
Co-authored-by: Hasan Mobarak <[email protected]>
Co-authored-by: mitra-deriv <[email protected]>
Co-authored-by: prince-deriv <[email protected]>
Co-authored-by: Aswathy-Deriv <[email protected]>
  • Loading branch information
16 people authored Nov 8, 2023
1 parent 72af3af commit 5d7156b
Show file tree
Hide file tree
Showing 62 changed files with 10,695 additions and 8,616 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/generate-preview-link.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ jobs:
- name: Post Cloudflare Pages Preview comment
uses: marocchino/sticky-pull-request-comment@v2
with:
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
header: Cloudflare Pages Preview Comment
number: ${{steps.pr_information.outputs.issue_number}}
message: ${{steps.generate_action_url.outputs.comment}}
Expand Down Expand Up @@ -183,6 +184,7 @@ jobs:
if: success() || failure()
uses: marocchino/sticky-pull-request-comment@v2
with:
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
header: Cloudflare Pages Preview Comment
number: ${{steps.pr_information.outputs.issue_number}}
message: ${{steps.generate_preview_url.outputs.comment || steps.generate_failure_comment.outputs.comment }}
Expand Down
165 changes: 82 additions & 83 deletions .github/workflows/lighthouse.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
name: Deriv Lighthouse Audit

permissions:
actions: write
checks: write
contents: write
deployments: write
pull-requests: write
statuses: write
actions: write
checks: write
contents: write
deployments: write
pull-requests: write
statuses: write

on:
issue_comment:
types: [edited]
types: [created]

jobs:
generate_lighthouse_audit:
Expand All @@ -26,9 +26,9 @@ jobs:
header: lighthouse
message: |
Running Lighthouse audit...
- name: Capture Vercel preview URL
id: vercel_preview_url
uses: binary-com/vercel-preview-url-action@v1.0.5
- name: Capture preview URL
id: capture_preview_url
uses: deriv-com/capture-url-from-issue-comment@v1.0.4
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/checkout@v3
Expand All @@ -37,7 +37,7 @@ jobs:
uses: treosh/lighthouse-ci-action@v9
with:
urls: |
${{ steps.vercel_preview_url.outputs.vercel_preview_url }}
${{ steps.capture_preview_url.outputs.url }}
uploadArtifacts: true
temporaryPublicStorage: true
runs: 5
Expand Down Expand Up @@ -83,7 +83,6 @@ jobs:
core.setOutput("best_practices_color", score(result['best-practices']));
core.setOutput("full_report", full_report);
- name: Add comment to PR
id: comment_to_pr
uses: marocchino/sticky-pull-request-comment@v2
Expand All @@ -100,83 +99,83 @@ jobs:
status: custom
fields: workflow,job,commit,repo
custom_payload: |
{
"blocks": [
{
"type": "section",
"text": {
"type": "plain_text",
"emoji": true,
"text": "It appears that this pull request has not met the required performance score."
}
},
{
"type": "divider"
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "*${{ steps.format_lighthouse_score.outputs.performance_color }} PERFORMANCE:* ${{ steps.format_lighthouse_score.outputs.performance }}\n\n*${{ steps.format_lighthouse_score.outputs.accessibility_color }} ACCESSIBILITY:* ${{ steps.format_lighthouse_score.outputs.accessibility }}\n\n*${{ steps.format_lighthouse_score.outputs.best_practices_color }} BEST PRACTICES:* ${{ steps.format_lighthouse_score.outputs.best_practices }}\n\n*${{ steps.format_lighthouse_score.outputs.seo_color }} SEO:* ${{ steps.format_lighthouse_score.outputs.seo }} \n\n*${{ steps.format_lighthouse_score.outputs.pwa_color }} PWA:* ${{ steps.format_lighthouse_score.outputs.pwa }}"
}
},
{
"type": "divider"
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "*User: <${{ github.event.issue.user.url }}|${{ github.event.issue.user.login }}>*\n*Link:* ${{ github.event.issue.pull_request.html_url }}\n*Title:* ${{ github.event.issue.title }}\n*Status:* ${{ github.event.issue.state }}"
{
"blocks": [
{
"type": "section",
"text": {
"type": "plain_text",
"emoji": true,
"text": "It appears that this pull request has not met the required performance score."
}
},
"accessory": {
"type": "image",
"image_url": "${{ github.event.issue.user.avatar_url }}",
"alt_text": "${{ github.event.issue.user.login }}"
}
},
{
"type": "divider"
},
{
"type": "context",
"elements": [
{
"type": "image",
"image_url": "https://api.slack.com/img/blocks/bkb_template_images/notificationsWarningIcon.png",
"alt_text": "notifications warning icon"
},
{
{
"type": "divider"
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "*<!subteam^S04RV6RFCTW> please check the PR*"
"text": "*${{ steps.format_lighthouse_score.outputs.performance_color }} PERFORMANCE:* ${{ steps.format_lighthouse_score.outputs.performance }}\n\n*${{ steps.format_lighthouse_score.outputs.accessibility_color }} ACCESSIBILITY:* ${{ steps.format_lighthouse_score.outputs.accessibility }}\n\n*${{ steps.format_lighthouse_score.outputs.best_practices_color }} BEST PRACTICES:* ${{ steps.format_lighthouse_score.outputs.best_practices }}\n\n*${{ steps.format_lighthouse_score.outputs.seo_color }} SEO:* ${{ steps.format_lighthouse_score.outputs.seo }} \n\n*${{ steps.format_lighthouse_score.outputs.pwa_color }} PWA:* ${{ steps.format_lighthouse_score.outputs.pwa }}"
}
]
},
{
"type": "divider"
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "Want the full lighthouse report?"
},
"accessory": {
"type": "button",
{
"type": "divider"
},
{
"type": "section",
"text": {
"type": "plain_text",
"text": "View",
"emoji": true
"type": "mrkdwn",
"text": "*User: <${{ github.event.issue.user.url }}|${{ github.event.issue.user.login }}>*\n*Link:* ${{ github.event.issue.pull_request.html_url }}\n*Title:* ${{ github.event.issue.title }}\n*Status:* ${{ github.event.issue.state }}"
},
"accessory": {
"type": "image",
"image_url": "${{ github.event.issue.user.avatar_url }}",
"alt_text": "${{ github.event.issue.user.login }}"
}
},
{
"type": "divider"
},
{
"type": "context",
"elements": [
{
"type": "image",
"image_url": "https://api.slack.com/img/blocks/bkb_template_images/notificationsWarningIcon.png",
"alt_text": "notifications warning icon"
},
{
"type": "mrkdwn",
"text": "*<!subteam^S04RV6RFCTW> please check the PR*"
}
]
},
{
"type": "divider"
},
{
"type": "section",
"text": {
"type": "mrkdwn",
"text": "Want the full lighthouse report?"
},
"value": "click_me_123",
"url": "${{ steps.format_lighthouse_score.outputs.full_report }}",
"action_id": "button-action"
"accessory": {
"type": "button",
"text": {
"type": "plain_text",
"text": "View",
"emoji": true
},
"value": "click_me_123",
"url": "${{ steps.format_lighthouse_score.outputs.full_report }}",
"action_id": "button-action"
}
},
{
"type": "divider"
}
},
{
"type": "divider"
}
]
}
]
}
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_LIGHTHOUSE }}
120 changes: 60 additions & 60 deletions .github/workflows/smoketests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,68 +8,68 @@ permissions:
pull-requests: write
statuses: write

on:
on:
issue_comment:
types: [edited]
types: [created]

jobs:
cypress-run:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
containers: [1,2,3,4,5]
cypress-run:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
containers: [1, 2, 3, 4, 5]

steps:
- name: Capture preview URL
id: capture_preview_url
uses: deriv-com/[email protected]
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Checkout external repository with Cypress tests
uses: actions/checkout@v4
with:
repository: deriv-com/e2e-deriv-com

- name: Cypress run
# Uses the official Cypress GitHub action https://github.com/cypress-io/github-action
uses: cypress-io/github-action@v6
with:
# Records to Cypress Cloud
# https://docs.cypress.io/guides/cloud/projects#Set-up-a-project-to-record
record: true
parallel: true # Runs test in parallel using settings above
spec: cypress/e2e/smoke/*.js
group: 'Smoke Tests'

steps:
- name: Capture Vercel preview URL
id: vercel_preview_url
uses: binary-com/[email protected]
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Checkout external repository with Cypress tests
uses: actions/checkout@v4
with:
repository: deriv-com/e2e-deriv-com
env:
# For recording and parallelization to work you must set your CYPRESS_RECORD_KEY
# in GitHub repo → Settings → Secrets → Actions
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
# Creating a token https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
# Set Base Url from client_payload.
CYPRESS_BASE_URL: ${{ steps.capture_preview_url.outputs.url }}
# Send PR details to Cypress test run
COMMIT_INFO_MESSAGE: PR "${{ github.event.issue.number }}" in Repo "${{ github.repository }}" (v2)

- name: Cypress run
# Uses the official Cypress GitHub action https://github.com/cypress-io/github-action
uses: cypress-io/github-action@v6
with:
# Records to Cypress Cloud
# https://docs.cypress.io/guides/cloud/projects#Set-up-a-project-to-record
record: true
parallel: true # Runs test in parallel using settings above
spec: cypress/e2e/smoke/*.js
group: 'Smoke Tests'

env:
# For recording and parallelization to work you must set your CYPRESS_RECORD_KEY
# in GitHub repo → Settings → Secrets → Actions
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
# Creating a token https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/creating-a-personal-access-token
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
# Set Base Url from client_payload.
CYPRESS_BASE_URL: ${{ steps.vercel_preview_url.outputs.vercel_preview_url }}
# Send PR details to Cypress test run
COMMIT_INFO_MESSAGE: PR "${{ github.event.issue.number }}" in Repo "${{ github.repository }}" (v2)
- name: Set comments message
id: set_msg
if: always()
run: |
# Using shell script to conditionally set the message
if [[ "${{ job.status }}" == "success" ]]; then
echo "msg=:rocket: Smoke test run (${{ matrix.containers }}) passed successfully!" >> $GITHUB_OUTPUT
else
echo "msg=:x: Smoke test run (${{ matrix.containers }}) failed. See logs for details: [Visit Action](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}})" >> $GITHUB_OUTPUT
fi
- name: Set comments message
id: set_msg
if: always()
run: |
# Using shell script to conditionally set the message
if [[ "${{ job.status }}" == "success" ]]; then
echo "msg=:rocket: Smoke test run (${{ matrix.containers }}) passed successfully!" >> $GITHUB_OUTPUT
else
echo "msg=:x: Smoke test run (${{ matrix.containers }}) failed. See logs for details: [Visit Action](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}})" >> $GITHUB_OUTPUT
fi
- name: Leave comment
if: always()
uses: marocchino/sticky-pull-request-comment@v2
with:
header: Smoke tests status update
number: ${{ github.event.issue.number }}
message: "${{ steps.set_msg.outputs.msg }}"
recreate: true
- name: Leave comment
if: always()
uses: marocchino/sticky-pull-request-comment@v2
with:
header: Smoke tests status update
number: ${{ github.event.issue.number }}
message: '${{ steps.set_msg.outputs.msg }}'
recreate: true
Loading

0 comments on commit 5d7156b

Please sign in to comment.