Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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 = '',
Expand Down
6 changes: 3 additions & 3 deletions src/IntakeForm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -182,16 +182,16 @@ export default function IntakeForm() {
path="/work/new/find-me-data/*"
/>

{/* Web Design (NEW) */}
{/* Web Design*/}
<Route
element={<WebsiteDesign isLoggedIn={isLoggedIn} />}
path="/work/new/website-design-new/*"
path="/work/new/website-design/*"
/>

{/* Web Design (Legacy) */}
<Route
element={<WebsiteDesignLegacy isLoggedIn={isLoggedIn} />}
path="/work/new/website-design/*"
path="/work/new/website-design-legacy/*"
/>

<Route
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
grid-template-columns: 1fr 359px;

&.website-design,
&.website-design-new,
&.website-design-legacy,
&.data-exploration,
&.review--payment {
background: linear-gradient(84.92deg, #065D6E 2.08%, #06596E 2.09%, #3E3B91 97.43%);
Expand Down Expand Up @@ -61,6 +61,7 @@
&.data-exploration {
background: url("../../../assets/images/data-exploration.png");
background-size: cover;

@include mobile {
background: url("../../../assets/images/data-exploration-mobile.png");
background-size: cover;
Expand All @@ -71,6 +72,7 @@
&.find-me-data {
background: url("../../../assets/images/find-me-data.png");
background-size: cover;

@include mobile {
background: url("../../../assets/images/find-me-data-mobile.png");
background-size: cover;
Expand All @@ -81,6 +83,7 @@
&.problem-statement--data-advisory {
background: url("../../../assets/images/problem-statement.png");
background-size: cover;

@include mobile {
background: url("../../../assets/images/problem-statement-mobile.png");
background-size: cover;
Expand All @@ -89,7 +92,7 @@
}

&.website-design,
&.website-design-new {
&.website-design-legacy {
background: url("../../../assets/images/website-design-v2.png");
background-size: cover;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const WebsiteDesignBannerLegacy = () => {
<div className={styles["heroIconContainer"]}>
<IconWebsiteTools />
</div>
WEBSITE DESIGN
WEBSITE DESIGN LEGACY
</div>
<div className={styles["heroHeaderSubtitle"]}>
Create a beautiful custom visual design for your website. and
Expand Down
36 changes: 18 additions & 18 deletions src/constants/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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",
};

/**
Expand Down Expand Up @@ -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.",
Expand All @@ -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",
Expand All @@ -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: (
Expand All @@ -311,11 +311,11 @@ export const webWorkTypes = [
</PageP>
<div className={styles["sampleImages"]}>
<a href={WebsiteDesignPdf1} target="_blank" rel="noreferrer">
<img className={styles["imgBanner"]} src={exampleImage1} alt="Example 1"/>
<img className={styles["imgBanner"]} src={exampleImage1} alt="Example 1" />
</a>
&nbsp;
<a href={WebsiteDesignPdf2} target="_blank" rel="noreferrer">
<img src={exampleImage2} alt="Example2"/>
<img src={exampleImage2} alt="Example2" />
</a>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions src/constants/products/WebsiteDesign/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
Expand Down
26 changes: 13 additions & 13 deletions src/constants/products/WebsiteDesignLegacy/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions src/routes/BasicInfoLegacy/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down Expand Up @@ -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));
}
Expand Down
4 changes: 2 additions & 2 deletions src/routes/BrandingLegacy/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};
Expand Down
2 changes: 1 addition & 1 deletion src/routes/LoginPrompt/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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"
);
};

Expand Down
4 changes: 2 additions & 2 deletions src/routes/PageDetailsLegacy/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
};
Expand Down
8 changes: 4 additions & 4 deletions src/routes/Products/WebsiteDesign/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ export default function WebsiteDesign({ isLoggedIn }) {
<Route
element={<LoginPrompt
isLoggedIn={isLoggedIn}
previousPageUrl="/self-service/work/new/website-design-new/basic-info"
nextPageUrl="/self-service/work/new/website-design-new/review"
previousPageUrl="/self-service/work/new/website-design/basic-info"
nextPageUrl="/self-service/work/new/website-design/review"
/>}
path="/login-prompt"
/>
Expand All @@ -56,10 +56,10 @@ export default function WebsiteDesign({ isLoggedIn }) {
{helperBannerContent}
</HelpBanner>
}
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={<DataExplorationIcon />}
Expand Down
2 changes: 1 addition & 1 deletion src/routes/Products/WebsiteDesignLegacy/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export default function WebsiteDesignLegacy({ isLoggedIn }) {
<Route
element={<LoginPrompt
isLoggedIn={isLoggedIn}
nextPageUrl="/self-service/work/new/website-design/branding"
nextPageUrl="/self-service/work/new/website-design-legacy/branding"
/>}
path="/login-prompt"
/>
Expand Down
4 changes: 2 additions & 2 deletions src/routes/ReviewLegacy/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 = () => {
Expand Down Expand Up @@ -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);
})
Expand Down
2 changes: 1 addition & 1 deletion src/routes/SelectWorkType/styles.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions src/routes/WebsitePurposeLegacy/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
};

Expand Down