Skip to content

Commit

Permalink
Merge branch 'develop' into release/3.4.1
Browse files Browse the repository at this point in the history
* develop:
  update account links and labels for jarvis
  Bump version
  Bump newfold-labs/wp-module-ecommerce to 0.9.1
  • Loading branch information
circlecube committed Oct 16, 2023
2 parents d447273 + b148f86 commit e7379ad
Showing 1 changed file with 20 additions and 10 deletions.
30 changes: 20 additions & 10 deletions src/app/pages/home/accountCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
} from "@heroicons/react/24/outline";
import { NewfoldRuntime } from "@newfold-labs/wp-module-runtime";
import { Card, Title } from "@newfold/ui-component-library";
import { addUtmParams, getPlatformBaseUrl, getPlatformPathUrl } from "../../util/helpers";
import { addUtmParams, getPlatformPathUrl, getPlatformBaseUrl } from "../../util/helpers";
import classNames from "classnames";

const isJarvis = NewfoldRuntime.sdk.isJarvis;
Expand All @@ -17,35 +17,43 @@ const base = [
{
icon: CpuChipIcon,
id: "account_link",
href: addUtmParams( getPlatformPathUrl("home", "app") ),
label: __("Control Panel", "bluehost-wordpress-plugin"),
href: addUtmParams( getPlatformPathUrl("hosting/list", "app") ),
label: isJarvis
? __("Hosting", "bluehost-wordpress-plugin")
: __("Control Panel", "bluehost-wordpress-plugin"),
color: "nfd-fill-gray",
},
{
icon: GiftIcon,
id: "products_link",
href: addUtmParams( getPlatformPathUrl("market-place", "account_center#products") ),
label: __("Products", "bluehost-wordpress-plugin"),
href: addUtmParams( getPlatformPathUrl("renewal-center", "account_center#products") ),
label: isJarvis
? __("Renewal Center", "bluehost-wordpress-plugin")
: __("Products", "bluehost-wordpress-plugin"),
color: "nfd-fill-primary-dark",
},
{
icon: CreditCardIcon,
id: "billing_link",
href: addUtmParams( getPlatformPathUrl("renewal-center", "account_center#billing") ),
label: __("Billing", "bluehost-wordpress-plugin"),
href: addUtmParams( getPlatformPathUrl("billing-center", "account_center#billing") ),
label: isJarvis
? __("Payment Methods", "bluehost-wordpress-plugin")
: __("Billing", "bluehost-wordpress-plugin"),
color: "nfd-fill-primary",
},
{
icon: EnvelopeIcon,
id: "mail_link",
href: addUtmParams( getPlatformPathUrl("home", "app#/email-office") ),
label: __("Mail & Office", "bluehost-wordpress-plugin"),
label: isJarvis
? __("Mail", "bluehost-wordpress-plugin")
: __("Mail & Office", "bluehost-wordpress-plugin"),
color: "nfd-fill-[#5b5b5b]",
},
{
icon: ShieldCheckIcon,
id: "security_link",
href: addUtmParams( getPlatformPathUrl("security", "account_center#security") ),
href: addUtmParams( getPlatformPathUrl("account-center", "account_center#security") ),
label: __("Security", "bluehost-wordpress-plugin"),
color: "nfd-fill-[#17b212]",
},
Expand All @@ -55,7 +63,9 @@ const base = [
href: isJarvis
? addUtmParams( getPlatformPathUrl("account-center") )
: addUtmParams( getPlatformBaseUrl("/cgi/token") ),
label: __("Validation Token", "bluehost-wordpress-plugin"),
label: isJarvis
? __("Profile", "bluehost-wordpress-plugin")
: __("Validation Token", "bluehost-wordpress-plugin"),
color: "nfd-fill-[#f89c24]",
},
];
Expand Down

0 comments on commit e7379ad

Please sign in to comment.