diff --git a/src-ts/tools/work/work-lib/work-provider/work-functions/work-factory/work-type.enum.ts b/src-ts/tools/work/work-lib/work-provider/work-functions/work-factory/work-type.enum.ts index e41289ac2..f5883f951 100644 --- a/src-ts/tools/work/work-lib/work-provider/work-functions/work-factory/work-type.enum.ts +++ b/src-ts/tools/work/work-lib/work-provider/work-functions/work-factory/work-type.enum.ts @@ -1,7 +1,7 @@ export enum WorkType { data = 'Data Exploration', - design = 'Website Design New', // TODO: remove word New once we get rid of designLegacy - designLegacy = 'Website Design', + design = 'Website Design', + designLegacy = 'Website Design Legacy', findData = 'Find Me Data', problem = 'Problem Statement & Data Advisory', unknown = '', diff --git a/src/IntakeForm.jsx b/src/IntakeForm.jsx index 3d8a1a1b1..7a043f806 100644 --- a/src/IntakeForm.jsx +++ b/src/IntakeForm.jsx @@ -182,16 +182,16 @@ export default function IntakeForm() { path="/work/new/find-me-data/*" /> - {/* Web Design (NEW) */} + {/* Web Design*/} } - path="/work/new/website-design-new/*" + path="/work/new/website-design/*" /> {/* Web Design (Legacy) */} } - path="/work/new/website-design/*" + path="/work/new/website-design-legacy/*" /> {
- WEBSITE DESIGN + WEBSITE DESIGN LEGACY
Create a beautiful custom visual design for your website. and diff --git a/src/constants/index.js b/src/constants/index.js index d0b01d9a0..97771a646 100644 --- a/src/constants/index.js +++ b/src/constants/index.js @@ -17,13 +17,13 @@ import WebsiteDesignPdf1 from "../assets/pdf/WebDesign-1.pdf"; import WebsiteDesignPdf2 from "../assets/pdf/WebDesign-2.pdf"; import styles from "./styles.module.scss"; -import { ReactComponent as MyWorkActiveIcon} from "../assets/images/icon-my-work-active.svg"; +import { ReactComponent as MyWorkActiveIcon } from "../assets/images/icon-my-work-active.svg"; import exampleImage1 from "../assets/images/design-example-image1.png"; import exampleImage2 from "../assets/images/design-example-image2.png"; -import { ReactComponent as MyWorkIcon} from "../assets/images/icon-my-work.svg"; +import { ReactComponent as MyWorkIcon } from "../assets/images/icon-my-work.svg"; import PageUl from "../components/PageElements/PageUl"; import PageP from "../components/PageElements/PageP"; -import { ReactComponent as copyFileIcon} from "../assets/images/icon-copy-file.svg"; +import { ReactComponent as copyFileIcon } from "../assets/images/icon-copy-file.svg"; import workUtil from "../utils/work"; import * as dataExplorationConfigs from "./products/DataExploration"; @@ -47,21 +47,21 @@ export const ROUTES = { INTAKE_FORM: "/self-service/wizard", HOME_PAGE: "/self-service", DASHBOARD_PAGE: "/work/dashboard", - WEBSITE_DESIGN: "/self-service/work/new/website-design-new/basic-info", - WEBSITE_DESIGN_REVIEW: "/self-service/work/new/website-design-new/review", + WEBSITE_DESIGN: "/self-service/work/new/website-design/basic-info", + WEBSITE_DESIGN_REVIEW: "/self-service/work/new/website-design/review", DATA_EXPLORATION: "/self-service/work/new/data-exploration/basic-info", DATA_EXPLORATION_REVIEW: "/self-service/work/new/data-exploration/review", PROBLEM_STATEMENT: "/self-service/work/new/data-advisory/basic-info", PROBLEM_STATEMENT_REVIEW: "/self-service/work/new/data-advisory/review", FIND_ME_DATA: "/self-service/work/new/find-me-data/basic-info", FIND_ME_DATA_REVIEW: "/self-service/work/new/find-me-data/review", - WEBSITE_DESIGN_LEGACY: "/self-service/work/new/website-design/basic-info", + WEBSITE_DESIGN_LEGACY: "/self-service/work/new/website-design-legacy/basic-info", WEBSITE_DESIGN_PURPOSE_LEGACY: - "/self-service/work/new/website-design/website-purpose", + "/self-service/work/new/website-design-legacy/website-purpose", WEBSITE_DESIGN_PAGE_DETAILS_LEGACY: - "/self-service/work/new/website-design/page-details", + "/self-service/work/new/website-design-legacy/page-details", WEBSITE_DESIGN_BRANDING_LEGACY: - "/self-service/work/new/website-design/branding", + "/self-service/work/new/website-design-legacy/branding", }; /** @@ -267,7 +267,7 @@ export const projectAndProfessionalWork = { export const webWorkTypes = [ { type: WorkType.designLegacy, - title: "Website Design", + title: "Website Design (Legacy)", duration: `${webDesignLegacyConfigs.DEFAULT_DURATION} Days`, description: "Create a beautiful custom visual design for your website. Specify the scope and device types, your vision, and receive up to 5 modern designs.", @@ -277,14 +277,14 @@ export const webWorkTypes = [ "​​Create a beautiful custom visual design for your website. Specify the scope and device types, your vision, and receive up to 5 modern designs.", price: workPriceDesignLegacy.getPrice(workPriceDesignLegacy), stickerPrice: workPriceDesignLegacy.base, - featured: true, - startRoute: "/self-service/work/new/website-design/basic-info", - basePath: "website-design", + featured: false, + startRoute: "/self-service/work/new/website-design-legacy/basic-info", + basePath: "website-design-legacy", bgImage: imgProductWebsiteDesign, }, { type: WorkType.design, - title: "Website Design (NEW)", + title: "Website Design", subTitle: "Create a beautiful custom visual design for your website. Specify the scope and device types, your vision, and receive up to 5 modern designs.", shortDescription: "Create Custom Website Designs that Wow", @@ -295,8 +295,8 @@ export const webWorkTypes = [ // stickerPrice: workPriceDesign.base, duration: `${webDesignConfigs.DEFAULT_DURATION} Days`, featured: true, - startRoute: "/self-service/work/new/website-design-new/basic-info", - basePath: "website-design-new", + startRoute: "/self-service/work/new/website-design/basic-info", + basePath: "website-design", helperBannerTitle: "WHAT WILL I RECEIVE?", bgImage: imgProductWebsiteDesign, helperBannerContent: ( @@ -311,11 +311,11 @@ export const webWorkTypes = [
- Example 1 + Example 1   - Example2 + Example2
diff --git a/src/constants/products/WebsiteDesign/index.js b/src/constants/products/WebsiteDesign/index.js index 5f53ee210..8cf01e6e7 100644 --- a/src/constants/products/WebsiteDesign/index.js +++ b/src/constants/products/WebsiteDesign/index.js @@ -6,13 +6,13 @@ export const CHALLENGE_FIELD_VALUES = { export const INTAKE_FORM_ROUTES = [ "/self-service/wizard", - "/self-service/work/new/website-design-new/basic-info", + "/self-service/work/new/website-design/basic-info", "/self-service", "/self-service", - "/self-service/work/new/website-design-new/login-prompt", + "/self-service/work/new/website-design/login-prompt", "/self-service", - "/self-service/work/new/website-design-new/review", - "/self-service/work/new/website-design-new/thank-you", + "/self-service/work/new/website-design/review", + "/self-service/work/new/website-design/thank-you", ]; export const DEFAULT_TIMELINE = [ diff --git a/src/constants/products/WebsiteDesignLegacy/index.js b/src/constants/products/WebsiteDesignLegacy/index.js index 11cf4eeee..336e84acc 100644 --- a/src/constants/products/WebsiteDesignLegacy/index.js +++ b/src/constants/products/WebsiteDesignLegacy/index.js @@ -112,53 +112,53 @@ export const DURATION_MAPPING = [ export const INTAKE_FORM_ROUTES = [ "/self-service/wizard", - "/self-service/work/new/website-design/basic-info", - "/self-service/work/new/website-design/website-purpose", - "/self-service/work/new/website-design/page-details", - "/self-service/work/new/website-design/login-prompt", - "/self-service/work/new/website-design/branding", - "/self-service/work/new/website-design/review", - "/self-service/work/new/website-design/thank-you", + "/self-service/work/new/website-design-legacy/basic-info", + "/self-service/work/new/website-design-legacy/website-purpose", + "/self-service/work/new/website-design-legacy/page-details", + "/self-service/work/new/website-design-legacy/login-prompt", + "/self-service/work/new/website-design-legacy/branding", + "/self-service/work/new/website-design-legacy/review", + "/self-service/work/new/website-design-legacy/thank-you", ]; export const PROGRESS_LEVELS = [ { label: "Basic Info", - url: "/self-service/work/new/website-design/basic-info", + url: "/self-service/work/new/website-design-legacy/basic-info", trueIndex: 2, showIndex: 1, visibleInProgressIndicator: true, }, { label: "REVIEW REQUIREMENTS", - url: "/self-service/work/new/website-design/basic-info", + url: "/self-service/work/new/website-design-legacy/basic-info", trueIndex: 2, showIndex: 1, }, { label: "Website Purpose", - url: "/self-service/work/new/website-design/website-purpose", + url: "/self-service/work/new/website-design-legacy/website-purpose", trueIndex: 3, showIndex: 2, visibleInProgressIndicator: true, }, { label: "Page Details", - url: "/self-service/work/new/website-design/page-details", + url: "/self-service/work/new/website-design-legacy/page-details", trueIndex: 4, showIndex: 3, visibleInProgressIndicator: true, }, { label: "Branding", - url: "/self-service/work/new/website-design/branding", + url: "/self-service/work/new/website-design-legacy/branding", trueIndex: 5, showIndex: 4, visibleInProgressIndicator: true, }, { label: "Review", - url: "/self-service/work/new/website-design/review", + url: "/self-service/work/new/website-design-legacy/review", trueIndex: 6, showIndex: 5, visibleInProgressIndicator: true, diff --git a/src/routes/BasicInfoLegacy/index.jsx b/src/routes/BasicInfoLegacy/index.jsx index 06b6d3333..1ed7d36a3 100644 --- a/src/routes/BasicInfoLegacy/index.jsx +++ b/src/routes/BasicInfoLegacy/index.jsx @@ -78,7 +78,7 @@ const BasicInfoLegacy = ({ const onNext = () => { setProgressItem(3); saveBasicInfo(formData); - navigate("/self-service/work/new/website-design/website-purpose"); + navigate("/self-service/work/new/website-design-legacy/website-purpose"); }; const updateNumOfPages = (newNumOfPages) => { @@ -119,8 +119,8 @@ const BasicInfoLegacy = ({ if (currentStep === 0) { saveWorkType({ - selectedWorkType: "Website Design", - selectedWorkTypeDetail: "Website Design", + selectedWorkType: "Website Design Legacy", + selectedWorkTypeDetail: "Website Design Legacy", }); dispatch(triggerAutoSave(true, isLoggedIn)); } diff --git a/src/routes/BrandingLegacy/index.jsx b/src/routes/BrandingLegacy/index.jsx index b8aed9506..2f5e17b38 100644 --- a/src/routes/BrandingLegacy/index.jsx +++ b/src/routes/BrandingLegacy/index.jsx @@ -104,11 +104,11 @@ const BrandingLegacy = ({ saveBranding, setProgressItem, isLoggedIn }) => { formData?.fontUrl.value.trim() !== ""); const onBack = () => { - navigate("/self-service/work/new/website-design/page-details"); + navigate("/self-service/work/new/website-design-legacy/page-details"); }; const onNext = () => { - navigate("/self-service/work/new/website-design/review"); + navigate("/self-service/work/new/website-design-legacy/review"); saveBranding(formData); setProgressItem(6); }; diff --git a/src/routes/LoginPrompt/index.jsx b/src/routes/LoginPrompt/index.jsx index 1b390fee3..7ce77f6c7 100644 --- a/src/routes/LoginPrompt/index.jsx +++ b/src/routes/LoginPrompt/index.jsx @@ -46,7 +46,7 @@ const LoginPrompt = ({ const onBack = () => { navigate( - previousPageUrl || "/self-service/work/new/website-design/page-details" + previousPageUrl || "/self-service/work/new/website-design-legacy/page-details" ); }; diff --git a/src/routes/PageDetailsLegacy/index.jsx b/src/routes/PageDetailsLegacy/index.jsx index 80f47e27e..88cb0a9b0 100644 --- a/src/routes/PageDetailsLegacy/index.jsx +++ b/src/routes/PageDetailsLegacy/index.jsx @@ -47,7 +47,7 @@ const PageDetailsLegacy = ({ savePageDetails, setProgressItem, isLoggedIn }) => const estimate = getDynamicPriceAndTimelineEstimate(fullState); const onBack = () => { - navigate("/self-service/work/new/website-design/website-purpose"); + navigate("/self-service/work/new/website-design-legacy/website-purpose"); }; const [firstMounted, setFirstMounted] = useState(true); @@ -74,7 +74,7 @@ const PageDetailsLegacy = ({ savePageDetails, setProgressItem, isLoggedIn }) => }, [currentStep, pageDetails, dispatch, setProgressItem, firstMounted, navigate, isLoggedIn]); const onNext = () => { - navigate("/self-service/work/new/website-design/login-prompt"); + navigate("/self-service/work/new/website-design-legacy/login-prompt"); savePageDetails(listInputs); setProgressItem(5); }; diff --git a/src/routes/Products/WebsiteDesign/index.jsx b/src/routes/Products/WebsiteDesign/index.jsx index 967b33b72..7562672c8 100644 --- a/src/routes/Products/WebsiteDesign/index.jsx +++ b/src/routes/Products/WebsiteDesign/index.jsx @@ -36,8 +36,8 @@ export default function WebsiteDesign({ isLoggedIn }) { } path="/login-prompt" /> @@ -56,10 +56,10 @@ export default function WebsiteDesign({ isLoggedIn }) { {helperBannerContent} } - previousPageUrl="/self-service/work/new/website-design-new/basic-info" + previousPageUrl="/self-service/work/new/website-design/basic-info" nextPageUrl={ isLoggedIn - ? "/self-service/work/new/website-design-new/thank-you" + ? "/self-service/work/new/website-design/thank-you" : config.SIGN_IN_URL } icon={} diff --git a/src/routes/Products/WebsiteDesignLegacy/index.jsx b/src/routes/Products/WebsiteDesignLegacy/index.jsx index 135474a92..74d244c16 100644 --- a/src/routes/Products/WebsiteDesignLegacy/index.jsx +++ b/src/routes/Products/WebsiteDesignLegacy/index.jsx @@ -31,7 +31,7 @@ export default function WebsiteDesignLegacy({ isLoggedIn }) { } path="/login-prompt" /> diff --git a/src/routes/ReviewLegacy/index.jsx b/src/routes/ReviewLegacy/index.jsx index 25f50a40b..41e5ee2e9 100644 --- a/src/routes/ReviewLegacy/index.jsx +++ b/src/routes/ReviewLegacy/index.jsx @@ -120,7 +120,7 @@ const ReviewLegacy = ({ }, [currentStep, anotherFirstMounted, navigate]); const onBack = () => { - navigate("/self-service/work/new/website-design/branding"); + navigate("/self-service/work/new/website-design-legacy/branding"); }; const clearPreviousForm = () => { @@ -167,7 +167,7 @@ const ReviewLegacy = ({ .then((res) => { activateChallenge(challengeId); clearPreviousForm(); - navigate("/self-service/work/new/website-design/thank-you"); + navigate("/self-service/work/new/website-design-legacy/thank-you"); setProgressItem(8); setPaymentFailed(false); }) diff --git a/src/routes/SelectWorkType/styles.module.scss b/src/routes/SelectWorkType/styles.module.scss index 52b2cf8c4..09b46beff 100644 --- a/src/routes/SelectWorkType/styles.module.scss +++ b/src/routes/SelectWorkType/styles.module.scss @@ -14,7 +14,7 @@ border-radius: 8px; &.website-design, - &.website-design-new { + &.website-design-legacy { background: linear-gradient(263.22deg, #038664 2.65%, #075f96 98.14%), #ffffff; } diff --git a/src/routes/WebsitePurposeLegacy/index.jsx b/src/routes/WebsitePurposeLegacy/index.jsx index 556af8a48..362171e99 100644 --- a/src/routes/WebsitePurposeLegacy/index.jsx +++ b/src/routes/WebsitePurposeLegacy/index.jsx @@ -54,12 +54,12 @@ const WebsitePurposeLegacy = ({ saveWebsitePurpose, setProgressItem, isLoggedIn formData?.userStory?.value.length; const onBack = () => { - navigate("/self-service/work/new/website-design/basic-info"); + navigate("/self-service/work/new/website-design-legacy/basic-info"); }; const onNext = () => { saveWebsitePurpose(formData); - navigate("/self-service/work/new/website-design/page-details"); + navigate("/self-service/work/new/website-design-legacy/page-details"); setProgressItem(4); };