@lancom/shared 0.0.390 → 0.0.392

package/assets/js/api/admin.js

@@ -291,7 +291,7 @@ export default {
     return customer._id ? _put(`admin/customer/${customer._id}`, customer) : _post('admin/customer', customer);
   },
   saveCustomerPassword(customer) {
-    return _put(`admin/customer/${customer._id}/password/${customer.passwordResetToken}`, customer);
+    return _put(`admin/customer/${customer._id}/password/${customer.passwordResetToken || customer._id}`, customer);
   },
   removeCustomer(id) {
     return _delete(`admin/customer/${id}`);

package/components/checkout/cart/cart.vue

@@ -74,7 +74,7 @@
 </template>
 
 <script>
-import { mapGetters, mapMutations } from 'vuex';
+import { mapGetters } from 'vuex';
 import gtm from '@lancom/shared/assets/js/utils/gtm';
 import CouponSelect from '@lancom/shared/components/common/coupon_select/coupon-select';
 import CartQuantityErrors from '@lancom/shared/components/checkout/cart/cart_quantity_errors/cart-quantity-errors';

package/components/checkout/order/order-success/order-success.scss

@@ -5,6 +5,7 @@
     position: absolute;
     left: 0;
     right: 0;
+    z-index: 2;
   }
   &__card {
     min-height: 400px;

package/components/customer/customer_form/customer-form.vue

@@ -34,27 +34,31 @@
                 {{ errors[0] }}
               </span>
             </validation-provider>
+          </div>
+          <div class="col-6">
             <validation-provider
+              v-if="!customer._id"
               v-slot="{ errors }"
               tag="div"
-              name="First Name"
+              name="Password"
               rules="required"
               class="form-row">
               <label
-                for="firstName"
+                for="password"
                 class="form-label">
-                First Name
+                Password
               </label>
               <input
-                id="firstName"
-                v-model="customer.firstName"
-                name="firstName"
-                type="text"
+                id="password"
+                ref="password"
+                v-model="customer.password"
+                name="password"
+                type="password"
                 class="form-field labelless"
-                placeholder="First Name"
+                placeholder="Password"
                 :class="{
                   'is-invalid': errors.length,
-                  filled: customer.firstName
+                  filled: customer.password
                 }" />
               <span
                 v-if="errors.length"
@@ -62,34 +66,31 @@
                 {{ errors[0] }}
               </span>
             </validation-provider>
-            <phone-input
-              v-model="customer.phone"
-              label-text="Phone (optional)" />
           </div>
+        </div>
+        <div class="row">
           <div class="col-6">
             <validation-provider
-              v-if="!customer._id"
               v-slot="{ errors }"
               tag="div"
-              name="Password"
+              name="First Name"
               rules="required"
               class="form-row">
               <label
-                for="password"
+                for="firstName"
                 class="form-label">
-                Password
+                First Name
               </label>
               <input
-                id="password"
-                ref="password"
-                v-model="customer.password"
-                name="password"
-                type="password"
+                id="firstName"
+                v-model="customer.firstName"
+                name="firstName"
+                type="text"
                 class="form-field labelless"
-                placeholder="Password"
+                placeholder="First Name"
                 :class="{
                   'is-invalid': errors.length,
-                  filled: customer.password
+                  filled: customer.firstName
                 }" />
               <span
                 v-if="errors.length"
@@ -97,6 +98,8 @@
                 {{ errors[0] }}
               </span>
             </validation-provider>
+          </div>
+          <div class="col-6">
             <validation-provider
               v-slot="{ errors }"
               tag="div"
@@ -125,6 +128,15 @@
                 {{ errors[0] }}
               </span>
             </validation-provider>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-6">
+            <phone-input
+              v-model="customer.phone"
+              label-text="Phone (optional)" />
+          </div>
+          <div class="col-6">
             <validation-provider
               v-slot="{ errors }"
               tag="div"

package/middleware/authenticated.js

@@ -0,0 +1,5 @@
+export default function ({ store, redirect }) {
+  if (!store.state.auth.token) {
+    return redirect('/customer/signin');
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lancom/shared",
-  "version": "0.0.390",
+  "version": "0.0.392",
   "description": "lancom common scripts",
   "author": "e.tokovenko <e.tokovenko@gmail.com>",
   "repository": {

package/pages/customer/coupons.vue

@@ -13,6 +13,7 @@ import metaInfo from '@lancom/shared/mixins/meta-info';
 
 export default {
   name: 'CustomerCouponsPage',
+  middleware: 'authenticated',
   components: {
     CustomerCoupons: () => import('@lancom/shared/components/customer/customer_coupons/customer-coupons'),
     CustomerMenu: () => import('@lancom/shared/components/customer/customer_navigation_menu/customer-navigation-menu')

package/pages/customer/orders.vue

@@ -13,6 +13,7 @@ import metaInfo from '@lancom/shared/mixins/meta-info';
 
 export default {
   name: 'CustomerOrdersPage',
+  middleware: 'authenticated',
   components: {
     CustomerOrders: () => import('@lancom/shared/components/customer/customer_orders/customer-orders'),
     CustomerNavigationMenu: () => import('@lancom/shared/components/customer/customer_navigation_menu/customer-navigation-menu')

package/pages/customer/settings.vue

@@ -12,6 +12,7 @@ import metaInfo from '@lancom/shared/mixins/meta-info';
 
 export default {
   name: 'CustomerCreatePage',
+  middleware: 'authenticated',
   components: {
     CustomerNavigationMenu: () => import('@lancom/shared/components/customer/customer_navigation_menu/customer-navigation-menu'),
     CustomerSettings: () => import('@lancom/shared/components/pages/customer/settings/settings')

package/store/auth.js

@@ -42,6 +42,7 @@ export const actions = {
   auth_logout({ commit }) {
     commit('AUTH_LOGOUT');
     Cookie.remove('auth');
+    window.location.href = '/';
   },
   update_user({ commit }, { token, user }) {
     Cookie.set('auth', token, { expires: 365 });