From 7cce88f523c9a04cb9fbc74152807b35ef4bd442 Mon Sep 17 00:00:00 2001 From: Aaron Mueller Date: Wed, 23 Apr 2014 23:23:44 +0200 Subject: [PATCH] Bring the project up to date and rearrange the files --- project.clj | 9 ++++---- .../css/font-awesome.min.css | 0 .../layout => resources}/css/layout.css | 0 resources/{public => }/css/screen.css | 0 resources/{public => }/js/content-browser.js | 0 .../js/imagesloaded-3.1.4.pkgd.min.js | 0 .../js/jquery-2.0.3.min.js | 0 .../js/jquery-2.0.3.min.map | 0 {prototypes/layout => resources}/js/main.js | 0 .../js/masonry.pkgd.min.js | 0 .../layout => resources/views}/layout.html | 0 src/ldview/core.clj | 3 +-- src/ldview/{models => }/db.clj | 2 +- src/ldview/handler.clj | 7 +++---- src/ldview/models/competition.clj | 2 +- src/ldview/models/entry.clj | 2 +- src/ldview/models/source.clj | 2 +- src/ldview/models/user.clj | 2 +- src/ldview/routes.clj | 13 ++++++++++++ src/ldview/routes/home.clj | 13 ------------ src/ldview/templates.clj | 6 ++++++ src/ldview/util.clj | 1 - src/ldview/views/layout.clj | 19 ----------------- src/ldview/views/templates/entries.html | 16 -------------- src/ldview/views/templates/layout.html | 21 ------------------- 25 files changed, 32 insertions(+), 86 deletions(-) rename {prototypes/layout => resources}/css/font-awesome.min.css (100%) rename {prototypes/layout => resources}/css/layout.css (100%) rename resources/{public => }/css/screen.css (100%) rename resources/{public => }/js/content-browser.js (100%) rename {prototypes/layout => resources}/js/imagesloaded-3.1.4.pkgd.min.js (100%) rename {prototypes/layout => resources}/js/jquery-2.0.3.min.js (100%) rename {prototypes/layout => resources}/js/jquery-2.0.3.min.map (100%) rename {prototypes/layout => resources}/js/main.js (100%) rename {prototypes/layout => resources}/js/masonry.pkgd.min.js (100%) rename {prototypes/layout => resources/views}/layout.html (100%) rename src/ldview/{models => }/db.clj (94%) create mode 100644 src/ldview/routes.clj delete mode 100644 src/ldview/routes/home.clj create mode 100644 src/ldview/templates.clj delete mode 100644 src/ldview/util.clj delete mode 100644 src/ldview/views/layout.clj delete mode 100644 src/ldview/views/templates/entries.html delete mode 100644 src/ldview/views/templates/layout.html diff --git a/project.clj b/project.clj index ab4c547..e470c13 100644 --- a/project.clj +++ b/project.clj @@ -1,19 +1,18 @@ (defproject ldview "2" :dependencies [[org.clojure/clojure "1.5.1"] - [lib-noir "0.7.9"] + [lib-noir "0.8.2"] [compojure "1.1.6"] [ring-server "0.3.1"] - [selmer "0.5.9"] - [com.taoensso/timbre "3.0.0-RC4"] + [com.taoensso/timbre "3.1.6"] [com.postspectacular/rotor "0.1.0"] - [com.taoensso/tower "2.0.1"] + [com.taoensso/tower "2.1.0-RC1"] [log4j "1.2.17" :exclusions [javax.mail/mail javax.jms/jms com.sun.jdmk/jmxtools com.sun.jmx/jmxri]] [sqlitejdbc "0.5.6"] [korma "0.3.0-RC6"] - [clj-http "0.7.8"] + [clj-http "0.9.1"] [image-resizer "0.1.6"] [enlive "1.1.5"] [me.raynes/fs "1.4.5"]] diff --git a/prototypes/layout/css/font-awesome.min.css b/resources/css/font-awesome.min.css similarity index 100% rename from prototypes/layout/css/font-awesome.min.css rename to resources/css/font-awesome.min.css diff --git a/prototypes/layout/css/layout.css b/resources/css/layout.css similarity index 100% rename from prototypes/layout/css/layout.css rename to resources/css/layout.css diff --git a/resources/public/css/screen.css b/resources/css/screen.css similarity index 100% rename from resources/public/css/screen.css rename to resources/css/screen.css diff --git a/resources/public/js/content-browser.js b/resources/js/content-browser.js similarity index 100% rename from resources/public/js/content-browser.js rename to resources/js/content-browser.js diff --git a/prototypes/layout/js/imagesloaded-3.1.4.pkgd.min.js b/resources/js/imagesloaded-3.1.4.pkgd.min.js similarity index 100% rename from prototypes/layout/js/imagesloaded-3.1.4.pkgd.min.js rename to resources/js/imagesloaded-3.1.4.pkgd.min.js diff --git a/prototypes/layout/js/jquery-2.0.3.min.js b/resources/js/jquery-2.0.3.min.js similarity index 100% rename from prototypes/layout/js/jquery-2.0.3.min.js rename to resources/js/jquery-2.0.3.min.js diff --git a/prototypes/layout/js/jquery-2.0.3.min.map b/resources/js/jquery-2.0.3.min.map similarity index 100% rename from prototypes/layout/js/jquery-2.0.3.min.map rename to resources/js/jquery-2.0.3.min.map diff --git a/prototypes/layout/js/main.js b/resources/js/main.js similarity index 100% rename from prototypes/layout/js/main.js rename to resources/js/main.js diff --git a/prototypes/layout/js/masonry.pkgd.min.js b/resources/js/masonry.pkgd.min.js similarity index 100% rename from prototypes/layout/js/masonry.pkgd.min.js rename to resources/js/masonry.pkgd.min.js diff --git a/prototypes/layout/layout.html b/resources/views/layout.html similarity index 100% rename from prototypes/layout/layout.html rename to resources/views/layout.html diff --git a/src/ldview/core.clj b/src/ldview/core.clj index b252078..ae48deb 100644 --- a/src/ldview/core.clj +++ b/src/ldview/core.clj @@ -2,6 +2,5 @@ (:require [ldview.tasks.runner :as runner]) (:gen-class)) -;; TODO: Grab the title from the page (defn -main [competition-id] - (runner/load-competition competition-id "some title")) + (runner/load-competition competition-id)) diff --git a/src/ldview/models/db.clj b/src/ldview/db.clj similarity index 94% rename from src/ldview/models/db.clj rename to src/ldview/db.clj index dbc5398..574bc77 100644 --- a/src/ldview/models/db.clj +++ b/src/ldview/db.clj @@ -1,4 +1,4 @@ -(ns ldview.models.db +(ns ldview.db (:use korma.core [korma.db :only (defdb)]) (:require [ldview.models.schema :as schema])) diff --git a/src/ldview/handler.clj b/src/ldview/handler.clj index 948ad15..d763de4 100644 --- a/src/ldview/handler.clj +++ b/src/ldview/handler.clj @@ -1,12 +1,11 @@ (ns ldview.handler (:require [compojure.core :refer [defroutes]] - [ldview.routes.home :refer [home-routes]] + [ldview.routes :refer [all-routes]] [noir.util.middleware :as middleware] [compojure.route :as route] [taoensso.timbre :as timbre] [com.postspectacular.rotor :as rotor] - [ldview.models.schema :as schema]) - (:use ldview.util)) + [ldview.models.schema :as schema])) (defroutes app-routes (route/resources "/") @@ -33,7 +32,7 @@ (def app (middleware/app-handler ;; add your application routes here - [home-routes app-routes] + [all-routes app-routes] ;; add custom middleware here :middleware [] ;; add access rules here diff --git a/src/ldview/models/competition.clj b/src/ldview/models/competition.clj index 7550e36..193904b 100644 --- a/src/ldview/models/competition.clj +++ b/src/ldview/models/competition.clj @@ -1,6 +1,6 @@ (ns ldview.models.competition (:use korma.core - [ldview.models.db])) + [ldview.db])) (defn latest [] (first (select competitions diff --git a/src/ldview/models/entry.clj b/src/ldview/models/entry.clj index 56d2424..b2057ea 100644 --- a/src/ldview/models/entry.clj +++ b/src/ldview/models/entry.clj @@ -1,6 +1,6 @@ (ns ldview.models.entry (:use korma.core - [ldview.models.db]) + [ldview.db]) (:require [ldview.models.user :as user] [ldview.models.competition :as competition] [ldview.models.source :as source])) diff --git a/src/ldview/models/source.clj b/src/ldview/models/source.clj index c7452b5..3652043 100644 --- a/src/ldview/models/source.clj +++ b/src/ldview/models/source.clj @@ -1,6 +1,6 @@ (ns ldview.models.source (:use korma.core - [ldview.models.db])) + [ldview.db])) (defn create! [entry_id uri title] ; (if (empty? (select sources (where {:entry_id entry_id :type title}))) diff --git a/src/ldview/models/user.clj b/src/ldview/models/user.clj index 2806998..f10c260 100644 --- a/src/ldview/models/user.clj +++ b/src/ldview/models/user.clj @@ -1,6 +1,6 @@ (ns ldview.models.user (:use korma.core - [ldview.models.db])) + [ldview.db])) (defn user-id [username] (first (select users diff --git a/src/ldview/routes.clj b/src/ldview/routes.clj new file mode 100644 index 0000000..feb274f --- /dev/null +++ b/src/ldview/routes.clj @@ -0,0 +1,13 @@ +(ns ldview.routes + (:use compojure.core) + (:require [ldview.models.entry :as entry] + [ldview.templates :as templates])) + +; TODO: Replace with enlive template stuff +(defn entries-page [] + "bla") + + ; (layout/render "entries.html" {:entries (entry/all) :competition-id 28})) + +(defroutes all-routes + (GET "/" [] (entries-page))) diff --git a/src/ldview/routes/home.clj b/src/ldview/routes/home.clj deleted file mode 100644 index 8699068..0000000 --- a/src/ldview/routes/home.clj +++ /dev/null @@ -1,13 +0,0 @@ -(ns ldview.routes.home - (:use compojure.core) - (:require [ldview.views.layout :as layout] - [ldview.util :as util] - [ldview.models.entry :as entry])) - -; TODO: Make dropdown or something to choose the competition-id -(defn entries-page [] - (layout/render "entries.html" {:entries (entry/all) - :competition-id 28})) - -(defroutes home-routes - (GET "/" [] (entries-page))) diff --git a/src/ldview/templates.clj b/src/ldview/templates.clj new file mode 100644 index 0000000..40baae2 --- /dev/null +++ b/src/ldview/templates.clj @@ -0,0 +1,6 @@ +(ns ldview.templates + (:require [net.cgrand.enlive-html :as html])) + +(html/deftemplate home-template "../resources/views/layout.html" + [] + [:body] (html/content "test")) diff --git a/src/ldview/util.clj b/src/ldview/util.clj deleted file mode 100644 index 495899f..0000000 --- a/src/ldview/util.clj +++ /dev/null @@ -1 +0,0 @@ -(ns ldview.util) diff --git a/src/ldview/views/layout.clj b/src/ldview/views/layout.clj deleted file mode 100644 index 3d49087..0000000 --- a/src/ldview/views/layout.clj +++ /dev/null @@ -1,19 +0,0 @@ -(ns ldview.views.layout - (:require [selmer.parser :as parser] - [ring.util.response :refer [content-type response]]) - (:import compojure.response.Renderable)) - -(def template-path "ldview/views/templates/") - -(deftype RenderableTemplate [template params] - Renderable - (render [this request] - (content-type - (->> (assoc params :servlet-context (:context request)) - (parser/render-file (str template-path template)) - response) - "text/html; charset=utf-8"))) - -(defn render [template & [params]] - (RenderableTemplate. template params)) - diff --git a/src/ldview/views/templates/entries.html b/src/ldview/views/templates/entries.html deleted file mode 100644 index ff8e1c3..0000000 --- a/src/ldview/views/templates/entries.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "ldview/views/templates/layout.html" %} -{% block content %} -
- {% for entry in entries %} -
-
-

{{entry.title}}

- {{entry.author.name}} -
-
- {{entry.title}} -
- {% endfor %} -
-
-{% endblock %} diff --git a/src/ldview/views/templates/layout.html b/src/ldview/views/templates/layout.html deleted file mode 100644 index e399d85..0000000 --- a/src/ldview/views/templates/layout.html +++ /dev/null @@ -1,21 +0,0 @@ - - - - - ldview -- an alternative Ludum Dare entry viewer - - - - - - - -

Ludum Dare submissions viewer

- -
- {% block content %} - {% endblock %} -
- - -