From 36bb3981ce75d9eb5b526cc4e5da0cc5d3b186f5 Mon Sep 17 00:00:00 2001 From: aswathy-deriv Date: Thu, 3 Aug 2023 10:44:06 +0400 Subject: [PATCH 01/55] feat: deriv prime page --- crowdin/messages.json | 7 +- .../components/templates/footer/data.ts | 20 ++--- .../navigation/main-nav/content/index.ts | 2 +- .../main-nav/content/partner/index.ts | 11 ++- .../navigation/payment-agent-nav/data.tsx | 15 +++- .../navigation/payment-agent-nav/index.tsx | 76 ++++++++++++------- src/pages/partners/deriv-prime/index.tsx | 13 ++++ 7 files changed, 97 insertions(+), 47 deletions(-) create mode 100644 src/pages/partners/deriv-prime/index.tsx diff --git a/crowdin/messages.json b/crowdin/messages.json index fbfec1872ca..3319c8c3d7c 100644 --- a/crowdin/messages.json +++ b/crowdin/messages.json @@ -202,7 +202,6 @@ "236845507": "What are contracts for difference (CFDs)?", "239216026": "XMR/USD", "241331061": "Deriv GO is really good! I've been looking for an app like this which is easy to use.", - "242139148": "PARTNER", "242356757": "Submit a report", "243084503": "Estimate the stop loss and/or take profit levels as well as the pip value for your contract to mitigate your risk when buying or selling a position.", "244046593": "Start trading stocks & indices on Deriv in 3 simple steps", @@ -602,6 +601,7 @@ "700971061": "You can find your Deriv MT5 server name on your <0>Deriv MT5 dashboard. Click Trade on your preferred MT5 account and look for the server below the broker name.", "701775446": "Volatility 200 Index", "701840176": "Commission per USD 100k turnover", + "702074152": "PARTNERS", "702303938": "affiliate ib", "704465777": "After making your payment, share the receipt with the seller via the chat feature in Deriv P2P.", "704532260": "Sign up with just your email. No credit card or minimum deposit required.", @@ -1951,8 +1951,8 @@ "-1246992539": "Binary Bot", "-34495732": "Regulatory information", "-634625185": "Terms & conditions", + "-258641121": "Deriv Prime", "-890622347": "Affiliates and IBs", - "-199351188": "Bug bounty", "-1642457320": "Help centre", "-1718500720": "Community", "-1306639327": "Payment methods", @@ -1965,7 +1965,6 @@ "-45792628": "Telegram", "-1076138910": "Trade", "-663862998": "Markets", - "-23722102": "Partner", "-2045194514": "Secure and responsible trading", "-58704987": "Trade the world’s largest financial market with popular forex pairs.", "-260024315": "Predict broader market trends and diversify your risk with stocks & indices.", @@ -2450,9 +2449,11 @@ "-667423170": "arrow", "-1342720542": "Enjoy trading asset prices derived from real-world
or simulated markets.", "-269790876": "partners", + "-23722102": "Partner", "-1750297019": "affiliates and IBs", "-1433497542": "payment agents", "-1153226820": "bug bounty", + "-199351188": "Bug bounty", "-700683835": "Alert", "-246108767": "Learn more >", "-1503338163": "Demo account ", diff --git a/src/features/components/templates/footer/data.ts b/src/features/components/templates/footer/data.ts index a67d6536962..0a367f201ac 100644 --- a/src/features/components/templates/footer/data.ts +++ b/src/features/components/templates/footer/data.ts @@ -235,13 +235,20 @@ const legalLinks: SmartFooterLink[] = [ const partnerLinks: SmartFooterLink[] = [ { id: 0, + data: { + text: '_t_Deriv Prime_t_', + url: { type: 'internal', to: '/partners/deriv-prime/' }, + }, + }, + { + id: 1, data: { text: '_t_Affiliates and IBs_t_', url: { type: 'internal', to: '/partners/affiliate-ib/' }, }, }, { - id: 1, + id: 2, data: { text: '_t_Payment agents_t_', url: { type: 'internal', to: '/partners/payment-agent/' }, @@ -251,19 +258,12 @@ const partnerLinks: SmartFooterLink[] = [ }, }, { - id: 2, + id: 3, data: { text: '_t_API_t_', url: { type: 'company', url_name: 'api' }, }, }, - { - id: 3, - data: { - text: '_t_Bug bounty_t_', - url: { type: 'non-company', href: deriv_bug_bounty_url }, - }, - }, ] const supportLinks: SmartFooterLink[] = [ @@ -343,7 +343,7 @@ export const footerLinks: SmartFooterLinkColumn[] = [ { id: 5, data: { - title: '_t_PARTNER_t_', + title: '_t_PARTNERS_t_', links: partnerLinks, }, }, diff --git a/src/features/components/templates/navigation/main-nav/content/index.ts b/src/features/components/templates/navigation/main-nav/content/index.ts index d5b2b1a9b34..1afd9659e02 100644 --- a/src/features/components/templates/navigation/main-nav/content/index.ts +++ b/src/features/components/templates/navigation/main-nav/content/index.ts @@ -68,7 +68,7 @@ export const mainItems: NavItems = [ { id: 5, data: { - title: '_t_Partner_t_', + title: '_t_Partners_t_', type: 'single-column', content: partnerNavSectionContent, }, diff --git a/src/features/components/templates/navigation/main-nav/content/partner/index.ts b/src/features/components/templates/navigation/main-nav/content/partner/index.ts index 0ac995f715b..dc70044de31 100644 --- a/src/features/components/templates/navigation/main-nav/content/partner/index.ts +++ b/src/features/components/templates/navigation/main-nav/content/partner/index.ts @@ -3,13 +3,20 @@ import { SmartNavContent } from '../../../types' export const partnerNavSectionContent: SmartNavContent[] = [ { id: 0, + data: { + title: '_t_Deriv Prime_t_', + url: { type: 'internal', to: '/partners/deriv-prime/' }, + }, + }, + { + id: 1, data: { title: '_t_Affiliates and IBs_t_', url: { type: 'internal', to: '/partners/affiliate-ib/' }, }, }, { - id: 1, + id: 2, data: { title: '_t_Payment agents_t_', url: { type: 'internal', to: '/partners/payment-agent/' }, @@ -19,7 +26,7 @@ export const partnerNavSectionContent: SmartNavContent[] = [ }, }, { - id: 2, + id: 3, data: { title: '_t_API_t_', url: { type: 'company', url_name: 'api', target: '_blank' }, diff --git a/src/features/components/templates/navigation/payment-agent-nav/data.tsx b/src/features/components/templates/navigation/payment-agent-nav/data.tsx index 3c08c95b5d5..d9ef55b36af 100644 --- a/src/features/components/templates/navigation/payment-agent-nav/data.tsx +++ b/src/features/components/templates/navigation/payment-agent-nav/data.tsx @@ -3,6 +3,17 @@ import { NavItems } from '../types' const affiliateNavItems: NavItems = [ { id: 0, + data: { + type: 'single-item', + title: '_t_Deriv Prime_t_', + content: { + type: 'internal', + to: '/partners/deriv-prime/', + }, + }, + }, + { + id: 1, data: { type: 'single-item', title: '_t_Affiliates and IBs_t_', @@ -13,7 +24,7 @@ const affiliateNavItems: NavItems = [ }, }, { - id: 1, + id: 2, data: { type: 'single-item', title: '_t_Payment agents_t_', @@ -27,7 +38,7 @@ const affiliateNavItems: NavItems = [ }, }, { - id: 2, + id: 3, data: { type: 'single-item', title: '_t_API_t_', diff --git a/src/features/components/templates/navigation/payment-agent-nav/index.tsx b/src/features/components/templates/navigation/payment-agent-nav/index.tsx index 6b7ed2fbb31..1a39a6689b7 100644 --- a/src/features/components/templates/navigation/payment-agent-nav/index.tsx +++ b/src/features/components/templates/navigation/payment-agent-nav/index.tsx @@ -9,8 +9,11 @@ import { Localize } from 'components/localization/localize' import LanguageSwitcher from 'features/components/molecules/language-switcher' import Link from 'features/components/atoms/link' import Flex from 'features/components/atoms/flex-box' +import { getLocationPathname } from 'common/utility' const PaymentAgentAffiliateNav = () => { + const is_deriv_prime_url = getLocationPathname().includes('deriv-prime') + return ( ( @@ -29,35 +32,50 @@ const PaymentAgentAffiliateNav = () => { align="center" gap="8x" > - - window.open('https://login.deriv.com/signin.php?lang=0', '_blank') - } - outlined - visible={'larger-than-tablet'} - className={partners_buttons} - > - - - - window.open('https://login.deriv.com/signin.php?lang=0', '_blank') - } - outlined - visible={'phone-and-tablet'} - > - - - window.open('https://login.deriv.com/signup.php', '_blank')} - visible={'larger-than-tablet'} - className={partners_buttons} - > - - + {is_deriv_prime_url ? ( + (window.location.hash = '#getintouch')} //navigating to the get in touch div element.will be changed later + className={partners_buttons} + > + + + ) : ( + <> + + window.open('https://login.deriv.com/signin.php?lang=0', '_blank') + } + outlined + visible={'larger-than-tablet'} + className={partners_buttons} + > + + + + window.open('https://login.deriv.com/signin.php?lang=0', '_blank') + } + outlined + visible={'phone-and-tablet'} + > + + + + window.open('https://login.deriv.com/signup.php', '_blank') + } + visible={'larger-than-tablet'} + className={partners_buttons} + > + + + + )} + diff --git a/src/pages/partners/deriv-prime/index.tsx b/src/pages/partners/deriv-prime/index.tsx new file mode 100644 index 00000000000..b481a5101e9 --- /dev/null +++ b/src/pages/partners/deriv-prime/index.tsx @@ -0,0 +1,13 @@ +import React from 'react' +import { WithIntl } from 'components/localization/withIntl' +import Layout from 'components/layout/layout' + +const DerivPrime = () => { + return ( + + <> + + ) +} + +export default WithIntl()(DerivPrime) From 0fe96c51886247af4db3e5a4890fdc13c9e223d3 Mon Sep 17 00:00:00 2001 From: aswathy-deriv Date: Thu, 3 Aug 2023 12:31:52 +0400 Subject: [PATCH 02/55] fix: prime page changes in atomic approach --- crowdin/messages.json | 2 ++ .../pages/partners/deriv-prime/index.tsx | 7 +++++++ src/pages/partners/deriv-prime/index.tsx | 18 +++++++++++++----- 3 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 src/features/pages/partners/deriv-prime/index.tsx diff --git a/crowdin/messages.json b/crowdin/messages.json index 3319c8c3d7c..eaeabd1a0af 100644 --- a/crowdin/messages.json +++ b/crowdin/messages.json @@ -474,6 +474,7 @@ "554620691": "Please enter a valid number", "557095822": "Click the <0>Renew button to renew the service or the <0>Unsubscribe button to cancel the subscription.", "560142031": "Available 24/7, our synthetic indices emulate price movements of real-world markets with varying levels of volatility. As they aren't based on actual underlying assets, they are unaffected by real-world market events. The pricing of our synthetic indices is backed by algorithms that are audited for fairness by an independent third party. Read <0>this article to learn more about trading synthetic indices on Deriv.", + "560243784": "Liquidity solutions provider | Deriv Prime", "560338255": "<0>UNG.US The United States Natural Gas Fund ETF tracks in percentage terms the movements of natural gas prices.", "562246914": "The rebranding exercise was inspired by you, our clients. After 20 years of service to you, we feel that we understand you better. The rebranding is an opportunity for us to implement an improved online trading solution to meet all your needs.", "562528971": "Zinc/USD", @@ -3308,6 +3309,7 @@ "-1299009682": "Optimise conversions with great user experience and creative support", "-1657692765": "Marketing creative material", "-372628491": "Earn up to 45% lifetime commission with an online trading provider that enables anyone to trade on popular financial markets with the utmost convenience. Deriv Group Ltd — the owner of Binary.com and Deriv.com — has a proven track record of running successful referral programmes with prompt payouts.", + "-1017956531": "With Deriv Prime's liquidity solutions for online trading, you get unbeatable spreads on the commodities, cryptocurrencies, and forex markets.", "-1225936915": "Be our partner | Partnership programmes | Deriv", "-1163074287": "Explore Deriv’s partnership programmes and team up with a trusted online trading broker to earn extra income.", "-2066779239": "FAQs", diff --git a/src/features/pages/partners/deriv-prime/index.tsx b/src/features/pages/partners/deriv-prime/index.tsx new file mode 100644 index 00000000000..03fed570ccb --- /dev/null +++ b/src/features/pages/partners/deriv-prime/index.tsx @@ -0,0 +1,7 @@ +import React from 'react' + +const DerivPrime = () => { + return <> +} + +export default DerivPrime diff --git a/src/pages/partners/deriv-prime/index.tsx b/src/pages/partners/deriv-prime/index.tsx index b481a5101e9..0989405cb66 100644 --- a/src/pages/partners/deriv-prime/index.tsx +++ b/src/pages/partners/deriv-prime/index.tsx @@ -1,13 +1,21 @@ import React from 'react' -import { WithIntl } from 'components/localization/withIntl' import Layout from 'components/layout/layout' +import { WithIntl } from 'components/localization' +import { SEO } from 'components/containers' +import DerivPrime from 'features/pages/partners/deriv-prime' +import PaymentAgentAffiliateNav from 'features/components/templates/navigation/payment-agent-nav' -const DerivPrime = () => { +const DerivPrimePage = () => { return ( - - <> + + + + ) } -export default WithIntl()(DerivPrime) +export default WithIntl()(DerivPrimePage) From ece5518ad9969f166ca326d5870a5e11623f57b5 Mon Sep 17 00:00:00 2001 From: aswathy-deriv Date: Thu, 3 Aug 2023 13:28:04 +0400 Subject: [PATCH 03/55] fix: added the new layout --- crowdin/messages.json | 2 +- src/features/pages/partners/deriv-prime/index.tsx | 15 ++++++++++++++- src/pages/partners/deriv-prime/index.tsx | 14 +------------- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/crowdin/messages.json b/crowdin/messages.json index eaeabd1a0af..dda8676604a 100644 --- a/crowdin/messages.json +++ b/crowdin/messages.json @@ -2556,6 +2556,7 @@ "-1267106447": "Deal with fellow traders at pre-agreed rates.", "-141169956": "Deriv P2P – peer-to-peer deposit and withdrawal service", "-1451760391": "With Deriv P2P your deposits and withdrawals are easy, fast, and efficient. Access now via the desktop or mobile app.", + "-1017956531": "With Deriv Prime's liquidity solutions for online trading, you get unbeatable spreads on the commodities, cryptocurrencies, and forex markets.", "-1957784093": "Easy And Free Sign Up | Online Trading | Deriv.com", "-1718206543": "Enter your email address to begin", "-2125275828": "Unique trade types. Hundreds of instruments. Financial and derived markets.", @@ -3309,7 +3310,6 @@ "-1299009682": "Optimise conversions with great user experience and creative support", "-1657692765": "Marketing creative material", "-372628491": "Earn up to 45% lifetime commission with an online trading provider that enables anyone to trade on popular financial markets with the utmost convenience. Deriv Group Ltd — the owner of Binary.com and Deriv.com — has a proven track record of running successful referral programmes with prompt payouts.", - "-1017956531": "With Deriv Prime's liquidity solutions for online trading, you get unbeatable spreads on the commodities, cryptocurrencies, and forex markets.", "-1225936915": "Be our partner | Partnership programmes | Deriv", "-1163074287": "Explore Deriv’s partnership programmes and team up with a trusted online trading broker to earn extra income.", "-2066779239": "FAQs", diff --git a/src/features/pages/partners/deriv-prime/index.tsx b/src/features/pages/partners/deriv-prime/index.tsx index 03fed570ccb..41cc21d556e 100644 --- a/src/features/pages/partners/deriv-prime/index.tsx +++ b/src/features/pages/partners/deriv-prime/index.tsx @@ -1,7 +1,20 @@ import React from 'react' +import Layout from 'features/components/templates/layout' +import { SEO } from 'components/containers' +import PaymentAgentAffiliateNav from 'features/components/templates/navigation/payment-agent-nav' +import Footer from 'features/components/templates/footer' const DerivPrime = () => { - return <> + return ( + + + +