From c86dd91d331db3941dfd071275b0ce9573b60009 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 4 Jan 2019 21:45:46 +0000
Subject: [PATCH]

---
 ayanova/src/App.vue                           |  2 +-
 ayanova/src/{utils => api}/aboutinfo.js       |  0
 ayanova/src/api/apiutil.js                    |  8 +++--
 ayanova/src/api/pagedlist.js                  | 29 -------------------
 .../src/components/inventorywidgetlist.vue    | 14 +++++----
 ayanova/src/utils/initialize.js               |  2 +-
 ayanova/src/views/About.vue                   |  2 +-
 7 files changed, 16 insertions(+), 41 deletions(-)
 rename ayanova/src/{utils => api}/aboutinfo.js (100%)
 delete mode 100644 ayanova/src/api/pagedlist.js

diff --git a/ayanova/src/App.vue b/ayanova/src/App.vue
index 8f78db52..ccec60b1 100644
--- a/ayanova/src/App.vue
+++ b/ayanova/src/App.vue
@@ -47,7 +47,7 @@
 </template>
 
 <script>
-import aboutInfo from "./utils/aboutinfo";
+import aboutInfo from "./api/aboutinfo";
 
 export default {
   name: "App",
diff --git a/ayanova/src/utils/aboutinfo.js b/ayanova/src/api/aboutinfo.js
similarity index 100%
rename from ayanova/src/utils/aboutinfo.js
rename to ayanova/src/api/aboutinfo.js
diff --git a/ayanova/src/api/apiutil.js b/ayanova/src/api/apiutil.js
index 16df839d..2eed905f 100644
--- a/ayanova/src/api/apiutil.js
+++ b/ayanova/src/api/apiutil.js
@@ -160,7 +160,7 @@ export default {
     );
   },
   get(route) {
-    var that=this;
+    var that = this;
     //debugger;
     return new Promise(function(resolve, reject) {
       //debugger;
@@ -169,12 +169,12 @@ export default {
         .then(that.json)
         .then(response => {
           //For now, assuming that all returns that make it here have either an error or a data object attached to them
-          //debugger;
+          // debugger;
           resolve(response);
         })
         .catch(function(error) {
           //fundamental error, can't proceed with this call
-          // debugger;
+          //debugger;
           var errorMessage =
             "API error: GET route =" + route + ", message =" + error.message;
           store.commit("logItem", errorMessage);
@@ -183,4 +183,6 @@ export default {
         });
     });
   }
+
+  //new functions above here
 };
diff --git a/ayanova/src/api/pagedlist.js b/ayanova/src/api/pagedlist.js
deleted file mode 100644
index 30c89d98..00000000
--- a/ayanova/src/api/pagedlist.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/* xeslint-disable */
-import apiUtil from "./apiutil";
-export default {
-  fetch(route, listOptions) {
-    // listOptions;
-
-    // var futureWithSortExampleListOptions = {
-    //   offset: 5,
-    //   limit: 5,
-    //   sortBy: "name",
-    //   descending: false
-    // };
-    // exampleListOptions;
-
-    var listUrl = route + "?" + apiUtil.buildQuery(listOptions);
-
-    return new Promise(function(resolve, reject) {
-      fetch(apiUtil.APIUrl(listUrl), apiUtil.fetchGetOptions())
-        .then(apiUtil.status)
-        .then(apiUtil.json)
-        .then(response => {
-          resolve(response);
-        })
-        .catch(function(error) {
-          reject(error);
-        });
-    });
-  }
-};
diff --git a/ayanova/src/components/inventorywidgetlist.vue b/ayanova/src/components/inventorywidgetlist.vue
index a16e0e1d..6fbb622e 100644
--- a/ayanova/src/components/inventorywidgetlist.vue
+++ b/ayanova/src/components/inventorywidgetlist.vue
@@ -52,9 +52,9 @@
 
 
 <script>
-/*  eslint-disable */
+/*  xeslint-disable */
 import localeText from "../api/locale";
-import pagedList from "../api/pagedlist";
+import api from "../api/apiutil";
 import WidgetEdit from "../components/inventorywidgetedit";
 export default {
   ltKeysRequired: [
@@ -118,7 +118,7 @@ export default {
     }
   },
   mounted() {
-    this.rowsPerPageText = lt("RowsPerPage");
+    this.rowsPerPageText = this.lt("RowsPerPage");
     this.getDataFromApi();
   },
   computed: {},
@@ -136,7 +136,7 @@ export default {
         offset: 0,
         limit: 5,
         sort: "name",
-        asc:true
+        asc: true
       };
 
       if (this.pagination.rowsPerPage && this.pagination.rowsPerPage > 0) {
@@ -145,10 +145,12 @@ export default {
         listOptions.limit = this.pagination.rowsPerPage;
       }
       listOptions.sort = this.pagination.sortBy;
-      listOptions.asc=!this.pagination.descending;
+      listOptions.asc = !this.pagination.descending;
 
       this.loading = true;
-      pagedList.fetch("Widget/ListWidgets", listOptions).then(res => {
+      //debugger;
+      var listUrl = "Widget/ListWidgets?" + api.buildQuery(listOptions);
+      api.get(listUrl).then(res => {
         // debugger;
         this.loading = false;
         this.Items = res.data;
diff --git a/ayanova/src/utils/initialize.js b/ayanova/src/utils/initialize.js
index dfd491ea..5f5e5c59 100644
--- a/ayanova/src/utils/initialize.js
+++ b/ayanova/src/utils/initialize.js
@@ -92,7 +92,7 @@ export default function initialize() {
     //check the timezone offset is still valid, offer to change it if not
     //api.get("UserOptions/" + store.state.userId).then(res => {
     api
-      .get("UserOptions/bb")
+      .get("UserOptions/" + store.state.userId)
       .then(res => {
         if (res.error) {
           //In a form this would trigger a bunch of validation or error display code but for here and now:
diff --git a/ayanova/src/views/About.vue b/ayanova/src/views/About.vue
index 54732205..cbbc6077 100644
--- a/ayanova/src/views/About.vue
+++ b/ayanova/src/views/About.vue
@@ -104,7 +104,7 @@
 <script>
 /* xeslint-disable */
 import api from "../api/apiutil";
-import aboutInfo from "../utils/aboutinfo";
+import aboutInfo from "../api/aboutinfo";
 import lt from "../api/locale";
 export default {
   data() {