From ede4016e7d0c755be3621d4db318f0ad2ec24582 Mon Sep 17 00:00:00 2001
From: Knut Sveidqvist <knut.sveidqvist@ipiccolo.com>
Date: Sat, 23 Nov 2019 16:05:11 +0100
Subject: [PATCH] Renaming of stores to better match purpose

---
 public/index.html            | 1 -
 src/code-error-store.js      | 3 +++
 src/components/Config.svelte | 8 ++++----
 src/components/Editor.svelte | 8 ++++----
 src/components/Error.svelte  | 4 ++--
 src/components/Links.svelte  | 2 +-
 src/components/View.svelte   | 8 ++++----
 src/config-error-store.js    | 3 +++
 src/config-store.js          | 3 ---
 src/error-store.js           | 3 ---
 src/routes/Edit.svelte       | 2 +-
 src/routes/View.svelte       | 1 +
 12 files changed, 23 insertions(+), 23 deletions(-)
 create mode 100644 src/code-error-store.js
 create mode 100644 src/config-error-store.js
 delete mode 100644 src/config-store.js
 delete mode 100644 src/error-store.js

diff --git a/public/index.html b/public/index.html
index 4cd152f1..0972b35f 100644
--- a/public/index.html
+++ b/public/index.html
@@ -17,7 +17,6 @@
 	})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
 
 	ga('create', 'UA-153180559-1', 'auto');
-	ga('send', 'pageview');
 	</script>
 	<!-- End Google Analytics -->
 
diff --git a/src/code-error-store.js b/src/code-error-store.js
new file mode 100644
index 00000000..1fbaa903
--- /dev/null
+++ b/src/code-error-store.js
@@ -0,0 +1,3 @@
+import { writable } from 'svelte/store';
+
+export const codeErrorStore = writable(undefined);
\ No newline at end of file
diff --git a/src/components/Config.svelte b/src/components/Config.svelte
index 062339b7..7b4e31c4 100644
--- a/src/components/Config.svelte
+++ b/src/components/Config.svelte
@@ -1,6 +1,6 @@
 <script>
 import { codeStore, updateCodeStore } from '../code-store.js';
-import { configStore } from '../config-store.js';
+import { configErrorStore } from '../config-error-store.js';
 import { onMount } from 'svelte';
 import {push, pop, replace} from 'svelte-spa-router'
 import { Base64 } from 'js-base64'
@@ -30,13 +30,13 @@ const handleConfUpdate =  conf => {
 		let newState = { code, mermaid: JSON.parse(conf) };
 		oldConf = newState.mermaid;
 		updateCodeStore(newState);
-		configStore.set(undefined);
+		configErrorStore.set(undefined);
 		const model = edit.getModel();
 		// model.setValue(conf);
 		// model.dispose();
 	} catch(e) {
 		console.log('Error in parsed', e);
-		configStore.set(e);
+		configErrorStore.set(e);
 		const str = JSON.stringify({ code, mermaid: oldConf });
 		push('/edit/' + Base64.encode(str))
 	}
@@ -73,7 +73,7 @@ const unsubscribe = codeStore.subscribe( state => {
 
 initEditor(monaco);
 
-const unsubscribeError = configStore.subscribe( _error => {
+const unsubscribeError = configErrorStore.subscribe( _error => {
 	// console.log('Error ideintified' + _error.toString());
 	if(_error) {
 		error = _error.toString();
diff --git a/src/components/Editor.svelte b/src/components/Editor.svelte
index 366e7fd5..8271b9cf 100644
--- a/src/components/Editor.svelte
+++ b/src/components/Editor.svelte
@@ -1,6 +1,6 @@
 <script>
 import { codeStore, updateCodeStore } from '../code-store.js';
-import { errorStore } from '../error-store.js';
+import { codeErrorStore } from '../code-error-store.js';
 import { onMount } from 'svelte';
 import {push, pop, replace} from 'svelte-spa-router'
 import { Base64 } from 'js-base64'
@@ -29,11 +29,11 @@ const handleCodeUpdate = code => {
 			edit.deltaDecorations(decor, []);
 		});
 
-		errorStore.set(undefined);
+		codeErrorStore.set(undefined);
 		const model = edit.getModel();
 	} catch(e) {
 		if(e) {
-			errorStore.set(e);
+			codeErrorStore.set(e);
 			console.log('Error in parsed', e.hash);
 			const str = JSON.stringify({ code: code, mermaid: conf });
 			push('/edit/' + Base64.encode(str))
@@ -75,7 +75,7 @@ const unsubscribe = codeStore.subscribe( state => {
 	}
 });
 
-const unsubscribeError = errorStore.subscribe( _error => {
+const unsubscribeError = codeErrorStore.subscribe( _error => {
 	if(_error) {
 		error = true;
 	} else {
diff --git a/src/components/Error.svelte b/src/components/Error.svelte
index 35f8ce3d..aba92400 100644
--- a/src/components/Error.svelte
+++ b/src/components/Error.svelte
@@ -1,5 +1,5 @@
 <script>
-import { errorStore } from '../error-store.js';
+import { codeErrorStore } from '../code-error-store.js';
 import { onMount } from 'svelte';
 
 onMount(async () => {
@@ -16,7 +16,7 @@ onMount(async () => {
 	export let errorText = '';
 
 
-// const unsubscribeError = errorStore.subscribe( _error => {
+// const unsubscribeError = codeErrorStore.subscribe( _error => {
 // 		if(typeof _error === 'undefined') {
 // 			classes = 'invisible';
 // 			error = {};
diff --git a/src/components/Links.svelte b/src/components/Links.svelte
index 2d81bf06..65dbe469 100644
--- a/src/components/Links.svelte
+++ b/src/components/Links.svelte
@@ -1,5 +1,5 @@
 <script>
-import { errorStore } from '../error-store.js';
+import { codeErrorStore } from '../code-error-store.js';
 import {link} from 'svelte-spa-router';
 import { Base64 } from 'js-base64'
 import { onMount } from 'svelte';
diff --git a/src/components/View.svelte b/src/components/View.svelte
index 9e0d9715..d8de5d8a 100644
--- a/src/components/View.svelte
+++ b/src/components/View.svelte
@@ -1,7 +1,7 @@
 <script>
 import { codeStore } from '../code-store.js';
-import { errorStore } from '../error-store.js';
-import { configStore } from '../config-store.js';
+import { codeErrorStore } from '../code-error-store.js';
+import { configErrorStore } from '../config-error-store.js';
 import { onMount } from 'svelte';
 import mermaid from '@mermaid-js/mermaid';
 
@@ -81,7 +81,7 @@ let insertSvg = function(svgCode, bindFunctions){
 		}
 
 	});
-	const unsubscribeError = errorStore.subscribe( _error => {
+	const unsubscribeError = codeErrorStore.subscribe( _error => {
 		if(typeof _error === 'undefined') {
 			codeClasses = '';
 		} else {
@@ -89,7 +89,7 @@ let insertSvg = function(svgCode, bindFunctions){
 			console.log('code error: ', _error);
 		}
 	});
-	const unsubscribeConfigError = configStore.subscribe( _error => {
+	const unsubscribeConfigError = configErrorStore.subscribe( _error => {
 		if(typeof _error === 'undefined') {
 			configClasses = '';
 		} else {
diff --git a/src/config-error-store.js b/src/config-error-store.js
new file mode 100644
index 00000000..943020e8
--- /dev/null
+++ b/src/config-error-store.js
@@ -0,0 +1,3 @@
+import { writable } from 'svelte/store';
+
+export const configErrorStore = writable(undefined);
\ No newline at end of file
diff --git a/src/config-store.js b/src/config-store.js
deleted file mode 100644
index 5e24eecd..00000000
--- a/src/config-store.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { writable } from 'svelte/store';
-
-export const configStore = writable(undefined);
\ No newline at end of file
diff --git a/src/error-store.js b/src/error-store.js
deleted file mode 100644
index 871fb3fc..00000000
--- a/src/error-store.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { writable } from 'svelte/store';
-
-export const errorStore = writable(undefined);
\ No newline at end of file
diff --git a/src/routes/Edit.svelte b/src/routes/Edit.svelte
index 7b20cf6d..88f5d247 100644
--- a/src/routes/Edit.svelte
+++ b/src/routes/Edit.svelte
@@ -8,7 +8,7 @@ import Links from '../components/Links.svelte';
 import { fromUrl } from '../code-store.js';
 
 onMount(async () => {
-	console.log('Data = ', params.data)
+	ga('send', 'pageview');
 	fromUrl(params.data);
 });
 
diff --git a/src/routes/View.svelte b/src/routes/View.svelte
index 1407e17f..7340d6c5 100644
--- a/src/routes/View.svelte
+++ b/src/routes/View.svelte
@@ -6,6 +6,7 @@ import { fromUrl } from '../code-store.js';
 
 onMount(async () => {
 	fromUrl(params.data);
+	ga('send', 'pageview');
 });
 
 	export let code = '';