Merge pull request #8550 from jwarwick/ui_stuff

Author: NoahTheDuke

src/clj/web/admin.clj

@@ -206,20 +206,6 @@
       (ws/broadcast-to! [uid] :admin/fetch-users {:success users}))
     (ws/broadcast-to! [uid] :admin/fetch-users {:error "Not allowed"})))
 
-(defn features-handler [{db :system/db}]
-  (let [config (mc/find-one-as-map db "config" nil)
-        features (:features config {})]
-    (response 200 {:message "ok" :features features})))
-
-(defn features-update-handler [{db :system/db
-                                {version :version} :body}]
-  (if-not (empty? version)
-    (do
-      (reset! frontend-version version)
-      (mc/update db "config" {} {$set {:version version}})
-      (response 200 {:message "ok" :version version}))
-    (response 400 {:message "Missing version item"})))
-
 (defmethod ws/-msg-handler :admin/block-game-creation
   admin--block-game-creation
   [{{user :user} :ring-req

src/clj/web/api.clj

@@ -28,7 +28,7 @@
 
 (add-encoder org.bson.types.ObjectId encode-str)
 
-(def paths ["" "chat" "cards" "deckbuilder" "play" "help" "account" "stats" "about" "tournament" "admin" "users" "prizes" "features"])
+(def paths ["" "chat" "cards" "deckbuilder" "play" "help" "account" "stats" "about" "tournament" "admin" "users" "prizes"])
 
 (defn base-routes []
   (ring/router
@@ -127,9 +127,7 @@
       ["/version" {:get #'admin/version-handler
                    :put #'admin/version-update-handler}]
       ["/banned" {:get #'admin/banned-message-handler
-                   :put #'admin/banned-message-update-handler}]
-      ["/features" {:get #'admin/features-handler
-                    :put #'admin/features-update-handler}]]]
+                   :put #'admin/banned-message-update-handler}]]]
     {:reitit.middleware/registry
      {::auth auth/wrap-authentication-required
       ::tournament-auth auth/wrap-tournament-auth-required

src/cljs/nr/account.cljs

@@ -336,7 +336,6 @@
                             {:name "Igpay Atinlay" :ref "la-pig"}]]
                 [:option {:value (:ref option) :key (:ref option)} (:name option)]))]
            [:div [tr-span [:settings_language-tip "Some languages are not fully translated yet. If you would like to help with translations, please contact us."]]]]
-           [:div [tr-span [:settings_language-tip "Some languages are not fully translated yet. If you would like to help with translations, please contact us."]]]]
 
           [:section
            [tr-element :h3 [:settings_card-language "Card language"]]
@@ -727,7 +726,7 @@
           [api-keys s]
 
           [:section
-           [:span.flash-message (:flash-message @s)]]])})))
+           [:span.flash-message (:flash-message @s)]]]])})))
 
 (defn account []
   (let [user (r/cursor app-state [:user])

src/cljs/nr/features.cljs

@@ -55,11 +55,7 @@
     :cls "prizes"
     :route "/prizes"
     :show? #(or (:isadmin (:user %))
-                (:ismoderator (:user %)))}
-   {:title [:nav_features "Features"]
-    :cls "features"
-    :route "/features"
-    :show? #(:isadmin (:user %))}])
+                (:ismoderator (:user %)))}])
 
 (def history (Html5History.))
 

src/cljs/nr/navbar.cljs

@@ -7,7 +7,6 @@
    [nr.cardbrowser :refer [card-browser]]
    [nr.chat :refer [chat-page]]
    [nr.deckbuilder :refer [deck-builder]]
-   [nr.features :refer [features]]
    [nr.gameboard.board :refer [gameboard]]
    [nr.help :refer [help]]
    [nr.landing :refer [landing]]
@@ -64,8 +63,6 @@
                 :view admin}]
      ["/users" {:name :nav/users
                 :view users}]
-     ["/features" {:name :nav/features
-                   :view features}]
      ["/landing" {:name :nav/landing
                    :view landing}]]))
 

src/cljs/nr/routes.cljs

@@ -39,6 +39,15 @@ nav ul
     li.active a
         color: gold-base
 
+    li.active#tournaments-nav a
+        color: gold-base
+
+    #tournaments-nav a
+        color: blue-light
+
+        &:hover
+            color: gold-base
+
     li.active#admin-nav a
         margin-left: 30px
         color: gold-base
@@ -53,11 +62,11 @@ nav ul
             &:hover
                 color: gold-base
 
-    li.active#features-nav a,
+    li.active#prizes-nav a,
     li.active#users-nav a
         color: gold-base
 
-    #features-nav a,
+    #prizes-nav a,
     #users-nav a
         color: yellow-light