diff --git a/examples/Simple.hs b/examples/Simple.hs index fe4e07683c9a85f317cb5b40c6a9ed1fd14bb011..162943384f5d05e8a3377b1aebdb6795469ac3dd 100644 --- a/examples/Simple.hs +++ b/examples/Simple.hs @@ -110,15 +110,15 @@ where -- Disable caching for all the following endpoints. wrapAction (defaultHeader hCacheControl "no-store" >>) $ do -- Return search results and repeat the form. - route $ getSearchHtmlR <$ get <* seg "search" + route $ getSearchHtmlR <$ get </ "search" <* offerHTML -- Present a simple greeting page. - route $ getHelloR <$ get <* seg "hello" <*> arg + route $ getHelloR <$ get </ "hello" <*> arg <* offerText -- Create an echoing JSON API. - route $ postEchoR <$ post <* seg "api" <* seg "echo" + route $ postEchoR <$ post </ "api" </ "echo" <* offerJSON <* acceptJSON diff --git a/lib/Hikaru/Dispatch.hs b/lib/Hikaru/Dispatch.hs index 000cb5fcc82247bcc973137caf3b50dd5d9a2766..45442313b050cf7fa76ab30a12af5adc775f71eb 100644 --- a/lib/Hikaru/Dispatch.hs +++ b/lib/Hikaru/Dispatch.hs @@ -92,14 +92,14 @@ where -- app = dispatch runAction $ do -- 'middleware' $ logStdoutDev -- - -- 'route' $ getRootR \<$ 'get' - -- 'route' $ getHelloR \<$ 'get' <* 'seg' "hello" \<*\> 'arg' + -- 'route' $ getRootR \<$ 'Hikaru.Route.get' + -- 'route' $ getHelloR \<$ 'Hikaru.Route.get' \<\/ "hello" \<*\> 'arg' -- -- 'wrapRoute' needAuth $ do - -- 'route' $ getAdminR \<$ 'get' \<* 'seg' "admin" - -- 'route' $ postPassR \<$ 'post' \<* 'seg' "admin" \<* 'seg' "password" + -- 'route' $ getAdminR \<$ 'Hikaru.Route.get' \<\/ "admin" + -- 'route' $ postPassR \<$ 'Hikaru.Route.post' \<\/ "admin" \<\/ "password" -- - -- 'handle' 'NotFound' notFoundR + -- 'handler' 'NotFound' notFoundR -- @ -- dispatch :: forall r. (r -> Application) @@ -201,8 +201,8 @@ where -- app = 'dispatch' runAction $ do -- 'wrapRoutes' ('Hikaru.Action.defaultHeader' hCacheControl "no-cache" >>) -- - -- 'route' $ getRootR \<$ 'get' - -- 'route' $ getHelloR \<$ 'get' <* 'seg' "hello" \<*\> 'arg' + -- 'route' $ getRootR \<$ 'Hikaru.Route.get' + -- 'route' $ getHelloR \<$ 'Hikaru.Route.get' \<\/ "hello" \<*\> 'arg' -- @ -- wrapActions :: (r -> r) -> Dispatch r l ()