Merge pull request #17 from Quamolit/rm-extra

remove extra function and logs; alpha release

.github/workflows/test.yaml

@@ -0,0 +1,20 @@
+
+name: Run tests
+
+on:
+  pull_request: {}
+  push:
+    branches:
+      - master
+
+jobs:
+  test:
+    name: Tests
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: docker://timbru31/java-node:latest
+      - uses: actions/checkout@v2
+      - name: run tests
+        run: 'yarn && yarn shadow-cljs compile client'

README.md

@@ -80,7 +80,9 @@ Draw text:
   :positiion {:x 1, :y 1}
   :alpha 1
   :style {
-    :color "red"
+    :fill "red"
+    :font-size 14
+    :font-family "Hind"
   }
 }
 ```

meyvn.edn

@@ -1,7 +1,7 @@
 
 {:pom {:group-id "quamolit",
        :artifact-id "phlox",
-       :version "0.0.1-a4",
+       :version "0.0.1-a5",
        :name "Pixi.js DSL in ClojureScript"}
  :packaging {:jar {:enabled true
                    :remote-repository {:id "clojars"

shadow-cljs.edn

@@ -8,10 +8,10 @@
     [respo "0.11.5"]
     [org.clojure/core.incubator "0.1.4"]
   ]
-  :repositories {
-    "central" {:url "https://maven.aliyun.com/nexus/content/groups/public/"}
-    "clojars" {:url "https://mirrors.ustc.edu.cn/clojars/"}
-  }
+  ; :repositories {
+  ;   "central" {:url "https://maven.aliyun.com/nexus/content/groups/public/"}
+  ;   "clojars" {:url "https://mirrors.ustc.edu.cn/clojars/"}
+  ; }
   :open-file-command [
     "subl"
     ["%s:%s:%s" :file :line :column]

src/phlox/app/main.cljs

@@ -3,19 +3,17 @@
   (:require ["pixi.js" :as PIXI]
             [phlox.core :refer [render!]]
             [phlox.app.container :refer [comp-container]]
-            [phlox.app.schema :as schema]))
+            [phlox.app.schema :as schema]
+            [phlox.app.config :refer [dev?]]
+            ["shortid" :as shortid]
+            [phlox.app.updater :refer [updater]]))
 
 (defonce *store (atom schema/store))
 
-(defn updater [store op op-data]
-  (case op
-    :add-x (update store :x (fn [x] (if (> x 10) 0 (+ x 1))))
-    :tab (assoc store :tab op-data)
-    (do (println "unknown op" op op-data) store)))
-
 (defn dispatch! [op op-data]
-  (println "dispatch!" op op-data)
-  (reset! *store (updater @*store op op-data)))
+  (when dev? (println "dispatch!" op op-data))
+  (let [op-id (shortid/generate), op-time (.now js/Date)]
+    (reset! *store (updater @*store op op-data op-id op-time))))
 
 (defn main! []
   (comment js/console.log PIXI)

src/phlox/app/updater.cljs

@@ -2,4 +2,8 @@
 (ns phlox.app.updater )
 
 (defn updater [store op op-data op-id op-time]
-  (case op :content (assoc store :content op-data) :hydrate-storage op-data store))
+  (case op
+    :add-x (update store :x (fn [x] (if (> x 10) 0 (+ x 1))))
+    :tab (assoc store :tab op-data)
+    :hydrate-storage op-data
+    (do (println "unknown op" op op-data) store)))

src/phlox/core.cljs

@@ -55,7 +55,7 @@
        (fn [] (-> pixi-app .-renderer (.resize js/window.innerWidth js/window.innerHeight)))))
     (set! js/window._phloxTree @*app))
   (let [expanded-app (expand-tree app)]
-    (js/console.log "render!" expanded-app)
+    (comment js/console.log "render!" expanded-app)
     (if (nil? @*tree-element)
       (mount-app! expanded-app dispatch!)
       (rerender-app! expanded-app dispatch! options))

src/phlox/render.cljs

@@ -213,7 +213,8 @@
          (component? old-element)
          (= (:name element) (:name old-element)))
       (if (and (= (:args element) (:args old-element)) (not (:swap? options)))
-        (do
+        (comment
+         do
          (js/console.log "Same, no changes" (:name element))
          (js/console.log (:args element) (:args old-element)))
         (recur (:tree element) (:tree old-element) parent-element idx dispatch! options))

upload.cirru

@@ -0,0 +1,10 @@
+
+{}
+  :host |tiye.me
+  :uploads $ []
+    {}
+      :from |dist/*
+      :to |cdn/phlox/
+    {}
+      :from |dist/index.html
+      :to |repo/Quamolit/phlox/