-
}
- bottomMargin
- name="Saleor Klaviyo App"
- author="By Saleor Commerce"
- />
-
-
-
+
+
);
}
diff --git a/apps/monitoring/src/pages/configuration/[[...path]].tsx b/apps/monitoring/src/pages/configuration/[[...path]].tsx
index 8634727..1a7d7cb 100644
--- a/apps/monitoring/src/pages/configuration/[[...path]].tsx
+++ b/apps/monitoring/src/pages/configuration/[[...path]].tsx
@@ -3,7 +3,6 @@ import { AppColumnsLayout } from "../../ui/app-columns-layout";
import React, { useEffect } from "react";
import { IntegrationsList } from "../../ui/providers-list";
import { NoProvidersConfigured } from "../../ui/no-providers-configured";
-import { AppMainBar } from "../../ui/app-main-bar";
import { useRouter } from "next/router";
import { DatadogConfig } from "../../ui/datadog/datadog-config";
import { DatadogSite, useConfigQuery } from "../../../generated/graphql";
@@ -11,13 +10,8 @@ import { LinearProgress, Link, Typography } from "@material-ui/core";
import { Section } from "../../ui/sections";
import { actions, useAppBridge } from "@saleor/app-sdk/app-bridge";
import { Done, Error } from "@material-ui/icons";
-import { makeStyles } from "@saleor/macaw-ui";
import { DATADOG_SITES_LINKS } from "../../datadog-urls";
-const useStyles = makeStyles((theme) => ({
- wrapper: {},
-}));
-
const useActiveProvider = () => {
const router = useRouter();
@@ -99,17 +93,13 @@ const Content = () => {
};
const ConfigurationPage: NextPage = () => {
- const styles = useStyles();
const selectedProvider = useActiveProvider();
return (
-
+
+
+
+
);
};
diff --git a/apps/monitoring/src/ui/app-icon.tsx b/apps/monitoring/src/ui/app-icon.tsx
deleted file mode 100644
index 16ec2db..0000000
--- a/apps/monitoring/src/ui/app-icon.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Typography } from "@material-ui/core";
-import { makeStyles } from "@saleor/macaw-ui";
-
-const useStyles = makeStyles({
- appIconContainer: {
- background: "rgb(58, 86, 199)",
- display: "flex",
- flexDirection: "column",
- justifyContent: "center",
- alignItems: "center",
- borderRadius: "50%",
- color: "#fff",
- width: 50,
- height: 50,
- },
-});
-
-export function AppIcon() {
- const styles = useStyles();
-
- return (
-
- );
-}
diff --git a/apps/monitoring/src/ui/app-main-bar.tsx b/apps/monitoring/src/ui/app-main-bar.tsx
deleted file mode 100644
index 806bcd2..0000000
--- a/apps/monitoring/src/ui/app-main-bar.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { MainBar } from "./main-bar";
-import { AppIcon } from "./app-icon";
-import React from "react";
-import { Button, makeStyles } from "@saleor/macaw-ui";
-import { GitHub, OfflineBoltOutlined } from "@material-ui/icons";
-import { actions, useAppBridge } from "@saleor/app-sdk/app-bridge";
-
-const useStyles = makeStyles({
- buttonsGrid: { display: "flex", gap: 10 },
-});
-
-export const AppMainBar = () => {
- const styles = useStyles();
-
- const { appBridge } = useAppBridge();
-
- const openInNewTab = (url: string) => {
- appBridge?.dispatch(
- actions.Redirect({
- to: url,
- newContext: true,
- })
- );
- };
-
- return (
-
}
- bottomMargin
- rightColumnContent={
-
- }
- onClick={() => {
- openInNewTab("https://github.com/saleor/apps");
- }}
- >
- Repository
-
- }
- variant="secondary"
- onClick={() => {
- openInNewTab("https://github.com/saleor/apps/discussions");
- }}
- >
- Request a feature
-
-
- }
- />
- );
-};
diff --git a/apps/monitoring/src/ui/main-bar.tsx b/apps/monitoring/src/ui/main-bar.tsx
deleted file mode 100644
index 7fd1e67..0000000
--- a/apps/monitoring/src/ui/main-bar.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { Paper, PaperProps } from "@material-ui/core";
-import { makeStyles } from "@saleor/macaw-ui";
-import clsx from "clsx";
-import { ReactNode } from "react";
-
-const useStyles = makeStyles((theme) => ({
- root: {
- height: 96,
- padding: "0 32px",
- display: "flex",
- alignItems: "center",
- justifyContent: "space-between",
- borderBottom: `1px solid ${theme.palette.grey.A100} `,
- },
- leftColumn: {
- marginRight: "auto",
- },
- rightColumn: {},
- iconColumn: {
- marginRight: 24,
- },
- appName: { fontSize: 24, margin: 0 },
- appAuthor: {
- fontSize: 12,
- textTransform: "uppercase",
- color: theme.palette.text.secondary,
- fontWeight: 500,
- margin: 0,
- },
- bottomMargin: {
- marginBottom: 32,
- },
-}));
-
-type Props = {
- name: string;
- author: string;
- rightColumnContent?: ReactNode;
- icon?: ReactNode;
- bottomMargin?: boolean;
-} & PaperProps;
-
-export function MainBar({
- name,
- author,
- rightColumnContent,
- className,
- icon,
- bottomMargin,
-}: Props) {
- const styles = useStyles();
-
- return (
-
- {icon && {icon}
}
-
-
{name}
- {author}
-
- {rightColumnContent}
-
- );
-}
diff --git a/apps/products-feed/src/modules/ui/main-bar.tsx b/apps/products-feed/src/modules/ui/main-bar.tsx
deleted file mode 100644
index 1907ed5..0000000
--- a/apps/products-feed/src/modules/ui/main-bar.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { makeStyles } from "@saleor/macaw-ui";
-import { ReactNode } from "react";
-import { Paper, PaperProps } from "@material-ui/core";
-import clsx from "clsx";
-
-const useStyles = makeStyles((theme) => ({
- root: {
- height: 96,
- padding: "0 32px",
- display: "flex",
- alignItems: "center",
- justifyContent: "space-between",
- },
- leftColumn: {
- marginRight: "auto",
- },
- rightColumn: {},
- iconColumn: {
- marginRight: 24,
- },
- appName: { fontSize: 24, margin: 0 },
- appAuthor: {
- fontSize: 12,
- textTransform: "uppercase",
- color: theme.palette.text.secondary,
- fontWeight: 500,
- margin: 0,
- },
-}));
-
-type Props = {
- name: string;
- author: string;
- rightColumnContent?: ReactNode;
- icon?: ReactNode;
-} & PaperProps;
-
-export const MainBar = ({ name, author, rightColumnContent, className, icon }: Props) => {
- const styles = useStyles();
-
- return (
-
- {icon && {icon}
}
-
-
{name}
- {author}
-
- {rightColumnContent}
-
- );
-};
diff --git a/apps/products-feed/src/pages/configuration.tsx b/apps/products-feed/src/pages/configuration.tsx
index 57be5b3..8a5223e 100644
--- a/apps/products-feed/src/pages/configuration.tsx
+++ b/apps/products-feed/src/pages/configuration.tsx
@@ -3,43 +3,9 @@ import React, { useEffect } from "react";
import { ChannelsConfiguration } from "../modules/app-configuration/ui/channels-configuration";
import { trpcClient } from "../modules/trpc/trpc-client";
import { useRouter } from "next/router";
-import { MainBar } from "../modules/ui/main-bar";
-import { Button, makeStyles } from "@saleor/macaw-ui";
-import { GitHub, OfflineBoltOutlined } from "@material-ui/icons";
import { actions, useAppBridge } from "@saleor/app-sdk/app-bridge";
-import { Typography } from "@material-ui/core";
-
-const useStyles = makeStyles({
- buttonsGrid: { display: "flex", gap: 10 },
- topBar: {
- marginBottom: 32,
- },
- appIconContainer: {
- background: `rgb(12, 197, 155)`,
- padding: 10,
- borderRadius: "50%",
- width: 50,
- height: 50,
- display: "flex",
- flexDirection: "column",
- justifyContent: "center",
- alignItems: "center",
- color: "#fff",
- },
-});
-
-const AppIcon = () => {
- const styles = useStyles();
-
- return (
-
- PF
-
- );
-};
const ConfigurationPage: NextPage = () => {
- const styles = useStyles();
const channels = trpcClient.channels.fetch.useQuery();
const router = useRouter();
@@ -60,39 +26,7 @@ const ConfigurationPage: NextPage = () => {
}
}, [channels.data, channels.isSuccess]);
- return (
-
-
}
- className={styles.topBar}
- name="Products Feed"
- author="By Saleor Commerce"
- rightColumnContent={
-
- }
- onClick={() => {
- openInNewTab("https://github.com/saleor/apps");
- }}
- >
- Repository
-
- }
- variant="secondary"
- onClick={() => {
- openInNewTab("https://github.com/saleor/apps/discussions");
- }}
- >
- Request a feature
-
-
- }
- />
-
-
- );
+ return
;
};
export default ConfigurationPage;
diff --git a/apps/search/src/components/ConfigurationView.tsx b/apps/search/src/components/ConfigurationView.tsx
index 92e7176..9c88f48 100644
--- a/apps/search/src/components/ConfigurationView.tsx
+++ b/apps/search/src/components/ConfigurationView.tsx
@@ -6,7 +6,6 @@ import { useRouter } from "next/router";
import Instructions from "./Instructions";
import { AppColumnsLayout } from "./AppColumnsLayout";
-import { SearchAppMainBar } from "./SearchAppMainBar";
const useStyles = makeStyles((theme) => ({
buttonsGrid: { display: "flex", gap: 10 },
@@ -17,7 +16,7 @@ const useStyles = makeStyles((theme) => ({
marginTop: 10,
},
wrapper: {
- minHeight: "100vh",
+ minHeight: "100%",
paddingBottom: 50,
},
tabs: { marginLeft: 32, marginBottom: 32 },
@@ -30,7 +29,6 @@ export const ConfigurationView = () => {
const handleClick = (val: string) => router.push("/" + val);
return (
-
diff --git a/apps/search/src/components/SearchAppMainBar.tsx b/apps/search/src/components/SearchAppMainBar.tsx
deleted file mode 100644
index 0a4720a..0000000
--- a/apps/search/src/components/SearchAppMainBar.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import { GitHub, OfflineBoltOutlined } from "@material-ui/icons";
-import { Button, makeStyles } from "@saleor/macaw-ui";
-
-import { useAppBridge, actions } from "@saleor/app-sdk/app-bridge";
-import appIcon from "./AppIcon.svg";
-import { AppIcon, TitleBar } from "@saleor/apps-shared";
-import Image from "next/image";
-
-const useStyles = makeStyles({
- buttonsGrid: { display: "flex", gap: 10 },
- topBar: {
- marginBottom: 32,
- },
- indexActions: {
- marginTop: 10,
- },
-});
-
-export const SearchAppMainBar = () => {
- const { appBridge } = useAppBridge();
- const styles = useStyles();
-
- const openInNewTab = (url: string) => {
- appBridge?.dispatch(
- actions.Redirect({
- to: url,
- newContext: true,
- })
- );
- };
-
- return (
- } />}
- className={styles.topBar}
- name="Saleor Search"
- author="By Saleor Commerce"
- rightColumnContent={
-
- }
- onClick={() => {
- openInNewTab("https://github.com/saleor/saleor-app-search");
- }}
- >
- Repository
-
- }
- variant="secondary"
- onClick={() => {
- openInNewTab("https://github.com/saleor/apps/discussions");
- }}
- >
- Request a feature
-
-
- }
- />
- );
-};
diff --git a/apps/search/src/pages/search/index.tsx b/apps/search/src/pages/search/index.tsx
index f3d8201..b218697 100644
--- a/apps/search/src/pages/search/index.tsx
+++ b/apps/search/src/pages/search/index.tsx
@@ -13,7 +13,7 @@ import { useAppBridge } from "@saleor/app-sdk/app-bridge";
import { useConfiguration } from "../../lib/configuration";
import { useMemo, useState } from "react";
import { useQuery } from "react-query";
-import { SearchAppMainBar } from "../../components/SearchAppMainBar";
+
import { AppColumnsLayout } from "../../components/AppColumnsLayout";
const useStyles = makeStyles((theme) => ({
@@ -62,7 +62,6 @@ function Search() {
return (
-
diff --git a/apps/search/src/components/AppIcon.svg b/apps/search/src/public/AppIcon.svg
similarity index 100%
rename from apps/search/src/components/AppIcon.svg
rename to apps/search/src/public/AppIcon.svg
diff --git a/apps/search/src/public/favicon.ico b/apps/search/src/public/favicon.ico
deleted file mode 100644
index 718d6fe..0000000
Binary files a/apps/search/src/public/favicon.ico and /dev/null differ
diff --git a/apps/search/src/public/vercel.svg b/apps/search/src/public/vercel.svg
deleted file mode 100644
index fbf0e25..0000000
--- a/apps/search/src/public/vercel.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-
\ No newline at end of file
diff --git a/apps/slack/src/components/SlackAppMainBar/SlackAppMainBar.tsx b/apps/slack/src/components/SlackAppMainBar/SlackAppMainBar.tsx
deleted file mode 100644
index 699c458..0000000
--- a/apps/slack/src/components/SlackAppMainBar/SlackAppMainBar.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import { GitHub, OfflineBoltOutlined } from "@material-ui/icons";
-import { Button, makeStyles } from "@saleor/macaw-ui";
-import { actions, useAppBridge } from "@saleor/app-sdk/app-bridge";
-
-import { AppIcon, TitleBar } from "@saleor/apps-shared";
-
-const useStyles = makeStyles({
- buttonsGrid: { display: "flex", gap: 10 },
- topBar: {
- marginBottom: 32,
- },
- indexActions: {
- marginTop: 10,
- },
-});
-
-export const SlackAppMainBar = () => {
- const { appBridge } = useAppBridge();
- const styles = useStyles();
-
- const openInNewTab = (url: string) => {
- appBridge?.dispatch(
- actions.Redirect({
- to: url,
- newContext: true,
- })
- );
- };
-
- return (
- }
- className={styles.topBar}
- name="Saleor Slack"
- author="By Saleor Commerce"
- rightColumnContent={
-
- }
- onClick={() => {
- openInNewTab("https://github.com/saleor/saleor-app-slack");
- }}
- >
- Repository
-
- }
- variant="secondary"
- onClick={() => {
- openInNewTab("https://github.com/saleor/apps/discussions");
- }}
- >
- Request a feature
-
-
- }
- />
- );
-};
diff --git a/apps/slack/src/pages/configuration.tsx b/apps/slack/src/pages/configuration.tsx
index 8f24459..e03e828 100644
--- a/apps/slack/src/pages/configuration.tsx
+++ b/apps/slack/src/pages/configuration.tsx
@@ -18,7 +18,6 @@ import AccessWarning from "../components/AccessWarning/AccessWarning";
import { ConfigurationError } from "../components/ConfigurationError/ConfigurationError";
import useAppApi from "../hooks/useAppApi";
import useDashboardNotifier from "../utils/useDashboardNotifier";
-import { SlackAppMainBar } from "../components/SlackAppMainBar/SlackAppMainBar";
import { AppColumnsLayout } from "../components/AppColumnsLayout/AppColumnsLayout";
interface ConfigurationField {
@@ -209,22 +208,19 @@ const ConfigurationWithAuth = withAuthorization({
})(Configuration);
ConfigurationWithAuth.getLayout = (page: ReactElement) => (
-
-
-
-
-
-
- {page}
-
-
-
-
-
-
-
-
-
+
+
+
+
+ {page}
+
+
+
+
+
+
+
+
);
export default ConfigurationWithAuth;
diff --git a/packages/shared/index.ts b/packages/shared/index.ts
index f87b494..04b9296 100644
--- a/packages/shared/index.ts
+++ b/packages/shared/index.ts
@@ -1,5 +1,3 @@
export * from "./src/is-in-iframe";
-export * from "./src/title-bar/title-bar";
-export * from "./src/app-icon/app-icon";
export * from "./src/macaw-theme-provider/macaw-theme-provider";
export * from "./src/no-ssr-wrapper";
diff --git a/packages/shared/src/app-icon/app-icon.tsx b/packages/shared/src/app-icon/app-icon.tsx
deleted file mode 100644
index b136456..0000000
--- a/packages/shared/src/app-icon/app-icon.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Typography } from "@material-ui/core";
-import { makeStyles } from "@saleor/macaw-ui";
-import { HTMLProps, ReactNode } from "react";
-import clsx from "clsx";
-
-const useStyles = makeStyles({
- appIconContainer: {
- display: "flex",
- flexDirection: "column",
- justifyContent: "center",
- alignItems: "center",
- borderRadius: "50%",
- color: "#fff",
- width: 50,
- height: 50,
- },
-});
-
-type Props = HTMLProps & {
- theme: string;
- text?: string;
- icon?: ReactNode;
-};
-
-export function AppIcon({ className, children, text, icon, theme, ...props }: Props) {
- const styles = useStyles();
-
- return (
-
- {text && {text}}
- {icon && icon}
-
- );
-}
diff --git a/packages/shared/src/title-bar/title-bar.module.css b/packages/shared/src/title-bar/title-bar.module.css
deleted file mode 100644
index 6b2c8e0..0000000
--- a/packages/shared/src/title-bar/title-bar.module.css
+++ /dev/null
@@ -1,52 +0,0 @@
-.container {
- --title-bar-height: 96px; /* TODO use design token */
-
- position: relative;
- height: var(--title-bar-height);
-}
-
-.root {
- z-index: 300;
- position: fixed;
- left: 0;
- right: 0;
- top: 0;
- height: var(--title-bar-height);
- padding: 0 32px;
- display: flex;
- align-items: center;
- justify-content: space-between;
- /* Override MUI. Remove with the new Macaw */
- border-top: none !important;
- border-left: none !important;
- border-right: none !important;
- border-radius: 0;
-}
-
-.leftColumn {
- margin-right: auto;
-}
-
-.rightColumn {
-}
-
-.iconColumn {
- margin-right: 24px;
-}
-
-.appName {
- font-size: 24px;
- margin: 0;
-}
-
-.appAuthor {
- font-size: 12px;
- text-transform: uppercase;
- color: rgba(0, 0, 0, 0.4); /* TODO use design token */
- font-weight: 500;
- margin: 0;
-}
-
-.bottomMargin {
- margin-bottom: 32px;
-}
diff --git a/packages/shared/src/title-bar/title-bar.tsx b/packages/shared/src/title-bar/title-bar.tsx
deleted file mode 100644
index 6be47e4..0000000
--- a/packages/shared/src/title-bar/title-bar.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { Paper, PaperProps } from "@material-ui/core";
-import styles from "./title-bar.module.css";
-import clsx from "clsx";
-import { ReactNode } from "react";
-
-const height = 96;
-
-type Props = {
- name: string;
- author: string;
- rightColumnContent?: ReactNode;
- icon?: ReactNode;
- bottomMargin?: boolean;
-} & PaperProps;
-
-export function TitleBar({
- name,
- author,
- rightColumnContent,
- className,
- icon,
- bottomMargin,
-}: Props) {
- return (
-
-
- {icon && {icon}
}
-
-
{name}
- {author}
-
- {rightColumnContent}
-
-
- );
-}
-
-TitleBar.height = height;