From e4857851a964b9aefb0159b0ef1d0af75e24a31d Mon Sep 17 00:00:00 2001 From: Sangeeth Sivan <74818788+berzerkeer@users.noreply.github.com> Date: Wed, 8 Feb 2023 13:05:35 +0530 Subject: [PATCH] chore: upgrade page changes & license route removed on CE (#20412) ## Description Updated the image on upgrade page. Removed license route on CE. Fixes [#303](https://github.com/appsmithorg/cloud-services/issues/303) Media Screenshot 2023-02-07 at 3 59 30 AM ![Screenshot 2023-02-07 at 3 59 30 AM (2)](https://user-images.githubusercontent.com/74818788/217103001-9d630000-7ecb-4131-ad73-3c65d3639f34.png) ## Type of change > Please delete options that are not relevant. - Chore (housekeeping or task changes that don't impact user perception) ## How Has This Been Tested? - Manual ## Checklist: ### Dev activity - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [x] PR is being merged under a feature flag ### QA activity: - [ ] Test plan has been approved by relevant developers - [ ] Test plan has been peer reviewed by QA - [ ] Cypress test cases have been added and approved by either SDET or manual QA - [ ] Organized project review call with relevant stakeholders after Round 1/2 of QA - [ ] Added Test Plan Approved label after reveiwing all Cypress test --- .../src/assets/svg/be-upgrade/be-cta.svg | 157 ++++++++++++++++++ app/client/src/ce/AppRouter.tsx | 3 - .../businessEdition/UpgradeToBEPage.tsx | 54 +++--- 3 files changed, 186 insertions(+), 28 deletions(-) create mode 100644 app/client/src/assets/svg/be-upgrade/be-cta.svg diff --git a/app/client/src/assets/svg/be-upgrade/be-cta.svg b/app/client/src/assets/svg/be-upgrade/be-cta.svg new file mode 100644 index 0000000000..85908c17f5 --- /dev/null +++ b/app/client/src/assets/svg/be-upgrade/be-cta.svg @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/client/src/ce/AppRouter.tsx b/app/client/src/ce/AppRouter.tsx index b5d915f61c..eb2b0b032b 100644 --- a/app/client/src/ce/AppRouter.tsx +++ b/app/client/src/ce/AppRouter.tsx @@ -14,7 +14,6 @@ import { BUILDER_PATCH_PATH, BUILDER_PATH, BUILDER_PATH_DEPRECATED, - LICENSE_CHECK_PATH, PROFILE, SETUP, SIGNUP_SUCCESS_URL, @@ -68,7 +67,6 @@ import { } from "@appsmith/selectors/tenantSelectors"; import useBrandingTheme from "utils/hooks/useBrandingTheme"; import RouteChangeListener from "RouteChangeListener"; -import { Spinner } from "design-system-old"; /* We use this polyfill to show emoji flags @@ -135,7 +133,6 @@ export function Routes() { */} - ); diff --git a/app/client/src/ce/pages/Upgrade/businessEdition/UpgradeToBEPage.tsx b/app/client/src/ce/pages/Upgrade/businessEdition/UpgradeToBEPage.tsx index 9bc04378a1..455bc52d4b 100644 --- a/app/client/src/ce/pages/Upgrade/businessEdition/UpgradeToBEPage.tsx +++ b/app/client/src/ce/pages/Upgrade/businessEdition/UpgradeToBEPage.tsx @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; -import BEBannerImage from "assets/images/upgrade/be-cta/be-box-image.png"; import BETextImage from "assets/svg/be-upgrade/upgrade-to-be-text.svg"; +import BECtaImage from "assets/svg/be-upgrade/be-cta.svg"; import { createMessage, MOVE_TO_BUSINESS_EDITION, @@ -11,8 +11,6 @@ import useOnUpgrade from "utils/hooks/useOnUpgrade"; import { Colors } from "constants/Colors"; export const UpgradeToBEPageWrapper = styled.div` - display: flex; - flex-direction: column; width: 100%; height: 100%; background: linear-gradient(90deg, #fff 20px, transparent 1%) center, @@ -21,13 +19,10 @@ export const UpgradeToBEPageWrapper = styled.div` `; export const ImageContainer = styled.div` - display: flex; - min-width: 50%; + min-width: 400px; img { - width: 400px; - height: 400px; - position: relative; - right: 200px; + width: 600px; + height: 600px; } `; @@ -54,25 +49,32 @@ export const Overlay = styled.div` export const FlexContainer = styled.div` display: flex; - flex-direction: row; align-items: center; height: calc(100% - 96px); width: 100%; - padding: 48px 200px; - justify-content: space-between; - min-width: 900px; + justify-content: center; + min-width: 1200px; `; export const LeftWrapper = styled.div` - display: flex; - flex-direction: column; - min-width: 80%; + min-width: 700px; img { - width: 800px; - height: 800px; + width: 1000px; + height: 1000px; } `; +export const ContentWrapper = styled.div` + display: flex; + height: 100%; + width: 1000px; + flex-direction: row; + padding: 48px 200px; + align-items: center; + justify-content: center; + min-width: 900px; +`; + export const UpgradeToBEPage = () => { const { onUpgrade } = useOnUpgrade({ logEventName: "BILLING_UPGRADE_ADMIN_SETTINGS", @@ -82,13 +84,15 @@ export const UpgradeToBEPage = () => { return ( - - - text-content - - - Upgrade to Business Edition - + + + + text-content + + + Upgrade to Business Edition + +