From d9a4b2990faee3ddb1324dbe546ad6fc4d24779e Mon Sep 17 00:00:00 2001 From: soupette Date: Tue, 15 May 2018 17:01:47 +0200 Subject: [PATCH] Init filter design --- packages/strapi-admin/package.json | 2 +- packages/strapi-helper-plugin/package.json | 2 +- .../admin/src/assets/images/icon_filter.png | Bin 0 -> 170 bytes .../src/components/AddFilterCTA/Button.js | 25 ++++++++++++++++++ .../src/components/AddFilterCTA/index.js | 21 +++++++++++++++ .../src/components/FiltersWrapper/index.js | 15 +++++++++++ .../admin/src/containers/ListPage/index.js | 9 +++++++ .../admin/src/translations/en.json | 4 ++- .../admin/src/translations/fr.json | 2 ++ .../package.json | 2 +- .../package.json | 2 +- .../package.json | 2 +- packages/strapi-plugin-upload/package.json | 2 +- .../package.json | 2 +- 14 files changed, 82 insertions(+), 8 deletions(-) create mode 100644 packages/strapi-plugin-content-manager/admin/src/assets/images/icon_filter.png create mode 100644 packages/strapi-plugin-content-manager/admin/src/components/AddFilterCTA/Button.js create mode 100644 packages/strapi-plugin-content-manager/admin/src/components/AddFilterCTA/index.js create mode 100644 packages/strapi-plugin-content-manager/admin/src/components/FiltersWrapper/index.js diff --git a/packages/strapi-admin/package.json b/packages/strapi-admin/package.json index 6901df32ef..11b178d20c 100755 --- a/packages/strapi-admin/package.json +++ b/packages/strapi-admin/package.json @@ -52,4 +52,4 @@ "npm": ">= 5.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-helper-plugin/package.json b/packages/strapi-helper-plugin/package.json index 23b730e845..02c0225f3e 100755 --- a/packages/strapi-helper-plugin/package.json +++ b/packages/strapi-helper-plugin/package.json @@ -118,4 +118,4 @@ "webpack-hot-middleware": "^2.18.2", "whatwg-fetch": "^2.0.3" } -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-content-manager/admin/src/assets/images/icon_filter.png b/packages/strapi-plugin-content-manager/admin/src/assets/images/icon_filter.png new file mode 100644 index 0000000000000000000000000000000000000000..24bee7b8dd0034a63d26984a10362f14e1fc33e8 GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^LO{&N!3HFiZux8nQY`6?zK#qG8~eHcB(eheiJmTw zAsV8|Cff?`{QCdDUZ0JNL0S2+nHtv@ + + + ); +} + +export default AddFilterCTA; diff --git a/packages/strapi-plugin-content-manager/admin/src/components/FiltersWrapper/index.js b/packages/strapi-plugin-content-manager/admin/src/components/FiltersWrapper/index.js new file mode 100644 index 0000000000..9e45331ca5 --- /dev/null +++ b/packages/strapi-plugin-content-manager/admin/src/components/FiltersWrapper/index.js @@ -0,0 +1,15 @@ +/** + * + * FiltersWrapper + * This component uses styled-components library for styling + * + */ + +import styled from 'styled-components'; + +const FiltersWrapper = styled.div` + margin-top: -2px; + margin-bottom: 2px; +`; + +export default FiltersWrapper; diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/ListPage/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/ListPage/index.js index 29bee9b8c9..9773a41fff 100644 --- a/packages/strapi-plugin-content-manager/admin/src/containers/ListPage/index.js +++ b/packages/strapi-plugin-content-manager/admin/src/containers/ListPage/index.js @@ -23,6 +23,8 @@ import PluginHeader from 'components/PluginHeader'; import PopUpWarning from 'components/PopUpWarning'; // Components from the plugin itself +import AddFilterCTA from 'components/AddFilterCTA'; +import FiltersWrapper from 'components/FiltersWrapper'; import Table from 'components/Table'; // Utils located in `strapi/packages/strapi-helper-plugin/lib/src/utils`; @@ -223,6 +225,13 @@ export class ListPage extends React.Component { id: listPage.currentModel || 'Content Manager', }} /> +
+
+ + + +
+
= 5.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-content-type-builder/package.json b/packages/strapi-plugin-content-type-builder/package.json index fb6d87793a..a2041641c0 100755 --- a/packages/strapi-plugin-content-type-builder/package.json +++ b/packages/strapi-plugin-content-type-builder/package.json @@ -51,4 +51,4 @@ "npm": ">= 5.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-settings-manager/package.json b/packages/strapi-plugin-settings-manager/package.json index 1428e5a5b8..ef6d16ee4b 100755 --- a/packages/strapi-plugin-settings-manager/package.json +++ b/packages/strapi-plugin-settings-manager/package.json @@ -48,4 +48,4 @@ "npm": ">= 5.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-upload/package.json b/packages/strapi-plugin-upload/package.json index 3ccf6c0ebb..b887bd69b5 100644 --- a/packages/strapi-plugin-upload/package.json +++ b/packages/strapi-plugin-upload/package.json @@ -48,4 +48,4 @@ "npm": ">= 3.0.0" }, "license": "MIT" -} +} \ No newline at end of file diff --git a/packages/strapi-plugin-users-permissions/package.json b/packages/strapi-plugin-users-permissions/package.json index b261d694ce..c6e2c3beef 100644 --- a/packages/strapi-plugin-users-permissions/package.json +++ b/packages/strapi-plugin-users-permissions/package.json @@ -55,4 +55,4 @@ "npm": ">= 5.0.0" }, "license": "MIT" -} +} \ No newline at end of file