From 5b14b225f84c97d5f61b7621989611dafbaf77f8 Mon Sep 17 00:00:00 2001 From: Hasan Mobarak <126637868+hasan-deriv@users.noreply.github.com> Date: Thu, 28 Dec 2023 17:26:37 +0800 Subject: [PATCH 1/3] Hasan/chore: added cy id in logo (#6401) * chore: added cy id in logo * chore: updated pacakges --- package-lock.json | 8 ++++---- package.json | 2 +- .../components/templates/navigation/main-nav/nav.logo.tsx | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 26ef445ddc5..21b8227835f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@artsy/fresnel": "^6.2.1", "@builder.io/partytown": "^0.8.1", - "@deriv-com/blocks": "^0.62.0", + "@deriv-com/blocks": "^0.64.0", "@deriv-com/components": "^0.37.0", "@deriv-com/hooks": "^0.10.0", "@deriv-com/providers": "^0.10.0", @@ -3004,9 +3004,9 @@ } }, "node_modules/@deriv-com/blocks": { - "version": "0.62.0", - "resolved": "https://npm.pkg.github.com/download/@deriv-com/blocks/0.62.0/5c2839e291695befc236d558f11781be700247f1", - "integrity": "sha512-atMM3Ky8CjvF82t8rn/+mFqZOEqGG8SK7jPJ6y+zLbBEqdwrj4mWoBaie22XON5LTI2M1MFFzgQDgeyJ4a/DEA==" + "version": "0.64.0", + "resolved": "https://npm.pkg.github.com/download/@deriv-com/blocks/0.64.0/7697a7cb556d915aa8bdc595a90b56b943cd9c3b", + "integrity": "sha512-ZwaDHawMB6ePTw4/0lH8pOP/ou4sXjXQBF3bbEycoqwK38RuV7zhRhIvOOpar2AWkqNyUMgfsuW5Bg1YRzJLUg==" }, "node_modules/@deriv-com/components": { "version": "0.37.0", diff --git a/package.json b/package.json index 295f9c49f13..89018521287 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "dependencies": { "@artsy/fresnel": "^6.2.1", "@builder.io/partytown": "^0.8.1", - "@deriv-com/blocks": "^0.62.0", + "@deriv-com/blocks": "^0.64.0", "@deriv-com/components": "^0.37.0", "@deriv-com/hooks": "^0.10.0", "@deriv-com/providers": "^0.10.0", diff --git a/src/features/components/templates/navigation/main-nav/nav.logo.tsx b/src/features/components/templates/navigation/main-nav/nav.logo.tsx index 6ff144566e1..ab2ffd0c113 100644 --- a/src/features/components/templates/navigation/main-nav/nav.logo.tsx +++ b/src/features/components/templates/navigation/main-nav/nav.logo.tsx @@ -5,7 +5,7 @@ import { BrandDerivWordmarkCoralIcon } from '@deriv/quill-icons/Logo' export const MainNavigationLogo = () => { return ( - + ) From 6396770fbcf15579c636fc27ae9eb2cb6b8b254f Mon Sep 17 00:00:00 2001 From: Hasan Mobarak <126637868+hasan-deriv@users.noreply.github.com> Date: Fri, 29 Dec 2023 15:28:34 +0800 Subject: [PATCH 2/3] Hasan/chore: added cy id in logo for mobile and desktop (#6409) * chore: added cy id in logo for mobile and desktop * chore: added cy id in hamburger for mobile and desktop * chore: added cy id for logo and hamburger --- package-lock.json | 8 ++++---- package.json | 2 +- .../templates/navigation/main-nav/nav.buttons.tsx | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 21b8227835f..c4ecf40d145 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "dependencies": { "@artsy/fresnel": "^6.2.1", "@builder.io/partytown": "^0.8.1", - "@deriv-com/blocks": "^0.64.0", + "@deriv-com/blocks": "^0.66.0", "@deriv-com/components": "^0.37.0", "@deriv-com/hooks": "^0.10.0", "@deriv-com/providers": "^0.10.0", @@ -3004,9 +3004,9 @@ } }, "node_modules/@deriv-com/blocks": { - "version": "0.64.0", - "resolved": "https://npm.pkg.github.com/download/@deriv-com/blocks/0.64.0/7697a7cb556d915aa8bdc595a90b56b943cd9c3b", - "integrity": "sha512-ZwaDHawMB6ePTw4/0lH8pOP/ou4sXjXQBF3bbEycoqwK38RuV7zhRhIvOOpar2AWkqNyUMgfsuW5Bg1YRzJLUg==" + "version": "0.66.0", + "resolved": "https://npm.pkg.github.com/download/@deriv-com/blocks/0.66.0/1f7dbb4bb03dcf0f1fd4f6a5225dd1b9db069f10", + "integrity": "sha512-0w8eBFlEV72pmumTV9nHjcBpeym3gvgbbBq5XCNDCz025l5uDbjKx/V8gxw8jiRNvqfWsq0KpCxfZ3Knxpt7hw==" }, "node_modules/@deriv-com/components": { "version": "0.37.0", diff --git a/package.json b/package.json index 89018521287..f31806b1a2b 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "dependencies": { "@artsy/fresnel": "^6.2.1", "@builder.io/partytown": "^0.8.1", - "@deriv-com/blocks": "^0.64.0", + "@deriv-com/blocks": "^0.66.0", "@deriv-com/components": "^0.37.0", "@deriv-com/hooks": "^0.10.0", "@deriv-com/providers": "^0.10.0", diff --git a/src/features/components/templates/navigation/main-nav/nav.buttons.tsx b/src/features/components/templates/navigation/main-nav/nav.buttons.tsx index 029a8d36077..d867140aad3 100644 --- a/src/features/components/templates/navigation/main-nav/nav.buttons.tsx +++ b/src/features/components/templates/navigation/main-nav/nav.buttons.tsx @@ -40,7 +40,7 @@ export const MainNavigationButtons = () => { )} - + ) } From d8b7766f1db4ddc78ee6dce3f26917243a658536 Mon Sep 17 00:00:00 2001 From: prince-deriv <82309725+prince-deriv@users.noreply.github.com> Date: Fri, 29 Dec 2023 13:03:43 +0400 Subject: [PATCH 3/3] Prince/Custom pages build on local environment (#6412) * chore: all set of pages to build * chore: all set of pages to build * chore: quick log build test * chore: updated building all pages --- gatsby-node.js | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 5 deletions(-) diff --git a/gatsby-node.js b/gatsby-node.js index 2a22e22c3db..75a5d4fbaae 100644 --- a/gatsby-node.js +++ b/gatsby-node.js @@ -10,12 +10,9 @@ exports.onPreBuild = async () => { await copyLibFiles(path.join(__dirname, 'static', '~partytown')) } // Based upon https://github.com/gatsbyjs/gatsby/tree/master/examples/using-i18n -exports.onCreatePage = ({ page, actions }) => { - const { createRedirect, createPage, deletePage } = actions - // First delete the incoming page that was automatically created by Gatsby - // So everything in src/pages/ - deletePage(page) +const BuildPage = (page, actions) => { + const { createRedirect, createPage } = actions const is_responsible_trading = /responsible/g.test(page.path) const is_contact_us = /contact_us/g.test(page.path) const is_careers = /careers/g.test(page.path) @@ -349,6 +346,48 @@ exports.onCreatePage = ({ page, actions }) => { return current_page }) } +exports.onCreatePage = ({ page, actions }) => { + const { deletePage } = actions + const isProduction = process.env.GATSBY_ENV === 'production' + const pagesToBuild = process.env.GATSBY_BUILD_PAGES || 'all' + + // First delete the incoming page that was automatically created by Gatsby + // So everything in src/pages/ + deletePage(page) + + const pagesCategory = { + all: [''], + 'no-affiliates': ['signup-affiliates', 'landing', 'ctrader', 'partners'], + 'no-help-centre': ['help-centre'], + 'no-tools': ['trader-tools'], + fast: [ + 'signup-affiliates', + 'landing', + 'ctrader', + 'partners', + 'help-centre', + 'trader-tools', + 'careers', + // 'markets', + // 'trade-types' Note: Feel free to adjust pages you want to skip building for faster local development + ], + } + + const disallowedPages = pagesCategory[pagesToBuild] || [] + + const regex = new RegExp(`/${disallowedPages.join('|') + '|'}/g`) + + const isMatch = regex.test(page.path) + + if (isProduction) { + return BuildPage(page, actions) + } else { + if (!isMatch || pagesToBuild === 'all') { + console.log(`\x1b[32mcreating\x1b[0m [${pagesToBuild}] ${page.path}`) + return BuildPage(page, actions) + } + } +} const StylelintPlugin = require('stylelint-webpack-plugin') const TerserPlugin = require('terser-webpack-plugin')