diff --git a/.eslintignore b/.eslintignore
old mode 100644
new mode 100755
diff --git a/.eslintrc b/.eslintrc
old mode 100644
new mode 100755
diff --git a/.gitattributes b/.gitattributes
old mode 100644
new mode 100755
diff --git a/LICENSE.md b/LICENSE.md
old mode 100644
new mode 100755
diff --git a/ROADMAP.md b/ROADMAP.md
old mode 100644
new mode 100755
diff --git a/lerna.json b/lerna.json
old mode 100644
new mode 100755
diff --git a/package.json b/package.json
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/.editorconfig b/packages/strapi-admin/.editorconfig
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/LICENSE.md b/packages/strapi-admin/LICENSE.md
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/README.md b/packages/strapi-admin/README.md
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/app.js b/packages/strapi-admin/admin/src/app.js
old mode 100644
new mode 100755
index 160a7c5599..4bcd6f0130
--- a/packages/strapi-admin/admin/src/app.js
+++ b/packages/strapi-admin/admin/src/app.js
@@ -7,12 +7,10 @@
import 'babel-polyfill';
// Import all the third party stuff
-import React from 'react';
-import ReactDOM from 'react-dom';
import { Provider } from 'react-redux';
import { ConnectedRouter } from 'react-router-redux';
import createHistory from 'history/createBrowserHistory';
-import _ from 'lodash';
+import { merge, isFunction } from 'lodash';
import 'sanitize.css/sanitize.css';
import 'whatwg-fetch';
@@ -79,14 +77,19 @@ window.onload = function onLoad() {
* @param params
*/
const registerPlugin = (plugin) => {
- const formattedPlugin = plugin;
-
// Merge admin translation messages
- _.merge(translationMessages, formattedPlugin.translationMessages);
+ merge(translationMessages, plugin.translationMessages);
- formattedPlugin.leftMenuSections = formattedPlugin.leftMenuSections || [];
+ plugin.leftMenuSections = plugin.leftMenuSections || [];
- store.dispatch(pluginLoaded(formattedPlugin));
+ // Execute bootstrap function.
+ if (isFunction(plugin.bootstrap)) {
+ plugin.bootstrap(plugin).then(plugin => {
+ store.dispatch(pluginLoaded(plugin));
+ });
+ } else {
+ store.dispatch(pluginLoaded(plugin));
+ }
};
const displayNotification = (message, status) => {
@@ -116,7 +119,7 @@ window.Strapi = {
apiUrl,
refresh: (pluginId) => ({
translationMessages: (translationMessagesUpdated) => {
- render(_.merge({}, translationMessages, translationMessagesUpdated));
+ render(merge({}, translationMessages, translationMessagesUpdated));
},
leftMenuSections: (leftMenuSectionsUpdated) => {
store.dispatch(updatePlugin(pluginId, 'leftMenuSections', leftMenuSectionsUpdated));
@@ -146,4 +149,4 @@ if (window.location.hostname === 'localhost') {
const dispatch = store.dispatch;
export {
dispatch,
-};
\ No newline at end of file
+};
diff --git a/packages/strapi-admin/admin/src/assets/images/logo-strapi.png b/packages/strapi-admin/admin/src/assets/images/logo-strapi.png
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/components/Header/index.js b/packages/strapi-admin/admin/src/components/Header/index.js
old mode 100644
new mode 100755
index a447e8311c..0309c4e660
--- a/packages/strapi-admin/admin/src/components/Header/index.js
+++ b/packages/strapi-admin/admin/src/components/Header/index.js
@@ -4,8 +4,6 @@
*
*/
-import React from 'react';
-
import styles from './styles.scss';
class Header extends React.Component { // eslint-disable-line react/prefer-stateless-function
diff --git a/packages/strapi-admin/admin/src/components/Header/styles.scss b/packages/strapi-admin/admin/src/components/Header/styles.scss
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/components/LeftMenuFooter/index.js b/packages/strapi-admin/admin/src/components/LeftMenuFooter/index.js
old mode 100644
new mode 100755
index a9ad2b2a1b..57398e6c8d
--- a/packages/strapi-admin/admin/src/components/LeftMenuFooter/index.js
+++ b/packages/strapi-admin/admin/src/components/LeftMenuFooter/index.js
@@ -4,7 +4,6 @@
*
*/
-import React from 'react';
import { defineMessages, FormattedMessage } from 'react-intl';
import LocaleToggle from 'containers/LocaleToggle';
diff --git a/packages/strapi-admin/admin/src/components/LeftMenuFooter/messages.json b/packages/strapi-admin/admin/src/components/LeftMenuFooter/messages.json
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/components/LeftMenuFooter/styles.scss b/packages/strapi-admin/admin/src/components/LeftMenuFooter/styles.scss
old mode 100644
new mode 100755
index 5606a60189..9dff07c8ad
--- a/packages/strapi-admin/admin/src/components/LeftMenuFooter/styles.scss
+++ b/packages/strapi-admin/admin/src/components/LeftMenuFooter/styles.scss
@@ -6,11 +6,17 @@
width: 100%;
bottom: 0;
height: 3rem;
- padding-left: 1rem;
- padding-right: 1rem;
+ padding-left: 15px;
+ padding-right: 15px;
line-height: 3rem;
+ font-family: 'Lato';
+ font-size: 1rem;
+ font-weight: 300;
+ letter-spacing: 0.05rem;
vertical-align: middle;
color: $strapi-gray-light;
- border-top: 1px solid $strapi-gray;
- font-size: $font-size-xs;
+
+ select{
+ outline: none;
+ }
}
diff --git a/packages/strapi-admin/admin/src/components/LeftMenuHeader/index.js b/packages/strapi-admin/admin/src/components/LeftMenuHeader/index.js
old mode 100644
new mode 100755
index fc114b0593..c8843a71e7
--- a/packages/strapi-admin/admin/src/components/LeftMenuHeader/index.js
+++ b/packages/strapi-admin/admin/src/components/LeftMenuHeader/index.js
@@ -4,7 +4,6 @@
*
*/
-import React from 'react';
import { Link } from 'react-router-dom';
import styles from './styles.scss';
diff --git a/packages/strapi-admin/admin/src/components/LeftMenuHeader/styles.scss b/packages/strapi-admin/admin/src/components/LeftMenuHeader/styles.scss
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/components/LeftMenuLink/index.js b/packages/strapi-admin/admin/src/components/LeftMenuLink/index.js
old mode 100644
new mode 100755
index 33f952067f..dc8bb81bd5
--- a/packages/strapi-admin/admin/src/components/LeftMenuLink/index.js
+++ b/packages/strapi-admin/admin/src/components/LeftMenuLink/index.js
@@ -5,7 +5,7 @@
*/
import _ from 'lodash';
-import React from 'react';
+import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl';
import { Link } from 'react-router-dom';
@@ -21,7 +21,14 @@ class LeftMenuLink extends React.Component { // eslint-disable-line react/prefer
-
+
);
@@ -29,9 +36,9 @@ class LeftMenuLink extends React.Component { // eslint-disable-line react/prefer
}
LeftMenuLink.propTypes = {
- destination: React.PropTypes.string.isRequired,
- icon: React.PropTypes.string.isRequired,
- label: React.PropTypes.string.isRequired,
+ destination: PropTypes.string.isRequired,
+ icon: PropTypes.string.isRequired,
+ label: PropTypes.string.isRequired,
};
export default LeftMenuLink;
diff --git a/packages/strapi-admin/admin/src/components/LeftMenuLink/styles.scss b/packages/strapi-admin/admin/src/components/LeftMenuLink/styles.scss
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/index.js b/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/index.js
old mode 100644
new mode 100755
index 1abad02d1b..932f70455f
--- a/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/index.js
+++ b/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/index.js
@@ -4,7 +4,7 @@
*
*/
-import React from 'react';
+import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl';
import { map } from 'lodash';
@@ -16,17 +16,17 @@ import messages from './messages.json';
class LeftMenuLinkContainer extends React.Component { // eslint-disable-line react/prefer-stateless-function
render() {
// Generate the list of sections
- const linkSections = this.props.plugins.valueSeq().map(plugin => (
- plugin.get('leftMenuSections').map((leftMenuSection, j) => {
- return (
-
-
{leftMenuSection.get('name')}
-
- {map(this.links, (link, k) => )}
-
-
- );
- })
+ const linkSections = map(this.props.plugins.toJS(), plugin => (
+ plugin.leftMenuSections.map((leftMenuSection, j) => (
+
+
{leftMenuSection.name}
+
+ {leftMenuSection.links.map((link, k) =>
+
+ )}
+
+
+ ))
));
// Check if the plugins list is empty or not
@@ -80,7 +80,7 @@ class LeftMenuLinkContainer extends React.Component { // eslint-disable-line rea
}
LeftMenuLinkContainer.propTypes = {
- plugins: React.PropTypes.object.isRequired,
+ plugins: PropTypes.object.isRequired,
};
export default LeftMenuLinkContainer;
diff --git a/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/styles.scss b/packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/styles.scss
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/components/Notification/index.js b/packages/strapi-admin/admin/src/components/Notification/index.js
old mode 100644
new mode 100755
index fbe24ec598..4847493322
--- a/packages/strapi-admin/admin/src/components/Notification/index.js
+++ b/packages/strapi-admin/admin/src/components/Notification/index.js
@@ -4,7 +4,7 @@
*
*/
-import React from 'react';
+import PropTypes from 'prop-types';
import { FormattedMessage } from 'react-intl';
import styles from './styles.scss';
@@ -53,8 +53,8 @@ class Notification extends React.Component { // eslint-disable-line react/prefer
}
Notification.propTypes = {
- notification: React.PropTypes.object.isRequired,
- onHideNotification: React.PropTypes.func.isRequired,
+ notification: PropTypes.object.isRequired,
+ onHideNotification: PropTypes.func.isRequired,
};
export default Notification;
diff --git a/packages/strapi-admin/admin/src/components/Notification/styles.scss b/packages/strapi-admin/admin/src/components/Notification/styles.scss
index 99c3945843..1075db8df0 100644
--- a/packages/strapi-admin/admin/src/components/Notification/styles.scss
+++ b/packages/strapi-admin/admin/src/components/Notification/styles.scss
@@ -4,69 +4,71 @@
.notification {
position: relative;
display: flex;
- width: 28.6rem;
align-items: stretch;
+ width: 300px;
+ min-height: 60px;
+ margin-bottom: 14px;
background: $white;
- margin-bottom: 1.4rem;
- transition: all 0.2s ease;
- border-radius: 0.1rem;
+ border-radius: 2px;
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.15);
color: #333740;
+ transition: all 0.15s ease;
+ overflow: hidden;
}
.notification:hover {
- box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.5);
+ cursor: pointer;
+ box-shadow: 0 1px 5px 0 rgba(0, 0, 0, 0.2);
}
.notificationIcon {
position: relative;
display: block;
- width: 18%;
+ width: 60px;
text-align: center;
font-size: 2.4rem;
&:before {
position: absolute;
- top: calc(50% - 1rem);
- left: calc(50% - 1rem);
+ top: calc(50% - 10px); left: calc(50% - 10px);
+ width: 20px;
+ height: 20px;
+ padding-top: 4px;
border-radius: 100%;
border: 1px solid $brand-success;
color: $brand-success;
- height: 2rem;
- width: 2rem;
font-size: 1.2rem;
- padding-top: .3rem;
- padding-left: 0.1rem;
text-align: center;
}
}
.notificationContent {
- display: block;
+ display: flex;
+ align-items: center;
+ width: 220px;
margin: 0;
- padding-top: 1.5rem;
- padding-bottom: 1.5rem;
- padding-right: 1rem;
+ padding-right: 10px;
border-right: 1px solid rgba(255, 255, 255, 0.3);
- width: 70%;
}
.notificationTitle {
- font-weight: 500;
- font-size: 1.4rem;
margin-bottom: 0;
+ font-size: 1.4rem;
+ font-weight: 400;
+ line-height: 1.8rem;
}
.notificationClose {
+ cursor: pointer;
+ opacity: 0.6;
position: relative;
display: block;
- cursor: pointer;
- width: 12%;
- opacity: 0.6;
- transition: opacity 0.1s ease;
+
+ width: 20px;
font-size: 1.6rem;
- color: #c2c4c7;
+ color: #BBC2BF;
+ transition: opacity 0.1s ease;
&:hover {
opacity: 1;
@@ -74,28 +76,39 @@
&:before {
position: absolute;
- top: calc(50% - .9rem);
- left: calc(50% - 0.5rem);
+ top: calc(50% - 6px);
+ height: 100%;
+ font-size: 1.4rem;
}
}
+.notificationSuccess{
+ background: linear-gradient(100deg , #FFFFFF 50%, rgba(39, 183, 15, .05)), $white;
+}
+
.notificationWarning {
+ background: linear-gradient(100deg , #FFFFFF 50%, rgba(250, 156, 0, .05)), $white;
+
.notificationIcon:before {
+ padding-top: 4px;
border-color: $brand-warning;
color: $brand-warning;
- padding-top: .4rem;
}
}
.notificationError {
+ background: linear-gradient(100deg , #FFFFFF 50%, rgba(255, 93, 0, .05)), $white;
+
.notificationIcon:before {
+ padding-top: 4px;
border-color: $brand-danger;
color: $brand-danger;
- padding-top: .4rem;
}
}
.notificationInfo {
+ background: linear-gradient(100deg , #FFFFFF 50%, rgba(28, 93, 231, .05)), $white;
+
.notificationIcon:before {
border-color: $brand-primary;
color: $brand-primary;
diff --git a/packages/strapi-admin/admin/src/components/NotificationsContainer/index.js b/packages/strapi-admin/admin/src/components/NotificationsContainer/index.js
old mode 100644
new mode 100755
index e8f7832fae..f14616778c
--- a/packages/strapi-admin/admin/src/components/NotificationsContainer/index.js
+++ b/packages/strapi-admin/admin/src/components/NotificationsContainer/index.js
@@ -4,42 +4,47 @@
*
*/
-import React from 'react';
-import ReactCSSTransitionGroup from 'react/lib/ReactCSSTransitionGroup';
+import PropTypes from 'prop-types';
import Notification from 'components/Notification';
import styles from './styles.scss';
+const { CSSTransition, TransitionGroup } = ReactTransitionGroup;
+
class NotificationsContainer extends React.Component { // eslint-disable-line react/prefer-stateless-function
render() {
- let notifications;
+ if (this.props.notifications.length === 0) {
+ return (false);
+ }
- if (this.props.notifications) {
- notifications = this.props.notifications.map((notification) => (
+ const notifications = this.props.notifications.map((notification, i) => (
+
));
- }
+ />
+
+ ));
return (
-
+
+ {notifications}
+
);
}
}
NotificationsContainer.propTypes = {
- notifications: React.PropTypes.object.isRequired,
- onHideNotification: React.PropTypes.func.isRequired,
+ notifications: PropTypes.object.isRequired,
+ onHideNotification: PropTypes.func.isRequired,
};
export default NotificationsContainer;
diff --git a/packages/strapi-admin/admin/src/components/NotificationsContainer/styles.scss b/packages/strapi-admin/admin/src/components/NotificationsContainer/styles.scss
old mode 100644
new mode 100755
index 815939e65e..7f9216f413
--- a/packages/strapi-admin/admin/src/components/NotificationsContainer/styles.scss
+++ b/packages/strapi-admin/admin/src/components/NotificationsContainer/styles.scss
@@ -3,8 +3,8 @@
.notificationsContainer { /* stylelint-disable */
position: absolute;
- top: 7rem;
- right: 1rem;
+ top: 72px;
+ right: 15px;
z-index: 1000;
list-style: none;
}
diff --git a/packages/strapi-admin/admin/src/components/Toggle/index.js b/packages/strapi-admin/admin/src/components/Toggle/index.js
old mode 100644
new mode 100755
index 9c4931d78e..9f7fe59424
--- a/packages/strapi-admin/admin/src/components/Toggle/index.js
+++ b/packages/strapi-admin/admin/src/components/Toggle/index.js
@@ -4,7 +4,7 @@
*
*/
-import React from 'react';
+import PropTypes from 'prop-types';
import ToggleOption from 'components/ToggleOption';
@@ -28,10 +28,10 @@ function Toggle(props) { // eslint-disable-line react/prefer-stateless-function
}
Toggle.propTypes = {
- messages: React.PropTypes.object.isRequired,
- onToggle: React.PropTypes.func.isRequired,
- value: React.PropTypes.string.isRequired,
- values: React.PropTypes.array.isRequired,
+ messages: PropTypes.object.isRequired,
+ onToggle: PropTypes.func.isRequired,
+ value: PropTypes.string.isRequired,
+ values: PropTypes.array.isRequired,
};
export default Toggle;
diff --git a/packages/strapi-admin/admin/src/components/Toggle/styles.scss b/packages/strapi-admin/admin/src/components/Toggle/styles.scss
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/components/ToggleOption/index.js b/packages/strapi-admin/admin/src/components/ToggleOption/index.js
old mode 100644
new mode 100755
index 2f13fcc4f7..6fb67a44b5
--- a/packages/strapi-admin/admin/src/components/ToggleOption/index.js
+++ b/packages/strapi-admin/admin/src/components/ToggleOption/index.js
@@ -4,7 +4,7 @@
*
*/
-import React from 'react';
+import PropTypes from 'prop-types';
import { injectIntl, intlShape } from 'react-intl';
const ToggleOption = ({ value, message, intl }) => (
@@ -15,11 +15,11 @@ const ToggleOption = ({ value, message, intl }) => (
ToggleOption.propTypes = {
intl: intlShape.isRequired,
- message: React.PropTypes.oneOfType([
- React.PropTypes.object.isRequired,
- React.PropTypes.string.isRequired,
+ message: PropTypes.oneOfType([
+ PropTypes.object.isRequired,
+ PropTypes.string.isRequired,
]).isRequired,
- value: React.PropTypes.string.isRequired,
+ value: PropTypes.string.isRequired,
};
export default injectIntl(ToggleOption);
diff --git a/packages/strapi-admin/admin/src/containers/AdminPage/index.js b/packages/strapi-admin/admin/src/containers/AdminPage/index.js
index 9f57e9e1f0..a5ec88f087 100644
--- a/packages/strapi-admin/admin/src/containers/AdminPage/index.js
+++ b/packages/strapi-admin/admin/src/containers/AdminPage/index.js
@@ -9,7 +9,7 @@
* the linting exception.
*/
-import React from 'react';
+import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { createStructuredSelector } from 'reselect';
import { Switch, Route } from 'react-router-dom';
@@ -26,7 +26,7 @@ import { hideNotification } from 'containers/NotificationProvider/actions';
import Header from 'components/Header/index';
-import styles from './syles.scss';
+import styles from './styles.scss';
export class AdminPage extends React.Component { // eslint-disable-line react/prefer-stateless-function
render() {
@@ -53,11 +53,11 @@ export class AdminPage extends React.Component { // eslint-disable-line react/pr
}
AdminPage.contextTypes = {
- router: React.PropTypes.object.isRequired,
+ router: PropTypes.object.isRequired,
};
AdminPage.propTypes = {
- plugins: React.PropTypes.object.isRequired,
+ plugins: PropTypes.object.isRequired,
};
const mapStateToProps = createStructuredSelector({
diff --git a/packages/strapi-admin/admin/src/containers/AdminPage/syles.scss b/packages/strapi-admin/admin/src/containers/AdminPage/styles.scss
old mode 100644
new mode 100755
similarity index 100%
rename from packages/strapi-admin/admin/src/containers/AdminPage/syles.scss
rename to packages/strapi-admin/admin/src/containers/AdminPage/styles.scss
diff --git a/packages/strapi-admin/admin/src/containers/App/actions.js b/packages/strapi-admin/admin/src/containers/App/actions.js
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/containers/App/constants.js b/packages/strapi-admin/admin/src/containers/App/constants.js
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/containers/App/index.js b/packages/strapi-admin/admin/src/containers/App/index.js
index 77fc7d38af..2d832477b1 100644
--- a/packages/strapi-admin/admin/src/containers/App/index.js
+++ b/packages/strapi-admin/admin/src/containers/App/index.js
@@ -11,7 +11,7 @@
* the linting exception.
*/
-import React from 'react';
+import PropTypes from 'prop-types';
import { Switch, Route } from 'react-router-dom';
import AdminPage from 'containers/AdminPage';
@@ -20,6 +20,7 @@ import NotFoundPage from 'containers/NotFoundPage';
import NotificationProvider from 'containers/NotificationProvider';
import '../../styles/main.scss';
+
import styles from './styles.scss';
export class App extends React.Component { // eslint-disable-line react/prefer-stateless-function
@@ -39,7 +40,7 @@ export class App extends React.Component { // eslint-disable-line react/prefer-s
}
App.contextTypes = {
- router: React.PropTypes.object.isRequired,
+ router: PropTypes.object.isRequired,
};
App.propTypes = {};
diff --git a/packages/strapi-admin/admin/src/containers/App/reducer.js b/packages/strapi-admin/admin/src/containers/App/reducer.js
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/containers/App/styles.scss b/packages/strapi-admin/admin/src/containers/App/styles.scss
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/containers/ComingSoonPage/index.js b/packages/strapi-admin/admin/src/containers/ComingSoonPage/index.js
old mode 100644
new mode 100755
index 2e768f9f3a..aea3a0c74e
--- a/packages/strapi-admin/admin/src/containers/ComingSoonPage/index.js
+++ b/packages/strapi-admin/admin/src/containers/ComingSoonPage/index.js
@@ -4,21 +4,33 @@
*
*/
-import React from 'react';
import { connect } from 'react-redux';
import Helmet from 'react-helmet';
-import { FormattedMessage } from 'react-intl';
-import messages from './messages.json';
+
+import PluginHeader from 'components/PluginHeader';
+
import styles from './styles.scss';
export class ComingSoonPage extends React.Component { // eslint-disable-line react/prefer-stateless-function
render() {
return (
-
+
);
}
diff --git a/packages/strapi-admin/admin/src/containers/ComingSoonPage/styles.scss b/packages/strapi-admin/admin/src/containers/ComingSoonPage/styles.scss
old mode 100644
new mode 100755
index 5c51919c86..69c2fa05ba
--- a/packages/strapi-admin/admin/src/containers/ComingSoonPage/styles.scss
+++ b/packages/strapi-admin/admin/src/containers/ComingSoonPage/styles.scss
@@ -1,3 +1,4 @@
-.wrapper {
- padding: 2.3rem;
+.containerFluid { /* stylelint-disable */
+ padding: 18px 30px !important;
+ overflow: hidden;
}
diff --git a/packages/strapi-admin/admin/src/containers/Content/index.js b/packages/strapi-admin/admin/src/containers/Content/index.js
old mode 100644
new mode 100755
index 628ee1f8a9..38b6bf4d00
--- a/packages/strapi-admin/admin/src/containers/Content/index.js
+++ b/packages/strapi-admin/admin/src/containers/Content/index.js
@@ -4,7 +4,7 @@
*
*/
-import React from 'react';
+import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
@@ -23,7 +23,7 @@ export class Content extends React.Component { // eslint-disable-line react/pref
}
Content.propTypes = {
- children: React.PropTypes.node.isRequired,
+ children: PropTypes.node.isRequired,
};
const mapStateToProps = createSelector(
diff --git a/packages/strapi-admin/admin/src/containers/Content/styles.scss b/packages/strapi-admin/admin/src/containers/Content/styles.scss
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/containers/HomePage/index.js b/packages/strapi-admin/admin/src/containers/HomePage/index.js
index d3fc554480..e256d315cd 100644
--- a/packages/strapi-admin/admin/src/containers/HomePage/index.js
+++ b/packages/strapi-admin/admin/src/containers/HomePage/index.js
@@ -4,7 +4,6 @@
*
*/
-import React from 'react';
import { connect } from 'react-redux';
import Helmet from 'react-helmet';
import { FormattedMessage } from 'react-intl';
diff --git a/packages/strapi-admin/admin/src/containers/LanguageProvider/actions.js b/packages/strapi-admin/admin/src/containers/LanguageProvider/actions.js
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/containers/LanguageProvider/constants.js b/packages/strapi-admin/admin/src/containers/LanguageProvider/constants.js
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/containers/LanguageProvider/index.js b/packages/strapi-admin/admin/src/containers/LanguageProvider/index.js
old mode 100644
new mode 100755
index 3d7e64751d..5fc465c591
--- a/packages/strapi-admin/admin/src/containers/LanguageProvider/index.js
+++ b/packages/strapi-admin/admin/src/containers/LanguageProvider/index.js
@@ -6,7 +6,7 @@
* IntlProvider component and i18n messages (loaded from `app/translations`)
*/
-import React from 'react';
+import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
import { IntlProvider } from 'react-intl';
@@ -23,9 +23,9 @@ export class LanguageProvider extends React.Component { // eslint-disable-line r
}
LanguageProvider.propTypes = {
- children: React.PropTypes.element.isRequired,
- locale: React.PropTypes.string.isRequired,
- messages: React.PropTypes.object.isRequired,
+ children: PropTypes.element.isRequired,
+ locale: PropTypes.string.isRequired,
+ messages: PropTypes.object.isRequired,
};
diff --git a/packages/strapi-admin/admin/src/containers/LanguageProvider/selectors.js b/packages/strapi-admin/admin/src/containers/LanguageProvider/selectors.js
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/containers/LeftMenu/index.js b/packages/strapi-admin/admin/src/containers/LeftMenu/index.js
old mode 100644
new mode 100755
index d9226fcfe0..35cd08b6d6
--- a/packages/strapi-admin/admin/src/containers/LeftMenu/index.js
+++ b/packages/strapi-admin/admin/src/containers/LeftMenu/index.js
@@ -4,7 +4,7 @@
*
*/
-import React from 'react';
+import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import LeftMenuHeader from 'components/LeftMenuHeader';
@@ -26,7 +26,7 @@ export class LeftMenu extends React.Component { // eslint-disable-line react/pre
}
LeftMenu.propTypes = {
- plugins: React.PropTypes.object.isRequired,
+ plugins: PropTypes.object.isRequired,
};
function mapDispatchToProps(dispatch) {
diff --git a/packages/strapi-admin/admin/src/containers/LeftMenu/styles.scss b/packages/strapi-admin/admin/src/containers/LeftMenu/styles.scss
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/containers/LocaleToggle/index.js b/packages/strapi-admin/admin/src/containers/LocaleToggle/index.js
old mode 100644
new mode 100755
index af45c417b2..e4aec6fd4d
--- a/packages/strapi-admin/admin/src/containers/LocaleToggle/index.js
+++ b/packages/strapi-admin/admin/src/containers/LocaleToggle/index.js
@@ -4,7 +4,7 @@
*
*/
-import React from 'react';
+import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { createSelector } from 'reselect';
@@ -32,8 +32,8 @@ export class LocaleToggle extends React.Component { // eslint-disable-line
}
LocaleToggle.propTypes = {
- locale: React.PropTypes.string.isRequired,
- onLocaleToggle: React.PropTypes.func.isRequired,
+ locale: PropTypes.string.isRequired,
+ onLocaleToggle: PropTypes.func.isRequired,
};
const mapStateToProps = createSelector(
diff --git a/packages/strapi-admin/admin/src/containers/LocaleToggle/styles.scss b/packages/strapi-admin/admin/src/containers/LocaleToggle/styles.scss
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/containers/NotFoundPage/index.js b/packages/strapi-admin/admin/src/containers/NotFoundPage/index.js
old mode 100644
new mode 100755
index 107d8da036..9c379c3d72
--- a/packages/strapi-admin/admin/src/containers/NotFoundPage/index.js
+++ b/packages/strapi-admin/admin/src/containers/NotFoundPage/index.js
@@ -9,9 +9,10 @@
* the linting exception.
*/
-import React from 'react';
+import PropTypes from 'prop-types';
import { defineMessages, FormattedMessage } from 'react-intl';
-import { Link } from 'react-router-dom';
+
+import Button from 'components/Button';
import styles from './styles.scss';
import messages from './messages.json';
@@ -28,8 +29,23 @@ export default class NotFound extends React.Component { // eslint-disable-line r
-
Back to home page.
+
);
}
}
+
+NotFound.propTypes = {
+ history: PropTypes.shape({
+ goBack: PropTypes.func.isRequired,
+ }).isRequired,
+};
diff --git a/packages/strapi-admin/admin/src/containers/NotFoundPage/messages.json b/packages/strapi-admin/admin/src/containers/NotFoundPage/messages.json
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/containers/NotFoundPage/styles.scss b/packages/strapi-admin/admin/src/containers/NotFoundPage/styles.scss
old mode 100644
new mode 100755
index 08bb8f2266..1d72ffefd1
--- a/packages/strapi-admin/admin/src/containers/NotFoundPage/styles.scss
+++ b/packages/strapi-admin/admin/src/containers/NotFoundPage/styles.scss
@@ -2,24 +2,29 @@
@import "../../styles/variables/variables";
.notFound { /* stylelint-ignore */
- height: 100vh;
- background: $strapi-blue-darker;
display: -webkit-flex;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
-}
+ padding-top: 114px;
-.notFoundTitle {
- color: $white;
- font-size: 20rem;
- margin-bottom: 2rem;
- text-shadow: 0 1rem 4rem rgba(255, 255, 255, 0.8);
- letter-spacing: 2rem;
-}
+ h1{
+ margin-bottom: 12px;
+ text-shadow: 0 1rem 4rem rgba(255, 255, 255, 0.8);
+ color: #2C3138;
+ font-size: 6.4rem;
+ letter-spacing: 2px;
+ }
-.notFoundDescription {
- color: $white;
- margin-bottom: 2rem;
-}
\ No newline at end of file
+ h2{
+ color: #2C3138;
+ font-size: 1.4rem;
+ font-weight: 400;
+ margin-bottom: 50px;
+ }
+
+ button{
+ margin: 0;
+ }
+}
diff --git a/packages/strapi-admin/admin/src/containers/NotificationProvider/actions.js b/packages/strapi-admin/admin/src/containers/NotificationProvider/actions.js
old mode 100644
new mode 100755
index 1c475054ef..be2a2a5229
--- a/packages/strapi-admin/admin/src/containers/NotificationProvider/actions.js
+++ b/packages/strapi-admin/admin/src/containers/NotificationProvider/actions.js
@@ -20,7 +20,7 @@ export function showNotification(message, status) {
((id) => {
setTimeout(() => {
dispatch(hideNotification(id));
- }, 5000);
+ }, 2500);
})(nextNotificationId);
return {
diff --git a/packages/strapi-admin/admin/src/containers/NotificationProvider/constants.js b/packages/strapi-admin/admin/src/containers/NotificationProvider/constants.js
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/containers/NotificationProvider/index.js b/packages/strapi-admin/admin/src/containers/NotificationProvider/index.js
index 093663fdce..1106f37860 100644
--- a/packages/strapi-admin/admin/src/containers/NotificationProvider/index.js
+++ b/packages/strapi-admin/admin/src/containers/NotificationProvider/index.js
@@ -4,7 +4,7 @@
*
*/
-import React from 'react';
+import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { createStructuredSelector } from 'reselect';
@@ -25,8 +25,8 @@ export class NotificationProvider extends React.Component { // eslint-disable-li
}
NotificationProvider.propTypes = {
- notifications: React.PropTypes.object.isRequired,
- onHideNotification: React.PropTypes.func.isRequired,
+ notifications: PropTypes.object.isRequired,
+ onHideNotification: PropTypes.func.isRequired,
};
const mapStateToProps = createStructuredSelector({
diff --git a/packages/strapi-admin/admin/src/containers/NotificationProvider/reducer.js b/packages/strapi-admin/admin/src/containers/NotificationProvider/reducer.js
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/containers/NotificationProvider/selectors.js b/packages/strapi-admin/admin/src/containers/NotificationProvider/selectors.js
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/containers/PluginPage/index.js b/packages/strapi-admin/admin/src/containers/PluginPage/index.js
old mode 100644
new mode 100755
index d6ba8497dd..2db1f6f6d8
--- a/packages/strapi-admin/admin/src/containers/PluginPage/index.js
+++ b/packages/strapi-admin/admin/src/containers/PluginPage/index.js
@@ -3,8 +3,8 @@
* PluginPage
*
*/
-
-import React from 'react';
+
+import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import Helmet from 'react-helmet';
import { createSelector } from 'reselect';
@@ -12,23 +12,27 @@ import { selectPlugins } from 'containers/App/selectors';
export class PluginPage extends React.Component { // eslint-disable-line react/prefer-stateless-function
render() {
+ let pluginName;
+
// Detect plugin id from url params
const pluginId = this.props.match.params.pluginId;
+ const plugins = this.props.plugins.toJS();
- const containers = this.props.plugins.valueSeq().map((plugin) => {
- if (plugin.get('id') === pluginId) {
- const Elem = plugin.get('mainComponent');
- return ;
+ const containers = Object.keys(plugins).map((name) => {
+ const plugin = plugins[name];
+
+ if (plugin.id === pluginId) {
+ pluginName = plugin.name;
+
+ const Elem = plugin.mainComponent;
+ return ;
}
});
return (
{containers}
@@ -36,13 +40,9 @@ export class PluginPage extends React.Component { // eslint-disable-line react/p
}
}
-PluginPage.contextTypes = {
- router: React.PropTypes.object.isRequired,
-};
-
PluginPage.propTypes = {
- match: React.PropTypes.object.isRequired,
- plugins: React.PropTypes.object.isRequired,
+ match: PropTypes.object.isRequired,
+ plugins: PropTypes.object.isRequired,
};
const mapStateToProps = createSelector(
diff --git a/packages/strapi-admin/admin/src/i18n.js b/packages/strapi-admin/admin/src/i18n.js
old mode 100644
new mode 100755
diff --git a/packages/strapi-admin/admin/src/index.html b/packages/strapi-admin/admin/src/index.html
old mode 100644
new mode 100755
index ff86160ebd..f9b3624764
--- a/packages/strapi-admin/admin/src/index.html
+++ b/packages/strapi-admin/admin/src/index.html
@@ -12,5 +12,9 @@
+
+
+
+