Merge pull request #79 from val92130/develop

2.9.2
val92130 · Nov 7, 2017 · 56f3275 · 56f3275
2 parents c5c1dda + 1d6b72d
commit 56f3275
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 17 deletions.
diff --git a/bot/manifest.json b/bot/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Supreme Auto-Checkout bot",
   "description": "Supreme Open-Source add to cart bot",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "background": {
     "scripts": ["background.js"]
   },

diff --git a/bot/src/app/components/shops/supreme/pages/Billing.jsx b/bot/src/app/components/shops/supreme/pages/Billing.jsx
@@ -63,7 +63,7 @@ const Billing = props => {
             floatingLabelText="Email"
             hintText="Email"
             style={Styles.fields.text}
-            validate={[Validators.required, Validators.email]}
+            validate={[Validators.email]}
           />
         </div>
 
@@ -74,7 +74,6 @@ const Billing = props => {
             floatingLabelText="Phone number"
             hintText="Phone number"
             style={Styles.fields.text}
-            validate={[Validators.required]}
           />
         </div>
 
@@ -85,7 +84,6 @@ const Billing = props => {
             floatingLabelText="Address"
             hintText="Address"
             style={Styles.fields.text}
-            validate={[Validators.required]}
           />
         </div>
 
@@ -106,7 +104,6 @@ const Billing = props => {
             floatingLabelText="City"
             hintText="City"
             style={Styles.fields.text}
-            validate={[Validators.required]}
           />
         </div>
 
@@ -117,7 +114,6 @@ const Billing = props => {
             floatingLabelText="Country"
             hintText="Country"
             style={Styles.fields.text}
-            validate={[Validators.required]}
           >
             {
               Utils.countries.map(x => <MenuItem key={x.value} value={x.value} primaryText={x.text} />)
@@ -132,7 +128,6 @@ const Billing = props => {
             floatingLabelText="State"
             hintText="State"
             style={Styles.fields.text}
-            validate={[Validators.required]}
           >
             {
               getStatesForCountry(country).map(x => <MenuItem key={x.value} value={x.value} primaryText={x.text} />)
@@ -146,7 +141,6 @@ const Billing = props => {
             component={TextField}
             floatingLabelText="Zip"
             style={Styles.fields.text}
-            validate={[Validators.required]}
           />
         </div>
 
@@ -156,7 +150,6 @@ const Billing = props => {
             component={SelectField}
             floatingLabelText="Credit card type"
             style={Styles.fields.text}
-            validate={[Validators.required]}
           >
             {
               getCreditCardsForCountry(country).map(x =>
@@ -173,7 +166,6 @@ const Billing = props => {
             floatingLabelText="Credit Card Number"
             hintText="Credit Card Number"
             style={Styles.fields.text}
-            validate={[Validators.required]}
           />
         </div>
 
@@ -183,7 +175,6 @@ const Billing = props => {
             component={SelectField}
             floatingLabelText="Expiry month"
             hintText="Expiry month"
-            validate={[Validators.required]}
             style={Styles.fields.text}
           >
             {
@@ -202,12 +193,11 @@ const Billing = props => {
             floatingLabelText="Expiry year"
             hintText="Expiry year"
             style={Styles.fields.text}
-            validate={[Validators.required]}
           >
             {
               Array.apply(null, new Array(10)).map((x, i) => {
                 const year = new Date().getFullYear() + i;
-                return <MenuItem key={year} value={year} primaryText={year}/>;
+                return <MenuItem key={year} value={year} primaryText={year} />;
               })
             }
           </Field>
@@ -220,7 +210,6 @@ const Billing = props => {
             hintText="CCV"
             floatingLabelText="CCV"
             style={Styles.fields.text}
-            validate={[Validators.required]}
           />
         </div>
         <div>

diff --git a/bot/src/app/components/shops/supreme/pages/Options.jsx b/bot/src/app/components/shops/supreme/pages/Options.jsx
@@ -26,6 +26,7 @@ const defaultValues = {
   addToCartDelay: 200,
   checkoutDelay: 2000,
   showNotifications: false,
+  disableImages: false,
 };
 
 class HelperField extends Component {
@@ -197,6 +198,26 @@ const Options = props => {
             }
           />
         </div>
+
+        <div>
+          <HelperField
+            field={
+              <Field
+                name="disableImages"
+                component={Toggle}
+                style={{ width: 'auto' }}
+              />
+            }
+            title="Disable images loading"
+            helperText={
+              <div>
+                <p>
+                  If enabled, images will not be loaded on the Supreme website, this can improve speed.
+                </p>
+              </div>
+            }
+          />
+        </div>
         <div>
           <HelperField
             field={

diff --git a/bot/src/app/index.jsx b/bot/src/app/index.jsx
@@ -36,11 +36,26 @@ async function init() {
   };
   const store = createStore(rootReducer, savedState, applyMiddleware(...middleware));
 
+  let imageSettings = 'allow';
 // Save state in localStorage automatically
   store.subscribe(async () => {
     const state = store.getState();
     if (state) {
       await StorageService.saveState({ menu: state.menu, profiles: state.profiles, atc: state.atc });
+      try {
+        const settings = await StorageService.getCurrentProfileSettings();
+        const newImageSettings = settings.Supreme.Options.disableImages ? 'block' : 'allow';
+        if (newImageSettings !== imageSettings) {
+          chrome.contentSettings.images.set({
+            primaryPattern: 'http://www.supremenewyork.com/*',
+            setting: newImageSettings,
+          });
+          imageSettings = newImageSettings;
+        }
+      } catch(e) {
+        console.error(e);
+        console.error('Error while trying to set image settings');
+      }
     }
   });
 

diff --git a/bot/src/app/utils/FormValidators.js b/bot/src/app/utils/FormValidators.js
@@ -2,7 +2,7 @@ import * as Helpers from './Helpers';
 
 export function email(input) {
   const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
-  return re.test(input) ? undefined : 'Please enter a valid email';
+  return (!input || re.test(input)) ? undefined : 'Please enter a valid email';
 }
 
 export function required(value) {
@@ -33,7 +33,7 @@ export function maxValue(max) {
 }
 
 export function fullName(value) {
-  return !value || value.split(' ').filter(x => x !== "").length < 2 ? 'Please enter a valid full name (firstname + lastname)' : undefined;
+  return value && value.split(' ').filter(x => x !== '').length < 2 ? 'Please enter a valid full name (firstname + lastname)' : undefined;
 }
 
 export function unique(candidates) {

diff --git a/bot/src/app/version.js b/bot/src/app/version.js
@@ -1 +1 @@
-export default '2.9.1';
+export default '2.9.2';