yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-06-27 00:41:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16335 from strapi/fix/components-not-found

Browse Source
This commit is contained in:
markkaylor 2023-04-11 14:18:47 +02:00 committed by GitHub
commit c0729afdd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/admin/admin/src/content-manager/pages/App/index.js
View File

@ -4,7 +4,7 @@ import { Switch, Route, useRouteMatch, Redirect, useLocation } from 'react-route
import { import {
CheckPagePermissions, CheckPagePermissions,
LoadingIndicatorPage, LoadingIndicatorPage,
NotFound, AnErrorOccurred,
useGuidedTour, useGuidedTour,
} from '@strapi/helper-plugin'; } from '@strapi/helper-plugin';
import { Layout, HeaderLayout, Main } from '@strapi/design-system'; import { Layout, HeaderLayout, Main } from '@strapi/design-system';
@ -104,7 +104,7 @@ const App = () => {
<Route path="/content-manager/no-content-types"> <Route path="/content-manager/no-content-types">
<NoContentType /> <NoContentType />
</Route> </Route>
<Route path="" component={NotFound} /> <Route path="" component={AnErrorOccurred} />
</Switch> </Switch>
</ModelsContext.Provider> </ModelsContext.Provider>
</Layout> </Layout>

4
packages/core/admin/admin/src/pages/MarketplacePage/components/EmptyNpmPackageSearch/index.js
View File

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { Typography, Box, Flex, Icon } from '@strapi/design-system'; import { Typography, Box, Flex, Icon } from '@strapi/design-system';
import { EmptyStateDocument } from '@strapi/icons'; import { EmptyDocuments } from '@strapi/icons';
import { EmptyNpmPackageGrid } from './EmptyNpmPackageGrid'; import { EmptyNpmPackageGrid } from './EmptyNpmPackageGrid';
const EmptyNpmPackageSearch = ({ content }) => { const EmptyNpmPackageSearch = ({ content }) => {
@ -10,7 +10,7 @@ const EmptyNpmPackageSearch = ({ content }) => {
<EmptyNpmPackageGrid /> <EmptyNpmPackageGrid />
<Box position="absolute" top={11} width="100%"> <Box position="absolute" top={11} width="100%">
<Flex alignItems="center" justifyContent="center" direction="column"> <Flex alignItems="center" justifyContent="center" direction="column">
<Icon as={EmptyStateDocument} color="" width="160px" height="88px" /> <Icon as={EmptyDocuments} color="" width="160px" height="88px" />
<Box paddingTop={6}> <Box paddingTop={6}>
<Typography variant="delta" as="p" textColor="neutral600"> <Typography variant="delta" as="p" textColor="neutral600">
{content} {content}

4
packages/core/content-type-builder/admin/src/components/AttributeOptions/EmptyAttributes/index.js
View File

@ -3,7 +3,7 @@ import styled from 'styled-components';
import { useIntl } from 'react-intl'; import { useIntl } from 'react-intl';
import qs from 'qs'; import qs from 'qs';
import { Box, Flex, Typography, LinkButton, Icon } from '@strapi/design-system'; import { Box, Flex, Typography, LinkButton, Icon } from '@strapi/design-system';
import { Plus, EmptyStateDocument } from '@strapi/icons'; import { Plus, EmptyDocuments } from '@strapi/icons';
import { getTrad } from '../../../utils'; import { getTrad } from '../../../utils';
const EmptyCard = styled(Box)` const EmptyCard = styled(Box)`
@ -38,7 +38,7 @@ const EmptyAttributes = () => {
<EmptyCardGrid /> <EmptyCardGrid />
<Box position="absolute" top={6} width="100%"> <Box position="absolute" top={6} width="100%">
<Flex alignItems="center" justifyContent="center" direction="column"> <Flex alignItems="center" justifyContent="center" direction="column">
<Icon as={EmptyStateDocument} color="" width="160px" height="88px" /> <Icon as={EmptyDocuments} color="" width="160px" height="88px" />
<Box paddingTop={6} paddingBottom={4}> <Box paddingTop={6} paddingBottom={4}>
<Box textAlign="center"> <Box textAlign="center">
<Typography variant="delta" as="p" textColor="neutral600"> <Typography variant="delta" as="p" textColor="neutral600">

4
packages/core/upload/admin/src/components/EmptyAssets/index.js
View File

@ -1,7 +1,7 @@
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { Typography, Flex, Box, Icon } from '@strapi/design-system'; import { Typography, Flex, Box, Icon } from '@strapi/design-system';
import { EmptyStateDocuments } from '@strapi/icons'; import { EmptyDocuments } from '@strapi/icons';
import { EmptyAssetGrid } from './EmptyAssetGrid'; import { EmptyAssetGrid } from './EmptyAssetGrid';
export const EmptyAssets = ({ icon, content, action, size, count }) => { export const EmptyAssets = ({ icon, content, action, size, count }) => {
@ -12,7 +12,7 @@ export const EmptyAssets = ({ icon, content, action, size, count }) => {
<Box position="absolute" top={11} width="100%"> <Box position="absolute" top={11} width="100%">
<Flex direction="column" alignItems="center" gap={4} textAlign="center"> <Flex direction="column" alignItems="center" gap={4} textAlign="center">
<Flex direction="column" alignItems="center" gap={6}> <Flex direction="column" alignItems="center" gap={6}>
<Icon as={icon || EmptyStateDocuments} color="" width="160px" height="88px" /> <Icon as={icon || EmptyDocuments} color="" width="160px" height="88px" />
<Typography variant="delta" as="p" textColor="neutral600"> <Typography variant="delta" as="p" textColor="neutral600">
{content} {content}

4
packages/generators/generators/lib/files/js/plugin/admin/src/pages/App/index.js
View File

@ -7,7 +7,7 @@
import React from 'react'; import React from 'react';
import { Switch, Route } from 'react-router-dom'; import { Switch, Route } from 'react-router-dom';
import { NotFound } from '@strapi/helper-plugin'; import { AnErrorOccurred } from '@strapi/helper-plugin';
import pluginId from '../../pluginId'; import pluginId from '../../pluginId';
import HomePage from '../HomePage'; import HomePage from '../HomePage';
@ -16,7 +16,7 @@ const App = () => {
<div> <div>
<Switch> <Switch>
<Route path={`/plugins/${pluginId}`} component={HomePage} exact /> <Route path={`/plugins/${pluginId}`} component={HomePage} exact />
<Route component={NotFound} /> <Route component={AnErrorOccurred} />
</Switch> </Switch>
</div> </div>
); );

4
packages/generators/generators/lib/files/ts/plugin/admin/src/pages/App/index.tsx
View File

@ -7,7 +7,7 @@
import React from 'react'; import React from 'react';
import { Switch, Route } from 'react-router-dom'; import { Switch, Route } from 'react-router-dom';
import { NotFound } from '@strapi/helper-plugin'; import { AnErrorOccurred } from '@strapi/helper-plugin';
import pluginId from '../../pluginId'; import pluginId from '../../pluginId';
import HomePage from '../HomePage'; import HomePage from '../HomePage';
@ -16,7 +16,7 @@ const App = () => {
<div> <div>
<Switch> <Switch>
<Route path={`/plugins/${pluginId}`} component={HomePage} exact /> <Route path={`/plugins/${pluginId}`} component={HomePage} exact />
<Route component={NotFound} /> <Route component={AnErrorOccurred} />
</Switch> </Switch>
</div> </div>
); );

4
packages/plugins/users-permissions/admin/src/pages/Roles/index.js
View File

@ -1,6 +1,6 @@
import React from 'react'; import React from 'react';
import { Switch, Route } from 'react-router-dom'; import { Switch, Route } from 'react-router-dom';
import { CheckPagePermissions, NotFound } from '@strapi/helper-plugin'; import { CheckPagePermissions, AnErrorOccurred } from '@strapi/helper-plugin';
import pluginId from '../../pluginId'; import pluginId from '../../pluginId';
import pluginPermissions from '../../permissions'; import pluginPermissions from '../../permissions';
import ProtectedRolesListPage from './ProtectedListPage'; import ProtectedRolesListPage from './ProtectedListPage';
@ -18,7 +18,7 @@ const Roles = () => {
/> />
<Route path={`/settings/${pluginId}/roles/:id`} component={ProtectedRolesEditPage} exact /> <Route path={`/settings/${pluginId}/roles/:id`} component={ProtectedRolesEditPage} exact />
<Route path={`/settings/${pluginId}/roles`} component={ProtectedRolesListPage} exact /> <Route path={`/settings/${pluginId}/roles`} component={ProtectedRolesListPage} exact />
<Route path="" component={NotFound} /> <Route path="" component={AnErrorOccurred} />
</Switch> </Switch>
</CheckPagePermissions> </CheckPagePermissions>
); );