- {{ if .User.Username }}
- Feature not yet ready.
- {{ else }}
- You must be logged in to proceed.
- {{ end }}
-
-
-
-
diff --git a/templates/shows/detail.html b/templates/shows/detail.html
deleted file mode 100644
index 3daaa8d..0000000
--- a/templates/shows/detail.html
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
- {{ range $index, $item := .Items }}
- {{ if eq (mod $index 7) (0) }}
-
-
- {{ end }}
-
-
{{.Date.CalendarString }}
-
-
- {{ if eq (mod $index 7) (6) }}
-
- {{ end }}
- {{ end }}
-
-
-
diff --git a/trackable/show/frontend.go b/trackable/show/frontend.go
index 9714969..4075e19 100644
--- a/trackable/show/frontend.go
+++ b/trackable/show/frontend.go
@@ -1,15 +1,20 @@
package show
import (
+ "context"
"encoding/json"
+ "errors"
"fmt"
"html/template"
+ "log"
"net/http"
+ "strings"
"tracker/date"
"tracker/server/auth"
"tracker/server/host"
- "tracker/templates"
+ "tracker/web"
+ "tracker/web/templates"
"github.com/gorilla/mux"
)
@@ -18,11 +23,12 @@ const DEVMODE = false
// Frontend implemnts server.Frontend
type Frontend struct {
- name string
- host *host.Host
- apiHost *host.Host
- handler Handler
- templates *template.Template
+ name string
+ host *host.Host
+ apiHost *host.Host
+ handler Handler
+ templates *template.Template
+ httpClient *http.Client
}
func (f *Frontend) RegisterHandlers(subdomain string) {
@@ -32,14 +38,16 @@ func (f *Frontend) RegisterHandlers(subdomain string) {
rtr.HandleFunc(fmt.Sprintf("/%s/schedule", subdomain), f.scheduleRequest)
rtr.HandleFunc(fmt.Sprintf("/%s/{type:[a-z]+}", subdomain), f.listRequest)
rtr.HandleFunc(fmt.Sprintf("/%s/{id:[0-9]+}", subdomain), f.detailRequest)
+ // TODO: Add slug based detail view
http.Handle(fmt.Sprintf("/%s/", subdomain), rtr)
}
-func (f *Frontend) Init(serverHost, apiHost *host.Host) error {
+func (f *Frontend) Init(serverHost, apiHost *host.Host) (err error) {
fmt.Println("Show Frontend Initialised")
f.host = serverHost
f.apiHost = apiHost
+ f.httpClient = http.DefaultClient
// Define all template functions
funcMap := template.FuncMap{
@@ -47,9 +55,15 @@ func (f *Frontend) Init(serverHost, apiHost *host.Host) error {
"doubleDigits": templates.DoubleDigits,
}
- // Load all templates
- f.templates = template.Must(template.New("main").Funcs(funcMap).ParseGlob(
- "templates/shows/*.html"))
+ f.templates, err = template.New("").
+ Funcs(funcMap).
+ ParseFS(web.Templates, "**/**.html")
+
+ if err != nil {
+ return fmt.Errorf("unable to parse templates: %w", err)
+ }
+
+ log.Println("defined templates:", f.templates.DefinedTemplates())
return nil
}
@@ -59,10 +73,17 @@ func (f *Frontend) Init(serverHost, apiHost *host.Host) error {
// the templates
func (f *Frontend) Reload() {
if DEVMODE {
- f.Init(f.host, f.apiHost)
+ _ = f.Init(f.host, f.apiHost)
}
}
+type ListRequestData struct {
+ Title string
+
+ ShowList
+ User auth.User
+}
+
func (f *Frontend) listRequest(w http.ResponseWriter, r *http.Request) {
f.Reload()
@@ -72,69 +93,78 @@ func (f *Frontend) listRequest(w http.ResponseWriter, r *http.Request) {
listType = "all"
}
- apiURL := fmt.Sprintf("%s/api/show/get/list/%s", f.apiHost.Address(), listType)
- resp, err := http.Get(apiURL)
- if err != nil {
- fmt.Println(err)
+ u := fmt.Sprintf("/api/show/get/list/%s", listType)
+
+ var showList ShowList
+ if err := f.get(r.Context(), u, &showList); err != nil {
+ serveError(err, w, r)
return
}
- decode := json.NewDecoder(resp.Body)
- var jsonRep ShowList
- decode.Decode(&jsonRep)
-
user, err := auth.CurrentUser(r)
if err != nil {
fmt.Printf("Error getting current user: %v\n", err)
}
- data := struct {
- ShowList
- User auth.User
- }{jsonRep, user}
+ data := ListRequestData{
+ Title: fmt.Sprintf("Show Tracker - %s", strings.Title(listType)),
+ ShowList: showList,
+ User: user,
+ }
fmt.Printf("\tTemplate: User=%v\n", user)
- err = f.templates.ExecuteTemplate(w, "index.html", data)
- if err != nil {
+
+ if err = f.templates.ExecuteTemplate(w, "index.html", data); err != nil {
serveError(err, w, r)
}
}
+type DetailsRequestData struct {
+ Title string
+
+ ShowFull
+ User auth.User
+}
+
func (f *Frontend) detailRequest(w http.ResponseWriter, r *http.Request) {
f.Reload()
params := mux.Vars(r)
id := params["id"]
- apiURL := fmt.Sprintf("%s/api/show/get/%s", f.apiHost.Address(), id)
- resp, err := http.Get(apiURL)
- if err != nil {
+ u := fmt.Sprintf("/api/show/get/%s", id)
+
+ var showDetails ShowFull
+ if err := f.get(r.Context(), u, &showDetails); err != nil {
serveError(err, w, r)
return
}
- decode := json.NewDecoder(resp.Body)
- var jsonRep ShowFull
- decode.Decode(&jsonRep)
-
user, err := auth.CurrentUser(r)
if err != nil {
fmt.Printf("Error getting current user: %v\n", err)
}
- data := struct {
- ShowFull
- User auth.User
- }{jsonRep, user}
+ data := DetailsRequestData{
+ Title: fmt.Sprintf("Show Tracker - %s", showDetails.Name),
+ ShowFull: showDetails,
+ User: user,
+ }
fmt.Printf("\tTemplate: User=%v\n", user)
- err = f.templates.ExecuteTemplate(w, "detail.html", data)
- if err != nil {
+ if err = f.templates.ExecuteTemplate(w, "detail.html", data); err != nil {
serveError(err, w, r)
}
}
+type ScheduleRequestData struct {
+ Title string
+
+ Schedule
+ User auth.User
+}
+
func (f *Frontend) scheduleRequest(w http.ResponseWriter, r *http.Request) {
f.Reload()
@@ -142,31 +172,28 @@ func (f *Frontend) scheduleRequest(w http.ResponseWriter, r *http.Request) {
startDate := curDate.Minus(7 + curDate.Weekday())
endDate := startDate.Plus((7 * 7) - 1)
- apiUrl := fmt.Sprintf("%s/api/show/get/schedule/%s/%s", f.apiHost.Address(), startDate, endDate)
- resp, err := http.Get(apiUrl)
- if err != nil {
- fmt.Println(err)
+ u := fmt.Sprintf("/api/show/get/schedule/%s/%s", startDate, endDate)
+
+ var schedule Schedule
+ if err := f.get(r.Context(), u, &schedule); err != nil {
+ serveError(err, w, r)
return
}
- decode := json.NewDecoder(resp.Body)
- var jsonRep Schedule
- decode.Decode(&jsonRep)
-
user, err := auth.CurrentUser(r)
if err != nil {
fmt.Printf("Error getting current user: %v\n", err)
}
- data := struct {
- Schedule
- User auth.User
- }{jsonRep, user}
+ data := ScheduleRequestData{
+ Title: "Show Tracker - Schedule",
+ Schedule: schedule,
+ User: user,
+ }
fmt.Printf("\tTemplate: User=%v\n", user)
- err = f.templates.ExecuteTemplate(w, "schedule.html", data)
- if err != nil {
+ if err = f.templates.ExecuteTemplate(w, "schedule.html", data); err != nil {
serveError(err, w, r)
}
}
@@ -180,6 +207,12 @@ func (f *Frontend) loginRequest(w http.ResponseWriter, r *http.Request) {
}
}
+type AddShowRequestData struct {
+ Title string
+
+ User auth.User
+}
+
func (f *Frontend) addShowRequest(w http.ResponseWriter, r *http.Request) {
f.Reload()
@@ -188,12 +221,43 @@ func (f *Frontend) addShowRequest(w http.ResponseWriter, r *http.Request) {
fmt.Printf("Error getting current user: %v\n", err)
}
- data := struct {
- User auth.User
- }{user}
+ data := AddShowRequestData{
+ Title: "Show Tracker - Add Tracking",
- err = f.templates.ExecuteTemplate(w, "add_show.html", data)
- if err != nil {
+ User: user,
+ }
+
+ if err = f.templates.ExecuteTemplate(w, "add_show.html", data); err != nil {
serveError(err, w, r)
}
}
+
+// get the given URL and unmarshal data into res. The url specified must be
+// prefixed with a /
+func (f *Frontend) get(ctx context.Context, url string, v interface{}) error {
+ req, err := http.NewRequestWithContext(
+ ctx,
+ http.MethodGet,
+ fmt.Sprintf("%s%s", f.apiHost.Address(), url),
+ nil,
+ )
+ if err != nil {
+ return fmt.Errorf("unable to create request: %w", err)
+ }
+
+ res, err := f.httpClient.Do(req)
+ if err != nil {
+ return fmt.Errorf("unable to request: %w", err)
+ }
+ // accept 200 and 300s, ignore 100s
+ if c := res.StatusCode / 100; c > 3 {
+ return errors.New("bad response")
+ }
+
+ defer res.Body.Close()
+ if err := json.NewDecoder(res.Body).Decode(v); err != nil {
+ return fmt.Errorf("unable to decode response: %w", err)
+ }
+
+ return nil
+}
diff --git a/templates/public/css/material.css b/web/public/css/material.css
similarity index 100%
rename from templates/public/css/material.css
rename to web/public/css/material.css
diff --git a/templates/public/css/menubar_material.css b/web/public/css/menubar_material.css
similarity index 100%
rename from templates/public/css/menubar_material.css
rename to web/public/css/menubar_material.css
diff --git a/templates/functions.go b/web/templates/functions.go
similarity index 100%
rename from templates/functions.go
rename to web/templates/functions.go
diff --git a/web/templates/shared/footer.html b/web/templates/shared/footer.html
new file mode 100644
index 0000000..615197b
--- /dev/null
+++ b/web/templates/shared/footer.html
@@ -0,0 +1,3 @@
+
+
-
-
-