diff --git a/examples/getstarted/plugins/myplugin/admin/src/index.js b/examples/getstarted/plugins/myplugin/admin/src/index.js index 656bb106d3..97d744d48b 100644 --- a/examples/getstarted/plugins/myplugin/admin/src/index.js +++ b/examples/getstarted/plugins/myplugin/admin/src/index.js @@ -14,6 +14,7 @@ export default strapi => { initializer: () => null, injectedComponents: [], isReady: true, + isRequired: pluginPkg.strapi.required || false, leftMenuLinks: [], leftMenuSections: [], mainComponent: null, diff --git a/packages/strapi-admin/admin/src/components/ContainerFluid/index.js b/packages/strapi-admin/admin/src/components/ContainerFluid/index.js new file mode 100644 index 0000000000..8bf886cf94 --- /dev/null +++ b/packages/strapi-admin/admin/src/components/ContainerFluid/index.js @@ -0,0 +1,12 @@ +import styled from 'styled-components'; +import { Container } from 'reactstrap'; + +const ContainerFluid = styled(Container)` + padding: 18px 30px !important; +`; + +ContainerFluid.defaultProps = { + fluid: true, +}; + +export default ContainerFluid; diff --git a/packages/strapi-admin/admin/src/containers/Admin/index.js b/packages/strapi-admin/admin/src/containers/Admin/index.js index d2d3fa2511..63e288b8f5 100644 --- a/packages/strapi-admin/admin/src/containers/Admin/index.js +++ b/packages/strapi-admin/admin/src/containers/Admin/index.js @@ -25,7 +25,8 @@ import Header from '../../components/Header/index'; import Logout from '../../components/Logout'; import NavTopRightWrapper from '../../components/NavTopRightWrapper'; import LeftMenu from '../LeftMenu'; -import ListPluginsPage from '../ListPluginsPage'; +// import ListPluginsPage from '../ListPluginsPage'; +import ListPluginsPage from '../InstalledPluginsPage'; import LocaleToggle from '../LocaleToggle'; import HomePage from '../HomePage'; import MarketplacePage from '../MarketplacePage'; diff --git a/packages/strapi-admin/admin/src/containers/InstalledPluginsPage/ListWrapper.js b/packages/strapi-admin/admin/src/containers/InstalledPluginsPage/ListWrapper.js new file mode 100644 index 0000000000..bb740be442 --- /dev/null +++ b/packages/strapi-admin/admin/src/containers/InstalledPluginsPage/ListWrapper.js @@ -0,0 +1,78 @@ +import styled from 'styled-components'; + +const Wrapper = styled.div` + padding-top: 2rem; + background-color: #ffffff; + box-shadow: 0 2px 4px #e3e9f3; + + .titleContainer { + display: flex; + justify-content: space-between; + padding-right: 1.8rem; + padding-left: 1.8rem; + font-size: 1.8rem; + font-weight: bold; + } + + .ulContainer { + width: 100%; + padding-top: 1.5rem; + > ul { + margin: 0; + padding: 0; + list-style: none; + > li { + height: 5.4rem !important; + line-height: 5.4rem !important; + padding-right: 3.2rem; + padding-left: 1.5rem; + > div:first-child { + margin: 0; + > div:first-child { + padding-left: 0 !important; + } + } + } + > li:last-child { + > div { + border-bottom: none; + } + } + } + } + + .pluginContent { + text-align: left !important; + > span:first-child { + font-size: 11px; + font-weight: 600; + letter-spacing: 0.7px; + text-transform: uppercase; + } + > span:last-child { + font-size: 13px; + } + } + + .icoContainer { + width: 70px; + height: 36px; + margin: auto 0; + line-height: 36px; + text-align: center; + border: 1px solid rgba(28, 93, 231, 0.1); + border-radius: 3px; + font-size: 20px; + } + + .actionContainer { + display: flex; + justify-content: flex-end; + } + + .nameWrapper { + display: flex; + } +`; + +export default Wrapper; diff --git a/packages/strapi-admin/admin/src/containers/InstalledPluginsPage/index.js b/packages/strapi-admin/admin/src/containers/InstalledPluginsPage/index.js new file mode 100644 index 0000000000..06611dd789 --- /dev/null +++ b/packages/strapi-admin/admin/src/containers/InstalledPluginsPage/index.js @@ -0,0 +1,46 @@ +/* eslint-disable */ +import React from 'react'; +import PropTypes from 'prop-types'; +import { FormattedMessage } from 'react-intl'; +import { LoadingIndicatorPage, useGlobalContext } from 'strapi-helper-plugin'; +import { Header } from '@buffetjs/custom'; +import PageTitle from '../../components/PageTitle'; +import useFetchPluginsFromMarketPlace from '../../hooks/useFetchPluginsFromMarketPlace'; +import ContainerFluid from '../../components/ContainerFluid'; +// import ListPlugins from '../../components/ListPlugins'; +import ListWrapper from './ListWrapper'; + +const InstalledPluginsPage = ({ history }) => { + const { formatMessage, plugins } = useGlobalContext(); + console.log(plugins); + const { error, isLoading, data } = useFetchPluginsFromMarketPlace(); + + if (isLoading || error) { + return ; + } + + return ( +
+ + +
+ +
+ ); +}; + +export default InstalledPluginsPage; diff --git a/packages/strapi-admin/admin/src/containers/ListPluginsPage/Wrapper.js b/packages/strapi-admin/admin/src/containers/ListPluginsPage/Wrapper.js index b35fc18907..b911946db3 100644 --- a/packages/strapi-admin/admin/src/containers/ListPluginsPage/Wrapper.js +++ b/packages/strapi-admin/admin/src/containers/ListPluginsPage/Wrapper.js @@ -2,7 +2,7 @@ import styled from 'styled-components'; const Wrapper = styled.div` padding: 18px 30px !important; - overflow: hidden; + // overflow: hidden; `; export default Wrapper; diff --git a/packages/strapi-admin/admin/src/containers/ListPluginsPage/index.js b/packages/strapi-admin/admin/src/containers/ListPluginsPage/index.js index b3f82f5e6e..92f40197bc 100644 --- a/packages/strapi-admin/admin/src/containers/ListPluginsPage/index.js +++ b/packages/strapi-admin/admin/src/containers/ListPluginsPage/index.js @@ -46,6 +46,8 @@ export class ListPluginsPage extends React.Component { return ; } + console.log(this.props.plugins); + return (
diff --git a/packages/strapi-admin/admin/src/containers/ListPluginsPage/saga.js b/packages/strapi-admin/admin/src/containers/ListPluginsPage/saga.js index bb189ebc2c..d5b1b59fa1 100644 --- a/packages/strapi-admin/admin/src/containers/ListPluginsPage/saga.js +++ b/packages/strapi-admin/admin/src/containers/ListPluginsPage/saga.js @@ -40,7 +40,7 @@ export function* pluginsGet() { call(request, '/admin/plugins', { method: 'GET' }), ]); const locale = yield select(selectLocale()); - + console.log({ response }); const opts = { method: 'GET', headers: { diff --git a/packages/strapi-admin/admin/src/containers/MarketplacePage/Wrapper.js b/packages/strapi-admin/admin/src/containers/MarketplacePage/Wrapper.js index 985ae7780c..878be40add 100644 --- a/packages/strapi-admin/admin/src/containers/MarketplacePage/Wrapper.js +++ b/packages/strapi-admin/admin/src/containers/MarketplacePage/Wrapper.js @@ -1,7 +1,7 @@ import styled from 'styled-components'; +import ContainerFluid from '../../components/ContainerFluid'; -const Wrapper = styled.div` - padding: 18px 30px !important; +const Wrapper = styled(ContainerFluid)` > div:first-child { margin-bottom: 11px; } diff --git a/packages/strapi-admin/admin/src/containers/MarketplacePage/index.js b/packages/strapi-admin/admin/src/containers/MarketplacePage/index.js index dd3297b9aa..19377cdef0 100644 --- a/packages/strapi-admin/admin/src/containers/MarketplacePage/index.js +++ b/packages/strapi-admin/admin/src/containers/MarketplacePage/index.js @@ -6,11 +6,10 @@ import { request, } from 'strapi-helper-plugin'; import { Header } from '@buffetjs/custom'; - +import useFetchPluginsFromMarketPlace from '../../hooks/useFetchPluginsFromMarketPlace'; import PageTitle from '../../components/PageTitle'; import PluginCard from '../../components/PluginCard'; import Wrapper from './Wrapper'; -import useFetchPluginsFromMarketPlace from '../../hooks/useFetchPluginsFromMarketPlace'; const MarketPlacePage = ({ history }) => { const { @@ -66,7 +65,7 @@ const MarketPlacePage = ({ history }) => { id: 'app.components.InstallPluginPage.helmet', })} /> - +
{ initializer: Initializer, injectedComponents: [], isReady: false, + isRequired: pluginPkg.strapi.required || false, layout: null, lifecycles, leftMenuLinks: [], diff --git a/packages/strapi-plugin-content-type-builder/admin/src/index.js b/packages/strapi-plugin-content-type-builder/admin/src/index.js index 68ece9de23..20f771fc32 100644 --- a/packages/strapi-plugin-content-type-builder/admin/src/index.js +++ b/packages/strapi-plugin-content-type-builder/admin/src/index.js @@ -38,6 +38,7 @@ export default strapi => { key: 'content-type-builder.form', }, ], + isRequired: pluginPkg.strapi.required || false, layout: null, lifecycles, leftMenuLinks: [], diff --git a/packages/strapi-plugin-documentation/admin/src/index.js b/packages/strapi-plugin-documentation/admin/src/index.js index 9044afd3fa..d983b32e70 100644 --- a/packages/strapi-plugin-documentation/admin/src/index.js +++ b/packages/strapi-plugin-documentation/admin/src/index.js @@ -18,6 +18,7 @@ export default strapi => { initializer: Initializer, injectedComponents: [], isReady: false, + isRequired: pluginPkg.strapi.required || false, layout: null, lifecycles, leftMenuLinks: [], diff --git a/packages/strapi-plugin-email/admin/src/index.js b/packages/strapi-plugin-email/admin/src/index.js index 82dc5d2f7a..90f1ba53a7 100644 --- a/packages/strapi-plugin-email/admin/src/index.js +++ b/packages/strapi-plugin-email/admin/src/index.js @@ -18,6 +18,7 @@ export default strapi => { id: pluginId, initializer: Initializer, injectedComponents: [], + isRequired: pluginPkg.strapi.required || false, layout: null, lifecycles, leftMenuLinks: [], diff --git a/packages/strapi-plugin-graphql/admin/src/index.js b/packages/strapi-plugin-graphql/admin/src/index.js index b8ac7f5766..47c9503a55 100644 --- a/packages/strapi-plugin-graphql/admin/src/index.js +++ b/packages/strapi-plugin-graphql/admin/src/index.js @@ -15,6 +15,7 @@ export default strapi => { isReady: true, initializer: () => null, injectedComponents: [], + isRequired: pluginPkg.strapi.required || false, layout: null, lifecycles: () => {}, leftMenuLinks: [], diff --git a/packages/strapi-plugin-upload/admin/src/index.js b/packages/strapi-plugin-upload/admin/src/index.js index f979b4cef1..180a60581a 100644 --- a/packages/strapi-plugin-upload/admin/src/index.js +++ b/packages/strapi-plugin-upload/admin/src/index.js @@ -17,6 +17,7 @@ export default strapi => { id: pluginId, initializer: Initializer, injectedComponents: [], + isRequired: pluginPkg.strapi.required || false, layout: null, lifecycles, leftMenuLinks: [], diff --git a/packages/strapi-plugin-users-permissions/admin/src/index.js b/packages/strapi-plugin-users-permissions/admin/src/index.js index d31ddba811..0802e4059b 100644 --- a/packages/strapi-plugin-users-permissions/admin/src/index.js +++ b/packages/strapi-plugin-users-permissions/admin/src/index.js @@ -19,6 +19,7 @@ export default strapi => { id: pluginId, initializer: Initializer, injectedComponents: [], + isRequired: pluginPkg.strapi.required || false, layout, lifecycles, leftMenuLinks: [],