diff --git a/.drone.sec b/.drone.sec new file mode 100644 index 0000000..1585851 --- /dev/null +++ b/.drone.sec @@ -0,0 +1 @@ +eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.H1l-q1EY6YIpTwF8UKa0UMPH3OfpKjN8rYz4VFmnZIwS6vZzW7FdoehfLMzejg0GC1UUDG6pWRtD9pg3lxnTCU8UNBqLtqpltBV2-0r5grdZbiRV4plWoO_Rdg_MaQ4f4frbS2PnRDsIs_8sKfIbbdhx1yWlCcXLXKm1khjhn3lNdsnZvNHkXlvEZ3HsQ4JMAbiNWP2uv0wkjlW_tYwQN9ig4FSxo0tGeXPwQ4TKe8pMcSKP6hLjyC69FDPDw0uWRWl73V87bFjEGRJqpsXqXQwgohGDVf0GO9qkZQ9VdgkQH6ccX0xlF-vKOx78ULm9AD-WhIWJNudz5UZUAixjrQ.PP6QusLM9yecRjWl.KOmlxYKRzikrE5VBI_AsF33DJasFbLDhvXGf0ffj9plbLodK7tHJphKj93c4IsAsWJ9JGlCf3h1Rpm5qOWQWzcovnOP7F7F0DOvVTVczI0gsgZ8RJpkp9BUAVGubZEkM9CpnozJ4hTBx3OqeARlcU7ksVOWcyiQt3aBPTG-VxPhJI5s8NHJurjlO2dV8ILBNEbyoGunoQ3x3IZA1wu-18ZTxik1FXudy2uxDWcbfrwl_1t-mg8dFh7QSO0gngC1nOaiOojvXQjiLmkC-XRSHzNOKm-evoPt0v_OxS9AL_1XX7b2E5qyP3HIafGQHQAXyx9Smz_0u5jSbEL1fMdCWhhvwJhNckN1cR-XJLXzd3_j2IYJOC0DlooojuhrjXHJ_Es64_QALuPdjTmmPUX51cIfOXHR12SrZ5AKR6jwD3GAhXhqgibDjCLgsPBvo5lgLvnbrvsQQVJ2LeLc5ZjkhjzNKWzAmq2ZNLlug1ewXsWZz5ApI7AdD6WGk5SrPFclMFMMCfshAXk83cXnfRK6DFdorqtKZdM2fc006aJxUWpyTYRNx3Myd04fV2_cDoQ.wxLLpkbPMiLJdAT3neW_iQ \ No newline at end of file diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..0f8586e --- /dev/null +++ b/.drone.yml @@ -0,0 +1,57 @@ +build: + css: + image: mhart/alpine-node:4 + commands: + - make install + - make build-sass + js: + image: pandeiro/lein + commands: + - make install + - make build-cljs + +notify: + slack: + webhook_url: $$SLACK_WEBHOOK_URL + channel: ulysses + username: drone + +# tag image with "latest" or "develop", and build number +publish: + docker: + file: Dockerfile + username: $$DOCKER_USER + password: $$DOCKER_PASS + email: $$DOCKER_EMAIL + repo: uconncore/ulysses-front + tag: latest + when: + branch: master + docker: + file: Dockerfile + username: $$DOCKER_USER + password: $$DOCKER_PASS + email: $$DOCKER_EMAIL + repo: uconncore/ulysses-front + tag: develop + when: + branch: develop + +# deploy new image to rancher (using ulysses stack) +deploy: + rancher: + url: $$RANCHER_URL + access_key: $$RANCHER_ACCESS_KEY + secret_key: $$RANCHER_SECRET_KEY + service: ulysses/front-staging + docker_image: uconncore/ulysses-front:develop + when: + branch: develop + rancher: + url: $$RANCHER_URL + access_key: $$RANCHER_ACCESS_KEY + secret_key: $$RANCHER_SECRET_KEY + service: ulysses/front-prod + docker_image: uconncore/ulysses-front:latest + when: + branch: master diff --git a/.editorconfig b/.editorconfig index c7bbd9e..112f51e 100644 --- a/.editorconfig +++ b/.editorconfig @@ -8,7 +8,7 @@ insert_final_newline = true # Matches multiple files with brace expansion notation # Set default charset -[{*.clj,*.cljs,*.scss,package.json}] +[{*.clj,*.cljs,*.scss,*.yml,package.json}] charset = utf-8 indent_style = space indent_size = 2 diff --git a/.gitignore b/.gitignore index d7f40f7..0fe96a5 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ out /.sass-cache /node_modules /.lein-repl-history +/secrets.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..130a8a6 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,3 @@ +FROM kyma/docker-nginx +ADD resources/public /var/www +CMD 'nginx' diff --git a/README.md b/README.md index c834502..ad747c0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # ulysses (front-end) +[![Build Status](http://155.37.254.135/api/badges/core/ulysses-front/status.svg)](http://155.37.254.135/core/ulysses-front) + stack: * language: [clojure](https://clojure.org/) / [clojurescript](https://github.com/clojure/clojurescript) [1] diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..6787535 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,5 @@ +front-staging: + image: uconncore/ulysses-front:develop + +front-prod: + image: uconncore/ulysses-front:latest diff --git a/src/cljs/ulysses/components/basic.cljs b/src/cljs/ulysses/components/basic.cljs index 7f88352..03144c2 100644 --- a/src/cljs/ulysses/components/basic.cljs +++ b/src/cljs/ulysses/components/basic.cljs @@ -27,14 +27,18 @@ ;; bootstrap helpers ----------------------- -(defn label [contextual & rest] +(defn label + "bootstrap label" + [contextual & rest] (let [classes ["label" (str "label-" (name contextual))] cname (string/join "." (into ["span"] classes))] (into [(keyword cname)] rest))) -(defn nav-item [href & body] +(defn nav-item + "bootstrap nav item" + [href & rest] [:li.nav-item - (into [link href {}] body)]) + (into [link href {}] rest)]) ;; css transition group --------------------