From 1ef117de296194d4b8189e566e1ef14abb9917c7 Mon Sep 17 00:00:00 2001
From: rdiedrich <email@rdiedrich.org>
Date: Wed, 24 Jun 2020 16:06:31 +0200
Subject: [PATCH] nrepl, linting, refactoring

---
 project.clj             |  3 ++-
 src/clojsa/saclient.clj |  3 +--
 src/clojsa/views.clj    | 50 +++++++++++++++++++++--------------------
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/project.clj b/project.clj
index 5f1c9bd..3128051 100644
--- a/project.clj
+++ b/project.clj
@@ -10,7 +10,8 @@
                  [hickory "0.7.1"]
                  [environ "1.1.0"]]
   :plugins [[lein-ring "0.12.5"]]
-  :ring {:handler clojsa.handler/app}
+  :ring {:handler clojsa.handler/app
+         :nrepl {:start? true :port 9000}}
   :uberjar-name "clojsa-standalone.jar"
   :profiles
   {:dev {:dependencies [[javax.servlet/servlet-api "2.5"]
diff --git a/src/clojsa/saclient.clj b/src/clojsa/saclient.clj
index 46a4ca9..4434b90 100644
--- a/src/clojsa/saclient.clj
+++ b/src/clojsa/saclient.clj
@@ -1,6 +1,5 @@
 (ns clojsa.saclient
-  (:require [clojure.string :as string]
-            [http.async.client :as http]))
+  (:require [http.async.client :as http]))
 
 
 (def url "https://forums.somethingawful.com/")
diff --git a/src/clojsa/views.clj b/src/clojsa/views.clj
index f347330..73a317a 100644
--- a/src/clojsa/views.clj
+++ b/src/clojsa/views.clj
@@ -1,8 +1,6 @@
 (ns clojsa.views
   (:use [hiccup core page])
-  (:require [clojure.string :as string]
-            [clojure.pprint]
-            [clojure.java.io :as io]
+  (:require [clojure.pprint]
             [ring.util.anti-forgery :refer [anti-forgery-field]]))
 
 
@@ -46,38 +44,42 @@
       [:label.label {:for "username"}
        "username"]
       [:div.control
-       [:input#username.input {:name "username" :type "text" :placeholder "enter your username"}]]]
+       [:input#username.input {:name "username" :type "text"
+                               :placeholder "enter your username"}]]]
      [:div.field
       [:label.label {:for "password"}
        "password"]
       [:div.control
-       [:input#password.input {:name "password" :type "password" :placeholder "enter your password"}]]]
+       [:input#password.input {:name "password" :type "password"
+                               :placeholder "enter your password"}]]]
      [:div.field
       [:div.control
        [:button.button.is-primary "Submit"]]]]]))
 
 (defn paginate [base cur last]
-  [:nav.container.box.pagination {:hx-boot "false"}
-   [:a.pagination-previous
-    {:href (format "%s?page=%d" base (dec cur))} "<"]
-   [:a.pagination-next
-    {:href (format "%s?page=%d" base (inc cur))} ">"]
-   [:ul.pagination-list
-    [:li
-     [:a.pagination-link
-      {:href (format "%s?page=%d" base 1)} (str 1)]]
-    [:li
-     [:span.pagination-ellipsis "&hellip;"]]
-    (for [i (range (- cur 2) (+ cur 3))]
+  (let [page-fstring "%s?page=%d"
+        href (partial format page-fstring base)]
+    [:nav.container.box.pagination {:hx-boot "false"}
+     [:a.pagination-previous
+      {:href (href (dec cur))} "<"]
+     [:a.pagination-next
+      {:href (href (inc cur))} ">"]
+     [:ul.pagination-list
       [:li
        [:a.pagination-link
-        {:href (format "%s?page=%d" base i)
-         :class (when (= i cur) "is-current")} (str i)]])
-    [:li
-     [:span.pagination-ellipsis "&hellip;"]]
-    [:li
-     [:a.pagination-link
-      {:href (format "%s?page=%d" base last)} (str last)]]]])
+        {:href (href 1)} (str 1)]]
+      [:li
+       [:span.pagination-ellipsis "&hellip;"]]
+      (for [i (range (- cur 2) (+ cur 3))]
+        [:li
+         [:a.pagination-link
+          {:href (href i)
+           :class (when (= i cur) "is-current")} (str i)]])
+      [:li
+       [:span.pagination-ellipsis "&hellip;"]]
+      [:li
+       [:a.pagination-link
+        {:href (href last)} (str last)]]]]))
 
 (defn thread-page [thread]
   (let [{:keys [id title page page-count content]} thread]