From dcd3c0a95b6618752696f7b9794dbec0fec6f197 Mon Sep 17 00:00:00 2001
From: Mason Payne <mason@masonitestudios.com>
Date: Fri, 16 Jul 2021 00:39:41 -0600
Subject: [PATCH] fix api proxy, route urls and filters

---
 frontend-frame/package.json                 |  1 -
 frontend-frame/vue.config.js                | 10 ++++++++++
 src/frontend-services/app-view-builder.ts   |  2 +-
 src/frontend-services/fe-service-creator.ts |  2 +-
 src/frontend-services/list-view-builder.ts  | 10 ++++++++--
 5 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 frontend-frame/vue.config.js

diff --git a/frontend-frame/package.json b/frontend-frame/package.json
index 71a25f3..cd22fbc 100644
--- a/frontend-frame/package.json
+++ b/frontend-frame/package.json
@@ -19,7 +19,6 @@
     "@typescript-eslint/eslint-plugin": "^4.18.0",
     "@typescript-eslint/parser": "^4.18.0",
     "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-plugin-eslint": "~4.5.0",
     "@vue/cli-plugin-pwa": "~4.5.0",
     "@vue/cli-plugin-typescript": "~4.5.0",
     "@vue/cli-service": "~4.5.0",
diff --git a/frontend-frame/vue.config.js b/frontend-frame/vue.config.js
new file mode 100644
index 0000000..55d701a
--- /dev/null
+++ b/frontend-frame/vue.config.js
@@ -0,0 +1,10 @@
+module.exports = {
+    devServer: {
+        proxy: {
+            '/api/': {
+                target: 'http://localhost:3000',
+                changeOrigin: true
+            },
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/frontend-services/app-view-builder.ts b/src/frontend-services/app-view-builder.ts
index aa5af17..f5b1ec0 100644
--- a/src/frontend-services/app-view-builder.ts
+++ b/src/frontend-services/app-view-builder.ts
@@ -22,7 +22,7 @@ export function buildAppLinks(component: ComponentDef, outDir: string, systemDef
 }
 
 function createLinksMarkup(component: ComponentDef, systemDef: SystemDef): string {
-    let out = `<router-link to="/${component.component}">${component.component} List</router-link>
+    let out = `<router-link to="/${component.component}">${component.component} List</router-link><br/>
   `;
 
     return out;
diff --git a/src/frontend-services/fe-service-creator.ts b/src/frontend-services/fe-service-creator.ts
index f858b17..daa2d6f 100644
--- a/src/frontend-services/fe-service-creator.ts
+++ b/src/frontend-services/fe-service-creator.ts
@@ -147,7 +147,7 @@ function createFEServiceFunc(view: EndpointDef): string {
     }
     let addTypeDeclaration = method === 'get' || method === 'post';
     let useList = view.type === 'list' || view.type === 'search';
-    let url = URL[view.type](view).replace(':' + view.component + '_id', '\' + ' + view.component + '_id');
+    let url = view.component + '/' + URL[view.type](view).replace(':' + view.component + '_id', '\' + ' + view.component + '_id');
     let isUpdateOrCreate = view.type === 'update' || view.type === 'create';
 
     func = `
diff --git a/src/frontend-services/list-view-builder.ts b/src/frontend-services/list-view-builder.ts
index d73f3a7..e9113ae 100644
--- a/src/frontend-services/list-view-builder.ts
+++ b/src/frontend-services/list-view-builder.ts
@@ -66,6 +66,11 @@ export function buildListView(component: ComponentDef, outDir: string, systemDef
             return insertFEFiltersMarkup(listEndpoints[0], filterSet, outDir);
         });
     }
+
+    // TODO: add create component to sidebar
+    // TODO: add details component to sidebar
+    // TODO: if delete endpoint exists add delete button next to each row
+
     return endpointPromise;
 }
 
@@ -148,13 +153,14 @@ function createFilterMarkup(view: EndpointDef, filters: Filter[]): string {
         if (f.type) {
             // base the filter markup on type
             out = out + `<div>
-            <input type="${inputType[f.type] || 'text'}" placeholder="${f.param}" v-model="item.${f.param}"/>
+            <label>${f.param}: </label>
+            <input type="${inputType[f.type] || 'text'}" placeholder="${f.param}" v-model="filterItems.${f.param}"/>
         </div>
         `;
         } else {
             // default to a string filter
             out = out + `<div>
-            <input type="text" placeholder="${f.param}" v-model="item.${f.param}"/>
+            <input type="text" placeholder="${f.param}" v-model="filterItems.${f.param}"/>
         </div>
     `;
         }