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

Commit

Permalink
Quill pr 3317 setup monorep config (#7215)
Browse files Browse the repository at this point in the history 
* chore: create themes and sites dir

* chore: created row and eu sites directiory

* chore: created gatsby-theme-deriv directory

* chore: moved src into deriv theme directory

* chore: moved types into deriv theme directory

* chore: moved static and gatsby files into deriv theme directory

* chore: moved storybook and favicons files into deriv theme directory

* chore: added eslint to theme

* chore: added typescript to theme

* chore: added workspaces

* chore: added eslint script

* chore: added stylelint script

* chore: added prettier script

* chore: added prettier and git ignore

* chore: udpated jest configure

* chore: fixed checkbox test

* chore: added codegen script

* chore: added storybook script

* chore: added react packages

* chore: moved packages to theme

* chore: added theme config and options

* chore: added row script

* chore: moved i18 files to theme

* chore: updated favicon path in gatsby config

* chore: moved babel tailwind and js config file to theme

* chore: added clean script

* chore: updated eslint and tsconfig to fix alias import error

* chore: added theme to sites

* chore: fixed sass classnames issue

* chore: updated tailwind config

* chore: fixed env issue

* chore: fixed eslint issues

* chore: added build script

* chore: fixed html minification issue

* chore: fixed html minification issue

* chore: updated partytown scripts

* chore: updated serve scripts

* chore: updated htaccess script

* chore: updated translation scripts

* chore: updated link generate workflow

* chore: updated link generate workflow

* chore: added new workflow

* chore: removed workflow

* empty: 🚀 to redeploy and trigger build

* feat: added region conditions on home and header nav

* chore: test workflow

* chore: merge cleanup

* chore: added region based data for homepage

* chore: added a different port to eu serve

* chore: test workflow

* empty: 🚀 to redeploy and trigger build

* empty: 🚀 to redeploy and trigger build

* empty: 🚀 to redeploy and trigger build

* chore: test workflow

* chore: test workflow

* chore: removed

* empty: 🚀 to redeploy and trigger build

* chore: removed workflow

* Pr 00 workflow fix 4 (#7182)

* chore: test workflow

* chore: removed

* chore: test

* chore: test

* chore: fixed preview link workflow

* chore: test workflow

* chore: test

* empty: 🚀 to redeploy and trigger build

* chore: testing eu domain utility

* Agrim/DPROD-3557/Translation 3557 footer change (#7158)

* text: updating footer text

* text: updating the text in the footer for EU and CPA

* text: terms and conditions edit of text

* text: edit the text

* text: formatting the text

* fix: changes in the text links

* fix: fixing t&c, risk disclosure, secure links

* auto-pull-translation

* auto-pull-translation

* fix: modifications in footer

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* fix: changes in the text links

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* fix: to redeploy and trigger build

* auto-pull-translation

* fix: to redeploy and trigger build

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* Agrim/DPROD-3441/Set disclaimer on trade specifications (#7095)

* text: disclaimer on trade specifications

* auto-pull-translation

* fix: resolve conflict

* fix: fixing the error

* fix: resolve conflicts

* auto-pull-translation

* fix: resolve conflict

* fix: fixing the error

* fix: resolve conflict

* auto-pull-translation

* fix: resolve conflict

* fix: fixing the error

* fix: resolve conflict

* auto-pull-translation

* fix: resolve conflict

* fix: fixing the error

* text: updating footer text

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* fix: to redeploy and trigger build

* auto-pull-translation

* fix: to redeploy and trigger build

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* fix: resolve conflict

* fix: resolve conflict

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* fix: to redeploy and trigger build

* auto-pull-translation

* fix: to redeploy and trigger build

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* fix: resolve conflict

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* fix: to redeploy and trigger build

* auto-pull-translation

* fix: to redeploy and trigger build

* auto-pull-translation

* auto-pull-translation

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

* fix: resolve conflict

* auto-pull-translation

* translation: 📚 sync translations from crowdin feature branch

---------

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

* Agrim/DPROD-3025/Replace the spanish row pdf's with english to spanish pdf's (#7128)

* fix: replacing the spanish row pdf's with english to spanish pdf's

* fix: remove spaces from pdf name

* behnaz/DPROD-3359/Feb trading data (#7060)

* chorn: fx row

* chorn: derived  row

* chorn: derived  coma row

* chorn: derived add quet  row

* chorn: derived add quet2  row

* chorn: stock row

* chorn: stock GBP row

* chorn: etfs  row

* chorn: etfs remove extra 1 row

* chorn: crypto row

* chorn: crypto base row

* chorn: comod row

* chorn: comod EU

* chorn: fx  EU

* chorn: derived  EU

* chorn: stock  EU

* chorn: etfs  EU

* chorn: crypto  EU

* chore: updated eu domains list

* mayuran/DPROD-2759/ws_improvements (#7070)

* fix: wip

* fix: dummy initial

* fix: check socket

* fix: added conditionsa

* fix: ws call

* fix: ws reconnect

* fix: check api manager

* chore: trigger vercel

* fix: ws socket calls

* fix: session storage

* fix: window added

* fix: addded window

* fix: remove unwanted code

* fix: check

* fix: kogs

* fix: ready state

* fix: code clear

* fix: added logs

* fix: minor issue in reconnect

* fix: loading changed logic

* fix: remove session storage

* Revert "fix: remove session storage"

This reverts commit abb84c3.

* fix: remove session storage

* fix: improvement of use WS

* chore: updated extract translations

* chore: updated extract translations

* chore: removed old preview link action

* chore: updated who we are page

* fix: remove console logs (#7201)

* Update smoketests.yml - change e2e skip term (#7194)

* Update smoketests.yml - change e2e skip term

If the term 'skipsm' is specified in the branch name then skip the e2e tests (used to be 'quill').

This is because the dev knows they are making radical change which will need the tests to be modified at a later date.

* Update smoketests.yml - Modified to use DRAFT param

Skip smoket test if the PR is in Draft mode.

* Update generate-preview-link.yml - Add DRAFT param (#7198)

We need to store a new param to GH storage, DRAFT. So that the smoketest.yml can use it to ignore a test run.

* Fasih/DPROD-3590/integrate firebase feature flag for third party items (#7149)

* feat: implement json which contain items name

* feat: adding flag on third party packages

* feat: implemented flag on trade platfrom apps

* feat: removed unsued code

* feat: made some items value false

* feat: enabled all items

* feat: add condition for derivgo footer badge

* feat: updated keys

* feat: interated api and hook

* feat: updated hook with importing function

* feat: updated hook and filtered footer icon data

* feat: remvoed hotjar and gtm from flags

* feat: removed unused code

* feat: made every item true

* feat: updated other layout files

* feat: updated the condition

---------

Co-authored-by: fasihali-deriv <[email protected]>
Co-authored-by: Muhammad Fasih Ali Naqvi <[email protected]>

* chore: fixed regulatory type

* chore: updated regulatory page

* chore: updated contact us and careers page

* chore: updated locations page

* chore: updated partners page

* chore: update multiple build action yml (#7210)

* chore: update multiple build action yml

* chore: update action with To DO

* chore: updated deriv prime page

* chore: updated affiliate ib page

* chore: updated 404 page

* chore: updated payment agent page

* chore: test workflow

* chore: test

* empty: 🚀 to redeploy and trigger build

---------

Co-authored-by: fasihali-deriv <[email protected]>
Co-authored-by: Agrim Jain <[email protected]>
Co-authored-by: DerivFE <[email protected]>
Co-authored-by: prince-deriv <[email protected]>
Co-authored-by: behnaz <[email protected]>
Co-authored-by: mayuran-deriv <[email protected]>
Co-authored-by: markodonnell-deriv <[email protected]>
Co-authored-by: fasihali-deriv <[email protected]>
Co-authored-by: Muhammad Fasih Ali Naqvi <[email protected]>
Co-authored-by: Habib Deriv <[email protected]>
  • Loading branch information
@hasan-deriv @fasihali-deriv
@agrim-deriv @DerivFE @prince-deriv @behnaz-deriv @mayuran-deriv @markodonnell-deriv @habib-deriv
11 people authored Mar 1, 2024
1 parent c0c840d commit 7cb6d74
Show file tree
Hide file tree
Showing 3,351 changed files with 19,164 additions and 15,160 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
22 changes: 9 additions & 13 deletions .eslintrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
],
"rules": {
"@typescript-eslint/explicit-module-boundary-types": "off",
"import/no-named-as-default": "off",
"deprecation/deprecation": "warn"
},
"parserOptions": {
Expand Down Expand Up @@ -83,7 +84,7 @@
]
}
],
"import/no-useless-path-segments": "error",
// "import/no-useless-path-segments": "error",
"import/prefer-default-export": 0,
"import/order": [
"error",
Expand Down Expand Up @@ -132,21 +133,16 @@
"jest": true
},
"settings": {
"import/parsers": {
"@typescript-eslint/parser": [".ts", ".tsx"]
},
"import/resolver": {
"typescript": {
"project": ["tsconfig.json", "themes/gatsby-theme-deriv/tsconfig.json"]
},
"node": {
"paths": [
"src"
],
"extensions": [
".js",
".jsx",
".ts",
".tsx"
]
"project": ["tsconfig.json", "themes/gatsby-theme-deriv/tsconfig.json"]
}
},
"react": {
"version": "17"
}
}
}
7 changes: 4 additions & 3 deletions .github/workflows/generate-preview-link-eu.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ concurrency:

jobs:
build_eu_to_cloudflare_pages:
runs-on: Runner_16cores
runs-on: Ubuntu-latest
if: contains(github.event.pull_request.head.ref, 'multiple-build')
permissions:
checks: write
pull-requests: write
Expand Down Expand Up @@ -117,7 +118,7 @@ jobs:
echo "Deploying build to Cloudflare Pages"
directory='sites/eu/public'
projectName='deriv-com-preview-links'
branch=eutestlink-$(echo "$HEAD_BRANCH" | head -c 20 | sed 's/[\/_\.]/-/g; s/[^a-zA-Z0-9]$/1/')
branch=eu-$(echo "$HEAD_BRANCH" | head -c 20 | sed 's/[\/_\.]/-/g; s/[^a-zA-Z0-9]$/1/')
cf_preview_url=$(wrangler pages deploy $directory --project-name=$projectName --branch=$branch > log.txt 2>&1; echo $?)
echo "------"
preview_url=https://$branch.deriv-com-preview-links.pages.dev
Expand Down Expand Up @@ -178,4 +179,4 @@ jobs:
uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2
with:
name: 'pr-${{github.run_id}}'
path: .pr
path: .pr
6 changes: 4 additions & 2 deletions .github/workflows/generate-preview-link-row.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ concurrency:

jobs:
build_row_to_cloudflare_pages:
runs-on: Runner_16cores
runs-on: Ubuntu-latest
# To be removed once released in production
if: contains(github.event.pull_request.head.ref, 'multiple-build')
permissions:
checks: write
pull-requests: write
Expand Down Expand Up @@ -117,7 +119,7 @@ jobs:
echo "Deploying build to Cloudflare Pages"
directory='sites/row/public'
projectName='deriv-com-preview-links'
branch=rowtestlink-$(echo "$HEAD_BRANCH" | head -c 20 | sed 's/[\/_\.]/-/g; s/[^a-zA-Z0-9]$/1/')
branch=row-$(echo "$HEAD_BRANCH" | head -c 20 | sed 's/[\/_\.]/-/g; s/[^a-zA-Z0-9]$/1/')
cf_preview_url=$(wrangler pages deploy $directory --project-name=$projectName --branch=$branch > log.txt 2>&1; echo $?)
echo "------"
preview_url=https://$branch.deriv-com-preview-links.pages.dev
Expand Down
188 changes: 0 additions & 188 deletions .github/workflows/generate-preview-link.yml
View file

This file was deleted.

7 changes: 4 additions & 3 deletions .github/workflows/smoketests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
echo "preview_url=$(cat ./pr/PREVIEW_URL)" >> $GITHUB_OUTPUT
echo "branch_name=$(cat ./pr/BRANCHNAME)" >> $GITHUB_OUTPUT
echo "user_name=$(cat ./pr/USERNAME)" >> $GITHUB_OUTPUT
echo "draft=$(cat ./pr/DRAFT)" >> $GITHUB_OUTPUT
- name: Checkout external repository with Cypress tests
uses: actions/checkout@v4
Expand All @@ -48,7 +49,7 @@ jobs:

- name: Cypress run
# Uses the official Cypress GitHub action https://github.com/cypress-io/github-action
if: "!contains(steps.pr_information.outputs.branch_name, 'quill')"
if: (!steps.pr_information.outputs.draft)
uses: cypress-io/github-action@v6
with:
# Records to Cypress Cloud
Expand All @@ -71,7 +72,7 @@ jobs:

- name: Set comments message
id: set_msg
if: always() && !contains(steps.pr_information.outputs.branch_name, 'quill')
if: always() && (!steps.pr_information.outputs.draft)
run: |
# Using shell script to conditionally set the message
if [[ "${{ job.status }}" == "success" ]]; then
Expand All @@ -81,7 +82,7 @@ jobs:
fi
- name: Leave comment
if: always() && !contains(steps.pr_information.outputs.branch_name, 'quill')
if: always() && (!steps.pr_information.outputs.draft)
uses: marocchino/sticky-pull-request-comment@v2
with:
header: Smoke tests status update
Expand Down
Loading

0 comments on commit 7cb6d74

Please sign in to comment.