diff --git a/rmo/mock.go b/rmo/mock.go index 3e6874ce..7e743eb4 100644 --- a/rmo/mock.go +++ b/rmo/mock.go @@ -38,11 +38,11 @@ func addMockRoutes(r chi.Router) { func makeContentURLMock(slug string) ContentURL { return ContentURL{ - Nuisance: makeURLMock(slug, "nuisance"), - NuisanceSubmitComplete: makeURLMock(slug, "nuisance-submit-complete"), - Status: makeURLMock(slug, "status"), - Tegola: config.MakeURLTegola("/"), - Water: makeURLMock(slug, "water"), + Nuisance: makeURLMock(slug, "nuisance"), + Status: makeURLMock(slug, "status"), + SubmitComplete: makeURLMock(slug, "nuisance-submit-complete"), + Tegola: config.MakeURLTegola("/"), + Water: makeURLMock(slug, "water"), } } func makeURLMock(slug, p string) string { diff --git a/rmo/root.go b/rmo/root.go index 9edc85a4..82e5a8f1 100644 --- a/rmo/root.go +++ b/rmo/root.go @@ -21,12 +21,12 @@ type ContentRoot struct { URL ContentURL } type ContentURL struct { - Nuisance string - NuisanceSubmit string - NuisanceSubmitComplete string - Status string - Tegola string - Water string + Nuisance string + NuisanceSubmit string + SubmitComplete string + Status string + Tegola string + Water string } var ( diff --git a/rmo/routes.go b/rmo/routes.go index 58421969..cd959ef7 100644 --- a/rmo/routes.go +++ b/rmo/routes.go @@ -11,19 +11,19 @@ func Router() chi.Router { r.Get("/nuisance", getNuisance) r.Post("/nuisance", postNuisance) r.Get("/submit-complete", getSubmitComplete) + r.Get("/water", getWater) r.Get("/district/{slug}", getRootDistrict) r.Get("/district/{slug}/nuisance", getNuisanceDistrict) //r.Get("/district/{slug}/nuisance-submit-complete", renderMock(mockNuisanceSubmitCompleteT)) //r.Get("/district/{slug}/status", renderMock(mockStatusT)) - //r.Get("/district/{slug}/water", renderMock(mockWaterT)) + r.Get("/district/{slug}/water", getWaterDistrict) r.Get("/privacy", getPrivacy) r.Get("/robots.txt", getRobots) r.Get("/email", getEmailByCode) r.Get("/image/{uuid}", getImageByUUID) r.Route("/mock", addMockRoutes) - r.Get("/pool", getPool) r.Post("/pool-submit", postPool) r.Get("/pool-submit-complete", getPoolSubmitComplete) r.Get("/quick", getQuick) diff --git a/rmo/template/pool.html b/rmo/template/water.html similarity index 62% rename from rmo/template/pool.html rename to rmo/template/water.html index df27fa55..b3584dad 100644 --- a/rmo/template/pool.html +++ b/rmo/template/water.html @@ -8,6 +8,7 @@ + {{template "photo-upload-header"}}