Skip to content

Commit

Permalink
Changes Image -> Images
Browse files Browse the repository at this point in the history
isakgranqvist2021 committed Apr 18, 2022
1 parent 28a5670 commit 44efd78
Showing 20 changed files with 124 additions and 151 deletions.
9 changes: 9 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"liveSassCompile.settings.formats": [
{
"format": "compressed",
"extensionName": ".min.css",
"savePath": "/src/public/css"
}
]
}
5 changes: 4 additions & 1 deletion data/log.txt
Original file line number Diff line number Diff line change
@@ -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
32 changes: 32 additions & 0 deletions src/assets/scss/home.scss
Original file line number Diff line number Diff line change
@@ -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;
}
}
}
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/packages/cart/cart.helpers.go
Original file line number Diff line number Diff line change
@@ -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,
24 changes: 15 additions & 9 deletions src/packages/product/product.model.go
Original file line number Diff line number Diff line change
@@ -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,
}
}

2 changes: 1 addition & 1 deletion src/packages/product/product.service.go
Original file line number Diff line number Diff line change
@@ -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{
29 changes: 0 additions & 29 deletions src/public/css/home.css

This file was deleted.

2 changes: 2 additions & 0 deletions src/public/css/home.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions src/public/css/home.min.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/public/css/main.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions src/public/css/main.min.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/public/css/symbols.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions src/public/css/symbols.min.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/views/layouts/main.html
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion src/views/pages/cart/cancel.html
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion src/views/pages/cart/success.html
Original file line number Diff line number Diff line change
@@ -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
125 changes: 22 additions & 103 deletions src/views/pages/product/index.html
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 4 additions & 4 deletions src/views/pages/product/product.html
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit 44efd78

Please sign in to comment.