Merge pull request #12845 from strapi/fix/marketplace-qa

This commit is contained in:
markkaylor 2022-03-15 17:30:24 +01:00 committed by GitHub
commit 067d31a116
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 210 additions and 255 deletions

View File

@ -68,7 +68,7 @@ const PluginCard = ({ plugin, installedPluginNames, useYarn }) => {
width={11} width={11}
height={11} height={11}
/> />
<Box paddingTop={5}> <Box paddingTop={4}>
<Typography as="h3" variant="delta"> <Typography as="h3" variant="delta">
<Flex alignItems="center"> <Flex alignItems="center">
{attributes.name} {attributes.name}
@ -108,7 +108,7 @@ const PluginCard = ({ plugin, installedPluginNames, useYarn }) => {
</Box> </Box>
</Box> </Box>
<Stack horizontal size={2} style={{ alignSelf: 'flex-end' }} paddingTop={3}> <Stack horizontal spacing={2} style={{ alignSelf: 'flex-end' }} paddingTop={6}>
<LinkButton <LinkButton
size="S" size="S"
href={`https://market.strapi.io/plugins/${attributes.slug}`} href={`https://market.strapi.io/plugins/${attributes.slug}`}

View File

@ -12,12 +12,13 @@ import {
useNotification, useNotification,
} from '@strapi/helper-plugin'; } from '@strapi/helper-plugin';
import { Grid, GridItem } from '@strapi/design-system/Grid'; import { Grid, GridItem } from '@strapi/design-system/Grid';
import { Layout, HeaderLayout, ContentLayout, ActionLayout } from '@strapi/design-system/Layout'; import { Layout, HeaderLayout, ContentLayout } from '@strapi/design-system/Layout';
import { Main } from '@strapi/design-system/Main'; import { Main } from '@strapi/design-system/Main';
import { Searchbar } from '@strapi/design-system/Searchbar'; import { Searchbar } from '@strapi/design-system/Searchbar';
import { Box } from '@strapi/design-system/Box';
import { LinkButton } from '@strapi/design-system/LinkButton'; import { LinkButton } from '@strapi/design-system/LinkButton';
import { useNotifyAT } from '@strapi/design-system/LiveRegions'; import { useNotifyAT } from '@strapi/design-system/LiveRegions';
import Plus from '@strapi/icons/Plus'; import Upload from '@strapi/icons/Upload';
import PluginCard from './components/PluginCard'; import PluginCard from './components/PluginCard';
import { EmptyPluginSearch } from './components/EmptyPluginSearch'; import { EmptyPluginSearch } from './components/EmptyPluginSearch';
@ -103,7 +104,11 @@ const MarketPlacePage = () => {
if (hasFailed) { if (hasFailed) {
return ( return (
<Layout> <Layout>
<ContentLayout>
<Box paddingTop={8}>
<AnErrorOccurred /> <AnErrorOccurred />
</Box>
</ContentLayout>
</Layout> </Layout>
); );
} }
@ -141,7 +146,7 @@ const MarketPlacePage = () => {
})} })}
primaryAction={ primaryAction={
<LinkButton <LinkButton
startIcon={<Plus />} startIcon={<Upload />}
variant="tertiary" variant="tertiary"
href="https://market.strapi.io/submit-plugin" href="https://market.strapi.io/submit-plugin"
onClick={() => trackUsage('didSubmitPlugin')} onClick={() => trackUsage('didSubmitPlugin')}
@ -153,8 +158,8 @@ const MarketPlacePage = () => {
</LinkButton> </LinkButton>
} }
/> />
<ActionLayout <ContentLayout>
startActions={ <Box width="25%" paddingBottom={4}>
<Searchbar <Searchbar
name="searchbar" name="searchbar"
onClear={() => setSearchQuery('')} onClear={() => setSearchQuery('')}
@ -174,9 +179,7 @@ const MarketPlacePage = () => {
defaultMessage: 'Search for a plugin', defaultMessage: 'Search for a plugin',
})} })}
</Searchbar> </Searchbar>
} </Box>
/>
<ContentLayout>
{searchQuery.length > 0 && !searchResults.length ? ( {searchQuery.length > 0 && !searchResults.length ? (
<EmptyPluginSearch <EmptyPluginSearch
content={formatMessage( content={formatMessage(