updated figwheel-bridge.js to pull in figwheel.connect.build_main

WintonCentre · May 27, 2017 · a030d55 · a030d55
1 parent 1660a3d
commit a030d55
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 31 deletions.
diff --git a/js/figwheel-bridge.js b/js/figwheel-bridge.js
@@ -225,7 +225,7 @@ function loadApp(platform, devHost, onLoadCb) {
                 // seriously React packager? why.
                 var googreq = goog.require;
 
-                googreq('figwheel.connect');
+                googreq('figwheel.connect.build_main');
             });
         });
     }

diff --git a/package.json b/package.json
@@ -19,7 +19,6 @@
     "react-native": "github:exponentjs/react-native#sdk-15.0.0",
     "react-native-settings-list": "~1.3.3",
     "react-native-simple-markdown": "^1.0.60-rc.3",
-    "react-native-svg": "~5.1.5",
     "react-native-vector-icons": "~4.0.0"
   },
   "devDependencies": {

diff --git a/project.clj b/project.clj
@@ -3,7 +3,7 @@
   :url "http://wintoncentre.maths.cam.ac.uk"
   :license {:name "MIT License"
             :url  "https://opensource.org/licenses/MIT"}
-  :dependencies [[org.clojure/clojure "1.9.0-alpha15"]
+  :dependencies [[org.clojure/clojure "1.9.0-alpha16"]
                  [org.clojure/clojurescript "1.9.521"]
                  [org.clojure/core.async "0.3.442"]
                  [rum "0.10.8" :exclusions [cljsjs/react cljsjs/react-dom sablono]]

diff --git a/src/unspun/screens/logo.cljs b/src/unspun/screens/logo.cljs
@@ -4,7 +4,7 @@
             [cljs-exponent.components :refer [text view image touchable-highlight status-bar animated-view] :as rn]
             [themes.palettes :refer [get-palette]]
             [unspun.db :refer [version app-state palette-index brand-title app-banner to-pc clamp winton-csv scenario-url]]
-            [graphics.svg :refer [svg circle rect]]))
+            ))
 
 ;(def logo-img (js/require "./assets/images/logo.png"))
 (def brand (js/require "./assets/images/brand.png"))

diff --git a/src/unspun/screens/svg_test_page.cljs b/src/unspun/screens/svg_test_page.cljs
@@ -4,35 +4,35 @@
             [cljs-exponent.components :refer [text view image touchable-highlight status-bar] :as rn]
             [themes.palettes :refer [get-palette]]
             [unspun.db :refer [app-state palette-index]]
-            [graphics.svg :refer [svg circle rect]]
             ))
 
-(defn title-style [palette]
-  {:color          (:light-primary palette)
-   :marginVertical 6
-   :fontSize       50
-   })
+(comment
+  (defn title-style [palette]
+    {:color          (:light-primary palette)
+     :marginVertical 6
+     :fontSize       50
+     })
 
-(defn test-page-style [palette]
-  {:flex            1
-   :backgroundColor (:primary palette)})
+  (defn test-page-style [palette]
+    {:flex            1
+     :backgroundColor (:primary palette)})
 
-(defc startup-title < rum/reactive [& {:keys [title style]
-                                       :or   {title "Risk Checker"
-                                              style (title-style (get-palette (rum/react palette-index)))}}]
-  (text {
-         :style style} title))
+  (defc startup-title < rum/reactive [& {:keys [title style]
+                                         :or   {title "Risk Checker"
+                                                style (title-style (get-palette (rum/react palette-index)))}}]
+    (text {
+           :style style} title))
 
-(defc test-page < rum/reactive [& {:keys [title logo launcher style]
-                                      :or   {title startup-title
-                                             style (test-page-style (get-palette (rum/react palette-index)))}}]
-  (let [palette (get-palette (rum/react palette-index))]
-    (view {:style style}
-          (status-bar {:key 10
-                       :hidden   false
-                       :barStyle "light-content"})
-          (title)
-          (svg {:flex 1}
-               (rect {:x 50 :y 50 :width 200 :height 200 :fill (:accent palette)})
-               (circle {:cx 150 :cy 150 :r 50 :fill (:dark-primary palette)})))))
+  (defc test-page < rum/reactive [& {:keys [title logo launcher style]
+                                     :or   {title startup-title
+                                            style (test-page-style (get-palette (rum/react palette-index)))}}]
+    (let [palette (get-palette (rum/react palette-index))]
+      (view {:style style}
+            (status-bar {:key      10
+                         :hidden   false
+                         :barStyle "light-content"})
+            (title)
+            (svg {:flex 1}
+                 (rect {:x 50 :y 50 :width 200 :height 200 :fill (:accent palette)})
+                 (circle {:cx 150 :cy 150 :r 50 :fill (:dark-primary palette)}))))))
 
diff --git a/src/unspun/screens/top_drawer.cljs b/src/unspun/screens/top_drawer.cljs
@@ -9,7 +9,7 @@
                                stack-navigation drawer-navigation-layout drawer-navigation drawer-navigation-item
                                ionicon]]
             [unspun.navigation.router :refer [Router]]
-            [unspun.screens.svg-test-page :refer [test-page]]
+    ;[unspun.screens.svg-test-page :refer [test-page]]
             [unspun.screens.rum-bars :as rum-bars]
             [unspun.screens.logo :as logo :refer [logo-page]]
             [unspun.common :refer [react-native ios?]]))