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

Draft PR - it is used as a testing ground for testing by other team members and quick problem solving #6048

Closed
wants to merge 37 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
7feddd4
updates for payment methods (#5849)
eduard-deriv Nov 13, 2023
954f7cf
translations: 📚 sync translations with crowdin (#5934)
github-actions[bot] Nov 13, 2023
6f3ddb4
fix: signup provider send null (#5935)
NikitK-deriv Nov 14, 2023
24036c4
translations: 📚 sync translations with crowdin (#5939)
github-actions[bot] Nov 14, 2023
9f7847e
Habib/gtm party town integration (#5943)
habib-deriv Nov 15, 2023
8865771
translations: 📚 sync translations with crowdin (#5945)
github-actions[bot] Nov 15, 2023
d409fa9
fix: removed telegram from footer and faq (#5950)
fasihali-deriv Nov 16, 2023
c7f9691
Fasih/without translation PR enable firebase live price trans (#5794)
fasihali-deriv Nov 16, 2023
0076eee
translations: 📚 sync translations with crowdin (#5955)
github-actions[bot] Nov 16, 2023
963d1c3
build: to add docker/k8 setup to deriv com (#5932)
yaswanth-deriv Nov 17, 2023
5d9497d
ci: add CA variable to bash (#5962)
ali-hosseini-deriv Nov 17, 2023
f15e5a9
translations: 📚 sync translations with crowdin (#5964)
github-actions[bot] Nov 17, 2023
b255712
ci: pass the needed secrets to the step (#5971)
ali-hosseini-deriv Nov 21, 2023
5784349
translations: 📚 sync translations with crowdin (#5973)
github-actions[bot] Nov 21, 2023
9339066
ci: pass K8S secrets to envs (#5974)
ali-hosseini-deriv Nov 21, 2023
4ac1fd3
updated general terms eu&row (#5970)
eduard-deriv Nov 21, 2023
6d3bd1a
fix: remove mail from url (#5947)
konstantinosG-deriv Nov 21, 2023
558f420
Hasan/fix: productboard iframe firefox issue (#5959)
hasan-deriv Nov 21, 2023
ffd89ec
Ako/ pass secrets to env (#5981)
ali-hosseini-deriv Nov 21, 2023
435cf31
updated ib coms rates (#5842)
eduard-deriv Nov 21, 2023
4d48c84
ci: use ref_name instead of tag_name (#5991)
ali-hosseini-deriv Nov 21, 2023
c91c39d
ci: add the missed env variable (#5996)
ali-hosseini-deriv Nov 21, 2023
17df29a
Ako/ add missing env variable (#6002)
ali-hosseini-deriv Nov 22, 2023
6a2605d
ci: use SHA on staging workflow (#6008)
ali-hosseini-deriv Nov 22, 2023
53af5a8
resolve confl
eduard-deriv Nov 23, 2023
ca18e9b
single post page
eduard-deriv Nov 27, 2023
cc48985
fix
eduard-deriv Nov 27, 2023
4e071ad
fix
eduard-deriv Nov 27, 2023
2628721
fix
eduard-deriv Nov 27, 2023
3035d2a
fix
eduard-deriv Nov 27, 2023
850436b
types
eduard-deriv Nov 29, 2023
bd63d85
fix
eduard-deriv Nov 29, 2023
0a47824
fix
eduard-deriv Nov 29, 2023
a2824e1
fix: slug change
mayuran-deriv Dec 14, 2023
e8bdc73
fix: remove console.log
mayuran-deriv Dec 14, 2023
5089363
open right post after all posts clicking
eduard-deriv Dec 15, 2023
74f3470
resolve confl
eduard-deriv Dec 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion .github/workflows/production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ jobs:
# For using same tag for staging and production we need to uncomment these two below lines:
# with:
# tagRegex: "production(.*)"

- name: Deploy to Cloudflare ☁️
uses: cloudflare/[email protected]
with:
Expand All @@ -64,6 +63,35 @@ jobs:
- name: Cloudflare production link ✨
run: echo "New website - http://cf-pages-deriv-com.deriv.com"

- name: Building docker image 🐳
run: docker build -t ${{ secrets.DOCKERHUB_ORGANISATION }}/deriv-com:latest -t ${{ secrets.DOCKERHUB_ORGANISATION }}/deriv-com:$GIT_TAG_NAME .

- name: Verify nginx image
run: |
set -e
docker run --rm ${{ secrets.DOCKERHUB_ORGANISATION }}/deriv-com:$GIT_TAG_NAME nginx -t
echo "docker image validated successfully"

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

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

eduard-deriv marked this conversation as resolved.
Show resolved Hide resolved
- name: Slack Notification 📣
uses: 8398a7/action-slack@v3
with:
Expand Down
30 changes: 29 additions & 1 deletion .github/workflows/staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ jobs:
# For using same tag for staging and production we need to uncomment these two below lines:
# with:
# tagRegex: "staging(.*)"

- name: Deploy to Cloudflare ☁️
uses: cloudflare/[email protected]
with:
Expand All @@ -61,6 +60,35 @@ jobs:
- name: Cloudflare preview link ✨
run: echo "New staging website - http://staging.cf-pages-deriv-com.deriv.com"

- name: Building docker image 🐳
run: docker build -t ${{ secrets.DOCKERHUB_ORGANISATION }}/deriv-com:latest-staging -t ${{ secrets.DOCKERHUB_ORGANISATION }}/deriv-com:$GITHUB_SHA .

- name: Verify nginx image
run: |
set -e
docker run --rm ${{ secrets.DOCKERHUB_ORGANISATION }}/deriv-com:$GITHUB_SHA nginx -t
echo "docker image validated successfully"

- name: Pushing Image to docker hub 🐳
run: |
echo ${{ secrets.DOCKERHUB_PASSWORD }}| docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
docker push ${{ secrets.DOCKERHUB_ORGANISATION }}/deriv-com:latest-staging
docker push ${{ secrets.DOCKERHUB_ORGANISATION }}/deriv-com:$GITHUB_SHA

- name: Deploy 🚀
env:
KUBE_SERVER: ${{ secrets.KUBE_SERVER }}
SERVICEACCOUNT_TOKEN: ${{ secrets.SERVICEACCOUNT_TOKEN }}
CA_CRT: ${{ secrets.CA_CRT }}
NAMESPACE: deriv-com-staging
DOCKERHUB_ORGANISATION: ${{ secrets.DOCKERHUB_ORGANISATION }}
run: |
git clone https://github.com/binary-com/devops-ci-scripts
cd devops-ci-scripts/k8s-build_tools
echo "${{ env.CA_CRT }}" | base64 --decode > ca.crt
export CA="ca.crt"
./release.sh deriv-com ${GITHUB_SHA}

- name: Slack Notification 📣
uses: 8398a7/action-slack@v3
with:
Expand Down
16 changes: 13 additions & 3 deletions crowdin/messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@
"154883335": "Exclusive access to innovative assets",
"155518428": "graph",
"155869362": "high low",
"156487821": "DEX 1500 DOWN Index",
"158763587": "Check the profit",
"159648667": "A chart illustrating a winning Over trade type contract",
"160123390": "European <0></0>indices",
Expand Down Expand Up @@ -282,7 +283,6 @@
"274438767": "The order amount is locked in escrow until both parties confirm that the transaction has been completed from their end.",
"275116637": "Deriv X",
"275316510": "Impersonators ask you to send confidential information over an unsecure platform, for example via SMS, WhatsApp, email, etc.",
"276089446": "All spreads are indicative. To view real-time spreads, please refer to your terminal.",
"276482397": "No, you can't.",
"278499050": "Use your local currency to make deposits into and withdrawals from your Deriv account.",
"281247370": "Margin Calculator",
Expand Down Expand Up @@ -360,13 +360,15 @@
"354060979": "<0>1 lot</0> with 1000 leverage:",
"356733895": "Know your potential profit with fixed payouts, or maximise potential profit with variable payouts if your predictions are right.",
"357105933": "Go to the Trader’s hub and choose the Demo option.",
"357273365": "For DEX Indices, a deal of 3 lots of the DEX 600 DOWN Index for a price of USD 6000 will pay out USD 0.5 in commission based on the following formula:",
"358257887": "Once your submitted document has been approved, go to Cashier > DP2P to register your Deriv P2P account.",
"358369253": "Can I close In/Out options before the end of the trade duration?",
"358838306": "Vice President of Customer Support",
"360357815": "High/Low ticks | Digital options contract | Deriv",
"361051814": "Let’s say you want to calculate the take profit level and pip value when you want to sell 3 lots of Volatility 50 Index priced at 249.5961 USD with a take profit amount of 84 USD.",
"364422126": "Available 24/7 with varying levels of volatility, our synthetic indices are priced based on algorithms that are audited for fairness by an independent third party.",
"365224830": "Basket indices trading online | Basket indices trading demo account | Deriv",
"365975557": "DEX 1500 UP Index",
"369107014": "25 - 1,500",
"369418918": "<0>Stop loss and/or take profit level = asset price - {stop loss OR take profit amount ÷ (volume × contract size)}</0>",
"370132757": "What is a Deriv X password?",
Expand Down Expand Up @@ -397,6 +399,7 @@
"395057342": "Who we are",
"395698348": "<0>1 lot</0> with 1,500 leverage:",
"396319850": "How to register for Deriv P2P?",
"396323780": "DEX Indices",
"396992773": "Deriv is the best broker in the world so far in terms of the assets they offer, ease of withdrawals and deposits, plus other services. Keep on giving us the best, Deriv!",
"400968378": "locations",
"401039438": "Have consistent, regular sign ups via your referral link",
Expand Down Expand Up @@ -1868,7 +1871,6 @@
"1786747559": "Our regulators require us to verify your account in accordance with anti-money laundering (AML) and Know Your Customer (KYC) laws. If we have prompted you to upload your documents to verify your account, it means that you'll only be able to continue using our services after your account is verified.",
"1787584197": "Gave incorrect email ID",
"1787682106": "A chart illustrating a vanilla put option trade payout",
"1790921346": "7",
"1791730321": "Purchase the contract if you are satisfied with the position you have defined.",
"1791797947": "<0>Sign up for free</0> if you don’t have a Deriv account yet.",
"1792856800": "Open a demo account and get unlimited virtual funds to practise on our platforms — Deriv Trader, SmartTrader, and Deriv Bot.",
Expand Down Expand Up @@ -3167,6 +3169,7 @@
"-1026502273": "One broker,",
"-1981735781": "One broker, countless trading opportunities",
"-1722031734": "Check trading specs",
"-61718257": "Speculate on the price movements of popular exchange-traded funds (ETFs). Diversify your portfolio with assets that track bonds, commodities, and indices, without the high cost of owning the underlying assets.",
"-777850431": "View all >",
"-1384760133": "Bid price",
"-1882694284": "Ask price",
Expand Down Expand Up @@ -3900,8 +3903,14 @@
"-1649127643": "1.75",
"-2068763730": "5",
"-2083395832": "7.5",
"-848571938": "Range Break Indices",
"-524043424": "1.25",
"-849512762": "2.50",
"-1288058598": "Basket Indices",
"-686754111": "DEX 600 DOWN Index",
"-805839656": "DEX 600 UP Index",
"-2122038729": "DEX 900 DOWN Index",
"-1117568087": "DEX 900 UP Index",
"-1057743207": "A deal for 1 lot of the Crash 500 Index for a price of USD 500,000 will pay out USD 1.75 in commission based on the following formula:",
"-1925239974": "A deal for 1 lot of the Volatility 75 Index for a price of USD 500,000 will pay out USD 25 in commission based on the following formula:",
"-663251399": "A deal for 2 lots of the Step index for a price of USD 500,000 will pay out USD 10 in commission based on the following formula:",
Expand All @@ -3911,10 +3920,12 @@
"-1050182500": "Commission per lot (1 standard forex lot is 100k units)",
"-483418533": "4<br>(Per lot)",
"-1587730975": "10",
"-1336695287": "Stocks, ETFs & Stock Indices",
"-1255878826": "For cryptocurrencies, a deal for 1 lot of BTC/USD will pay out USD 2 in commission based on the following formula:",
"-1188569430": "For <0>stocks</0>, a deal for 1 lot of AAPL for a price of USD 178 will pay out USD 0.02 in commission based on the following formula:",
"-1887577729": "For <0>stock indices</0>, a deal for 20 lots of JP225 for a price of JPY 32,500 will pay out USD 0.05 in commission based on the following formula:",
"-693105141": "MT5 Financial",
"-169492429": "Forex (Micros)",
"-1097570263": "For forex, there is a fixed commission of USD 2 per lot (only applicable for standard lots). A deal for 1 lot of EUR/USD will pay out USD 2 in commission based on the following formula:",
"-1923011108": "For cryptocurrency assets, a deal for 1 lot of BTC/USD (with a BTC to USD exchange rate of USD 50,000) will pay out USD 5 in commission based on the following formula:",
"-146777658": "For stock indices assets, a deal for 2 lots of US Tech Index will pay out USD 0.26 in commission based on the following formula:",
Expand All @@ -3924,7 +3935,6 @@
"-953695719": "For forex, a deal of 0.1 lots of GBP/USD will pay out USD 0.32 in commission based on the following formula:",
"-1574199474": "Forex (Majors)",
"-1141326877": "Forex (Minors)",
"-169492429": "Forex (Micros)",
"-538388184": "1.50",
"-1196573047": "For commodities, a deal for 10 lots of <0>oil</0> for a price of USD 96 will pay out USD 0.05 in commission based on the following formula:",
"-1380138201": "The same formula applies to all synthetics except <0>Step Index</0>, which has the following formula:",
Expand Down
8 changes: 8 additions & 0 deletions gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -392,5 +392,13 @@ module.exports = {
],
},
},
'gatsby-transformer-remark',
{
resolve: 'gatsby-source-filesystem',
options: {
name: 'markdown-pages',
path: `${__dirname}/src/features/pages/posts/single-blog/index.tsx`,
},
},
],
}
Loading
Loading