diff --git a/public-report/page.go b/public-report/page.go index 0351e04f..0b166703 100644 --- a/public-report/page.go +++ b/public-report/page.go @@ -11,6 +11,7 @@ import ( var embeddedFiles embed.FS var components = [...]string{"footer", "photo-upload", "photo-upload-header"} +var svgs = [...]string{"check-report", "mosquito", "pond"} func buildTemplate(files ...string) *htmlpage.BuiltTemplate { subdir := "public-report" @@ -21,5 +22,8 @@ func buildTemplate(files ...string) *htmlpage.BuiltTemplate { for _, c := range components { full_files = append(full_files, fmt.Sprintf("%s/template/component/%s.html", subdir, c)) } + for _, c := range svgs { + full_files = append(full_files, fmt.Sprintf("%s/template/svg/%s.svg", subdir, c)) + } return htmlpage.NewBuiltTemplate(embeddedFiles, "public-report/", full_files...) } diff --git a/public-report/routes.go b/public-report/routes.go index 14541bbc..ec4924f3 100644 --- a/public-report/routes.go +++ b/public-report/routes.go @@ -12,7 +12,7 @@ func Router() chi.Router { r.Get("/robots.txt", getRobots) r.Get("/email", getEmailByCode) r.Get("/image/{uuid}", getImageByUUID) - r.Get("/mock", getMockRoot) + r.Route("/mock", addMockRoutes) r.Get("/nuisance", getNuisance) r.Post("/nuisance-submit", postNuisance) r.Get("/nuisance-submit-complete", getNuisanceSubmitComplete) diff --git a/public-report/template/mock/root.html b/public-report/template/mock/root.html index d5fcb2d0..d4c32601 100644 --- a/public-report/template/mock/root.html +++ b/public-report/template/mock/root.html @@ -48,30 +48,23 @@

How Can We Help You Today?

-
- - - + {{ template "svg/mosquito" }}
-

Follow-up or Check Status

-

Check on a previous request or view current mosquito activity in your area.

- Get Status +

Report Mosquito Nuisance

+

Report areas with high adult mosquito activity causing discomfort or concern.

+ Report Problem
- -
- - - + {{ template "svg/pond" }}

Report Standing Water

Report any water that has been sitting for several days, where mosquitoes can live.

@@ -79,19 +72,15 @@
- -
- - - + {{ template "svg/check-report" }}
-

Report Mosquito Nuisance

-

Report areas with high adult mosquito activity causing discomfort or concern.

- Report Problem +

Follow-up or Check Status

+

Check on a previous request or view current mosquito activity in your area.

+ Get Status
diff --git a/public-report/template/svg/check-report.svg b/public-report/template/svg/check-report.svg new file mode 100644 index 00000000..15b82fd6 --- /dev/null +++ b/public-report/template/svg/check-report.svg @@ -0,0 +1,3 @@ +{{define "svg/check-report"}} + +{{end}} diff --git a/public-report/template/svg/mosquito.svg b/public-report/template/svg/mosquito.svg new file mode 100644 index 00000000..ccbcec39 --- /dev/null +++ b/public-report/template/svg/mosquito.svg @@ -0,0 +1,3 @@ +{{define "svg/mosquito"}} + +{{end}} diff --git a/public-report/template/svg/pond.svg b/public-report/template/svg/pond.svg new file mode 100644 index 00000000..bffa55de --- /dev/null +++ b/public-report/template/svg/pond.svg @@ -0,0 +1,3 @@ +{{define "svg/pond"}} + +{{end}}