yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-28 07:33:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicts

Browse Source 
Signed-off-by: soupette <cyril.lpz@gmail.com>
This commit is contained in:
soupette 2021-05-11 11:39:07 +02:00
parent d5b17f7cf0
commit 8928d9e8f2
2 changed files with 0 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
packages/core/content-type-builder/admin/src/index.js
View File

@ -27,11 +27,6 @@ export default {
description: pluginDescription,
icon,
id: pluginId,
<<<<<<< HEAD
// FIXME
=======
>>>>>>> 6665d1068 (Init load CTB)
injectedComponents: [
{
plugin: 'content-manager.editView',
@ -57,11 +52,6 @@ export default {
mainComponent: App,
name,
pluginLogo,
<<<<<<< HEAD
=======
// reducers,
>>>>>>> 6665d1068 (Init load CTB)
trads,
menu: {
pluginsSectionLinks: [
@ -85,63 +75,3 @@ export default {
},
boot() {},
};
// export default strapi => {
// const plugin = {
// blockerComponent: null,
// blockerComponentProps: {},
// description: pluginDescription,
// icon,
// id: pluginId,
// initializer: Initializer,
// injectedComponents: [
// {
// plugin: 'content-manager.editView',
// area: 'right.links',
// component: Link,
// key: 'content-type-builder.link',
// props: {
// message: {
// id: 'content-manager.containers.Edit.Link.Fields',
// },
// icon: 'fa-cog',
// },
// },
// {
// plugin: 'content-manager.editSettingsView',
// area: 'left.links',
// component: Button,
// key: 'content-type-builder.form',
// },
// ],
// isRequired: pluginPkg.strapi.required || false,
// layout: null,
// lifecycles,
// mainComponent: App,
// name,
// pluginLogo,
// preventComponentRendering: false,
// reducers,
// trads,
// menu: {
// pluginsSectionLinks: [
// {
// destination: `/plugins/${pluginId}`,
// icon,
// label: {
// id: `${pluginId}.plugin.name`,
// defaultMessage: 'Content-Types Builder',
// },
// name,
// permissions: pluginPermissions.main,
// },
// ],
// },
// // Internal APIs exposed by the CTB for the other plugins to use
// apis: {
// forms: formsAPI,
// },
// };
// return strapi.registerPlugin(plugin);
// };

62
packages/core/upload/admin/src/index.js
View File

@ -81,65 +81,3 @@ export default {
},
boot() {},
};
// export default strapi => {
// const plugin = {
// blockerComponent: null,
// blockerComponentProps: {},
// description: pluginDescription,
// fileModel: null,
// icon,
// id: pluginId,
// initializer: Initializer,
// injectedComponents: [],
// isReady: false,
// isRequired: pluginPkg.strapi.required || false,
// layout: null,
// lifecycles: null,
// mainComponent: App,
// name,
// pluginLogo,
// preventComponentRendering: false,
// settings: {
// global: {
// links: [
// {
// title: {
// id: getTrad('plugin.name'),
// defaultMessage: 'Media Library',
// },
// name: 'media-library',
// to: '/settings/media-library',
// Component: () => (
// <CheckPagePermissions permissions={pluginPermissions.settings}>
// <SettingsPage />
// </CheckPagePermissions>
// ),
// permissions: pluginPermissions.settings,
// },
// ],
// },
// },
// trads,
// menu: {
// pluginsSectionLinks: [
// {
// destination: `/plugins/${pluginId}`,
// icon,
// label: {
// id: `${pluginId}.plugin.name`,
// defaultMessage: 'Media Library',
// },
// name,
// permissions: pluginPermissions.main,
// },
// ],
// },
// };
// strapi.registerComponent({ name: 'media-library', Component: InputModalStepper });
// strapi.registerField({ type: 'media', Component: InputMedia });
// return strapi.registerPlugin(plugin);
// };