feat: #82 run lint

vuestorefront-community · Sep 12, 2021 · e5a6845 · e5a6845
1 parent bf64e70
commit e5a6845
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/packages/composables/src/types/types.ts b/packages/composables/src/types/types.ts
@@ -67,7 +67,7 @@ export type SearchResultValue<SEARCH_DATA, SEARCH_INPUT> = {
   input?: SEARCH_INPUT;
 }
 
-export { OrderAddress } from '@vue-storefront/vendure-api';
+export { OrderAddress, Order } from '@vue-storefront/vendure-api';
 
 // TODO: Replace later with types from vendure-api after implementing api-client functions
 export interface ForgotPasswordResult {

diff --git a/packages/theme/helpers/checkout.ts b/packages/theme/helpers/checkout.ts
@@ -1,9 +1,11 @@
-import { ARRANGING_PAYMENT } from './constants'
+import { Context } from '@nuxt/types';
+import { Order } from '@vue-storefront/vendure';
+import { ARRANGING_PAYMENT } from './constants';
 
-export const canEnterPayment = cart => canEnterShipping(cart) && canEnterBilling(cart) && cart?.shipping && cart?.state === ARRANGING_PAYMENT;
+export const canEnterThankYou = (context: Context): boolean => Boolean(context.route.query?.order);
 
-export const canEnterThankYou = query => Boolean(query?.order);
+export const canEnterShipping = (cart: Order): boolean => Boolean(cart?.customer);
 
-export const canEnterShipping = cart => Boolean(cart?.customer);
+export const canEnterBilling = (cart: Order): boolean => Boolean(cart?.shippingAddress?.streetLine1 && cart?.shippingAddress?.country);
 
-export const canEnterBilling = cart => cart?.shippingAddress?.streetLine1 && cart?.shippingAddress?.country
+export const canEnterPayment = (cart: Order): boolean => canEnterShipping(cart) && canEnterBilling(cart) && cart?.shipping && cart?.state === ARRANGING_PAYMENT;
diff --git a/packages/theme/middleware/checkout.js b/packages/theme/middleware/checkout.js
@@ -2,7 +2,6 @@ import { canEnterShipping, canEnterBilling, canEnterPayment, canEnterThankYou }
 
 export default async ({ app, $vsf }) => {
   const currentPath = app.context.route.fullPath.split('/checkout/')[1];
-  const currentQuery = app.context.route.query;
 
   if (!currentPath) return;
 
@@ -28,7 +27,7 @@ export default async ({ app, $vsf }) => {
       }
       break;
     case 'thank-you':
-      if (!canEnterThankYou(currentQuery)) {
+      if (!canEnterThankYou(app.context)) {
         app.context.redirect('/');
       }
       break;

diff --git a/packages/theme/pages/Checkout/Customer.vue b/packages/theme/pages/Checkout/Customer.vue
@@ -149,8 +149,8 @@ export default {
         form.value = {
           firstName: customer?.firstName,
           lastName: customer?.lastName,
-          emailAddress: customer?.emailAddress,
-        }
+          emailAddress: customer?.emailAddress
+        };
       }
     });