-
+ render = () => {
+ const routeName = Utils.slugify(this.props.currentRoute.name);
+ const classes = this.props.classes;
+ const isOpen = this.state.isOpen;
-
- this.toggle('sideNav', openOrClose)} />
+ return (
+
+
-
-
-
-
-
-
-
+
+ this.toggle('sideNav', openOrClose)} />
-
- {this.props.children}
-
+
+
+
+
+
+
+
-
+
+ {this.props.children}
+
+
+
+
- );
+ );
+ };
+ }
+
+
+ Layout.propTypes = {
+ classes: PropTypes.object.isRequired,
+ children: PropTypes.node,
};
-}
-Layout.propTypes = {
- classes: PropTypes.object.isRequired,
- children: PropTypes.node,
-};
+ Layout.displayName = 'Layout';
-Layout.displayName = 'Layout';
-
-
-replaceComponent('Layout', Layout, [withStyles, styles]);
+ replaceComponent('Layout', Layout, [withStyles, styles]);
diff --git a/packages/vulcan-ui-material/example/SideNavigation.jsx b/packages/vulcan-ui-material/example/SideNavigation.jsx
index 2d30e417f..9f3cf0edb 100644
--- a/packages/vulcan-ui-material/example/SideNavigation.jsx
+++ b/packages/vulcan-ui-material/example/SideNavigation.jsx
@@ -1,7 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import { Components, registerComponent, withCurrentUser } from 'meteor/vulcan:core';
-import { withRouter } from 'react-router-dom';
+import { withRouter } from 'react-router';
import List from '@material-ui/core/List';
import ListItem from '@material-ui/core/ListItem';
import ListItemIcon from '@material-ui/core/ListItemIcon';
@@ -38,15 +38,14 @@ class SideNavigation extends React.Component {
};
render () {
- const currentUser = this.props.currentUser;
- const classes = this.props.classes;
+ const { currentUser, classes, history } = this.props;
const isOpen = this.state.isOpen;
return (
- {this.props.history.push('/');}}>
+ {history.push('/');}}>
@@ -69,14 +68,14 @@ class SideNavigation extends React.Component {
{this.props.history.push('/admin');}}>
+ onClick={() => {browserHistory.push('/admin');}}>
{this.props.history.push('/theme');}}>
+ onClick={() => {browserHistory.push('/theme');}}>
diff --git a/packages/vulcan-ui-material/fr_FR.js b/packages/vulcan-ui-material/fr_FR.js
index 2d5c04745..7ba3c6d2f 100644
--- a/packages/vulcan-ui-material/fr_FR.js
+++ b/packages/vulcan-ui-material/fr_FR.js
@@ -1,8 +1,7 @@
import { addStrings } from 'meteor/vulcan:core';
addStrings('fr', {
-
- "search.search": "Recherche",
- "search.clear": "Effacer la recherche",
-
+ 'search.search': 'Recherche',
+ 'search.clear': 'Effacer la recherche',
+ 'modal.close': 'Fermer',
});
diff --git a/packages/vulcan-ui-material/modules/routes.js b/packages/vulcan-ui-material/modules/routes.js
index ee9c6cf06..55d267e77 100755
--- a/packages/vulcan-ui-material/modules/routes.js
+++ b/packages/vulcan-ui-material/modules/routes.js
@@ -1,8 +1,10 @@
import { addRoute } from 'meteor/vulcan:core';
-
-addRoute({
- name: 'theme',
- path: '/theme',
- componentName: 'ThemeStyles',
-});
+//Only create route on dev mode, not production.
+if (Meteor.isDevelopment) {
+ addRoute({
+ name: 'theme',
+ path: '/theme',
+ componentName: 'ThemeStyles',
+ });
+}
diff --git a/packages/vulcan-ui-material/package.js b/packages/vulcan-ui-material/package.js
index 024850c42..0e5d542b1 100644
--- a/packages/vulcan-ui-material/package.js
+++ b/packages/vulcan-ui-material/package.js
@@ -5,7 +5,6 @@ Package.describe({
documentation: 'README.md'
});
-
Package.onUse(function (api) {
api.versionsFrom('METEOR@1.6');
@@ -23,4 +22,4 @@ Package.onUse(function (api) {
api.mainModule('client/main.js', 'client');
api.mainModule('server/main.js', 'server');
-});
+});
\ No newline at end of file
diff --git a/packages/vulcan-ui-material/readme.md b/packages/vulcan-ui-material/readme.md
index 05f71b4b4..c644b6807 100644
--- a/packages/vulcan-ui-material/readme.md
+++ b/packages/vulcan-ui-material/readme.md
@@ -1,10 +1,10 @@
-# erikdakoda:vulcan-material-ui 1.12.8_13
+# vulcan:ui-material 1.12.8_13
+
+Package initially created by [Erik Dakoda](https://github.com/ErikDakoda) ([`erikdakoda:vulcan-material-ui`](https://github.com/ErikDakoda/vulcan-material-ui))
+
Replacement for [Vulcan](http://vulcanjs.org/) components using [Material-UI](https://material-ui.com/).
-This version has been tested against Vulcan 1.12.8 and Material-UI 3.1.0.
-To give me feedback open an issue on GitHub or you can reach me on the [Vulcan Slack](https://vulcanjs.slack.com)
-channel as erikdakoda.
There are some nice bonus features like a CountrySelect with autocomplete and theming.
@@ -15,9 +15,9 @@ All components in vulcan:ui-bootstrap, vulcan:forms and vulcan:accounts have bee
To add vulcan-material-ui to an existing Vulcan project, enter the following:
``` sh
-meteor add erikdakoda:vulcan-material-ui
+meteor add vulcan:ui-material
-meteor npm install --save @material-ui/core
+meteor npm install --save @material-ui/core@3.1.0
meteor npm install --save react-jss
meteor npm install --save mdi-material-ui
meteor npm install --save react-autosuggest
@@ -48,7 +48,7 @@ For an example theme see `modules/sampleTheme.js`. For a complete list of values
see the [MUI Default Theme](https://material-ui-next.com/customization/default-theme/).
Register your theme in the Vulcan environment by giving it a name: `registerTheme('MyTheme', theme);`.
-You can have multiple themes registered and you can specify which one to use in your settings file using the `muiTheme` public setting.
+You can have multiple themes registered and you can specify which one to use in your settings file using the `muiTheme` **public** setting.
In addition to the Material UI spec, I use a `utils` section in my themes where I place global variables for reusable styles.
For example the sample theme contains