User page cleanup

- return single profile from user-profile query
- get rid of global slack-instance var
- move CSS to garden
- make template more straightforward, instead of for+select-keys

Co-authored-by: Ariel Alexi <[email protected]>
Co-authored-by: Arne Brasseur <[email protected]>

Author: 3 people

src/clojurians_log/db/queries.clj

@@ -112,11 +112,11 @@
 (defn user-profile
   "returing all the data about the user acording to the user id slack number"
   [db id]
-  (first (d/q '[:find (pull ?user [*])
-                :in $ ?id
-                :where [?user :user/slack-id ?id]]
-              db
-              id)))
+  (ffirst (d/q '[:find (pull ?user [*])
+                 :in $ ?id
+                 :where [?user :user/slack-id ?id]]
+               db
+               id)))
 
 (defn thread-messages
   "Retrieve all child messages for the given parent threads"

src/clojurians_log/routes.clj

@@ -132,14 +132,13 @@
       views/about
       response/render))
 
-(defn user-profile-route  [{:keys [endpoint] :as request}]
-    (let [db (db-from-endpoint endpoint)]
-      (-> request
-          make-context
-          (assoc :data/user-profile 
-                 (queries/user-profile db (get-in request [:path-params :user-id])))
-          views/user-profile-route
-          response/render)))
+(defn user-profile-route [{:keys [endpoint path-params] :as request}]
+  (let [db (db-from-endpoint endpoint)]
+    (-> request
+        make-context
+        (assoc :data/user-profile (queries/user-profile db (:user-id path-params)))
+        views/user-profile-route
+        response/render)))
 
 (defn sitemap-route [{:keys [endpoint] :as request}]
   (let [config @(get-in endpoint [:config :value])
@@ -166,7 +165,7 @@
   [["/" {:name :clojurians-log.routes/index
          :get index-route}]
    ["/_/_/users/{user-id}" {:name :clojurians-log.routes/user-profile-route
-                          :get user-profile-route}]
+                            :get user-profile-route}]
    ["/x/x/x/about" {:name :clojurians-log.routes/about
                     :get about-route}]
    ["/x/x/x/sitemap" {:name :clojurians-log.routes/sitemap
@@ -178,9 +177,5 @@
    ["/{channel}/{date}" {:name :clojurians-log.routes/channel-date
                          :get log-route}]
    ["/{channel}/{date}/{ts}" {:name :clojurians-log.routes/message :get log-route}]
-   ["/_/stats/{from-date}/{to-date}" {:name :clojurians-log.routes/message-stats 
-                                      :get message-stats-route}]
-
-  ;;  {:conflicts nil}
-   ]
- )
+   ["/_/stats/{from-date}/{to-date}" {:name :clojurians-log.routes/message-stats
+                                      :get message-stats-route}]])

src/clojurians_log/styles.clj

@@ -416,4 +416,28 @@
             :line-height "1.33rem"}]
    [:ul {:padding-left "1rem"}]
    [:li {:list-style-type "disc"}]]
-  )
+
+  [:.user-profile-page
+   [:h2 {:text-align "center"
+         :margin-top "20px"
+         :font-family "sans-serif"}]
+   [:section {:box-shadow "0 4px 8px 0 rgba(0, 0, 0, 0.2)"
+              :max-width "350px"
+              :margin "auto"
+              :text-align "center"
+              :font-family "sans-serif"}]
+   [:img {:width "95%"
+          :border-radius "80%"
+          :padding "8px 0px"}]
+   [:.real-name {:color "grey"
+                 :font-size "18px"}]
+   [:.talk-on-slack {:border "none"
+                     :outline "0"
+                     :display "inline-block"
+                     :padding "8px 0px"
+                     :color "white"
+                     :background-color "#000"
+                     :text-align "center"
+                     :cursor "pointer"
+                     :width "100%"
+                     :font-size "18px"}]])

src/clojurians_log/views.clj

@@ -170,6 +170,11 @@
                              :date future-date})}
         [:div.day-next ">"]])]]])
 
+(defn slack-url [ctx & parts]
+  (apply str
+         (get-in ctx [:request :clojurians-log.application/slack-instance])
+         parts))
+
 (defn- single-message
   "Returns the hiccup of a single message"
   [{:keys [request]
@@ -179,27 +184,25 @@
 
   (let [{:user/keys         [name slack-id]
          :user-profile/keys [display-name real-name image-48]} user]
-    (def slack-instance (:clojurians-log.application/slack-instance request))    
-    
-
     ;; things in the profile
     ;; :image_512 :email :real_name_normalized :image_48 :image_192 :real_name :image_72 :image_24
     ;; :avatar_hash :title :team :image_32 :display_name :display_name_normalized
-    (list [:div.message
-           {:id (cl.tu/format-inst-id inst) :class (when (thread-child? message) "thread-msg")}
-           [:a.message_profile-pic {:href (str slack-instance "/users/x/x/" slack-id) :style (str "background-image: url(" image-48 ");")}]
-           ;;[:a.message_username {:href (str slack-instance "/team/" slack-id)}
-           [:a.message_username {:href (str "/_/_/users/" slack-id)}
-            (some #(when-not (str/blank? %) %) [display-name real-name name])]
-           [:span.message_timestamp [:a {:rel  "nofollow"
-                                         :href (path-for context
-                                                         :clojurians-log.routes/message
-                                                         {:channel (:channel/name channel)
-                                                          :date date
-                                                          :ts ts})}
-                                     (cl.tu/format-inst-time inst)]]
-           [:span.message_star]
-           [:span.message_content [:p (slack-messages/message->hiccup text usernames emojis)]]])))
+    [:div.message
+     {:id (cl.tu/format-inst-id inst) :class (when (thread-child? message) "thread-msg")}
+     [:a.message_profile-pic {:href (slack-url context "/users/x/x/" slack-id)
+                              :style (str "background-image: url(" image-48 ");")}]
+     ;;[:a.message_username {:href (str slack-instance "/team/" slack-id)}
+     [:a.message_username {:href (str "/_/_/users/" slack-id)}
+      (some #(when-not (str/blank? %) %) [display-name real-name name])]
+     [:span.message_timestamp [:a {:rel  "nofollow"
+                                   :href (path-for context
+                                                   :clojurians-log.routes/message
+                                                   {:channel (:channel/name channel)
+                                                    :date date
+                                                    :ts ts})}
+                               (cl.tu/format-inst-time inst)]]
+     [:span.message_star]
+     [:span.message_content [:p (slack-messages/message->hiccup text usernames emojis)]]]))
 
 (defn- message-hiccup
   "Returns either a single message hiccup, or if the given message starts a thread,
@@ -284,22 +287,18 @@
 
 (defn- user-profile-html [context]
   [:html.user-profile-page
-   [:body 
-    [:h2 {:style "text-align:center; margin-top: 20px; font-family: sans-serif;"} "User Profile"]
-    [:div {:style " box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2); max-width: 350px; 
-                   margin: auto; text-align: center; font-family: sans-serif;"}
-
-     (for [[k v] (select-keys (get-in context [:data/user-profile 0])
-                              [:user-profile/display-name :user-profile/real-name :user-profile/image-192 :user/slack-id])
-           :when (-> k)]
-       (case k
-         :user-profile/image-192 [:img {:src v, :style "width:95%; border-radius:80%; padding: 8px 0px;"}]
-         :user-profile/display-name [:h1 v]
-         :user-profile/real-name [:p {:style "color: grey; font-size: 18px;"} v]
-         :user/slack-id [:a {:style "border: none; outline: 0; display: inline-block; padding: 8px 0px; 
-                                    color: white; background-color: #000; text-align: center; cursor: pointer; 
-                                    width: 100%; font-size: 18px;"
-                             :href (str slack-instance "/team/" v )} "let's talk on Slack"]))]]])
+   (page-head context)
+   [:body
+    [:h2 "User Profile"]
+    [:section
+     (let [user-profile (get-in context [:data/user-profile])
+           {:user-profile/keys [display-name real-name image-192]
+            :user/keys [slack-id]} user-profile]
+       (list
+        [:img {:src image-192 :alt (str display-name " avatar")}]
+        [:h1 display-name]
+        [:p.real-name real-name]
+        [:a.talk-on-slack {:href (slack-url context "/team/" slack-id)} "let's talk on Slack"]))]]])
 
 (defn- sitemap-xml [{:data/keys [channel-day-tuples http-origin] :as context}]
   [:urlset {:xmlns "http://www.sitemaps.org/schemas/sitemap/0.9"}
@@ -333,7 +332,7 @@
    [:body
     [:div
      [:h4 "Slack message stats"]
-     [:p 
+     [:p
       [:strong {:style {:border-bottom "1px solid black"}} (:day (first message-stats))]
       " to "
       [:strong {:style {:border-bottom "1px solid black"}} (:day (last message-stats))]]
@@ -369,4 +368,4 @@
   (assoc context :response/xml (sitemap-xml context)))
 
 (defn message-stats-page [context]
-  (assoc context :response/html (message-stats-page-html context)))
+  (assoc context :response/html (message-stats-page-html context)))