Add: "ignore" to word comfort levels.

Author: teesloane

src/app/renderer/components.cljs

@@ -263,18 +263,21 @@
                   :on-change     (fn [e] (swap! form assoc :translation (-> e .-target .-value)))}]
 
           ;; radio button
-          [:div.my-2.flex.md:flex-col.xl:flex-row.xl:justify-between
+          [:div.my-2.flex.md:flex-col.lg:flex-row.xl:justify-between.flex-wrap
            (doall ;; needed for deref (@) in lazy for loop.
             (for [[comfort-int comfort-data] u/comfort-text-and-col
-                  :let                       [{:keys [name text-col]} comfort-data]]
-              [:span.flex.xl:justify-between.items-center.mr-2 {:key comfort-int}
+                  :let                       [{:keys [name text-col help-text]} comfort-data]]
+              [:span {:class "flex items-center lg:w-1/2 xl:w-1/3"
+                      :key comfort-int}
                [:input {:id        name
                         :type      "radio"
                         :value     comfort-int
                         :name      "group-1"
                         :checked   (= (@form :comfort) comfort-int)
                         :on-change (fn [e] (swap! form assoc :comfort (-> e .-target .-value int)))}]
-               [:label {:for name :class (str "text-sm p-0.5 pl-1 " text-col)} (str name "(" (+ 1 comfort-int) ")")]]))]
+               [:label {:for name
+                        :title help-text
+                        :class (str "text-sm p-0.5 pl-1 pr-2 " text-col)} (str name "(" (+ 1 comfort-int) ")")]]))]
 
           ;; submit update
           [:div.mt-4 [button {:type "submit"

src/app/renderer/events.cljs

@@ -144,7 +144,7 @@
 (r-fx :key-pressed-num
       (fn [{:keys [db]} event]
         (let [last-key              (-> event last last)
-              key->comfort-val      {49 0 50 1 51 2 52 3 53 4}
+              key->comfort-val      {49 0 50 1 51 2 52 3 53 4 54 5}
               current-word          (-> db :current-word)
               new-word-with-comfort (assoc current-word :comfort (get key->comfort-val (last-key :keyCode)))]
           (when (u/curr-word-view-open? db)

src/app/renderer/re_pressed.cljs

@@ -285,7 +285,7 @@
    :event-keys [[[:key-pressed-right] [{:keyCode 39}]] ;; right arrow pressed once.
                 [[:key-pressed-left]  [{:keyCode 37}]] ;; left arrow pressed
                 [[:key-pressed-shift]     [{:keyCode 16}]]
-                [[:key-pressed-num] [{:keyCode 49}]  [{:keyCode 50}]  [{:keyCode 51}]  [{:keyCode 52}] [{:keyCode 53}]]
+                [[:key-pressed-num] [{:keyCode 49}]  [{:keyCode 50}]  [{:keyCode 51}]  [{:keyCode 52}] [{:keyCode 53}] [{:keyCode 54}]]
                 ]
    :clear-keys           [] ;; takes a collection of key combos that, if pressed, will clear the recorded keys  [{:keycode 27}]
    :always-listen-keys   [] ;; takes a collection of keys that will always be recorded (regardless if the user is typing in an input, select, or textarea)

src/app/shared/util.cljs

@@ -15,19 +15,37 @@
     (apply prn args)))
 
 (def comfort-text-and-col
-  {0 {:name "Unknown" :text-col "text-gray-800 dark:text-gray-200"   :bg-col "bg-gray-300 dark:bg-gray-800"}
-   1 {:name "Hard"    :text-col "text-red-500"    :bg-col "bg-red-300"}
-   2 {:name "Medium"  :text-col "text-yellow-500" :bg-col "bg-yellow-300"}
-   3 {:name "Easy"    :text-col "text-green-600"  :bg-col "bg-green-300"}
-   4 {:name "Known"   :text-col "text-black dark:text-gray-500"      :bg-col "bg-white dark:bg-gray-900"}})
+  {0 {:name      "Unknown"
+      :text-col  "text-gray-800 dark:text-gray-200"
+      :bg-col    "bg-gray-300 dark:bg-gray-800"
+      :help-text "A word with no comfort or translation assigned."}
+   1 {:name      "Hard"
+      :text-col  "text-red-500"
+      :bg-col    "bg-red-300"
+      :help-text "A difficult word you are in the process of learning."}
+   2 {:name      "Medium"
+      :text-col  "text-yellow-500"
+      :bg-col    "bg-yellow-300"
+      :help-text "A word you know fairly well."}
+   3 {:name      "Easy"
+      :text-col  "text-green-600"
+      :bg-col    "bg-green-300"
+      :help-text "A word that you almost always remember."}
+   4 {:name      "Known"
+      :text-col  "text-black dark:text-gray-200"
+      :bg-col    "bg-white dark:bg-gray-900"
+      :help-text "A well known word that you don't need to study."}
+   5 {:name      "Ignore"
+      :text-col  "text-gray-500 dark:text-gray-400"
+      :bg-col    "bg-gray-50 dark:bg-gray-900"
+      :help-text "Ignore this word (ex: proper nouns, untranslateable words etc.)"}})
 
 (defn get-comfort-level-name [idx]
   (-> idx comfort-text-and-col :name))
 
 (defn get-comfort-bg-col [idx]
   (-> idx comfort-text-and-col :bg-col))
 
-
 (defn split-article
   "Splits a string by whitespace and punctuation"
   [string]
@@ -113,13 +131,11 @@
   (when ts
     (-> ts js/Date. (.toLocaleDateString))))
 
-
 ;; class light + dark
 (defn twld
   "Takes two strings, and adds dark mode to the end class"
   [a b]
-  (let [
-        with-dark (->> (str/split b " ")
+  (let [with-dark (->> (str/split b " ")
                        (map (fn [s] (str "dark:" s)))
                        (str/join " "))]
     (str a " " with-dark)))
@@ -146,7 +162,6 @@
                             (assoc :capture-buffer []))
                         (-> acc
                             (assoc :out (into [] (concat (acc :out) (acc :capture-buffer) [curr])))
-                            (assoc :capture-buffer [])))
-                      )))
-                {:out [] :capture-buffer [] } word-data)]
+                            (assoc :capture-buffer []))))))
+                {:out [] :capture-buffer []} word-data)]
     (res :out)))