From ffd5d92ced61b33de685c7cfdb1771c6afc2e71a Mon Sep 17 00:00:00 2001 From: Nathan Stormer Date: Wed, 22 Apr 2015 09:45:05 -0700 Subject: [PATCH 1/2] #12 | namespace components --- components/alert/{alert.jsx => ui-alert.jsx} | 2 +- components/button/{button.jsx => ui-button.jsx} | 8 +++++++- components/form/inputs/{input.jsx => ui-input.jsx} | 2 +- components/form/inputs/{select.jsx => ui-select.jsx} | 2 +- components/form/inputs/{textarea.jsx => ui-textarea.jsx} | 2 +- components/form/labels/{label.jsx => ui-label.jsx} | 2 +- .../form/validation/{validation.jsx => ui-validation.jsx} | 2 +- 7 files changed, 13 insertions(+), 7 deletions(-) rename components/alert/{alert.jsx => ui-alert.jsx} (98%) rename components/button/{button.jsx => ui-button.jsx} (89%) rename components/form/inputs/{input.jsx => ui-input.jsx} (98%) rename components/form/inputs/{select.jsx => ui-select.jsx} (99%) rename components/form/inputs/{textarea.jsx => ui-textarea.jsx} (98%) rename components/form/labels/{label.jsx => ui-label.jsx} (97%) rename components/form/validation/{validation.jsx => ui-validation.jsx} (98%) diff --git a/components/alert/alert.jsx b/components/alert/ui-alert.jsx similarity index 98% rename from components/alert/alert.jsx rename to components/alert/ui-alert.jsx index e377b1d..975ebca 100644 --- a/components/alert/alert.jsx +++ b/components/alert/ui-alert.jsx @@ -6,7 +6,7 @@ var SynfrastructureHelperMixin = require('../../mixins/synfrastructure-helper-mi module.exports = React.createClass({ - displayName : 'Alert', + displayName : 'UI-Alert', mixins : [SynfrastructureHelperMixin], diff --git a/components/button/button.jsx b/components/button/ui-button.jsx similarity index 89% rename from components/button/button.jsx rename to components/button/ui-button.jsx index a9aea9f..aaa32c4 100644 --- a/components/button/button.jsx +++ b/components/button/ui-button.jsx @@ -6,7 +6,7 @@ var SynfrastructureHelperMixin = require('../../mixins/synfrastructure-helper-mi module.exports = React.createClass({ - displayName : 'Button', + displayName : 'UI-Button', mixins : [SynfrastructureHelperMixin], @@ -21,6 +21,10 @@ module.exports = React.createClass({ attributes : React.PropTypes.object, componentCSSClassName : React.PropTypes.string, size : React.PropTypes.string, + modifier : React.PropTypes.oneOfType([ + React.PropTypes.string, + React.PropTypes.array + ]), disabled : React.PropTypes.bool, className : React.PropTypes.string, onClick : React.PropTypes.func @@ -33,6 +37,7 @@ module.exports = React.createClass({ attributes : {}, componentCSSClassName : 'button', size : null, + modifier : null, disabled : false, className : null, onClick : null @@ -49,6 +54,7 @@ module.exports = React.createClass({ classes = [ this.props.componentCSSClassName, + this.props.modifier.join(' '), this.props.className, this.props.disabled ? this.props.componentCSSClassName + '--disabled' : null diff --git a/components/form/inputs/input.jsx b/components/form/inputs/ui-input.jsx similarity index 98% rename from components/form/inputs/input.jsx rename to components/form/inputs/ui-input.jsx index 753365d..12d7bd1 100644 --- a/components/form/inputs/input.jsx +++ b/components/form/inputs/ui-input.jsx @@ -6,7 +6,7 @@ var FormInputMixin = require('../../../mixins/form-input-mixin'); module.exports = React.createClass({ - displayName : 'Input', + displayName : 'UI-Input', mixins : [ FormInputMixin diff --git a/components/form/inputs/select.jsx b/components/form/inputs/ui-select.jsx similarity index 99% rename from components/form/inputs/select.jsx rename to components/form/inputs/ui-select.jsx index a46dc39..f37741c 100644 --- a/components/form/inputs/select.jsx +++ b/components/form/inputs/ui-select.jsx @@ -7,7 +7,7 @@ var FormInputMixin = require('../../../mixins/form-input-mixin'); module.exports = React.createClass({ - displayName : 'Select', + displayName : 'UI-Select', mixins : [ FormInputMixin diff --git a/components/form/inputs/textarea.jsx b/components/form/inputs/ui-textarea.jsx similarity index 98% rename from components/form/inputs/textarea.jsx rename to components/form/inputs/ui-textarea.jsx index a17b3b7..273ebd0 100644 --- a/components/form/inputs/textarea.jsx +++ b/components/form/inputs/ui-textarea.jsx @@ -6,7 +6,7 @@ var FormInputMixin = require('../../../mixins/form-input-mixin'); module.exports = React.createClass({ - displayName : 'TextArea', + displayName : 'UI-TextArea', mixins : [ FormInputMixin diff --git a/components/form/labels/label.jsx b/components/form/labels/ui-label.jsx similarity index 97% rename from components/form/labels/label.jsx rename to components/form/labels/ui-label.jsx index 262426b..9d0753d 100644 --- a/components/form/labels/label.jsx +++ b/components/form/labels/ui-label.jsx @@ -6,7 +6,7 @@ var SynfrastructureHelperMixin = require('../../../mixins/synfrastructure-helper module.exports = React.createClass({ - displayName : 'FormLabel', + displayName : 'UI-FormLabel', mixins : [SynfrastructureHelperMixin], diff --git a/components/form/validation/validation.jsx b/components/form/validation/ui-validation.jsx similarity index 98% rename from components/form/validation/validation.jsx rename to components/form/validation/ui-validation.jsx index 47c7357..dd35834 100644 --- a/components/form/validation/validation.jsx +++ b/components/form/validation/ui-validation.jsx @@ -7,7 +7,7 @@ var SynfrastructureHelperMixin = require('../../../mixins/synfrastructure-helper module.exports = React.createClass({ - displayName : 'Validation', + displayName : 'UI-Validation', mixins : [SynfrastructureHelperMixin], From ada4f16b8277cda00a068e5d410eb6e2a30d8625 Mon Sep 17 00:00:00 2001 From: Nathan Stormer Date: Wed, 22 Apr 2015 09:50:30 -0700 Subject: [PATCH 2/2] #12 | namesapce sass files --- components/alert/{_alerts.scss => _ui-alerts.scss} | 0 components/button/{_buttons.scss => _ui-buttons.scss} | 0 components/form/inputs/{_inputs.scss => _ui-inputs.scss} | 0 components/form/labels/{_labels.scss => _ui-labels.scss} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename components/alert/{_alerts.scss => _ui-alerts.scss} (100%) rename components/button/{_buttons.scss => _ui-buttons.scss} (100%) rename components/form/inputs/{_inputs.scss => _ui-inputs.scss} (100%) rename components/form/labels/{_labels.scss => _ui-labels.scss} (100%) diff --git a/components/alert/_alerts.scss b/components/alert/_ui-alerts.scss similarity index 100% rename from components/alert/_alerts.scss rename to components/alert/_ui-alerts.scss diff --git a/components/button/_buttons.scss b/components/button/_ui-buttons.scss similarity index 100% rename from components/button/_buttons.scss rename to components/button/_ui-buttons.scss diff --git a/components/form/inputs/_inputs.scss b/components/form/inputs/_ui-inputs.scss similarity index 100% rename from components/form/inputs/_inputs.scss rename to components/form/inputs/_ui-inputs.scss diff --git a/components/form/labels/_labels.scss b/components/form/labels/_ui-labels.scss similarity index 100% rename from components/form/labels/_labels.scss rename to components/form/labels/_ui-labels.scss