diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..5571165 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,22 @@ +kind: pipeline +name: default +steps: + - name: Build + image: clojure:tools-deps + commands: + - clj -Adev -m figwheel.main -bo prod + + - name: deploy-site + pull: True + image: appleboy/drone-scp + settings: + host: digitaloctave.com + username: + from_secret: ssh_user + key: + from_secret: ssh_key + port: 22 + duration: 4m + target: /var/www/clojure-demos/ + source: + - resources/public/* diff --git a/.gitlab-ci.yaml b/.gitlab-ci.yaml new file mode 100644 index 0000000..cd8cddf --- /dev/null +++ b/.gitlab-ci.yaml @@ -0,0 +1,31 @@ +image: clojure:tools-deps-alpine + +# unit-test: +# stage: test +# when: always +# image: clojure:tools-deps-alpine +# script: +# - cd ./reagent-reitit-demo/ +# - clj -m figwheel.main --build dev --repl +# - export GITLIBS=".gitlibs/" +# - clojure -Sdeps '{:mvn/local-repo "./.m2/repository"}' -A:test + +pages: + stage: deploy + when: always + image: clojure:tools-deps-alpine + script: + - cd ./reagent-reitit-demo/ + - clj -m figwheel.main --build dev --repl + +# script: +# - python setup.py develop +# - elcato build --path=public/ +# - gzip --keep --recursive public + + artifacts: + paths: + - resouorces/public + only: + - master + - develop diff --git a/datalog-demo/deps.edn b/datalog-demo/deps.edn index cb06970..1e94d3e 100644 --- a/datalog-demo/deps.edn +++ b/datalog-demo/deps.edn @@ -1,5 +1,7 @@ {:deps {org.clojure/clojure {:mvn/version "1.10.0"} org.clojure/clojurescript {:mvn/version "1.10.764"} datascript {:mvn/version "1.0.0"} + olymk2/cl-org {:git/url "https://gitlab.com/olymk2/cl-org.git" + :sha "07586193adea3e9fb48381360f83f4f65a0deef3"} com.bhauman/figwheel-main {:mvn/version "0.2.11"}} :paths ["src" "resources"]} diff --git a/reagent-reitit-demo/deps.edn b/reagent-reitit-demo/deps.edn index 9575ac9..02b9b9f 100644 --- a/reagent-reitit-demo/deps.edn +++ b/reagent-reitit-demo/deps.edn @@ -3,6 +3,9 @@ cljs-ajax {:mvn/version "0.8.1"} reagent {:mvn/version "0.9.1"} reagent-utils {:mvn/version "0.3.3"} + olymk2/cl-org {:git/url "https://gitlab.com/olymk2/cl-org.git" + :sha "c366560dd59e16759ca24209b253f55e46ecbbe3"} + metosin/reitit {:mvn/version "0.5.10"} metosin/reitit-spec {:mvn/version "0.5.10"} metosin/reitit-frontend {:mvn/version "0.5.10"} diff --git a/reagent-reitit-demo/resources/public/reagent-reitit.org b/reagent-reitit-demo/resources/public/reagent-reitit.org index 1f7137a..21c1919 100644 --- a/reagent-reitit-demo/resources/public/reagent-reitit.org +++ b/reagent-reitit-demo/resources/public/reagent-reitit.org @@ -107,6 +107,5 @@ You need to connect your routes data structure to =ref/start!= this function tak To create a link to a route, you can use the =rfe/href= function which takes a lookup key which you specified in your routes, in this instance the key is name spaced to the current namespace. #+BEGIN_SRC clojurescript - [:a {:href (rfe/href ::frontpage)} "example link"] - + [:a {:href (rfe/href ::frontpage)} "example link"] #+END_SRC diff --git a/reagent-reitit-demo/src/core.cljs b/reagent-reitit-demo/src/core.cljs index 44612a2..902c07d 100644 --- a/reagent-reitit-demo/src/core.cljs +++ b/reagent-reitit-demo/src/core.cljs @@ -1,7 +1,9 @@ (ns ^:figwheel-hooks core.demo (:require [reagent.core :as reagent] [ajax.core :refer [GET raw-response-format]] - [demo.org :refer [parse->to-hiccup parse-flat]] + ;[demo.org :refer [parse->to-hiccup parse-flat]] + [cl-eorg.parser :as o :refer [parse parse-flat]] + [cl-eorg.html :refer [org->replacements]] [reitit.frontend :as rf] [reitit.frontend.easy :as rfe] [reitit.coercion.spec :as rss] @@ -14,8 +16,7 @@ :datalog-demo {:file "datalog-demo.org" :git-link "https://github.com/atomjuice/dsl-demo"} :reagent-demo - {:file "reagent-reitit.org" :git-link "https://github.com/atomjuice/dsl-demo"} - } + {:file "reagent-reitit.org" :git-link "https://github.com/atomjuice/dsl-demo"}} :lorem "Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industry's standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum."}) @@ -107,10 +108,11 @@ (GET (-> site-data :demos demo-key :file) {:response-format (raw-response-format) :handler (fn [response] - (prn response) - (prn (parse->to-hiccup response)) - (prn (parse-flat response)) - (reset! content (parse->to-hiccup response)))}) + (->> response + parse + org->replacements + (reset! content)) + #_(reset! content (org->replacements (parse response))))}) (fn [route] ;[:div (-> route :parameters :path :page)] [:main.mt4