updated notifications to use react

2 files changed, 145 insertions, 12 deletions

diff --git a/lisp/webapps/bogenherr/clojurescript/bogenherr/src/core.cljs b/lisp/webapps/bogenherr/clojurescript/bogenherr/src/core.cljs
index 12ae124..53c7a95 100644
--- a/lisp/webapps/bogenherr/clojurescript/bogenherr/src/core.cljs
+++ b/lisp/webapps/bogenherr/clojurescript/bogenherr/src/core.cljs
@@ -9,7 +9,7 @@
             [reagent.core :as r]
             [reagent.dom :as rd]
             [reagent.dom.client :as rdc]
-            [org-ckons-cljs.notifications.core :as ck-notifications]
+            [org-ckons-cljs.notifications.react :as ck-notifications]
             [org-ckons-cljs.form.core :as ck-form]))
 
 ;; declarations
@@ -17,6 +17,11 @@
 (declare date-sql-to-pretty)
 (declare markdown-to-html)
 (declare reduce-checkboxes)
+(declare comp-app)
+(declare start-render)
+(declare start-location)
+(declare reset-location)
+(declare start)
 (declare notifications)
 (declare auth-notifications)
 (declare template-menu)
@@ -162,14 +167,9 @@
 (declare on-menu-clicked)
 (declare handler-location)
 (declare goto-location)
-(declare reset-app)
 (declare goto-register)
-(declare comp-app)
-(declare start-render)
-(declare start-location)
-(declare reset-location)
+(declare reset-app)
 (declare reset-about-us-category)
-(declare start)
 
 (enable-console-print!)
 (def jquery (js* "$"))
@@ -216,8 +216,8 @@
        [:td {:class "banner-title"} "Bogen-" [:i "Herr"]]
        [:td {:class "banner-menu"} " "]]]]]
    [:div {:id "menu" :class "well"}]
-   [:div {:id "errormsg"}]
-   [:div {:id "message"}]
+   [ck-notifications/comp-errormsg]
+   [ck-notifications/comp-message]
    [:div {:id "body"}]
    [:div {:id "footer"}
     [:hr]
@@ -232,7 +232,8 @@
 (defn start-location []
   (cond (str/starts-with? (@nav-state :location) "/register/")
         (goto-register (str/replace-first (@nav-state :location) "/register/" ""))
-        :else (goto-location (@nav-state :location))))
+        :else
+        (goto-location (@nav-state :location))))
 
 (defn reset-location [url]
   (reset! nav-state (assoc @nav-state :location url)))
@@ -252,8 +253,8 @@
 ;; notifications
 
 (defn notifications [jsonobj]
-  (ck-notifications/maybe-message jsonobj)
-  (ck-notifications/maybe-error jsonobj))
+  (ck-notifications/set-message (get jsonobj "message"))
+  (ck-notifications/set-errormsg (get jsonobj "errormsg")))
 
 (defn auth-notifications [jsonobj]
   (cond (empty? (get jsonobj "errormsg"))
diff --git a/org/test.org b/org/test.org
new file mode 100644
index 0000000..1d13520
--- /dev/null
+++ b/org/test.org
@@ -0,0 +1,132 @@
+* Rocket
+:PROPERTIES:
+:ID:       a02dbde8-38d3-4479-8c87-db79821a4296
+:CATEGORY: asdfasdf
+:END:
+** TODO Design rocket :#Juan:
+SCHEDULED: <2020-02-03 Mon> DEADLINE: <2020-05-10 Sun>
+:PROPERTIES:
+:ID:       7cda092c-d670-4545-892b-4eae2c68c4fa
+:ELGANTT-COLOR: Red Yellow
+:ELGANTT-LINKED-TO: 0b4dde5d-4363-47d2-9995-b82c36a40645
+:END:
+** Get materials :#Justinia:                
+SCHEDULED: <2020-02-16 Sun> DEADLINE: <2020-03-21 Sat>
+:PROPERTIES:
+:ID:       0b4dde5d-4363-47d2-9995-b82c36a40645
+:ELGANTT-COLOR: Black LightBlue
+:Effort:   60d
+:END:
+** Assemble materials :#Jasmine:
+SCHEDULED: <2020-06-01 Mon> DEADLINE: <2020-06-16 Tue>
+:PROPERTIES:
+:ID:       a6ecb972-16e3-46bb-9029-201ba1e8c1d3
+:ELGANTT-COLOR: Purple Violet
+:END:
+** TODO Test rocket :#Jack:
+:PROPERTIES:
+:ID:       099705d6-4a2b-49c6-9cae-a8845f5915a0
+:END:
+<2020-07-17 Fri>
+:PROPERTIES:
+:ID:       65e013e5-ec03-4389-b45f-2f1e57f71602
+:END:
+** Visit from POTUS
+:PROPERTIES:
+:ID:       00db3ad5-ddce-4c22-9a63-96693d45b691
+:END:
+<2020-08-23 Sun>
+* Space suit 
+:PROPERTIES:
+:ID:       60b318f5-8093-4015-9f51-7239c0ff10e2
+:END:
+** Design space suit :#Jasmine:adsf:
+SCHEDULED: <2020-01-09 Thu> DEADLINE: <2020-03-13 Fri>
+:PROPERTIES:
+:ID:       5b3e77de-fd29-4cde-b3ae-a86ecbd0141e
+:ELGANTT-COLOR: LightGreen DarkGreen
+:END:
+** Get materials :#Justinia:
+SCHEDULED: <2020-02-14 Fri> DEADLINE: <2020-04-07 Tue>
+:PROPERTIES:
+:ID:       c6b84a57-1d92-4062-9f14-773ed232bb5c
+:ELGANTT-COLOR: Black LightBlue
+:END:
+** TODO Assemble materials :#Jason:
+SCHEDULED: <2020-04-01 Wed> DEADLINE: <2020-05-23 Sat>
+:PROPERTIES:
+:ELGANTT-COLOR: Purple Violet
+:ID:       0888069b-96f4-4059-bb4e-5797a2554a84
+:END:
+** TODO Test space suit :#Jack:
+SCHEDULED: <2020-04-22 Wed> DEADLINE: <2020-05-23 Sat>
+:PROPERTIES:
+:ID:       09aa34ed-6dce-4e48-981f-3d0717c59fc1
+:END:
+* Launch pad
+:PROPERTIES:
+:ID:       b1444d1f-6fae-4475-83dc-39a83efc8d8b
+:END:
+** Design launch pad :#Lucas:
+SCHEDULED: <2020-01-24 Fri> DEADLINE: <2020-02-23 Sun>
+:PROPERTIES:
+:ELGANTT-COLOR: LightGreen DarkGreen
+:ID:       76658fe8-deee-40b6-bc32-53d16c9a62e5
+:END:
+** TODO Get materials :#Justinia:
+SCHEDULED: <2020-02-24 Mon> DEADLINE: <2020-04-02 Thu>
+:PROPERTIES:
+:ID:       3ed67722-6f89-4c0b-a23e-8949b9cf1686
+:ELGANTT-COLOR: Black LightBlue
+:END:
+** Assemble launch pad :#Jason:
+SCHEDULED: <2020-05-01 Fri> DEADLINE: <2020-05-24 Sun>
+:PROPERTIES:
+:ID:       c68a26af-59f3-40a8-a412-9964278114ff
+:ELGANTT-COLOR: Purple Violet
+:END:
+** Test launch pad :#Jack:
+DEADLINE: <2020-06-24 Wed>
+:PROPERTIES:
+:ID:       8a7731e3-16dd-47f9-a45c-b4ea64d310e6
+:END:
+** Launch pad inspection
+:PROPERTIES:
+:ID:       794bc7c5-e537-4596-9201-59310523f211
+:END:
+<2020-07-06 Mon>
+* Vacations
+:PROPERTIES:
+:ID:       75f4b06b-e846-4c90-8291-16741bee93cb
+:END:
+** Justinia on vacation :#Justinia:
+:PROPERTIES:
+:ID:       0b371c70-c90c-41e0-8556-fc591f602e34
+:ELGANTT-LINKED-TO: 0b371c70-c90c-41e0-8556-fc591f602e34
+:ELGANTT-COLOR: Purple LightSlateGray
+:END:
+<2020-05-29 Fri>--<2020-06-29 Mon>
+** Juan on paternity leave :#Juan:
+:PROPERTIES:
+:ID:       30ee37cc-8d66-4cb0-a7f5-0a2d44be0296
+:ELGANTT-LINKED-TO: 30ee37cc-8d66-4cb0-a7f5-0a2d44be0296
+:ELGANTT-COLOR: Purple LightSlateGray
+:END:
+<2020-07-04 Sat>--<2020-07-24 Fri>
+** Jason on vacation :#Jason:
+:PROPERTIES:
+:ID:       5a2f1845-88ce-4aff-a2e8-130c05c2b53b
+:ELGANTT-LINKED-TO: 5a2f1845-88ce-4aff-a2e8-130c05c2b53b
+:ELGANTT-COLOR: Purple LightSlateGray
+:END:
+<2020-07-01 Wed>--<2020-07-12 Sun>
+* test
+:PROPERTIES:
+:ID:       4b37aca5-a66e-4917-a904-8dfb1f1c69a5
+:END:
+** asdf
+DEADLINE: <2020-07-11 Sat>
+:PROPERTIES:
+:ID:       71536120-18eb-440f-a877-da07468e86da
+:END:
+