Display and navigate b/w organisations in the sidebar

resources/public/assets/css/style.css

@@ -140,6 +140,12 @@ a:hover {
   background: #2e3344;
   transition: left 0.1s;
   color: white;
+  overflow-y: scroll;
+  overflow: -moz-scrollbars-none;
+}
+
+.sidebar::-webkit-scrollbar {
+  width: 0 !important
 }
 
 .sidebar-logo-box {
@@ -160,15 +166,10 @@ a:hover {
   margin-bottom: 4px;
 }
 
-.sidebar-section {
-  padding-left: 10px;
-}
-
 .sidebar-section-head {
   color: white;
   font-weight: bolder;
-  margin-bottom: 5px;
-  margin-top: 25px;
+  margin: 25px 0px 5px 8px;
 }
 
 .sidebar-section-list {
@@ -179,9 +180,19 @@ a:hover {
 .sidebar-section-list > .item {
   display: block;
   line-height: 35px;
-  padding: 0 15px 0 15px;
+  padding: 0 15px 0 20px;
   width: 100%;
   text-decoration: none;
+  border: 2px solid transparent;
+}
+
+.sidebar-section-list .item:hover {
+  background: #363c4e;
+}
+
+.sidebar .item.active {
+  border-left: 2px solid aliceblue;
+  background: #404040;
 }
 
 .sidebar-section-list .item-label {
@@ -205,6 +216,7 @@ a:hover {
 .sidebar-link {
   color: #d5e2f1 !important;
   cursor: pointer;
+  display: block;
 }
 
 .sidebar-link:hover {
@@ -256,6 +268,7 @@ a:hover {
   margin-bottom: 0;
   background-color: #fff;
   box-shadow: 0px 2px rgba(0, 0, 0, 0.05), 0 1px 0 rgba(0, 0, 0, 0.05);
+  padding: 10px 10px 0 10px;
 }
 
 /* End Dashboard*/

src/clj/villagebook/organisation/handlers.clj

@@ -33,3 +33,8 @@
     (if (s/valid? ::organisation-spec/id id)
       (retrieve-from-model id)
       (res/bad-request "Invalid request."))))
+
+(defn retrieve-by-user
+  [request]
+  (let [{user-id :id} (:identity request)]
+    (res/response (:success (models/retrieve-by-user user-id)))))

src/clj/villagebook/organisation/models.clj

@@ -16,3 +16,7 @@
     (if org
       {:success org}
       {:error "Organisation not found"})))
+
+(defn retrieve-by-user
+  [user-id]
+  {:success (db/retrieve-by-user user-id)})

src/clj/villagebook/routes.clj

@@ -9,8 +9,9 @@
             [villagebook.config :as config]))
 
 (def apiroutes
-  {"organisations" {["/" :id] {:get (with-auth org/retrieve)}
-                    :post     (with-auth org/create!)}
+  {"organisations" {:get      (with-auth org/retrieve-by-user)
+                    :post     (with-auth org/create!)
+                    ["/" :id] {:get (with-auth org/retrieve)}}
    "user"          {:get (with-auth user/retrieve)}})
 
 

src/cljs/villagebookUI/api/organisation.cljs

@@ -1,11 +1,18 @@
 (ns villagebookUI.api.organisation
-  [:require [ajax.core :refer [POST]]])
+  [:require [ajax.core :refer [GET POST]]])
 
 (def ^:private create-org-api "/api/organisations")
+(def ^:private get-all-orgs-api "/api/organisations")
 
-(defn create-org [org-data handler-fn error-handler-fn]
+(defn create! [org-data handler-fn error-handler-fn]
   (POST create-org-api
         {:params        org-data
          :format        :raw
          :handler       handler-fn
          :error-handler error-handler-fn}))
+
+(defn get-all [handler-fn error-handler-fn]
+  (GET get-all-orgs-api
+       {:handler         handler-fn
+        :response-format :json
+        :error-handler   error-handler-fn}))

src/cljs/villagebookUI/api/user.cljs

@@ -1,10 +1,11 @@
 (ns villagebookUI.api.user
-  [:require [ajax.core :refer [GET]]])
+  (:require [ajax.core :refer [GET]]
+            [villagebookUI.store.user :as store]))
 
 (def ^:private get-user-data-api "/api/user")
 
-(defn get-user-data
-  [handler-fn error-handler-fn]
+(defn get-data [handler-fn error-handler-fn finally-fn]
   (GET get-user-data-api
-       {:handler       handler-fn
-        :error-handler error-handler-fn}))
+       {:handler         handler-fn
+        :error-handler   error-handler-fn
+        :finally finally-fn}))

src/cljs/villagebookUI/components/create_org.cljs

@@ -1,14 +1,15 @@
 (ns villagebookUI.components.create-org
   (:require [reagent.core :as r]
             [villagebookUI.helpers :refer [random-color handle-esc]]
+            [villagebookUI.fetchers :as fetchers]
             [villagebookUI.components.utils :as utils]
-            [villagebookUI.api.organisation :as org]))
+            [villagebookUI.api.organisation :as org-api]))
 
 (defn- create-org [form success-handler error-handler]
   (when (:name form)
-    (org/create-org form
-                    success-handler
-                    error-handler)))
+    (org-api/create! form
+                     success-handler
+                     error-handler)))
 
 (defn org-creation-form [on-close-handler]
   (let [color (random-color)
@@ -19,7 +20,10 @@
       [:form.inline-block {:on-submit (fn [e]
                                         (.preventDefault e)
                                         (create-org @form
-                                                    on-close-handler
+                                                    (do
+                                                      (on-close-handler)
+                                                      (fn [res]
+                                                        (fetchers/fetch-orgs! last)))
                                                     #(reset! error true)))}
        [:div.inline-block
         [utils/color-picker-patch

src/cljs/villagebookUI/components/dashboard.cljs

@@ -2,9 +2,9 @@
   (:require [villagebookUI.components.sidebar :refer [sidebar]]
             [villagebookUI.components.main-content :refer [main-content]]))
 
-(defn dashboard []
-  (let []
-    (fn []
-      [:div
-       [sidebar]
-       [main-content]])))
+(defn dashboard [on-mount-cb]
+  (on-mount-cb)
+  (fn []
+    [:div
+     [sidebar]
+     [main-content]]))

src/cljs/villagebookUI/components/login.cljs

@@ -2,8 +2,9 @@
   (:require [reagent.core :as r]
             [accountant.core :as accountant]
 
+            [villagebookUI.fetchers :as fetchers]
             [villagebookUI.api.auth :as auth]
-            [villagebookUI.store :as store]))
+            [villagebookUI.store.user :as user-store]))
 
 (defn validate!
   [elementID formdata]
@@ -27,7 +28,7 @@
   (let [formdata (r/atom {})
         error    (r/atom {})]
     (fn []
-      (if @store/user
+      (if (user-store/read)
         (do
           (accountant/navigate! "/dashboard")
           [:div])
@@ -46,6 +47,7 @@
                           (:user @formdata)
                           (fn [res]
                             (swap! error assoc :message "")
+                            (fetchers/fetch-user!)
                             (accountant/navigate! "/dashboard"))
                           (fn [res]
                             (swap! error assoc :message (:response res)))))}

src/cljs/villagebookUI/components/main_content.cljs

@@ -1,5 +1,7 @@
-(ns villagebookUI.components.main-content)
+(ns villagebookUI.components.main-content
+  (:require [villagebookUI.store.organisations :as org-store]))
 
 (defn main-content []
   [:div.main-content
-   [:div.navbar]])
+   [:div.navbar
+    [:h5 (:name (org-store/get-selected))]]])

src/cljs/villagebookUI/components/sidebar.cljs

@@ -2,7 +2,7 @@
   (:require [reagent.core :as r]
             [villagebookUI.components.utils :as utils]
             [villagebookUI.components.create-org :refer [org-creation-form]]
-            [villagebookUI.api.organisation :as org]))
+            [villagebookUI.store.organisations :as org-store]))
 
 (defn sidebar []
   (let [creating-org (r/atom false)]
@@ -13,12 +13,17 @@
          [:p.sidebar-logo "villagebook"]
          [:div.divider]]
         [:div.sidebar-section
-         [:p.sidebar-section-head "Organisations"]
+         [:p.sidebar-section-head "Your organisations"]
          [:ul.sidebar-section-list
-          [:li.item
-           [:a.sidebar-link [utils/patch "#5fcc5f"] "Org 1"]]
-          [:li.item
-           [:a.sidebar-link [utils/patch "#ff8383"] "Org 2"]]
+          (doall
+           (for [org  (org-store/get-all)
+                 :let [id (:id org)]]
+             [:li.item {:key   (:id org)
+                        :class (if (= id (:id (org-store/get-selected)))
+                                 [:active])}
+              [:a.sidebar-link {:href (str "/orgs/" id)}
+               [utils/patch (:color org)]
+               (:name org)]]))
           [:li.item
            (if @creating-org
              [org-creation-form #(reset! creating-org false)]

src/cljs/villagebookUI/components/signup.cljs

@@ -1,10 +1,11 @@
 (ns villagebookUI.components.signup
   (:require [reagent.core :as r]
-            [reagent.session :as session]
             [accountant.core :as accountant]
 
+            [villagebookUI.fetchers :as fetchers]
             [villagebookUI.api.auth :as auth]
-            [villagebookUI.store :as store]))
+            [villagebookUI.api.user :as user-api]
+            [villagebookUI.store.user :as user-store]))
 
 (defn validate!
   [elementID formdata]
@@ -28,7 +29,7 @@
   (let [formdata (r/atom {})
         error    (r/atom {})]
     (fn []
-      (if @store/user
+      (if (user-store/read)
         (do
           (accountant/navigate! "/dashboard")
           [:div])
@@ -49,6 +50,7 @@
                           (:user @formdata)
                           (fn [res]
                             (swap! error assoc :message "")
+                            (fetchers/fetch-user!)
                             (accountant/navigate! "/dashboard"))
                           (fn [res]
                             (swap! error assoc :message (:response res)))))}

src/cljs/villagebookUI/core.cljs

@@ -1,30 +1,32 @@
 (ns villagebookUI.core
   (:require [reagent.core :as r]
-            [reagent.session :as session]
             [accountant.core :as accountant]
             [bidi.bidi :as bidi]
 
+            [villagebookUI.fetchers :as fetchers]
             [villagebookUI.routes :refer [routes]]
-            [villagebookUI.store :as store]))
+            [villagebookUI.store.core :as store]
+            [villagebookUI.store.session :as session]))
 
 (accountant/configure-navigation!
  {:nav-handler (fn [path]
                  (let [matched-route (bidi/match-route routes path)
                        current-page  (:handler matched-route)
                        route-params  (:route-params matched-route)]
-                   (session/put! :route {:current-page current-page
-                                         :route-params route-params})))
+                   (session/set! {:current-page current-page
+                                  :route-params route-params})))
   :path-exists? (fn [path]
                   (boolean (bidi/match-route routes path)))})
 
 (defn root []
   "Root component holding all other components"
-  (let [component (:current-page (session/get :route))]
+  (let [component (session/current-page)]
     [component]))
 
 (defn main! []
+  (store/init!)
+  (fetchers/fetch-user!)
   (accountant/dispatch-current!)
-  (store/init)
   (r/render [root]
             (.getElementById js/document "villagebook-app")))
 

src/cljs/villagebookUI/fetchers.cljs

@@ -0,0 +1,24 @@
+(ns villagebookUI.fetchers
+  (:require [villagebookUI.store.user :as user-store]
+            [villagebookUI.api.user :as user-api]
+            [villagebookUI.store.organisations :as org-store]
+            [villagebookUI.api.organisation :as org-api]))
+
+
+(defn fetch-user! []
+  (user-api/get-data
+   (fn [res]
+     (user-store/add! res))
+   (fn [res]
+     (user-store/add! nil))
+   #(user-store/fetched!)))
+
+(defn fetch-orgs!
+  [& [selector-fn]]
+  (org-api/get-all
+   (fn [res]
+     (org-store/add-all! res)
+     (when selector-fn
+       (org-store/set-selected!
+        (selector-fn (org-store/get-all)))))
+   identity))

src/cljs/villagebookUI/helpers.cljs

@@ -1,4 +1,5 @@
-(ns villagebookUI.helpers)
+(ns villagebookUI.helpers
+  (:require [villagebookUI.store.session :as session]))
 
 (defn random-color []
   (str "hsl(" (->> (.random js/Math)
@@ -9,3 +10,8 @@
   [el handler]
   (if (= (.-key el) "Escape")
     (handler)))
+
+(defn org-id-from-url []
+  (-> (session/route-params)
+      :org-id
+      js/parseInt))

src/cljs/villagebookUI/middleware.cljs

@@ -1,13 +1,13 @@
 (ns villagebookUI.middleware
-  (:require [villagebookUI.store :as store]
+  (:require [villagebookUI.store.user :as user-store]
             [villagebookUI.components.utils :as utils]
             [villagebookUI.components.login :refer [login]]))
 
 (defn require-login
-  [component]
+  [component & props]
   (fn []
-    (if (store/fetched?)
-      (if @store/user
-        [component]
+    (if (user-store/fetched?)
+      (if (user-store/read)
+        [(apply component props)]
         [login])
       [utils/loading])))