Browse code
Modifications to make split projects work
fiddlerwoaroof authored on 06/11/2015 06:44:28
Showing 2 changed files
Showing 2 changed files
... | ... |
@@ -166,11 +166,14 @@ |
166 | 166 |
|
167 | 167 |
;;; TODO: add needs to return the new content, so that angular can append it |
168 | 168 |
|
169 |
+(defparameter *userasdfs* nil) |
|
169 | 170 |
(cl-oid-connect:def-route ("/feeds/json" (params) :app *app*) |
170 | 171 |
(ningle.context:with-context-variables (session) |
171 | 172 |
(let* ((user-info (gethash :app-user session)) |
172 | 173 |
(*feeds* (if user-info (deserialize user-info) *feeds*))) |
173 |
- `(200 (:content-type "application/json" :cache-control "private, max-age=300") ,(jsonapi-encoder t *feeds*))))) |
|
174 |
+ (setf *userasdfs* user-info) |
|
175 |
+ `(200 (:content-type "application/json" :cache-control "private, max-age=300") |
|
176 |
+ ,(jsonapi-encoder t *feeds*))))) |
|
174 | 177 |
|
175 | 178 |
(cl-oid-connect:def-route ("/feeds/:feeds/html" (params) :app *app*) |
176 | 179 |
(ningle.context:with-context-variables (session) |
... | ... |
@@ -188,9 +191,12 @@ |
188 | 191 |
(cl-oid-connect:def-route ("/demo" (params) :app *app*) |
189 | 192 |
(base-template-f t)) |
190 | 193 |
|
194 |
+#|(cl-oid-connect:require-login |
|
195 |
+ ))|# |
|
196 |
+ |
|
191 | 197 |
(cl-oid-connect:def-route ("/" (params) :app *app*) |
192 | 198 |
(ningle:with-context-variables (session) |
193 |
- (cl-oid-connect:require-login |
|
199 |
+ (cl-oid-connect.utils:require-login |
|
194 | 200 |
(cl-oid-connect:redirect-if-necessary session |
195 | 201 |
(let* ((user-info (gethash :app-user session)) |
196 | 202 |
(*feeds* (deserialize user-info))) |
... | ... |
@@ -406,4 +412,3 @@ |
406 | 412 |
(start))) |
407 | 413 |
|
408 | 414 |
|
409 |
-; vim: foldmethod=marker foldmarker=(,) foldminlines=3 : |
... | ... |
@@ -145,7 +145,7 @@ |
145 | 145 |
(collect item)))) |
146 | 146 |
|
147 | 147 |
(defserializer (rss-item) |
148 |
- title link (description :bind-from description) guid pub-date source) |
|
148 |
+ title link description guid pub-date source) |
|
149 | 149 |
|
150 | 150 |
(defmethod jonathan:%to-json ((obj rss-feed)) |
151 | 151 |
(jonathan:%to-json (serialize obj #'alexandria:alist-hash-table #'%json-pair-transform))) |