diff --git a/README.md b/README.md index 6ea7159..6ec0759 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # xiana -A Leiningen template for flexiana/framework v0.3.0. +A Leiningen template for flexiana/framework. ## Usage diff --git a/project.clj b/project.clj index 8fad576..d55d576 100644 --- a/project.clj +++ b/project.clj @@ -1,5 +1,5 @@ -(defproject xiana/lein-template "0.3.4.1" - :description "A Leiningen template for flexiana/framework v0.3.x" +(defproject xiana/lein-template "0.4.0" + :description "A Leiningen template for flexiana/framework v0.4.x" :url "https://github.com/Flexiana/xiana-template" :license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0" :url "https://www.eclipse.org/legal/epl-2.0/"} diff --git a/resources/leiningen/new/xiana/config/dev/config.edn b/resources/leiningen/new/xiana/config/dev/config.edn index d14157e..2354c66 100644 --- a/resources/leiningen/new/xiana/config/dev/config.edn +++ b/resources/leiningen/new/xiana/config/dev/config.edn @@ -1,23 +1,23 @@ -{:framework.db.storage/postgresql {:port 5433 - :dbname "{{name-to-path}}" - :host "localhost" - :dbtype "postgresql" - :user "postgres" - :password "postgres"} - :framework.app/session-backend {:storage :database - :session-table-name :sessions} - :framework.db.storage/migration {:store :database - :seeds-dir "dev_seeds" - :migration-dir "migrations" - :init-in-transaction? false - :migration-table-name "migrations" - :seeds-table-name "seeds"} - :framework.app/web-server {:port 3000 - :join? false} - :framework.app/auth {:hash-algorithm :bcrypt ;; Available values: :bcrypt, :scrypt, and :pbkdf2 - :bcrypt-settings {:work-factor 11} - :scrypt-settings {:cpu-cost 32768 ;; Must be a power of 2 - :memory-cost 8 - :parallelization 1} - :pbkdf2-settings {:type :sha1 ;; Available values: :sha1 and :sha256 - :iterations 100000}}} +{:xiana/postgresql {:port 5433 + :dbname "{{name-to-path}}" + :host "localhost" + :dbtype "postgresql" + :user "postgres" + :password "postgres"} + :xiana/session-backend {:storage :database + :session-table-name :sessions} + :xiana/migration {:store :database + :seeds-dir "dev_seeds" + :migration-dir "migrations" + :init-in-transaction? false + :migration-table-name "migrations" + :seeds-table-name "seeds"} + :xiana/web-server {:port 3000 + :join? false} + :xiana/auth {:hash-algorithm :bcrypt ;; Available values: :bcrypt, :scrypt, and :pbkdf2 + :bcrypt-settings {:work-factor 11} + :scrypt-settings {:cpu-cost 32768 ;; Must be a power of 2 + :memory-cost 8 + :parallelization 1} + :pbkdf2-settings {:type :sha1 ;; Available values: :sha1 and :sha256 + :iterations 100000}}} diff --git a/resources/leiningen/new/xiana/config/test/config.edn b/resources/leiningen/new/xiana/config/test/config.edn index 69b20ae..f380dba 100644 --- a/resources/leiningen/new/xiana/config/test/config.edn +++ b/resources/leiningen/new/xiana/config/test/config.edn @@ -1,22 +1,22 @@ -{:framework.db.storage/postgresql {:image-name "postgres:14-alpine" - :port 5433 - :dbname "{{name-to-path}}" - :host "localhost" - :dbtype "postgresql" - :user "postgres" - :password "postgres"} - :framework.db.storage/migration {:store :database - :seeds-dir "test_seeds" - :migration-dir "migrations" - :init-in-transaction? false - :migration-table-name "migrations" - :seeds-table-name "seeds"} - :framework.app/web-server {:port 3333 - :join? false} - :framework.app/auth {:hash-algorithm :bcrypt ;; Available values: :bcrypt, :scrypt, and :pbkdf2 - :bcrypt-settings {:work-factor 11} - :scrypt-settings {:cpu-cost 32768 ;; Must be a power of 2 - :memory-cost 8 - :parallelization 1} - :pbkdf2-settings {:type :sha1 ;; Available values: :sha1 and :sha256 - :iterations 100000}}} +{:xiana/postgresql {:image-name "postgres:14-alpine" + :port 5433 + :dbname "{{name-to-path}}" + :host "localhost" + :dbtype "postgresql" + :user "postgres" + :password "postgres"} + :xiana/migration {:store :database + :seeds-dir "test_seeds" + :migration-dir "migrations" + :init-in-transaction? false + :migration-table-name "migrations" + :seeds-table-name "seeds"} + :xiana/web-server {:port 3333 + :join? false} + :xiana/auth {:hash-algorithm :bcrypt ;; Available values: :bcrypt, :scrypt, and :pbkdf2 + :bcrypt-settings {:work-factor 11} + :scrypt-settings {:cpu-cost 32768 ;; Must be a power of 2 + :memory-cost 8 + :parallelization 1} + :pbkdf2-settings {:type :sha1 ;; Available values: :sha1 and :sha256 + :iterations 100000}}} diff --git a/resources/leiningen/new/xiana/project.clj b/resources/leiningen/new/xiana/project.clj index b8a86a3..65d5742 100644 --- a/resources/leiningen/new/xiana/project.clj +++ b/resources/leiningen/new/xiana/project.clj @@ -2,7 +2,7 @@ :description "FIXME: write description" :min-lein-version "2.0.0" :dependencies [[org.clojure/clojure "1.10.3"] - [com.flexiana/framework "0.3.4"] + [com.flexiana/framework "0.4.0"] [thheller/shadow-cljs "2.11.26"] [migratus "1.3.5"] [clj-http "3.12.1"] diff --git a/resources/leiningen/new/xiana/shadow-cljs.edn b/resources/leiningen/new/xiana/shadow-cljs.edn index c310c9a..502c64b 100644 --- a/resources/leiningen/new/xiana/shadow-cljs.edn +++ b/resources/leiningen/new/xiana/shadow-cljs.edn @@ -28,4 +28,4 @@ :output-dir "resources/public/assets/js/compiled", :asset-path "assets/js/compiled", :modules {:app {:init-fn {{sanitized-name}}.core/init, - :preloads [devtools.preload]}}}}, :lein true} \ No newline at end of file + :preloads [devtools.preload]}}}}, :lein true} diff --git a/resources/leiningen/new/xiana/src/backend/app_name/core.clj b/resources/leiningen/new/xiana/src/backend/app_name/core.clj index 2e71aec..75d0910 100644 --- a/resources/leiningen/new/xiana/src/backend/app_name/core.clj +++ b/resources/leiningen/new/xiana/src/backend/app_name/core.clj @@ -22,7 +22,7 @@ (defn ->system [app-cfg] (-> (config/config app-cfg) - (rename-key :framework.app/auth :auth) + (rename-key :xiana/auth :auth) routes/reset rbac/init session/init-backend