diff of b041ecc7bf33ae42761aadb3ef8053ad796ef675
b041ecc7bf33ae42761aadb3ef8053ad796ef675
diff --git a/src/routes/root-routes.lisp b/src/routes/root-routes.lisp
index 6dc4e25..9764121 100644
--- a/src/routes/root-routes.lisp
+++ b/src/routes/root-routes.lisp
@@ -60,17 +60,18 @@
(progn
(setf (hunchentoot:return-code*) 404)
""))))
+
(defroute resources ("/resources/:file" :method :get) ()
(get-resource file))
-;; (defroute resources ("/blog/resources/:file" :method :get) ()
+;; (defroute resources ("/resources/:file" :method :get) ()
;; (get-resource file))
(defun @check-if-initial (next)
(if (user-db:no-users?)
(progn
(setf (hunchentoot:return-code*) 302)
- (setf (hunchentoot:header-out :location) "/blog/initial-setup")
+ (setf (hunchentoot:header-out :location) "/initial-setup")
"")
(funcall next)))
diff --git a/src/view/admin/media-admin.lisp b/src/view/admin/media-admin.lisp
index 2b439c3..88246f5 100644
--- a/src/view/admin/media-admin.lisp
+++ b/src/view/admin/media-admin.lisp
@@ -49,7 +49,7 @@
-(deftab blog/media-admin (:url "/blog/media-admin"
+(deftab blog/media-admin (:url "/media-admin"
:title "Manage media"
:require-login t
:needed-abilities ("create-post" "delete-post" "edit-post"))
diff --git a/src/view/admin/new-post.lisp b/src/view/admin/new-post.lisp
index bbce8f0..9ddbd67 100644
--- a/src/view/admin/new-post.lisp
+++ b/src/view/admin/new-post.lisp
@@ -20,7 +20,7 @@
;; :referrerpolicy "no-referrer"
)))
-(defroute blog/new-post ("/blog/new-post"
+(defroute blog/new-post ("/new-post"
:method :post
:decorators (@db
@ssr-authenticated)) ()
@@ -33,7 +33,7 @@
(redirect 'blog/post/editor :id (format nil "~d" post-id)))
"no can do")))
-(deftab blog/post/editor (:url "/blog/post/editor/:id"
+(deftab blog/post/editor (:url "/post/editor/:id"
:subtab murja.view.admin.post-list:blog/postadmin
:require-login t
:needed-abilities ("create-post" "delete-post" "edit-post")
diff --git a/src/view/admin/post-list.lisp b/src/view/admin/post-list.lisp
index 3f2be9f..57da058 100644
--- a/src/view/admin/post-list.lisp
+++ b/src/view/admin/post-list.lisp
@@ -46,7 +46,7 @@ from blog.post as orig_post,
(format nil "~a (~d)" tag count))))))))))
-(deftab blog/postadmin (:url "/blog/postadmin"
+(deftab blog/postadmin (:url "/postadmin"
:title "Manage posts"
:require-login t
:needed-abilities ("create-post" "delete-post" "edit-post"))
diff --git a/src/view/blog-root.lisp b/src/view/blog-root.lisp
index 45c7cc0..74177e2 100644
--- a/src/view/blog-root.lisp
+++ b/src/view/blog-root.lisp
@@ -15,7 +15,7 @@
(loaded-page (get-page 1 recent-post-count)))
(page loaded-page 1)))
-(deftab page-tab (:url "/blog/page/:id"
+(deftab page-tab (:url "/page/:id"
:subtab root
:captured-url-params (id))
(let* ((id (parse-integer id))
diff --git a/src/view/components/root.lisp b/src/view/components/root.lisp
index bc70d1a..4db43ef 100644
--- a/src/view/components/root.lisp
+++ b/src/view/components/root.lisp
@@ -34,8 +34,8 @@
(gethash month by-month)))))))))))))))
(defun sidebar/new-post ()
- (let ((disabled-routes (list "/blog/new-post"
- "/blog/post/editor")))
+ (let ((disabled-routes (list "/new-post"
+ "/post/editor")))
(with-html
(if (and *user*
(not (member (cl-ppcre:regex-replace "/\\d+$" (hunchentoot:request-uri*) "")
diff --git a/src/view/rss.lisp b/src/view/rss.lisp
index c611f83..feaed3f 100644
--- a/src/view/rss.lisp
+++ b/src/view/rss.lisp
@@ -7,7 +7,7 @@
(in-package :murja.view.rss)
-(deftab rss-single-item (:url "/blog/feeds/:feed-id/item/:item-id"
+(deftab rss-single-item (:url "/feeds/:feed-id/item/:item-id"
:subtab rss
:require-login t
:captured-url-params (feed-id item-id))
@@ -27,7 +27,7 @@ RETURNING id, title, description, link, author, pubdate" item-id feed-id :list))
:rss-link link)))
(murja.view.components.blogpost:blogpost p)))))
-(deftab rss-single-feed (:url "/blog/feeds/:feed-id"
+(deftab rss-single-feed (:url "/feeds/:feed-id"
:subtab rss
:params (&get archived)
:require-login t
@@ -56,7 +56,7 @@ ORDER BY pubdate DESC" feed-id (not (not archived))))
(:section ("Published ~a" (lisp-fixup:fix-timestamp pubdate)))))))))
-(defroute delete-feed-route ("/blog/feed/:id"
+(defroute delete-feed-route ("/feed/:id"
:decorators (@db
@ssr-authenticated)
:method :delete ) ()
@@ -68,7 +68,7 @@ ORDER BY pubdate DESC" feed-id (not (not archived))))
(ps
(defun-async delete-feed (feed-id)
- (let ((result (await (fetch (+ "/blog/feed/" feed-id)
+ (let ((result (await (fetch (+ "/feed/" feed-id)
(create method "DELETE")))))
(if (equal 204 (await (@ result status)))
(chain location (reload))
@@ -87,7 +87,7 @@ ORDER BY pubdate DESC" feed-id (not (not archived))))
(when (confirm (+ "Are you sure you wish to DELETE " (@ e target dataset feedname) "?"))
(delete-feed (@ e target dataset feedid)))))))))))))
-(defroute new-feed ("/blog/feed/"
+(defroute new-feed ("/feed/"
:decorators (@db
@ssr-authenticated)
:method :post)
@@ -96,7 +96,7 @@ ORDER BY pubdate DESC" feed-id (not (not archived))))
(let ((referer (hunchentoot:header-in* "referer")))
(hunchentoot:redirect referer)))
-(deftab rss (:url "/blog/feeds/"
+(deftab rss (:url "/feeds/"
:title "RSS Feeds"
:require-login t)
(let ((feeds (get-user-feeds2 (user-id *user*) nil))