first working version

pkg/server/routes.go

@@ -1,4 +1,4 @@
-// Copyright (C) 2017 Marius Schellenberger
+// Copyright (C) 2018 Marius Schellenberger
 
 package server
 
@@ -37,7 +37,7 @@ var routes = []route{
 	{
 		"/new",
 		authHandler(
-			wikiNewHandler),
+			pageNewHandler),
 		[]string{"GET", "POST"},
 	},
 	{
@@ -46,55 +46,11 @@ var routes = []route{
 		[]string{"GET"},
 	},
 	{
-		"/wiki/{title:[a-zA-Z0-9+-]+$}",
-		wikiHandler,
-		[]string{"GET"},
-	},
-	{
-		"/wiki/{title:[a-zA-Z0-9+-]+}/md",
-		wikiMDHandler(
-			wikiHandler),
-		[]string{"GET"},
-	},
-	{
-		"/wiki/{title:[a-zA-Z0-9+-]+}/edit",
-		authHandler(
-			wikiEditHandler),
-		[]string{"GET", "POST"},
-	},
-	{
-		"/wiki/{title:[a-zA-Z0-9+-]+}/del",
-		authHandler(
-			wikiDelHandler),
-		[]string{"POST"},
-	},
-	{
-		"/users",
+		"/user",
 		adminAuthHandler(
-			usersHandler),
+			userHandler),
 		[]string{"GET"},
 	},
-	{
-		"/users/{user:[a-zA-Z0-9]+}/{title:[a-zA-Z0-9+-]+$}",
-		wikiHandler,
-		[]string{"GET"},
-	},
-	{
-		"/users/{user:[a-zA-Z0-9]+}/{title:[a-zA-Z0-9+-]+}/md",
-		wikiMDHandler(
-			wikiHandler),
-		[]string{"GET"},
-	},
-	{
-		"/users/{user:[a-zA-Z0-9]+}/{title:[a-zA-Z0-9+-]+}/edit",
-		wikiEditHandler,
-		[]string{"GET", "POST"},
-	},
-	{
-		"/users/{user:[a-zA-Z0-9]+}/{title:[a-zA-Z0-9+-]+}/del",
-		wikiDelHandler,
-		[]string{"POST"},
-	},
 	{
 		"/user/new",
 		adminAuthHandler(
@@ -124,4 +80,43 @@ var routes = []route{
 		logoutHandler,
 		[]string{"GET", "POST"},
 	},
+	{
+		"/view/{key}",
+		pageHandler,
+		[]string{"GET"},
+	},
+	{
+		"/view/{key}/md",
+		pageMDHandler(
+			pageHandler),
+		[]string{"GET"},
+	},
+	{
+		"/{section}/{title}",
+		pageHandler,
+		[]string{"GET"},
+	},
+	{
+		"/{section}/{title}/md",
+		pageMDHandler(
+			pageHandler),
+		[]string{"GET"},
+	},
+	{
+		"/{section}/{title}/share",
+		pageShareHandler,
+		[]string{"GET"},
+	},
+	{
+		"/{section}/{title}/edit",
+		authHandler(
+			pageEditHandler),
+		[]string{"GET", "POST"},
+	},
+	{
+		"/{section}/{title}/del",
+		authHandler(
+			pageDelHandler),
+		[]string{"GET", "POST"},
+	},
 }