prefer namespaces in src as most expected place

Author: timothypratley

.gitignore

@@ -1,5 +1,5 @@
 /temp
-/site/*/**
+/site/*/
 .clj-kondo/
 .quarto/
 _site/

README.md

@@ -1,14 +1,15 @@
 # Clojure Civitas
 
-<img src="notebooks/images/civitas-icon.svg" alt="Civitas Icon" align="right">
+<img src="src/images/civitas-icon.svg" alt="Civitas Icon" align="right">
 
 An open effort to structure learning resources with meaningful connections.
 
 ⚡ No setup – Clone this repo, make a new namespace, start coding.
 
 ✍️ Write as you code – Capture notes, results, and ideas as you go as comments.
 
-🚀 Easy to share – Create a Pull Request, once merged it appears on the [Clojure Civitas Website](https://clojurecivitas.github.io).
+🚀 Easy to share – Create a Pull Request, once merged it appears on
+the [Clojure Civitas Website](https://clojurecivitas.github.io).
 
 🧠 Build shared knowledge – Your work becomes part of a community resource.
 
@@ -26,11 +27,12 @@ See [About Clojure Civitas](https://clojurecivitas.github.io/about).
 Your perspective matters.
 Pull Requests invited, that's the point!
 
-### Creating notebooks
+### Creating posts and pages
 
-Add a Clojure namespace or markdown file in the [`/notebooks`](notebooks) folder.
+Add a Clojure namespace or markdown file in the [`/src`](src) folder.
 
 Add metadata on your namespace to set the title, author, and tags.
+
 ```clojure
 ^{:kindly/hide-code true                 ; don't show this code in the notebook
   :clay             {:title  "About Civitas Metadata"
@@ -59,7 +61,8 @@ unless a different image is listed in the metadata.
  :many-others ["see the examples" "creative uses" "visual variety"]}
 ```
 
-**Optional:** [Setup your editor with Clay shortcuts](https://scicloj.github.io/clay/#setup) to visualize the notebook as you write.
+**Optional:** [Setup your editor with Clay shortcuts](https://scicloj.github.io/clay/#setup) to visualize the notebook
+as you write.
 
 **Optional:** Preview the final website.
 
@@ -84,11 +87,13 @@ To create a pull request
 3. push the branch to your fork
 4. and then open a pull request on GitHub to propose merging your changes into the Civitas main branch.
 
-Please contact [@timothypratley](https://github.com/timothypratley) if you are having any difficulty submitting a notebook.
+Please contact [@timothypratley](https://github.com/timothypratley) if you are having any difficulty submitting a
+notebook.
 
 ### See your page views
 
-Publicly available [page view analytics](https://clojurecivitas.goatcounter.com/) indicate how widely your notebook is being shared.
+Publicly available [page view analytics](https://clojurecivitas.goatcounter.com/) indicate how widely your notebook is
+being shared.
 
 ### Building the database
 
@@ -160,19 +165,18 @@ Differentiation between posts, pages, and presentations is by `type` metadata (a
 
 ### File system organization
 
-| Directory   | Description                                                          |
-|-------------|----------------------------------------------------------------------|
-| `src`       | Code for building a website and database                             |
-| `notebooks` | Source root for notebooks (Clojure and Markdown), images, data files |
-| `site`      | Static assets of the Quarto website                                  |
+| Directory | Description                                                          |
+|-----------|----------------------------------------------------------------------|
+| `src`     | Source root for notebooks (Clojure and Markdown), images, data files |
+| `site`    | Static assets of the Quarto website                                  |
 
-Non-Clojure files in `notebooks` will be synced to `site`.
-Shared images can go in `images`, but prefer placing images and data files as siblings to your namespace under
-`notebooks`.
-All Clojure and Non-Clojure files in `notebooks` should go under a subdirectory,
+Non-Clojure files in `src` will be synced to `site`.
+Shared images can go in `src/images`,
+but prefer placing images and data files as siblings to your namespace under `src`.
+All files in `src` should go under a subdirectory,
 so that it is clear they are not part of the static configuration of `site`.
-When building the site, Clojure namespaces are built to markdown files under `site/{my/namespaced/notebook.qmd}`.
-Subdirectories of `site` are gitignored and considered temporary build artifacts, safe to clean up.
+Clojure namespaces are built to markdown files under `site/{my/namespaced/notebook.qmd}`.
+Subdirectories of `site` are git ignored and considered temporary build artifacts, safe to clean up.
 Quarto builds all the markdown into HTML in `_site` for preview and deploy.
 While developing, Clay uses `temp` to build and serve HTML files.
 

clay.edn

@@ -1,6 +1,6 @@
 {:base-target-path "temp"
- :base-source-path "notebooks"
- :subdirs-to-sync  ["notebooks"]
+ :base-source-path "src"
+ :subdirs-to-sync  ["src"]
  :sync-as-subdirs  false
  :flatten-targets  false
  :remote-repo      {:git-url "https://github.com/ClojureCivitas/clojurecivitas.github.io"

deps.edn

@@ -1,4 +1,4 @@
-{:paths ["src" "notebooks"]
+{:paths ["src"]
 
  :deps
  {org.clojure/clojure                         {:mvn/version "1.12.0"}
@@ -22,7 +22,8 @@
   ;; Run Clay in watch mode with `clojure -J-Dclojure.main.report=stderr -M:clay`
   :clay  {:main-opts ["-m" "scicloj.clay.v2.main"]}
   ;; When debugging libraries
-  :local {:override-deps {org.scicloj/clay {:local/root "../clay"}}}
+  :local {:override-deps {org.scicloj/clay          {:local/root "../clay"}
+                          org.scicloj/kindly-advice {:local/root "../kindly-advice"}}}
   ;; $ clojure -T:build test
   ;; $ clojure -T:build ci
   :build {:deps       {io.github.clojure/tools.build

notebooks/civitas/explorer.clj src/civitas/explorer.cljnotebooks/civitas/explorer.clj renamed to src/civitas/explorer.clj

@@ -10,7 +10,7 @@
 
 (defn source-path-for [{:keys [topics id] :as notebook}]
   {:pre [id (seq topics)]}
-  (str (fs/path "notebooks"
+  (str (fs/path "src"
                 (str (symbol (first topics)))
                 (str id ".md"))))
 
@@ -35,22 +35,21 @@
    [:url {:optional true} :string]])
 
 (def BlogPostFrontmatter
-  (def BlogPostFrontmatter
-    [:map {:closed true}
-     [:title :string]
-     [:authors {:optional true} [:vector Author]]
-     [:author {:optional true} Author]
-     [:image {:optional true} :string]
-     [:draft {:optional true} :boolean]
-     [:publish-date {:optional true} inst?]
-     [:last-modified-date {:optional true} inst?]
-     [:tags {:optional true} [:vector :string]]
-     [:categories {:optional true} [:vector :string]]
-     [:description {:optional true} :string]
-     [:slug {:optional true} :string]
-     [:canonical-url {:optional true} :string]
-     [:keywords {:optional true} [:vector :string]]
-     [:layout {:optional true} :string]]))
+  [:map {:closed true}
+   [:title :string]
+   [:authors {:optional true} [:vector Author]]
+   [:author {:optional true} Author]
+   [:image {:optional true} :string]
+   [:draft {:optional true} :boolean]
+   [:publish-date {:optional true} inst?]
+   [:last-modified-date {:optional true} inst?]
+   [:tags {:optional true} [:vector :string]]
+   [:categories {:optional true} [:vector :string]]
+   [:description {:optional true} :string]
+   [:slug {:optional true} :string]
+   [:canonical-url {:optional true} :string]
+   [:keywords {:optional true} [:vector :string]]
+   [:layout {:optional true} :string]])
 
 (def key-descriptions
   {:title              "The title of the blog post. Essential for SEO and user understanding."