From 09f21b7abfdbe78a515833760f7567bd23614757 Mon Sep 17 00:00:00 2001
From: ckonstanski <ckonstanski@pippiandcarlos.com>
Date: Wed, 23 Dec 2020 18:40:07 -0700
Subject: moved json functions to separate library

---
 service/auth-service.lisp   | 2 +-
 service/home-service.lisp   | 6 +++---
 service/login-service.lisp  | 4 ++--
 service/logout-service.lisp | 2 +-
 service/menu-service.lisp   | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'service')

diff --git a/service/auth-service.lisp b/service/auth-service.lisp
index 24556b7..e6f3ef4 100644
--- a/service/auth-service.lisp
+++ b/service/auth-service.lisp
@@ -16,4 +16,4 @@
   `(let ((,instance (make-instance ',auth-service)))
      (when (null (errormsg ,instance))
        ,@body)
-     (objects-to-json `(,,instance))))
+     (org-ckons-json::objects-to-json `(,,instance))))
diff --git a/service/home-service.lisp b/service/home-service.lisp
index fd96b36..2685264 100644
--- a/service/home-service.lisp
+++ b/service/home-service.lisp
@@ -13,6 +13,6 @@
   (setf (content home-service) (format nil "Welcome to the ~a website" (title *webapp*))))
 
 (defun home-json (&optional message errormsg)
-  (objects-to-json `(,(make-instance 'home-service
-                                     :message message
-                                     :errormsg errormsg))))
+  (org-ckons-json::objects-to-json `(,(make-instance 'home-service
+                                                     :message message
+                                                     :errormsg errormsg))))
diff --git a/service/login-service.lisp b/service/login-service.lisp
index 7007327..10e0722 100644
--- a/service/login-service.lisp
+++ b/service/login-service.lisp
@@ -22,7 +22,7 @@
                                           (:label "Login" :field-type "button" :onclick "on_login_submit_clicked()")))))
 
 (defun login-json ()
-  (objects-to-json `(,(make-instance 'login-service))))
+  (org-ckons-json::objects-to-json `(,(make-instance 'login-service))))
 
 (defclass login-authenticate-service (rest-service)
   ((location-p :initarg :location-p
@@ -40,4 +40,4 @@
     (when (check-ldap-password (ldap *webapp*) dn password)
       (setf (session-value :permissions) "admin")
       (setf auth-result t))
-    (objects-to-json `(,(make-instance 'login-authenticate-service :auth-result auth-result)))))
+    (org-ckons-json::objects-to-json `(,(make-instance 'login-authenticate-service :auth-result auth-result)))))
diff --git a/service/logout-service.lisp b/service/logout-service.lisp
index afc3ace..10f469f 100644
--- a/service/logout-service.lisp
+++ b/service/logout-service.lisp
@@ -15,4 +15,4 @@
 
 (defun logout-json ()
   (setf (session-value :permissions) nil)
-  (objects-to-json `(,(make-instance 'logout-service))))
+  (org-ckons-json::objects-to-json `(,(make-instance 'logout-service))))
diff --git a/service/menu-service.lisp b/service/menu-service.lisp
index 8ee9c25..8ea0515 100644
--- a/service/menu-service.lisp
+++ b/service/menu-service.lisp
@@ -52,4 +52,4 @@
                                          *menu-config*)))))
 
 (defun menu-json ()
-  (objects-to-json `(,(make-instance 'menu-service))))
+  (org-ckons-json::objects-to-json `(,(make-instance 'menu-service))))
-- 
cgit v1.3