From 5b07edd2db4bde34a577c1d2fa62ca42146ecd03 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 12 Mar 2012 13:42:04 +0200 Subject: [PATCH] RootR to HomeR #267 --- yesod/scaffold/Application.hs.cg | 2 +- yesod/scaffold/Foundation.hs.cg | 4 ++-- yesod/scaffold/Handler/{Root.hs.cg => Home.hs.cg} | 8 ++++---- yesod/scaffold/config/routes.cg | 2 +- yesod/scaffold/project.cabal.cg | 2 +- yesod/scaffold/tiny/Application.hs.cg | 2 +- yesod/scaffold/tiny/config/routes.cg | 2 +- yesod/scaffold/tiny/project.cabal.cg | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) rename yesod/scaffold/Handler/{Root.hs.cg => Home.hs.cg} (86%) diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg index b2580d2c..d7f831c2 100644 --- a/yesod/scaffold/Application.hs.cg +++ b/yesod/scaffold/Application.hs.cg @@ -21,7 +21,7 @@ import qualified Database.Persist.Store~importMigration~ import Network.HTTP.Conduit (newManager, def) -- Import all relevant handler modules here. -import Handler.Root +import Handler.Home -- This line actually creates our YesodSite instance. It is the second half -- of the call to mkYesodData which occurs in Foundation.hs. Please see diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg index 246a08ba..2745c83b 100644 --- a/yesod/scaffold/Foundation.hs.cg +++ b/yesod/scaffold/Foundation.hs.cg @@ -137,9 +137,9 @@ instance YesodAuth ~sitearg~ where type AuthId ~sitearg~ = UserId -- Where to send a user after successful login - loginDest _ = RootR + loginDest _ = HomeR -- Where to send a user after logout - logoutDest _ = RootR + logoutDest _ = HomeR getAuthId creds = runDB $ do x <- getBy $ UniqueUser $ credsIdent creds diff --git a/yesod/scaffold/Handler/Root.hs.cg b/yesod/scaffold/Handler/Home.hs.cg similarity index 86% rename from yesod/scaffold/Handler/Root.hs.cg rename to yesod/scaffold/Handler/Home.hs.cg index 708a5382..a0a1bb2d 100644 --- a/yesod/scaffold/Handler/Root.hs.cg +++ b/yesod/scaffold/Handler/Home.hs.cg @@ -1,16 +1,16 @@ -module Handler.Root where +module Handler.Home where import Import --- This is a handler function for the GET request method on the RootR +-- This is a handler function for the GET request method on the HomeR -- resource pattern. All of your resource patterns are defined in -- config/routes -- -- The majority of the code you will write in Yesod lives in these handler -- functions. You can spread them across multiple files if you are so -- inclined, or create a single monolithic file. -getRootR :: Handler RepHtml -getRootR = do +getHomeR :: Handler RepHtml +getHomeR = do defaultLayout $ do h2id <- lift newIdent setTitle "~project~ homepage" diff --git a/yesod/scaffold/config/routes.cg b/yesod/scaffold/config/routes.cg index 7a0bb067..d20ca65e 100644 --- a/yesod/scaffold/config/routes.cg +++ b/yesod/scaffold/config/routes.cg @@ -4,4 +4,4 @@ /favicon.ico FaviconR GET /robots.txt RobotsR GET -/ RootR GET +/ HomeR GET diff --git a/yesod/scaffold/project.cabal.cg b/yesod/scaffold/project.cabal.cg index 79c75c47..adbb6ac9 100644 --- a/yesod/scaffold/project.cabal.cg +++ b/yesod/scaffold/project.cabal.cg @@ -32,7 +32,7 @@ library Model Settings Settings.StaticFiles - Handler.Root + Handler.Home ghc-options: -Wall -threaded -O0 cpp-options: -DDEVELOPMENT diff --git a/yesod/scaffold/tiny/Application.hs.cg b/yesod/scaffold/tiny/Application.hs.cg index 0112ac03..917f6a37 100644 --- a/yesod/scaffold/tiny/Application.hs.cg +++ b/yesod/scaffold/tiny/Application.hs.cg @@ -20,7 +20,7 @@ import Network.Wai.Middleware.RequestLogger (logCallback) import Network.Wai (Application) -- Import all relevant handler modules here. -import Handler.Root +import Handler.Home -- This line actually creates our YesodSite instance. It is the second half -- of the call to mkYesodData which occurs in Foundation.hs. Please see diff --git a/yesod/scaffold/tiny/config/routes.cg b/yesod/scaffold/tiny/config/routes.cg index f8eb4921..8ab56283 100644 --- a/yesod/scaffold/tiny/config/routes.cg +++ b/yesod/scaffold/tiny/config/routes.cg @@ -3,5 +3,5 @@ /favicon.ico FaviconR GET /robots.txt RobotsR GET -/ RootR GET +/ HomeR GET diff --git a/yesod/scaffold/tiny/project.cabal.cg b/yesod/scaffold/tiny/project.cabal.cg index 2c55a800..d5f41777 100644 --- a/yesod/scaffold/tiny/project.cabal.cg +++ b/yesod/scaffold/tiny/project.cabal.cg @@ -30,7 +30,7 @@ library Import Settings Settings.StaticFiles - Handler.Root + Handler.Home ghc-options: -Wall -threaded -O0 cpp-options: -DDEVELOPMENT