+
Member Benefit
-
+
This series pass is free for Ghost Guild members!
@@ -308,7 +307,7 @@ const handleSubmit = async () => {
title: "Series Pass Purchased!",
description: `You're now registered for all ${purchaseResponse.registration.eventsRegistered} events in this series.`,
color: "green",
- timeout: 5000,
+ duration: 5000,
});
// Emit success event
@@ -328,7 +327,7 @@ const handleSubmit = async () => {
title: "Purchase Failed",
description: errorMessage,
color: "red",
- timeout: 5000,
+ duration: 5000,
});
emit("purchase-error", errorMessage);
@@ -355,3 +354,18 @@ const formatPrice = (price, currency = "CAD") => {
}).format(price);
};
+
+
diff --git a/app/components/SignupFlowOverlay.vue b/app/components/SignupFlowOverlay.vue
index 6ad3321..10fe663 100644
--- a/app/components/SignupFlowOverlay.vue
+++ b/app/components/SignupFlowOverlay.vue
@@ -108,7 +108,7 @@ const stepLabel = computed(() => {
position: fixed;
inset: 0;
z-index: 50;
- background: rgba(42, 32, 21, 0.72);
+ background: color-mix(in srgb, var(--parch) 72%, transparent);
backdrop-filter: blur(4px);
display: flex;
align-items: center;
diff --git a/app/components/TierPicker.vue b/app/components/TierPicker.vue
deleted file mode 100644
index 5cf6318..0000000
--- a/app/components/TierPicker.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
- {{ tier.display }}
- {{ tier.subtitle }}
-
-
-
-
-
-
diff --git a/app/composables/useMemberPayment.js b/app/composables/useMemberPayment.js
index 23255a7..fcab6fe 100644
--- a/app/composables/useMemberPayment.js
+++ b/app/composables/useMemberPayment.js
@@ -25,17 +25,45 @@ export const useMemberPayment = () => {
paymentSuccess.value = false
try {
- // Skip HelcimPay verify if a card's already on file — Helcim refuses
- // to re-save it, breaking retries after a partial-failed signup.
- const [, existing] = await Promise.all([
- getOrCreateCustomer(),
- $fetch('/api/helcim/existing-card').catch((err) => {
+ // Fast-path: when both Helcim ids are already cached on the member doc
+ // AND a card's on file, we can skip the paid getOrCreateCustomer round
+ // trip entirely and go straight to subscription creation.
+ const hasCachedHelcimIds = Boolean(
+ memberData.value?.helcimCustomerId && memberData.value?.helcimCustomerCode
+ )
+
+ let existing = null
+ let probedExistingCard = false
+ let cardToken = null
+
+ if (hasCachedHelcimIds) {
+ existing = await $fetch('/api/helcim/existing-card').catch((err) => {
console.warn('[payment] existing-card lookup failed, falling back to verify flow:', err)
return null
- }),
- ])
+ })
+ probedExistingCard = true
+ if (existing?.cardToken) {
+ customerId.value = memberData.value.helcimCustomerId
+ customerCode.value = memberData.value.helcimCustomerCode
+ cardToken = existing.cardToken
+ }
+ }
- let cardToken = existing?.cardToken || null
+ if (!cardToken) {
+ // Skip HelcimPay verify if a card's already on file — Helcim refuses
+ // to re-save it, breaking retries after a partial-failed signup.
+ const [, existingFromFull] = await Promise.all([
+ getOrCreateCustomer(),
+ probedExistingCard
+ ? Promise.resolve(existing)
+ : $fetch('/api/helcim/existing-card').catch((err) => {
+ console.warn('[payment] existing-card lookup failed, falling back to verify flow:', err)
+ return null
+ }),
+ ])
+
+ cardToken = existingFromFull?.cardToken || null
+ }
if (!cardToken) {
await initializeHelcimPay(
diff --git a/app/config/memberStatus.js b/app/config/memberStatus.js
new file mode 100644
index 0000000..04850e8
--- /dev/null
+++ b/app/config/memberStatus.js
@@ -0,0 +1,8 @@
+export const STATUS_LABELS = {
+ active: "Active",
+ pending_payment: "Payment setup incomplete",
+ suspended: "Paused",
+ cancelled: "Closed",
+};
+
+export const statusLabel = (s) => STATUS_LABELS[s] || "Pending";
diff --git a/app/middleware/coming-soon.global.js b/app/middleware/coming-soon.global.js
index c1ee747..d2433f8 100644
--- a/app/middleware/coming-soon.global.js
+++ b/app/middleware/coming-soon.global.js
@@ -21,6 +21,15 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
return;
}
+ // Logged-in admins bypass coming-soon (and see the public site + their dashboard)
+ try {
+ const headers = import.meta.server ? useRequestHeaders(["cookie"]) : undefined;
+ const member = await $fetch("/api/auth/member", { headers });
+ if (member?.role === "admin") return;
+ } catch {
+ // Not authenticated — fall through to redirect
+ }
+
// Redirect all other routes to coming-soon
return navigateTo("/coming-soon");
});
diff --git a/app/pages/about.vue b/app/pages/about.vue
index a423811..5920e9b 100644
--- a/app/pages/about.vue
+++ b/app/pages/about.vue
@@ -38,16 +38,16 @@
The Circles
-
Founder
+
Founder
For people actively building cooperatives.
-
Practitioner
+
Practitioner
For experienced practitioners sharing what they know.
diff --git a/app/pages/admin/events/index.vue b/app/pages/admin/events/index.vue
index 051e4c8..0cafd01 100644
--- a/app/pages/admin/events/index.vue
+++ b/app/pages/admin/events/index.vue
@@ -570,7 +570,7 @@ tbody td {
letter-spacing: 0.04em;
text-transform: uppercase;
color: var(--c-founder);
- border: 1px dashed rgba(138, 68, 32, 0.3);
+ border: 1px dashed color-mix(in srgb, var(--ember) 30%, transparent);
padding: 2px 8px;
}
@@ -583,7 +583,7 @@ tbody td {
font-size: 10px;
font-weight: 600;
color: var(--c-founder);
- border: 1px dashed rgba(138, 68, 32, 0.4);
+ border: 1px dashed color-mix(in srgb, var(--ember) 40%, transparent);
border-radius: 50%;
}
@@ -632,12 +632,12 @@ tbody td {
.status-upcoming {
color: var(--candle);
- border-color: rgba(122, 90, 16, 0.3);
+ border-color: color-mix(in srgb, var(--candle) 30%, transparent);
}
.status-ongoing {
color: var(--green);
- border-color: rgba(74, 106, 56, 0.3);
+ border-color: color-mix(in srgb, var(--green) 30%, transparent);
}
.status-past {
@@ -647,7 +647,7 @@ tbody td {
.status-cancelled {
color: var(--ember);
- border-color: rgba(138, 68, 32, 0.3);
+ border-color: color-mix(in srgb, var(--ember) 30%, transparent);
margin-top: 4px;
}
diff --git a/app/pages/admin/index.vue b/app/pages/admin/index.vue
index e117a8f..289a813 100644
--- a/app/pages/admin/index.vue
+++ b/app/pages/admin/index.vue
@@ -65,7 +65,7 @@
{{ member.email }}