From 4f5fca0dd7d24ded9fbacd55454dc243c3de9f25 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 15 Apr 2020 23:58:08 +0000
Subject: [PATCH]

---
 ayanova/src/components/wiki-control.vue       | 37 +++++++++++++++++++
 .../src/components/wiki-viewer-control.vue    | 34 -----------------
 ayanova/src/main.js                           |  5 +--
 ayanova/src/views/widget.vue                  |  4 +-
 4 files changed, 41 insertions(+), 39 deletions(-)
 create mode 100644 ayanova/src/components/wiki-control.vue
 delete mode 100644 ayanova/src/components/wiki-viewer-control.vue

diff --git a/ayanova/src/components/wiki-control.vue b/ayanova/src/components/wiki-control.vue
new file mode 100644
index 00000000..6fb865be
--- /dev/null
+++ b/ayanova/src/components/wiki-control.vue
@@ -0,0 +1,37 @@
+<template>
+  <div>
+    <v-col cols="12">
+      <span class="v-label v-label--active theme--light">
+        {{ $ay.t("WikiPage") }}
+      </span>
+      <v-sheet elevation="4" color="light-gray" v-html="compiledOutput" class="pa-2 pa-sm-6">
+        <!-- <div v-html="compiledOutput"></div> -->
+      </v-sheet>
+      <div>raw Content: {{ content }}</div>
+    </v-col>
+  </div>
+</template>
+<script>
+import marked from "marked";
+export default {
+  data: () => ({}),
+  props: {
+    content: String
+  },
+  computed: {
+    compiledOutput() {
+      //return marked(this.content, { sanitize: true });
+      return marked(this.content);
+    }
+  }
+};
+
+/**
+todo:
+put the output on a paper element so it's raised and delineated
+figure out why parts are fucked (blockquote)
+remove extra spacing on sides in xs mode (gutters maybe on column or row?)
+Show/hide/edit control
+
+ */
+</script>
diff --git a/ayanova/src/components/wiki-viewer-control.vue b/ayanova/src/components/wiki-viewer-control.vue
deleted file mode 100644
index 44b521c4..00000000
--- a/ayanova/src/components/wiki-viewer-control.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
-  <div>
-    <v-col cols="12">
-      <span class="v-label v-label--active theme--light">
-        {{ $ay.t("WikiPage") }}
-      </span>
-      <div v-html="compiledOutput"></div>
-      <div>raw Content: {{ content }}</div>
-    </v-col>
-  </div>
-</template>
-<script>
-import marked from "marked";
-export default {
-  data: () => ({}),
-  props: {
-    content: String
-  },
-  computed: {
-    compiledOutput() {
-      return marked(this.content, { sanitize: true });
-    }
-  }
-};
-
-/**
- * 
- * //markdown viewer
-Vue.filter("marked", function vueMarkedFilter(value) {
-  return marked(value, { sanitize: true });
-});
-
- */
-</script>
diff --git a/ayanova/src/main.js b/ayanova/src/main.js
index 82c3f7e7..692c90a0 100644
--- a/ayanova/src/main.js
+++ b/ayanova/src/main.js
@@ -15,7 +15,6 @@ import { DateTime } from "luxon";
 import VueCurrencyInput from "vue-currency-input";
 import lodash from "./libs/lodash.min.js";
 
-
 //my libs
 import errorhandler from "./api/errorhandler";
 import ayaNovaVersion from "./api/ayanova-version";
@@ -46,7 +45,7 @@ import decimalControl from "./components/decimal-control.vue";
 import errorControl from "./components/error-control.vue";
 import reportSelectorControl from "./components/report-selector-control.vue";
 import reportViewerControl from "./components/report-viewer-control.vue";
-import wikiViewerControl from "./components/wiki-viewer-control.vue";
+import wikiControl from "./components/wiki-control.vue";
 
 /////////////////////////////////////////////////////////////////
 // LIBS AND GLOBAL ITEMS
@@ -176,7 +175,7 @@ Vue.component("gz-decimal", decimalControl);
 Vue.component("gz-error", errorControl);
 Vue.component("gz-report-selector", reportSelectorControl);
 Vue.component("gz-report-viewer", reportViewerControl);
-Vue.component("gz-wiki-viewer", wikiViewerControl);
+Vue.component("gz-wiki", wikiControl);
 
 //3rd party components
 Vue.use(VueCurrencyInput);
diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue
index c115be61..8afd9520 100644
--- a/ayanova/src/views/widget.vue
+++ b/ayanova/src/views/widget.vue
@@ -205,8 +205,8 @@
               ></gz-custom-fields>
             </v-col>
             <v-col cols="12">
-              <gz-wiki-viewer :content="obj.wikiContent"
-            /></v-col>
+              <gz-wiki :content="obj.wikiContent"></gz-wiki
+            ></v-col>
           </v-row>
         </v-form>
       </v-col>