vbatts/microservices-demo
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

updated footer with apigee_client_id

Browse source
This commit is contained in:
phriscage 2018-12-02 16:39:13 -05:00
parent 03de6a9b1c
commit 3e19a763b4
2 changed files with 34 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/frontend/handlers.go
View file

@ -73,14 +73,15 @@ func (fe *frontendServer) homeHandler(w http.ResponseWriter, r *http.Request) {
} }
if err := templates.ExecuteTemplate(w, "home", map[string]interface{}{ if err := templates.ExecuteTemplate(w, "home", map[string]interface{}{
"session_id": sessionID(r), "session_id": sessionID(r),
"request_id": r.Context().Value(ctxKeyRequestID{}), "request_id": r.Context().Value(ctxKeyRequestID{}),
"user_currency": currentCurrency(r), "apigee_client_id": currentApigeeClientID(r),
"currencies": currencies, "user_currency": currentCurrency(r),
"products": ps, "currencies": currencies,
"cart_size": len(cart), "products": ps,
"banner_color": os.Getenv("BANNER_COLOR"), // illustrates canary deployments "cart_size": len(cart),
"ad": fe.chooseAd(r.Context(), []string{}, log), "banner_color": os.Getenv("BANNER_COLOR"), // illustrates canary deployments
"ad": fe.chooseAd(r.Context(), []string{}, log),
}); err != nil { }); err != nil {
log.Error(err) log.Error(err)
} }
@ -131,14 +132,15 @@ func (fe *frontendServer) productHandler(w http.ResponseWriter, r *http.Request)
}{p, price} }{p, price}
if err := templates.ExecuteTemplate(w, "product", map[string]interface{}{ if err := templates.ExecuteTemplate(w, "product", map[string]interface{}{
"session_id": sessionID(r), "session_id": sessionID(r),
"request_id": r.Context().Value(ctxKeyRequestID{}), "request_id": r.Context().Value(ctxKeyRequestID{}),
"ad": fe.chooseAd(r.Context(), p.Categories, log), "apigee_client_id": currentApigeeClientID(r),
"user_currency": currentCurrency(r), "ad": fe.chooseAd(r.Context(), p.Categories, log),
"currencies": currencies, "user_currency": currentCurrency(r),
"product": product, "currencies": currencies,
"recommendations": recommendations, "product": product,
"cart_size": len(cart), "recommendations": recommendations,
"cart_size": len(cart),
}); err != nil { }); err != nil {
log.Println(err) log.Println(err)
} }
@ -238,6 +240,7 @@ func (fe *frontendServer) viewCartHandler(w http.ResponseWriter, r *http.Request
if err := templates.ExecuteTemplate(w, "cart", map[string]interface{}{ if err := templates.ExecuteTemplate(w, "cart", map[string]interface{}{
"session_id": sessionID(r), "session_id": sessionID(r),
"request_id": r.Context().Value(ctxKeyRequestID{}), "request_id": r.Context().Value(ctxKeyRequestID{}),
"apigee_client_id": currentApigeeClientID(r),
"user_currency": currentCurrency(r), "user_currency": currentCurrency(r),
"currencies": currencies, "currencies": currencies,
"recommendations": recommendations, "recommendations": recommendations,
@ -300,12 +303,13 @@ func (fe *frontendServer) placeOrderHandler(w http.ResponseWriter, r *http.Reque
} }
if err := templates.ExecuteTemplate(w, "order", map[string]interface{}{ if err := templates.ExecuteTemplate(w, "order", map[string]interface{}{
"session_id": sessionID(r), "session_id": sessionID(r),
"request_id": r.Context().Value(ctxKeyRequestID{}), "request_id": r.Context().Value(ctxKeyRequestID{}),
"user_currency": currentCurrency(r), "apigee_client_id": currentApigeeClientID(r),
"order": order.GetOrder(), "user_currency": currentCurrency(r),
"total_paid": &totalPaid, "order": order.GetOrder(),
"recommendations": recommendations, "total_paid": &totalPaid,
"recommendations": recommendations,
}); err != nil { }); err != nil {
log.Println(err) log.Println(err)
} }
@ -366,9 +370,9 @@ func (fe *frontendServer) viewConfigHandler(w http.ResponseWriter, r *http.Reque
if err := templates.ExecuteTemplate(w, "config", map[string]interface{}{ if err := templates.ExecuteTemplate(w, "config", map[string]interface{}{
"session_id": sessionID(r), "session_id": sessionID(r),
"request_id": r.Context().Value(ctxKeyRequestID{}), "request_id": r.Context().Value(ctxKeyRequestID{}),
"apigee_client_id": apigeeClientID,
"user_currency": currentCurrency(r), "user_currency": currentCurrency(r),
"currencies": currencies, "currencies": currencies,
"apigee_client_id": apigeeClientID,
"cart_size": len(cart), "cart_size": len(cart),
}); err != nil { }); err != nil {
log.Println(err) log.Println(err)
@ -415,11 +419,12 @@ func renderHTTPError(log logrus.FieldLogger, r *http.Request, w http.ResponseWri
w.WriteHeader(code) w.WriteHeader(code)
templates.ExecuteTemplate(w, "error", map[string]interface{}{ templates.ExecuteTemplate(w, "error", map[string]interface{}{
"session_id": sessionID(r), "session_id": sessionID(r),
"request_id": r.Context().Value(ctxKeyRequestID{}), "request_id": r.Context().Value(ctxKeyRequestID{}),
"error": errMsg, "apigee_client_id": currentApigeeClientID(r),
"status_code": code, "error": errMsg,
"status": http.StatusText(code)}) "status_code": code,
"status": http.StatusText(code)})
} }
func currentCurrency(r *http.Request) string { func currentCurrency(r *http.Request) string {

1
src/frontend/templates/footer.html
View file

@ -16,6 +16,7 @@
<small class="text-muted"> <small class="text-muted">
{{ if $.session_id }}session-id: {{ $.session_id }}</br>{{end}} {{ if $.session_id }}session-id: {{ $.session_id }}</br>{{end}}
{{ if $.request_id }}request-id: {{ $.request_id }}</br>{{end}} {{ if $.request_id }}request-id: {{ $.request_id }}</br>{{end}}
{{ if $.apigee_client_id }}<a href="/config#apigee_client_id">apigee-client-id:</a> {{ $.apigee_client_id }}</br>{{end}}
</small> </small>
</div> </div>
</footer> </footer>