diff --git a/rmo/nuisance.go b/rmo/nuisance.go index 14b0a832..c5de09a3 100644 --- a/rmo/nuisance.go +++ b/rmo/nuisance.go @@ -21,18 +21,20 @@ type ContentNuisance struct { URL ContentURL } type ContentNuisanceSubmitComplete struct { + District *ContentDistrict ReportID string + URL ContentURL } var ( - Nuisance = buildTemplate("nuisance", "base") - NuisanceSubmitComplete = buildTemplate("nuisance-submit-complete", "base") + NuisanceT = buildTemplate("nuisance", "base") + SubmitCompleteT = buildTemplate("submit-complete", "base") ) func getNuisance(w http.ResponseWriter, r *http.Request) { html.RenderOrError( w, - Nuisance, + NuisanceT, ContentNuisance{ District: nil, MapboxToken: config.MapboxToken, @@ -40,13 +42,15 @@ func getNuisance(w http.ResponseWriter, r *http.Request) { }, ) } -func getNuisanceSubmitComplete(w http.ResponseWriter, r *http.Request) { +func getSubmitComplete(w http.ResponseWriter, r *http.Request) { report := r.URL.Query().Get("report") html.RenderOrError( w, - NuisanceSubmitComplete, + SubmitCompleteT, ContentNuisanceSubmitComplete{ + District: nil, ReportID: report, + URL: makeContentURL(), }, ) } diff --git a/rmo/routes.go b/rmo/routes.go index a7cc3e0a..5c073267 100644 --- a/rmo/routes.go +++ b/rmo/routes.go @@ -10,6 +10,7 @@ func Router() chi.Router { r.Get("/", getRoot) r.Get("/nuisance", getNuisance) r.Post("/nuisance", postNuisance) + r.Get("/submit-complete", getSubmitComplete) //r.Get("/district/{slug}", renderMock(mockDistrictRootT)) //r.Get("/district/{slug}/nuisance", renderMock(mockNuisanceT)) //r.Get("/district/{slug}/nuisance-submit-complete", renderMock(mockNuisanceSubmitCompleteT)) @@ -21,7 +22,6 @@ func Router() chi.Router { r.Get("/email", getEmailByCode) r.Get("/image/{uuid}", getImageByUUID) r.Route("/mock", addMockRoutes) - r.Get("/nuisance-submit-complete", getNuisanceSubmitComplete) r.Get("/pool", getPool) r.Post("/pool-submit", postPool) r.Get("/pool-submit-complete", getPoolSubmitComplete) diff --git a/rmo/template/nuisance-submit-complete.html b/rmo/template/nuisance-submit-complete.html deleted file mode 100644 index 1e6c6237..00000000 --- a/rmo/template/nuisance-submit-complete.html +++ /dev/null @@ -1,115 +0,0 @@ -{{template "base.html" .}} - -{{define "title"}}Nuisance Submission Complete{{end}} -{{define "extraheader"}} - - -{{end}} -{{define "content"}} -
-
-
- -
-
-

- - - - Nuisance Report Complete -

-
-
-
-
- - - -
-

Thank You!

-

Your report has been successfully submitted.

-
- Report ID: - {{.ReportID|publicReportID}} -
-
- -
- - -
-
- - - - - What to Expect -
-
    -
  • - - - - - A confirmation message has been sent to your contact information. -
    • -
  • - - - - - - You will receive updates when: -
      -
    • Your report is assigned to a specialist
      • -
    • A site visit is scheduled
      • -
    • Treatment or remediation is completed
      • -
    • The case is resolved
      • -
    -
    • -
  • - - - - You can check your report status anytime using your Report ID. -
    • -
-
- - -
- - - - - Check Report Status - - - - - - Return to Home - -
-
-
- - -
-
-
- - - - - Need Help? -
-

If you need to update your contact information or have questions about your report, please contact our Mosquito Control Unit at (123) 456-7890 or mosquito@example.gov and reference your Report ID.

-
-
-
-
-
-{{end}} diff --git a/rmo/template/submit-complete.html b/rmo/template/submit-complete.html new file mode 100644 index 00000000..b05b3f6f --- /dev/null +++ b/rmo/template/submit-complete.html @@ -0,0 +1,136 @@ +{{template "base.html" .}} + +{{define "title"}}Report Submission Complete{{end}} +{{define "extraheader"}} + + +{{end}} +{{define "content"}} +
+
+
+ +
+
+

+ + + + Report Successfully Submitted +

+
+
+
+
+ Your Report ID: + {{.ReportID|publicReportID}} +
+
+ +
+ +
+

+ + + + Get Updates +

+

Provide your contact information to receive updates about your report.

+ +
+ + +
+ +
+ + + + + + +
+
+ +
+ +
+ + + + + + + +
+
+ +
+ + +
+ You must consent to receive notifications. +
+
+
+ + +
+ + +
+
+ +
+ + +
+

+ + + + Check Your Report Status +

+

You can check the status of your report at any time using your Report ID.

+ + Check Status + +
+ +
+
+ {{ if not (eq .District nil) }} +

Your report will be handled by

+

{{ .District.Name }}

+ + {{ end }} +
+
+
+
+ + +
+ + + + + + Submit Another Report + +
+
+
+
+{{end}}