Changes Image -> Images

isakgranqvist2021 · Apr 18, 2022 · 44efd78 · 44efd78
1 parent 28a5670
commit 44efd78
Showing 20 changed files with 124 additions and 151 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,9 @@
+{
+	"liveSassCompile.settings.formats": [
+		{
+			"format": "compressed",
+			"extensionName": ".min.css",
+			"savePath": "/src/public/css"
+		}
+	]
+}
diff --git a/data/log.txt b/data/log.txt
@@ -8,4 +8,7 @@ Mon, 18 Apr 2022 10:50:46 CEST Cast sess.Get(ALERT) -> *Alert failed
 Mon, 18 Apr 2022 10:56:05 CEST Cast sess.Get(ALERT) -> *Alert failed
 Mon, 18 Apr 2022 11:08:23 CEST Cast sess.Get(ALERT) -> *Alert failed
 Mon, 18 Apr 2022 17:44:16 CEST Cast sess.Get(ALERT) -> *Alert failed
-Mon, 18 Apr 2022 18:02:35 CEST Cast sess.Get(ALERT) -> *Alert failed
+Mon, 18 Apr 2022 18:02:35 CEST Cast sess.Get(ALERT) -> *Alert failed
+Mon, 18 Apr 2022 22:46:05 CEST the provided hex string is not a valid ObjectID
+Mon, 18 Apr 2022 22:51:33 CEST document is nil
+Mon, 18 Apr 2022 23:06:52 CEST error decoding key image: cannot decode document into []image.Image
diff --git a/src/assets/scss/home.scss b/src/assets/scss/home.scss
@@ -0,0 +1,32 @@
+.column {
+	gap: 3rem;
+	display: flex;
+	padding: 2rem 0;
+	flex-direction: column;
+
+	.section {
+		display: flex;
+		margin: 0 auto;
+
+		&:not(:last-of-type) {
+			border-bottom: 1px solid rgb(238, 238, 238);
+		}
+
+		&:nth-child(even) {
+			flex-direction: row-reverse;
+		}
+
+		.photo-grid {
+			display: grid;
+			grid-template-columns: 1fr 1fr;
+
+			img {
+				background-color: rgb(211, 211, 211);
+			}
+		}
+
+		.about-product {
+			padding: 2rem;
+		}
+	}
+}
diff --git a/src/public/css/main.css → src/assets/scss/main.scss b/src/public/css/main.css → src/assets/scss/main.scss
diff --git a/src/public/css/symbols.css → src/assets/scss/symbols.scss b/src/public/css/symbols.css → src/assets/scss/symbols.scss
diff --git a/src/packages/cart/cart.helpers.go b/src/packages/cart/cart.helpers.go
@@ -102,7 +102,7 @@ func JoinCart(cart []CartItem) []product.Product {
 				ID:          _product.ID,
 				Amount:      _product.Amount,
 				Description: _product.Description,
-				Image:       _product.Image,
+				Images:      _product.Images,
 				Features:    _product.Features,
 				Name:        _product.Name,
 				Stock:       _product.Stock,

diff --git a/src/packages/product/product.model.go b/src/packages/product/product.model.go
@@ -7,26 +7,32 @@ import (
 )
 
 type Product struct {
-	ID          string      `bson:"_id"`
-	Amount      int         `bson:"amount"`
-	Description string      `bson:"description"`
-	Image       image.Image `bson:"image"`
-	Features    []string    `bson:"features"`
-	Name        string      `bson:"name"`
-	Stock       int         `bson:"stock"`
-	Quantity    int         `bson:"quantity"`
+	ID          string        `bson:"_id"`
+	Amount      int           `bson:"amount"`
+	Description string        `bson:"description"`
+	Images      []image.Image `bson:"images"`
+	Features    []string      `bson:"features"`
+	Name        string        `bson:"name"`
+	Stock       int           `bson:"stock"`
+	Quantity    int           `bson:"quantity"`
 }
 
 func (product *Product) ConvertToStripeProduct() *stripe.CheckoutSessionLineItemParams {
 	description := stringm.CutStr(product.Description)
 
+	images := []*string{}
+
+	for _, v := range product.Images {
+		images = append(images, &v.Src)
+	}
+
 	return &stripe.CheckoutSessionLineItemParams{
 		Description: &description,
 		Name:        &product.Name,
 		Currency:    stripe.String("SEK"),
 		Quantity:    stripe.Int64(int64(product.Quantity)),
 		Amount:      stripe.Int64(int64(product.Amount * 100)),
-		Images:      []*string{stripe.String(product.Image.Src)},
+		Images:      images,
 	}
 }
 

diff --git a/src/packages/product/product.service.go b/src/packages/product/product.service.go
@@ -9,7 +9,7 @@ func (product *Product) InsertProduct() error {
 		"description": product.Description,
 		"features":    product.Features,
 		"stock":       product.Stock,
-		"image":       product.Image,
+		"images":      product.Images,
 	}
 
 	insertOptions := database.CreateOptions{

diff --git a/src/public/css/home.css b/src/public/css/home.css
diff --git a/src/public/css/home.min.css b/src/public/css/home.min.css
diff --git a/src/public/css/home.min.css.map b/src/public/css/home.min.css.map
diff --git a/src/public/css/main.min.css b/src/public/css/main.min.css
diff --git a/src/public/css/main.min.css.map b/src/public/css/main.min.css.map
diff --git a/src/public/css/symbols.min.css b/src/public/css/symbols.min.css
diff --git a/src/public/css/symbols.min.css.map b/src/public/css/symbols.min.css.map
diff --git a/src/views/layouts/main.html b/src/views/layouts/main.html
@@ -9,7 +9,7 @@
 			href="https://cdn.jsdelivr.net/npm/uikit@3.13.5/dist/css/uikit.min.css"
 		/>
 		<link rel="stylesheet" href="https://unpkg.com/aos@next/dist/aos.css" />
-		<link rel="stylesheet" href="/public/css/main.css" />
+		<link rel="stylesheet" href="/public/css/main.min.css" />
 		<link
 			rel="shortcut icon"
 			href="/public/img/favicon.ico"

diff --git a/src/views/pages/cart/cancel.html b/src/views/pages/cart/cancel.html
@@ -1,4 +1,4 @@
-<link rel="stylesheet" href="/public/css/symbols.css" />
+<link rel="stylesheet" href="/public/css/symbols.min.css" />
 
 <div class="uk-container uk-flex uk-flex-column uk-flex-middle uk-flex-center">
 	<svg

diff --git a/src/views/pages/cart/success.html b/src/views/pages/cart/success.html
@@ -1,4 +1,4 @@
-<link rel="stylesheet" href="/public/css/symbols.css" />
+<link rel="stylesheet" href="/public/css/symbols.min.css" />
 
 <div class="uk-container uk-flex uk-flex-column uk-flex-middle uk-flex-center">
 	<svg

diff --git a/src/views/pages/product/index.html b/src/views/pages/product/index.html
@@ -1,109 +1,28 @@
-<link rel="stylesheet" href="/public/css/home.css" />
-<div class="column">
-	<!-- <section class="section"></section> -->
-
-	<section class="section">
-		<div class="uk-container-large">
-			<div class="photo-grid">
-				<img src="/public/img/product/a.webp" alt="" />
-				<img src="/public/img/product/b.webp" alt="" />
-				<img src="/public/img/product/c.webp" alt="" />
-				<img src="/public/img/product/d.webp" alt="" />
-			</div>
-			<div class="about-product">
-				<h2 class="uk-text-bold">Lorem ipsum dolor sit amet.</h2>
-				<p>
-					Lorem ipsum dolor sit amet consectetur adipisicing elit. Sapiente
-					voluptates unde iure, molestiae maiores ipsam ipsa deserunt?
-					Dignissimos, consectetur? Repudiandae perspiciatis sapiente adipisci
-					magni? At.
-				</p>
-
-				<button class="uk-button uk-button-primary" data-aos="zoom-in">
-					Buy now
-				</button>
-			</div>
-		</div>
-	</section>
-
-	<hr />
-	<!-- <section class="section"></section> -->
+<link rel="stylesheet" href="/public/css/home.min.css" />
 
-	<section class="section">
-		<div class="uk-container-large">
-			<div class="about-product">
-				<h2 class="uk-text-bold">Lorem ipsum dolor sit amet.</h2>
-				<p>
-					Lorem ipsum dolor sit amet consectetur adipisicing elit. Sapiente
-					voluptates unde iure, molestiae maiores ipsam ipsa deserunt?
-					Dignissimos, consectetur? Repudiandae perspiciatis sapiente adipisci
-					magni? At.
-				</p>
-
-				<button class="uk-button uk-button-primary" data-aos="zoom-in">
-					Buy now
-				</button>
-			</div>
-			<div class="photo-grid">
-				<img src="/public/img/product/a.webp" alt="" />
-				<img src="/public/img/product/b.webp" alt="" />
-				<img src="/public/img/product/c.webp" alt="" />
-				<img src="/public/img/product/d.webp" alt="" />
-			</div>
+<div class="column">
+	{{ range .Products }}
+
+	<section class="section uk-container-large">
+		<div class="photo-grid">
+			<img src="/public/img/product/a.webp" alt="" />
+			<img src="/public/img/product/b.webp" alt="" />
+			<img src="/public/img/product/c.webp" alt="" />
+			<img src="/public/img/product/d.webp" alt="" />
 		</div>
-	</section>
-
-	<!-- <section class="section"></section> -->
-	<hr />
-
-	<section class="section">
-		<div class="uk-container-large">
-			<div class="photo-grid">
-				<img src="/public/img/product/a.webp" alt="" />
-				<img src="/public/img/product/b.webp" alt="" />
-				<img src="/public/img/product/c.webp" alt="" />
-				<img src="/public/img/product/d.webp" alt="" />
-			</div>
-			<div class="about-product">
-				<h2 class="uk-text-bold">Lorem ipsum dolor sit amet.</h2>
-				<p>
-					Lorem ipsum dolor sit amet consectetur adipisicing elit. Sapiente
-					voluptates unde iure, molestiae maiores ipsam ipsa deserunt?
-					Dignissimos, consectetur? Repudiandae perspiciatis sapiente adipisci
-					magni? At.
-				</p>
-
-				<button class="uk-button uk-button-primary" data-aos="zoom-in">
-					Buy now
-				</button>
-			</div>
+		<div class="about-product uk-width-100">
+			<h2 class="uk-text-bold">{{ .Name }}</h2>
+			<p>{{ .Description }}</p>
+
+			<a
+				class="uk-button uk-button-primary"
+				data-aos="zoom-in"
+				href="/{{ Replace .Name }}/{{ .ID }}"
+			>
+				Buy now
+			</a>
 		</div>
 	</section>
 
-	<!-- <section class="section"></section> -->
-	<hr />
-
-	<section class="section">
-		<div class="uk-container-large">
-			<div class="about-product">
-				<h2 class="uk-text-bold">Lorem ipsum dolor sit amet.</h2>
-				<p>
-					Lorem ipsum dolor sit amet consectetur adipisicing elit. Sapiente
-					voluptates unde iure, molestiae maiores ipsam ipsa deserunt?
-					Dignissimos, consectetur? Repudiandae perspiciatis sapiente adipisci
-					magni? At.
-				</p>
-
-				<button class="uk-button uk-button-primary" data-aos="zoom-in">
-					Buy now
-				</button>
-			</div>
-			<div class="photo-grid">
-				<img src="/public/img/product/a.webp" alt="" />
-				<img src="/public/img/product/b.webp" alt="" />
-				<img src="/public/img/product/c.webp" alt="" />
-				<img src="/public/img/product/d.webp" alt="" />
-			</div>
-		</div>
-	</section>
+	{{ end }}
 </div>
diff --git a/src/views/pages/product/product.html b/src/views/pages/product/product.html
@@ -1,11 +1,11 @@
 <div class="uk-container-large uk-padding-large uk-margin-auto">
 	<div class="two-col-layout">
+		{{ range .Product.Images }}
 		<div>
-			<img
-				src="/public/img/{{ .Product.Image.Src }}"
-				alt="{{ .Product.Name }}"
-			/>
+			<img src="/public/img/{{ .Src }}" alt="{{ .Alt }}" />
 		</div>
+		{{ end }}
+
 		<div class="uk-width-1-1">
 			<h1>{{ .Product.Name }}</h1>