@fleetbase/storefront-engine 0.0.3 → 0.0.4

package/addon/components/modals/create-network-category.hbs

@@ -21,7 +21,7 @@
             {{else}}
                 <div class="w-32">
                     <img src={{@options.category.icon_url}} alt={{@options.category.name}} class="w-full rounded-md" />
-                    <FileUpload @name="icons" @accept="image/*" @onFileAdded={{fn @options.uploadIcon}} as |queue|>
+                    <FileUpload @name="icons" @accept="image/*" @onFileAdded={{@options.uploadIcon}} as |queue|>
                         <a tabindex={{0}} class="flex items-center px-0 mt-2 text-xs no-underline truncate btn btn-sm btn-default">
                             {{#if queue.files.length}}
                                 <Spinner class="mr-1" />

package/addon/components/modals/create-product-category.hbs

@@ -8,7 +8,7 @@
                     <Image src={{@options.category.icon_url}} @fallbackSrc={{config "defaultValues.categoryImage"}} alt={{@options.category.name}} height="80" width="80" class="h-20 w-20 rounded-md" />
                 </div>
                 <div class="flex-1">
-                    <FileUpload @name="photos" @accept="image/*" @onFileAdded={{fn @options.uploadNewPhoto}} as |queue|>
+                    <FileUpload @name="photos" @accept="image/*" @onFileAdded={{@options.uploadNewPhoto}} as |queue|>
                         <a tabindex={{0}} class="flex items-center px-0 mt-2 text-xs no-underline truncate btn btn-sm btn-default">
                             {{#if queue.files.length}}
                                 <Spinner class="mr-1" />

package/addon/components/modals/import-products.hbs

@@ -7,7 +7,7 @@
                 </div>
             </div>
         {{else}}
-            <FileDropzone @name="spreadsheets" @multiple={{true}} @onFileAdded={{fn @options.queueFile}} @accept={{join ","
+            <FileDropzone @name="spreadsheets" @multiple={{true}} @onFileAdded={{@options.queueFile}} @accept={{join ","
                 @options.acceptedFileTypes}} class="min-h-56 dropzone w-full rounded px-4 py-8 min-h text-gray-900 dark:text-white text-center flex flex-col items-center justify-center border-2 border-dashed border-gray-200 dark:border-indigo-500" as |dropzone queue|>
                 {{#if dropzone.active}}
                     {{#if dropzone.valid}}
@@ -30,8 +30,8 @@
                             <p class="text-base font-semibold my-5">Drag and drop spreadsheet files onto this dropzone</p>
                         {{/if}}
 
-                        <FileUpload @name="spreadsheets" @for="spreadsheets" @accept={{join "," @options.acceptedFileTypes}} @multiple={{true}} @onFileAdded={{fn @options.queueFile}}>
-                            <a tabindex=0 class="btn btn-magic cursor-pointer ml-1 hover:text-white">or select spreadsheets to
+                        <FileUpload @name="spreadsheets" @for="spreadsheets" @accept={{join "," @options.acceptedFileTypes}} @multiple={{true}} @onFileAdded={{@options.queueFile}}>
+                            <a tabindex="0" class="btn btn-magic cursor-pointer ml-1 hover:text-white">or select spreadsheets to
                                 upload.</a>
                         </FileUpload>
                     </div>

package/addon/components/modals/manage-addons.js

@@ -2,7 +2,6 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
-import { alias } from '@ember/object/computed';
 
 export default class ModalsManageAddonsComponent extends Component {
     @service store;

package/addon/components/store-selector.hbs

@@ -1,7 +1,7 @@
 {{#if @activeStore}}
     <DropdownButton @renderInPlace={{true}} @size="xs" @type="primary" @icon="store" @iconSize="sm" @text={{@activeStore.name}} @buttonClass={{concat "w-full " @buttonClass}} @buttonWrapperClass={{concat "w-full " @buttonWrapperClass}} @wrapperClass={{@wrapperClass}} as |dd|>
-        <div class="next-dd-menu py-1">
-            <div class="px-1 overflow-y-scroll" {{set-height "300px"}}>
+        <div role="menu" class="next-dd-menu py-1">
+            <div role="group" class="px-1 overflow-y-scroll" {{set-height "300px"}}>
                 {{#each @stores as |store|}}
                     <a href="javascript:;" class="next-dd-item" role="menuitem" {{on "click" (dropdown-fn dd this.onSwitchStore store)}}>
                         {{or store.name "-"}}
@@ -10,8 +10,8 @@
             </div>
             <div class="px-1">
                 <div class="next-dd-menu-seperator"></div>
-                <div class="px-1">
-                    <a href="javascript:;" class="next-dd-item" {{on "click" (dropdown-fn dd this.onCreateStore)}}>
+                <div role="group" class="px-1">
+                    <a href="javascript:;" class="next-dd-item" role="menuitem" {{on "click" (dropdown-fn dd this.onCreateStore)}}>
                         Create a new storefront
                     </a>
                 </div>

package/addon/controllers/customers/index.js

@@ -1,7 +1,6 @@
 import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
 import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';

package/addon/controllers/orders/index.js

@@ -1,7 +1,6 @@
-import Controller, { inject as controller } from '@ember/controller';
+import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-import { action } from '@ember/object';
 import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';

package/addon/controllers/products/index/category/edit.js

@@ -2,7 +2,6 @@ import ProductsIndexCategoryNewController from './new';
 import { tracked } from '@glimmer/tracking';
 import { alias } from '@ember/object/computed';
 import { action } from '@ember/object';
-import { isArray } from '@ember/array';
 
 export default class ProductsIndexCategoryEditController extends ProductsIndexCategoryNewController {
     @alias('model') product;

package/addon/controllers/products/index/category/new.js

@@ -3,7 +3,6 @@ import { tracked } from '@glimmer/tracking';
 import { isArray } from '@ember/array';
 import { action } from '@ember/object';
 import { alias } from '@ember/object/computed';
-import { isEmpty } from '@ember/utils';
 import { underscore } from '@ember/string';
 import { inject as service } from '@ember/service';
 

package/addon/controllers/products/index/category.js

@@ -1,7 +1,7 @@
 import Controller from '@ember/controller';
 import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
-import { action, computed } from '@ember/object';
+import { action } from '@ember/object';
 import { dasherize } from '@ember/string';
 import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
@@ -140,7 +140,7 @@ export default class ProductsIndexCategoryController extends Controller {
             confirm: (modal) => {
                 modal.startLoading();
 
-                return category.save().then((category) => {
+                return category.save().then(() => {
                     this.notifications.success('Category changes saved.');
                 });
             },

package/addon/controllers/products/index/index.js

@@ -2,7 +2,6 @@ import Controller from '@ember/controller';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { action } from '@ember/object';
-import { equal } from '@ember/object/computed';
 import { isBlank } from '@ember/utils';
 import { timeout } from 'ember-concurrency';
 import { task } from 'ember-concurrency-decorators';

package/addon/controllers/products/index.js

@@ -4,8 +4,6 @@ import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { alias } from '@ember/object/computed';
 import { dasherize } from '@ember/string';
-import { timeout } from 'ember-concurrency';
-import { task } from 'ember-concurrency-decorators';
 
 export default class ProductsIndexController extends Controller {
     @service store;
@@ -59,7 +57,7 @@ export default class ProductsIndexController extends Controller {
             company_uuid: this.currentUser.companyId,
             owner_uuid: this.currentUser.getOption('activeStorefront'),
             owner_type: 'storefront:store',
-            for: 'storefront_product'
+            for: 'storefront_product',
         });
 
         this.modalsManager.show('modals/create-product-category', {
@@ -90,7 +88,7 @@ export default class ProductsIndexController extends Controller {
             confirm: (modal) => {
                 modal.startLoading();
 
-                return category.save().then((category) => {
+                return category.save().then(() => {
                     this.notifications.success('New product category created.');
                     return this.hostRouter.refresh();
                 });

package/addon/controllers/settings/gateways.js

@@ -1,5 +1,4 @@
 import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { alias } from '@ember/object/computed';
 import { action, set } from '@ember/object';

package/addon/controllers/settings/locations.js

@@ -1,5 +1,4 @@
 import Controller from '@ember/controller';
-import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import { alias } from '@ember/object/computed';
 import { action } from '@ember/object';

package/addon/models/product-store-location.js

@@ -1,4 +1,5 @@
 import Model, { attr, hasMany } from '@ember-data/model';
+import { format, formatDistanceToNow } from 'date-fns';
 
 export default class ProductStoreLocationModel extends Model {
     /** @ids */
@@ -24,18 +25,18 @@ export default class ProductStoreLocationModel extends Model {
 
     /** @computed */
     get updatedAgo() {
-        return moment(this.updated_at).fromNow();
+        return formatDistanceToNow(this.updated_at);
     }
 
     get updatedAt() {
-        return moment(this.updated_at).format('DD MMM YYYY');
+        return format(this.updated_at, 'PPP');
     }
 
     get createdAgo() {
-        return moment(this.created_at).fromNow();
+        return formatDistanceToNow(this.created_at);
     }
 
     get createdAt() {
-        return moment(this.created_at).format('DD MMM YYYY');
+        return format(this.created_at, 'PPP p');
     }
 }

package/addon/models/product-variant.js

@@ -1,4 +1,5 @@
 import Model, { attr, hasMany } from '@ember-data/model';
+import { format, formatDistanceToNow } from 'date-fns';
 
 export default class ProductVariantModel extends Model {
     /** @ids */
@@ -27,18 +28,18 @@ export default class ProductVariantModel extends Model {
 
     /** @computed */
     get updatedAgo() {
-        return moment(this.updated_at).fromNow();
+        return formatDistanceToNow(this.updated_at);
     }
 
     get updatedAt() {
-        return moment(this.updated_at).format('DD MMM YYYY');
+        return format(this.updated_at, 'PPP');
     }
 
     get createdAgo() {
-        return moment(this.created_at).fromNow();
+        return formatDistanceToNow(this.created_at);
     }
 
     get createdAt() {
-        return moment(this.created_at).format('DD MMM YYYY');
+        return format(this.created_at, 'PPP p');
     }
 }

package/addon/models/product.js

@@ -1,8 +1,7 @@
 import Model, { attr, belongsTo, hasMany } from '@ember-data/model';
 import { tracked } from '@glimmer/tracking';
 import { getOwner } from '@ember/application';
-import { set, setProperties } from '@ember/object';
-import { isArray } from '@ember/array';
+import { setProperties } from '@ember/object';
 import { isEmpty } from '@ember/utils';
 import { underscore } from '@ember/string';
 import { format, formatDistanceToNow } from 'date-fns';

package/addon/routes/networks/index/network/index.js

@@ -7,9 +7,4 @@ export default class NetworksIndexNetworkIndexRoute extends Route {
     model() {
         return this.modelFor('networks.index.network');
     }
-
-    afterModel(model) {
-        // model.loadNotificationChannels();
-        // model.loadPaymentGateways();
-    }
 }

package/addon/routes/products/index.js

@@ -6,7 +6,7 @@ export default class ProductsIndexRoute extends Route {
     @service store;
     @service currentUser;
 
-    @action willTransition(transition) {
+    @action willTransition() {
         this.controller.category = null;
     }
 

package/addon/services/storefront.js

@@ -1,7 +1,6 @@
 import Service from '@ember/service';
 import Evented from '@ember/object/evented';
 import { inject as service } from '@ember/service';
-import socketClusterClient from 'socketcluster';
 
 export default class StorefrontService extends Service.extend(Evented) {
     @service store;

package/addon/templates/networks/index/network/stores.hbs

@@ -130,14 +130,14 @@
                             </div>
                             <div>
                                 <DropdownButton @size="xs" @icon="cog" @iconPrefix="fas" @textClass="block truncate" as |dd|>
-                                    <div class="next-dd-menu" aria-orientation="vertical" aria-labelledby="user-menu">
+                                    <div role="menu" class="next-dd-menu" aria-orientation="vertical" aria-labelledby="user-menu">
                                         <div class="px-1">
                                             <div class="next-dd-title">
                                                 Store Options
                                             </div>
                                         </div>
                                         <div class="next-dd-menu-seperator"></div>
-                                        <div class="px-1">
+                                        <div role="group" class="px-1">
                                             {{!-- <a href="javascript:;" class="next-dd-item" role="menuitem">
                                                 <FaIcon @icon="receipt" class="mr-2" />
                                                 <span>View orders via network</span>

package/addon/templates/networks/index.hbs

@@ -18,14 +18,14 @@
                                 </div>
                                 <div>
                                     <DropdownButton @renderInPlace={{true}} @size="xs" @icon="cog" @iconPrefix="fas" @textClass="block truncate text-gray-700 dark:text-gray-100" as |dd|>
-                                        <div class="next-dd-menu" aria-orientation="vertical" aria-labelledby="user-menu">
+                                        <div role="menu" class="next-dd-menu" aria-orientation="vertical" aria-labelledby="user-menu">
                                             <div class="px-1">
                                                 <div class="next-dd-title">
                                                     Network Options
                                                 </div>
                                             </div>
                                             <div class="next-dd-menu-seperator"></div>
-                                            <div class="px-1">
+                                            <div role="group" class="px-1">
                                                 <a href="javascript:;" class="next-dd-item" role="menuitem" {{on "click" (dropdown-fn dd this.manageNetwork network)}}>
                                                     <div class="w-7">
                                                         <FaIcon @icon="network-wired" class="mr-2" />

package/addon/templates/products/index/category/new.hbs

@@ -196,7 +196,7 @@
                                     {{#if dropzone.supported}}
                                         <p class="text-base font-semibold my-5">Drag and drop image and video files onto this dropzone</p>
                                     {{/if}}
-                                    <FileUpload @name="files" @for="files" @accept={{join "," this.acceptedFileTypes}} @multiple={{true}} @onFileAdded={{fn this.queueFile}}>
+                                    <FileUpload @name="files" @for="files" @accept={{join "," this.acceptedFileTypes}} @multiple={{true}} @onFileAdded={{this.queueFile}}>
                                         <a tabindex={{0}} class="btn btn-magic cursor-pointer ml-1">or select files to upload.</a>
                                     </FileUpload>
                                 </div>

package/addon/templates/products/index.hbs

@@ -6,7 +6,7 @@
 </Layout::Section::Header>
 
 <Layout::Section::Body class="section-content flex flex-col lg:flex-row">
-    <AsideItemScroller @title="Product Categories" @resource="category" @items={{@model}} @titleKey="name" @onCreate={{this.createNewProductCategory}} @onInit={{this.setAsideScroller}} @customTopItemComponent="aside-item-scroller/item" @customTopItemText="All Products" @customTopItemOnClick={{this.viewAllProducts}} @customTopItemClass="border-t border-gray-200 dark:border-gray-700" as |category dd|>
+    <AsideItemScroller @title="Product Categories" @resource="category" @items={{@model}} @titleKey="name" @onCreate={{this.createNewProductCategory}} @onInit={{this.setAsideScroller}} @customTopItemComponent="aside-item-scroller/item" @customTopItemText="All Products" @customTopItemOnClick={{this.viewAllProducts}} @customTopItemClass="border-t border-gray-200 dark:border-gray-700" as |category|>
         <a href="javascript:;" class="aside-item-link cursor-pointer flex w-full md:px-6 md:py-5" {{on "click" (fn this.switchCategory category)}}>
             <div class="flex items-center justify-between">
                 <div>

package/addon/templates/settings/index.hbs

@@ -84,7 +84,7 @@
                             </div>
                         </div>
                     {{else}}
-                        <FileDropzone @name="files" @multiple={{true}} @onFileAdded={{fn this.queueFile}} @accept={{join "," this.acceptedFileTypes}} class="dropzone file-dropzone" as |dropzone queue|>
+                        <FileDropzone @name="files" @multiple={{true}} @onFileAdded={{this.queueFile}} @accept={{join "," this.acceptedFileTypes}} class="dropzone file-dropzone" as |dropzone queue|>
                             {{#if dropzone.active}}
                                 {{#if dropzone.valid}}
                                     Drop to upload
@@ -107,7 +107,7 @@
                                     {{#if dropzone.supported}}
                                         <p class="text-base font-semibold my-5">Drag and drop image and video files onto this dropzone</p>
                                     {{/if}}
-                                    <FileUpload @name="files" @for="files" @accept={{join "," this.acceptedFileTypes}} @multiple={{true}} @onFileAdded={{fn this.queueFile}}>
+                                    <FileUpload @name="files" @for="files" @accept={{join "," this.acceptedFileTypes}} @multiple={{true}} @onFileAdded={{this.queueFile}}>
                                         <a tabindex={{0}} class="btn btn-magic cursor-pointer ml-1">or select files to upload.</a>
                                     </FileUpload>
                                 </div>

package/index.js

@@ -8,14 +8,6 @@ module.exports = buildEngine({
         enabled: true,
     },
     _concatStyles: () => {},
-    included: function (app) {
-        this._super.included.apply(this, arguments);
-
-        // socketcluster
-        this.import('node_modules/socketcluster-client/socketcluster-client.min.js', {
-            using: [{ transformation: 'es6', as: 'socketcluster' }],
-        });
-    },
     isDevelopingAddon() {
         return true;
     },

package/package.json

@@ -2,7 +2,7 @@
     "name": "@fleetbase/storefront-engine",
     "extension": "Storefront",
     "icon": "store",
-    "version": "0.0.3",
+    "version": "0.0.4",
     "priority": 1,
     "description": "Fleetbase Storefront extension provides a headless commerce module for launching e-commerce stores, on-demand apps, or marketplaces.",
     "keywords": [
@@ -37,11 +37,12 @@
         "test:ember-compatibility": "ember try:each"
     },
     "dependencies": {
-        "@fleetbase/ember-core": "^0.0.1",
-        "@fleetbase/ember-ui": "^0.0.3",
-        "@fleetbase/fleetops-data": "^0.0.1",
+        "@fleetbase/ember-core": "^0.0.2",
+        "@fleetbase/ember-ui": "^0.0.4",
+        "@fleetbase/fleetops-data": "^0.0.2",
         "@fortawesome/ember-fontawesome": "^0.4.1",
-        "@fortawesome/free-solid-svg-icons": "^6.2.0",
+        "@fortawesome/fontawesome-svg-core": "^6.4.0",
+        "@fortawesome/free-solid-svg-icons": "^6.4.0",
         "ember-cli-babel": "^7.26.11",
         "ember-cli-es6-transform": "^1.0.0",
         "ember-cli-htmlbars": "^6.1.0",