From 28f5a3f10cf6271b79c4e56e6f56162d441ad612 Mon Sep 17 00:00:00 2001 From: Simon Brooke Date: Sun, 26 Mar 2017 18:40:01 +0100 Subject: [PATCH] #30: Done The concerns of the server and client side are now separated; there's plenty of work still to be done on both but it's clear what belongs where. --- favicon.ico | Bin 0 -> 12862 bytes favicon.xcf | Bin 0 -> 3633 bytes resources/docs/docs.md | 35 ------------ resources/public/about.html | 51 ------------------ resources/public/blurb.html | 68 ------------------------ resources/public/call-me.html | 67 ----------------------- resources/public/electorsview.html | 61 --------------------- resources/public/facebook-login.html | 46 ---------------- resources/public/google-login.html | 46 ---------------- resources/public/index.html | 40 -------------- resources/public/library.html | 53 ------------------- resources/public/login.html | 45 ---------------- resources/public/mapview.html | 34 ------------ resources/public/notyet.html | 42 --------------- resources/public/register.html | 76 --------------------------- resources/public/supporter.html | 45 ---------------- resources/public/twitter-login.html | 46 ---------------- src/cljs/youyesyet/views/about.cljs | 1 - src/cljs/youyesyet/views/issue.cljs | 6 ++- 19 files changed, 4 insertions(+), 758 deletions(-) create mode 100644 favicon.ico create mode 100644 favicon.xcf delete mode 100644 resources/docs/docs.md delete mode 100644 resources/public/about.html delete mode 100644 resources/public/blurb.html delete mode 100644 resources/public/call-me.html delete mode 100644 resources/public/electorsview.html delete mode 100644 resources/public/facebook-login.html delete mode 100644 resources/public/google-login.html delete mode 100644 resources/public/index.html delete mode 100644 resources/public/library.html delete mode 100644 resources/public/login.html delete mode 100644 resources/public/mapview.html delete mode 100644 resources/public/notyet.html delete mode 100644 resources/public/register.html delete mode 100644 resources/public/supporter.html delete mode 100644 resources/public/twitter-login.html diff --git a/favicon.ico b/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..5df78a1e017f85e7e2f0c574e3c8b80cd1a88c0e GIT binary patch literal 12862 zcmeHOX-rgC6rLts#HuKrDmAgOtHeax&?VZ%pteaHEGWw;T0>Q0QPe7+xK(l2y0yU= zWrkq}L54;4AfU*i2*_?Nh*UO}9R_B=VK(SD40#MQ?>+`a|MZQA$(?iWx#xS|J@4Fe zZz6~D3jW#Iaqw-;v9aZFrgAtO8~j1V@yDM|Px^?Lzs(BE0LuW&0LuW&0LuW&0LuW& z0LuW&fSv*2vI#+s<7q|2dy9@GuFz?c(8)5wb57#U?@|sdO*_K7>hBo8V`2EZkA=%7 z20KrtwF-8&6gpcPL2-5OP|R-@8tG+MO^ZIz;1`nWRt{1)9X9(Tx=#}%!Z zmLGah)?BB0D%U6#7_Zf+2SjJ6R`e+4(g&FlQJX#kIYWkK9KPCW?)DQtpp=>lkV4(x zD~dQl7&}beEp5&|=Otb-O}v~7O0&*+sd{^cjUfN1El7#kHXn;cxn^#(R+rIE*4N)3 zzr#*%E8=k@y=;4=Ewm#^%133HLg&d3GQ&v&NP4VJ@&PB2%M@nh`reW81H9*)o{nac zI|jY1rCzJmFbp7c^(lK~a5^UV1&$Wd#}5dOo?WewOIvHpHEI=UisGn~!7j9^VA$)- z%s;~ZPN+Yv3joLu*^ifk?=U{Xb8czupCFBPq>)k~>qz!@;M>0@aIk=61#Il^L$n%y zx;vVK94$s%0%rVS?lVc`$NMc7xlS3(GdwQRW}NSWY{BmApglSf?7kCrs8Dj$Si+CQ z`z;c=4rOMf&4!9RWAp>Rg)Uali9crRJlZ9$%8Ei<8BdNp=`w{9tUj$EBk9D|N|)1C zzZ>Jb02!DTzsQXI$-sY{@3$Fe*3r%!z4?nk1i(+@%n}C+{W1kRSqdD+g{*uhdA~zJ zsDEvKQb&D7A6@Y1odzv^)0iTYCt|=KyX~vem@~BayBhwLnJukVMUr3VM0wd3Tt3|X zxQcc{Q)PWo8bWJC{4EblOl_gT8+B#NmzC+Ew7sKJVxMiRF4JnY=361_Chqzk+aELj zORJ{$$~#EYrk`G0ks>7ZzBoN1>dqzq;F0z(f#dkfObG)Fcxlpd_Om^G|YMiR4&m#BoC@i#e+{yUx*13#xThoLVVwYbd^QI&95{W|j?z ztD4*dT5RSh3&M}`?Oz=zq)|%`N~GspGq*6fs4u==8hr|7Uh+Qsur(j>mmr(HfvHfr z=_+j}OJrA4@FV?R**f1GoTM=zE!@M#aDL30FaDi0-cYZQwPV-Dc)dCHvYY2O=kk3F zB~P$D-gg1&Mne}=8;{o2TxU4vGql_5%F|D|Utar>*lk+$Cfnjjvr20?YO2V`aS5>T z2x#CGL+d@`tOxas6!L)v_qJdMt;wjB1L2DZ?i)>RgqQo*#L>UalX%W8iu?mhY3f(4 zRK%H_p7c*~Y31~;#%fcO7on-T8O^Z0GI(q(&kb?29!|Ti?8FO_7qX9JSd*Km?CvD> zDxb%wM*r4Blf|gAzi9X#cmooS@>_XWf@t8#iUdMkGdBdu_5r%pRJF?+yhHb!t(z#q8e^@e-5jPOuD z>kCsu+;Cl>TO*X6Dg`mrllIyVB1E;XujB{58C>h99r_+_s9PyQo~KOU=-P=@6k5{; zdZ|eew@?1gHXWna^hleCOKeh{QvjZ`5xROtTlHNMq|WAg+?!D@@UT&vJ|_)^KIfu0 zHTWeoL@rj>j=M47xq8^uC}w>eU>NK34ZY!*z6HpNO*Q2mEe*8N)!K+l zV_F!f@zRd1ly|n%8bVo;a8bN`Dy{8UDtTPwRb9q55#fM_!57xf)QZvskMg3J!4ccV kGQcvxGQcvxGQcvxGQcvxGQcvxG5`ih|1W^m|34V`4;FU=_5c6? literal 0 HcmV?d00001 diff --git a/favicon.xcf b/favicon.xcf new file mode 100644 index 0000000000000000000000000000000000000000..643b2f0afaf4367bfd2f50f301cf5549a4e8f5fa GIT binary patch literal 3633 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 Z1_S<e|*OLdyZ*((1H0?LU^aOQZk* literal 0 HcmV?d00001 diff --git a/resources/docs/docs.md b/resources/docs/docs.md deleted file mode 100644 index 5930be1..0000000 --- a/resources/docs/docs.md +++ /dev/null @@ -1,35 +0,0 @@ -
- -### Database Configuration is Required - -If you haven't already, then please follow the steps below to configure your database connection and run the necessary migrations. - -* Create the database for your application. -* Update the connection URL in the `profiles.clj` file with your database name and login. -* Run `lein run migrate` in the root of the project to create the tables. -* Let `mount` know to start the database connection by `require`-ing youyesyet.db.core in some other namespace. -* Restart the application. - -
- - -### Managing Your Middleware - -Request middleware functions are located under the `youyesyet.middleware` namespace. - -This namespace is reserved for any custom middleware for the application. Some default middleware is -already defined here. The middleware is assembled in the `wrap-base` function. - -Middleware used for development is placed in the `youyesyet.dev-middleware` namespace found in -the `env/dev/clj/` source path. - -### Here are some links to get started - -1. [HTML templating](http://www.luminusweb.net/docs/html_templating.md) -2. [Accessing the database](http://www.luminusweb.net/docs/database.md) -3. [Setting response types](http://www.luminusweb.net/docs/responses.md) -4. [Defining routes](http://www.luminusweb.net/docs/routes.md) -5. [Adding middleware](http://www.luminusweb.net/docs/middleware.md) -6. [Sessions and cookies](http://www.luminusweb.net/docs/sessions_cookies.md) -7. [Security](http://www.luminusweb.net/docs/security.md) -8. [Deploying the application](http://www.luminusweb.net/docs/deployment.md) diff --git a/resources/public/about.html b/resources/public/about.html deleted file mode 100644 index 370071f..0000000 --- a/resources/public/about.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - 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. -

-
-
-
- This is a dummy page illustrating the intended navigation flow through the app. It may be replaced by something more dynamic later. -
-
- - - diff --git a/resources/public/blurb.html b/resources/public/blurb.html deleted file mode 100644 index 53ee2e9..0000000 --- a/resources/public/blurb.html +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - Issues: Currency - - -
- - -

- Issues: Currency -

-
-
- -

- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer tincidunt - at ex id pretium. Proin nec ultricies mauris. Donec mattis, velit at commodo - vehicula, nisi velit mattis justo, at tempor enim eros eget tortor. Quisque - a porttitor lorem. Vestibulum tempus ex id sem laoreet, id fermentum enim - pharetra. Cras diam ante, pulvinar sed pharetra sed, venenatis eget tellus. - Quisque fermentum sem sed nulla mollis, et fermentum nisl pretium. Pellentesque - porttitor interdum ultricies. Nunc ut accumsan leo, rutrum tempor tellus. - Nam ultricies magna ipsum. -

-

- Pellentesque in est rutrum, consectetur nisi vel, dictum felis. Quisque id - elementum enim. Donec aliquet, massa id mattis semper, lectus elit scelerisque - justo, quis dapibus tortor eros a erat. Vestibulum erat mauris, consectetur id - condimentum ut, luctus vitae diam. Integer faucibus ultrices mi sed consequat. - Aliquam lacinia sapien quis urna blandit, sed consectetur ligula gravida. Ut - eleifend purus id mi vulputate faucibus ut quis risus. Donec dapibus finibus - tincidunt. Nunc luctus libero tellus, eget porta diam lacinia vel. Pellentesque - turpis nunc, venenatis vitae nisl eu, mollis pulvinar erat. Nulla scelerisque - tellus eget ex hendrerit tincidunt. -

-

- Duis tincidunt iaculis magna, ac rutrum velit congue quis. Maecenas feugiat - efficitur sem, in hendrerit erat. Nunc congue, dui sit amet commodo faucibus, - enim nisl feugiat nisl, a tincidunt massa metus nec nisi. Duis viverra nunc ut - libero tempus, sed convallis elit dapibus. Sed venenatis condimentum odio, non - elementum diam. Morbi fermentum metus justo, ac viverra dui fermentum at. - Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere - cubilia Curae; Aliquam erat volutpat. -

-
-
-
- This is a dummy page illustrating the intended navigation flow through the app. It may be replaced by something more dynamic later. -
-
- - - diff --git a/resources/public/call-me.html b/resources/public/call-me.html deleted file mode 100644 index 71b5ca9..0000000 --- a/resources/public/call-me.html +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - Please call me! - - -
- - -

- Please call me! -

-
-
-

- Use this form to request someone to phone you to discuss your concerns about independence. -

-
-

- - -

-

- - -

-

- - -

-

- - -

-

- - -

-
-
-
-
- This is a dummy page illustrating the intended navigation flow through the app. It may be replaced by something more dynamic later. -
-
- - diff --git a/resources/public/electorsview.html b/resources/public/electorsview.html deleted file mode 100644 index 793ee92..0000000 --- a/resources/public/electorsview.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - - Sign up! - - -
- -

- 43 Imaginary Terrace -

-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
Jock TamsonAnne TamsonMary Tamson
-
-
-
- This is a dummy page illustrating the intended navigation flow through the app. It may be replaced by something more dynamic later. -
-
- - diff --git a/resources/public/facebook-login.html b/resources/public/facebook-login.html deleted file mode 100644 index 15fe226..0000000 --- a/resources/public/facebook-login.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - Login with Facebook - - -
- - -

- Login with Facebook -

-
-
-

- The actual login page is provided by the 0-auth provider chosen by the user. We don't - handle login ourselves, and we don't store any passwords. -

- -
- Login -
-
-
-
- This is a dummy page illustrating the intended navigation flow through the app. It may be replaced by something more dynamic later. -
-
- - diff --git a/resources/public/google-login.html b/resources/public/google-login.html deleted file mode 100644 index 80422de..0000000 --- a/resources/public/google-login.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - Login with Google - - -
- - -

- Login with Google -

-
-
-

- The actual login page is provided by the 0-auth provider chosen by the user. We don't - handle login ourselves, and we don't store any passwords. -

- -
- Login -
-
-
-
- This is a dummy page illustrating the intended navigation flow through the app. It may be replaced by something more dynamic later. -
-
- - diff --git a/resources/public/index.html b/resources/public/index.html deleted file mode 100644 index be48712..0000000 --- a/resources/public/index.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - You Yes Yet? - - -
- - -

- You yes yet? -

-
-
-
- Yes -
-
- No -
-
-
-
- This is a dummy page illustrating the intended navigation flow through the app. It may be replaced by something more dynamic later. -
-
- - diff --git a/resources/public/library.html b/resources/public/library.html deleted file mode 100644 index 21379d8..0000000 --- a/resources/public/library.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - Issues - - -
- - -

- Issues -

-
- - -
-
- This is a dummy page illustrating the intended navigation flow through the app. It may be replaced by something more dynamic later. -
-
- - diff --git a/resources/public/login.html b/resources/public/login.html deleted file mode 100644 index 74f0bc3..0000000 --- a/resources/public/login.html +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - Please Log in - - -
- -

- Please Log in -

-
- -
-
- This is a dummy page illustrating the intended navigation flow through the app. It may be replaced by something more dynamic later. -
-
- - diff --git a/resources/public/mapview.html b/resources/public/mapview.html deleted file mode 100644 index 25bab78..0000000 --- a/resources/public/mapview.html +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - Sign up! - - -
- -
-
- - Dummy map view - -
-
-
- This is a dummy page illustrating the intended navigation flow through the app. It may be replaced by something more dynamic later. -
-
- - diff --git a/resources/public/notyet.html b/resources/public/notyet.html deleted file mode 100644 index c2b8bf9..0000000 --- a/resources/public/notyet.html +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - Can we persuade you? - - -
- -

- Can we persuade you? -

-
- -
-
- This is a dummy page illustrating the intended navigation flow through the app. It may be replaced by something more dynamic later. -
-
- - diff --git a/resources/public/register.html b/resources/public/register.html deleted file mode 100644 index 352b90f..0000000 --- a/resources/public/register.html +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - Sign up! - - -
- - -

- Sign up! -

-
-
-

- Use this form to request someone to phone you to discuss your concerns about independence. -

-
-

- - -

-

- - -

-

- - -

-

- - -

-

- - -

-

- - -

-

- - -

-
-
-
-
- This is a dummy page illustrating the intended navigation flow through the app. It may be replaced by something more dynamic later. -
-
- - diff --git a/resources/public/supporter.html b/resources/public/supporter.html deleted file mode 100644 index 321ac48..0000000 --- a/resources/public/supporter.html +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - Are you registered? - - -
- - -

- Have you signed up as a canvasser yet? -

-
-
- -
- Yes -
-
- No -
-
-
-
- This is a dummy page illustrating the intended navigation flow through the app. It may be replaced by something more dynamic later. -
-
- - diff --git a/resources/public/twitter-login.html b/resources/public/twitter-login.html deleted file mode 100644 index 3676415..0000000 --- a/resources/public/twitter-login.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - Login with Twitter - - -
- - -

- Login with Twitter -

-
-
-

- The actual login page is provided by the 0-auth provider chosen by the user. We don't - handle login ourselves, and we don't store any passwords. -

- -
- Login -
-
- - - diff --git a/src/cljs/youyesyet/views/about.cljs b/src/cljs/youyesyet/views/about.cljs index 186c95c..966e000 100644 --- a/src/cljs/youyesyet/views/about.cljs +++ b/src/cljs/youyesyet/views/about.cljs @@ -26,7 +26,6 @@ ;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - ;;; The pattern from the re-com demo (https://github.com/Day8/re-com) is to have ;;; one source file/namespace per view. Each namespace contains a function 'panel' ;;; whose output is an enlive-style specification of the view to be redered. diff --git a/src/cljs/youyesyet/views/issue.cljs b/src/cljs/youyesyet/views/issue.cljs index f86be91..20620d6 100644 --- a/src/cljs/youyesyet/views/issue.cljs +++ b/src/cljs/youyesyet/views/issue.cljs @@ -1,5 +1,6 @@ (ns youyesyet.views.issue (:require [re-frame.core :refer [reg-sub subscribe]] + [markdown.core :refer [md->html]] [youyesyet.ui-utils :as ui] [youyesyet.views.issues :as issues])) @@ -41,7 +42,8 @@ [:h1 issue] [:div.container {:id "main-container"} [:div {:id "issue"} - [:div {:id "issue-text"} - (issues issue)]] + [:div {:id "issue-text" + :dangerouslySetInnerHTML + {:__html (md->html (issues issue))}}]] (ui/big-link "Request call" "#/followup") (ui/back-link)]]))