Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Konstantinos / Conflicts 3 #4364

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
ce82709
Konstantinos / Ubuntu font (#4088)
konstantinosG-deriv Jan 23, 2023
072d14b
Konstantinos / Reusable title (#4087)
konstantinosG-deriv Jan 23, 2023
807dd0f
chore: add assets
habib-deriv Jan 23, 2023
31b0609
Meenu/ live price rebranding (#4093)
meenakshi-deriv Jan 24, 2023
1a9a3d0
chore: fetch latest translations (#4090)
prince-deriv Jan 24, 2023
8c536fb
chore: fix conflicts
habib-deriv Jan 25, 2023
d34053f
chore: :sparkles: add reusable component for button (#4100)
mitra-deriv Jan 26, 2023
c59d433
refactor: stepperview component (#4108)
konstantinosG-deriv Jan 30, 2023
57d74e4
Konstantinos / Reusable component for number section (#4107)
konstantinosG-deriv Jan 30, 2023
a81faad
Habib/multi row gray bg (#4113)
habib-deriv Jan 30, 2023
15b2600
Mitra/Reusable button components with new design (#4114)
mitra-deriv Jan 31, 2023
14db655
Fix type and API issues (#4116)
habib-deriv Feb 1, 2023
ad021c4
chore: change content structure (#4120)
habib-deriv Feb 1, 2023
f5cbd3b
Habib/content structure update (#4121)
habib-deriv Feb 2, 2023
0ddc99f
Habib/update master rebranding (#4128)
habib-deriv Feb 2, 2023
b1196ca
Konstantinos / [FE Deriv.com squad] [Rebranding] Trader Type - Option…
konstantinosG-deriv Feb 3, 2023
427046b
Mitra/Reusable hero banner (#4135)
mitra-deriv Feb 6, 2023
6700e62
Konstantinos / Accumulators (#4134)
konstantinosG-deriv Feb 6, 2023
8ec274c
Konstantinos / CFDs rebrand (#4142)
konstantinosG-deriv Feb 7, 2023
35fa6b2
Konstantinos / CommonheaderSection improve (#4149)
konstantinosG-deriv Feb 7, 2023
1bbdb44
Konstantinos / Multipliers Rebrand (#4146)
konstantinosG-deriv Feb 7, 2023
6e032cb
Habib/rebranding deriv 8feb 1 (#4155)
habib-deriv Feb 8, 2023
b4f9c3e
Pr 85511 rebrand home page (#4115)
fasihali-deriv Feb 9, 2023
9d02c43
chore: updated from master
habib-deriv Feb 10, 2023
bdd710e
chore: updated from master
habib-deriv Feb 10, 2023
4eb2739
chore: add gray angled column Section (#4169)
habib-deriv Feb 13, 2023
1b08595
chore: add error check on live market table (#4171)
habib-deriv Feb 14, 2023
5905013
Konstantinos / Forex page rebrand (#4166)
konstantinosG-deriv Feb 14, 2023
7315ec7
Konstantinos / CFDs Derived description update (#4168)
konstantinosG-deriv Feb 14, 2023
d00e50f
Habib/ Update Navigation and remove Black Background (#4178)
habib-deriv Feb 14, 2023
1edcd55
chore: update github translation workflow (#4179)
habib-deriv Feb 15, 2023
75bc444
chore: update gap (#4180)
habib-deriv Feb 15, 2023
99d2813
Revert "chore: update github translation workflow (#4179)" (#4183)
habib-deriv Feb 15, 2023
1455f61
chore: update package-lock
habib-deriv Feb 15, 2023
65f3ce7
Konstantinos / Commodities Rebrand (#4185)
konstantinosG-deriv Feb 15, 2023
77093a3
Konstantinos / Cryptocurrencies Rebrand (#4184)
konstantinosG-deriv Feb 15, 2023
735378a
Konstantinos / Stocks and Indices Rebrand (#4176)
konstantinosG-deriv Feb 15, 2023
22128a2
Konstantinos / Derived page rebrand (#4175)
konstantinosG-deriv Feb 15, 2023
97338c6
Mitra/Footer and Nav changes rebranding (#4189)
mitra-deriv Feb 16, 2023
aa7c20b
Pr 86506 rebrand dtrader page (#4162)
fasihali-deriv Feb 16, 2023
3fa3e6f
chore: add strings (#4196)
habib-deriv Feb 16, 2023
8f2c712
feat: add accumulator tab (#4197)
konstantinosG-deriv Feb 16, 2023
3dc8d48
Konstantinos / [FE Deriv.com squad] Create design for Accumulators in…
konstantinosG-deriv Feb 16, 2023
e63f72a
chore: add strings (#4198)
habib-deriv Feb 16, 2023
e27590f
chore: add translation pages (#4206)
habib-deriv Feb 20, 2023
8cb9375
chore: update translation (#4218)
habib-deriv Feb 21, 2023
76c9e0f
fix: replace background images (#4229)
konstantinosG-deriv Feb 22, 2023
fb6f09b
Konstantinos / Multipliers Rebrand Subtasks (#4207)
konstantinosG-deriv Feb 22, 2023
9e0b796
Konstantinos / Derived subtasks (#4209)
konstantinosG-deriv Feb 22, 2023
d609a15
fix: subtasks (#4219)
konstantinosG-deriv Feb 22, 2023
d2bffff
fix: subtasks (#4228)
konstantinosG-deriv Feb 22, 2023
8aa4790
chore: translation strings (#4234)
habib-deriv Feb 22, 2023
728dd1a
Habib/update from master 22 (#4236)
habib-deriv Feb 22, 2023
cc782d7
Konstantinos / Options subtasks (#4233)
konstantinosG-deriv Feb 23, 2023
15120bf
fix: subtasks (#4232)
konstantinosG-deriv Feb 23, 2023
2383822
fix: subtasks (#4231)
konstantinosG-deriv Feb 23, 2023
d8f45d2
Pr 85511 optimise rebranded home page (#4222)
fasihali-deriv Feb 23, 2023
b91015e
Fasih /Pr 86506 rebrand dtrader page (#4211)
fasihali-deriv Feb 23, 2023
ab89804
Revert "Fasih /Pr 86506 rebrand dtrader page (#4211)" (#4238)
habib-deriv Feb 23, 2023
a34df5e
Revert "Pr 85511 optimise rebranded home page (#4222)" (#4239)
habib-deriv Feb 23, 2023
4a90e28
fix: subtasks (#4246)
konstantinosG-deriv Feb 26, 2023
566bb73
Pr 86506 rebrand dtrader page (#4248)
fasihali-deriv Feb 27, 2023
7a49d64
Pr 85511 optimise rebranded home page (#4249)
fasihali-deriv Feb 27, 2023
76889f3
Revert "Pr 85511 optimise rebranded home page (#4249)" (#4260)
habib-deriv Feb 27, 2023
4e31791
Pr 85511 optimise rebranded home page (#4263)
fasihali-deriv Feb 27, 2023
aa392b0
Konstantinos / Accumulators subtasks part 2 (#4240)
konstantinosG-deriv Feb 28, 2023
19870d3
fix: subtask (#4250)
konstantinosG-deriv Feb 28, 2023
51eb5d7
fix: subtasks and refactor image (#4252)
konstantinosG-deriv Feb 28, 2023
70f068f
fix: subtasks (#4255)
konstantinosG-deriv Feb 28, 2023
e3abf5b
chore: add translation (#4266)
habib-deriv Feb 28, 2023
0c61bbb
fix: rtl background image (#4272)
konstantinosG-deriv Mar 1, 2023
a5d74b1
fix: subtasks (#4270)
konstantinosG-deriv Mar 1, 2023
c15b39b
fix: change crypto pairs (#4269)
konstantinosG-deriv Mar 1, 2023
cc06d88
Meenu rebranding live price and trading spec (#4097)
meenakshi-deriv Mar 1, 2023
ab50154
Konstantinos / Forex subtasks part 2 (#4268)
konstantinosG-deriv Mar 2, 2023
82aea83
Pr 87521 rebrand derivgo page (#4265)
fasihali-deriv Mar 3, 2023
3d93c25
chore: add translation (#4280)
habib-deriv Mar 3, 2023
8c848c7
chore: add translation strings (#4296)
habib-deriv Mar 7, 2023
2f2a3c9
chore: translation strings (#4298)
habib-deriv Mar 8, 2023
748ca43
Konstantinos / Final Rebranding fixes (#4290)
konstantinosG-deriv Mar 10, 2023
9f41daa
auto-pull-translation
Mar 13, 2023
aec3227
Translation 87520 rebrand dbot page (#4306)
fasihali-deriv Mar 16, 2023
4159942
Konstantinos / Final rebranding fixes 2 (#4325)
konstantinosG-deriv Mar 20, 2023
8a21080
Merge branch 'translation-rebranding-deriv' of github.com:binary-com/…
Mar 20, 2023
cb766be
Konstantinos / Conflicts fix Rebranding-Master (#4361)
konstantinosG-deriv Mar 20, 2023
299a62f
Merge branch 'translation-rebranding-deriv' of github.com:binary-com/…
Mar 20, 2023
fc536e9
Merge branch 'master' of github.com:binary-com/deriv-com into transla…
Mar 20, 2023
8780fa6
fix: vercel2
Mar 20, 2023
8024dbf
fix: vercel
Mar 20, 2023
3b40fc9
fix: vercel
Mar 20, 2023
7a5c9b5
fix: vercel
Mar 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
152 changes: 152 additions & 0 deletions .github/workflows/content.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
name: Release Academy Content

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

on:
repository_dispatch:
types: [publish_academy]
env:
GATSBY_CPU_COUNT: 2
GATSBY_ENV: production

jobs:
lint:
timeout-minutes: 10
runs-on: ubuntu-latest
environment: production

steps:
- name: Checkout 🛎️
uses: actions/[email protected]

- name: Set up Node.js
uses: actions/setup-node@v1
with:
node-version: 16
- name: Cache dependencies
id: cache
uses: actions/cache@v2
env:
cache-name: cache-node-modules
with:
path: ./node_modules
key: modules-${{ hashFiles('package-lock.json') }}
- name: Install Node.js dependencies
run: |
npm ci
npm test

release-production:
needs: lint
timeout-minutes: 30
runs-on: ubuntu-latest
environment: production
steps:
- name: Checkout 🛎️
uses: actions/[email protected]

- name: fetch git tags
id: get_tag_name
run: |
git fetch --prune --unshallow --tags
GIT_TAG_NAME=`git tag --format='%(creatordate:short)%09%(refname:strip=2)' --sort=creatordate | grep production | awk '{ print $2; }' | tail -1`

echo "git tag is ${GIT_TAG_NAME}"
echo ::set-output name=VERSION::${GIT_TAG_NAME}

- name: Clone latest production tag
uses: actions/[email protected]
with:
ref: ${{ steps.get_tag_name.outputs.VERSION }}

- name: Setup Node
uses: actions/[email protected]
with:
node-version: '16.x'

- name: Set version env variable
run: echo "GATSBY_DERIV_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV

- name: Cache Gatsby
id: gatsby-cache-build
uses: actions/cache@v2
with:
path: |
public
.cache
key: ${{ runner.os }}-gatsby-build-${{ secrets.CACHE_VERSION }}-${{ github.run_id }}
restore-keys: |
${{ runner.os }}-gatsby-build-${{ secrets.CACHE_VERSION }}

- run: npm ci
- run: npm run format
- run: npm run test
- run: npm run build

- name: Remove Storybook
uses: JesseTG/[email protected]
with:
path: public/storybook

- uses: olegtarasov/[email protected]
id: tagName
# For using same tag for staging and production we need to uncomment these two below lines:
# with:
# tagRegex: "production(.*)"

- name: Building docker image 🐳
run: docker build -t ${{ secrets.DOCKHUB_ORGANISATION }}/deriv-com:latest -t ${{ secrets.DOCKHUB_ORGANISATION }}/deriv-com:${{ steps.get_tag_name.outputs.VERSION }} .

- name: Pushing Image to docker hub 🐳
run: |
echo ${{ secrets.DOCKERHUB_PASSWORD }}| docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
docker push ${{ secrets.DOCKHUB_ORGANISATION }}/deriv-com:latest
docker push ${{ secrets.DOCKHUB_ORGANISATION }}/deriv-com:${{ steps.get_tag_name.outputs.VERSION }}

- name: git tag used for deployment
run: |
echo "git tag used for deployment is: ${{ steps.get_tag_name.outputs.VERSION }} "
- name: Deploy 🚀
run: |
export NAMESPACE="deriv-com-production"
export SERVICEACCOUNT_TOKEN=${{ secrets.SERVICEACCOUNT_TOKEN }}
export DOCKERHUB_ORGANISATION=${{ secrets.DOCKERHUB_ORGANISATION }}
export KUBE_SERVER=${{ secrets.KUBE_SERVER }}
export CA=${{ secrets.CA }}
git clone https://github.com/binary-com/devops-ci-scripts
cd devops-ci-scripts/k8s-build_tools
echo ${{ secrets.CA_CRT}} | base64 --decode > ca.crt
./release.sh deriv-com ${{ steps.get_tag_name.outputs.VERSION }}

- name: Deploy to Cloudflare ☁️
uses: cloudflare/[email protected]
with:
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
command: pages publish public --project-name=deriv-com-pages --branch=main

- name: Cloudflare production link ✨
run: echo "New website - http://cf-pages-deriv-com.deriv.com"

- name: Slack Notification 📣
uses: 8398a7/action-slack@v3
with:
status: ${{ job.status }}
fields: workflow,repo
if_mention: failure,cancelled
custom_payload: |
{
attachments: [{
color: '${{ job.status }}' === 'success' ? 'good' : '${{ job.status }}' === 'failure' ? 'danger' : 'warning',
text: `Release for *Deriv.com* with version *${{ steps.get_tag_name.outputs.VERSION }}*`
}]
}
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
if: always()
8 changes: 0 additions & 8 deletions .github/workflows/lighthouse.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
name: Deriv Lighthouse Audit

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

on:
issue_comment:
types: [edited]
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ concurrency:
env:
GATSBY_CPU_COUNT: 2
GATSBY_ENV: staging
GATSBY_ENV_CIO_SITE_ID: ${{ secrets.GATSBY_ENV_CIO_SITE_ID }}

jobs:
lint:
Expand All @@ -28,7 +29,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: 18
node-version: 16
cache: "npm"

- name: Install Node.js dependencies
Expand All @@ -48,7 +49,7 @@ jobs:
- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: "18.x"
node-version: "16.x"
cache: "npm"

- run: npm ci
Expand Down
23 changes: 10 additions & 13 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
{
"processors": [
"stylelint-processor-styled-components"
],
"processors": ["stylelint-processor-styled-components"],
"extends": [
"stylelint-config-standard",
"stylelint-config-styled-components",
"stylelint-config-prettier"
],
"overrides": [
{
"files": ["**/*.tsx"],
"customSyntax": "@stylelint/postcss-css-in-js"
}
],
"rules": {
"string-quotes": "single",
"number-leading-zero": "always",
Expand All @@ -19,21 +23,14 @@
"selector-type-no-unknown": [
true,
{
"ignoreTypes": [
"/^amp-/"
]
"ignoreTypes": ["/^amp-/"]
}
],
"rule-empty-line-before": [
"always",
{
"ignore": [
"after-comment"
],
"except": [
"inside-block-and-after-rule",
"first-nested"
]
"ignore": ["after-comment"],
"except": ["inside-block-and-after-rule", "first-nested"]
}
],
"value-keyword-case": null,
Expand Down
Loading