From 56fc3dfe014d5a86be74cd789df833fc8dfbbf6b Mon Sep 17 00:00:00 2001
From: Josha von Gizycki <mail@joshavg.de>
Date: Sat, 26 Dec 2020 22:03:24 +0100
Subject: [PATCH] update on readme, moar titles, correction in last migration

---
 README.md                                   |  2 +-
 src/wanijo/infrastructure/repl.clj          | 12 ++++++------
 src/wanijo/infrastructure/view.clj          |  2 +-
 src/wanijo/instance/view/edit.clj           |  1 +
 src/wanijo/instance/view/instances.clj      |  1 +
 src/wanijo/instance/view/link_selection.clj |  1 +
 src/wanijo/instance/view/show.clj           |  1 +
 7 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index e236b4d..6618c62 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ When started via its `main` method, as is the uberjar case, an nREPL server is s
 To connect via the command line, use the following command:
 
 ```
-clj -Sdeps '{:deps {nrepl {:mvn/version "0.7.0"}}}' -m nrepl.cmdline --connect --host host --port port
+clj -Sdeps '{:deps {nrepl/nrepl {:mvn/version "0.7.0"}}}' -m nrepl.cmdline --connect --host host --port port
 ```
 
 ### "Architecture"
diff --git a/src/wanijo/infrastructure/repl.clj b/src/wanijo/infrastructure/repl.clj
index d0572a2..b5987ca 100644
--- a/src/wanijo/infrastructure/repl.clj
+++ b/src/wanijo/infrastructure/repl.clj
@@ -24,9 +24,9 @@
          c.last_migration = ''")
 
 (neo4j/defquery merge-config
-  "UPDATE (c:dbconfig)
-      SET c.last_migration = {now},
-          c.db_version = {version}")
+  "MATCH (c:dbconfig)
+     SET c.last_migration = {now},
+         c.db_version = {version}")
 
 (neo4j/defquery config
   "MATCH (c:dbconfig) RETURN c")
@@ -96,9 +96,9 @@
 (defn run-migrations! []
   (neo4j/exec-query! init-config {:now (neo4j/now-str)})
   (let [version (-> (neo4j/exec-query! config {})
-                   first
-                   :c
-                   :db_version)]
+                    first
+                    :c
+                    :db_version)]
     (println "got version" version "from db," (count migrations) "available")
     (when-let [to-run (nthrest migrations version)]
       (println "running" (count to-run) "migrations")
diff --git a/src/wanijo/infrastructure/view.clj b/src/wanijo/infrastructure/view.clj
index 7d1ef53..5f5909d 100644
--- a/src/wanijo/infrastructure/view.clj
+++ b/src/wanijo/infrastructure/view.clj
@@ -42,7 +42,7 @@
       [:meta {:charset "utf-8"}]
       [:meta {:name "viewport"
               :content "width=device-width,initial-scale=1,shrink-to-fit=no"}]
-      [:title (str "wan ijo" (when title (str " - " title)))]
+      [:title (h (str (when title (str title " - ")) "wanijo"))]
       (include-css "/css/app.css")
       (when devmode? (include-css "/css/devmode.css"))
       (include-js "/js/scripts.js")
diff --git a/src/wanijo/instance/view/edit.clj b/src/wanijo/instance/view/edit.clj
index 874811c..6ed0237 100644
--- a/src/wanijo/instance/view/edit.clj
+++ b/src/wanijo/instance/view/edit.clj
@@ -11,6 +11,7 @@
 (defn edit [instance form form-data schemas req]
   (view/layout
     :request req
+    :title (str (:name instance) " - " (-> instance :schema :name))
     :content
     [[:h1
       (h (-> instance :schema :name))
diff --git a/src/wanijo/instance/view/instances.clj b/src/wanijo/instance/view/instances.clj
index aa7390b..009f2f7 100644
--- a/src/wanijo/instance/view/instances.clj
+++ b/src/wanijo/instance/view/instances.clj
@@ -10,6 +10,7 @@
 (defn instances [schema instances new-form req]
   (view/layout
     :request req
+    :title (:name schema)
     :content
     [[:h1 "All Instances of schema "
       [:span.schema-title__name (h (:name schema))]]
diff --git a/src/wanijo/instance/view/link_selection.clj b/src/wanijo/instance/view/link_selection.clj
index 7c50ca4..5bcff89 100644
--- a/src/wanijo/instance/view/link_selection.clj
+++ b/src/wanijo/instance/view/link_selection.clj
@@ -8,6 +8,7 @@
 (defn link-selection [instance schema form req]
   (view/layout
     :request req
+    :title (str (:name instance) " - " (-> instance :schema :name))
     :content
     [[:h1
       [:small "Link " (-> instance :schema :name h) " "]
diff --git a/src/wanijo/instance/view/show.clj b/src/wanijo/instance/view/show.clj
index 015082d..3f60823 100644
--- a/src/wanijo/instance/view/show.clj
+++ b/src/wanijo/instance/view/show.clj
@@ -39,6 +39,7 @@
 (defn show [instance schemas req]
   (view/layout
     :request req
+    :title (str (:name instance) " - " (-> instance :schema :name))
     :content
     [[:h1
       (if (:starred instance)