From 95507002c7fb5e824e0446e0dadef02a59a78da3 Mon Sep 17 00:00:00 2001 From: simon Date: Wed, 5 Apr 2017 09:56:27 +0100 Subject: [PATCH] Very rough beginning of making the database stuff work. --- resources/sql/queries.sql | 28 ++++++++++++++++++++++ src/clj/youyesyet/routes/authenticated.clj | 23 ++++++++++++------ 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql index 6dbcae4..29a9d67 100644 --- a/resources/sql/queries.sql +++ b/resources/sql/queries.sql @@ -1,3 +1,31 @@ +------------------------------------------------------------------------------; +---- +---- youyesyet.routes.authenticated: routes and pages for authenticated users. +---- +---- This program is free software; you can redistribute it and/or +---- modify it under the terms of the GNU General Public License +---- as published by the Free Software Foundation; either version 2 +---- of the License, or (at your option) any later version. +---- +---- This program is distributed in the hope that it will be useful, +---- but WITHOUT ANY WARRANTY; without even the implied warranty of +---- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +---- GNU General Public License for more details. +---- +---- You should have received a copy of the GNU General Public License +---- along with this program; if not, write to the Free Software +---- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +---- USA. +---- +---- Copyright (C) 2016 Simon Brooke for Radical Independence Campaign +---- +------------------------------------------------------------------------------; + +-- This file gets slurped in and converted into simple functions by the line +-- in youyesyet.db.core.clj: +-- (conman/bind-connection *db* "sql/queries.sql") +-- the functions then appeare in the youyesyet.db.core namespace. + -- :name create-address! :! :n -- :doc creates a new address record INSERT INTO addresses diff --git a/src/clj/youyesyet/routes/authenticated.clj b/src/clj/youyesyet/routes/authenticated.clj index b5c2644..7e38955 100644 --- a/src/clj/youyesyet/routes/authenticated.clj +++ b/src/clj/youyesyet/routes/authenticated.clj @@ -1,12 +1,12 @@ (ns youyesyet.routes.authenticated - (:require [clojure.walk :refer [keywordize-keys]] + (:require [clojure.java.io :as io] + [clojure.walk :refer [keywordize-keys]] + [compojure.core :refer [defroutes GET POST]] [noir.response :as nresponse] [noir.util.route :as route] - [youyesyet.layout :as layout] - [youyesyet.db.core :as db-core] - [compojure.core :refer [defroutes GET POST]] [ring.util.http-response :as response] - [clojure.java.io :as io])) + [youyesyet.layout :as layout] + [youyesyet.db.core :as db])) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;; @@ -31,5 +31,14 @@ ;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; (defn roles-page [request] -;; (if +;;; This code adapted from http://www.luminusweb.net/docs#accessing_the_database + +(defn canvassers-page + [request] + (if + (:params request) + (let [params (:params request)] + (if (:id params) + (db/update-canvasser! params) + (db/create-canvasser! params))))) +