diff --git a/project.clj b/project.clj index c134c35..8130d1e 100644 --- a/project.clj +++ b/project.clj @@ -5,35 +5,36 @@ :dependencies [[org.clojure/clojure "1.8.0"] [org.clojure/clojurescript "1.9.229" :scope "provided"] - [ring/ring-servlet "1.5.0"] + [ring/ring-servlet "1.5.1"] [clj-oauth "1.5.5"] - [ch.qos.logback/logback-classic "1.1.8"] - [re-frame "0.9.1"] + [ch.qos.logback/logback-classic "1.2.2"] + [re-frame "0.9.2"] [cljs-ajax "0.5.8"] [secretary "1.2.3"] - [reagent-utils "0.2.0"] - [reagent "0.6.0"] + [reagent-utils "0.2.1"] + [reagent "0.6.1"] [korma "0.4.3"] - [selmer "1.10.3"] - [markdown-clj "0.9.91"] - [ring-middleware-format "0.7.0"] - [metosin/ring-http-response "0.8.0"] - [bouncer "1.0.0"] - [org.webjars/bootstrap "4.0.0-alpha.5"] + [selmer "1.10.6"] + [markdown-clj "0.9.98"] + [ring-middleware-format "0.7.2"] + [metosin/ring-http-response "0.8.2"] + [bouncer "1.0.1"] + [org.webjars/bootstrap "4.0.0-alpha.6-1"] [org.webjars/font-awesome "4.7.0"] - [org.webjars.bower/tether "1.3.7"] + [org.webjars.bower/tether "1.4.0"] [org.clojure/tools.logging "0.3.1"] - [compojure "1.5.1"] + [compojure "1.5.2"] + [metosin/compojure-api "1.1.10"] [ring-webjars "0.1.1"] - [ring/ring-defaults "0.2.1"] + [ring/ring-defaults "0.2.3"] [luminus/ring-ttl-session "0.3.1"] [mount "0.1.11"] - [cprop "0.1.9"] + [cprop "0.1.10"] [org.clojure/tools.cli "0.3.5"] - [migratus "0.8.32"] + [migratus "0.8.33"] [luminus-nrepl "0.1.4"] - [luminus-migrations "0.2.9"] - [conman "0.6.2"] + [luminus-migrations "0.3.0"] + [conman "0.6.3"] [org.postgresql/postgresql "9.4.1212"] ] @@ -111,21 +112,21 @@ :project/dev {:dependencies [[prone "1.1.4"] [ring/ring-mock "0.3.0"] - [ring/ring-devel "1.5.0"] + [ring/ring-devel "1.5.1"] [luminus-jetty "0.1.4"] [pjstadig/humane-test-output "0.8.1"] [org.clojure/core.cache "0.6.5"] - [org.apache.httpcomponents/httpcore "4.4.5"] + [org.apache.httpcomponents/httpcore "4.4.6"] [clj-webdriver/clj-webdriver "0.7.2"] - [org.seleniumhq.selenium/selenium-server "3.0.1"] + [org.seleniumhq.selenium/selenium-server "3.3.1"] [doo "0.1.7"] - [binaryage/devtools "0.8.3"] - [figwheel-sidecar "0.5.8"] + [binaryage/devtools "0.9.2"] + [figwheel-sidecar "0.5.9"] [com.cemerick/piggieback "0.2.2-SNAPSHOT"] [directory-naming/naming-java "0.8"]] :plugins [[com.jakemccrary/lein-test-refresh "0.14.0"] [lein-doo "0.1.7"] - [lein-figwheel "0.5.8"] + [lein-figwheel "0.5.9"] [org.clojure/clojurescript "1.9.229"]] :cljsbuild {:builds diff --git a/resources/public/about.html b/resources/public/about.html index e69de29..370071f 100644 --- a/resources/public/about.html +++ b/resources/public/about.html @@ -0,0 +1,51 @@ + + + + + + + About YouYesYet + + +
+ + +

+ About YouYesYet +

+
+
+ +

+ This isn't finished and doesn't work yet! This site is just a look-and-feel + dummy. +

+

+ YouYesYet is a project to build a canvassing app for the new Scottish + Independence Referendum. The source code is here. The specification + is here. +

+

+ If we're going to get this working in time I cannot do it alone: I need help. Contact + me by email or on on Twitter. +

+
+ + + + diff --git a/resources/public/css/spinner.css b/resources/public/css/spinner.css new file mode 100644 index 0000000..66bc787 --- /dev/null +++ b/resources/public/css/spinner.css @@ -0,0 +1,141 @@ +/* + * Cribbed from http://tobiasahlin.com/spinkit/ + * (source here https://github.com/tobiasahlin/SpinKit) + * Thanks Tobias! + */ + +.sk-fading-circle { + margin: 100px auto; + width: 40px; + height: 40px; + position: relative; +} + +.sk-fading-circle .sk-circle { + width: 100%; + height: 100%; + position: absolute; + left: 0; + top: 0; +} + +.sk-fading-circle .sk-circle:before { + content: ''; + display: block; + margin: 0 auto; + width: 15%; + height: 15%; + background-color: white; + border-radius: 100%; + -webkit-animation: sk-circleFadeDelay 1.2s infinite ease-in-out both; + animation: sk-circleFadeDelay 1.2s infinite ease-in-out both; +} +.sk-fading-circle .sk-circle2 { + -webkit-transform: rotate(30deg); + -ms-transform: rotate(30deg); + transform: rotate(30deg); +} +.sk-fading-circle .sk-circle3 { + -webkit-transform: rotate(60deg); + -ms-transform: rotate(60deg); + transform: rotate(60deg); +} +.sk-fading-circle .sk-circle4 { + -webkit-transform: rotate(90deg); + -ms-transform: rotate(90deg); + transform: rotate(90deg); +} +.sk-fading-circle .sk-circle5 { + -webkit-transform: rotate(120deg); + -ms-transform: rotate(120deg); + transform: rotate(120deg); +} +.sk-fading-circle .sk-circle6 { + -webkit-transform: rotate(150deg); + -ms-transform: rotate(150deg); + transform: rotate(150deg); +} +.sk-fading-circle .sk-circle7 { + -webkit-transform: rotate(180deg); + -ms-transform: rotate(180deg); + transform: rotate(180deg); +} +.sk-fading-circle .sk-circle8 { + -webkit-transform: rotate(210deg); + -ms-transform: rotate(210deg); + transform: rotate(210deg); +} +.sk-fading-circle .sk-circle9 { + -webkit-transform: rotate(240deg); + -ms-transform: rotate(240deg); + transform: rotate(240deg); +} +.sk-fading-circle .sk-circle10 { + -webkit-transform: rotate(270deg); + -ms-transform: rotate(270deg); + transform: rotate(270deg); +} +.sk-fading-circle .sk-circle11 { + -webkit-transform: rotate(300deg); + -ms-transform: rotate(300deg); + transform: rotate(300deg); +} +.sk-fading-circle .sk-circle12 { + -webkit-transform: rotate(330deg); + -ms-transform: rotate(330deg); + transform: rotate(330deg); +} +.sk-fading-circle .sk-circle2:before { + -webkit-animation-delay: -1.1s; + animation-delay: -1.1s; +} +.sk-fading-circle .sk-circle3:before { + -webkit-animation-delay: -1s; + animation-delay: -1s; +} +.sk-fading-circle .sk-circle4:before { + -webkit-animation-delay: -0.9s; + animation-delay: -0.9s; +} +.sk-fading-circle .sk-circle5:before { + -webkit-animation-delay: -0.8s; + animation-delay: -0.8s; +} +.sk-fading-circle .sk-circle6:before { + -webkit-animation-delay: -0.7s; + animation-delay: -0.7s; +} +.sk-fading-circle .sk-circle7:before { + -webkit-animation-delay: -0.6s; + animation-delay: -0.6s; +} +.sk-fading-circle .sk-circle8:before { + -webkit-animation-delay: -0.5s; + animation-delay: -0.5s; +} +.sk-fading-circle .sk-circle9:before { + -webkit-animation-delay: -0.4s; + animation-delay: -0.4s; +} +.sk-fading-circle .sk-circle10:before { + -webkit-animation-delay: -0.3s; + animation-delay: -0.3s; +} +.sk-fading-circle .sk-circle11:before { + -webkit-animation-delay: -0.2s; + animation-delay: -0.2s; +} +.sk-fading-circle .sk-circle12:before { + -webkit-animation-delay: -0.1s; + animation-delay: -0.1s; +} + +@-webkit-keyframes sk-circleFadeDelay { + 0%, 39%, 100% { opacity: 0; } + 40% { opacity: 1; } +} + +@keyframes sk-circleFadeDelay { + 0%, 39%, 100% { opacity: 0; } + 40% { opacity: 1; } +} diff --git a/resources/public/css/yyy-static.css b/resources/public/css/yyy-static.css index 0587468..515088f 100644 --- a/resources/public/css/yyy-static.css +++ b/resources/public/css/yyy-static.css @@ -23,6 +23,14 @@ * ## html elements generally in alphabetic order */ +a { + color: silver; +} + +a:hover, a:active { + color: white; +} + body { font-family: "Archivo Narrow", "Helvetica", "Sans", sans-serif; background-color: rgb( 50, 109, 177); @@ -160,7 +168,7 @@ th { #main-container{ } -#back-link { +#back-link, .back-link { min-width: 8em; padding: 0.25em 1em; background-color: gray; @@ -170,7 +178,7 @@ th { border-bottom-right-radius: 0.5em; } -#back-link:hover, #back-link:active { +#back-link:hover, #back-link:active, .back-link:hover, .back-link:active, { text-decoration: none; background-color: rgb(160, 160, 160); } @@ -308,6 +316,9 @@ th { color: white; } +.splash-screen { +} + .warn { color: maroon; } @@ -430,7 +441,7 @@ th { } #nav menu li { - padding: 0.5em; + padding: 0.5em 2em 0.5em 0.5em; margin: 0.5 em; font-size: 150%; } @@ -463,6 +474,14 @@ th { text-align: right; } + .hidden { + display: none; + } + + .shown { + display: block; + } + /* content of the current in the Wiki - editable, provided by users. Within main-container */ #content { border: thin solid silver; @@ -496,22 +515,16 @@ th { font-weight: bold; } - #nav:hover #nav-menu, #nav:hover #phone-side-bar { - display: block; - list-style-type: none; - width: 100%; - } - #nav-icon { padding: 0; } - #nav-menu, #phone-side-bar { - display: none; + #nav-menu { + list-style-type: none; } #nav menu li { - padding: 0.5em; + padding: 0.5em 2em 0.5em 0.5em; margin: 0.5 em; font-size: 150%; } diff --git a/resources/public/img/clojure-icon.gif b/resources/public/img/clojure-icon.gif new file mode 100644 index 0000000..84eee16 Binary files /dev/null and b/resources/public/img/clojure-icon.gif differ diff --git a/resources/public/img/github-logo-transparent.png b/resources/public/img/github-logo-transparent.png new file mode 100644 index 0000000..6a37959 Binary files /dev/null and b/resources/public/img/github-logo-transparent.png differ diff --git a/resources/public/img/gnu.small.png b/resources/public/img/gnu.small.png new file mode 100644 index 0000000..04177f6 Binary files /dev/null and b/resources/public/img/gnu.small.png differ diff --git a/resources/public/img/ric-logo.png b/resources/public/img/ric-logo.png new file mode 100644 index 0000000..050b70d Binary files /dev/null and b/resources/public/img/ric-logo.png differ diff --git a/resources/templates/home.html b/resources/templates/home.html index 31a313d..5c334b5 100644 --- a/resources/templates/home.html +++ b/resources/templates/home.html @@ -1,38 +1,44 @@ - - - Welcome to YouYesYet + + + + + + You Yes Yet?
-
-
-
-

Welcome to YouYesYet

-

If you're seeing this message, that means you haven't yet compiled your ClojureScript!

-

Please run lein figwheel to start the ClojureScript compiler and reload the page.

-

For better ClojureScript development experience in Chrome follow these steps:

-
    -
  • Open DevTools -
  • Go to Settings ("three dots" icon in the upper right corner of DevTools > Menu > Settings F1 > General > Console) -
  • Check-in "Enable custom formatters" -
  • Close DevTools -
  • Open DevTools -
-

See ClojureScript documentation for further details.

-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+ You Yes Yet is loading. + You must enable JavaScript to use the You Yes Yet app. +

- {% script "/vendor/leaflet/dist/leaflet.js" %} - {% style "/assets/bootstrap/css/bootstrap.min.css" %} - {% style "/assets/font-awesome/css/font-awesome.min.css" %} - {% style "/css/screen.css" %} + + + + +