Done, working.

This commit is contained in:
simon 2016-09-02 16:51:53 +01:00
parent ee5630ecb2
commit de7a553a86
5 changed files with 12 additions and 10 deletions

View file

@ -51,9 +51,9 @@ with the line
<img height="16" width="16" alt="The Web Engineering Factory &amp; Toolworks" src="img/weft.logo.64.png"> Developed by <a href="http://www.weft.scot/">WEFT</a> <img height="16" width="16" alt="The Web Engineering Factory &amp; Toolworks" src="img/weft.logo.64.png"> Developed by <a href="http://www.weft.scot/">WEFT</a>
## Prerequisites ## Prerequisites
You will need [Leiningen][1] 2.0 or above installed. You will need [Leiningen](https://github.com/technomancy/leiningen) 2.0 or above installed.
[1]: https://github.com/technomancy/leiningen You will need [node](https://nodejs.org/en/) and [bower](https://bower.io/) installed.
## Running ## Running
To start a web server for the application, run: To start a web server for the application, run:

View file

@ -28,10 +28,10 @@
:jvm-opts ["-server"] :jvm-opts ["-server"]
:plugins [[lein-ring "0.8.13" :exclusions [org.clojure/clojure]] :plugins [[lein-ring "0.8.13" :exclusions [org.clojure/clojure]]
[lein-environ "1.0.0"] [lein-environ "1.0.0"]
[lein-bower "0.5.1"]
[lein-ancient "0.5.5" :exclusions [org.clojure/clojure org.clojure/data.xml]] [lein-ancient "0.5.5" :exclusions [org.clojure/clojure org.clojure/data.xml]]
[lein-marginalia "0.7.1" :exclusions [org.clojure/clojure]] [lein-marginalia "0.7.1" :exclusions [org.clojure/clojure]]]
[lein-npm "0.6.2"]] :bower-dependencies [[simplemde "1.11.2"]]
:npm {:dependencies [[simplemde "1.11.2"]]}
:ring {:handler smeagol.handler/app :ring {:handler smeagol.handler/app
:init smeagol.handler/init :init smeagol.handler/init
:destroy smeagol.handler/destroy} :destroy smeagol.handler/destroy}

View file

@ -51,17 +51,19 @@ parts of Smeagol into another open source project which uses a less restrictive
license, please contact me; I'm open to dual licensing it. license, please contact me; I'm open to dual licensing it.
## Prerequisites ## Prerequisites
You will need [Leiningen][1] 2.0 or above installed. You will need [Leiningen](https://github.com/technomancy/leiningen) 2.0 or above installed.
[1]: https://github.com/technomancy/leiningen You will need [node](https://nodejs.org/en/) and [bower](https://bower.io/) installed.
## Running ## Running
To start a web server for the application, run: To start a web server for the application, run:
lein bower install
lein ring server lein ring server
Alternatively, if you want to deploy to a servlet container (which I would strongly recommend), the simplest thing is to run: Alternatively, if you want to deploy to a servlet container (which I would strongly recommend), the simplest thing is to run:
lein bower install
lein ring uberwar lein ring uberwar
(a command which I'm sure Smeagol would entirely appreciate) and deploy the resulting war file. (a command which I'm sure Smeagol would entirely appreciate) and deploy the resulting war file.

View file

@ -1,7 +1,7 @@
{% extends "templates/base.html" %} {% extends "templates/base.html" %}
{% block extra-headers %} {% block extra-headers %}
<link rel="stylesheet" href="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css"> <link rel="stylesheet" href="{{servlet-context}}/vendor/simplemde/dist/simplemde.min.css">
<script src="https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.js"></script> <script src="{{servlet-context}}/vendor/simplemde/dist/simplemde.min.js"></script>
{% endblock %} {% endblock %}
{% block content %} {% block content %}