From f664ea73f96e4499bdadd207a073435a03b046ee Mon Sep 17 00:00:00 2001 From: isakgranqvist2021 Date: Sun, 3 Apr 2022 18:07:02 +0200 Subject: [PATCH] Change template name and move into seperate directories --- src/packages/cart/cart.controller.go | 4 ++-- src/packages/cart/cart.router.go | 2 +- src/packages/order/order.controller.go | 2 +- src/packages/product/product.controller.go | 4 ++-- src/views/pages/{cancel-purchase.html => cart/cancel.html} | 0 src/views/pages/{checkout.html => cart/index.html} | 0 .../pages/{completed-purchase.html => cart/success.html} | 0 src/views/pages/{ => product}/index.html | 0 src/views/pages/{view-product.html => product/product.html} | 0 9 files changed, 6 insertions(+), 6 deletions(-) rename src/views/pages/{cancel-purchase.html => cart/cancel.html} (100%) rename src/views/pages/{checkout.html => cart/index.html} (100%) rename src/views/pages/{completed-purchase.html => cart/success.html} (100%) rename src/views/pages/{ => product}/index.html (100%) rename src/views/pages/{view-product.html => product/product.html} (100%) diff --git a/src/packages/cart/cart.controller.go b/src/packages/cart/cart.controller.go index 320d47d..74f4cfb 100644 --- a/src/packages/cart/cart.controller.go +++ b/src/packages/cart/cart.controller.go @@ -63,7 +63,7 @@ func ChangeQuantity(c *fiber.Ctx) error { return c.Redirect("/cart") } -func Checkout(c *fiber.Ctx) error { +func Cart(c *fiber.Ctx) error { sess, err := config.GetStore().Get(c) if err != nil { @@ -80,7 +80,7 @@ func Checkout(c *fiber.Ctx) error { products := JoinCart(cartInventory) - return c.Render("pages/checkout", fiber.Map{ + return c.Render("pages/cart/index", fiber.Map{ "Products": products, }) } diff --git a/src/packages/cart/cart.router.go b/src/packages/cart/cart.router.go index 7784287..0ef0fbe 100644 --- a/src/packages/cart/cart.router.go +++ b/src/packages/cart/cart.router.go @@ -3,7 +3,7 @@ package cart import "github.com/gofiber/fiber/v2" func CartRouter(r fiber.Router) { - r.Get("/", Checkout) + r.Get("/", Cart) r.Post("/add-to-cart/:ID", AddToCart) r.Get("/change-quantity/:ACTION/:ID", ChangeQuantity) } diff --git a/src/packages/order/order.controller.go b/src/packages/order/order.controller.go index 668c060..09455f9 100644 --- a/src/packages/order/order.controller.go +++ b/src/packages/order/order.controller.go @@ -33,7 +33,7 @@ func Success(c *fiber.Ctx) error { fmt.Println(sess.Get("STRIPE_SESSION")) - return c.Render("pages/completed-purchase", nil) + return c.Render("pages/cart/success", nil) } func Pay(c *fiber.Ctx) error { diff --git a/src/packages/product/product.controller.go b/src/packages/product/product.controller.go index ee8ca97..7d8a724 100644 --- a/src/packages/product/product.controller.go +++ b/src/packages/product/product.controller.go @@ -19,7 +19,7 @@ func ViewProduct(c *fiber.Ctx) error { return c.Redirect("/error") } - return c.Render("pages/view-product", fiber.Map{ + return c.Render("pages/product/product", fiber.Map{ "Product": product, }) } @@ -31,7 +31,7 @@ func ViewProducts(c *fiber.Ctx) error { return c.Redirect("/error") } - return c.Render("pages/index", fiber.Map{ + return c.Render("pages/product/index", fiber.Map{ "Products": products, }) } diff --git a/src/views/pages/cancel-purchase.html b/src/views/pages/cart/cancel.html similarity index 100% rename from src/views/pages/cancel-purchase.html rename to src/views/pages/cart/cancel.html diff --git a/src/views/pages/checkout.html b/src/views/pages/cart/index.html similarity index 100% rename from src/views/pages/checkout.html rename to src/views/pages/cart/index.html diff --git a/src/views/pages/completed-purchase.html b/src/views/pages/cart/success.html similarity index 100% rename from src/views/pages/completed-purchase.html rename to src/views/pages/cart/success.html diff --git a/src/views/pages/index.html b/src/views/pages/product/index.html similarity index 100% rename from src/views/pages/index.html rename to src/views/pages/product/index.html diff --git a/src/views/pages/view-product.html b/src/views/pages/product/product.html similarity index 100% rename from src/views/pages/view-product.html rename to src/views/pages/product/product.html