{{ if eq (len $.items) 0 }}

Your shopping cart is empty!

Items you add to your shopping cart will appear here.

- Continue Shopping + Continue Shopping
{{ else }}
@@ -42,11 +42,11 @@

Your shopping cart is empty!

Cart ({{ $.cart_size }})

-
+ - + Continue Shopping
@@ -56,8 +56,8 @@

Cart ({{ $.cart_size }})

{{ range $.items }}
- - + +
@@ -99,7 +99,7 @@

{{ .Item.Name }}

-
+
@@ -187,7 +187,7 @@

Payment Method

- +
@@ -198,7 +198,7 @@

Payment Method

{{- end}} >{{$y}}{{end}} - +
diff --git a/src/frontend/templates/header.html b/src/frontend/templates/header.html index a5cff47c15b..21777c48a67 100644 --- a/src/frontend/templates/header.html +++ b/src/frontend/templates/header.html @@ -35,17 +35,14 @@ - - - - + + + + {{ if $.is_cymbal_brand }} - + {{ else }} - - {{ end }} - {{ if ne $.baseUrl "" }} - + {{ end }} @@ -60,11 +57,11 @@ {{ end }}
- + {{ if $.is_cymbal_brand }} - + {{ else }} - + {{ end }}
@@ -73,26 +70,26 @@
{{ renderCurrencyLogo $.user_currency}} - + - +
{{ end }} {{ if $.assistant_enabled }} - - + + {{ end }} - - + + {{ if $.cart_size }} {{$.cart_size}} {{ end }} diff --git a/src/frontend/templates/home.html b/src/frontend/templates/home.html index 46354537f6b..afe87a939dd 100644 --- a/src/frontend/templates/home.html +++ b/src/frontend/templates/home.html @@ -45,8 +45,8 @@

Hot Products

{{ range $.products }}
- - + +
diff --git a/src/frontend/templates/order.html b/src/frontend/templates/order.html index c66a25cb99b..c82e0debd68 100644 --- a/src/frontend/templates/order.html +++ b/src/frontend/templates/order.html @@ -63,7 +63,7 @@

- + Continue Shopping
diff --git a/src/frontend/templates/product.html b/src/frontend/templates/product.html index 87ad69cde19..bb3720097ac 100644 --- a/src/frontend/templates/product.html +++ b/src/frontend/templates/product.html @@ -26,7 +26,7 @@
- +
@@ -53,7 +53,7 @@

Packaging

{{ end }} -
+
- +
diff --git a/src/frontend/templates/recommendations.html b/src/frontend/templates/recommendations.html index 2d493272822..7b8c76a62e7 100644 --- a/src/frontend/templates/recommendations.html +++ b/src/frontend/templates/recommendations.html @@ -24,8 +24,8 @@

You May Also Like

{{range . }}
- - + +
From 1795d10573b986cc2e0feab1b064f1aeec494c20 Mon Sep 17 00:00:00 2001 From: Zadkiel AHARONIAN Date: Wed, 26 Jun 2024 12:28:55 +0200 Subject: [PATCH 03/11] fix: make all handlers listen on baseurl --- src/frontend/handlers.go | 9 ++++----- src/frontend/main.go | 32 ++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/frontend/handlers.go b/src/frontend/handlers.go index cf76bc74361..33c94d8e21d 100644 --- a/src/frontend/handlers.go +++ b/src/frontend/handlers.go @@ -46,7 +46,6 @@ var ( frontendMessage = strings.TrimSpace(os.Getenv("FRONTEND_MESSAGE")) isCymbalBrand = "true" == strings.ToLower(os.Getenv("CYMBAL_BRANDING")) assistantEnabled = "true" == strings.ToLower(os.Getenv("ENABLE_ASSISTANT")) - baseUrl = os.Getenv("BASE_URL") templates = template.Must(template.New(""). Funcs(template.FuncMap{ "renderMoney": renderMoney, @@ -233,7 +232,7 @@ func (fe *frontendServer) addToCartHandler(w http.ResponseWriter, r *http.Reques renderHTTPError(log, r, w, errors.Wrap(err, "failed to add to cart"), http.StatusInternalServerError) return } - w.Header().Set("location", "/cart") + w.Header().Set("location", baseUrl + "/cart") w.WriteHeader(http.StatusFound) } @@ -245,7 +244,7 @@ func (fe *frontendServer) emptyCartHandler(w http.ResponseWriter, r *http.Reques renderHTTPError(log, r, w, errors.Wrap(err, "failed to empty cart"), http.StatusInternalServerError) return } - w.Header().Set("location", "/") + w.Header().Set("location", baseUrl + "/") w.WriteHeader(http.StatusFound) } @@ -424,7 +423,7 @@ func (fe *frontendServer) logoutHandler(w http.ResponseWriter, r *http.Request) c.MaxAge = -1 http.SetCookie(w, c) } - w.Header().Set("Location", "/") + w.Header().Set("Location", baseUrl + "/") w.WriteHeader(http.StatusFound) } @@ -517,7 +516,7 @@ func (fe *frontendServer) setCurrencyHandler(w http.ResponseWriter, r *http.Requ } referer := r.Header.Get("referer") if referer == "" { - referer = "/" + referer = baseUrl + "/" } w.Header().Set("Location", referer) w.WriteHeader(http.StatusFound) diff --git a/src/frontend/main.go b/src/frontend/main.go index 17786620c0e..516d5c21ff9 100644 --- a/src/frontend/main.go +++ b/src/frontend/main.go @@ -42,6 +42,8 @@ const ( cookiePrefix = "shop_" cookieSessionID = cookiePrefix + "session-id" cookieCurrency = cookiePrefix + "currency" + + baseUrl = "" ) var ( @@ -104,6 +106,8 @@ func main() { propagation.NewCompositeTextMapPropagator( propagation.TraceContext{}, propagation.Baggage{})) + baseUrl = os.Getenv("BASE_URL") + if os.Getenv("ENABLE_TRACING") == "1" { log.Info("Tracing enabled.") initTracing(log, ctx, svc) @@ -141,20 +145,20 @@ func main() { mustConnGRPC(ctx, &svc.adSvcConn, svc.adSvcAddr) r := mux.NewRouter() - r.HandleFunc("/", svc.homeHandler).Methods(http.MethodGet, http.MethodHead) - r.HandleFunc("/product/{id}", svc.productHandler).Methods(http.MethodGet, http.MethodHead) - r.HandleFunc("/cart", svc.viewCartHandler).Methods(http.MethodGet, http.MethodHead) - r.HandleFunc("/cart", svc.addToCartHandler).Methods(http.MethodPost) - r.HandleFunc("/cart/empty", svc.emptyCartHandler).Methods(http.MethodPost) - r.HandleFunc("/setCurrency", svc.setCurrencyHandler).Methods(http.MethodPost) - r.HandleFunc("/logout", svc.logoutHandler).Methods(http.MethodGet) - r.HandleFunc("/cart/checkout", svc.placeOrderHandler).Methods(http.MethodPost) - r.HandleFunc("/assistant", svc.assistantHandler).Methods(http.MethodGet) - r.PathPrefix("/static/").Handler(http.StripPrefix("/static/", http.FileServer(http.Dir("./static/")))) - r.HandleFunc("/robots.txt", func(w http.ResponseWriter, _ *http.Request) { fmt.Fprint(w, "User-agent: *\nDisallow: /") }) - r.HandleFunc("/_healthz", func(w http.ResponseWriter, _ *http.Request) { fmt.Fprint(w, "ok") }) - r.HandleFunc("/product-meta/{ids}", svc.getProductByID).Methods(http.MethodGet) - r.HandleFunc("/bot", svc.chatBotHandler).Methods(http.MethodPost) + r.HandleFunc(baseUrl + "/", svc.homeHandler).Methods(http.MethodGet, http.MethodHead) + r.HandleFunc(baseUrl + "/product/{id}", svc.productHandler).Methods(http.MethodGet, http.MethodHead) + r.HandleFunc(baseUrl + "/cart", svc.viewCartHandler).Methods(http.MethodGet, http.MethodHead) + r.HandleFunc(baseUrl + "/cart", svc.addToCartHandler).Methods(http.MethodPost) + r.HandleFunc(baseUrl + "/cart/empty", svc.emptyCartHandler).Methods(http.MethodPost) + r.HandleFunc(baseUrl + "/setCurrency", svc.setCurrencyHandler).Methods(http.MethodPost) + r.HandleFunc(baseUrl + "/logout", svc.logoutHandler).Methods(http.MethodGet) + r.HandleFunc(baseUrl + "/cart/checkout", svc.placeOrderHandler).Methods(http.MethodPost) + r.HandleFunc(baseUrl + "/assistant", svc.assistantHandler).Methods(http.MethodGet) + r.PathPrefix(baseUrl + "/static/").Handler(http.StripPrefix("/static/", http.FileServer(http.Dir("./static/")))) + r.HandleFunc(baseUrl + "/robots.txt", func(w http.ResponseWriter, _ *http.Request) { fmt.Fprint(w, "User-agent: *\nDisallow: /") }) + r.HandleFunc(baseUrl + "/_healthz", func(w http.ResponseWriter, _ *http.Request) { fmt.Fprint(w, "ok") }) + r.HandleFunc(baseUrl + "/product-meta/{ids}", svc.getProductByID).Methods(http.MethodGet) + r.HandleFunc(baseUrl + "/bot", svc.chatBotHandler).Methods(http.MethodPost) var handler http.Handler = r handler = &logHandler{log: log, next: handler} // add logging From 347676a882fa400d2bce73e52e73f3e3669070bc Mon Sep 17 00:00:00 2001 From: Zadkiel AHARONIAN Date: Wed, 26 Jun 2024 12:42:03 +0200 Subject: [PATCH 04/11] Update main.go --- src/frontend/main.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/frontend/main.go b/src/frontend/main.go index 516d5c21ff9..b62c3d8868b 100644 --- a/src/frontend/main.go +++ b/src/frontend/main.go @@ -42,8 +42,6 @@ const ( cookiePrefix = "shop_" cookieSessionID = cookiePrefix + "session-id" cookieCurrency = cookiePrefix + "currency" - - baseUrl = "" ) var ( @@ -53,7 +51,10 @@ var ( "CAD": true, "JPY": true, "GBP": true, - "TRY": true} + "TRY": true, + } + + baseUrl = "" ) type ctxKeySessionID struct{} From 4b4bdd1693a31b3c95352176ec528f583aafcfdf Mon Sep 17 00:00:00 2001 From: Zadkiel AHARONIAN Date: Wed, 26 Jun 2024 13:26:08 +0200 Subject: [PATCH 05/11] Update src/frontend/main.go --- src/frontend/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/frontend/main.go b/src/frontend/main.go index b62c3d8868b..a023eb936db 100644 --- a/src/frontend/main.go +++ b/src/frontend/main.go @@ -155,7 +155,7 @@ func main() { r.HandleFunc(baseUrl + "/logout", svc.logoutHandler).Methods(http.MethodGet) r.HandleFunc(baseUrl + "/cart/checkout", svc.placeOrderHandler).Methods(http.MethodPost) r.HandleFunc(baseUrl + "/assistant", svc.assistantHandler).Methods(http.MethodGet) - r.PathPrefix(baseUrl + "/static/").Handler(http.StripPrefix("/static/", http.FileServer(http.Dir("./static/")))) + r.PathPrefix(baseUrl + "/static/").Handler(http.StripPrefix(baseUrl + "/static/", http.FileServer(http.Dir("./static/")))) r.HandleFunc(baseUrl + "/robots.txt", func(w http.ResponseWriter, _ *http.Request) { fmt.Fprint(w, "User-agent: *\nDisallow: /") }) r.HandleFunc(baseUrl + "/_healthz", func(w http.ResponseWriter, _ *http.Request) { fmt.Fprint(w, "ok") }) r.HandleFunc(baseUrl + "/product-meta/{ids}", svc.getProductByID).Methods(http.MethodGet) From 3654ac4f804749b965ede820c4c8a663930a5317 Mon Sep 17 00:00:00 2001 From: Zadkiel AHARONIAN Date: Tue, 2 Jul 2024 18:59:04 +0200 Subject: [PATCH 06/11] fix(frontend): cart - pass baseUrl to recommendations template --- src/frontend/templates/cart.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/frontend/templates/cart.html b/src/frontend/templates/cart.html index a8e23cb7539..aced5d78e9f 100644 --- a/src/frontend/templates/cart.html +++ b/src/frontend/templates/cart.html @@ -226,8 +226,8 @@

Payment Method