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

Merge epoch2 into master

This commit is contained in:
Daniel Compton 2018-01-18 16:04:34 +13:00
parent 7d79ef5937 b05ecb2250
commit eac8b85952
3 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/day8/re_frame/trace/utils/utils.cljs
View File

@ -1,5 +1,7 @@
(ns day8.re-frame.trace.utils.utils)
(def diff-link "https://github.com/Day8/re-frame-trace/blob/master/docs/HyperlinkedInformation/Diffs.md")
(defn last-in-vec
"Get the last element in the vector"
[v]

19
src/day8/re_frame/trace/view/app_db.cljs
View File

@ -1,6 +1,7 @@
(ns day8.re-frame.trace.view.app-db
(:require [devtools.prefs]
[devtools.formatters.core]
[day8.re-frame.trace.utils.utils :as utils]
[day8.re-frame.trace.view.components :as components]
[mranderson047.re-frame.v0v10v2.re-frame.core :as rf]
[mranderson047.reagent.v0v6v0.reagent.core :as r]
@ -21,7 +22,7 @@
(def cljs-dev-tools-background "#e8ffe8")
(def pod-gap common/gs-19s)
(def pad-padding common/gs-7s)
(def pad-padding "0px")
(def border-radius "3px")
(def app-db-styles
@ -245,9 +246,11 @@
:class "app-db-path--link"
:justify :end
:children [[rc/hyperlink-href
;:class "app-db-path--label"
:label "ONLY BEFORE"
:href "https://github.com/Day8/re-frame-trace/wiki/app-db#diff"]]]
;:class "app-db-path--label"
:label "ONLY BEFORE"
:style {:margin-left common/gs-7s}
:target "_blank"
:href utils/diff-link]]]
^{:key "only-before-diff"}
[rc/v-box
@ -260,9 +263,11 @@
:class "app-db-path--link"
:justify :end
:children [[rc/hyperlink-href
;:class "app-db-path--label"
:label "ONLY AFTER"
:href "https://github.com/Day8/re-frame-trace/wiki/app-db#diff"]]]
;:class "app-db-path--label"
:label "ONLY AFTER"
:style {:margin-left common/gs-7s}
:target "_blank"
:href utils/diff-link]]]
^{:key "only-after-diff"}
[rc/v-box

25
src/day8/re_frame/trace/view/subs.cljs
View File

@ -1,5 +1,6 @@
(ns day8.re-frame.trace.view.subs
(:require [mranderson047.re-frame.v0v10v2.re-frame.core :as rf]
(:require [day8.re-frame.trace.utils.utils :as utils]
[mranderson047.re-frame.v0v10v2.re-frame.core :as rf]
[mranderson047.reagent.v0v6v0.reagent.core :as r]
[day8.re-frame.trace.utils.re-com :as rc :refer [css-join]]
[day8.re-frame.trace.common-styles :as common]
@ -17,7 +18,7 @@
(def cljs-dev-tools-background "#e8ffe8")
(def pod-gap common/gs-19s)
(def pad-padding common/gs-7s)
(def pad-padding "0px")
;; TODO: START ========== LOCAL DATA - REPLACE WITH SUBS AND EVENTS
@ -195,10 +196,12 @@
:height common/gs-19s
:justify :end
:style {:margin (css-join "0px" pad-padding)}
:children [[rc/hyperlink
;:class "app-db-path--label"
:label "ONLY BEFORE"
:on-click #(println "Clicked [ONLY BEFORE]")]]])
:children [[rc/hyperlink-href
;:class "app-db-path--label"
:label "ONLY BEFORE"
:style {:margin-left common/gs-7s}
:target "_blank"
:href utils/diff-link]]])
(when (and open? diff?)
[rc/v-box
:height "60px"
@ -212,10 +215,12 @@
:height common/gs-19s
:justify :end
:style {:margin (css-join "0px" pad-padding)}
:children [[rc/hyperlink
;:class "app-db-path--label"
:label "ONLY AFTER"
:on-click #(println "Clicked [ONLY AFTER]")]]])
:children [[rc/hyperlink-href
;:class "app-db-path--label"
:label "ONLY AFTER"
:style {:margin-left common/gs-7s}
:target "_blank"
:href utils/diff-link]]])
(when (and open? diff?)
[rc/v-box
:height "60px"