status-im
/
re-frame-10x
mirror of https://github.com/status-im/re-frame-10x.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixup compile errors

This commit is contained in:
Daniel Compton 2018-02-20 16:26:56 +13:00
parent acea185cc2
commit 39259f6d03
6 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
README.md
View File

@ -115,22 +115,24 @@ Slightly out of date, but indicative ...
## Installation
re-frame-10x configuration is per-project, only one person in your team needs to configure a project to use it, and then everyone else can benefit.
If you are using leiningen, modify `project.clj` in the following ways. When puzzling over the various possible leiningen configurations, it's often helpful to look at a sample [project.clj](https://github.com/technomancy/leiningen/blob/stable/sample.project.clj).
[![Clojars Project](https://img.shields.io/clojars/v/day8.re-frame/re-frame-10x.svg)](https://clojars.org/day8.re-frame/re-frame-10x)
- Update your re-frame dependency to at least `0.10.5` - `[re-frame "0.10.5"]`.
- Add re-frame-10x as a dev dependency by placing `[day8.re-frame/re-frame-10x "VERSION"]` within `:profiles :dev :dependencies`. For example:
- Add re-frame-10x as a dev dependency by placing `[day8.re-frame/re-frame-10x "VERSION"]` within `:profiles :dev :dependencies`, where `"VERSION"` is the version shown above. For example:
```cljs
:profiles
{:dev
{:dependencies [[some-other-package "0.0.0"]
[day8.re-frame/re-frame-10x "0.0.0 (see version above)"]] }}
{:dependencies [[some-other-package "0.1.0"]
[day8.re-frame/re-frame-10x "VERSION (see version above)"]] }}
```
If your project uses React 16 and Reagent 0.8.0-alpha2 (or higher) then you will need to add the qualifier `-react16` to the version, e.g. `[day8.re-frame/re-frame-10x "0.0.0-react16"]`.
If your project uses React 16 and Reagent 0.8.0-alpha2 (or higher) then you will need to add the qualifier `-react16` to the version, e.g. `[day8.re-frame/re-frame-10x "VERSION-react16"]`.
- Locate the `:compiler` map under `:dev` and add:

5
project.clj
View File

@ -27,11 +27,6 @@
["vcs" "commit"]
["vcs" "push"]]
:figwheel {:css-dirs ["resources/day8/re_frame_10x/trace"]}
:less {:source-paths ["resources/day8/re_frame_10x/trace"]
:target-path "resources/day8/re_frame_10x/trace"}
:profiles {:dev {:dependencies [[binaryage/dirac "RELEASE"]]}
:mranderson {:dependencies ^:replace [^:source-dep [re-frame "0.10.2"
:exclusions [org.clojure/clojurescript

18
src/day8/re_frame_10x/view/app_db.cljs
View File

@ -11,15 +11,15 @@
[clojure.data])
(:require-macros [day8.re-frame-10x.utils.macros :as macros]))
(def delete (macros/slurp-macro "day8/re_frame_10x/trace/images/delete.svg"))
(def reload (macros/slurp-macro "day8/re_frame_10x/trace/images/reload.svg"))
(def reload-disabled (macros/slurp-macro "day8/re_frame_10x/trace/images/reload-disabled.svg"))
(def snapshot (macros/slurp-macro "day8/re_frame_10x/trace/images/snapshot.svg"))
(def snapshot-ready (macros/slurp-macro "day8/re_frame_10x/trace/images/snapshot-ready.svg"))
(def round-arrow (macros/slurp-macro "day8/re_frame_10x/trace/images/round-arrow.svg"))
(def arrow-right (macros/slurp-macro "day8/re_frame_10x/trace/images/arrow-right.svg"))
(def copy (macros/slurp-macro "day8/re_frame_10x/trace/images/copy.svg"))
(def trash (macros/slurp-macro "day8/re_frame_10x/trace/images/trash.svg"))
(def delete (macros/slurp-macro "day8/re_frame_10x/images/delete.svg"))
(def reload (macros/slurp-macro "day8/re_frame_10x/images/reload.svg"))
(def reload-disabled (macros/slurp-macro "day8/re_frame_10x/images/reload-disabled.svg"))
(def snapshot (macros/slurp-macro "day8/re_frame_10x/images/snapshot.svg"))
(def snapshot-ready (macros/slurp-macro "day8/re_frame_10x/images/snapshot-ready.svg"))
(def round-arrow (macros/slurp-macro "day8/re_frame_10x/images/round-arrow.svg"))
(def arrow-right (macros/slurp-macro "day8/re_frame_10x/images/arrow-right.svg"))
(def copy (macros/slurp-macro "day8/re_frame_10x/images/copy.svg"))
(def trash (macros/slurp-macro "day8/re_frame_10x/images/trash.svg"))
(def cljs-dev-tools-background "#e8ffe8")
(def pod-gap common/gs-19s)

3
src/day8/re_frame_10x/view/components.cljs
View File

@ -4,7 +4,8 @@
[mranderson047.re-frame.v0v10v2.re-frame.core :as rf]
[clojure.string :as str]
[day8.re-frame-10x.utils.re-com :as rc]
[mranderson047.reagent.v0v7v0.reagent.core :as r])
[mranderson047.reagent.v0v7v0.reagent.core :as r]
[devtools.prefs])
(:require-macros [day8.re-frame-10x.utils.macros :refer [with-cljs-devtools-prefs]]))
(defn search-input [{:keys [title placeholder on-save on-change on-stop]}]

12
src/day8/re_frame_10x/view/container.cljs
View File

@ -18,7 +18,7 @@
[day8.re-frame-10x.utils.re-com :as rc]
[day8.re-frame-10x.common-styles :as common]))
(def triangle-down (macros/slurp-macro "day8/re_frame_10x/trace/images/triangle-down.svg"))
(def triangle-down (macros/slurp-macro "day8/re_frame_10x/images/triangle-down.svg"))
(defn tab-button [panel-id title]
(let [selected-tab @(rf/subscribe [:settings/selected-tab])]
[rc/v-box
@ -29,11 +29,11 @@
[:img {:src (str "data:image/svg+xml;utf8," triangle-down)
:style {:opacity (if (= selected-tab panel-id) "1" "0")}}]]]))
(def open-external (macros/slurp-macro "day8/re_frame_10x/trace/images/logout.svg"))
(def settings-svg (macros/slurp-macro "day8/re_frame_10x/trace/images/wrench.svg"))
(def orange-settings-svg (macros/slurp-macro "day8/re_frame_10x/trace/images/orange-wrench.svg"))
(def pause-svg (macros/slurp-macro "day8/re_frame_10x/trace/images/pause.svg"))
(def play-svg (macros/slurp-macro "day8/re_frame_10x/trace/images/play.svg"))
(def open-external (macros/slurp-macro "day8/re_frame_10x/images/logout.svg"))
(def settings-svg (macros/slurp-macro "day8/re_frame_10x/images/wrench.svg"))
(def orange-settings-svg (macros/slurp-macro "day8/re_frame_10x/images/orange-wrench.svg"))
(def pause-svg (macros/slurp-macro "day8/re_frame_10x/images/pause.svg"))
(def play-svg (macros/slurp-macro "day8/re_frame_10x/images/play.svg"))
(def outer-margins {:margin (str "0px " common/gs-19s)})

2
src/day8/re_frame_10x/view/subs.cljs
View File

@ -17,7 +17,7 @@
;(s/def ::query-cache (s/map-of ::query-cache-params ::deref))
;(assert (s/valid? ::query-cache (rc/deref-or-value-peek subs/query->reaction)))
(def copy (macros/slurp-macro "day8/re_frame_10x/trace/images/copy.svg"))
(def copy (macros/slurp-macro "day8/re_frame_10x/images/copy.svg"))
(defn sub-tag-class [type]
(case type