Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bb.edn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{:deps {com.github.hephaistox/auto-build {:git/sha "740a55bfdeca371fffda8ae96f7dbab16072052b"}}
{:deps {com.github.hephaistox/auto-build {:git/sha "58d0992fdf43313238153f369f1a6d8f27e26189"}}
:paths []
:tasks
{:requires [[auto-build.os.exit-codes] [auto-build.os.exiting :refer [exit]]]
Expand Down Expand Up @@ -73,4 +73,4 @@
:override-builtin true
:requires [[auto-build.tasks.repl :as build-repl] [auto-build.echo :refer [level1-header]]]
:task (-> (build-repl/repl level1-header "." (current-task) [:cljs-deps] 7006)
exit)}}}
exit)}}}
4 changes: 2 additions & 2 deletions deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
["-m" "cognitect.test-runner" "-r" ".*-test.*" "-d" "test/clj" "test/cljc"]}}
:deps {amalloy/ring-gzip-middleware {:mvn/version "0.1.4"}
clj-http/clj-http {:mvn/version "3.13.0"}
com.github.hephaistox/auto-core {:git/sha "70c0de7cfc2898a76ed607814f58b45cb98c7936"}
com.github.hephaistox/auto-core {:git/sha "0ef4d2d22532986f6533b19d09e00d28e0a7aa75"}
com.taoensso/sente {:mvn/version "1.20.0"}
hiccup/hiccup {:mvn/version "2.0.0-RC5"}
http-kit/http-kit {:mvn/version "2.8.0"}
Expand All @@ -36,4 +36,4 @@
ring/ring-anti-forgery {:mvn/version "1.4.0"}
ring/ring-headers {:mvn/version "0.4.0"}
ring/ring-ssl {:mvn/version "0.4.0"}}
:paths ["src/clj" "src/cljc" "resources"]}
:paths ["src/clj" "src/cljc" "resources"]}
135 changes: 5 additions & 130 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"source-map-support": "^0.5.21"
},
"dependencies": {
"create-react-class": "15.6.3",
"create-react-class": "15.7.0",
"react": "16.13.1",
"react-dom": "16.13.1"
}
Expand Down
4 changes: 2 additions & 2 deletions src/cljc/auto_web/components/lang.cljc
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
(ns auto-web.components.lang
"Language based components"
(:require
#?(:cljs [auto-web.local-storage :refer [set-item!]]
#?(:cljs [auto-web.local-storage :refer [set-ls!]]
:clj [auto-web.http-request.lang :refer [update-cookie-language]])))


#?(:cljs (defn- update-lang-opts
[on-lang-change l]
{:on-click #(do (set-item! :lang l) (when on-lang-change (on-lang-change l)))})
{:on-click #(do (set-ls! :lang l) (when on-lang-change (on-lang-change l)))})
:clj (defn- update-lang-opts [_ l] {:onclick (update-cookie-language l)}))

(defn clang-bar
Expand Down
2 changes: 1 addition & 1 deletion src/cljs/auto_web/lang_fe.cljs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Then, the language stored in the js.
* In worst case, the `:en` language"
[]
(let [ls-lang (wlocal-storage/get-item :lang)
(let [ls-lang (wlocal-storage/get-ls :lang)
server-accepted-lang js/lang]
(cond
(some? ls-lang) (keyword ls-lang)
Expand Down
24 changes: 19 additions & 5 deletions src/cljs/auto_web/local_storage.cljs
Original file line number Diff line number Diff line change
@@ -1,16 +1,30 @@
(ns auto-web.local-storage)
(ns auto-web.local-storage
"Provide data persistance in local storage for clojurescript."
(:require
[re-frame.core :as rf]))

(defn set-item!
(defn set-ls!
"Set `key` in browser's localStorage to `val`."
[key val]
(.setItem (.-localStorage js/window) key val))
(.setItem js/localStorage key (js/JSON.stringify (clj->js val))))

(defn get-item
(defn get-ls
"Returns value of `key` from browser's localStorage."
[key]
(.getItem (.-localStorage js/window) key))
(some-> (.getItem js/localStorage key)
(js/JSON.parse)
(js->clj :keywordize-keys true)))

(defn remove-item!
"Remove the browser's localStorage value for the given `key`"
[key]
(.removeItem (.-localStorage js/window) key))

(comment
(set-ls! "cooc"
{:a 12
:b "foo"})
(get-ls "cooc")
(rf/dispatch [::save-to-ls [:auto-sim.canvas/canvas :canvas-1]])
;
)
Loading