Skip to content

Commit

Permalink
Updated for paper v6.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@DrJulik
DrJulik committed Dec 8, 2023
1 parent 847f327 commit be41cd1
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 27 deletions.
6 changes: 6 additions & 0 deletions src/css/utilities/borders.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@
outline: 2px solid transparent;
outline-offset: 2px;
}
.border--focus--inset {
box-shadow: none;
outline: 2px solid var(--color__bg-body-light);
outline-offset: -4px;
border: 2px solid var(--color__border-selected-light-1) !important;
}

/* ======= */
/* button borders */
Expand Down
11 changes: 10 additions & 1 deletion src/entrypoints/styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ html {

/* - hide alpine elements until ready */
[x-cloak] {
@apply hidden;
@apply !hidden;
}

/* - remove margin on child content */
Expand Down Expand Up @@ -196,6 +196,15 @@ html {
margin-bottom: 0;
}

input[type=range]::-moz-range-thumb {
pointer-events: all;
cursor: pointer;
-moz-appearance: none;
width: 24px;
height: 24px;
/* @apply w-6 h-6 appearance-none pointer-events-auto; */
}

/* - add spacing to challenge captcha page */
/* - add spacing to shopify legal pages */
.shopify-challenge__container,
Expand Down
50 changes: 28 additions & 22 deletions src/ts/cart/cart.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ export const cart = {
// Update cart with note input
updateCartNote(note: string) {
this.cart_loading = true;
fetch("/cart/update.js", {
fetch(`${window.Shopify.routes.root}cart/update.js`, {
method: "POST",
headers: {
"Content-Type": "application/json",
Expand Down Expand Up @@ -53,19 +53,18 @@ export const cart = {
this.cart.total_price = data.total_price;
this.cart.original_total_price = data.original_total_price;
this.cart.total_discount = data.total_discount;
this.cart.cart_level_discount_applications =
data.cart_level_discount_applications;
this.cart.cart_level_discount_applications = data.cart_level_discount_applications;
this.cart.note = data.note;

// Custom properties
this.cart.shipping_gap =
this.progress_bar_threshold * (+window.Shopify.currency.rate || 1) -
this.cart.total_price;
this.cart.shipping_progress =
(this.cart.total_price /
(this.progress_bar_threshold *
(+window.Shopify.currency.rate || 1))) *
100 +
"%";
let calcTotal;
if (this.cart_shipping_bar_total === 'total') {
calcTotal = this.cart.total_price
} else {
calcTotal = this.cart.original_total_price
}
this.cart.shipping_gap = this.progress_bar_threshold * (+window.Shopify.currency.rate || 1) - calcTotal;
this.cart.shipping_progress = (calcTotal / (this.progress_bar_threshold * (+window.Shopify.currency.rate || 1))) * 100 + "%";

// Finish loading
setTimeout(() => {
Expand All @@ -75,8 +74,15 @@ export const cart = {

// Open cart if set
if (openCart == true) {
let cart_behavior;
if(window.screen.width < 768){
cart_behavior = this.cart_behavior_mobile;
}
else {
cart_behavior = this.cart_behavior_desktop;
}
this.cart_delay_width = "0%";
if (this.cart_behavior == "alert") {
if (cart_behavior == "alert") {
this.cart_alert = true;
setTimeout(() => {
this.cart_delay_width = "100%";
Expand All @@ -85,10 +91,10 @@ export const cart = {
this.cart_alert = false;
}, this.cart_delay);
}
if (this.cart_behavior == "drawer") {
if (cart_behavior == "drawer") {
this.cart_drawer = true;
}
if (this.cart_behavior == "redirect") {
if (cart_behavior == "redirect") {
window.location.href = "/cart";
}
}
Expand Down Expand Up @@ -118,7 +124,7 @@ export const cart = {
id: oldKey.toString(),
quantity: "0",
};
fetch("/cart/change.js", {
fetch(`${window.Shopify.routes.root}cart/change.js`, {
method: "POST",
body: JSON.stringify(formData),
headers: {
Expand All @@ -142,7 +148,7 @@ export const cart = {
}
// Add new item

fetch("/cart/add.js", {
fetch(`${window.Shopify.routes.root}cart/add.js`, {
method: "POST",
body: JSON.stringify(formData),
headers: {
Expand Down Expand Up @@ -190,7 +196,7 @@ export const cart = {
id: key.toString(),
quantity: quantity.toString(),
};
fetch("/cart/change.js", {
fetch(`${window.Shopify.routes.root}cart/change.js`, {
method: "POST",
body: JSON.stringify(formData),
headers: {
Expand Down Expand Up @@ -447,7 +453,7 @@ export const cart = {
};
}

fetch("/cart/add.js", {
fetch(`${window.Shopify.routes.root}cart/add.js`, {
method: "POST",
headers: {
"Content-Type": "application/json",
Expand Down Expand Up @@ -488,7 +494,7 @@ export const cart = {
if (clear) {
this.cart_loading = true;

fetch("/cart/clear.js", {
fetch(`${window.Shopify.routes.root}cart/clear.js`, {
method: "POST",
headers: {
"Content-Type": "application/json",
Expand All @@ -499,7 +505,7 @@ export const cart = {
this.updateCart(true);
})
.then(() => {
fetch("/cart/add.js", {
fetch(`${window.Shopify.routes.root}cart/add.js`, {
method: "POST",
headers: {
"Content-Type": "application/json",
Expand All @@ -522,7 +528,7 @@ export const cart = {
this.cart_loading = false;
});
} else {
fetch("/cart/add.js", {
fetch(`${window.Shopify.routes.root}cart/add.js`, {
method: "POST",
headers: {
"Content-Type": "application/json",
Expand Down
6 changes: 3 additions & 3 deletions src/ts/collections/collections.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,16 +111,16 @@ export const collections = {
if (pair[0].indexOf("price") !== -1) {
if (pair[0] === "filter.v.price.lte") {
if (pair[1] < this.filter_max) {
urlFilter = urlFilter + "&" + pair[0] + "=" + encodeURIComponent(pair[1] instanceof File ? "" : pair[1]);
urlFilter = urlFilter + "&" + pair[0] + "=" + pair[1];
}
}
if (pair[0] === "filter.v.price.gte") {
if (pair[1] > this.filter_min) {
urlFilter = urlFilter + "&" + pair[0] + "=" + encodeURIComponent(pair[1] instanceof File ? "" : pair[1]);
urlFilter = urlFilter + "&" + pair[0] + "=" + pair[1];
}
}
} else {
urlFilter = urlFilter + "&" + pair[0] + "=" + encodeURIComponent(pair[1] instanceof File ? "" : pair[1]);
urlFilter = urlFilter + "&" + pair[0] + "=" + encodeURIComponent(pair[1]);
}
}
return urlFilter;
Expand Down
4 changes: 3 additions & 1 deletion src/ts/globals/globals.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,14 @@ export const globals = {
incomplete_fields: window.__initialData.incomplete_fields, // Boolean to check if product options are incomplete
selectedImageIndex: window.__initialData.selectedImageIndex, // Index of the selected product image (used for fullscreen slider)
// Cart related properties
cart_shipping_bar_total: window.__initialData.cart_shipping_bar_total, // Total or subtotal
cart_drawer: window.__initialData.cart_drawer, // Boolean to toggle the cart drawer
cart_loading: window.__initialData.cart_loading, // Boolean to toggle the cart loading state
cart_alert: window.__initialData.cart_alert, // Boolean to toggle the cart alert
cart_delay: window.__initialData.cart_delay, // Set the delay for the cart alert to close
cart_delay_width: window.__initialData.cart_delay_width, // Set the width for the cart alert progress bar
cart_behavior: window.__initialData.cart_behavior, // Set to 'drawer' 'alert' or 'redirect'
cart_behavior_desktop: window.__initialData.cart_behavior_desktop, // Set to 'drawer' 'alert' or 'redirect'
cart_behavior_mobile: window.__initialData.cart_behavior_mobile, // Set to 'drawer' 'alert' or 'redirect'
cart: window.__initialData.cart, // Object to store the cart data
progress_bar_threshold: window.__initialData.progress_bar_threshold, // Set the threshold for the 'free shipping' progress bar

Expand Down

0 comments on commit be41cd1

Please sign in to comment.