Merge branch 'develop' of https://github.com/status-im/open-bounty into 193-hide-myself

project.clj

@@ -69,7 +69,6 @@
             [lein-auto "0.1.2"]
             [lein-less "1.7.5"]
             [lein-shell "0.5.0"]
-            [cider/cider-nrepl "0.15.0-SNAPSHOT"]
             [lein-sha-version "0.1.1"]]
 
 

src/clj/commiteth/core.clj

@@ -1,7 +1,7 @@
 (ns commiteth.core
   (:require [commiteth.handler :as handler]
             [clojure.tools.nrepl.server :as nrepl-server]
-            [cider.nrepl :refer [cider-nrepl-handler]]
+            [luminus.repl-server :as repl]
             [luminus.http-server :as http]
             [luminus-migrations.core :as migrations]
             [commiteth.config :refer [env]]
@@ -31,7 +31,7 @@ repl-server
   (when-let [nrepl-port (env :nrepl-port)]
     (log/info "Starting NREPL server on port" nrepl-port)
     (nrepl-server/start-server :port nrepl-port
-                               :handler cider-nrepl-handler))
+                               :handler nrepl-server/default-handler))
   :stop
   (when repl-server
     (nrepl-server/stop-server repl-server)))

src/cljs/commiteth/bounties.cljs

@@ -8,7 +8,8 @@
             [commiteth.handlers :as handlers]
             [commiteth.db :as db]
             [commiteth.ui-model :as ui-model]
-            [commiteth.subscriptions :as subs]))
+            [commiteth.subscriptions :as subs]
+            [commiteth.util :as util]))
 
 
 (defn bounty-item [bounty]
@@ -207,8 +208,11 @@
     [:div
      (let [left  (inc (* (dec page-number) items-per-page))
            right (dec (+ left item-count))]
-       [:div.item-counts-label
+       [:div.item-counts-label-and-sorting-container
-        [:span (str "Showing " left "-" right " of " total-count)]])
+        [:div.item-counts-label
+         [:span (str "Showing " left "-" right " of " total-count)]]
+        (when-not (util/os-windows?)
+          [bounties-sort-view])])
      (display-data-page bounty-page-data bounty-item container-element)]))
 
 (defn bounties-page []
@@ -223,8 +227,7 @@
         [:div.ui.container.open-bounties-container
          {:ref #(reset! container-element %1)}
          [:div.open-bounties-header "Bounties"]
-         [:div.open-bounties-filter-and-sort
+         (when-not (util/os-windows?)
-          [bounty-filters-view]
+           [:div.open-bounties-filter-and-sort
-          [bounties-sort-view]]
+            [bounty-filters-view]])
-         [bounties-list @bounty-page-data container-element]]))
+         [bounties-list @bounty-page-data container-element]]))))
-    ))

src/cljs/commiteth/core.cljs

@@ -208,12 +208,12 @@
        [:div.ui.vertical.segment
         [:div.ui.container
          [:div.ui.grid.stackable
-          [:div {:class (str (if (show-top-hunters?) "ten" "sixteen")
+          [:div {:class (str (if (show-top-hunters?) "eleven" "sixteen")
                              " wide computer sixteen wide tablet column")}
            [:div.ui.container
             [(pages @current-page)]]]
           (when (show-top-hunters?)
-            [:div.six.wide.column.computer.only
+            [:div.five.wide.column.computer.only
              [:div.ui.container.top-hunters
               [:h3.top-hunters-header "Top 5 hunters"]
               [:div.top-hunters-subheader "All time"]

src/cljs/commiteth/util.cljs

@@ -0,0 +1,5 @@
+(ns commiteth.util
+  (:require [clojure.string :as string]))
+
+(defn os-windows? []
+  (string/includes? (-> js/navigator .-platform) "Win"))

src/less/style.less

@@ -422,6 +422,11 @@ label[for="input-hidden"] {
         color: #42505c;
     }
 
+    .item-counts-label-and-sorting-container {
+        display: flex;
+        justify-content: space-between;
+    }
+
     .open-bounties-filter-and-sort {
         margin-top: 24px;
         display: flex;
@@ -450,6 +455,7 @@ label[for="input-hidden"] {
         margin-right: 10px;
         position: relative;
         display: flex;
+        z-index: 1000;
 
         .text {
             margin: 8px 12px;
@@ -677,7 +683,7 @@ label[for="input-hidden"] {
         font-weight: 500;
         line-height: 1.0;
         color: #8d99a4;
-        padding: 8px 12px;
+        padding: 16px 12px 0;
         display: flex;
         align-items: center;
     }
@@ -719,6 +725,10 @@ label[for="input-hidden"] {
     }
 }
 
+.open-bounty-item:first-child {
+    border-top: #eaecee 1px solid !important;
+}
+
 .open-bounty-item {
     background-color: #fff;
     display: flex;
@@ -1275,12 +1285,11 @@ body {
 }
 
 .item-counts-label {
-  margin: auto;
+  //margin: auto;
 	font-family: "PostGrotesk-Book";
 	font-size: 15px;
 	color: #8d99a4;
-  padding-top: 8px;
+    padding-top: 20px;
-  padding-bottom: 8px;
 }