om's spaghetti; wip

MichaelDrogalis · Oct 26, 2016 · c1af567 · c1af567
1 parent 39fb715
commit c1af567
Show file tree

Hide file tree

Showing 5 changed files with 228 additions and 16,726 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ pom.xml
 .lein-plugins/
 .repl
 .nrepl-port
+.cljs_rhino_repl/
diff --git a/project.clj b/project.clj
@@ -7,6 +7,7 @@
   :dependencies [[org.clojure/clojure "1.8.0"]
                  [org.clojure/clojurescript "1.9.293"]
                  [org.onyxplatform/onyx-local-rt "0.9.11.0"]
+                 [org.omcljs/om "1.0.0-alpha47"]
                  [cljsjs/codemirror "5.19.0-0"]]
 
   :plugins [[lein-figwheel "0.5.8"]
@@ -100,7 +101,7 @@
                    ;; need to add dev source path here to get user.clj loaded
                    :source-paths ["src" "dev"]
                    ;; for CIDER
-                   :plugins [[cider/cider-nrepl "0.12.0"]]
+                   ;;:plugins [[cider/cider-nrepl "0.12.0"]]
                    :repl-options {; for nREPL dev you really need to limit output
                                   :init (set! *print-length* 50)
                                   :nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]}}}

diff --git a/resources/public/index.html b/resources/public/index.html
@@ -7,44 +7,8 @@
     <link rel="stylesheet" href="css/main.css">
   </head>
   <body>
-      <form id="app">
-        <h2>Onyx tutorial scratchpad</h2>
-
-        <h4>Function</h4>
-        <textarea rows="5" cols="80" id="fn">
-(defn ^:export my-inc [segment]
-  (update-in segment [:n] inc))
-        </textarea>
-
-        <h4>Job</h4>
-        <textarea rows="10" cols="80" id="job">
-{:workflow [[:in :inc] [:inc :out]]
- :catalog [{:onyx/name :in
-            :onyx/type :input
-            :onyx/batch-size 20}
-           {:onyx/name :inc
-            :onyx/type :function
-            :onyx/fn ::my-inc
-            :onyx/batch-size 20}
-           {:onyx/name :out
-            :onyx/type :output
-            :onyx/batch-size 20}]
- :lifecycles []}
-        </textarea>
-
-        <h4>Evaluation</h4>
-        <pre>
-(-> (api/init job)
-    (api/new-segment :in {:n 41})
-    (api/new-segment :in {:n 84})
-    (api/drain)
-    (api/stop)
-    (api/env-summary))
-        </pre>
-        <input type="submit" value="Run"/>
-        <h4>Result</h4>
-        <textarea rows="10" cols="80" id="result"></textarea>
-    </form>
-    <script src="js/compiled/onyx_tutorial.js" type="text/javascript"></script>
+      <h2>Onyx tutorial scratchpad</h2>
+      <div id="app"></div>
+      <script src="js/compiled/onyx_tutorial.js" type="text/javascript"></script>
   </body>
 </html>