From f7c5d095a9514b78f80ada9f9cf76913a0f24639 Mon Sep 17 00:00:00 2001 From: Yann Esposito Date: Thu, 27 Aug 2015 18:09:45 +0200 Subject: [PATCH] playing --- src/apintro/core.cljs | 25 ++++++--------------- src/apintro/model.cljs | 2 +- src/apintro/vgapi.cljs | 49 +++++++++++++++++++++++++++--------------- 3 files changed, 40 insertions(+), 36 deletions(-) diff --git a/src/apintro/core.cljs b/src/apintro/core.cljs index 2096d0d..fd23425 100644 --- a/src/apintro/core.cljs +++ b/src/apintro/core.cljs @@ -1,6 +1,5 @@ (ns apintro.core - ; (:refer-clojure :exclude [atom]) - (:require [freactive.core :refer [atom cursor]] + (:require [freactive.core :refer [cursor]] [freactive.dom :as dom] [freactive.animation :as animation] [apintro.model :refer [init! sets gets swaps]] @@ -16,7 +15,7 @@ :vgapi vgapi/initial-state }) -(vgapi/init) +(vgapi/init :vgapi) (defn on-js-reload [] ;; optionally touch your app-state to force rerendering depending on @@ -48,7 +47,7 @@ (defn animated-title [text] [:h1 {:style {:font-size (rx (str (* 80 @ease1) "px")) - :padding-top (rx (str (* 200 @ease1) "px")) + :padding-top (rx (str (* 100 @ease1) "px")) :opacity (rx (str @ease2)) :transform (rx (str "rotate(" @ease3 "deg)")) :-webkit-transform (rx (str "rotate(" @ease3 "deg)")) @@ -78,21 +77,11 @@ [:div [animated-title (gets [:title])] [:div.project {:style {:font-family "Monaco,monospace" :opacity 0.5}} - (gets [:vgapi :project-id])]]] + (gets [:vgapi :project-id])] + (rx [vgapi/view (gets [:vgapi])]) + ]] [page 1 "subtitle" green "#title" "« Back to Title" - [animated-title (gets [:subtitle])]] - ]) - -(defn view [] - [:div - {:width "100%" - :height "100%" - :style {:border "1px solid black"} - :on-mousemove (fn [e] (sets [:mouse-pos] [(.-clientX e) (.-clientY e)])) - } - [:h1 (gets [:text])] - [:p "Your mouse is at: " (rx (str (gets [:mouse-pos])))] - ]) + [animated-title (gets [:subtitle])]]]) (dom/mount! (.getElementById js/document "root") (ease-view)) diff --git a/src/apintro/model.cljs b/src/apintro/model.cljs index d946587..698ca23 100644 --- a/src/apintro/model.cljs +++ b/src/apintro/model.cljs @@ -1,6 +1,6 @@ (ns ^:figwheel-always apintro.model (:refer-clojure :exclude [atom]) - (:require [freactive.core :refer [atom]])) + (:require [freactive.core :refer [atom cursor]])) (defonce state (atom {})) diff --git a/src/apintro/vgapi.cljs b/src/apintro/vgapi.cljs index 5ee7af6..e0f76b2 100644 --- a/src/apintro/vgapi.cljs +++ b/src/apintro/vgapi.cljs @@ -1,8 +1,10 @@ (ns ^:figwheel-always apintro.vgapi + (:refer-clojure :exclude [atom]) (:require-macros [cljs.core.async.macros :refer [go]] [freactive.macros :refer [rx]]) (:require [apintro.model :refer [gets sets]] + [freactive.animation :as animation] [cljs-http.client :as http] [cljs.core.async :refer [