Cleanup remaining clj(s) resources

* Move template files into a more organized resources templates dir except for zotero-items.edn which isn't a template * Remove unused favorites templates * Move grammar file which should be in a resource path and not a standard source path
novakda · May 30, 2023 · 5f44d9b · 5f44d9b
1 parent 4c0583c
commit 5f44d9b
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 8 deletions.
diff --git a/deps.edn b/deps.edn
@@ -1,4 +1,4 @@
-{:paths ["src/main" "src/electron" "templates" "src/resources"]
+{:paths ["src/main" "src/electron" "src/resources"]
  :deps
  {org.clojure/clojure                   {:mvn/version "1.11.1"}
   rum/rum                               {:mvn/version "0.12.9"}

diff --git a/src/main/frontend/config.cljs b/src/main/frontend/config.cljs
@@ -339,7 +339,7 @@
 (def custom-css-file "custom.css")
 (def export-css-file "export.css")
 (def custom-js-file "custom.js")
-(def config-default-content (rc/inline "config.edn"))
+(def config-default-content (rc/inline "templates/config.edn"))
 (def config-default-content-md5 (let [md5 (new crypt/Md5)]
                                   (.update md5 (crypt/stringToUtf8ByteArray config-default-content))
                                   (crypt/byteArrayToHex (.digest md5))))

diff --git a/src/main/frontend/handler/global_config.cljs b/src/main/frontend/handler/global_config.cljs
@@ -41,7 +41,7 @@
     (state/set-global-config! config)
     config))
 
-(def default-content (rc/inline "global-config.edn"))
+(def default-content (rc/inline "templates/global-config.edn"))
 
 (defn- create-global-config-file-if-not-exists
   [repo-url]

diff --git a/src/main/frontend/handler/repo.cljs b/src/main/frontend/handler/repo.cljs
@@ -48,8 +48,8 @@
       (let [format (state/get-preferred-format)
             file-rpath (str "pages/" "contents." (config/get-file-extension format))
             default-content (case (name format)
-                              "org" (rc/inline "contents.org")
-                              "markdown" (rc/inline "contents.md")
+                              "org" (rc/inline "templates/contents.org")
+                              "markdown" (rc/inline "templates/contents.md")
                               "")]
         (p/let [_ (fs/mkdir-if-not-exists (path/path-join repo-dir pages-dir))
                 file-exists? (fs/create-if-not-exists repo-url repo-dir file-rpath default-content)]

diff --git a/src/main/grammar/calc.bnf → src/resources/grammar/calc.bnf b/src/main/grammar/calc.bnf → src/resources/grammar/calc.bnf
diff --git a/templates/config.edn → src/resources/templates/config.edn b/templates/config.edn → src/resources/templates/config.edn
diff --git a/templates/contents.md → src/resources/templates/contents.md b/templates/contents.md → src/resources/templates/contents.md
diff --git a/templates/contents.org → src/resources/templates/contents.org b/templates/contents.org → src/resources/templates/contents.org
diff --git a/templates/global-config.edn → src/resources/templates/global-config.edn b/templates/global-config.edn → src/resources/templates/global-config.edn
diff --git a/templates/zotero-items.edn → src/resources/zotero-items.edn b/templates/zotero-items.edn → src/resources/zotero-items.edn
diff --git a/templates/favorites.md b/templates/favorites.md
diff --git a/templates/favorites.org b/templates/favorites.org
diff --git a/typos.toml b/typos.toml
@@ -13,4 +13,4 @@ fo = "fo"
 aks = "aks"
 Mannor = "Mannor"
 [files]
-extend-exclude = ["resources/*", "templates/*", "src/resources/*"]
+extend-exclude = ["resources/*", "src/resources/*"]