simon/youyesyet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Dynamic site now looks very like the dummy...

Browse source 
But the phone menu isn't working nicely yet.
This commit is contained in:
Simon Brooke 2017-03-16 19:27:08 +00:00
parent a46f55e50e
commit 6b9e315b2f
3 changed files with 32 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
resources/public/css/yyy-static.css
View file

@ -23,6 +23,14 @@
* ## html elements generally in alphabetic order * ## html elements generally in alphabetic order
*/ */
a {
color: silver;
}
a:hover, a:active {
color: white;
}
body { body {
font-family: "Archivo Narrow", "Helvetica", "Sans", sans-serif; font-family: "Archivo Narrow", "Helvetica", "Sans", sans-serif;
background-color: rgb( 50, 109, 177); background-color: rgb( 50, 109, 177);
@ -430,7 +438,7 @@ th {
} }
#nav menu li { #nav menu li {
padding: 0.5em; padding: 0.5em 2em 0.5em 0.5em;
margin: 0.5 em; margin: 0.5 em;
font-size: 150%; font-size: 150%;
} }
@ -511,7 +519,7 @@ th {
} }
#nav menu li { #nav menu li {
padding: 0.5em; padding: 0.5em 2em 0.5em 0.5em;
margin: 0.5 em; margin: 0.5 em;
font-size: 150%; font-size: 150%;
} }

16
resources/templates/home.html
View file

@ -8,22 +8,6 @@
<title>You Yes Yet?</title> <title>You Yes Yet?</title>
</head> </head>
<body> <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 id="app">
<div class="container-fluid"> <div class="container-fluid">

33
src/cljs/youyesyet/core.cljs
View file

@ -12,6 +12,7 @@
[youyesyet.views.map :as maps]) [youyesyet.views.map :as maps])
(:import goog.History)) (:import goog.History))
(defn nav-link [uri title page collapsed?] (defn nav-link [uri title page collapsed?]
(let [selected-page (rf/subscribe [:page])] (let [selected-page (rf/subscribe [:page])]
[:li.nav-item [:li.nav-item
@ -20,28 +21,31 @@
{:href uri {:href uri
:on-click #(reset! collapsed? true)} title]])) :on-click #(reset! collapsed? true)} title]]))
(defn navbar [] (defn navbar []
(r/with-let [collapsed? (r/atom true)] (r/with-let [collapsed? (r/atom true)]
[:nav.navbar.navbar-light.bg-faded [:div {:id "nav"}
[:button.navbar-toggler.hidden-sm-up [:img {:id "nav-icon"
{:on-click #(swap! collapsed? not)} "☰"] :src "img/threelines.png"
[:div.collapse.navbar-toggleable-xs :on-click #(swap! collapsed? not)}]
(when-not @collapsed? {:class "in"}) [:menu.nav (merge {:id "nav-menu"} (when @collapsed? {:class "fred"}))
[:a.navbar-brand {:href "#/"} "You yes yet?"] (nav-link "#/" "Home" :home collapsed?)
[:ul.nav.navbar-nav (nav-link "#/library" "Library" :library collapsed?)
[nav-link "#/" "Home" :home collapsed?] (nav-link "#/register" "Register" :register collapsed?)
[nav-link "#/map" "Map" :home collapsed?] (nav-link "#/login" "Login" :login collapsed?)
[nav-link "#/about" "About" :about collapsed?]]]])) (nav-link "#/about" "About" :about collapsed?)]]))
(defn back-link [] (defn back-link []
[:div.back-link-container {:id ":div.back-link-container"} [:div.back-link-container {:id "back-link-container"}
[:a {:href "javascript:history.back()" :id "back-link"} "Back"]]) [:a {:href "javascript:history.back()" :id "back-link"} "Back"]])
(defn big-link [text target] (defn big-link [text target]
[:div.big-link-container [:div.big-link-container
[:a.big-link {:href target} text]]) [:a.big-link {:href target} text]])
(defn about-page [] (defn about-page []
[:div.container {:id "main-container"} [:div.container {:id "main-container"}
(back-link) (back-link)
@ -50,6 +54,7 @@
[:div.col-md-12 [:div.col-md-12
"this is the story of youyesyet... work in progress"]]]) "this is the story of youyesyet... work in progress"]]])
(defn home-page [] (defn home-page []
[:div.container {:id "main-container"} [:div.container {:id "main-container"}
(back-link) (back-link)
@ -75,7 +80,9 @@
(defn page [] (defn page []
[:div [:div
[:header
[navbar] [navbar]
[:h1 "You yes yet?"]]
[(pages @(rf/subscribe [:page]))]]) [(pages @(rf/subscribe [:page]))]])
;; ------------------------- ;; -------------------------
@ -88,6 +95,10 @@
(secretary/defroute "/about" [] (secretary/defroute "/about" []
(rf/dispatch [:set-active-page :about])) (rf/dispatch [:set-active-page :about]))
(secretary/defroute "/map" []
(rf/dispatch [:set-active-page :map]))
;; ------------------------- ;; -------------------------
;; History ;; History
;; must be called after routes have been defined ;; must be called after routes have been defined