diff --git a/.changeset/curvy-bikes-mate.md b/.changeset/curvy-bikes-mate.md new file mode 100644 index 00000000000..78e7c592d05 --- /dev/null +++ b/.changeset/curvy-bikes-mate.md @@ -0,0 +1,5 @@ +--- +"saleor-dashboard": patch +--- + +You can now see a new card in home page that can redirect you to Saleor solution engineers contact information if you need technical advice. diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json index 8c41a78c244..c0597d81eb6 100644 --- a/locale/defaultMessages.json +++ b/locale/defaultMessages.json @@ -2965,6 +2965,10 @@ "context": "staff member's account", "string": "Active" }, + "HRXLYk": { + "context": "cta button label", + "string": "Get in touch" + }, "HSmg1/": { "context": "gift cards section name", "string": "Gift Cards" @@ -3243,6 +3247,10 @@ "context": "link", "string": "View Orders" }, + "J5R1SI": { + "context": "home get in touch card title", + "string": "Need technical help?" + }, "J7mFhU": { "context": "currency code select", "string": "{code} - {countries}" @@ -8717,6 +8725,10 @@ "u0V06N": { "string": "Max. Order Weight" }, + "u0hKaa": { + "context": "home get in touch card description", + "string": "Save hours of evaluating Saleor on your own by speaking with our solution engineer." + }, "u24Ppd": { "string": "This attribute cannot be assigned to this product type" }, diff --git a/package-lock.json b/package-lock.json index d82b9a72963..cff990bce2f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "@material-ui/styles": "^4.11.4", "@reach/auto-id": "^0.16.0", "@saleor/macaw-ui": "npm:@saleor/macaw-ui@0.7.4", - "@saleor/macaw-ui-next": "npm:@saleor/macaw-ui@1.1.10", + "@saleor/macaw-ui-next": "npm:@saleor/macaw-ui@1.1.12", "@saleor/sdk": "0.6.0", "@sentry/react": "^8.21.0", "@sentry/vite-plugin": "^2.21.1", @@ -6861,9 +6861,9 @@ }, "node_modules/@saleor/macaw-ui-next": { "name": "@saleor/macaw-ui", - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/@saleor/macaw-ui/-/macaw-ui-1.1.10.tgz", - "integrity": "sha512-lDxfD3p1lZChtYSN6FsV9NucBHmYcOvynlKqPsniuFJyvC1KShpRLP5CSM8qldYovHQHwaxESBSn9TH3PtVKQg==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/@saleor/macaw-ui/-/macaw-ui-1.1.12.tgz", + "integrity": "sha512-hGV/OOtbYgSj3+EsVPaabRf/OQosf9Kn1Du5UXNA0Rm9i+wCi1IS406tnEy2zcM+mKMmDsUmLf8hvFjTQi0tAA==", "dependencies": { "@dessert-box/react": "^0.4.0", "@floating-ui/react-dom": "^2.0.2", @@ -29665,9 +29665,9 @@ } }, "@saleor/macaw-ui-next": { - "version": "npm:@saleor/macaw-ui@1.1.10", - "resolved": "https://registry.npmjs.org/@saleor/macaw-ui/-/macaw-ui-1.1.10.tgz", - "integrity": "sha512-lDxfD3p1lZChtYSN6FsV9NucBHmYcOvynlKqPsniuFJyvC1KShpRLP5CSM8qldYovHQHwaxESBSn9TH3PtVKQg==", + "version": "npm:@saleor/macaw-ui@1.1.12", + "resolved": "https://registry.npmjs.org/@saleor/macaw-ui/-/macaw-ui-1.1.12.tgz", + "integrity": "sha512-hGV/OOtbYgSj3+EsVPaabRf/OQosf9Kn1Du5UXNA0Rm9i+wCi1IS406tnEy2zcM+mKMmDsUmLf8hvFjTQi0tAA==", "requires": { "@dessert-box/react": "^0.4.0", "@floating-ui/react-dom": "^2.0.2", diff --git a/package.json b/package.json index e3702b8d484..1866f711344 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "@material-ui/styles": "^4.11.4", "@reach/auto-id": "^0.16.0", "@saleor/macaw-ui": "npm:@saleor/macaw-ui@0.7.4", - "@saleor/macaw-ui-next": "npm:@saleor/macaw-ui@1.1.10", + "@saleor/macaw-ui-next": "npm:@saleor/macaw-ui@1.1.12", "@saleor/sdk": "0.6.0", "@sentry/react": "^8.21.0", "@sentry/vite-plugin": "^2.21.1", diff --git a/src/home/components/HomePage/HomeGetInTouch.tsx b/src/home/components/HomePage/HomeGetInTouch.tsx new file mode 100644 index 00000000000..c40dd7be18f --- /dev/null +++ b/src/home/components/HomePage/HomeGetInTouch.tsx @@ -0,0 +1,56 @@ +import { DashboardCard } from "@dashboard/components/Card"; +import { TECHNICAL_HELP_CTA_URL } from "@dashboard/links"; +import { Button, HelpIcon, Text } from "@saleor/macaw-ui-next"; +import * as React from "react"; +import { FormattedMessage } from "react-intl"; + +export const HomeGetInTouchCard: React.FC = () => ( + + + + + + + + + + + + + + + + + + +); diff --git a/src/home/components/HomePage/HomePage.tsx b/src/home/components/HomePage/HomePage.tsx index ad0b4c72aaf..fbbeab7d2b9 100644 --- a/src/home/components/HomePage/HomePage.tsx +++ b/src/home/components/HomePage/HomePage.tsx @@ -15,10 +15,10 @@ import { Box, Skeleton } from "@saleor/macaw-ui-next"; import React from "react"; import { useIntl } from "react-intl"; -import { HomeActivityCard } from "../HomeActivityCard"; import { HomeAnalyticsCard } from "../HomeAnalyticsCard"; import { HomeHeader } from "../HomeHeader"; import { HomeProductList } from "../HomeProductList"; +import { HomePageRightSidebar } from "./HomePageRightSidebar"; import { homePageMessages } from "./messages"; export interface HomePageProps { @@ -79,13 +79,8 @@ const HomePage: React.FC = props => { )} - {activities && ( - - - - - - )} + + ); }; diff --git a/src/home/components/HomePage/HomePageRightSidebar.tsx b/src/home/components/HomePage/HomePageRightSidebar.tsx new file mode 100644 index 00000000000..f08c1c4c0b3 --- /dev/null +++ b/src/home/components/HomePage/HomePageRightSidebar.tsx @@ -0,0 +1,24 @@ +import { DetailPageLayout } from "@dashboard/components/Layouts"; +import RequirePermissions from "@dashboard/components/RequirePermissions"; +import { PermissionEnum } from "@dashboard/graphql"; +import { Activities, HomeData } from "@dashboard/home/types"; +import * as React from "react"; + +import { HomeActivityCard } from "../HomeActivityCard"; +import { HomeGetInTouchCard } from "./HomeGetInTouch"; + +export interface HomePageRightSidebarProps { + activities?: HomeData; +} + +export const HomePageRightSidebar: React.FC = ({ activities }) => ( + + + + {activities && ( + + + + )} + +); diff --git a/src/links.ts b/src/links.ts new file mode 100644 index 00000000000..39306c97691 --- /dev/null +++ b/src/links.ts @@ -0,0 +1,2 @@ +export const TECHNICAL_HELP_CTA_URL = + "https://www.getclockwise.com/c/rian-dillon-saleor-io/short-call-with-saleor";