From 4aee4e11f8503cf820c3d3ff3dbb748e76f71afa Mon Sep 17 00:00:00 2001 From: Lukasz Ostrowski Date: Wed, 6 Sep 2023 14:22:54 +0200 Subject: [PATCH] Invoices, Klaviyo: Refactor to shared components (#989) --- .changeset/nine-rivers-flow.md | 5 + .changeset/real-pigs-promise.md | 5 + .changeset/twelve-pianos-relate.md | 5 + .changeset/wicked-llamas-talk.md | 5 + apps/invoices/next.config.js | 13 +- apps/invoices/package.json | 2 + apps/invoices/src/lib/theme-synchronizer.tsx | 25 --- .../app-configuration-router.test.ts | 2 + .../app-configuration/ui/address-form.tsx | 55 +++---- .../views/app-config.view.tsx | 51 +++--- .../views/channel-config.view.tsx | 11 +- .../channels/ui/per-channel-config-list.tsx | 3 +- .../shop-info/ui/default-shop-address.tsx | 42 ++--- apps/invoices/src/modules/trpc/trpc-client.ts | 27 +--- .../invoices/src/modules/trpc/trpc-context.ts | 13 -- apps/invoices/src/modules/trpc/trpc-server.ts | 3 +- apps/invoices/src/modules/ui/AppSection.tsx | 36 ----- apps/invoices/src/pages/_app.tsx | 3 +- apps/invoices/src/pages/api/trpc/[trpc].ts | 2 +- apps/invoices/src/public/favicon.ico | Bin 25931 -> 0 bytes apps/invoices/src/public/vercel.svg | 4 - apps/invoices/src/styles/globals.css | 5 - apps/klaviyo/package.json | 1 + apps/klaviyo/src/hooks/theme-synchronizer.tsx | 25 --- .../klaviyo/src/lib/ui/app-columns-layout.tsx | 17 -- apps/klaviyo/src/pages/_app.tsx | 13 +- apps/klaviyo/src/pages/_document.tsx | 7 +- apps/klaviyo/src/pages/api/configuration.ts | 18 ++- apps/klaviyo/src/pages/api/manifest.ts | 14 +- apps/klaviyo/src/pages/configuration.tsx | 147 +++++++----------- apps/klaviyo/turbo.json | 4 +- cspell.json | 3 +- package.json | 4 +- pnpm-lock.yaml | 9 ++ 34 files changed, 220 insertions(+), 359 deletions(-) create mode 100644 .changeset/nine-rivers-flow.md create mode 100644 .changeset/real-pigs-promise.md create mode 100644 .changeset/twelve-pianos-relate.md create mode 100644 .changeset/wicked-llamas-talk.md delete mode 100644 apps/invoices/src/lib/theme-synchronizer.tsx delete mode 100644 apps/invoices/src/modules/trpc/trpc-context.ts delete mode 100644 apps/invoices/src/modules/ui/AppSection.tsx delete mode 100644 apps/invoices/src/public/favicon.ico delete mode 100644 apps/invoices/src/public/vercel.svg delete mode 100644 apps/klaviyo/src/hooks/theme-synchronizer.tsx delete mode 100644 apps/klaviyo/src/lib/ui/app-columns-layout.tsx diff --git a/.changeset/nine-rivers-flow.md b/.changeset/nine-rivers-flow.md new file mode 100644 index 0000000..14d320b --- /dev/null +++ b/.changeset/nine-rivers-flow.md @@ -0,0 +1,5 @@ +--- +"saleor-app-klaviyo": patch +--- + +Fixed error where config couldn't be saved diff --git a/.changeset/real-pigs-promise.md b/.changeset/real-pigs-promise.md new file mode 100644 index 0000000..c8ce3bb --- /dev/null +++ b/.changeset/real-pigs-promise.md @@ -0,0 +1,5 @@ +--- +"saleor-app-invoices": minor +--- + +Replace text "loading" messages with skeletons diff --git a/.changeset/twelve-pianos-relate.md b/.changeset/twelve-pianos-relate.md new file mode 100644 index 0000000..2fcc79c --- /dev/null +++ b/.changeset/twelve-pianos-relate.md @@ -0,0 +1,5 @@ +--- +"saleor-app-invoices": minor +--- + +Redesigned app layout. Now app uses shared sections as other apps. diff --git a/.changeset/wicked-llamas-talk.md b/.changeset/wicked-llamas-talk.md new file mode 100644 index 0000000..1f44420 --- /dev/null +++ b/.changeset/wicked-llamas-talk.md @@ -0,0 +1,5 @@ +--- +"saleor-app-klaviyo": minor +--- + +Improved app layout to match modern style. diff --git a/apps/invoices/next.config.js b/apps/invoices/next.config.js index 6f81e6a..9d3f40c 100644 --- a/apps/invoices/next.config.js +++ b/apps/invoices/next.config.js @@ -1,13 +1,18 @@ const { withSentryConfig } = require("@sentry/nextjs"); const isSentryPropertiesInEnvironment = Boolean( - process.env.SENTRY_AUTH_TOKEN && process.env.SENTRY_PROJECT && process.env.SENTRY_ORG + process.env.SENTRY_AUTH_TOKEN && process.env.SENTRY_PROJECT && process.env.SENTRY_ORG, ); /** @type {import('next').NextConfig} */ const nextConfig = { reactStrictMode: true, - transpilePackages: ["@saleor/apps-shared", "@saleor/apps-ui", "@saleor/react-hook-form-macaw"], + transpilePackages: [ + "@saleor/apps-shared", + "@saleor/apps-ui", + "@saleor/react-hook-form-macaw", + "@saleor/trpc", + ], }; const configWithSentry = withSentryConfig( @@ -23,9 +28,7 @@ const configWithSentry = withSentryConfig( tunnelRoute: "/monitoring", hideSourceMaps: true, disableLogger: true, - } + }, ); - module.exports = isSentryPropertiesInEnvironment ? configWithSentry : nextConfig; - diff --git a/apps/invoices/package.json b/apps/invoices/package.json index 20e7ff5..7282de7 100644 --- a/apps/invoices/package.json +++ b/apps/invoices/package.json @@ -15,7 +15,9 @@ "@hookform/resolvers": "^3.1.0", "@saleor/app-sdk": "0.41.1", "@saleor/apps-shared": "workspace:*", + "@saleor/apps-ui": "workspace:*", "@saleor/macaw-ui": "0.8.0-pre.127", + "@saleor/trpc": "workspace:*", "@sentry/nextjs": "7.67.0", "@tanstack/react-query": "4.29.19", "@trpc/client": "10.34.0", diff --git a/apps/invoices/src/lib/theme-synchronizer.tsx b/apps/invoices/src/lib/theme-synchronizer.tsx deleted file mode 100644 index 2ae0fe6..0000000 --- a/apps/invoices/src/lib/theme-synchronizer.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import { useAppBridge } from "@saleor/app-sdk/app-bridge"; -import { useTheme } from "@saleor/macaw-ui/next"; -import { memo, useEffect } from "react"; - -// todo move to shared -export function ThemeSynchronizer() { - const { appBridgeState } = useAppBridge(); - const { setTheme } = useTheme(); - - useEffect(() => { - if (!setTheme || !appBridgeState?.theme) { - return; - } - - if (appBridgeState.theme === "light") { - setTheme("defaultLight"); - } - - if (appBridgeState.theme === "dark") { - setTheme("defaultDark"); - } - }, [appBridgeState?.theme, setTheme]); - - return null; -} diff --git a/apps/invoices/src/modules/app-configuration/app-configuration-router.test.ts b/apps/invoices/src/modules/app-configuration/app-configuration-router.test.ts index aebe150..c0457bd 100644 --- a/apps/invoices/src/modules/app-configuration/app-configuration-router.test.ts +++ b/apps/invoices/src/modules/app-configuration/app-configuration-router.test.ts @@ -53,6 +53,8 @@ describe("appConfigurationRouter", function () { token: "TOKEN", saleorApiUrl: "http://localhost:8000/graphql/", appId: "app", + ssr: true, + baseUrl: "localhost:3000", }) .upsertChannelOverride({ channelSlug: "test", diff --git a/apps/invoices/src/modules/app-configuration/ui/address-form.tsx b/apps/invoices/src/modules/app-configuration/ui/address-form.tsx index fc8b764..dd77680 100644 --- a/apps/invoices/src/modules/app-configuration/ui/address-form.tsx +++ b/apps/invoices/src/modules/app-configuration/ui/address-form.tsx @@ -1,13 +1,14 @@ import { Controller, useForm } from "react-hook-form"; -import React, { useCallback, useEffect } from "react"; -import { Box, Button, Input, Text } from "@saleor/macaw-ui/next"; -import { SellerAddress } from "../address"; -import { trpcClient } from "../../trpc/trpc-client"; import { zodResolver } from "@hookform/resolvers/zod"; -import { z } from "zod"; import { useDashboardNotification } from "@saleor/apps-shared"; +import { ButtonsBox, Layout, SkeletonLayout } from "@saleor/apps-ui"; +import { Box, Button, Input, Text } from "@saleor/macaw-ui/next"; import { useRouter } from "next/router"; +import { useCallback } from "react"; +import { z } from "zod"; +import { trpcClient } from "../../trpc/trpc-client"; +import { SellerAddress } from "../address"; import { AddressV2Schema, AddressV2Shape } from "../schema-v2/app-config-schema.v2"; type Props = { @@ -57,12 +58,29 @@ export const AddressForm = (props: Props & InnerFormProps) => { }); return ( -
+ + + + } onSubmit={handleSubmit((data, event) => { return props.onSubmit(data); })} > - + {fieldsBlock1.map((fieldName) => ( { /> ))} - - - - - + ); }; @@ -164,9 +168,6 @@ export const ConnectedAddressForm = (props: Props) => { const { push } = useRouter(); - const addressData = - channelOverrideConfigQuery.data && channelOverrideConfigQuery.data[props.channelSlug]; - const submitHandler = useCallback( async (data: AddressV2Shape) => { return upsertConfigMutation.mutate({ @@ -174,7 +175,7 @@ export const ConnectedAddressForm = (props: Props) => { channelSlug: props.channelSlug, }); }, - [props.channelSlug, upsertConfigMutation] + [props.channelSlug, upsertConfigMutation], ); const onCancelHandler = useCallback(() => { @@ -182,7 +183,7 @@ export const ConnectedAddressForm = (props: Props) => { }, [push]); if (channelOverrideConfigQuery.isLoading) { - return Loading; + return ; } return ( diff --git a/apps/invoices/src/modules/app-configuration/views/app-config.view.tsx b/apps/invoices/src/modules/app-configuration/views/app-config.view.tsx index 35dba1f..0e680fa 100644 --- a/apps/invoices/src/modules/app-configuration/views/app-config.view.tsx +++ b/apps/invoices/src/modules/app-configuration/views/app-config.view.tsx @@ -1,29 +1,25 @@ import { Box, Text } from "@saleor/macaw-ui/next"; import { DefaultShopAddress } from "../../shop-info/ui/default-shop-address"; -import { AppSection } from "../../ui/AppSection"; import { PerChannelConfigList } from "../../channels/ui/per-channel-config-list"; import { actions, useAppBridge } from "@saleor/app-sdk/app-bridge"; +import { Layout } from "@saleor/apps-ui"; export const AppConfigView = () => { const { appBridge } = useAppBridge(); return ( - - - - Configuration - - - The Invoices App will generate invoices for each order, for which{" "} - INVOICE_REQUESTED event will be triggered - + + Configuration + + + The Invoices App will generate invoices for each order, for which{" "} + INVOICE_REQUESTED event will be triggered + + By default it will use{" "} { appBridge?.dispatch( actions.Redirect({ to: "/site-settings", - }) + }), ); }} > @@ -40,22 +36,25 @@ export const AppConfigView = () => { {" "} address, but each channel can be configured separately - - - - - - + + + + } sideContent={ Configure custom billing address for each channel. If not set, default shop address will be used } - /> + > + + + + ); }; diff --git a/apps/invoices/src/modules/app-configuration/views/channel-config.view.tsx b/apps/invoices/src/modules/app-configuration/views/channel-config.view.tsx index 489b1da..042ac41 100644 --- a/apps/invoices/src/modules/app-configuration/views/channel-config.view.tsx +++ b/apps/invoices/src/modules/app-configuration/views/channel-config.view.tsx @@ -1,9 +1,9 @@ import { Box, ChevronRightIcon, Text, Button } from "@saleor/macaw-ui/next"; -import { AppSection } from "../../ui/AppSection"; import { useRouter } from "next/router"; import { ConnectedAddressForm } from "../ui/address-form"; import { trpcClient } from "../../trpc/trpc-client"; import { useDashboardNotification } from "@saleor/apps-shared"; +import { Layout } from "@saleor/apps-ui"; export const ChannelConfigView = () => { const { @@ -15,7 +15,7 @@ export const ChannelConfigView = () => { const { notifySuccess } = useDashboardNotification(); if (!channel) { - return null; + return null; // TODO: error } return ( @@ -29,10 +29,9 @@ export const ChannelConfigView = () => { {channel}
- } sideContent={ @@ -51,7 +50,9 @@ export const ChannelConfigView = () => { } - /> + > + + ); }; diff --git a/apps/invoices/src/modules/channels/ui/per-channel-config-list.tsx b/apps/invoices/src/modules/channels/ui/per-channel-config-list.tsx index 18b2961..65a2950 100644 --- a/apps/invoices/src/modules/channels/ui/per-channel-config-list.tsx +++ b/apps/invoices/src/modules/channels/ui/per-channel-config-list.tsx @@ -1,6 +1,7 @@ import { Box, Text, Chip, Button } from "@saleor/macaw-ui/next"; import { trpcClient } from "../../trpc/trpc-client"; import { useRouter } from "next/router"; +import { SkeletonLayout } from "@saleor/apps-ui"; const defaultAddressChip = ( @@ -17,7 +18,7 @@ export const PerChannelConfigList = () => { const { push } = useRouter(); if (shopChannelsQuery.isLoading || channelsOverridesQuery.isLoading) { - return Loading...; + return ; } const renderChannelAddress = (slug: string) => { diff --git a/apps/invoices/src/modules/shop-info/ui/default-shop-address.tsx b/apps/invoices/src/modules/shop-info/ui/default-shop-address.tsx index 171e5d0..e6d5b2e 100644 --- a/apps/invoices/src/modules/shop-info/ui/default-shop-address.tsx +++ b/apps/invoices/src/modules/shop-info/ui/default-shop-address.tsx @@ -2,30 +2,31 @@ import { Box, Text, Button } from "@saleor/macaw-ui/next"; import { trpcClient } from "../../trpc/trpc-client"; import { PropsWithChildren } from "react"; import { actions, useAppBridge } from "@saleor/app-sdk/app-bridge"; +import { ButtonsBox, Layout, SkeletonLayout } from "@saleor/apps-ui"; const Wrapper = ({ children }: PropsWithChildren<{}>) => { const { appBridge } = useAppBridge(); return ( - - - Default address of the shop - - + + + + } + > {children} - + ); }; @@ -46,7 +47,7 @@ export const DefaultShopAddress = () => { if (isLoading) { return ( - Loading... + ); } @@ -70,6 +71,9 @@ export const DefaultShopAddress = () => { if (data && data.companyAddress) { return ( + + This address will be used if custom address is not set for channel + {data.companyAddress.companyName} diff --git a/apps/invoices/src/modules/trpc/trpc-client.ts b/apps/invoices/src/modules/trpc/trpc-client.ts index 7411da9..cca3b09 100644 --- a/apps/invoices/src/modules/trpc/trpc-client.ts +++ b/apps/invoices/src/modules/trpc/trpc-client.ts @@ -1,34 +1,13 @@ -import { httpBatchLink } from "@trpc/client"; import { createTRPCNext } from "@trpc/next"; -import { SALEOR_API_URL_HEADER, SALEOR_AUTHORIZATION_BEARER_HEADER } from "@saleor/app-sdk/const"; +import { createHttpBatchLink } from "@saleor/trpc"; import { appBridgeInstance } from "../../pages/_app"; import { AppRouter } from "./trpc-app-router"; -function getBaseUrl() { - if (typeof window !== "undefined") return ""; - if (process.env.VERCEL_URL) return `https://${process.env.VERCEL_URL}`; - - return `http://localhost:${process.env.PORT ?? 3000}`; -} - export const trpcClient = createTRPCNext({ - config({ ctx }) { + config() { return { - links: [ - httpBatchLink({ - url: `${getBaseUrl()}/api/trpc`, - headers() { - return { - /** - * Attach headers from app to client requests, so tRPC can add them to context - */ - [SALEOR_AUTHORIZATION_BEARER_HEADER]: appBridgeInstance?.getState().token, - [SALEOR_API_URL_HEADER]: appBridgeInstance?.getState().saleorApiUrl, - }; - }, - }), - ], + links: [createHttpBatchLink(appBridgeInstance)], // queryClientConfig: { defaultOptions: { queries: { staleTime: 60 } } }, }; }, diff --git a/apps/invoices/src/modules/trpc/trpc-context.ts b/apps/invoices/src/modules/trpc/trpc-context.ts deleted file mode 100644 index 6e4bcbf..0000000 --- a/apps/invoices/src/modules/trpc/trpc-context.ts +++ /dev/null @@ -1,13 +0,0 @@ -import * as trpcNext from "@trpc/server/adapters/next"; -import { SALEOR_AUTHORIZATION_BEARER_HEADER, SALEOR_API_URL_HEADER } from "@saleor/app-sdk/const"; -import { inferAsyncReturnType } from "@trpc/server"; - -export const createTrpcContext = async ({ res, req }: trpcNext.CreateNextContextOptions) => { - return { - token: req.headers[SALEOR_AUTHORIZATION_BEARER_HEADER] as string | undefined, - saleorApiUrl: req.headers[SALEOR_API_URL_HEADER] as string | undefined, - appId: undefined as undefined | string, - }; -}; - -export type TrpcContext = inferAsyncReturnType; diff --git a/apps/invoices/src/modules/trpc/trpc-server.ts b/apps/invoices/src/modules/trpc/trpc-server.ts index 9a930bd..7989c90 100644 --- a/apps/invoices/src/modules/trpc/trpc-server.ts +++ b/apps/invoices/src/modules/trpc/trpc-server.ts @@ -1,6 +1,7 @@ import { initTRPC } from "@trpc/server"; -import { TrpcContext } from "./trpc-context"; + import { Permission } from "@saleor/app-sdk/types"; +import { TrpcContext } from "@saleor/trpc"; interface Meta { requiredClientPermissions?: Permission[]; diff --git a/apps/invoices/src/modules/ui/AppSection.tsx b/apps/invoices/src/modules/ui/AppSection.tsx deleted file mode 100644 index c9a61e9..0000000 --- a/apps/invoices/src/modules/ui/AppSection.tsx +++ /dev/null @@ -1,36 +0,0 @@ -import { Box, PropsWithBox, Text } from "@saleor/macaw-ui/next"; -import { ReactNode } from "react"; - -// todo move to shared -export const AppSection = ({ - heading, - sideContent, - mainContent, - includePadding = false, - ...props -}: PropsWithBox<{ - heading: string; - sideContent?: ReactNode; - mainContent: ReactNode; - includePadding?: boolean; -}>) => { - return ( - - - - {heading} - - {sideContent} - - - {mainContent} - - - ); -}; diff --git a/apps/invoices/src/pages/_app.tsx b/apps/invoices/src/pages/_app.tsx index 70a64bc..0cd0711 100644 --- a/apps/invoices/src/pages/_app.tsx +++ b/apps/invoices/src/pages/_app.tsx @@ -6,12 +6,11 @@ import { RoutePropagator } from "@saleor/app-sdk/app-bridge/next"; import React, { ReactElement } from "react"; import { AppProps } from "next/app"; -import { NoSSRWrapper } from "@saleor/apps-shared"; +import { NoSSRWrapper, ThemeSynchronizer } from "@saleor/apps-shared"; import { trpcClient } from "../modules/trpc/trpc-client"; import { Box, ThemeProvider } from "@saleor/macaw-ui/next"; import { NextPage } from "next"; -import { ThemeSynchronizer } from "../lib/theme-synchronizer"; /** * Ensure instance is a singleton. diff --git a/apps/invoices/src/pages/api/trpc/[trpc].ts b/apps/invoices/src/pages/api/trpc/[trpc].ts index 80bfedf..cc490e9 100644 --- a/apps/invoices/src/pages/api/trpc/[trpc].ts +++ b/apps/invoices/src/pages/api/trpc/[trpc].ts @@ -1,7 +1,7 @@ import * as trpcNext from "@trpc/server/adapters/next"; -import { createTrpcContext } from "../../../modules/trpc/trpc-context"; import { appRouter } from "../../../modules/trpc/trpc-app-router"; import { createLogger } from "@saleor/apps-shared"; +import { createTrpcContext } from "@saleor/trpc"; const logger = createLogger({ name: "tRPC error" }); diff --git a/apps/invoices/src/public/favicon.ico b/apps/invoices/src/public/favicon.ico deleted file mode 100644 index 718d6fea4835ec2d246af9800eddb7ffb276240c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25931 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 LrJugUA?W`A8`#=m diff --git a/apps/invoices/src/public/vercel.svg b/apps/invoices/src/public/vercel.svg deleted file mode 100644 index fbf0e25..0000000 --- a/apps/invoices/src/public/vercel.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - \ No newline at end of file diff --git a/apps/invoices/src/styles/globals.css b/apps/invoices/src/styles/globals.css index 2366a15..fe307dc 100644 --- a/apps/invoices/src/styles/globals.css +++ b/apps/invoices/src/styles/globals.css @@ -1,8 +1,3 @@ -body { - font-family: Inter, -apple-system, "system-ui", "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, - "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif; -} - a { cursor: pointer; text-decoration: none; diff --git a/apps/klaviyo/package.json b/apps/klaviyo/package.json index 8864eba..d659e4e 100644 --- a/apps/klaviyo/package.json +++ b/apps/klaviyo/package.json @@ -16,6 +16,7 @@ "@material-ui/lab": "4.0.0-alpha.61", "@saleor/app-sdk": "0.41.1", "@saleor/apps-shared": "workspace:*", + "@saleor/apps-ui": "workspace:*", "@saleor/macaw-ui": "0.8.0-pre.127", "@sentry/nextjs": "7.67.0", "@urql/exchange-auth": "^2.1.4", diff --git a/apps/klaviyo/src/hooks/theme-synchronizer.tsx b/apps/klaviyo/src/hooks/theme-synchronizer.tsx deleted file mode 100644 index 3386f49..0000000 --- a/apps/klaviyo/src/hooks/theme-synchronizer.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import { useAppBridge } from "@saleor/app-sdk/app-bridge"; -import { useTheme } from "@saleor/macaw-ui/next"; -import { useEffect } from "react"; - -// todo move to shared -export function ThemeSynchronizer() { - const { appBridgeState } = useAppBridge(); - const { setTheme } = useTheme(); - - useEffect(() => { - if (!setTheme || !appBridgeState?.theme) { - return; - } - - if (appBridgeState.theme === "light") { - setTheme("defaultLight"); - } - - if (appBridgeState.theme === "dark") { - setTheme("defaultDark"); - } - }, [appBridgeState?.theme, setTheme]); - - return null; -} diff --git a/apps/klaviyo/src/lib/ui/app-columns-layout.tsx b/apps/klaviyo/src/lib/ui/app-columns-layout.tsx deleted file mode 100644 index 9e1ae6d..0000000 --- a/apps/klaviyo/src/lib/ui/app-columns-layout.tsx +++ /dev/null @@ -1,17 +0,0 @@ -import { Box } from "@saleor/macaw-ui/next"; -import { PropsWithChildren } from "react"; - -export function AppColumnsLayout({ children }: PropsWithChildren<{}>) { - return ( - - {children} - - ); -} diff --git a/apps/klaviyo/src/pages/_app.tsx b/apps/klaviyo/src/pages/_app.tsx index a50a676..e0427bb 100644 --- a/apps/klaviyo/src/pages/_app.tsx +++ b/apps/klaviyo/src/pages/_app.tsx @@ -1,11 +1,8 @@ -import "@saleor/macaw-ui/next/style"; import { AppBridge, AppBridgeProvider } from "@saleor/app-sdk/app-bridge"; -import React from "react"; -import { AppProps } from "next/app"; -import { RoutePropagator } from "@saleor/app-sdk/app-bridge/next"; +import { NoSSRWrapper, ThemeSynchronizer } from "@saleor/apps-shared"; import { Box, ThemeProvider } from "@saleor/macaw-ui/next"; -import { NoSSRWrapper } from "@saleor/apps-shared"; -import { ThemeSynchronizer } from "../hooks/theme-synchronizer"; +import "@saleor/macaw-ui/next/style"; +import { AppProps } from "next/app"; /** * Ensure instance is a singleton. @@ -18,7 +15,9 @@ function SaleorApp({ Component, pageProps }: AppProps) { - + + + diff --git a/apps/klaviyo/src/pages/_document.tsx b/apps/klaviyo/src/pages/_document.tsx index 82f6b4d..33153d7 100644 --- a/apps/klaviyo/src/pages/_document.tsx +++ b/apps/klaviyo/src/pages/_document.tsx @@ -3,13 +3,8 @@ import { Head, Html, Main, NextScript } from "next/document"; export default function Document() { return ( - - - +
diff --git a/apps/klaviyo/src/pages/api/configuration.ts b/apps/klaviyo/src/pages/api/configuration.ts index 3971999..b2b8297 100644 --- a/apps/klaviyo/src/pages/api/configuration.ts +++ b/apps/klaviyo/src/pages/api/configuration.ts @@ -61,12 +61,20 @@ const handler: NextProtectedApiHandler = async (request, res, ctx) => { data: await getAppSettings(settings), }); case "POST": { - await settings.set((request.body as PostRequestBody).data); + try { + await settings.set((JSON.parse(request.body) as PostRequestBody).data); - return res.json({ - success: true, - data: await getAppSettings(settings), - }); + return res.json({ + success: true, + data: await getAppSettings(settings), + }); + } catch (e) { + console.error(e); + + return res.json({ + success: false, + }); + } } default: return res.status(405).end(); diff --git a/apps/klaviyo/src/pages/api/manifest.ts b/apps/klaviyo/src/pages/api/manifest.ts index 58e28b8..0a7ee12 100644 --- a/apps/klaviyo/src/pages/api/manifest.ts +++ b/apps/klaviyo/src/pages/api/manifest.ts @@ -8,17 +8,17 @@ import { orderCreatedWebhook } from "./webhooks/order-created"; import { orderFullyPaidWebhook } from "./webhooks/order-fully-paid"; const handler = createManifestHandler({ - async manifestFactory(context): Promise { - const { appBaseUrl } = context; + async manifestFactory({ appBaseUrl }): Promise { + const iframeBaseUrl = process.env.APP_IFRAME_BASE_URL ?? appBaseUrl; + const apiBaseURL = process.env.APP_API_BASE_URL ?? appBaseUrl; return { - about: - "Klaviyo integration allows sending Klaviyo notifications on Saleor events.", - appUrl: appBaseUrl, + about: "Klaviyo integration allows sending Klaviyo notifications on Saleor events.", + appUrl: iframeBaseUrl, author: "Saleor Commerce", brand: { logo: { - default: `${context.appBaseUrl}/logo.png`, + default: `${apiBaseURL}/logo.png`, }, }, dataPrivacyUrl: "https://saleor.io/legal/privacy/", @@ -27,7 +27,7 @@ const handler = createManifestHandler({ name: "Klaviyo", permissions: ["MANAGE_USERS", "MANAGE_ORDERS"], supportUrl: "https://github.com/saleor/apps/discussions", - tokenTargetUrl: `${appBaseUrl}/api/register`, + tokenTargetUrl: `${apiBaseURL}/api/register`, version: pkg.version, webhooks: [ customerCreatedWebhook.getWebhookManifest(appBaseUrl), diff --git a/apps/klaviyo/src/pages/configuration.tsx b/apps/klaviyo/src/pages/configuration.tsx index 702151d..96e3e19 100644 --- a/apps/klaviyo/src/pages/configuration.tsx +++ b/apps/klaviyo/src/pages/configuration.tsx @@ -1,47 +1,31 @@ -import { useAppBridge, withAuthorization } from "@saleor/app-sdk/app-bridge"; +import { useAppBridge, useAuthenticatedFetch } from "@saleor/app-sdk/app-bridge"; import { SALEOR_API_URL_HEADER, SALEOR_AUTHORIZATION_BEARER_HEADER } from "@saleor/app-sdk/const"; import { ChangeEvent, SyntheticEvent, useEffect, useState } from "react"; -import { useAppApi } from "../hooks/useAppApi"; -import { AppColumnsLayout } from "../lib/ui/app-columns-layout"; import { useDashboardNotification } from "@saleor/apps-shared"; -import { Box, BoxProps, Text, Input, Button } from "@saleor/macaw-ui/next"; +import { Breadcrumbs, ButtonsBox, Layout, SkeletonLayout, TextLink } from "@saleor/apps-ui"; +import { Box, Button, Input, Text } from "@saleor/macaw-ui/next"; +import { useAppApi } from "../hooks/useAppApi"; interface ConfigurationField { key: string; value: string; } -function Section(props: BoxProps) { - return ; -} - function Instructions() { - const { appBridge } = useAppBridge(); - - const openExternalUrl = (url: string) => { - // eslint-disable-next-line - appBridge?.dispatch({ - type: "redirect", - payload: { - newContext: true, - actionId: "redirect_from_klaviyo_app", - to: url, - }, - }); - }; - return ( -
- + + How to set up - App will send events as Klaviyo metrics each time Saleor Event occurs. - + + App will send events as Klaviyo metrics each time Saleor Event occurs. + + When first metric is sent, it should be available in Klaviyo to build on top of. - + Metric name can be customized, PUBLIC_TOKEN must be provided to enable the app. @@ -49,16 +33,9 @@ function Instructions() { @@ -66,47 +43,28 @@ function Instructions() { -
+ ); } @@ -114,6 +72,7 @@ function Configuration() { const { appBridgeState } = useAppBridge(); const { notifySuccess, notifyError } = useDashboardNotification(); const [configuration, setConfiguration] = useState(); + const authenticatedFetch = useAuthenticatedFetch() as typeof window.fetch; const { data: configurationData, error } = useAppApi({ url: "/api/configuration", @@ -131,13 +90,8 @@ function Configuration() { const handleSubmit = (event: SyntheticEvent) => { event.preventDefault(); - fetch("/api/configuration", { + authenticatedFetch("/api/configuration", { method: "POST", - headers: [ - ["content-type", "application/json"], - [SALEOR_API_URL_HEADER, appBridgeState?.saleorApiUrl!], - [SALEOR_AUTHORIZATION_BEARER_HEADER, appBridgeState?.token!], - ], body: JSON.stringify({ data: configuration }), }) .then(async (response) => { @@ -149,7 +103,7 @@ function Configuration() { }) .catch(async () => { await notifyError( - "Configuration update failed. Ensure fields are filled correctly and you have MANAGE_APPS permission" + "Configuration update failed. Ensure fields are filled correctly and you have MANAGE_APPS permission", ); }); }; @@ -158,7 +112,7 @@ function Configuration() { const { name, value } = event.target as HTMLInputElement; setConfiguration((prev) => - prev!.map((prevField) => (prevField.key === name ? { ...prevField, value } : prevField)) + prev!.map((prevField) => (prevField.key === name ? { ...prevField, value } : prevField)), ); }; @@ -192,31 +146,36 @@ function Configuration() { } if (configuration === undefined) { - return

Loading...

; + return ; } return ( - -
-
- - Klaviyo configuration - - - {configuration!.map(({ key, value }) => ( -
- -
- ))} -
- -
- -
- - + + + Configuration + + }> + + + + } + > + + {configuration!.map(({ key, value }) => ( +
+ +
+ ))} + + + + ); } diff --git a/apps/klaviyo/turbo.json b/apps/klaviyo/turbo.json index abd10d3..e0aa903 100644 --- a/apps/klaviyo/turbo.json +++ b/apps/klaviyo/turbo.json @@ -18,7 +18,9 @@ "SENTRY_PROJECT", "SENTRY_AUTH_TOKEN", "NEXT_PUBLIC_VERCEL_ENV", - "SENTRY_ENVIRONMENT" + "SENTRY_ENVIRONMENT", + "APP_API_BASE_URL", + "APP_IFRAME_BASE_URL" ] } } diff --git a/cspell.json b/cspell.json index 166b708..0cee309 100644 --- a/cspell.json +++ b/cspell.json @@ -67,7 +67,8 @@ "vals", "urql", "Protos", - "pino" + "pino", + "IFRAME" ], "ignorePaths": [ "node_modules", diff --git a/package.json b/package.json index fe57896..b316811 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ }, "devDependencies": { "@changesets/cli": "^2.26.2", + "@sentry/cli": "2.20.6", "@types/node": "18.15.3", "cspell": "^7.2.0", "eslint": "8.46.0", @@ -27,8 +28,7 @@ "next": "13.4.8", "prettier": "3.0.3", "syncpack": "10.9.3", - "turbo": "1.10.12", - "@sentry/cli": "2.20.6" + "turbo": "1.10.12" }, "engines": { "node": ">=18.0.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bc1dd0f..2f04812 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -642,9 +642,15 @@ importers: '@saleor/apps-shared': specifier: workspace:* version: link:../../packages/shared + '@saleor/apps-ui': + specifier: workspace:* + version: link:../../packages/ui '@saleor/macaw-ui': specifier: 0.8.0-pre.127 version: 0.8.0-pre.127(@types/react-dom@18.2.5)(@types/react@18.2.5)(react-dom@18.2.0)(react@18.2.0) + '@saleor/trpc': + specifier: workspace:* + version: link:../../packages/trpc '@sentry/nextjs': specifier: 7.67.0 version: 7.67.0(next@13.4.8)(react@18.2.0) @@ -787,6 +793,9 @@ importers: '@saleor/apps-shared': specifier: workspace:* version: link:../../packages/shared + '@saleor/apps-ui': + specifier: workspace:* + version: link:../../packages/ui '@saleor/macaw-ui': specifier: 0.8.0-pre.127 version: 0.8.0-pre.127(@types/react-dom@18.2.5)(@types/react@18.2.5)(react-dom@18.2.0)(react@18.2.0)