From a46f55e50e9cf6fc15086677a366cdeda4ca7003 Mon Sep 17 00:00:00 2001
From: Simon Brooke <simon@journeyman.cc>
Date: Thu, 16 Mar 2017 08:22:07 +0000
Subject: [PATCH] #22: This isn't even nearly working...
But it's starting to work!
---
resources/public/css/yyy-static.css | 4 ++--
resources/templates/home.html | 28 ++++++++++++++++++-------
src/cljs/youyesyet/core.cljs | 32 +++++++++++++++++++++--------
3 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/resources/public/css/yyy-static.css b/resources/public/css/yyy-static.css
index 0587468..a61993e 100644
--- a/resources/public/css/yyy-static.css
+++ b/resources/public/css/yyy-static.css
@@ -160,7 +160,7 @@ th {
#main-container{
}
-#back-link {
+#back-link, .back-link {
min-width: 8em;
padding: 0.25em 1em;
background-color: gray;
@@ -170,7 +170,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);
}
diff --git a/resources/templates/home.html b/resources/templates/home.html
index 31a313d..37db8b6 100644
--- a/resources/templates/home.html
+++ b/resources/templates/home.html
@@ -1,11 +1,29 @@
<!DOCTYPE html>
<html>
<head>
- <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <title>Welcome to YouYesYet</title>
+ <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link rel="stylesheet" type="text/css" href="css/yyy-static.css" />
+ <link href="https://fonts.googleapis.com/css?family=Archivo+Black|Archivo+Narrow" rel="stylesheet"/>
+ <title>You Yes Yet?</title>
</head>
<body>
+ <header>
+ <div id="nav">
+ <img id="nav-icon" src="img/threelines.png" alt="Menu"/>
+ <menu id="nav-menu" class="nav">
+ <li class=""><a href="index.html">Home</a></li>
+ <li class=""><a href="library.html">Library</a></li>
+ <li class=""><a href="register.html">Register</a></li>
+ <li class=""><a href="login.html">Login</a></li>
+ <li class=""><a href="about.html">About</a></li>
+ </menu>
+ </div>
+
+ <h1>
+ You yes yet?
+ </h1>
+ </header>
<div id="app">
<div class="container-fluid">
@@ -29,10 +47,6 @@
</div>
<!-- scripts and styles -->
- {% 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" %}
<script type="text/javascript">
var context = "{{servlet-context}}";
diff --git a/src/cljs/youyesyet/core.cljs b/src/cljs/youyesyet/core.cljs
index f6f5717..5976bd3 100644
--- a/src/cljs/youyesyet/core.cljs
+++ b/src/cljs/youyesyet/core.cljs
@@ -27,29 +27,43 @@
{:on-click #(swap! collapsed? not)} "☰"]
[:div.collapse.navbar-toggleable-xs
(when-not @collapsed? {:class "in"})
- [:a.navbar-brand {:href "#/"} "youyesyet"]
+ [:a.navbar-brand {:href "#/"} "You yes yet?"]
[:ul.nav.navbar-nav
[nav-link "#/" "Home" :home collapsed?]
[nav-link "#/map" "Map" :home collapsed?]
[nav-link "#/about" "About" :about collapsed?]]]]))
+
+(defn back-link []
+ [:div.back-link-container {:id ":div.back-link-container"}
+ [:a {:href "javascript:history.back()" :id "back-link"} "Back"]])
+
+(defn big-link [text target]
+ [:div.big-link-container
+ [:a.big-link {:href target} text]])
+
(defn about-page []
- [:div.container
+ [:div.container {:id "main-container"}
+ (back-link)
+ (big-link "Map" "#/map")
[:div.row
[:div.col-md-12
"this is the story of youyesyet... work in progress"]]])
(defn home-page []
- [:div.container
+ [:div.container {:id "main-container"}
+ (back-link)
+ (big-link "Map" "#/map")
+ (big-link "About" "#/about")
[: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)}}]]])])
+ [: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)}}]]])])
(defn map-page []
(maps/map-div))