Finished /web redirects/URLs
Caught a few redirects; moved the whole tree under a subRoute instead of having /web everywhere
This commit is contained in:
Daniel J. Summers
parent
da134318d8
commit
e8c3458e57
|
|
@ -61,83 +61,87 @@ module Configure =
|
||||||
/// Routes for PrayerTracker
|
/// Routes for PrayerTracker
|
||||||
let webApp =
|
let webApp =
|
||||||
router Handlers.CommonFunctions.fourOhFour [
|
router Handlers.CommonFunctions.fourOhFour [
|
||||||
GET [
|
// Traditional web app routes
|
||||||
subRoute "/web/church" [
|
subRoute"/web" [
|
||||||
route "es" Handlers.Church.maintain
|
GET [
|
||||||
routef "/%O/edit" Handlers.Church.edit
|
subRoute "/church" [
|
||||||
|
route "es" Handlers.Church.maintain
|
||||||
|
routef "/%O/edit" Handlers.Church.edit
|
||||||
|
]
|
||||||
|
route "/class/logon" (redirectTo true "/web/small-group/log-on")
|
||||||
|
routef "/error/%s" Handlers.Home.error
|
||||||
|
routef "/language/%s" Handlers.Home.language
|
||||||
|
subRoute "/legal" [
|
||||||
|
route "/privacy-policy" Handlers.Home.privacyPolicy
|
||||||
|
route "/terms-of-service" Handlers.Home.tos
|
||||||
|
]
|
||||||
|
route "/log-off" Handlers.Home.logOff
|
||||||
|
subRoute "/prayer-request" [
|
||||||
|
route "s" (Handlers.PrayerRequest.maintain true)
|
||||||
|
routef "s/email/%s" Handlers.PrayerRequest.email
|
||||||
|
route "s/inactive" (Handlers.PrayerRequest.maintain false)
|
||||||
|
route "s/lists" Handlers.PrayerRequest.lists
|
||||||
|
routef "s/%O/list" Handlers.PrayerRequest.list
|
||||||
|
route "s/maintain" (redirectTo true "/web/prayer-requests")
|
||||||
|
routef "s/print/%s" Handlers.PrayerRequest.print
|
||||||
|
route "s/view" (Handlers.PrayerRequest.view None)
|
||||||
|
routef "s/view/%s" (Some >> Handlers.PrayerRequest.view)
|
||||||
|
routef "/%O/edit" Handlers.PrayerRequest.edit
|
||||||
|
routef "/%O/expire" Handlers.PrayerRequest.expire
|
||||||
|
routef "/%O/restore" Handlers.PrayerRequest.restore
|
||||||
|
]
|
||||||
|
subRoute "/small-group" [
|
||||||
|
route "" Handlers.SmallGroup.overview
|
||||||
|
route "s" Handlers.SmallGroup.maintain
|
||||||
|
route "/announcement" Handlers.SmallGroup.announcement
|
||||||
|
routef "/%O/edit" Handlers.SmallGroup.edit
|
||||||
|
route "/log-on" (Handlers.SmallGroup.logOn None)
|
||||||
|
routef "/log-on/%O" (Some >> Handlers.SmallGroup.logOn)
|
||||||
|
route "/logon" (redirectTo true "/web/small-group/log-on")
|
||||||
|
routef "/member/%O/edit" Handlers.SmallGroup.editMember
|
||||||
|
route "/members" Handlers.SmallGroup.members
|
||||||
|
route "/preferences" Handlers.SmallGroup.preferences
|
||||||
|
]
|
||||||
|
route "/unauthorized" Handlers.Home.unauthorized
|
||||||
|
subRoute "/user" [
|
||||||
|
route "s" Handlers.User.maintain
|
||||||
|
routef "/%O/edit" Handlers.User.edit
|
||||||
|
routef "/%O/small-groups" Handlers.User.smallGroups
|
||||||
|
route "/log-on" Handlers.User.logOn
|
||||||
|
route "/logon" (redirectTo true "/web/user/log-on")
|
||||||
|
route "/password" Handlers.User.password
|
||||||
|
]
|
||||||
|
route "/" Handlers.Home.homePage
|
||||||
]
|
]
|
||||||
route "/web/class/logon" (redirectTo true "/small-group/log-on")
|
POST [
|
||||||
routef "/web/error/%s" Handlers.Home.error
|
subRoute "/church" [
|
||||||
routef "/web/language/%s" Handlers.Home.language
|
routef "/%O/delete" Handlers.Church.delete
|
||||||
subRoute "/web/legal" [
|
route "/save" Handlers.Church.save
|
||||||
route "/privacy-policy" Handlers.Home.privacyPolicy
|
]
|
||||||
route "/terms-of-service" Handlers.Home.tos
|
subRoute "/prayer-request" [
|
||||||
]
|
routef "/%O/delete" Handlers.PrayerRequest.delete
|
||||||
route "/web/log-off" Handlers.Home.logOff
|
route "/save" Handlers.PrayerRequest.save
|
||||||
subRoute "/web/prayer-request" [
|
]
|
||||||
route "s" (Handlers.PrayerRequest.maintain true)
|
subRoute "/small-group" [
|
||||||
routef "s/email/%s" Handlers.PrayerRequest.email
|
route "/announcement/send" Handlers.SmallGroup.sendAnnouncement
|
||||||
route "s/inactive" (Handlers.PrayerRequest.maintain false)
|
routef "/%O/delete" Handlers.SmallGroup.delete
|
||||||
route "s/lists" Handlers.PrayerRequest.lists
|
route "/log-on/submit" Handlers.SmallGroup.logOnSubmit
|
||||||
routef "s/%O/list" Handlers.PrayerRequest.list
|
routef "/member/%O/delete" Handlers.SmallGroup.deleteMember
|
||||||
route "s/maintain" (redirectTo true "/prayer-requests")
|
route "/member/save" Handlers.SmallGroup.saveMember
|
||||||
routef "s/print/%s" Handlers.PrayerRequest.print
|
route "/preferences/save" Handlers.SmallGroup.savePreferences
|
||||||
route "s/view" (Handlers.PrayerRequest.view None)
|
route "/save" Handlers.SmallGroup.save
|
||||||
routef "s/view/%s" (Some >> Handlers.PrayerRequest.view)
|
]
|
||||||
routef "/%O/edit" Handlers.PrayerRequest.edit
|
subRoute "/user" [
|
||||||
routef "/%O/expire" Handlers.PrayerRequest.expire
|
routef "/%O/delete" Handlers.User.delete
|
||||||
routef "/%O/restore" Handlers.PrayerRequest.restore
|
route "/edit/save" Handlers.User.save
|
||||||
]
|
route "/log-on" Handlers.User.doLogOn
|
||||||
subRoute "/web/small-group" [
|
route "/password/change" Handlers.User.changePassword
|
||||||
route "" Handlers.SmallGroup.overview
|
route "/small-groups/save" Handlers.User.saveGroups
|
||||||
route "s" Handlers.SmallGroup.maintain
|
]
|
||||||
route "/announcement" Handlers.SmallGroup.announcement
|
|
||||||
routef "/%O/edit" Handlers.SmallGroup.edit
|
|
||||||
route "/log-on" (Handlers.SmallGroup.logOn None)
|
|
||||||
routef "/log-on/%O" (Some >> Handlers.SmallGroup.logOn)
|
|
||||||
route "/logon" (redirectTo true "/small-group/log-on")
|
|
||||||
routef "/member/%O/edit" Handlers.SmallGroup.editMember
|
|
||||||
route "/members" Handlers.SmallGroup.members
|
|
||||||
route "/preferences" Handlers.SmallGroup.preferences
|
|
||||||
]
|
|
||||||
route "/web/unauthorized" Handlers.Home.unauthorized
|
|
||||||
subRoute "/web/user" [
|
|
||||||
route "s" Handlers.User.maintain
|
|
||||||
routef "/%O/edit" Handlers.User.edit
|
|
||||||
routef "/%O/small-groups" Handlers.User.smallGroups
|
|
||||||
route "/log-on" Handlers.User.logOn
|
|
||||||
route "/logon" (redirectTo true "/user/log-on")
|
|
||||||
route "/password" Handlers.User.password
|
|
||||||
]
|
|
||||||
route "/web/" Handlers.Home.homePage
|
|
||||||
route "/" (redirectTo true "/web/")
|
|
||||||
]
|
|
||||||
POST [
|
|
||||||
subRoute "/web/church" [
|
|
||||||
routef "/%O/delete" Handlers.Church.delete
|
|
||||||
route "/save" Handlers.Church.save
|
|
||||||
]
|
|
||||||
subRoute "/web/prayer-request" [
|
|
||||||
routef "/%O/delete" Handlers.PrayerRequest.delete
|
|
||||||
route "/save" Handlers.PrayerRequest.save
|
|
||||||
]
|
|
||||||
subRoute "/web/small-group" [
|
|
||||||
route "/announcement/send" Handlers.SmallGroup.sendAnnouncement
|
|
||||||
routef "/%O/delete" Handlers.SmallGroup.delete
|
|
||||||
route "/log-on/submit" Handlers.SmallGroup.logOnSubmit
|
|
||||||
routef "/member/%O/delete" Handlers.SmallGroup.deleteMember
|
|
||||||
route "/member/save" Handlers.SmallGroup.saveMember
|
|
||||||
route "/preferences/save" Handlers.SmallGroup.savePreferences
|
|
||||||
route "/save" Handlers.SmallGroup.save
|
|
||||||
]
|
|
||||||
subRoute "/web/user" [
|
|
||||||
routef "/%O/delete" Handlers.User.delete
|
|
||||||
route "/edit/save" Handlers.User.save
|
|
||||||
route "/log-on" Handlers.User.doLogOn
|
|
||||||
route "/password/change" Handlers.User.changePassword
|
|
||||||
route "/small-groups/save" Handlers.User.saveGroups
|
|
||||||
]
|
]
|
||||||
]
|
]
|
||||||
|
// Temp redirect to new URLs
|
||||||
|
route "/" (redirectTo false "/web/")
|
||||||
]
|
]
|
||||||
|
|
||||||
let errorHandler (ex : exn) (logger : ILogger) =
|
let errorHandler (ex : exn) (logger : ILogger) =
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user