WIP: Merch #31

Manually merged
cnidariaware merged 36 commits from Merch into dev 2026-01-31 14:43:27 -07:00
Owner
No description provided.
cnidariaware added this to the Merch Shop milestone 2025-12-07 13:20:28 -07:00
(feat): Added Contact Us page, improved CSS.
Some checks are pending
Deploy to Cloudflare Pages / deploy (push) Waiting to run
9aa052cf8e
feat(About): Added numbers section.
Some checks are pending
Deploy to Cloudflare Pages / deploy (push) Waiting to run
9177f58a5b
feat(Contact CSS): Improved and descriptive
Some checks are pending
Deploy to Cloudflare Pages / deploy (push) Waiting to run
3784895549
bug(main page): fixed sponsor hyperlinks
Some checks are pending
Deploy to Cloudflare Pages / deploy (push) Waiting to run
6c944ff08f
Merge branch 'dev' of ssh://ssh.forge.ucalgarybaja.ca:222/UCalgary_Baja/ucalg-baja-ca into dev
Some checks are pending
Deploy to Cloudflare Pages / deploy (push) Waiting to run
fc056896e1
Merge branch 'dev' of ssh://ssh.forge.ucalgarybaja.ca:222/UCalgary_Baja/ucalg-baja-ca into dev
Some checks are pending
Deploy to Cloudflare Pages / deploy (push) Waiting to run
d5f761c1bd
remove(BannerImage): removed old css comments
Some checks are pending
Deploy to Cloudflare Pages / deploy (push) Waiting to run
e22cccabd3
Merge branch 'dev' of ssh://ssh.forge.ucalgarybaja.ca:222/UCalgary_Baja/ucalg-baja-ca into dev
Some checks failed
Deploy to Cloudflare Pages / deploy (push) Has been cancelled
eaeeb590d9
feat(Added banners)
Some checks failed
Deploy to Cloudflare Pages / deploy (push) Has been cancelled
dbfaaef7d5
Update .forgejo/workflows/deploy_to_cloudflare.yaml
Some checks failed
Deploy to Cloudflare Pages / deploy (push) Failing after 2s
694ebf39f4
Update .forgejo/workflows/deploy_to_cloudflare.yaml
Some checks failed
Deploy to Cloudflare Pages / deploy (push) Failing after 0s
d95707cdce
Update .forgejo/workflows/deploy_to_cloudflare.yaml
Some checks are pending
Deploy to Cloudflare Pages / deploy (push) Waiting to run
34ba2189b0
Update .forgejo/workflows/deploy_to_cloudflare.yaml
Some checks are pending
Deploy to Cloudflare Pages / deploy (push) Waiting to run
0665270818
Update .forgejo/workflows/deploy_to_cloudflare.yaml
Some checks failed
Deploy to Cloudflare Pages / deploy (push) Failing after 1m12s
59cb1e70cc
fix(actions): fixed project name
Some checks failed
Deploy to Cloudflare Pages / deploy (push) Failing after 1m18s
16e51a799a
Signed-off-by: darkicewolf50 <brock@darkicewolf50.dev>
fix(actions): fixed project name
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 1m5s
76edcfa8dc
Signed-off-by: darkicewolf50 <brock@darkicewolf50.dev>
feat(actions): more detailed webhook notification
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 1m6s
032fed73ef
Signed-off-by: darkicewolf50 <brock@darkicewolf50.dev>
feat(actions): more detailed webhook notification using curl
Some checks are pending
deploy_to_cloudflare.yaml / feat(actions): more detailed webhook notification using curl (push) Waiting to run
110231356e
Signed-off-by: darkicewolf50 <brock@darkicewolf50.dev>
remove(actions): removed old notification messaging
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 1m1s
269a842f52
Signed-off-by: darkicewolf50 <brock@darkicewolf50.dev>
feat(Sponsors): Added static sponsors, updated sponsor logos.
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 1m4s
abee980fc8
feat(Merch): Added item tiles, item page, merch top banner, merch header.
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 1m12s
47065ae457
init(checkout): (#14)
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 1m6s
241de388c0
(feat): Added post checkout return pg.
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 1m5s
b5a4a56b0b
feat(checkout): started on preping for fetch to backend
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 46s
38b8db3c4c
feat(checkout): cleaning up chatgpt code
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 51s
fe19885e37
feat(merch): cart now shared state, checkout submits to backend
Some checks failed
Deploy to Cloudflare Pages / deploy (push) Failing after 29s
082da42e79
feat(merch): store now included
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 58s
d4287bd4e9
feat(merch): backend hooked up and started on categroy filtering
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 50s
28dbb57cb4
Merch: fixed css
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 1m2s
efbd850704
feat(merch): chnaged over to use many slugs, reorganized folders TODO fix formatted subtotal
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 46s
86c9e22612
feat(merch): functionality completed, error handling needs to be dealt with
Some checks failed
Deploy to Cloudflare Pages / deploy (push) Failing after 26s
4bee8b12c4
feat(merch): now hooked up to backend
Some checks failed
Deploy to Cloudflare Pages / deploy (push) Failing after 27s
504dedbae2
fix(merch): removed last refernce to copy of topBanner
Some checks failed
Deploy to Cloudflare Pages / deploy (push) Failing after 19s
ed745caf62
remove(merch): now MerchTopBanner should be gone
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 43s
Deploy to Cloudflare Pages / deploy (pull_request) Successful in 45s
6af2eeeaf4
feat(merch): updated cart from session based cookie to svelte store
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 46s
Deploy to Cloudflare Pages / deploy (pull_request) Successful in 53s
fdd8c0518b
cnidariaware changed target branch from master to dev 2025-12-07 13:21:02 -07:00
cnidariaware added the due date 2025-12-27 2025-12-07 13:21:17 -07:00
cnidariaware force-pushed Merch from fdd8c0518b
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 46s
Deploy to Cloudflare Pages / deploy (pull_request) Successful in 53s
to 6af2eeeaf4
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 43s
Deploy to Cloudflare Pages / deploy (pull_request) Successful in 45s
2025-12-07 13:32:10 -07:00
Compare
removed (merch): unicode character
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 44s
Deploy to Cloudflare Pages / deploy (pull_request) Successful in 49s
e9d82bd279
feat (merch): title now static and present on all merch shop pages
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 50s
Deploy to Cloudflare Pages / deploy (pull_request) Successful in 52s
509fe217ac
Signed-off-by: darkicewolf50 <brock@darkicewolf50.dev>
remove(merch): some of the AI was covered, there is so MUCH MORE
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 55s
Deploy to Cloudflare Pages / deploy (pull_request) Successful in 1m4s
8e62d36cbd
remove(merch): cart aside now minimized class amount
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 1m9s
Deploy to Cloudflare Pages / deploy (pull_request) Successful in 1m8s
25c2ce140c
fix(merch): buttons now disable and enable when cart is full or empty
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 1m4s
Deploy to Cloudflare Pages / deploy (pull_request) Successful in 1m3s
b40d263668
cnidariaware left a comment

make these changes

make these changes
@ -0,0 +50,4 @@
- Canada Action:
LogoUrl:
Url:
DescriptionAboutSponsor:
Author
Owner

remove file

remove file
cnidariaware marked this conversation as resolved
@ -0,0 +9,4 @@
// );
const total = cartStore.formatted_subtotal;
// $inspect($total);
Author
Owner

remove comments

remove comments
cnidariaware marked this conversation as resolved
@ -0,0 +69,4 @@
<span>Subtotal:</span>
<div>
<!-- {$inspect(cartStore.formatted_subtotal)} -->
<span>${$total}</span>
Author
Owner

remove comment

remove comment
cnidariaware marked this conversation as resolved
@ -0,0 +21,4 @@
// `Added ${qty} x ${product.name}` +
// (selectedColour ? ` (${selectedColour})` : '') +
// (selectedSize ? ` [${selectedSize}]` : '')
// );
Author
Owner

remove comment

remove comment
cnidariaware marked this conversation as resolved
@ -0,0 +35,4 @@
{#if products.length !== 0}
<title>UCalgary Baja - Merch - {product.name}</title>
<!-- <title>{product.name} - Floof Hoodie</title> -->
Author
Owner

remove comment

remove comment
cnidariaware marked this conversation as resolved
@ -0,0 +39,4 @@
<div class="product-page">
<figure>
<button type="button" aria-label="Previous image" onclick={prev}></button>
Author
Owner

check for different symbol for < and >

check for different symbol for < and >
cnidariaware marked this conversation as resolved
@ -23,0 +22,4 @@
--banner-text-background: rgba(31, 31, 31, 0.8);
--banner-text-padding: 2svh 2svw;
--banner-text-rounding: 1rem;
}
Author
Owner

move root to globals.css if not already present

move root to globals.css if not already present
cnidariaware marked this conversation as resolved
@ -0,0 +57,4 @@
{/if}
{:catch error}
<!-- Error state -->
<p>Error loading merchandise: {error.message}</p>
Author
Owner

remove comments

remove comments
cnidariaware marked this conversation as resolved
@ -0,0 +44,4 @@
{/await}
<!-- <li>
<a href={'/merch/category/heavy'}>HEAVY WEAR</a>
Author
Owner

remove comment

remove comment
cnidariaware marked this conversation as resolved
@ -13,0 +266,4 @@
display: flex;
flex-direction: column;
justify-content: center;
}
Author
Owner

remove entirely

remove entirely
Author
Owner

keep current version of sponsors page

keep current version of sponsors page
fix(merch): removed comments and changed > to html symbol
All checks were successful
Deploy to Cloudflare Pages / deploy (push) Successful in 1m30s
Deploy to Cloudflare Pages / deploy (pull_request) Successful in 51s
ab0671c0a4
cnidariaware manually merged commit eb139fa00b into dev 2026-01-31 14:43:27 -07:00
Author
Owner

merged #13, #14, #15, #16

merged #13, #14, #15, #16
Sign in to join this conversation.
No reviewers
No milestone
No project
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

2025-12-27

Dependencies

No dependencies set.

Reference
ucalgary-baja/ucalg-baja-ca!31
No description provided.