diff --git a/index.html b/index.html index fe4355ba..96341399 100644 --- a/index.html +++ b/index.html @@ -41,7 +41,7 @@ - +
diff --git a/package-lock.json b/package-lock.json index 2ad6fe66..0bc86721 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "react-content-loader": "^7.0.0", "react-div-100vh": "^0.3.8", "react-dom": "^18.2.0", - "react-joyride": "^2.5.3", + "react-joyride": "^2.8.2", "react-loadable": "^5.5.0", "react-router-dom": "^6.25.1", "react-tiny-popover": "^8.0.4", diff --git a/package.json b/package.json index 94e496d0..3ab99fd8 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "react-content-loader": "^7.0.0", "react-div-100vh": "^0.3.8", "react-dom": "^18.2.0", - "react-joyride": "^2.5.3", + "react-joyride": "^2.8.2", "react-loadable": "^5.5.0", "react-router-dom": "^6.25.1", "react-tiny-popover": "^8.0.4", diff --git a/public/assets/icons/IcCloseCircle.svg b/public/assets/icons/IcCloseCircle.svg deleted file mode 100644 index 09e119a6..00000000 --- a/public/assets/icons/IcCloseCircle.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/assets/videos/bot-builder-tour-step-4.mp4 b/public/assets/videos/bot-builder-tour-step-4.mp4 new file mode 100644 index 00000000..0a67d83e Binary files /dev/null and b/public/assets/videos/bot-builder-tour-step-4.mp4 differ diff --git a/public/assets/videos/bot-builder-tour-step-5.mp4 b/public/assets/videos/bot-builder-tour-step-5.mp4 new file mode 100644 index 00000000..1fc25539 Binary files /dev/null and b/public/assets/videos/bot-builder-tour-step-5.mp4 differ diff --git a/public/assets/videos/dbot-mobile-onboarding-step-1.mp4 b/public/assets/videos/dbot-mobile-onboarding-step-1.mp4 new file mode 100644 index 00000000..1e19f570 Binary files /dev/null and b/public/assets/videos/dbot-mobile-onboarding-step-1.mp4 differ diff --git a/public/assets/videos/dbot-mobile-onboarding-step-2.mp4 b/public/assets/videos/dbot-mobile-onboarding-step-2.mp4 new file mode 100644 index 00000000..6301bd1d Binary files /dev/null and b/public/assets/videos/dbot-mobile-onboarding-step-2.mp4 differ diff --git a/public/assets/videos/dbot-mobile-onboarding-step-3.mp4 b/public/assets/videos/dbot-mobile-onboarding-step-3.mp4 new file mode 100644 index 00000000..975af24c Binary files /dev/null and b/public/assets/videos/dbot-mobile-onboarding-step-3.mp4 differ diff --git a/public/assets/videos/dbot-mobile-onboarding-step-5.mp4 b/public/assets/videos/dbot-mobile-onboarding-step-5.mp4 new file mode 100644 index 00000000..d7c4719e Binary files /dev/null and b/public/assets/videos/dbot-mobile-onboarding-step-5.mp4 differ diff --git a/public/assets/videos/dbot-mobile-onboarding-step-6.mp4 b/public/assets/videos/dbot-mobile-onboarding-step-6.mp4 new file mode 100644 index 00000000..7eca06c9 Binary files /dev/null and b/public/assets/videos/dbot-mobile-onboarding-step-6.mp4 differ diff --git a/public/assets/videos/dbot-onboarding-tour-step-1.mp4 b/public/assets/videos/dbot-onboarding-tour-step-1.mp4 new file mode 100644 index 00000000..3445bee6 Binary files /dev/null and b/public/assets/videos/dbot-onboarding-tour-step-1.mp4 differ diff --git a/public/assets/videos/dbot-onboarding-tour-step-2.mp4 b/public/assets/videos/dbot-onboarding-tour-step-2.mp4 new file mode 100644 index 00000000..f8eac3bd Binary files /dev/null and b/public/assets/videos/dbot-onboarding-tour-step-2.mp4 differ diff --git a/public/assets/videos/dbot-onboarding-tour-step-3.mp4 b/public/assets/videos/dbot-onboarding-tour-step-3.mp4 new file mode 100644 index 00000000..08466ffd Binary files /dev/null and b/public/assets/videos/dbot-onboarding-tour-step-3.mp4 differ diff --git a/public/assets/videos/dbot-onboarding-tour-step-5.mp4 b/public/assets/videos/dbot-onboarding-tour-step-5.mp4 new file mode 100644 index 00000000..3f1556cd Binary files /dev/null and b/public/assets/videos/dbot-onboarding-tour-step-5.mp4 differ diff --git a/public/assets/videos/dbot-onboarding-tour-step-6.mp4 b/public/assets/videos/dbot-onboarding-tour-step-6.mp4 new file mode 100644 index 00000000..9c62205a Binary files /dev/null and b/public/assets/videos/dbot-onboarding-tour-step-6.mp4 differ diff --git a/rsbuild.config.ts b/rsbuild.config.ts index 0cbb97a2..f3e819e6 100644 --- a/rsbuild.config.ts +++ b/rsbuild.config.ts @@ -14,6 +14,7 @@ export default defineConfig({ @import "${path.resolve(__dirname, 'src/components/shared/styles/fonts.scss')}"; @import "${path.resolve(__dirname, 'src/components/shared/styles/inline-icons.scss')}"; @import "${path.resolve(__dirname, 'src/components/shared/styles/devices.scss')}"; + @import "${path.resolve(__dirname, 'src/components/shared/styles/themes.scss')}"; `, }, }), diff --git a/src/pages/bot-builder/toolbox/search-box/search-icon.tsx b/src/pages/bot-builder/toolbox/search-box/search-icon.tsx index a0ed9880..d5ac7dd9 100644 --- a/src/pages/bot-builder/toolbox/search-box/search-icon.tsx +++ b/src/pages/bot-builder/toolbox/search-box/search-icon.tsx @@ -10,7 +10,7 @@ type TSearchIcon = { const SearchIcon = observer(({ search, is_search_loading, onClick }: TSearchIcon) => { if (!search) return ; if (is_search_loading) return
; - return ; + return ; }); export default SearchIcon; diff --git a/src/pages/tutorials/dbot-tours/bot-builder-tour/bot-builder-tour-mobile.tsx b/src/pages/tutorials/dbot-tours/bot-builder-tour/bot-builder-tour-mobile.tsx index be9fb10c..4c2eefbf 100644 --- a/src/pages/tutorials/dbot-tours/bot-builder-tour/bot-builder-tour-mobile.tsx +++ b/src/pages/tutorials/dbot-tours/bot-builder-tour/bot-builder-tour-mobile.tsx @@ -1,10 +1,10 @@ import React from 'react'; import { observer } from 'mobx-react-lite'; import ProgressBarTracker from '@/components/shared_ui/progress-bar-tracker'; +import Text from '@/components/shared_ui/text'; import { useStore } from '@/hooks/useStore'; import { getSetting } from '@/utils/settings'; import { localize } from '@/utils/tmp/dummy'; -import { Text } from '@deriv-com/ui'; import TourButton from '../common/tour-button'; import TourStartDialog from '../common/tour-start-dialog'; import { BOT_BUILDER_MOBILE } from '../tour-content'; @@ -60,7 +60,7 @@ const BotBuilderTourMobile = observer(() => {
- + {content_data?.content}
diff --git a/src/pages/tutorials/dbot-tours/common/tour-button.tsx b/src/pages/tutorials/dbot-tours/common/tour-button.tsx index 70ac1602..aa6f3ada 100644 --- a/src/pages/tutorials/dbot-tours/common/tour-button.tsx +++ b/src/pages/tutorials/dbot-tours/common/tour-button.tsx @@ -1,4 +1,4 @@ -import { Text } from '@deriv-com/ui'; +import Text from '@/components/shared_ui/text'; type TTourButton = { type?: string; @@ -10,7 +10,7 @@ const TourButton = ({ label, type = 'default', ...props }: TTourButton) => { if (!label) return null; return ( diff --git a/src/pages/tutorials/dbot-tours/common/tour-end-dialog.tsx b/src/pages/tutorials/dbot-tours/common/tour-end-dialog.tsx index 0751607a..f0d80bcc 100644 --- a/src/pages/tutorials/dbot-tours/common/tour-end-dialog.tsx +++ b/src/pages/tutorials/dbot-tours/common/tour-end-dialog.tsx @@ -1,7 +1,8 @@ import { observer } from 'mobx-react-lite'; +import Dialog from '@/components/shared_ui/dialog'; +import Text from '@/components/shared_ui/text'; import { useStore } from '@/hooks/useStore'; import { Localize, localize } from '@/utils/tmp/dummy'; -import { Dialog, Text } from '@deriv-com/ui'; const TourEndDialog = observer(() => { const { ui } = useStore(); diff --git a/src/pages/tutorials/dbot-tours/common/tour-start-dialog.tsx b/src/pages/tutorials/dbot-tours/common/tour-start-dialog.tsx index cceadf22..2897596a 100644 --- a/src/pages/tutorials/dbot-tours/common/tour-start-dialog.tsx +++ b/src/pages/tutorials/dbot-tours/common/tour-start-dialog.tsx @@ -1,8 +1,9 @@ import { observer } from 'mobx-react-lite'; +import Dialog from '@/components/shared_ui/dialog'; +import Text from '@/components/shared_ui/text'; import { DBOT_TABS } from '@/constants/bot-contents'; import { useStore } from '@/hooks/useStore'; import { Localize, localize } from '@/utils/tmp/dummy'; -import { Dialog, Text } from '@deriv-com/ui'; import { getBotBuilderTourHeader, getTourDialogAction, diff --git a/src/pages/tutorials/dbot-tours/common/tour-steps.tsx b/src/pages/tutorials/dbot-tours/common/tour-steps.tsx index e2c43f17..31ec4eaf 100644 --- a/src/pages/tutorials/dbot-tours/common/tour-steps.tsx +++ b/src/pages/tutorials/dbot-tours/common/tour-steps.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { observer } from 'mobx-react-lite'; +import Text from '@/components/shared_ui/text'; import { getUUID } from '@/external/bot-skeleton/services/tradeEngine/utils/helpers'; -import { Text } from '@deriv-com/ui'; type TTourSteps = { content: string[] | React.ReactElement[]; @@ -19,14 +19,14 @@ const TourSteps = observer(
{show_actions && (
- + {step_index}/6
)}
- + {label}
@@ -52,7 +52,7 @@ const TourSteps = observer( content_data ) : (
- + {content_data}
diff --git a/src/pages/tutorials/dbot-tours/onboarding-tour/onboarding-tour-mobile.tsx b/src/pages/tutorials/dbot-tours/onboarding-tour/onboarding-tour-mobile.tsx index 9520956a..79de4fef 100644 --- a/src/pages/tutorials/dbot-tours/onboarding-tour/onboarding-tour-mobile.tsx +++ b/src/pages/tutorials/dbot-tours/onboarding-tour/onboarding-tour-mobile.tsx @@ -2,10 +2,10 @@ import React from 'react'; import classNames from 'classnames'; import { observer } from 'mobx-react-lite'; import ProgressBarTracker from '@/components/shared_ui/progress-bar-tracker'; +import Text from '@/components/shared_ui/text'; import { useStore } from '@/hooks/useStore'; import { getSetting } from '@/utils/settings'; import { Icon, localize } from '@/utils/tmp/dummy'; -import { Text } from '@deriv-com/ui'; import TourButton from '../common/tour-button'; import { DBOT_ONBOARDING_MOBILE, TMobileTourConfig } from '../tour-content'; @@ -63,7 +63,7 @@ const OnboardingTourMobile = observer(() => { {`${tour_step_key - 1}/7`} @@ -84,7 +84,7 @@ const OnboardingTourMobile = observer(() => { align='center' className='dbot-slider__title' as='span' - LineHeight='sm' + lineHeight='s' size='xs' > {localize(header)} @@ -120,7 +120,7 @@ const OnboardingTourMobile = observer(() => { color='prominent' className='dbot-slider__content' as='div' - LineHeight='sm' + lineHeight='s' size='xxs' > {data} diff --git a/src/pages/tutorials/dbot-tours/tour-content.tsx b/src/pages/tutorials/dbot-tours/tour-content.tsx index 9f694aad..f84c4f77 100644 --- a/src/pages/tutorials/dbot-tours/tour-content.tsx +++ b/src/pages/tutorials/dbot-tours/tour-content.tsx @@ -1,8 +1,8 @@ -import { getImageLocation, getUrlBase } from '../../../public-path'; +import { getImageLocation } from '../../../public-path'; import React from 'react'; +import Text from '@/components/shared_ui/text'; import { isDbotRTL } from '@/external/bot-skeleton/utils/workspace'; import { Icon, Localize, localize } from '@/utils/tmp/dummy'; -import { Text } from '@deriv-com/ui'; import TourSteps from './common/tour-steps'; type TJoyrideConfig = Record< @@ -34,7 +34,7 @@ export const DBOT_ONBOARDING = [ 'We also provide a guide on the Tutorial tab to show you how you can build and execute a simple strategy.' ), ]} - media={getUrlBase('/public/videos/dbot-onboarding-tour-step-1.mp4')} + media={'/assets/videos/dbot-onboarding-tour-step-1.mp4'} step_index={1} /> ), @@ -47,7 +47,7 @@ export const DBOT_ONBOARDING = [ ), @@ -60,7 +60,7 @@ export const DBOT_ONBOARDING = [ ), @@ -86,7 +86,7 @@ export const DBOT_ONBOARDING = [ ), @@ -106,7 +106,7 @@ export const DBOT_ONBOARDING = [ components={[]} />, ]} - media={'/public/videos/dbot-onboarding-tour-step-6.mp4'} + media={'/assets/videos/dbot-onboarding-tour-step-6.mp4'} step_index={6} /> ), @@ -293,7 +293,7 @@ const Step4 = ({ show_label = false }) => (
@@ -343,7 +343,7 @@ const Step5 = ({ show_label = false }) => (
@@ -472,7 +472,7 @@ export const DBOT_ONBOARDING_MOBILE: TMobileTourConfig[] = [ i18n_default_text='Import your bot or tap Quick Strategies to choose from the ready-to-use bot templates.' />, ], - media: '/public/videos/dbot-mobile-onboarding-step-1.mp4', + media: '/assets/videos/dbot-mobile-onboarding-step-1.mp4', tour_step_key: 2, }, { @@ -480,7 +480,7 @@ export const DBOT_ONBOARDING_MOBILE: TMobileTourConfig[] = [ content: [ , ], - media: '/public/videos/dbot-mobile-onboarding-step-2.mp4', + media: '/assets/videos/dbot-mobile-onboarding-step-2.mp4', tour_step_key: 3, }, { @@ -491,7 +491,7 @@ export const DBOT_ONBOARDING_MOBILE: TMobileTourConfig[] = [ i18n_default_text='Explore the video guides and FAQs to build your bot in the tutorials tab.' />, ], - media: '/public/videos/dbot-mobile-onboarding-step-3.mp4', + media: '/assets/videos/dbot-mobile-onboarding-step-3.mp4', tour_step_key: 4, }, { @@ -507,7 +507,7 @@ export const DBOT_ONBOARDING_MOBILE: TMobileTourConfig[] = [ }, { header: localize('Check your bot’s performance'), - media: '/public/videos/dbot-mobile-onboarding-step-5.mp4', + media: '/assets/videos/dbot-mobile-onboarding-step-5.mp4', content: [ , ], @@ -515,7 +515,7 @@ export const DBOT_ONBOARDING_MOBILE: TMobileTourConfig[] = [ }, { header: localize('Run your bot'), - media: '/public/videos/dbot-mobile-onboarding-step-6.mp4', + media: '/assets/videos/dbot-mobile-onboarding-step-6.mp4', content: [