clyne/bitgloo-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move content code to separate file

Browse Source
This commit is contained in:
Clyne 2023-05-22 09:21:21 -04:00
parent cacf536651
commit f022f75dad
Signed by: clyne
GPG Key ID: 3267C8EBF3F9AFC7
3 changed files with 44 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
project.clj
View File

@ -1,4 +1,4 @@
(defproject bitgloo-web "0.2"
(defproject bitgloo-web "0.3"
:description "bitgloo website framework"
:url "https://bitgloo.com"
:license {:name "GPL-3.0-or-later" :url "https://www.gnu.org/licenses/gpl-3.0.en.html"}

36
src/bitgloo_web/content.clj Normal file
View File

@ -0,0 +1,36 @@
(ns bitgloo-web.content
(:gen-class)
(:require [clojure.java.io :as io])
(:require [clojure.string :as str])
(:require [hiccup.page :as page])
(:require [markdown.core :refer [md-to-html-string]]))
(def page-header
[:div#title-container
[:a {:href "/"}
[:img#logo {:src "/logo.jpg" :alt "bitgloo logo"}]
[:h1 "bitgloo"]]])
(def page-footer [:div#footer [:span "© Clyne Sullivan 2023"]])
(def page-not-found [:div "Page not found"])
(defn md-file? [path] (str/ends-with? path ".md"))
(defn get-file-list [path] (->> path io/file .listFiles sort))
(defn parse-md-file [file] (-> file slurp md-to-html-string))
(defn render-md-files [file-list] (for [f file-list] [:div.block (parse-md-file f)]))
(defn load-page-contents [path]
(let [file-list (filter md-file? (get-file-list path))]
(if (empty? file-list)
page-not-found
[:div#posts (render-md-files file-list)])))
(defn load-page [path]
(page/html5
[:head [:title "bitgloo"] (page/include-css "/main.css")]
[:body [:div#container page-header (load-page-contents path) page-footer]]))

44
src/bitgloo_web/core.clj
View File

@ -1,55 +1,25 @@
(ns bitgloo-web.core
(:gen-class)
(:require [clojure.java.io :as io])
(:require [bitgloo-web.content :as content])
(:require [clojure.string :as str])
(:require [hiccup.core :as hiccup])
(:require [hiccup.page :as page])
(:require [ring.adapter.jetty :refer [run-jetty]])
(:require [ring.middleware.resource :refer [wrap-resource]])
(:require [ring.middleware.content-type :refer [wrap-content-type]])
(:require [ring.middleware.not-modified :refer [wrap-not-modified]])
(:require [ring.util.response :as resp])
(:require [markdown.core :refer [md-to-html-string]]))
(:require [ring.util.response :as resp]))
(def image-extensions [".jpg" ".bmp"])
(def page-header
[:div#title-container
[:a {:href "/"}
[:img#logo {:src "/logo.jpg" :alt "bitgloo logo"}]
[:h1 "bitgloo"]]])
(def page-footer [:div#footer [:span "© Clyne Sullivan 2023"]])
(def page-not-found [:div "Page not found"])
(defn md-file? [path] (str/ends-with? path ".md"))
(defn image? [path] (some (partial str/ends-with? path) image-extensions))
(defn get-file-list [path] (->> path io/file .listFiles sort))
(defn parse-md-file [file] (-> file slurp md-to-html-string))
(defn render-md-files [file-list] (for [file file-list] [:div.block (parse-md-file file)]))
(defn load-page-contents [path]
(let [file-list (filter md-file? (get-file-list path))]
(if (empty? file-list)
page-not-found
[:div#posts (render-md-files file-list)])))
(defn load-page [path content-path]
(let [true-path (str content-path (if (= 1 (count path)) "/home" path))]
(hiccup/html
(page/html5
[:head [:title "bitgloo"] (page/include-css "/main.css")]
[:body [:div#container page-header (load-page-contents true-path) page-footer]]))))
(defn home-redirect [uri] (if (= "/" uri) "/home" uri))
(defn request-handler [content-path request]
(when (= :get (:request-method request))
(-> request
:uri
(load-page content-path)
(-> (:uri request)
(home-redirect)
((partial str content-path))
(content/load-page)
(resp/response)
(resp/content-type "text/html")
(resp/charset "utf8"))))