diff --git a/project.clj b/project.clj
index 408db4a..8130d1e 100644
--- a/project.clj
+++ b/project.clj
@@ -126,7 +126,7 @@
[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/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/src/cljs/youyesyet/core.cljs b/src/cljs/youyesyet/core.cljs
index cc6cccb..bbc546b 100644
--- a/src/cljs/youyesyet/core.cljs
+++ b/src/cljs/youyesyet/core.cljs
@@ -10,57 +10,22 @@
[youyesyet.handlers]
[youyesyet.subscriptions]
[youyesyet.ui-utils :as ui]
+ [youyesyet.views.about :as about]
+ [youyesyet.views.home :as home]
[youyesyet.views.map :as maps])
(:import goog.History))
-(defn nav-link [uri title page collapsed?]
- (let [selected-page (rf/subscribe [:page])]
- [:li.nav-item
- {:class (when (= page @selected-page) "active")}
- [:a.nav-link
- {:href uri
- :on-click #(reset! collapsed? true)} title]]))
-
-
-(defn navbar []
- (r/with-let [collapsed? (r/atom true)]
- [:div {:id "nav"}
- [:img {:id "nav-icon"
- :src "img/threelines.png"
- :on-click #(swap! collapsed? not)}]
- [:menu.nav {:id "nav-menu" :class (if @collapsed? "hidden" "shown")}
- (nav-link "#/" "Home" :home collapsed?)
- (nav-link "#/library" "Library" :library collapsed?)
- (nav-link "#/register" "Register" :register collapsed?)
- (nav-link "#/login" "Login" :login collapsed?)
- (nav-link "#/about" "About" :about collapsed?)]]))
-
-
(defn about-page []
- [:div.container {:id "main-container"}
- (ui.back-link)
- [:div.row
- [:div.col-md-12
- "this is the story of youyesyet... work in progress"]]])
+ (about/panel))
(defn home-page []
- [:div.container {:id "main-container"}
- (big-link "About" "#/about")
- (big-link "Map" "#/map")
- [:div.jumbotron
- [:h1 "Welcome to youyesyet"]
- [:p "Time to start building your site!"]
- [:p [:a.btn.btn-primary.btn-lg {:href "http://luminusweb.net"} "Learn more ยป"]]]])
- (when-let [docs @(rf/subscribe [:docs])]
- [:div.row
- [:div.col-md-12
- [:div {:dangerouslySetInnerHTML
- {:__html (md->html docs)}}]]])
+ (home/panel))
+
(defn map-page []
- (maps/map-div))
+ (maps/panel))
(def pages
{:home #'home-page
@@ -70,7 +35,7 @@
(defn page []
[:div
[:header
- [navbar]
+ [ui/navbar]
[:h1 "You yes yet?"]]
[(pages @(rf/subscribe [:page]))]])
@@ -84,7 +49,6 @@
(secretary/defroute "/about" []
(rf/dispatch [:set-active-page :about]))
-
(secretary/defroute "/map" []
(rf/dispatch [:set-active-page :map]))
diff --git a/src/cljs/youyesyet/ui_utils.cljs b/src/cljs/youyesyet/ui_utils.cljs
index 7b9d4c4..2f651dd 100644
--- a/src/cljs/youyesyet/ui_utils.cljs
+++ b/src/cljs/youyesyet/ui_utils.cljs
@@ -1,8 +1,10 @@
-(ns youyesyet.ui-utils)
+(ns youyesyet.ui-utils
+ (:require [reagent.core :as r]
+ [re-frame.core :as rf]))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;
-;;;; youyesyet.views.electors: electors view for youyesyet.
+;;;; youyesyet.ui-utils: User interface stuff common to many views.
;;;;
;;;; This program is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU General Public License
@@ -23,8 +25,6 @@
;;;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;; User interface stuff common to many views
-
(defn back-link []
[:div.back-link-container {:id "back-link-container"}
@@ -34,3 +34,26 @@
(defn big-link [text target]
[:div.big-link-container
[:a.big-link {:href target} text]])
+
+
+(defn nav-link [uri title page collapsed?]
+ (let [selected-page (rf/subscribe [:page])]
+ [:li.nav-item
+ {:class (when (= page @selected-page) "active")}
+ [:a.nav-link
+ {:href uri
+ :on-click #(reset! collapsed? true)} title]]))
+
+
+(defn navbar []
+ (r/with-let [collapsed? (r/atom true)]
+ [:div {:id "nav"}
+ [:img {:id "nav-icon"
+ :src "img/threelines.png"
+ :on-click #(swap! collapsed? not)}]
+ [:menu.nav {:id "nav-menu" :class (if @collapsed? "hidden" "shown")}
+ (nav-link "#/" "Home" :home collapsed?)
+ (nav-link "#/library" "Library" :library collapsed?)
+ (nav-link "#/register" "Register" :register collapsed?)
+ (nav-link "#/login" "Login" :login collapsed?)
+ (nav-link "#/about" "About" :about collapsed?)]]))
diff --git a/src/cljs/youyesyet/views/about.cljs b/src/cljs/youyesyet/views/about.cljs
index 13832db..cbfcc7a 100644
--- a/src/cljs/youyesyet/views/about.cljs
+++ b/src/cljs/youyesyet/views/about.cljs
@@ -4,7 +4,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;
-;;;; youyesyet.views.electors: electors view for youyesyet.
+;;;; youyesyet.views.electors: about/credits view for youyesyet.
;;;;
;;;; This program is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU General Public License
@@ -34,7 +34,21 @@
"Generate the about panel."
[]
[:div.container {:id "main-container"}
- (ui/back-link)
- [:div.row
- [:div.col-md-12
- "this is the story of youyesyet... work in progress"]]])
+ [:h2 "Pre-alpha/proof of concept"]
+ [:p {:class "centre"}
+ [:img {:src "img/ric-logo.png" :width "24" :height "24"}]
+ " A project of the "
+ [:a {:href "https://radical.scot/"} "Radical Independence Campaign"]]
+ [:p {:class "centre"}
+ [:img {:src "img/clojure-icon.gif" :alt "Clojure" :height "24" :width "24"}]
+ " Powered by "
+ [:a {:href "http://clojure.org"} "Clojure"]]
+ [:p {:class "centre"}
+ [:img {:src "img/github-logo-transparent.png" :alt "GitHub" :height "24" :width "24"}]
+ " Find me/fork me on "
+ [:a {:href "https://github.com/simon-brooke/youyesyet"} "GitHub"]]
+ [:p {:class "centre"}
+ [:img {:src "img/gnu.small.png" :alt "Free Software Foundation" :height "24" :width "24"}]
+ " Licensed under the "
+ [:a {:href "http://www.gnu.org/licenses/gpl-2.0.html"}
+ "GNU General Public License v2.0"]]])
diff --git a/src/cljs/youyesyet/views/home.cljs b/src/cljs/youyesyet/views/home.cljs
index 15c628d..bbf270d 100644
--- a/src/cljs/youyesyet/views/home.cljs
+++ b/src/cljs/youyesyet/views/home.cljs
@@ -4,7 +4,7 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;;;
-;;;; youyesyet.views.electors: electors view for youyesyet.
+;;;; youyesyet.views.electors: home view for youyesyet.
;;;;
;;;; This program is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU General Public License