Update configuration and routes

config.ar

@@ -5,4 +5,6 @@ term.log("domain: "+domain)
 let port = number(env.get("PORT", 7030))
 term.log("port: "+port)
 
-term.log(env)
+let env_keys = env.keys()
+for (i from 0 to env_keys.length) do
+    term.log(env_keys[i]+": "+env[env_keys[i]])

iso-lock.json

@@ -1 +1 @@
-[{"Name":"bleach.ar","Version":"1.0.0","URL":"https://isotope.wbell.dev/isotope-download?version=1.0.0\u0026name=bleach.ar","Remote":"isotope.wbell.dev"},{"Name":"shlex.ar","Version":"1.0.1","URL":"https://isotope.wbell.dev/isotope-download?name=shlex.ar\u0026version=1.0.1","Remote":"isotope.wbell.dev"},{"Name":"neon.ar","Version":"beta1.0.2","URL":"https://isotope.wbell.dev/isotope-download?version=beta1.0.2\u0026name=neon.ar","Remote":"isotope.wbell.dev"},{"Name":"url.ar","Version":"1.0.1","URL":"https://isotope.wbell.dev/isotope-download?name=url.ar\u0026version=1.0.1","Remote":"isotope.wbell.dev"},{"Name":"http.ar","Version":"1.0.5","URL":"https://isotope.wbell.dev/isotope-download?name=http.ar\u0026version=1.0.5","Remote":"isotope.wbell.dev"}]
+[{"Name":"bleach.ar","Version":"1.0.0","URL":"https://isotope.wbell.dev/isotope-download?name=bleach.ar\u0026version=1.0.0","Remote":"isotope.wbell.dev"},{"Name":"shlex.ar","Version":"1.0.1","URL":"https://isotope.wbell.dev/isotope-download?version=1.0.1\u0026name=shlex.ar","Remote":"isotope.wbell.dev"},{"Name":"neon.ar","Version":"beta1.0.2","URL":"https://isotope.wbell.dev/isotope-download?name=neon.ar\u0026version=beta1.0.2","Remote":"isotope.wbell.dev"},{"Name":"url.ar","Version":"1.0.1","URL":"https://isotope.wbell.dev/isotope-download?name=url.ar\u0026version=1.0.1","Remote":"isotope.wbell.dev"},{"Name":"http.ar","Version":"1.1.0","URL":"https://isotope.wbell.dev/isotope-download?name=http.ar\u0026version=1.1.0","Remote":"isotope.wbell.dev"}]

routes/isotope/download.ar

@@ -21,4 +21,4 @@ let download(req, res) = do
     let p = path.join([program.cwd, "data","packages", name, filename])
     package.downloads = package.get("downloads", 0) + 1
     res.sendFile(p)
-app.route("/isotope-download", null, download)
+app.get("/isotope-download", download)

routes/isotope/push.ar

@@ -44,4 +44,4 @@ let push(req, res) = do
         package.versions['latest'] = {redirect: version}
     makeChange()
     res.send("OK")
-app.route("/isotope-push", ['POST'], push)
+app.post("/isotope-push", push)

routes/isotope/search.ar

@@ -21,4 +21,4 @@ let search(req, res) = do
     let filename = currentVersion.get("filename")
     let URL = config.url+"/isotope-download?"+urllib.queryStr({name:currentVersion.name, version:currentVersion.version})
     res.json({Name: currentVersion.name, Version: currentVersion.version, URL:URL })
-app.route("/isotope-search", null, search)
+app.get("/isotope-search", search)

routes/website/account/account.ar

@@ -6,4 +6,4 @@ let accountpage(req, res) = do
     let acc = account.getByToken(req.cookies.get("token", ""))
     if (not acc) return res.redirect("/login?"+url.queryStr({to:req.path}))
     res.renderTemplate("account.html", {username:acc.username, email:acc.email})
-app.route("/account", null, accountpage)
+app.get("/account", accountpage)

routes/website/account/auth.ar

@@ -15,4 +15,4 @@ let accountpage(req, res) = do
     let deleteCommand = shlex.join(["isotope", "auth", "--remove", config.domain])
     term.log(command, deleteCommand)
     res.renderTemplate("auth.html", {command:command, deleteCommand:deleteCommand})
-app.route("/account/auth", ["POST"], accountpage)
+app.post("/account/auth", accountpage)

routes/website/account/login.ar

@@ -3,7 +3,6 @@ import "database" as *
 
 let login(req, res) = do
     let redirect = req.query.get("to", "/")
-    term.log(redirect, req.query)
     if (redirect == "/login") redirect = "/"
     let acc = account.getByToken(req.cookies.get("token", ""))
     if (acc) do
@@ -20,4 +19,4 @@ let login(req, res) = do
         res.redirect(redirect)
         return
     res.renderTemplate("login.html", {})
-app.route("/login", ["GET", "POST"], login)
+app.all("/login", login)

routes/website/account/logout.ar

@@ -7,4 +7,4 @@ let logout(req, res) = do
     term.log(account.deleteToken(req.cookies.get("token", "")))
     res.deleteCookie("token")
     res.redirect(redirect)
-app.route("/logout", null, logout)
+app.get("/logout", logout)

routes/website/account/register.ar

@@ -3,7 +3,6 @@ import "database" as *
 
 let register(req, res) = do
     let redirect = req.query.get("to", "/")
-    term.log(redirect, req.query)
     if (redirect == "/register") redirect = "/"
     let acc = account.getByToken(req.cookies.get("token", ""))
     if (acc) do
@@ -23,4 +22,4 @@ let register(req, res) = do
         res.redirect(redirect)
         return
     res.renderTemplate("register.html", {})
-app.route("/register", ["GET", "POST"], register)
+app.all("/register", register)

routes/website/home.ar

@@ -3,4 +3,4 @@ import "database" as *
 
 let home(req, res) = do
     res.renderTemplate("index.html", {})
-app.route("/", null, home)
+app.get("/", home)

routes/website/package.ar

@@ -46,4 +46,4 @@ let package(req, res) = do
         else versions.append(html)
     let author = account.getById(package.get("owner")) || {username:"Unknown", id:""}
     res.renderTemplate("package.html", {name:name, description: package.get("description", ""), 'short-description': package.get("short-description", ""), 'downloads': commaSeperatedNumber(package.get("downloads", 0)), keywords:package.get("keywords", []).join(', '), repository:package.get("repository", "https://github.com/"), license: package.get("license", "Unspecified"), author: author.username, authorPage: '/author?'+url.queryStr({id:author.id}), version:version, versions:versions.join(""), command:command, commandComma:command.replace("'", "\\'")})
-app.route("/package", null, package)
+app.get("/package", package)

routes/website/package/create.ar

@@ -56,4 +56,4 @@ let newPackage(req, res) = do
     values.repository = req.query.get("repository", "")
     values.keywords = req.query.get("keywords", "")
     res.renderTemplate("createPackage.html", values)
-app.route("/package/create", ["GET", "POST"], newPackage)
+app.all("/package/create", newPackage)

routes/website/package/edit.ar

@@ -58,4 +58,4 @@ let editPackage(req, res) = do
     values.repository = pkg["repository"]
     values.keywords = pkg["keywords"].join(", ")
     res.renderTemplate("editPackage.html", values)
-app.route("/package/edit", ["GET", "POST"], editPackage)
+app.all("/package/edit", editPackage)

routes/website/search.ar

@@ -36,4 +36,4 @@ let search(req, res) = do
     render.extend(namedSearch)
     render.extend(descriptionSearch)
     res.renderTemplate("search.html", {query:query, numOfResults:results, results:render.join(""), navbar:renderer.navbar(acc)})
-app.route("/search", null, search)
+app.get("/search", search)