2023-08-04 10:47:55 (UTC-03:00)
Marcel Rodrigues <marcelgmr@gmail.com>
more consistent paths
diff --git a/skopos.lua b/skopos.lua index dfd93a8..d7d5b54 100644 --- a/skopos.lua +++ b/skopos.lua @@ -117,7 +117,7 @@ function App:routes() local env = {title=self.title, invites=invites} return lud.template.render_file("view/invites.html", env) end}, - {"POST", "/create%-invite", + {"POST", "/new/invite", function (req) local user = self:get_user(req) if user == nil then return "/login", 303 end @@ -125,7 +125,7 @@ function App:routes() self:log(LOG_INFO, "user "..user.nick.." generated a new invite") return "/invites", 303 end}, - {"POST", "/cancel%-invite/([%x]+)", + {"POST", "/del/invite/([%x]+)", function (req, uuid) local user = self:get_user(req) if user == nil then return "/login", 303 end @@ -141,14 +141,14 @@ function App:routes() local env = {title=self.title, user=user, projs=projs} return lud.template.render_file("view/projs.html", env) end}, - {"GET", "/new%-project", + {"GET", "/new/project", function (req) local user = self:get_user(req) if user == nil then return "/login", 303 end local env = {title=self.title, user=user} return lud.template.render_file("view/proj_form.html", env) end}, - {"POST", "/new%-project", + {"POST", "/new/project", function (req) local user = self:get_user(req) if user == nil then return "/login", 303 end @@ -161,7 +161,7 @@ function App:routes() self:log(LOG_INFO, "user "..user.nick.." created project "..name) return "/p", 303 end}, - {"GET", "/upd%-project/([-_%w]+)", + {"GET", "/p/([-_%w]+)/edit", function (req, name) local user = self:get_user(req) if user == nil then return "/login", 303 end @@ -170,7 +170,7 @@ function App:routes() local env = {title=self.title, user=user, proj=proj} return lud.template.render_file("view/proj_form.html", env) end}, - {"POST", "/upd%-project/([-_%w]+)", + {"POST", "/upd/project/([-_%w]+)", function (req, old_name) local user = self:get_user(req) if user == nil then return "/login", 303 end @@ -183,7 +183,7 @@ function App:routes() self:log(LOG_INFO, "user "..user.nick.." edited project "..old_name) return "/p", 303 end}, - {"POST", "/del%-project/([-_%w]+)", + {"POST", "/del/project/([-_%w]+)", function (req, name) local user = self:get_user(req) if user == nil then return "/login", 303 end diff --git a/view/invites.html b/view/invites.html index 7e3fca2..a5e477c 100644 --- a/view/invites.html +++ b/view/invites.html @@ -11,7 +11,7 @@ </head> <body> <h1 class="centered">Invites</h1> - <form class="centered" action="/create-invite" method="post"> + <form class="centered" action="/new/invite" method="post"> <button type="submit">new</button> </form> <br> @@ -26,7 +26,7 @@ <td><a href="/join?invite={{$invite.uuid}}" class="mono">{{$invite.uuid}}</a></td> <td>{{os.date("%Y-%m-%d %H:%M:%S", $invite.expire)}}</td> <td> - <form action="/cancel-invite/{{$invite.uuid}}" method="post"> + <form action="/del/invite/{{$invite.uuid}}" method="post"> <button type="submit">cancel</button> </form> </td> diff --git a/view/proj_form.html b/view/proj_form.html index 9484b84..6d0d018 100644 --- a/view/proj_form.html +++ b/view/proj_form.html @@ -11,11 +11,11 @@ <body> <h1 class="centered">Project</h1> % if $proj == nil then - % set action = "/new-project" + % set action = "/new/project" % set proj = {name="", desc="", goal="", color="#000000", priority=0} % set submit_value = "Create" % else - % set action = "/upd-project/" .. $proj.name + % set action = "/upd/project/" .. $proj.name % set submit_value = "Save" % end <form action="{{$action}}" method="post"> diff --git a/view/projs.html b/view/projs.html index 0a08b99..438484b 100644 --- a/view/projs.html +++ b/view/projs.html @@ -10,7 +10,7 @@ </head> <body> <h1 class="centered">Projects</h1> - <div class="centered"><a href="/new-project">new</a></div> + <div class="centered"><a href="/new/project">new</a></div> <br> <table class="center"> <tr> @@ -27,9 +27,9 @@ <td>{{$proj.desc}}</td> <td>{{$proj.priority}}</td> <td><span style="background-color:{{$proj.color}};">{{$proj.color}}</span></td> - <td><a href="/upd-project/{{$proj.name}}">edit</a></td> + <td><a href="/p/{{$proj.name}}/edit">edit</a></td> <td> - <form action="/del-project/{{$proj.name}}" method="post"> + <form action="/del/project/{{$proj.name}}" method="post"> <button type="submit">delete</button> </form> </td>