disco_app 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55b6e027313db5f034873fc0d138df85fc662c82be60a510e56e431179cfd34a
-  data.tar.gz: 1a12ff5b38091517ce4c74c10b8ef3c2d830cbf7a32ed5014d50d86b993e4e03
+  metadata.gz: 67c1382ade46bd8b42313b42c9909b4be0fe58413a16ffe7a648a790ef586013
+  data.tar.gz: b22447a345d05be4698c2853e3cbe9495a45e8562802ca173a8cbe657953675f
 SHA512:
-  metadata.gz: 96d90ea57565818f97bfd7c1d19ce54fac6db48d6ab9e71e6199e3f3f00dbadde7fe1d7350b7f31d962afb7f6b1b442d101ac848c28bc611acdc71665de3c3e7
-  data.tar.gz: 3c8605e4d8804db6d665c24ba11b5ff2d9e861539557b70cf4c4230b860f1a4451976762ebe847e31c5d58062ef983bc5d7927dc90bcae06879febb36afdcec2
+  metadata.gz: c06b73bcd5bef5ef52e56958ecaaabf57c94c58019eda073410d7626da493e4c782880ce8cc87b1ded926a34faf25e053949af8298809d69de9f33aad2acc81e
+  data.tar.gz: 80349c2dceb7d75b80034b017606503f041838658a080c8884b88256996b14364daebe948e8e06da7c4e333ed4ecf744c2f09b267291d8dc44a7695588567081

data/app/assets/javascripts/disco_app/components/ui-kit/cards/card-section.es6.jsx

@@ -1,4 +1,4 @@
-const CardSection = ({ title, children, wrappable, borderless }) => {
+const CardSection = ({ title, title_small, children, wrappable, borderless }) => {
 
   const className = classNames({
     'next-card__section': true,
@@ -10,7 +10,7 @@ const CardSection = ({ title, children, wrappable, borderless }) => {
 
   const showTitle = () => {
     if (title) {
-      return <CardSectionTitle title={title}/>;
+      return <CardSectionTitle title={title} small={title_small} />;
     } else {
       return null;
     }

data/app/assets/javascripts/disco_app/components/ui-kit/cards/cart-section-title.es6.jsx

@@ -1,9 +1,17 @@
-const CardSectionTitle = ({ title }) => {
+const CardSectionTitle = ({ title, small }) => {
+
+  const className = classNames({
+    'next-heading': true,
+    'next-heading--small': small,
+    'next-heading--half-margin': small
+  });
+
   return (
-    <h3 className="next-heading">{title}</h3>
+    <h2 className={className}>{title}</h2>
   );
 };
 
 CardSectionTitle.propTypes = {
-  title: React.PropTypes.string.isRequired
+  title: React.PropTypes.string.isRequired,
+  small: React.PropTypes.bool
 };

data/app/assets/javascripts/disco_app/components/ui-kit/forms/button.es6.jsx

@@ -1,8 +1,9 @@
-const Button = ({ children, disabled, name=false, onClick = ()=>{}, primary = false, type = 'button' }) => {
+const Button = ({ children, disabled, name=false, onClick = ()=>{}, primary = false, destroy = false, type = 'button' }) => {
 
   const className = classNames({
     'btn': true,
-    'btn-primary': primary
+    'btn-primary': primary,
+    'btn-destroy': destroy
   });
 
   return(

data/app/assets/javascripts/disco_app/components/ui-kit/forms/input-select.es6.jsx

@@ -1,4 +1,4 @@
-const InputSelect = ({ id, label, labelHidden, name, options, value, onChange }) => {
+const InputSelect = ({ id, label, labelHidden, name, options, value, defaultValue, helpMessage, onChange }) => {
 
   const optionElements = options.map((option) => {
     return <option key={option.value} value={option.value}>{option.label}</option>;
@@ -13,15 +13,21 @@ const InputSelect = ({ id, label, labelHidden, name, options, value, onChange })
     onChange(e.target.value);
   };
 
+  let helpElement = null;
+  if(helpMessage) {
+    helpElement = <p className="next-input__help-text">{helpMessage}</p>;
+  }
+
   return(
     <div className="next-input-wrapper">
       <label className={labelClassName} htmlFor={id}>{label}</label>
       <div className="next-select__wrapper next-input--has-content">
-        <select className="next-select rule-field" id={id} name={name} value={value} onChange={handleChange}>
+        <select className="next-select rule-field" id={id} name={name} value={value} defaultValue={defaultValue} onChange={handleChange}>
           {optionElements}
         </select>
         <NextIcon name="next-chevron-down" size={12} />
       </div>
+      {helpElement}
     </div>
   )
 

data/app/assets/javascripts/disco_app/components/ui-kit/forms/input-text.es6.jsx

@@ -1,7 +1,7 @@
 class InputText extends BaseInput {
 
   render() {
-    const { errors, name, value, defaultValue, disabled, helpMessage, label, labelHidden, onChange, placeholder } = this.props;
+    const { errors, inputType, name, value, defaultValue, disabled, helpMessage, label, labelHidden, onChange, onKeyDown, onKeyUp, placeholder } = this.props;
 
     const wrapperClassName = classNames({
       'next-input-wrapper': true,
@@ -17,6 +17,14 @@ class InputText extends BaseInput {
       onChange && onChange(e.target.value);
     };
 
+    const handleKeyDown = (e) => {
+      onKeyDown && onKeyDown(e);
+    };
+
+    const handleKeyUp = (e) => {
+      onKeyUp && onKeyUp(e);
+    };
+
     let helpElement = null;
     if(helpMessage) {
       helpElement = <p className="next-input__help-text">{helpMessage}</p>;
@@ -33,8 +41,10 @@ class InputText extends BaseInput {
           defaultValue={defaultValue}
           name={name}
           onChange={handleChange}
+          onKeyDown={handleKeyDown}
+          onKeyUp={handleKeyUp}
           placeholder={placeholder}
-          type="text"
+          type={inputType || 'text'}
         />
         {helpElement}
       </div>

data/app/assets/javascripts/disco_app/components/ui-kit/forms/input-time.es6.jsx

@@ -0,0 +1,7 @@
+class InputTime extends InputText {
+
+  render() {
+    return <InputText inputType="time" {...this.props} />
+  }
+
+}

data/app/assets/javascripts/disco_app/components/ui-kit/forms/ui-form__element.es6.jsx

@@ -0,0 +1,17 @@
+const UIFormElement = ({ helpText, children }) => {
+
+  const className = classNames({
+    'ui-form__element': true,
+    'ui-form__section--help-text': helpText
+  });
+
+  return (
+    <div className={className}>
+      {children}
+    </div>
+  );
+};
+
+UIFormElement.propTypes = {
+  children: React.PropTypes.node
+};

data/app/assets/javascripts/disco_app/components/ui-kit/forms/ui-form__group.es6.jsx

@@ -0,0 +1,11 @@
+const UIFormGroup = ({ children }) => {
+  return (
+    <div className="ui-form__group">
+      {children}
+    </div>
+  );
+};
+
+UIFormGroup.propTypes = {
+  children: React.PropTypes.node
+};

data/app/assets/javascripts/disco_app/components/ui-kit/forms/ui-form__section.es6.jsx

@@ -0,0 +1,11 @@
+const UIFormSection = ({ children }) => {
+  return (
+    <div className="ui-form__section">
+      {children}
+    </div>
+  );
+};
+
+UIFormSection.propTypes = {
+  children: React.PropTypes.node
+};

data/app/assets/javascripts/disco_app/components/ui-kit/ui-layout/ui-page-actions.es6.jsx

@@ -1,48 +1,13 @@
-const UIPageActions = ({ label, disabled, secondaryButtons, secondaryHref, secondaryLabel }) => {
-
-  const buttonClassName = classNames({
-    'btn': true,
-    'btn-primary': !disabled,
-    'disabled': disabled
-  });
-
-  let secondaryElement = null;
-  if(secondaryButtons) {
-    secondaryElement = (
-      <div className="ui-page-actions__secondary">
-        <div className="button-group">
-          {secondaryButtons}
-        </div>
-      </div>
-    );
-  } else if(secondaryHref) {
-    secondaryElement = (
-      <div className="ui-page-actions__secondary">
-        <div className="button-group">
-          <a className="btn" href={secondaryHref}>{secondaryLabel}</a>
-        </div>
-      </div>
-    );
-  }
-
+const UIPageActions = ({ primary, secondary }) => {
   return (
     <div className="ui-page-actions">
-      {secondaryElement}
-      <div className="ui-page-actions__primary">
-        <div className="button-group button-group--right-aligned">
-          <button name="button" type="submit" className={buttonClassName} disabled={disabled}>
-            {label}
-          </button>
-        </div>
-      </div>
+      <UIPageActionsButtons primary={false} buttons={secondary} />
+      <UIPageActionsButtons primary={true} buttons={primary} />
     </div>
   );
 };
 
 UIPageActions.propTypes = {
-  label: React.PropTypes.string.isRequired,
-  disabled: React.PropTypes.bool,
-  secondaryButtons: React.PropTypes.node,
-  secondaryHref: React.PropTypes.string,
-  secondaryLabel: React.PropTypes.string
+  primary: React.PropTypes.array.isRequired,
+  secondary: React.PropTypes.array.isRequired
 };

data/app/assets/javascripts/disco_app/components/ui-kit/ui-layout/ui-page-actions__buttons.es6.jsx

@@ -0,0 +1,27 @@
+const UIPageActionsButtons = ({ primary, buttons }) => {
+
+  const className = classNames({
+    'ui-page-actions__primary': primary,
+    'ui-page-actions__secondary': !primary
+  });
+
+  const buttonGroupClassName = classNames({
+    'button-group': true,
+    'button-group--right-aligned': primary
+  });
+
+  return (
+    <div className={className}>
+      <div className={buttonGroupClassName}>
+        {buttons.map((button, index) => {
+          return React.cloneElement(button, { key: index});
+        })}
+      </div>
+    </div>
+  );
+};
+
+UIPageActionsButtons.propTypes = {
+  primary: React.PropTypes.bool.isRequired,
+  buttons: React.PropTypes.array.isRequired
+};

data/app/assets/stylesheets/disco_app/disco_app.scss

@@ -13,6 +13,8 @@ $font-family: -apple-system, "BlinkMacSystemFont", "San Francisco", "Roboto", "S
 @import 'ui-kit/ui-type';
 @import 'ui-kit/ui-icons';
 @import 'ui-kit/ui-layout';
+@import 'ui-kit/ui-forms';
+@import 'ui-kit/ui-stack';
 @import 'ui-kit/ui-empty-state';
 @import 'ui-kit/ui-footer-help';
 @import 'ui-kit/ui-page-actions';

data/app/assets/stylesheets/disco_app/ui-kit/_ui-forms.scss

@@ -0,0 +1,69 @@
+//
+// ui-forms.scss
+// Styles for forms not provided by the Channel SDK
+// UI Kit.
+// --------------------------------------------------
+
+.ui-form__section {
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-flex-shrink: 0;
+  -ms-flex-negative: 0;
+  flex-shrink: 0;
+  -webkit-flex-wrap: wrap;
+  -ms-flex-wrap: wrap;
+  flex-wrap: wrap;
+  margin: -8px;
+
+  .next-input-wrapper {
+    box-sizing: border-box;
+    margin: 0;
+    display: -webkit-flex;
+    display: -ms-flexbox;
+    display: flex;
+    -webkit-flex-direction: column;
+    -ms-flex-direction: column;
+    flex-direction: column;
+    min-width: 220px;
+    padding: 8px;
+  }
+}
+
+.ui-form__group {
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-wrap: wrap;
+  -ms-flex-wrap: wrap;
+  flex-wrap: wrap;
+
+  > .ui-form__element, .next-input-wrapper {
+    max-width: 100%;
+    -webkit-flex: 1 0 220px;
+    -ms-flex: 1 0 220px;
+    flex: 1 0 220px;
+  }
+}
+
+.ui-form__element {
+  box-sizing: border-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-grow: 1;
+  -ms-flex-positive: 1;
+  flex-grow: 1;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  min-width: 220px;
+  padding: 8px;
+}
+
+.ui-form__element.ui-form__section--help-text {
+  padding-top: 0;
+}

data/app/assets/stylesheets/disco_app/ui-kit/_ui-kit.scss

@@ -403,7 +403,7 @@ html {
 }
 
 body {
-  color: rgba(0,0,0,0.9);
+  color: #1a1a1a;
   font-size: 1.07143rem;
   line-height: 1.42857rem;
   font-weight: 400;
@@ -439,7 +439,6 @@ a.is-disabled {
 }
 
 h1, h2, h3, h4, h5, h6 {
-  color: #212529;
   font-weight: 400;
   margin: 0;
 }
@@ -1228,7 +1227,7 @@ a.type--subdued:hover {
 
 .ui-layout {
   max-width: 1036px;
-  margin: 20px auto 0;
+  margin: 20px auto;
 }
 
 .ui-layout--full-width {
@@ -3664,27 +3663,24 @@ input[type=checkbox].next-checkbox {
   -webkit-appearance: none;
   -moz-appearance: none;
   width: 100%;
-  color: rgba(0,0,0,0.9);
   font-size: 1.14286rem;
   line-height: 1.71429rem;
   font-weight: 400;
   text-transform: initial;
   letter-spacing: initial;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
   background: transparent;
   padding: 5px 10px;
   padding-right: 32px;
   border: 0;
   box-sizing: border-box;
-  height: auto;
+  height: 36px;
   max-width: none;
   display: block;
 }
 
 .next-select:focus {
   outline: none;
-  border: none;
+  border: 0;
 }
 
 .next-select option {
@@ -3795,7 +3791,6 @@ input[type=checkbox].next-checkbox {
 }
 
 .next-heading {
-  color: rgba(0,0,0,0.9);
   font-size: 1.21429rem;
   line-height: 1.71429rem;
   font-weight: 600;
@@ -3823,7 +3818,15 @@ input[type=checkbox].next-checkbox {
 }
 
 .next-heading--small {
-  font-size: 15px;
+  font-size: 0.92857rem;
+  line-height: 1.42857rem;
+  font-weight: 600;
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+
+  @media screen and (min-width: 640px) {
+    font-size: 0.85714rem;
+  }
 }
 
 .next-heading--large {
@@ -5065,7 +5068,6 @@ td a.subdued:hover {
 }
 
 .ui-annotated-section__annotation {
-  color: rgba(0,0,0,0.56);
   -webkit-box-flex: 1;
   -webkit-flex: 1 0 240px;
   -ms-flex: 1 0 240px;
@@ -5077,6 +5079,7 @@ td a.subdued:hover {
 }
 
 .ui-annotated-section__description {
+  color: #707070;
   padding: 0 20px 20px 20px;
 }
 

data/app/assets/stylesheets/disco_app/ui-kit/_ui-page-actions.scss

@@ -6,8 +6,10 @@
 
 .ui-page-actions {
   @include flexbox();
-  margin: 0 auto 20px auto;
+  margin: 0 auto;
   max-width: 1036px;
+  padding: 20px 0;
+  border-top: 1px solid #d3dbe2;
 }
 
 .ui-page-actions__primary {

data/app/assets/stylesheets/disco_app/ui-kit/_ui-stack.scss

@@ -0,0 +1,39 @@
+.ui-stack {
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  margin-left: -1.42857rem;
+  margin-top: -1.42857rem;
+
+  > * {
+    margin-left: 1.42857rem;
+    margin-top: 1.42857rem;
+    -webkit-flex: 0 1 auto;
+    -ms-flex: 0 1 auto;
+    flex: 0 1 auto;
+  }
+}
+
+.ui-stack--wrap {
+  -webkit-flex-wrap: wrap;
+  -ms-flex-wrap: wrap;
+  flex-wrap: wrap;
+}
+
+.ui-stack--alignment-center {
+  -webkit-align-items: center;
+  -ms-flex-align: center;
+  -ms-grid-row-align: center;
+  align-items: center;
+}
+
+.ui-stack-item {
+  min-width: 0;
+  max-width: 100%;
+}
+
+.ui-stack-item--fill {
+  -webkit-flex: 1 1 auto;
+  -ms-flex: 1 1 auto;
+  flex: 1 1 auto;
+}

data/app/models/disco_app/concerns/synchronises.rb

@@ -20,7 +20,7 @@ module DiscoApp::Concerns::Synchronises
           instance.shop = shop
           instance.data = data
         end
-      rescue ActiveRecord::RecordNotUnique
+      rescue ActiveRecord::RecordNotUnique, PG::UniqueViolation
         retry
       end
 

data/lib/disco_app/version.rb

@@ -1,3 +1,3 @@
 module DiscoApp
-  VERSION = '0.10.3'
+  VERSION = '0.10.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco_app
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Gavin Ballard
@@ -379,6 +379,10 @@ files:
 - app/assets/javascripts/disco_app/components/ui-kit/forms/input-select.es6.jsx
 - app/assets/javascripts/disco_app/components/ui-kit/forms/input-text.es6.jsx
 - app/assets/javascripts/disco_app/components/ui-kit/forms/input-textarea.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/forms/input-time.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/forms/ui-form__element.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/forms/ui-form__group.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/forms/ui-form__section.es6.jsx
 - app/assets/javascripts/disco_app/components/ui-kit/icons/icon-chevron.es6.jsx
 - app/assets/javascripts/disco_app/components/ui-kit/icons/next-icon.es6.jsx
 - app/assets/javascripts/disco_app/components/ui-kit/input_select.es6.jsx
@@ -391,6 +395,7 @@ files:
 - app/assets/javascripts/disco_app/components/ui-kit/ui-layout/ui-layout-sections.es6.jsx
 - app/assets/javascripts/disco_app/components/ui-kit/ui-layout/ui-layout.es6.jsx
 - app/assets/javascripts/disco_app/components/ui-kit/ui-layout/ui-page-actions.es6.jsx
+- app/assets/javascripts/disco_app/components/ui-kit/ui-layout/ui-page-actions__buttons.es6.jsx
 - app/assets/javascripts/disco_app/disco_app.js
 - app/assets/javascripts/disco_app/frame.js
 - app/assets/javascripts/disco_app/shopify-turbolinks.js
@@ -408,10 +413,12 @@ files:
 - app/assets/stylesheets/disco_app/mixins/_flexbox.scss
 - app/assets/stylesheets/disco_app/ui-kit/_ui-empty-state.scss
 - app/assets/stylesheets/disco_app/ui-kit/_ui-footer-help.scss
+- app/assets/stylesheets/disco_app/ui-kit/_ui-forms.scss
 - app/assets/stylesheets/disco_app/ui-kit/_ui-icons.scss
 - app/assets/stylesheets/disco_app/ui-kit/_ui-kit.scss
 - app/assets/stylesheets/disco_app/ui-kit/_ui-layout.scss
 - app/assets/stylesheets/disco_app/ui-kit/_ui-page-actions.scss
+- app/assets/stylesheets/disco_app/ui-kit/_ui-stack.scss
 - app/assets/stylesheets/disco_app/ui-kit/_ui-tabs.scss
 - app/assets/stylesheets/disco_app/ui-kit/_ui-type.scss
 - app/controllers/disco_app/admin/app_settings_controller.rb