Skip to content
Permalink
Browse files

release "2.9.12.13"

  • Loading branch information...
yogthos committed Dec 31, 2017
1 parent 28d82f9 commit d3cbc6e12573c383a86c0f1ededd2b19e732361c
@@ -1,6 +1,11 @@
## 2.9.12.13

- bootstrap 4.0.0-beta.3
- conman 0.7.5
- org.webjars.bower/tether 1.4.3
- org.webjars/font-awesome 5.0.2
- navbar cleanup
- [migratus support for boot](https://github.com/luminus-framework/luminus-template/pull/341)

## 2.9.12.12

@@ -31,9 +31,14 @@ <h4>For better ClojureScript development experience in Chrome follow these steps

<!-- scripts and styles -->
{% style "/assets/bootstrap/css/bootstrap.min.css" %}
{% style "/assets/font-awesome/css/font-awesome.min.css" %}
{% style "/assets/font-awesome/web-fonts-with-css/css/fontawesome-all.min.css" %}
{% style "/css/screen.css" %}

{% script "/assets/jquery/jquery.min.js" %}
{% script "/assets/font-awesome/svg-with-js/js/fontawesome.min.js" %}
{% script "/assets/tether/dist/js/tether.min.js" %}
{% script "/assets/bootstrap/js/bootstrap.min.js" %}

<script type="text/javascript">
var context = "{{servlet-context}}";
var csrfToken = "{{csrf-token}}";
@@ -1,6 +1,6 @@
# <<name>>

generated using Luminus version "2.9.12.12"
generated using Luminus version "2.9.12.13"

FIXME

@@ -42,14 +42,8 @@
:dev [:project/dev :profiles/dev]
:test [:project/dev :project/test :profiles/test]

:project/dev {:dependencies [[prone "1.1.4"]
[ring/ring-mock "0.3.2"]
[ring/ring-devel "1.6.3"]<%if war %>
<<dev-http-server-dependencies>><% endif %>
[pjstadig/humane-test-output "0.8.3"]<% if dev-dependencies %>
<<dev-dependencies>><% endif %>]
:plugins [[com.jakemccrary/lein-test-refresh "0.19.0"]<% if dev-plugins %>
<<dev-plugins>><% endif %>]<% if cljs %>
:project/dev {:dependencies [<<dev-dependencies>>]
:plugins [<<dev-plugins>>]<% if cljs %>
:cljsbuild
<<dev-cljsbuild>>
<% endif %>
@@ -7,21 +7,21 @@

<!-- styles -->
{% style "/assets/bootstrap/css/bootstrap.min.css" %}
{% style "/assets/font-awesome/css/font-awesome.min.css" %}
{% style "/assets/font-awesome/web-fonts-with-css/css/fontawesome-all.min.css" %}

{% style "/css/screen.css" %}
</head>
<body>
<!-- navbar -->
<nav class="navbar navbar-dark bg-primary" role="navigation">
<nav class="navbar navbar-dark bg-primary navbar-expand-md" role="navigation">
<button class="navbar-toggler hidden-sm-up"
type="button"
data-toggle="collapse"
data-target="#collapsing-navbar">
&#9776;
</button>
<div class="collapse navbar-toggleable-xs" id="collapsing-navbar">
<a class="navbar-brand" href="{{servlet-context}}/"><<name>></a>
<a class="navbar-brand" href="{{servlet-context}}/"><<name>></a>
<div class="collapse navbar-collapse" id="collapsing-navbar">
<ul class="nav navbar-nav">
<li class="nav-item">
<a href="{{servlet-context}}/"
@@ -46,6 +46,7 @@

<!-- scripts -->
{% script "/assets/jquery/jquery.min.js" %}
{% script "/assets/font-awesome/svg-with-js/js/fontawesome.min.js" %}
{% script "/assets/tether/dist/js/tether.min.js" %}
{% script "/assets/bootstrap/js/bootstrap.min.js" %}

@@ -9,25 +9,23 @@
[ajax.core :refer [GET POST]])
(:import goog.History))

(defn nav-link [uri title page collapsed?]
(defn nav-link [uri title page]
[:li.nav-item
{:class (when (= page (session/get :page)) "active")}
[:a.nav-link
{:href uri
:on-click #(reset! collapsed? true)} title]])
[:a.nav-link {:href uri} title]])

(defn navbar []
(let [collapsed? (r/atom true)]
(fn []
[:nav.navbar.navbar-dark.bg-primary
[:button.navbar-toggler.hidden-sm-up
{:on-click #(swap! collapsed? not)} ""]
[:div.collapse.navbar-toggleable-xs
(when-not @collapsed? {:class "in"})
[:a.navbar-brand {:href "#/"} "<<name>>"]
[:ul.nav.navbar-nav
[nav-link "#/" "Home" :home collapsed?]
[nav-link "#/about" "About" :about collapsed?]]]])))
[:nav.navbar.navbar-dark.bg-primary.navbar-expand-md
{:role "navigation"}
[:button.navbar-toggler.hidden-sm-up
{:type "button"
:data-toggle "collapse"
:data-target "#collapsing-navbar"} ""]
[:a.navbar-brand {:href "#/"} "<<name>>"]
[:div#collapsing-navbar.collapse.navbar-collapse
[:ul.nav.navbar-nav.mr-auto
[nav-link "#/" "Home" :home]
[nav-link "#/about" "About" :about]]]])

(defn about-page []
[:div.container
@@ -10,25 +10,23 @@
[<<project-ns>>.events])
(: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 nav-link [uri title page]
[:li.nav-item
{:class (when (= page @(rf/subscribe [:page])) "active")}
[:a.nav-link {:href uri} title]])

(defn navbar []
(r/with-let [collapsed? (r/atom true)]
[:nav.navbar.navbar-dark.bg-primary
[:button.navbar-toggler.hidden-sm-up
{:on-click #(swap! collapsed? not)} ""]
[:div.collapse.navbar-toggleable-xs
(when-not @collapsed? {:class "in"})
[:a.navbar-brand {:href "#/"} "<<name>>"]
[:ul.nav.navbar-nav
[nav-link "#/" "Home" :home collapsed?]
[nav-link "#/about" "About" :about collapsed?]]]]))
[:nav.navbar.navbar-dark.bg-primary.navbar-expand-md
{:role "navigation"}
[:button.navbar-toggler.hidden-sm-up
{:type "button"
:data-toggle "collapse"
:data-target "#collapsing-navbar"} ""]
[:a.navbar-brand {:href "#/"} "<<name>>"]
[:div#collapsing-navbar.collapse.navbar-collapse
[:ul.nav.navbar-nav.mr-auto
[nav-link "#/" "Home" :home]
[nav-link "#/about" "About" :about]]]])

(defn about-page []
[:div.container
@@ -91,7 +91,7 @@
:resource-paths ["resources"]})

(defn sort-deps [deps]
(sort-by (fn [dep] (str dep)) deps))
(sort-by (fn [[dep]] (str dep)) deps))

(defn format-options [{:keys [http-server-dependencies features] :as options}]
(let [boot? (some #{"+boot"} features)
@@ -118,9 +118,9 @@
['metosin/muuntaja "0.4.1"]
['metosin/ring-http-response "0.9.0"]
['funcool/struct "1.1.0"]
['org.webjars/bootstrap "4.0.0-alpha.5"]
['org.webjars/font-awesome "4.7.0"]
['org.webjars.bower/tether "1.4.0"]
['org.webjars/bootstrap "4.0.0-beta.3"]
['org.webjars/font-awesome "5.0.2"]
['org.webjars.bower/tether "1.4.3"]
['org.webjars/jquery "3.2.1"]
['org.clojure/tools.logging "0.4.0"]
['compojure "1.6.0"]
@@ -133,6 +133,15 @@
['org.clojure/tools.cli "0.3.5"]
['luminus-nrepl "0.1.4"]])

(def core-dev-dependencies
[['prone "1.1.4"]
['ring/ring-mock "0.3.2"]
['ring/ring-devel "1.6.3"]
['pjstadig/humane-test-output "0.8.3"]])

(def core-dev-plugins
[['com.jakemccrary/lein-test-refresh "0.19.0"]])

(defn generate-project
"Create a new Luminus project"
[options]
@@ -227,6 +236,8 @@
project-relative-paths
{:name (project-name name)
:dependencies core-dependencies
:dev-dependencies core-dev-dependencies
:dev-plugins core-dev-plugins
:selmer-renderer render-template
:min-lein-version "2.0.0"
:project-ns (sanitize-ns name)
@@ -18,8 +18,7 @@
(if (some #{"+war"} (:features options))
[(update-assets assets)
(-> options
(rename-keys {:http-server-dependencies :dev-http-server-dependencies})
(dissoc :immutant-session)
(dissoc :immutant-session :http-server-dependencies)
(assoc
:war true
:uberwar-options (indent root-indent (ring-options options)))
@@ -28,7 +27,8 @@
dependencies
(conj dependencies ['luminus/ring-ttl-session "0.3.1"]))))
(append-options :dependencies [['ring/ring-servlet "1.4.0"]])
(append-options :dev-dependencies [['directory-naming/naming-java "0.8"]])
(append-options :dev-dependencies (into [['directory-naming/naming-java "0.8"]]
(:http-server-dependencies options)))
(append-options :plugins (if (some #{"+lein"} (:features options))
[['lein-uberwar "0.2.0"]])))]
state))

0 comments on commit d3cbc6e

Please sign in to comment.
You can’t perform that action at this time.