From ab2ea36541e01e02688da2cb55f58215375decae Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Fri, 5 Apr 2019 13:05:45 +0200
Subject: [PATCH] Added markdown support to features

---
 app/imports/ui/character/FeaturesTab.vue      |  4 ++--
 app/imports/ui/components/MarkdownText.vue    | 20 +++++++++++++++++++
 .../ui/components/features/FeatureCard.vue    |  7 ++++---
 .../ui/components/features/FeatureDialog.vue  |  6 ++++--
 .../features/FeatureDialogContainer.vue       |  7 ++++++-
 .../components/properties/PropertyDialog.vue  |  1 -
 app/imports/ui/utility/evaluate.js            | 14 +++++++++----
 app/package-lock.json                         |  5 +++++
 app/package.json                              |  1 +
 9 files changed, 52 insertions(+), 13 deletions(-)
 create mode 100644 app/imports/ui/components/MarkdownText.vue

diff --git a/app/imports/ui/character/FeaturesTab.vue b/app/imports/ui/character/FeaturesTab.vue
index 549f7822..7ffd4dbe 100644
--- a/app/imports/ui/character/FeaturesTab.vue
+++ b/app/imports/ui/character/FeaturesTab.vue
@@ -27,7 +27,7 @@
 	import { insertFeature } from '/imports/api/creature/properties/Features.js';
 	import ColumnLayout from '/imports/ui/components/ColumnLayout.vue';
 	import FeatureCard from '/imports/ui/components/features/FeatureCard.vue';
-	import { evaluateComputation, evaluateString } from '/imports/ui/utility/evaluate.js';
+	import { evaluateComputation, evaluateStringWithVariables } from '/imports/ui/utility/evaluate.js';
 
 	export default {
 		props: {
@@ -47,7 +47,7 @@
 				}, {
 					sort: {order: 1},
 				}).map(f => {
-					f.description = evaluateString(f.description, vars);
+					f.description = evaluateStringWithVariables(f.description, vars);
 					return f;
 				});
 			},
diff --git a/app/imports/ui/components/MarkdownText.vue b/app/imports/ui/components/MarkdownText.vue
new file mode 100644
index 00000000..1d2ffc06
--- /dev/null
+++ b/app/imports/ui/components/MarkdownText.vue
@@ -0,0 +1,20 @@
+<template lang="html">
+  <div v-html="compiledMarkdown">
+	</div>
+</template>
+
+<script>
+	import marked from 'marked';
+
+	export default {
+		props: {
+			markdown: String,
+		},
+		computed: {
+	    compiledMarkdown() {
+				if (!this.markdown) return;
+				return marked(this.markdown, { sanitize: true });
+	    },
+	  },
+	}
+</script>
diff --git a/app/imports/ui/components/features/FeatureCard.vue b/app/imports/ui/components/features/FeatureCard.vue
index 16e7824b..2a23e40a 100644
--- a/app/imports/ui/components/features/FeatureCard.vue
+++ b/app/imports/ui/components/features/FeatureCard.vue
@@ -13,13 +13,14 @@
 				@click.stop="$emit('update', {_id, update: {enabled: !enabled}})"
 			/>
 		</template>
-		<v-card-text>
-			{{description}}
+		<v-card-text v-if="description">
+			<markdown-text :markdown="description"/>
 		</v-card-text>
   </toolbar-card>
 </template>
 
 <script>
+	import MarkdownText from '/imports/ui/components/MarkdownText.vue';
 	import ToolbarCard from '/imports/ui/components/ToolbarCard.vue';
 
 	export default {
@@ -33,9 +34,9 @@
 			alwaysEnabled: Boolean,
 		},
 		components: {
+			MarkdownText,
 			ToolbarCard,
 		},
-
 	};
 </script>
 
diff --git a/app/imports/ui/components/features/FeatureDialog.vue b/app/imports/ui/components/features/FeatureDialog.vue
index 3cfc8e7e..36c4e69c 100644
--- a/app/imports/ui/components/features/FeatureDialog.vue
+++ b/app/imports/ui/components/features/FeatureDialog.vue
@@ -1,25 +1,27 @@
 <template lang="html">
 	<property-dialog :doc="feature" collection="features" @remove="$emit('remove')">
 		<div>
-			{{feature.description}}
+			<markdown-text :markdown="feature.computedDescription || feature.description"/>
 			<!--
 			<child-lists
 				:parent="feature"
 			/>
 			-->
 		</div>
-		<feature-foremovet="form" :feature="feature" @update="(update, ack) => $emit('update', update, ack)"/>
+		<feature-form slot="form" :feature="feature" @update="(update, ack) => $emit('update', update, ack)"/>
 	</property-dialog>
 </template>
 
 <script>
 	import PropertyDialog from '/imports/ui/components/properties/PropertyDialog.vue';
 	import FeatureForm from '/imports/ui/components/features/FeatureForm.vue';
+	import MarkdownText from '/imports/ui/components/MarkdownText.vue';
 
 	export default {
 		components: {
 			PropertyDialog,
 			FeatureForm,
+			MarkdownText,
 		},
 		props: {
 			feature: Object,
diff --git a/app/imports/ui/components/features/FeatureDialogContainer.vue b/app/imports/ui/components/features/FeatureDialogContainer.vue
index 0cd30c46..fcbbd839 100644
--- a/app/imports/ui/components/features/FeatureDialogContainer.vue
+++ b/app/imports/ui/components/features/FeatureDialogContainer.vue
@@ -9,6 +9,7 @@
 <script>
 	import Features, {updateFeature} from '/imports/api/creature/properties/Features.js';
 	import FeatureDialog from '/imports/ui/components/features/FeatureDialog.vue';
+	import {evaluateStringForCharId} from '/imports/ui/utility/evaluate.js';
 
 	export default {
 		components: {
@@ -19,7 +20,11 @@
 		},
 		meteor: {
 			feature(){
-				return Features.findOne(this._id);
+				let feature = Features.findOne(this._id);
+				feature.computedDescription = evaluateStringForCharId(
+					feature.description, feature.charId
+				);
+				return feature;
 			},
 		},
 		methods: {
diff --git a/app/imports/ui/components/properties/PropertyDialog.vue b/app/imports/ui/components/properties/PropertyDialog.vue
index bcc7d2fa..7827e6bf 100644
--- a/app/imports/ui/components/properties/PropertyDialog.vue
+++ b/app/imports/ui/components/properties/PropertyDialog.vue
@@ -12,7 +12,6 @@
 </template>
 
 <script>
-	import propertyUpdateMethods from '/imports/api/creature/properties/propertyUpdateMethods.js';
 	import DialogBase from '/imports/ui/dialogStack/DialogBase.vue';
 	export default {
 		components: {
diff --git a/app/imports/ui/utility/evaluate.js b/app/imports/ui/utility/evaluate.js
index 05d66b29..1fd79377 100644
--- a/app/imports/ui/utility/evaluate.js
+++ b/app/imports/ui/utility/evaluate.js
@@ -1,6 +1,8 @@
+import Creatures from '/imports/api/creature/Creatures.js';
+
 // Computations resolve to numbers
 // vars is a dict of variables to substitute
-function evaluateComputation(string, vars){
+export function evaluateComputation(string, vars){
   if (!string) return string;
   // Replace all the string variables with numbers if possible
   let substitutedString = string.replace(
@@ -14,11 +16,11 @@ function evaluateComputation(string, vars){
   } catch (e){
     return substitutedString;
   }
-};
+}
 
 // Strings can have computations in bracers like so: {computation}
 // vars is a dict of variables to substitute
-function evaluateString(string, vars){
+export function evaluateStringWithVariables(string, vars){
 	if (!string) return string;
   // Compute everything inside bracers
 	return string.replace(/\{([^\{\}]*)\}/g, function(match, p1){
@@ -26,4 +28,8 @@ function evaluateString(string, vars){
 	});
 }
 
-export { evaluateComputation, evaluateString };
+export function evaluateStringForCharId(string, charId){
+  let char = Creatures.findOne(charId, {fields: {variables: 1}});
+  let vars = char ? char.variables : {};
+  return evaluateStringWithVariables(string, vars);
+}
diff --git a/app/package-lock.json b/app/package-lock.json
index 9e014a4c..d2d5f362 100644
--- a/app/package-lock.json
+++ b/app/package-lock.json
@@ -830,6 +830,11 @@
         "p-defer": "^1.0.0"
       }
     },
+    "marked": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.6.1.tgz",
+      "integrity": "sha512-+H0L3ibcWhAZE02SKMqmvYsErLo4EAVJxu5h3bHBBDvvjeWXtl92rGUSBYHL2++5Y+RSNgl8dYOAXcYe7lp1fA=="
+    },
     "mathjs": {
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-5.5.0.tgz",
diff --git a/app/package.json b/app/package.json
index 278ceaea..22941607 100644
--- a/app/package.json
+++ b/app/package.json
@@ -20,6 +20,7 @@
     "css-box-shadow": "^1.0.0-3",
     "fibers": "^2.0.2",
     "lodash": "^4.17.11",
+    "marked": "^0.6.1",
     "mathjs": "^5.5.0",
     "meteor-node-stubs": "^0.3.3",
     "moo": "^0.5.0",