From 2d23480c617a8591d87b6598c3096d48e7715786 Mon Sep 17 00:00:00 2001 From: Lukasz Ostrowski Date: Tue, 28 Feb 2023 20:18:34 +0100 Subject: [PATCH] Remove TitleBar from apps and shared package (#209) * Remove TitleBar from apps and shared package * Invoices: add manifest homepage and support urls --- .changeset/few-fireants-unite.md | 5 ++ .changeset/mighty-tigers-scream.md | 12 +++ apps/data-importer/src/pages/importer.tsx | 29 +------- .../ui/channels-configuration.tsx | 3 +- apps/invoices/src/pages/api/manifest.ts | 2 + apps/invoices/src/pages/configuration.tsx | 52 +------------ apps/klaviyo/pages/configuration.tsx | 58 +++++++-------- .../src/pages/configuration/[[...path]].tsx | 18 +---- apps/monitoring/src/ui/app-icon.tsx | 28 ------- apps/monitoring/src/ui/app-main-bar.tsx | 56 -------------- apps/monitoring/src/ui/main-bar.tsx | 69 ------------------ .../products-feed/src/modules/ui/main-bar.tsx | 51 ------------- .../products-feed/src/pages/configuration.tsx | 68 +---------------- .../src/components/ConfigurationView.tsx | 4 +- .../src/components/SearchAppMainBar.tsx | 62 ---------------- apps/search/src/pages/search/index.tsx | 3 +- .../src/{components => public}/AppIcon.svg | 0 apps/search/src/public/favicon.ico | Bin 25931 -> 0 bytes apps/search/src/public/vercel.svg | 4 - .../SlackAppMainBar/SlackAppMainBar.tsx | 60 --------------- apps/slack/src/pages/configuration.tsx | 30 ++++---- packages/shared/index.ts | 2 - packages/shared/src/app-icon/app-icon.tsx | 40 ---------- .../shared/src/title-bar/title-bar.module.css | 52 ------------- packages/shared/src/title-bar/title-bar.tsx | 44 ----------- 25 files changed, 67 insertions(+), 685 deletions(-) create mode 100644 .changeset/few-fireants-unite.md create mode 100644 .changeset/mighty-tigers-scream.md delete mode 100644 apps/monitoring/src/ui/app-icon.tsx delete mode 100644 apps/monitoring/src/ui/app-main-bar.tsx delete mode 100644 apps/monitoring/src/ui/main-bar.tsx delete mode 100644 apps/products-feed/src/modules/ui/main-bar.tsx delete mode 100644 apps/search/src/components/SearchAppMainBar.tsx rename apps/search/src/{components => public}/AppIcon.svg (100%) delete mode 100644 apps/search/src/public/favicon.ico delete mode 100644 apps/search/src/public/vercel.svg delete mode 100644 apps/slack/src/components/SlackAppMainBar/SlackAppMainBar.tsx delete mode 100644 packages/shared/src/app-icon/app-icon.tsx delete mode 100644 packages/shared/src/title-bar/title-bar.module.css delete mode 100644 packages/shared/src/title-bar/title-bar.tsx diff --git a/.changeset/few-fireants-unite.md b/.changeset/few-fireants-unite.md new file mode 100644 index 0000000..5ac466f --- /dev/null +++ b/.changeset/few-fireants-unite.md @@ -0,0 +1,5 @@ +--- +"saleor-app-invoices": patch +--- + +Add homepage and support url to manifest diff --git a/.changeset/mighty-tigers-scream.md b/.changeset/mighty-tigers-scream.md new file mode 100644 index 0000000..6465768 --- /dev/null +++ b/.changeset/mighty-tigers-scream.md @@ -0,0 +1,12 @@ +--- +"saleor-app-data-importer": minor +"saleor-app-products-feed": minor +"saleor-app-monitoring": minor +"@saleor/apps-shared": minor +"saleor-app-invoices": minor +"saleor-app-klaviyo": minor +"saleor-app-search": minor +"saleor-app-slack": minor +--- + +Remove TitleBar component from apps, because it is moved to Dashboard, outside of iframe context diff --git a/apps/data-importer/src/pages/importer.tsx b/apps/data-importer/src/pages/importer.tsx index db43307..4bc84db 100644 --- a/apps/data-importer/src/pages/importer.tsx +++ b/apps/data-importer/src/pages/importer.tsx @@ -5,13 +5,12 @@ import { Button, makeStyles, PageTab, PageTabs, SaleorTheme } from "@saleor/maca import { CustomersImporterView } from "../modules/customers/customers-importer-nuvo/customers-importer-view"; import GraphQLProvider from "../providers/GraphQLProvider"; import { actions, useAppBridge } from "@saleor/app-sdk/app-bridge"; -import { AppIcon, TitleBar } from "@saleor/apps-shared"; type Tab = "customers"; const useStyles = makeStyles((theme: SaleorTheme) => ({ wrapper: { - minHeight: `100vh`, + minHeight: `100%`, }, })); @@ -32,32 +31,6 @@ const ImporterPage: NextPage = () => { return (
- } />} - name="Data Importer" - author="By Saleor Commerce" - rightColumnContent={ -
- - -
- } - /> { diff --git a/apps/invoices/src/pages/api/manifest.ts b/apps/invoices/src/pages/api/manifest.ts index ee94e61..6ce3704 100644 --- a/apps/invoices/src/pages/api/manifest.ts +++ b/apps/invoices/src/pages/api/manifest.ts @@ -15,6 +15,8 @@ export default createManifestHandler({ version: packageJson.version, webhooks: [invoiceRequestedWebhook.getWebhookManifest(context.appBaseUrl)], extensions: [], + homepageUrl: "https://github.com/saleor/apps", + supportUrl: "https://github.com/saleor/apps/discussions", }; return manifest; diff --git a/apps/invoices/src/pages/configuration.tsx b/apps/invoices/src/pages/configuration.tsx index 694f635..8a5223e 100644 --- a/apps/invoices/src/pages/configuration.tsx +++ b/apps/invoices/src/pages/configuration.tsx @@ -3,22 +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 { Button, makeStyles } from "@saleor/macaw-ui"; -import { GitHub, OfflineBoltOutlined } from "@material-ui/icons"; import { actions, useAppBridge } from "@saleor/app-sdk/app-bridge"; -import appIcon from "../app-invoices-icon.svg"; -import Image from "next/image"; -import { AppIcon, TitleBar } from "@saleor/apps-shared"; - -const useStyles = makeStyles({ - buttonsGrid: { display: "flex", gap: 10 }, - topBar: { - marginBottom: 32, - }, -}); const ConfigurationPage: NextPage = () => { - const styles = useStyles(); const channels = trpcClient.channels.fetch.useQuery(); const router = useRouter(); @@ -39,44 +26,7 @@ const ConfigurationPage: NextPage = () => { } }, [channels.data, channels.isSuccess]); - return ( -
- } - /> - } - className={styles.topBar} - name="Saleor Invoices" - author="By Saleor Commerce" - rightColumnContent={ -
- - -
- } - /> - -
- ); + return ; }; export default ConfigurationPage; diff --git a/apps/klaviyo/pages/configuration.tsx b/apps/klaviyo/pages/configuration.tsx index fad72ac..8b6c6c8 100644 --- a/apps/klaviyo/pages/configuration.tsx +++ b/apps/klaviyo/pages/configuration.tsx @@ -2,7 +2,7 @@ import { Link, List, ListItem, Paper, PaperProps, TextField, Typography } from " import Skeleton from "@material-ui/lab/Skeleton"; import { useAppBridge, withAuthorization } from "@saleor/app-sdk/app-bridge"; import { SALEOR_API_URL_HEADER, SALEOR_AUTHORIZATION_BEARER_HEADER } from "@saleor/app-sdk/const"; -import { AppIcon, TitleBar } from "@saleor/apps-shared"; + import { ConfirmButton, ConfirmButtonTransitionState, makeStyles } from "@saleor/macaw-ui"; import { ChangeEvent, SyntheticEvent, useEffect, useState } from "react"; @@ -217,39 +217,31 @@ function Configuration() { } return ( -
- } - bottomMargin - name="Saleor Klaviyo App" - author="By Saleor Commerce" - /> - -
-
-
- {configuration!.map(({ key, value }) => ( -
- -
- ))} -
- + +
+
+ + {configuration!.map(({ key, value }) => ( +
+
- -
- - -
+ ))} +
+ +
+ +
+ + ); } 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 ( -
-
- M -
-
- ); -} 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={ -
- - -
- } - /> - ); -}; 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={ -
- - -
- } - /> - -
- ); + 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={ -
- - -
- } - /> - ); -}; 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 718d6fea4835ec2d246af9800eddb7ffb276240c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25931 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 LrJugUA?W`A8`#=m 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={ -
- - -
- } - /> - ); -}; 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;