Compare commits
1 commit
main
...
fix/e2e-st
| Author | SHA1 | Date | |
|---|---|---|---|
| 45a365035a |
149 changed files with 1548 additions and 4201 deletions
|
|
@ -21,16 +21,16 @@ jobs:
|
|||
playwright:
|
||||
runs-on: ubuntu-latest
|
||||
needs: vitest
|
||||
services:
|
||||
mongo:
|
||||
image: mongo:7
|
||||
ports:
|
||||
- 27017:27017
|
||||
env:
|
||||
MONGODB_URI: mongodb://mongo-ci:27017/ghostguild-test
|
||||
MONGODB_URI: mongodb://localhost:27017/ghostguild-test
|
||||
JWT_SECRET: ci-test-jwt-secret
|
||||
RESEND_API_KEY: re_ci_dummy_not_used
|
||||
HELCIM_API_TOKEN: helcim_ci_dummy_not_used
|
||||
OIDC_COOKIE_SECRET: ci-oidc-cookie-secret-not-secret
|
||||
NUXT_PUBLIC_COMING_SOON: 'false'
|
||||
NODE_ENV: development
|
||||
ALLOW_DEV_TEST_ENDPOINTS: 'true'
|
||||
BASE_URL: http://localhost:3000
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
|
|
@ -39,35 +39,15 @@ jobs:
|
|||
cache: npm
|
||||
- run: npm ci
|
||||
- run: npx playwright install --with-deps chromium
|
||||
- name: Start MongoDB
|
||||
run: |
|
||||
docker rm -f mongo-ci 2>/dev/null || true
|
||||
docker run -d --name mongo-ci mongo:7
|
||||
# Forgejo runs each job inside its own container; attach Mongo to
|
||||
# that container's network so MONGODB_URI=mongodb://mongo-ci:27017
|
||||
# resolves from inside the runner.
|
||||
RUNNER_NET=$(docker inspect "$HOSTNAME" --format '{{range $k,$v := .NetworkSettings.Networks}}{{$k}} {{end}}' | awk '{print $1}')
|
||||
docker network connect "$RUNNER_NET" mongo-ci
|
||||
docker ps
|
||||
- name: Wait for MongoDB
|
||||
run: timeout 30 sh -c 'until docker exec mongo-ci mongosh --quiet --eval "1" >/dev/null 2>&1; do sleep 1; done'
|
||||
- name: MongoDB log on failure
|
||||
if: failure()
|
||||
run: docker logs mongo-ci || true
|
||||
- name: Seed test data
|
||||
run: node scripts/seed-all.js && node scripts/seed-tags.js
|
||||
- run: npm run build
|
||||
- name: Start server
|
||||
run: node .output/server/index.mjs > /tmp/server.log 2>&1 &
|
||||
run: node .output/server/index.mjs &
|
||||
env:
|
||||
PORT: 3000
|
||||
- name: Wait for server
|
||||
run: timeout 30 sh -c 'until curl -sf http://localhost:3000; do sleep 1; done'
|
||||
- name: Server log on failure
|
||||
if: failure()
|
||||
run: cat /tmp/server.log || true
|
||||
- run: npx playwright test
|
||||
- uses: actions/upload-artifact@v3
|
||||
- run: npx playwright test --ignore-snapshots
|
||||
- uses: actions/upload-artifact@v4
|
||||
if: failure()
|
||||
with:
|
||||
name: playwright-report
|
||||
|
|
@ -88,3 +68,39 @@ jobs:
|
|||
-H 'Content-type: application/json' \
|
||||
--data "{\"text\":\":x: *Ghost Guild CI failed* on \`${{ github.ref_name }}\`\nCommit: ${{ github.sha }}\n${{ github.server_url }}/${{ github.repository }}/actions\"}"
|
||||
|
||||
visual:
|
||||
runs-on: ubuntu-latest
|
||||
needs: vitest
|
||||
continue-on-error: true
|
||||
services:
|
||||
mongo:
|
||||
image: mongo:7
|
||||
ports:
|
||||
- 27017:27017
|
||||
env:
|
||||
MONGODB_URI: mongodb://localhost:27017/ghostguild-test
|
||||
JWT_SECRET: ci-test-jwt-secret
|
||||
NUXT_PUBLIC_COMING_SOON: 'false'
|
||||
NODE_ENV: development
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: 22
|
||||
cache: npm
|
||||
- run: npm ci
|
||||
- run: npx playwright install --with-deps chromium
|
||||
- run: npm run build
|
||||
- name: Start server
|
||||
run: node .output/server/index.mjs &
|
||||
env:
|
||||
PORT: 3000
|
||||
- name: Wait for server
|
||||
run: timeout 30 sh -c 'until curl -sf http://localhost:3000; do sleep 1; done'
|
||||
- run: npx playwright test e2e/visual/
|
||||
- uses: actions/upload-artifact@v4
|
||||
if: failure()
|
||||
with:
|
||||
name: visual-diffs
|
||||
path: e2e/test-results/
|
||||
retention-days: 7
|
||||
|
|
|
|||
|
|
@ -3,18 +3,15 @@ project_name: "ghostguild-org"
|
|||
|
||||
|
||||
# list of languages for which language servers are started; choose from:
|
||||
# al ansible bash clojure cpp
|
||||
# cpp_ccls crystal csharp csharp_omnisharp dart
|
||||
# elixir elm erlang fortran fsharp
|
||||
# go groovy haskell haxe hlsl
|
||||
# java json julia kotlin lean4
|
||||
# lua luau markdown matlab msl
|
||||
# nix ocaml pascal perl php
|
||||
# php_phpactor powershell python python_jedi python_ty
|
||||
# r rego ruby ruby_solargraph rust
|
||||
# scala solidity swift systemverilog terraform
|
||||
# toml typescript typescript_vts vue yaml
|
||||
# zig
|
||||
# al bash clojure cpp csharp
|
||||
# csharp_omnisharp dart elixir elm erlang
|
||||
# fortran fsharp go groovy haskell
|
||||
# java julia kotlin lua markdown
|
||||
# matlab nix pascal perl php
|
||||
# php_phpactor powershell python python_jedi r
|
||||
# rego ruby ruby_solargraph rust scala
|
||||
# swift terraform toml typescript typescript_vts
|
||||
# vue yaml zig
|
||||
# (This list may be outdated. For the current list, see values of Language enum here:
|
||||
# https://github.com/oraios/serena/blob/main/src/solidlsp/ls_config.py
|
||||
# For some languages, there are alternative language servers, e.g. csharp_omnisharp, ruby_solargraph.)
|
||||
|
|
@ -68,17 +65,53 @@ read_only: false
|
|||
|
||||
# list of tool names to exclude.
|
||||
# This extends the existing exclusions (e.g. from the global configuration)
|
||||
# Find the list of tools here: https://oraios.github.io/serena/01-about/035_tools.html
|
||||
#
|
||||
# Below is the complete list of tools for convenience.
|
||||
# To make sure you have the latest list of tools, and to view their descriptions,
|
||||
# execute `uv run scripts/print_tool_overview.py`.
|
||||
#
|
||||
# * `activate_project`: Activates a project by name.
|
||||
# * `check_onboarding_performed`: Checks whether project onboarding was already performed.
|
||||
# * `create_text_file`: Creates/overwrites a file in the project directory.
|
||||
# * `delete_lines`: Deletes a range of lines within a file.
|
||||
# * `delete_memory`: Deletes a memory from Serena's project-specific memory store.
|
||||
# * `execute_shell_command`: Executes a shell command.
|
||||
# * `find_referencing_code_snippets`: Finds code snippets in which the symbol at the given location is referenced.
|
||||
# * `find_referencing_symbols`: Finds symbols that reference the symbol at the given location (optionally filtered by type).
|
||||
# * `find_symbol`: Performs a global (or local) search for symbols with/containing a given name/substring (optionally filtered by type).
|
||||
# * `get_current_config`: Prints the current configuration of the agent, including the active and available projects, tools, contexts, and modes.
|
||||
# * `get_symbols_overview`: Gets an overview of the top-level symbols defined in a given file.
|
||||
# * `initial_instructions`: Gets the initial instructions for the current project.
|
||||
# Should only be used in settings where the system prompt cannot be set,
|
||||
# e.g. in clients you have no control over, like Claude Desktop.
|
||||
# * `insert_after_symbol`: Inserts content after the end of the definition of a given symbol.
|
||||
# * `insert_at_line`: Inserts content at a given line in a file.
|
||||
# * `insert_before_symbol`: Inserts content before the beginning of the definition of a given symbol.
|
||||
# * `list_dir`: Lists files and directories in the given directory (optionally with recursion).
|
||||
# * `list_memories`: Lists memories in Serena's project-specific memory store.
|
||||
# * `onboarding`: Performs onboarding (identifying the project structure and essential tasks, e.g. for testing or building).
|
||||
# * `prepare_for_new_conversation`: Provides instructions for preparing for a new conversation (in order to continue with the necessary context).
|
||||
# * `read_file`: Reads a file within the project directory.
|
||||
# * `read_memory`: Reads the memory with the given name from Serena's project-specific memory store.
|
||||
# * `remove_project`: Removes a project from the Serena configuration.
|
||||
# * `replace_lines`: Replaces a range of lines within a file with new content.
|
||||
# * `replace_symbol_body`: Replaces the full definition of a symbol.
|
||||
# * `restart_language_server`: Restarts the language server, may be necessary when edits not through Serena happen.
|
||||
# * `search_for_pattern`: Performs a search for a pattern in the project.
|
||||
# * `summarize_changes`: Provides instructions for summarizing the changes made to the codebase.
|
||||
# * `switch_modes`: Activates modes by providing a list of their names
|
||||
# * `think_about_collected_information`: Thinking tool for pondering the completeness of collected information.
|
||||
# * `think_about_task_adherence`: Thinking tool for determining whether the agent is still on track with the current task.
|
||||
# * `think_about_whether_you_are_done`: Thinking tool for determining whether the task is truly completed.
|
||||
# * `write_memory`: Writes a named memory (for future reference) to Serena's project-specific memory store.
|
||||
excluded_tools: []
|
||||
|
||||
# list of tools to include that would otherwise be disabled (particularly optional tools that are disabled by default).
|
||||
# This extends the existing inclusions (e.g. from the global configuration).
|
||||
# Find the list of tools here: https://oraios.github.io/serena/01-about/035_tools.html
|
||||
included_optional_tools: []
|
||||
|
||||
# fixed set of tools to use as the base tool set (if non-empty), replacing Serena's default set of tools.
|
||||
# This cannot be combined with non-empty excluded_tools or included_optional_tools.
|
||||
# Find the list of tools here: https://oraios.github.io/serena/01-about/035_tools.html
|
||||
fixed_tools: []
|
||||
|
||||
# list of mode names to that are always to be included in the set of active modes
|
||||
|
|
@ -89,14 +122,11 @@ fixed_tools: []
|
|||
# Set this to a list of mode names to always include the respective modes for this project.
|
||||
base_modes:
|
||||
|
||||
# list of mode names that are to be activated by default, overriding the setting in the global configuration.
|
||||
# The full set of modes to be activated is base_modes (from global config) + default_modes + added_modes.
|
||||
# If the setting is undefined/empty, the default_modes from the global configuration (serena_config.yml) apply.
|
||||
# list of mode names that are to be activated by default.
|
||||
# The full set of modes to be activated is base_modes + default_modes.
|
||||
# If the setting is undefined, the default_modes from the global configuration (serena_config.yml) apply.
|
||||
# Otherwise, this overrides the setting from the global configuration (serena_config.yml).
|
||||
# Therefore, you can set this to [] if you do not want the default modes defined in the global config to apply
|
||||
# for this project.
|
||||
# This setting can, in turn, be overridden by CLI parameters (--mode).
|
||||
# See https://oraios.github.io/serena/02-usage/050_configuration.html#modes
|
||||
default_modes:
|
||||
|
||||
# initial prompt for the project. It will always be given to the LLM upon activating the project
|
||||
|
|
@ -120,8 +150,3 @@ read_only_memory_patterns: []
|
|||
# Extends the list from the global configuration, merging the two lists.
|
||||
# Example: ["_archive/.*", "_episodes/.*"]
|
||||
ignored_memory_patterns: []
|
||||
|
||||
# list of mode names to be activated additionally for this project, e.g. ["query-projects"]
|
||||
# The full set of modes to be activated is base_modes (from global config) + default_modes + added_modes.
|
||||
# See https://oraios.github.io/serena/02-usage/050_configuration.html#modes
|
||||
added_modes:
|
||||
|
|
|
|||
|
|
@ -27,10 +27,7 @@
|
|||
--text: #2a2015;
|
||||
--text-bright: #1a1008;
|
||||
--text-dim: #5a5040;
|
||||
/* Darkened from #746a58 (4.01:1 on --surface, fails WCAG AA) to #665c4b
|
||||
(4.94:1 on --surface, 5.13:1 on --bg). Stays visually quieter than
|
||||
--text-dim (5.80:1) while meeting AA for small text. */
|
||||
--text-faint: #665c4b;
|
||||
--text-faint: #746a58;
|
||||
--parch: #2a2015;
|
||||
--parch-hover: #3a3025;
|
||||
--parch-text: #ede4d0;
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ const slackLinks = computed(() => {
|
|||
<style scoped>
|
||||
.board-post {
|
||||
border: 1px dashed var(--border);
|
||||
padding: 20px 24px;
|
||||
padding: 18px 22px;
|
||||
background: var(--surface);
|
||||
break-inside: avoid;
|
||||
-webkit-column-break-inside: avoid;
|
||||
|
|
@ -178,8 +178,7 @@ const slackLinks = computed(() => {
|
|||
font-size: 10px;
|
||||
letter-spacing: 0.1em;
|
||||
text-transform: uppercase;
|
||||
/* --text-faint fails WCAG AA (4.01:1) on the cream card bg */
|
||||
color: var(--text-dim);
|
||||
color: var(--text-faint);
|
||||
}
|
||||
|
||||
.post-actions {
|
||||
|
|
@ -220,7 +219,7 @@ const slackLinks = computed(() => {
|
|||
|
||||
.post-title {
|
||||
font-family: "Brygada 1918", serif;
|
||||
font-size: 18px;
|
||||
font-size: 19px;
|
||||
font-weight: 500;
|
||||
color: var(--text-bright);
|
||||
margin: 0 0 12px;
|
||||
|
|
@ -234,8 +233,7 @@ const slackLinks = computed(() => {
|
|||
font-size: 10px;
|
||||
letter-spacing: 0.1em;
|
||||
text-transform: uppercase;
|
||||
/* --text-faint fails WCAG AA (4.01:1) on the cream card bg */
|
||||
color: var(--text-dim);
|
||||
color: var(--text-faint);
|
||||
margin-bottom: 2px;
|
||||
}
|
||||
.block-text {
|
||||
|
|
@ -246,8 +244,7 @@ const slackLinks = computed(() => {
|
|||
|
||||
.post-note {
|
||||
font-size: 11px;
|
||||
/* --text-faint fails WCAG AA (4.01:1) on the cream card bg */
|
||||
color: var(--text-dim);
|
||||
color: var(--text-faint);
|
||||
font-style: italic;
|
||||
margin: 8px 0;
|
||||
white-space: pre-wrap;
|
||||
|
|
@ -296,8 +293,7 @@ const slackLinks = computed(() => {
|
|||
align-items: center;
|
||||
justify-content: center;
|
||||
font-size: 10px;
|
||||
/* --text-faint fails WCAG AA (4.01:1) on the cream card bg */
|
||||
color: var(--text-dim);
|
||||
color: var(--text-faint);
|
||||
font-family: "Commit Mono", monospace;
|
||||
}
|
||||
.author-name {
|
||||
|
|
@ -312,8 +308,7 @@ const slackLinks = computed(() => {
|
|||
}
|
||||
.slack-handle {
|
||||
font-size: 11px;
|
||||
/* --text-faint fails WCAG AA (4.01:1) on the cream card bg */
|
||||
color: var(--text-dim);
|
||||
color: var(--text-faint);
|
||||
font-family: "Commit Mono", monospace;
|
||||
background: transparent;
|
||||
border: none;
|
||||
|
|
|
|||
|
|
@ -138,7 +138,7 @@ function handleSubmit() {
|
|||
<style scoped>
|
||||
.post-form {
|
||||
border: 1px dashed var(--border);
|
||||
padding: 16px 16px;
|
||||
padding: 14px 16px;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
|
|
@ -147,7 +147,7 @@ function handleSubmit() {
|
|||
}
|
||||
.form-title {
|
||||
font-family: "Brygada 1918", serif;
|
||||
font-size: 16px;
|
||||
font-size: 15px;
|
||||
font-weight: 500;
|
||||
color: var(--text-bright);
|
||||
}
|
||||
|
|
@ -183,7 +183,7 @@ function handleSubmit() {
|
|||
color: var(--text-faint);
|
||||
text-transform: none;
|
||||
letter-spacing: 0;
|
||||
font-size: 10px;
|
||||
font-size: 9px;
|
||||
margin-left: 4px;
|
||||
opacity: 0.7;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ defineEmits(['update:modelValue'])
|
|||
|
||||
.circle-option {
|
||||
border: 1px dashed var(--border);
|
||||
padding: 12px 12px;
|
||||
padding: 14px 12px;
|
||||
background: var(--bg);
|
||||
cursor: pointer;
|
||||
transition: all 0.15s;
|
||||
|
|
@ -83,7 +83,7 @@ defineEmits(['update:modelValue'])
|
|||
}
|
||||
|
||||
.circle-tag {
|
||||
font-size: 10px;
|
||||
font-size: 9px;
|
||||
letter-spacing: 0.06em;
|
||||
text-transform: uppercase;
|
||||
margin-top: 6px;
|
||||
|
|
|
|||
70
app/components/EventSeriesBadge.vue
Normal file
70
app/components/EventSeriesBadge.vue
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
<template>
|
||||
<div
|
||||
class="series-badge p-4 bg-guild-800/50 dark:bg-guild-700/30 rounded-xl border border-guild-600 dark:border-guild-600"
|
||||
>
|
||||
<div class="flex items-start justify-between gap-6">
|
||||
<div class="flex-1 min-w-0">
|
||||
<div class="flex flex-wrap items-center gap-2 mb-2">
|
||||
<span
|
||||
class="series-badge__label text-sm font-semibold text-guild-300 dark:text-guild-300"
|
||||
>
|
||||
Part of a Series
|
||||
</span>
|
||||
<span
|
||||
v-if="totalEvents"
|
||||
class="series-badge__count inline-flex items-center px-2 py-0.5 rounded-md bg-guild-700/50 dark:bg-guild-600/50 text-sm font-medium text-guild-200 dark:text-guild-200"
|
||||
>
|
||||
<template v-if="position">
|
||||
Event {{ position }} of {{ totalEvents }}
|
||||
</template>
|
||||
<template v-else> {{ totalEvents }} events in series </template>
|
||||
</span>
|
||||
</div>
|
||||
<h3
|
||||
class="series-badge__title text-lg font-semibold text-guild-100 dark:text-guild-100 mb-2"
|
||||
>
|
||||
{{ title }}
|
||||
</h3>
|
||||
<p
|
||||
v-if="description"
|
||||
class="series-badge__description text-sm text-guild-300 dark:text-guild-300"
|
||||
>
|
||||
{{ description }}
|
||||
</p>
|
||||
</div>
|
||||
<div v-if="seriesId" class="flex-shrink-0 self-start">
|
||||
<UButton
|
||||
:to="`/series/${seriesId}`"
|
||||
color="primary"
|
||||
size="md"
|
||||
label="View Series"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
const props = defineProps({
|
||||
title: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
description: {
|
||||
type: String,
|
||||
default: "",
|
||||
},
|
||||
position: {
|
||||
type: Number,
|
||||
default: null,
|
||||
},
|
||||
totalEvents: {
|
||||
type: Number,
|
||||
default: null,
|
||||
},
|
||||
seriesId: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
});
|
||||
</script>
|
||||
|
|
@ -160,16 +160,12 @@
|
|||
</div>
|
||||
|
||||
<!-- Already Registered -->
|
||||
<div
|
||||
v-else-if="alreadyRegistered"
|
||||
class="p-4"
|
||||
style="background: color-mix(in srgb, var(--candle) 15%, transparent); border: 1px solid var(--candle)"
|
||||
>
|
||||
<div v-else-if="alreadyRegistered" class="p-4 bg-candlelight-900/20 border border-candlelight-700/30 rounded-lg">
|
||||
<div class="flex items-start gap-3">
|
||||
<Icon name="heroicons:check-badge" class="w-6 h-6 flex-shrink-0" style="color: var(--candle)" />
|
||||
<Icon name="heroicons:check-badge" class="w-6 h-6 text-candlelight-400 flex-shrink-0" />
|
||||
<div>
|
||||
<div class="font-semibold mb-1" style="color: var(--candle)">You're Registered!</div>
|
||||
<div class="text-sm" style="color: var(--candle)">
|
||||
<div class="font-semibold text-candlelight-300 mb-1">You're Registered!</div>
|
||||
<div class="text-sm text-candlelight-400">
|
||||
You have a series pass and are registered for all {{ totalEvents }} events.
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -154,7 +154,6 @@
|
|||
securely
|
||||
</p>
|
||||
|
||||
<div class="consent-block">
|
||||
<label class="consent-field">
|
||||
<input
|
||||
v-model="form.createAccount"
|
||||
|
|
@ -166,7 +165,6 @@
|
|||
<p class="field-hint consent-hint">
|
||||
Guest accounts let you view your tickets and register faster next time. We won't add you to member communications.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<button
|
||||
type="submit"
|
||||
|
|
@ -452,26 +450,22 @@ const formatEventDate = (date) => {
|
|||
margin-top: 2px;
|
||||
}
|
||||
|
||||
.consent-block {
|
||||
display: grid;
|
||||
grid-template-columns: auto 1fr;
|
||||
align-items: flex-start;
|
||||
column-gap: 8px;
|
||||
row-gap: 4px;
|
||||
margin-bottom: 14px;
|
||||
}
|
||||
.consent-field {
|
||||
display: contents;
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 8px;
|
||||
font-size: 12px;
|
||||
color: var(--text);
|
||||
margin-bottom: 4px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.consent-field input[type="checkbox"] {
|
||||
margin-top: 3px;
|
||||
flex-shrink: 0;
|
||||
accent-color: var(--candle);
|
||||
}
|
||||
.consent-hint {
|
||||
grid-column: 2;
|
||||
margin: 0;
|
||||
margin-bottom: 14px;
|
||||
padding-left: 24px;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ const formatDate = (dateStr) => {
|
|||
}
|
||||
|
||||
.em-circle {
|
||||
font-size: 10px;
|
||||
font-size: 9px;
|
||||
letter-spacing: 0.06em;
|
||||
text-transform: uppercase;
|
||||
margin-top: 2px;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ defineEmits(['update:modelValue'])
|
|||
|
||||
<style scoped>
|
||||
.filter-bar {
|
||||
padding: 16px 28px;
|
||||
padding: 14px 32px;
|
||||
border-bottom: 1px dashed var(--border);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
|
|
|||
|
|
@ -5,16 +5,14 @@
|
|||
<img
|
||||
:src="transformedImageUrl"
|
||||
:alt="modelValue.alt || 'Event image'"
|
||||
class="w-full h-48 object-cover"
|
||||
style="border: 1px solid var(--border)"
|
||||
class="w-full h-48 object-cover rounded-lg border border-guild-700"
|
||||
@error="console.log('Image failed to load:', transformedImageUrl)"
|
||||
@load="console.log('Image loaded successfully:', transformedImageUrl)"
|
||||
>
|
||||
/>
|
||||
<button
|
||||
type="button"
|
||||
class="absolute top-2 right-2 p-1 rounded-full transition-colors"
|
||||
style="background: var(--ember); color: var(--parch-text)"
|
||||
@click="removeImage"
|
||||
type="button"
|
||||
class="absolute top-2 right-2 p-1 bg-ember-500 text-white rounded-full hover:bg-ember-600 transition-colors"
|
||||
>
|
||||
<Icon name="heroicons:x-mark" class="w-4 h-4" />
|
||||
</button>
|
||||
|
|
@ -23,84 +21,67 @@
|
|||
<!-- Upload Area -->
|
||||
<div
|
||||
v-if="!modelValue?.url"
|
||||
class="border-2 border-dashed p-6 text-center transition-colors"
|
||||
:style="
|
||||
isDragging
|
||||
? 'border-color: var(--candle); background: color-mix(in srgb, var(--candle) 15%, transparent)'
|
||||
: 'border-color: var(--border)'
|
||||
"
|
||||
class="border-2 border-dashed border-guild-700 rounded-lg p-6 text-center hover:border-guild-600 transition-colors"
|
||||
@dragover.prevent="isDragging = true"
|
||||
@dragleave.prevent="isDragging = false"
|
||||
@drop.prevent="handleDrop"
|
||||
:class="{ 'border-candlelight-400 bg-candlelight-900/20': isDragging }"
|
||||
>
|
||||
<input
|
||||
ref="fileInput"
|
||||
type="file"
|
||||
accept="image/*"
|
||||
class="hidden"
|
||||
@change="handleFileSelect"
|
||||
>
|
||||
class="hidden"
|
||||
/>
|
||||
|
||||
<div class="space-y-3">
|
||||
<Icon
|
||||
name="heroicons:photo"
|
||||
class="w-12 h-12 mx-auto"
|
||||
style="color: var(--text-dim)"
|
||||
/>
|
||||
<Icon name="heroicons:photo" class="w-12 h-12 text-guild-400 mx-auto" />
|
||||
<div>
|
||||
<p style="color: var(--text-dim)">
|
||||
<p class="text-guild-400">
|
||||
<button
|
||||
type="button"
|
||||
class="font-medium"
|
||||
style="color: var(--candle)"
|
||||
@click="$refs.fileInput.click()"
|
||||
class="text-candlelight-400 hover:text-candlelight-300 font-medium"
|
||||
>
|
||||
Click to upload
|
||||
</button>
|
||||
or drag and drop
|
||||
</p>
|
||||
<p class="text-sm" style="color: var(--text-faint)">
|
||||
PNG, JPG, GIF up to 10MB
|
||||
</p>
|
||||
<p class="text-sm text-guild-500">PNG, JPG, GIF up to 10MB</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Alt Text Input -->
|
||||
<div v-if="modelValue?.url">
|
||||
<label
|
||||
class="block text-sm font-medium mb-1"
|
||||
style="color: var(--text-bright)"
|
||||
>
|
||||
<label class="block text-sm font-medium text-guild-100 mb-1">
|
||||
Alt Text (for accessibility)
|
||||
</label>
|
||||
<input
|
||||
:value="modelValue.alt || ''"
|
||||
placeholder="Describe this image..."
|
||||
class="w-full px-3 py-2 alt-text-input"
|
||||
@input="updateAltText($event.target.value)"
|
||||
>
|
||||
placeholder="Describe this image..."
|
||||
class="w-full bg-guild-800 border border-guild-700 rounded-lg px-3 py-2 text-guild-100 placeholder-guild-500 focus:ring-2 focus:ring-candlelight-500 focus:border-transparent"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<!-- Upload Progress -->
|
||||
<div v-if="isUploading" class="space-y-2">
|
||||
<div class="flex items-center justify-between text-sm">
|
||||
<span style="color: var(--text-dim)">Uploading...</span>
|
||||
<span style="color: var(--text-dim)">{{ uploadProgress }}%</span>
|
||||
<span class="text-guild-400">Uploading...</span>
|
||||
<span class="text-guild-400">{{ uploadProgress }}%</span>
|
||||
</div>
|
||||
<div class="w-full bg-guild-800 rounded-full h-2">
|
||||
<div
|
||||
class="w-full rounded-full h-2"
|
||||
style="background: var(--surface)"
|
||||
>
|
||||
<div
|
||||
class="h-2 rounded-full transition-all duration-300"
|
||||
:style="`width: ${uploadProgress}%; background: var(--candle)`"
|
||||
class="bg-candlelight-600 h-2 rounded-full transition-all duration-300"
|
||||
:style="`width: ${uploadProgress}%`"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Error Message -->
|
||||
<div v-if="errorMessage" class="text-sm" style="color: var(--ember)">
|
||||
<div v-if="errorMessage" class="text-sm text-ember-400">
|
||||
{{ errorMessage }}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -220,16 +201,3 @@ const updateAltText = (altText) => {
|
|||
});
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.alt-text-input {
|
||||
background: var(--input-bg);
|
||||
border: 1px solid var(--border);
|
||||
color: var(--text);
|
||||
}
|
||||
|
||||
.alt-text-input:focus {
|
||||
outline: none;
|
||||
border-color: var(--candle);
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
type="email"
|
||||
placeholder="your.email@example.com"
|
||||
required
|
||||
>
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="info-box">
|
||||
|
|
@ -182,7 +182,7 @@ onUnmounted(() => document.removeEventListener('keydown', handleKeydown))
|
|||
|
||||
.modal-overline {
|
||||
font-family: 'Brygada 1918', serif;
|
||||
font-size: 13px;
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
color: var(--candle);
|
||||
margin-bottom: 12px;
|
||||
|
|
@ -218,7 +218,7 @@ onUnmounted(() => document.removeEventListener('keydown', handleKeydown))
|
|||
.info-box {
|
||||
font-size: 11px;
|
||||
color: var(--text-faint);
|
||||
padding: 12px 16px;
|
||||
padding: 10px 14px;
|
||||
border: 1px dashed var(--border);
|
||||
margin-bottom: 16px;
|
||||
line-height: 1.6;
|
||||
|
|
|
|||
|
|
@ -18,14 +18,12 @@
|
|||
<Icon
|
||||
v-if="isValidParse && naturalInput.trim()"
|
||||
name="heroicons:check-circle"
|
||||
class="w-5 h-5"
|
||||
style="color: var(--candle)"
|
||||
class="w-5 h-5 text-candlelight-500"
|
||||
/>
|
||||
<Icon
|
||||
v-else-if="hasError && naturalInput.trim()"
|
||||
name="heroicons:exclamation-circle"
|
||||
class="w-5 h-5"
|
||||
style="color: var(--ember)"
|
||||
class="w-5 h-5 text-ember-500"
|
||||
/>
|
||||
</template>
|
||||
</UInput>
|
||||
|
|
@ -33,8 +31,7 @@
|
|||
|
||||
<div
|
||||
v-if="parsedDate && isValidParse"
|
||||
class="text-sm px-3 py-2"
|
||||
style="color: var(--candle); background: color-mix(in srgb, var(--candle) 15%, transparent); border: 1px solid var(--candle)"
|
||||
class="text-sm text-candlelight-400 bg-candlelight-900/20 px-3 py-2 rounded-lg border border-candlelight-800"
|
||||
>
|
||||
<div class="flex items-center gap-2">
|
||||
<Icon name="heroicons:calendar" class="w-4 h-4" />
|
||||
|
|
@ -44,8 +41,7 @@
|
|||
|
||||
<div
|
||||
v-if="hasError && naturalInput.trim()"
|
||||
class="text-sm px-3 py-2"
|
||||
style="color: var(--ember); background: color-mix(in srgb, var(--ember) 15%, transparent); border: 1px solid var(--ember)"
|
||||
class="text-sm text-ember-400 bg-ember-900/20 px-3 py-2 rounded-lg border border-ember-800"
|
||||
>
|
||||
<div class="flex items-center gap-2">
|
||||
<Icon name="heroicons:exclamation-triangle" class="w-4 h-4" />
|
||||
|
|
@ -55,7 +51,7 @@
|
|||
|
||||
<!-- Fallback datetime-local input -->
|
||||
<details class="text-sm">
|
||||
<summary class="cursor-pointer" style="color: var(--text-dim)">
|
||||
<summary class="cursor-pointer text-guild-400 hover:text-guild-100">
|
||||
Use traditional date picker
|
||||
</summary>
|
||||
<div class="mt-2">
|
||||
|
|
|
|||
|
|
@ -118,7 +118,7 @@ const barEmpty = computed(() => '-'.repeat((4 - completedCount.value) * 2) + ']'
|
|||
display: inline-block;
|
||||
margin-top: 8px;
|
||||
padding: 4px 12px;
|
||||
border: 1px dashed color-mix(in srgb, var(--parch-text) 25%, transparent);
|
||||
border: 1px dashed rgba(237, 228, 208, 0.25);
|
||||
color: var(--parch-accent);
|
||||
font-size: 11px;
|
||||
text-decoration: none;
|
||||
|
|
@ -134,7 +134,7 @@ const barEmpty = computed(() => '-'.repeat((4 - completedCount.value) * 2) + ']'
|
|||
.ow-progress {
|
||||
margin-top: 10px;
|
||||
padding-top: 8px;
|
||||
border-top: 1px dashed color-mix(in srgb, var(--parch-text) 12%, transparent);
|
||||
border-top: 1px dashed rgba(237, 228, 208, 0.12);
|
||||
font-size: 11px;
|
||||
color: var(--parch-text-dim);
|
||||
display: flex;
|
||||
|
|
@ -153,7 +153,7 @@ const barEmpty = computed(() => '-'.repeat((4 - completedCount.value) * 2) + ']'
|
|||
}
|
||||
|
||||
.ow-bar-empty {
|
||||
color: color-mix(in srgb, var(--parch-text) 20%, transparent);
|
||||
color: rgba(237, 228, 208, 0.2);
|
||||
}
|
||||
|
||||
.ow-skip {
|
||||
|
|
|
|||
|
|
@ -9,11 +9,14 @@
|
|||
</div>
|
||||
|
||||
<!-- Error State -->
|
||||
<div v-else-if="error" class="error-state p-6">
|
||||
<h3 class="error-state__heading text-lg font-semibold mb-2">
|
||||
<div
|
||||
v-else-if="error"
|
||||
class="p-6 bg-ember-900/20 rounded-xl border border-ember-800"
|
||||
>
|
||||
<h3 class="text-lg font-semibold text-ember-300 mb-2">
|
||||
Unable to Load Series Pass
|
||||
</h3>
|
||||
<p class="error-state__body">{{ error }}</p>
|
||||
<p class="text-ember-400">{{ error }}</p>
|
||||
</div>
|
||||
|
||||
<!-- Content -->
|
||||
|
|
@ -45,7 +48,7 @@
|
|||
<!-- Registration Form -->
|
||||
<div
|
||||
v-if="passInfo.available && !passInfo.alreadyRegistered"
|
||||
class="registration-form p-6"
|
||||
class="bg-guild-800/50 dark:bg-guild-700/30 rounded-xl border border-guild-600 dark:border-guild-600 p-6"
|
||||
>
|
||||
<h3 class="text-xl font-bold text-[--ui-text] mb-6">
|
||||
{{
|
||||
|
|
@ -100,20 +103,18 @@
|
|||
<!-- Member Benefits Notice -->
|
||||
<div
|
||||
v-if="passInfo.ticket.isFree && passInfo.memberInfo?.isMember"
|
||||
class="p-4"
|
||||
style="background: color-mix(in srgb, var(--candle) 15%, transparent); border: 1px solid var(--candle)"
|
||||
class="p-4 bg-candlelight-900/20 border border-candlelight-700/30 rounded-lg"
|
||||
>
|
||||
<div class="flex items-start gap-3">
|
||||
<Icon
|
||||
name="heroicons:sparkles"
|
||||
class="w-5 h-5 flex-shrink-0 mt-0.5"
|
||||
style="color: var(--candle)"
|
||||
class="w-5 h-5 text-candlelight-400 flex-shrink-0 mt-0.5"
|
||||
/>
|
||||
<div>
|
||||
<div class="font-semibold mb-1" style="color: var(--candle)">
|
||||
<div class="font-semibold text-candlelight-300 mb-1">
|
||||
Member Benefit
|
||||
</div>
|
||||
<div class="text-sm" style="color: var(--candle)">
|
||||
<div class="text-sm text-candlelight-400">
|
||||
This series pass is free for Ghost Guild members!
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -307,7 +308,7 @@ const handleSubmit = async () => {
|
|||
title: "Series Pass Purchased!",
|
||||
description: `You're now registered for all ${purchaseResponse.registration.eventsRegistered} events in this series.`,
|
||||
color: "green",
|
||||
duration: 5000,
|
||||
timeout: 5000,
|
||||
});
|
||||
|
||||
// Emit success event
|
||||
|
|
@ -327,7 +328,7 @@ const handleSubmit = async () => {
|
|||
title: "Purchase Failed",
|
||||
description: errorMessage,
|
||||
color: "red",
|
||||
duration: 5000,
|
||||
timeout: 5000,
|
||||
});
|
||||
|
||||
emit("purchase-error", errorMessage);
|
||||
|
|
@ -354,18 +355,3 @@ const formatPrice = (price, currency = "CAD") => {
|
|||
}).format(price);
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.error-state {
|
||||
background: color-mix(in srgb, var(--ember) 8%, transparent);
|
||||
border: 1px dashed var(--ember);
|
||||
}
|
||||
.error-state__heading,
|
||||
.error-state__body {
|
||||
color: var(--ember);
|
||||
}
|
||||
.registration-form {
|
||||
background: var(--surface);
|
||||
border: 1px dashed var(--border);
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ const stepLabel = computed(() => {
|
|||
position: fixed;
|
||||
inset: 0;
|
||||
z-index: 50;
|
||||
background: color-mix(in srgb, var(--parch) 72%, transparent);
|
||||
background: rgba(42, 32, 21, 0.72);
|
||||
backdrop-filter: blur(4px);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
|
|
|||
99
app/components/TierPicker.vue
Normal file
99
app/components/TierPicker.vue
Normal file
|
|
@ -0,0 +1,99 @@
|
|||
<template>
|
||||
<div class="tier-picker">
|
||||
<div
|
||||
v-for="tier in tiers"
|
||||
:key="tier.amount"
|
||||
class="tier-option"
|
||||
:class="{ current: modelValue === tier.amount }"
|
||||
@click="$emit('update:modelValue', tier.amount)"
|
||||
>
|
||||
<span class="tier-amount">{{ tier.display }}</span>
|
||||
<span v-if="tier.subtitle" class="tier-subtitle">{{ tier.subtitle }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
defineProps({
|
||||
modelValue: { type: Number, default: 0 },
|
||||
tiers: {
|
||||
type: Array,
|
||||
default: () => [
|
||||
{ amount: 0, display: "$0", label: "Free" },
|
||||
{ amount: 5, display: "$5", label: "/month" },
|
||||
{ amount: 15, display: "$15", label: "/month" },
|
||||
{ amount: 30, display: "$30", label: "/month" },
|
||||
{ amount: 50, display: "$50", label: "/month" },
|
||||
],
|
||||
},
|
||||
});
|
||||
|
||||
defineEmits(["update:modelValue"]);
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.tier-picker {
|
||||
display: flex;
|
||||
gap: 0;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
.tier-option {
|
||||
flex: 1;
|
||||
padding: 18px 8px;
|
||||
text-align: center;
|
||||
border: 1px dashed var(--border);
|
||||
background: var(--bg);
|
||||
cursor: pointer;
|
||||
transition: all 0.15s;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
/* Overlap adjacent borders so dashed lines collapse into one */
|
||||
.tier-option + .tier-option {
|
||||
margin-left: -1px;
|
||||
}
|
||||
|
||||
.tier-option:hover {
|
||||
background: var(--surface-hover);
|
||||
}
|
||||
|
||||
/* Active item paints its solid border on top of any neighbor */
|
||||
.tier-option.current {
|
||||
border-color: var(--candle);
|
||||
border-style: solid;
|
||||
background: var(--surface);
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.tier-amount {
|
||||
font-size: 24px;
|
||||
font-weight: 600;
|
||||
color: var(--text);
|
||||
font-family: "Brygada 1918", serif;
|
||||
display: block;
|
||||
line-height: 1.1;
|
||||
}
|
||||
|
||||
.tier-option.current .tier-amount {
|
||||
color: var(--candle);
|
||||
}
|
||||
|
||||
.tier-subtitle {
|
||||
display: block;
|
||||
margin-top: 4px;
|
||||
font-size: 11px;
|
||||
color: var(--text-dim);
|
||||
font-family: "Commit Mono", monospace;
|
||||
letter-spacing: 0.02em;
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
.tier-picker {
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.tier-option {
|
||||
min-width: 60px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -25,45 +25,17 @@ export const useMemberPayment = () => {
|
|||
paymentSuccess.value = false
|
||||
|
||||
try {
|
||||
// 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
|
||||
}
|
||||
}
|
||||
|
||||
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([
|
||||
const [, existing] = await Promise.all([
|
||||
getOrCreateCustomer(),
|
||||
probedExistingCard
|
||||
? Promise.resolve(existing)
|
||||
: $fetch('/api/helcim/existing-card').catch((err) => {
|
||||
$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
|
||||
}
|
||||
let cardToken = existing?.cardToken || null
|
||||
|
||||
if (!cardToken) {
|
||||
await initializeHelcimPay(
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
export const STATUS_LABELS = {
|
||||
active: "Active",
|
||||
pending_payment: "Payment setup incomplete",
|
||||
suspended: "Paused",
|
||||
cancelled: "Closed",
|
||||
};
|
||||
|
||||
export const statusLabel = (s) => STATUS_LABELS[s] || "Pending";
|
||||
|
|
@ -21,15 +21,6 @@ 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");
|
||||
});
|
||||
|
|
|
|||
|
|
@ -38,16 +38,16 @@
|
|||
<div class="section-label">The Circles</div>
|
||||
<div class="circles-grid">
|
||||
<div id="community" class="circle-cell">
|
||||
<h2 style="color: var(--c-community)">Community</h2>
|
||||
<h3 style="color: var(--c-community)">Community</h3>
|
||||
|
||||
<p>For anyone exploring cooperative models.</p>
|
||||
</div>
|
||||
<div id="founder" class="circle-cell">
|
||||
<h2 style="color: var(--c-founder)">Founder</h2>
|
||||
<h3 style="color: var(--c-founder)">Founder</h3>
|
||||
<p>For people actively building cooperatives.</p>
|
||||
</div>
|
||||
<div id="practitioner" class="circle-cell">
|
||||
<h2 style="color: var(--c-practitioner)">Practitioner</h2>
|
||||
<h3 style="color: var(--c-practitioner)">Practitioner</h3>
|
||||
<p>For experienced practitioners sharing what they know.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -570,7 +570,7 @@ tbody td {
|
|||
letter-spacing: 0.04em;
|
||||
text-transform: uppercase;
|
||||
color: var(--c-founder);
|
||||
border: 1px dashed color-mix(in srgb, var(--ember) 30%, transparent);
|
||||
border: 1px dashed rgba(138, 68, 32, 0.3);
|
||||
padding: 2px 8px;
|
||||
}
|
||||
|
||||
|
|
@ -583,7 +583,7 @@ tbody td {
|
|||
font-size: 10px;
|
||||
font-weight: 600;
|
||||
color: var(--c-founder);
|
||||
border: 1px dashed color-mix(in srgb, var(--ember) 40%, transparent);
|
||||
border: 1px dashed rgba(138, 68, 32, 0.4);
|
||||
border-radius: 50%;
|
||||
}
|
||||
|
||||
|
|
@ -632,12 +632,12 @@ tbody td {
|
|||
|
||||
.status-upcoming {
|
||||
color: var(--candle);
|
||||
border-color: color-mix(in srgb, var(--candle) 30%, transparent);
|
||||
border-color: rgba(122, 90, 16, 0.3);
|
||||
}
|
||||
|
||||
.status-ongoing {
|
||||
color: var(--green);
|
||||
border-color: color-mix(in srgb, var(--green) 30%, transparent);
|
||||
border-color: rgba(74, 106, 56, 0.3);
|
||||
}
|
||||
|
||||
.status-past {
|
||||
|
|
@ -647,7 +647,7 @@ tbody td {
|
|||
|
||||
.status-cancelled {
|
||||
color: var(--ember);
|
||||
border-color: color-mix(in srgb, var(--ember) 30%, transparent);
|
||||
border-color: rgba(138, 68, 32, 0.3);
|
||||
margin-top: 4px;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@
|
|||
<span class="item-sub">{{ member.email }}</span>
|
||||
</div>
|
||||
<div class="item-meta">
|
||||
<CircleBadge :circle="member.circle" />
|
||||
<span class="badge" :class="member.circle">{{ member.circle }}</span>
|
||||
<span class="item-date">{{ formatDate(member.createdAt) }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
<p v-if="member" class="member-email">{{ member.email }}</p>
|
||||
</div>
|
||||
<div v-if="member" class="header-badges">
|
||||
<CircleBadge :circle="member.circle" />
|
||||
<span class="badge" :class="member.circle">{{ member.circle }}</span>
|
||||
<span :class="statusClass(member.status)" class="status-badge">{{ member.status }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -39,11 +39,11 @@
|
|||
<form class="edit-form" @submit.prevent="submitEdit">
|
||||
<div class="field">
|
||||
<label>Name</label>
|
||||
<input v-model="form.name" type="text" required >
|
||||
<input v-model="form.name" type="text" required />
|
||||
</div>
|
||||
<div class="field">
|
||||
<label>Email</label>
|
||||
<input v-model="form.email" type="email" required >
|
||||
<input v-model="form.email" type="email" required />
|
||||
</div>
|
||||
<div class="field">
|
||||
<label>Circle</label>
|
||||
|
|
@ -56,18 +56,14 @@
|
|||
<div class="field">
|
||||
<label>Contribution ($/mo)</label>
|
||||
<input v-model.number="form.contributionAmount" type="number" min="0" step="1">
|
||||
<p class="field-hint field-hint--warn">
|
||||
Writes to our database only. If the member is on a paid plan, also update <code>recurringAmount</code> in the Helcim dashboard — this form does not sync.
|
||||
</p>
|
||||
</div>
|
||||
<div class="field">
|
||||
<label>Status</label>
|
||||
<select v-model="form.status">
|
||||
<option
|
||||
v-for="(label, value) in STATUS_LABELS"
|
||||
:key="value"
|
||||
:value="value"
|
||||
>{{ label }}</option>
|
||||
<option value="pending_payment">pending_payment</option>
|
||||
<option value="active">active</option>
|
||||
<option value="suspended">suspended</option>
|
||||
<option value="cancelled">cancelled</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="field">
|
||||
|
|
@ -110,19 +106,8 @@
|
|||
</div>
|
||||
<div class="meta-row">
|
||||
<dt>Slack invite</dt>
|
||||
<dd v-if="member.slackInvited" class="status-ok">
|
||||
Invited {{ formatDate(member.slackInvitedAt) }}
|
||||
</dd>
|
||||
<dd v-else class="meta-action">
|
||||
<span class="status-dim">Not yet invited</span>
|
||||
<button
|
||||
type="button"
|
||||
class="link-btn"
|
||||
:disabled="markingSlackInvited"
|
||||
@click="markSlackInvited"
|
||||
>
|
||||
{{ markingSlackInvited ? "Marking…" : "Mark as Slack invited" }}
|
||||
</button>
|
||||
<dd :class="member.slackInvited ? 'status-ok' : 'status-dim'">
|
||||
{{ member.slackInvited ? "Invited" : "Pending" }}
|
||||
</dd>
|
||||
</div>
|
||||
<div v-if="member.helcimCustomerId" class="meta-row">
|
||||
|
|
@ -170,6 +155,12 @@
|
|||
{{ member.onboarding?.completedAt ? formatDate(member.onboarding.completedAt) : 'In progress' }}
|
||||
</dd>
|
||||
</div>
|
||||
<div class="meta-row">
|
||||
<dt>Slack status</dt>
|
||||
<dd :class="slackStatusClass">
|
||||
{{ member.slackInviteStatus || 'none' }}
|
||||
</dd>
|
||||
</div>
|
||||
</dl>
|
||||
</section>
|
||||
|
||||
|
|
@ -243,7 +234,6 @@
|
|||
|
||||
<script setup>
|
||||
import { formatActivity } from '~/utils/activityText'
|
||||
import { STATUS_LABELS } from '~/config/memberStatus'
|
||||
|
||||
definePageMeta({
|
||||
layout: "admin",
|
||||
|
|
@ -366,31 +356,12 @@ const hasBoardEngaged = computed(() => {
|
|||
)
|
||||
})
|
||||
|
||||
const markingSlackInvited = ref(false)
|
||||
|
||||
async function markSlackInvited() {
|
||||
if (!member.value || markingSlackInvited.value) return
|
||||
markingSlackInvited.value = true
|
||||
try {
|
||||
const res = await $fetch(
|
||||
`/api/admin/members/${route.params.id}/slack-status`,
|
||||
{
|
||||
method: "PATCH",
|
||||
body: { slackInvited: true },
|
||||
},
|
||||
)
|
||||
member.value = { ...member.value, ...res.member }
|
||||
toast.add({ title: "Marked as Slack invited", color: "success" })
|
||||
} catch (err) {
|
||||
toast.add({
|
||||
title: "Failed to mark Slack invited",
|
||||
description: err.data?.statusMessage || err.message,
|
||||
color: "error",
|
||||
const slackStatusClass = computed(() => {
|
||||
const status = member.value?.slackInviteStatus
|
||||
if (status === 'joined') return 'status-ok'
|
||||
if (status === 'invited') return 'status-dim'
|
||||
return 'status-dim'
|
||||
})
|
||||
} finally {
|
||||
markingSlackInvited.value = false
|
||||
}
|
||||
}
|
||||
|
||||
// Activity log
|
||||
const activityEntries = ref([])
|
||||
|
|
@ -539,24 +510,6 @@ onMounted(loadActivity)
|
|||
margin-top: 12px;
|
||||
}
|
||||
|
||||
.field-hint {
|
||||
font-size: 11px;
|
||||
color: var(--text-faint);
|
||||
margin: 6px 0 0;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
.field-hint--warn {
|
||||
color: var(--ember);
|
||||
border-left: 2px solid var(--ember);
|
||||
padding: 4px 0 4px 8px;
|
||||
}
|
||||
|
||||
.field-hint code {
|
||||
font-family: "Commit Mono", monospace;
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.form-actions {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
|
|
@ -600,32 +553,6 @@ onMounted(loadActivity)
|
|||
word-break: break-all;
|
||||
}
|
||||
|
||||
.meta-action {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.link-btn {
|
||||
background: none;
|
||||
border: none;
|
||||
color: var(--candle);
|
||||
cursor: pointer;
|
||||
font-family: "Commit Mono", monospace;
|
||||
font-size: 11px;
|
||||
padding: 2px 6px;
|
||||
}
|
||||
|
||||
.link-btn:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.link-btn:disabled {
|
||||
opacity: 0.6;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.mono {
|
||||
font-family: "Commit Mono", monospace;
|
||||
font-size: 11px;
|
||||
|
|
|
|||
|
|
@ -41,11 +41,10 @@
|
|||
<div class="field" style="margin-bottom: 0">
|
||||
<select v-model="statusFilter" aria-label="Filter by status">
|
||||
<option value="">All Statuses</option>
|
||||
<option
|
||||
v-for="(label, value) in STATUS_LABELS"
|
||||
:key="value"
|
||||
:value="value"
|
||||
>{{ label }}</option>
|
||||
<option value="active">Active</option>
|
||||
<option value="pending_payment">Pending Payment</option>
|
||||
<option value="suspended">Suspended</option>
|
||||
<option value="cancelled">Cancelled</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -109,7 +108,9 @@
|
|||
</td>
|
||||
<td class="col-email">{{ member.email }}</td>
|
||||
<td>
|
||||
<CircleBadge :circle="member.circle" />
|
||||
<span class="badge" :class="member.circle">{{
|
||||
member.circle
|
||||
}}</span>
|
||||
</td>
|
||||
<td class="col-mono">${{ member.contributionAmount ?? 0 }}/mo</td>
|
||||
<td>
|
||||
|
|
@ -123,11 +124,8 @@
|
|||
</span>
|
||||
</td>
|
||||
<td>
|
||||
<span v-if="member.slackInvited" class="status-ok">
|
||||
Invited {{ formatDate(member.slackInvitedAt) }}
|
||||
</span>
|
||||
<span v-else class="status-dim">
|
||||
Not yet invited
|
||||
<span :class="member.slackInvited ? 'status-ok' : 'status-dim'">
|
||||
{{ member.slackInvited ? "Invited" : "Pending" }}
|
||||
</span>
|
||||
</td>
|
||||
<td class="col-mono col-date">
|
||||
|
|
@ -137,12 +135,8 @@
|
|||
<NuxtLink :to="`/admin/members/${member._id}`" class="link-btn" @click.stop
|
||||
>View</NuxtLink
|
||||
>
|
||||
<button
|
||||
v-if="!member.slackInvited"
|
||||
class="link-btn"
|
||||
@click.stop="markSlackInvited(member)"
|
||||
>
|
||||
Mark as Slack invited
|
||||
<button class="link-btn" @click.stop="sendSlackInvite(member)">
|
||||
Slack
|
||||
</button>
|
||||
<button class="link-btn" @click.stop="editMember(member)">Edit</button>
|
||||
</td>
|
||||
|
|
@ -268,7 +262,7 @@
|
|||
<th>Name</th>
|
||||
<th>Email</th>
|
||||
<th>Circle</th>
|
||||
<th>Contribution</th>
|
||||
<th>Tier</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
@ -372,11 +366,10 @@
|
|||
<div class="field">
|
||||
<label>Status</label>
|
||||
<select v-model="editingMember.status">
|
||||
<option
|
||||
v-for="(label, value) in STATUS_LABELS"
|
||||
:key="value"
|
||||
:value="value"
|
||||
>{{ label }}</option>
|
||||
<option value="pending_payment">Pending Payment</option>
|
||||
<option value="active">Active</option>
|
||||
<option value="suspended">Suspended</option>
|
||||
<option value="cancelled">Cancelled</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="modal-actions">
|
||||
|
|
@ -468,8 +461,6 @@
|
|||
</template>
|
||||
|
||||
<script setup>
|
||||
import { STATUS_LABELS, statusLabel } from "~/config/memberStatus";
|
||||
|
||||
definePageMeta({
|
||||
layout: "admin",
|
||||
middleware: "admin",
|
||||
|
|
@ -490,6 +481,14 @@ const statusFilter = ref("");
|
|||
const sortKey = ref("createdAt");
|
||||
const sortDir = ref("desc");
|
||||
|
||||
const STATUS_LABELS = {
|
||||
active: "Active",
|
||||
pending_payment: "Pending",
|
||||
suspended: "Suspended",
|
||||
cancelled: "Cancelled",
|
||||
};
|
||||
const statusLabel = (s) => STATUS_LABELS[s] || "Pending";
|
||||
|
||||
const toggleSort = (key) => {
|
||||
if (sortKey.value === key) {
|
||||
sortDir.value = sortDir.value === "asc" ? "desc" : "asc";
|
||||
|
|
@ -830,25 +829,8 @@ const submitInvites = async () => {
|
|||
};
|
||||
|
||||
// --- Existing actions ---
|
||||
const markSlackInvited = async (member) => {
|
||||
try {
|
||||
const res = await $fetch(
|
||||
`/api/admin/members/${member._id}/slack-status`,
|
||||
{
|
||||
method: "PATCH",
|
||||
body: { slackInvited: true },
|
||||
},
|
||||
);
|
||||
const idx = members.value.findIndex((m) => m._id === member._id);
|
||||
if (idx !== -1) members.value[idx] = { ...members.value[idx], ...res.member };
|
||||
toast.add({ title: "Marked as Slack invited", color: "success" });
|
||||
} catch (err) {
|
||||
toast.add({
|
||||
title: "Failed to mark Slack invited",
|
||||
description: err.data?.statusMessage || err.message,
|
||||
color: "error",
|
||||
});
|
||||
}
|
||||
const sendSlackInvite = (member) => {
|
||||
console.log("Send Slack invite to:", member.email);
|
||||
};
|
||||
|
||||
// --- Edit Member ---
|
||||
|
|
@ -1144,7 +1126,7 @@ th.sortable:hover {
|
|||
text-transform: uppercase;
|
||||
}
|
||||
.badge.status-active {
|
||||
color: var(--green);
|
||||
color: var(--green, #3a6b3a);
|
||||
border-color: rgba(58, 107, 58, 0.45);
|
||||
}
|
||||
.badge.status-pending_payment {
|
||||
|
|
@ -1153,7 +1135,7 @@ th.sortable:hover {
|
|||
}
|
||||
.badge.status-suspended {
|
||||
color: var(--ember);
|
||||
border-color: color-mix(in srgb, var(--ember) 45%, transparent);
|
||||
border-color: rgba(138, 68, 32, 0.45);
|
||||
}
|
||||
.badge.status-cancelled {
|
||||
color: var(--text-faint);
|
||||
|
|
@ -1301,7 +1283,7 @@ th.sortable:hover {
|
|||
}
|
||||
|
||||
.row-error {
|
||||
background: color-mix(in srgb, var(--ember) 4%, transparent);
|
||||
background: rgba(138, 68, 32, 0.04);
|
||||
}
|
||||
|
||||
/* ---- PREVIEW BOX ---- */
|
||||
|
|
|
|||
|
|
@ -643,8 +643,8 @@ tbody td {
|
|||
}
|
||||
|
||||
.status-accepted {
|
||||
color: var(--green);
|
||||
border-color: var(--green);
|
||||
color: var(--green, #4a7);
|
||||
border-color: var(--green, #4a7);
|
||||
}
|
||||
|
||||
.status-expired {
|
||||
|
|
@ -671,7 +671,7 @@ tbody td {
|
|||
|
||||
/* ---- STATUS INDICATORS ---- */
|
||||
.status-ok {
|
||||
color: var(--green);
|
||||
color: var(--green, #4a7);
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -850,7 +850,7 @@ const exportSeriesData = () => {
|
|||
font-size: 11px;
|
||||
font-weight: 600;
|
||||
color: var(--c-founder);
|
||||
border: 1px dashed color-mix(in srgb, var(--ember) 40%, transparent);
|
||||
border: 1px dashed rgba(138, 68, 32, 0.4);
|
||||
border-radius: 50%;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
|
@ -931,12 +931,12 @@ const exportSeriesData = () => {
|
|||
|
||||
.status-active {
|
||||
color: var(--green);
|
||||
border-color: color-mix(in srgb, var(--green) 30%, transparent);
|
||||
border-color: rgba(74, 106, 56, 0.3);
|
||||
}
|
||||
|
||||
.status-upcoming {
|
||||
color: var(--candle);
|
||||
border-color: color-mix(in srgb, var(--candle) 30%, transparent);
|
||||
border-color: rgba(122, 90, 16, 0.3);
|
||||
}
|
||||
|
||||
.status-completed {
|
||||
|
|
@ -946,7 +946,7 @@ const exportSeriesData = () => {
|
|||
|
||||
.status-ongoing {
|
||||
color: var(--green);
|
||||
border-color: color-mix(in srgb, var(--green) 30%, transparent);
|
||||
border-color: rgba(74, 106, 56, 0.3);
|
||||
}
|
||||
|
||||
/* ---- LINK BUTTONS ---- */
|
||||
|
|
|
|||
|
|
@ -954,8 +954,8 @@ const applyBatchVisibility = async (hidden) => {
|
|||
}
|
||||
|
||||
.sync-created {
|
||||
color: var(--green);
|
||||
border-color: var(--green);
|
||||
color: var(--green, #4a7);
|
||||
border-color: var(--green, #4a7);
|
||||
}
|
||||
|
||||
.sync-updated {
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ if (import.meta.server && !xsrf.value) {
|
|||
.auth-title {
|
||||
font-family: var(--font-display);
|
||||
font-size: 28px;
|
||||
font-weight: 600;
|
||||
font-weight: 700;
|
||||
line-height: 1.1;
|
||||
letter-spacing: -0.01em;
|
||||
color: var(--candle);
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ useHead({ title: "Signed Out — Ghost Guild" });
|
|||
.auth-title {
|
||||
font-family: var(--font-display);
|
||||
font-size: 28px;
|
||||
font-weight: 600;
|
||||
font-weight: 700;
|
||||
line-height: 1.1;
|
||||
letter-spacing: -0.01em;
|
||||
color: var(--candle);
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ const hasDetail = computed(
|
|||
.auth-title {
|
||||
font-family: var(--font-display);
|
||||
font-size: 28px;
|
||||
font-weight: 600;
|
||||
font-weight: 700;
|
||||
line-height: 1.1;
|
||||
letter-spacing: -0.01em;
|
||||
color: var(--candle);
|
||||
|
|
@ -97,7 +97,7 @@ const hasDetail = computed(
|
|||
|
||||
.auth-detail-code {
|
||||
color: var(--ember);
|
||||
font-weight: 600;
|
||||
font-weight: 700;
|
||||
margin: 0 0 4px;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -172,8 +172,8 @@ function resetForm() {
|
|||
|
||||
.wiki-login-title {
|
||||
font-family: var(--font-display);
|
||||
font-size: 36px;
|
||||
font-weight: 600;
|
||||
font-size: 32px;
|
||||
font-weight: 700;
|
||||
line-height: 1.1;
|
||||
letter-spacing: -0.01em;
|
||||
color: var(--candle);
|
||||
|
|
@ -240,7 +240,7 @@ function resetForm() {
|
|||
.wiki-login-sent-heading {
|
||||
font-family: var(--font-display);
|
||||
font-size: 20px;
|
||||
font-weight: 600;
|
||||
font-weight: 700;
|
||||
color: var(--text-bright);
|
||||
margin: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -357,13 +357,13 @@ onMounted(async () => {
|
|||
|
||||
/* ---- LOADING / EMPTY ---- */
|
||||
.loading-state {
|
||||
padding: 64px 24px;
|
||||
padding: 60px 24px;
|
||||
text-align: center;
|
||||
color: var(--text-faint);
|
||||
font-size: 12px;
|
||||
}
|
||||
.empty-state {
|
||||
padding: 64px 24px;
|
||||
padding: 60px 24px;
|
||||
text-align: center;
|
||||
}
|
||||
.empty-title {
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@ const handleLogout = async () => {
|
|||
.coming-soon-title {
|
||||
font-family: var(--font-display);
|
||||
font-size: 3rem;
|
||||
font-weight: 600;
|
||||
font-weight: 700;
|
||||
color: var(--text-bright);
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -309,7 +309,7 @@ useHead({
|
|||
}
|
||||
.guidelines-section ul li {
|
||||
position: relative;
|
||||
padding: 2px 0 2px 16px;
|
||||
padding: 2px 0 2px 18px;
|
||||
font-size: 13px;
|
||||
color: var(--text-dim);
|
||||
line-height: 1.7;
|
||||
|
|
@ -365,7 +365,7 @@ useHead({
|
|||
font-family: "Brygada 1918", serif;
|
||||
font-style: italic;
|
||||
color: var(--text-bright);
|
||||
font-size: 16px;
|
||||
font-size: 15px;
|
||||
margin-top: 12px;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -133,8 +133,9 @@ const filterOptions = [
|
|||
const { data: eventsData } = await useFetch("/api/events");
|
||||
const { data: seriesData } = await useFetch("/api/series");
|
||||
|
||||
const filteredEvents = computed(() => {
|
||||
const now = new Date();
|
||||
|
||||
const filteredEvents = computed(() => {
|
||||
if (!eventsData.value) return [];
|
||||
return eventsData.value.filter((event) => {
|
||||
if (!includePastEvents.value && new Date(event.startDate) < now)
|
||||
|
|
@ -232,12 +233,8 @@ const isAlmostFull = (event) => {
|
|||
.event-row:hover {
|
||||
padding-left: 4px;
|
||||
}
|
||||
.event-row.is-cancelled .event-title a {
|
||||
text-decoration: line-through;
|
||||
text-decoration-thickness: 1px;
|
||||
}
|
||||
.event-row.is-cancelled .event-tagline {
|
||||
text-decoration: line-through;
|
||||
.event-row.is-cancelled {
|
||||
opacity: 0.5;
|
||||
}
|
||||
|
||||
.event-date-col {
|
||||
|
|
@ -434,10 +431,6 @@ const isAlmostFull = (event) => {
|
|||
border-color: var(--candle-faint);
|
||||
color: var(--text-dim);
|
||||
}
|
||||
.past-toggle:focus-visible {
|
||||
outline: 2px dashed var(--candle);
|
||||
outline-offset: 3px;
|
||||
}
|
||||
.past-toggle.active {
|
||||
border-color: var(--candle);
|
||||
border-style: solid;
|
||||
|
|
|
|||
|
|
@ -317,17 +317,13 @@
|
|||
<ParchmentInset>
|
||||
<h2>How membership works</h2>
|
||||
<ul>
|
||||
<li>Full access to the knowledge commons, events and workshops, and community</li>
|
||||
<li>Full access to the knowledge commons, Slack, and peer support</li>
|
||||
<li>Free access to all Ghost Guild events</li>
|
||||
<li>Equal access for every member, regardless of contribution</li>
|
||||
<li>Your circle reflects where you are, not rank</li>
|
||||
<li>Pay what you can ($0–$50+/month, separate from circle)</li>
|
||||
<li>Higher contributions create solidarity spots for others</li>
|
||||
</ul>
|
||||
<p>
|
||||
Community connection happens in our Slack workspace, joined in monthly
|
||||
onboarding waves — there may be a short wait after you join.
|
||||
</p>
|
||||
</ParchmentInset>
|
||||
|
||||
<!-- THREE CIRCLES -->
|
||||
|
|
@ -751,7 +747,7 @@ onUnmounted(() => {
|
|||
padding: 0;
|
||||
}
|
||||
.tier-list li {
|
||||
padding: 4px 0;
|
||||
padding: 5px 0;
|
||||
font-size: 12px;
|
||||
color: var(--text-dim);
|
||||
border-bottom: 1px dashed var(--border);
|
||||
|
|
|
|||
|
|
@ -283,7 +283,7 @@
|
|||
form.contributionAmount === Number(memberData.contributionAmount || 0) ||
|
||||
isUpdating
|
||||
"
|
||||
@click="handleUpdateContribution"
|
||||
@click="handleUpdateTier"
|
||||
>
|
||||
{{ isUpdating ? "Updating…" : "Update Contribution" }}
|
||||
</button>
|
||||
|
|
@ -315,7 +315,6 @@
|
|||
|
||||
<script setup>
|
||||
import { CONTRIBUTION_PRESETS, getGuidanceLabel, requiresPayment } from '~/config/contributions';
|
||||
import { STATUS_LABELS } from '~/config/memberStatus';
|
||||
|
||||
definePageMeta({
|
||||
middleware: "auth",
|
||||
|
|
@ -418,6 +417,13 @@ const circleOptions = [
|
|||
},
|
||||
];
|
||||
|
||||
const STATUS_LABELS = {
|
||||
active: "Active",
|
||||
pending_payment: "Setting up payment",
|
||||
suspended: "Paused",
|
||||
cancelled: "Closed",
|
||||
};
|
||||
|
||||
const formatStatus = (s) => STATUS_LABELS[s] || s;
|
||||
|
||||
const capitalise = (s) => (s ? s.charAt(0).toUpperCase() + s.slice(1) : s);
|
||||
|
|
@ -476,7 +482,7 @@ const refreshNextBillingIfStale = async () => {
|
|||
}
|
||||
};
|
||||
|
||||
const handleUpdateContribution = async () => {
|
||||
const handleUpdateTier = async () => {
|
||||
isUpdating.value = true;
|
||||
try {
|
||||
await $fetch("/api/members/update-contribution", {
|
||||
|
|
|
|||
|
|
@ -38,10 +38,6 @@
|
|||
<CircleBadge :circle="memberData?.circle || 'community'" />
|
||||
<span>${{ memberData?.contributionAmount ?? 0 }} CAD/mo</span>
|
||||
</div>
|
||||
<p v-if="showSlackComingNote" class="slack-coming-note">
|
||||
Slack workspace access is part of your membership. Invitations are
|
||||
sent in monthly onboarding waves — we'll be in touch.
|
||||
</p>
|
||||
</PageHeader>
|
||||
|
||||
<!-- Upcoming Events + Quick Actions -->
|
||||
|
|
@ -228,10 +224,6 @@ const { isActive, statusConfig, isPendingPayment, canPeerSupport } =
|
|||
|
||||
const route = useRoute();
|
||||
const isNewSignup = computed(() => route.query.welcome === "1");
|
||||
const showSlackComingNote = computed(
|
||||
() =>
|
||||
memberData.value?.status === "active" && !memberData.value?.slackInvited,
|
||||
);
|
||||
const welcomeTitle = computed(() => {
|
||||
const name = memberData.value?.name || "";
|
||||
return isNewSignup.value
|
||||
|
|
@ -476,13 +468,6 @@ useHead({
|
|||
margin-top: 8px;
|
||||
}
|
||||
|
||||
.slack-coming-note {
|
||||
margin-top: 12px;
|
||||
font-size: 12px;
|
||||
color: var(--text-dim);
|
||||
line-height: 1.65;
|
||||
}
|
||||
|
||||
.content-row {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||
|
|
|
|||
|
|
@ -85,47 +85,22 @@ const initialize = async () => {
|
|||
}
|
||||
|
||||
try {
|
||||
// Fast-path: when both Helcim ids are already cached on the member doc
|
||||
// AND a card's on file, skip the paid get-or-create-customer round trip.
|
||||
const hasCachedHelcimIds = Boolean(
|
||||
memberData.value?.helcimCustomerId && memberData.value?.helcimCustomerCode
|
||||
);
|
||||
|
||||
let existing = null;
|
||||
let probedExistingCard = false;
|
||||
if (hasCachedHelcimIds) {
|
||||
existing = await $fetch('/api/helcim/existing-card').catch((err) => {
|
||||
console.warn('[payment-setup] 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;
|
||||
hasExistingCard.value = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!hasExistingCard.value) {
|
||||
// Skip HelcimPay verify if a card's already on file — Helcim refuses
|
||||
// to re-save it, breaking retries after a partial-failed signup.
|
||||
const [customer, existingFromFull] = await Promise.all([
|
||||
const [customer, existing] = await Promise.all([
|
||||
$fetch('/api/helcim/get-or-create-customer', { method: 'POST' }),
|
||||
probedExistingCard
|
||||
? Promise.resolve(existing)
|
||||
: $fetch('/api/helcim/existing-card').catch((err) => {
|
||||
$fetch('/api/helcim/existing-card').catch((err) => {
|
||||
console.warn('[payment-setup] existing-card lookup failed, falling back to verify flow:', err);
|
||||
return null;
|
||||
}),
|
||||
]);
|
||||
customerId.value = customer.customerId;
|
||||
customerCode.value = customer.customerCode;
|
||||
hasExistingCard.value = Boolean(existingFromFull?.cardToken);
|
||||
hasExistingCard.value = Boolean(existing?.cardToken);
|
||||
|
||||
if (!hasExistingCard.value) {
|
||||
await initializeHelcimPay(customerId.value, customerCode.value, 0);
|
||||
}
|
||||
}
|
||||
step.value = 'ready';
|
||||
} catch (err) {
|
||||
console.error('Payment setup init failed:', err);
|
||||
|
|
|
|||
|
|
@ -37,7 +37,9 @@
|
|||
<span class="profile-pronouns">{{ member.pronouns }}</span>
|
||||
</div>
|
||||
<div class="profile-meta">
|
||||
<CircleBadge v-if="member.circle" :circle="member.circle" :label="circleLabels[member.circle]" />
|
||||
<span v-if="member.circle" class="badge" :class="member.circle">
|
||||
{{ circleLabels[member.circle] }}
|
||||
</span>
|
||||
<template v-if="member.studio">
|
||||
<span class="meta-sep">·</span>
|
||||
<span class="profile-studio">{{ member.studio }}</span>
|
||||
|
|
@ -370,7 +372,7 @@ useHead({
|
|||
}
|
||||
.profile-name {
|
||||
font-family: "Brygada 1918", serif;
|
||||
font-size: 36px;
|
||||
font-size: 42px;
|
||||
font-weight: 600;
|
||||
color: var(--text-bright);
|
||||
margin: 0;
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ const getEventStatus = (event) => {
|
|||
display: flex;
|
||||
align-items: baseline;
|
||||
gap: 12px;
|
||||
padding: 12px 28px;
|
||||
padding: 10px 28px;
|
||||
border-bottom: 1px dashed var(--border);
|
||||
font-size: 12px;
|
||||
}
|
||||
|
|
|
|||
122
docs/BACKLOG.md
122
docs/BACKLOG.md
|
|
@ -1,122 +0,0 @@
|
|||
# Ghost Guild — Open Backlog
|
||||
|
||||
_Last consolidated: 2026-04-30. Single source of truth for every open issue across the codebase. Pulls from `LAUNCH_READINESS.md`, `TODO.md`, the post-launch backlog memory, and a fresh sweep of in-code TODO/FIXME comments._
|
||||
|
||||
Cutover has not happened yet. Deploy steps live separately in [`LAUNCH_READINESS.md`](./LAUNCH_READINESS.md).
|
||||
|
||||
---
|
||||
|
||||
## Pre-cutover (do once)
|
||||
|
||||
Operational steps that have to run during cutover. Full details + env-var list in [`LAUNCH_READINESS.md`](./LAUNCH_READINESS.md).
|
||||
|
||||
- [ ] Provision the Dokploy app, set env vars (full list in LAUNCH_READINESS.md), confirm `BASE_URL` exact-matches the public origin and `NODE_ENV=production`.
|
||||
- [ ] Add the daily Dokploy Scheduled Task that POSTs to `/api/internal/reconcile-payments` with `X-Reconcile-Token`.
|
||||
- [ ] **Run `node scripts/migrate-contribution-amount.cjs --apply` against prod Mongo BEFORE the new code serves traffic.**
|
||||
- [ ] Set `NUXT_HELCIM_MONTHLY_PLAN_ID=50302` and `NUXT_HELCIM_ANNUAL_PLAN_ID=50303` in Dokploy.
|
||||
- [ ] Set `NUXT_RECONCILE_TOKEN` to a 32+ char random string.
|
||||
- [ ] Push local `main` to `origin/main`.
|
||||
- [ ] Deploy.
|
||||
- [ ] **Run `node scripts/reconcile-helcim-payments.mjs --apply` against prod Mongo AFTER the new code serves traffic.**
|
||||
- [ ] Audit prod for pre-fix series-pass bypass registrations (registrations on pass-only series children with `registeredAt < 2026-04-20` from non-pass-holders). Decide per case.
|
||||
- [ ] In Helcim dashboard: disable the default payment-confirmation email for plans 50302 + 50303 (we send our own CRA-safe version via Resend).
|
||||
- [ ] Run one real test charge and verify (a) Payment doc in Mongo and (b) exactly one CRA-compliant confirmation email.
|
||||
- [ ] Rotate `HELCIM_API_TOKEN` in the Helcim merchant portal and update the Dokploy env var.
|
||||
- [ ] Trigger the daily reconcile task once manually in Dokploy to confirm it's wired correctly.
|
||||
|
||||
## Pilot smoke walks (before first wave)
|
||||
|
||||
Once cutover lands, before the first Slack onboarding wave goes out:
|
||||
|
||||
- [ ] **Pilot smoke walk for Slack-invited workflow.** One admin manually clicks "Mark as Slack invited" against a real test member in production, confirms the row updates in place, and confirms the dashboard "Slack coming" note disappears for that member. Unit tests cover the pieces; nothing covers the live admin-to-member round-trip.
|
||||
|
||||
---
|
||||
|
||||
## Bylaws-decoupling (waiting on amendment ratification)
|
||||
|
||||
Membership status is being decoupled from payment status. Copy + UI gates already align; behavioral changes below remain.
|
||||
|
||||
- [ ] **B1.** `server/api/members/cancel-subscription.post.js:31,48` flips status to `pending_payment` on cancel. Under the new bylaws, cancellation should keep status `active` (just zero contribution). Update the `findByIdAndUpdate` payload + response, the comment at line 26, and add coverage in `tests/server/api/cancel-subscription.test.js`.
|
||||
- ~~B3 cancelled.~~ `pending_payment` stays.
|
||||
- ~~B4 admin "Pending Payment" → "Payment setup incomplete"~~ shipped 2026-04-29 (`59d2be2`).
|
||||
|
||||
---
|
||||
|
||||
## Known gotchas (post-launch)
|
||||
|
||||
- **Admin edit does not sync Helcim `recurringAmount`.** `/admin/members/[id]` PUT writes `contributionAmount` direct to Mongo by design. Admins must PATCH Helcim manually. The admin form already shows an `--ember`-bordered notice (commit `e756170`); a real sync flow is a future enhancement.
|
||||
- **Cadence switch rejected on active subscriptions.** `server/api/members/update-contribution.post.js:206` refuses cadence changes mid-subscription with a TODO comment pointing here. No UI toggle exists on `/member/account`. Adding cadence switch requires a Helcim subscription replacement flow, not a plain update.
|
||||
- **S2 test fixture id/slug mismatch (local dev only).** Seeded S2 series has `id: 'test-s2-drop-in-allowed'` but `slug: 'test-s2-drop-in-allowed-series'`. Doesn't affect prod — fix the seed script if anyone re-runs fixtures.
|
||||
- **`/admin/series-management` "Delete" button doesn't actually delete.** Click handler iterates events to PUT-unlink each from the series, never calls `DELETE /api/admin/series/:id`. For an empty series the button is a no-op; for a series with events it just orphans them. Either rename to "Unlink events" or add the actual DELETE call. Surfaced by `e2e/admin-series.spec.js` (delete test skipped). Flagged 2026-04-30.
|
||||
- **Past-deadline events and sold-out events render identically.** `EventTicketPurchase.vue` falls through to "Event Sold Out" panel for both `tickets.available.reason === 'Registration deadline has passed'` and zero-stock cases. If "Registration closed" is meant to read differently from "Sold out," add a distinct branch. Flagged 2026-04-30 (no e2e written — gated on this UX decision).
|
||||
|
||||
---
|
||||
|
||||
## Accessibility / a11y
|
||||
|
||||
- [ ] **Button minimum target size.** Site-wide `.btn` renders ~35px tall. WCAG AA 2.5.8 (24×24) passes; AAA 2.5.5 (44×44) fails. Bumping padding affects every button — design call, not a drop-in fix. Flagged 2026-04-11.
|
||||
- [ ] **`/board` color-contrast violations (WCAG AA).** `.block-label` ("Offering" tag) and `.slack-handle` use `#746a58` on `#e8dfc8` → 4.01:1; AA needs 4.5:1 for small text. Surfaced by `e2e/a11y.spec.js` (the `/board` route fails; test is intentionally left red until fixed). Likely a single CSS variable adjustment. Flagged 2026-04-30.
|
||||
|
||||
---
|
||||
|
||||
## Deferred features (own session each)
|
||||
|
||||
- [ ] **Email automation system.** Patterned after Tranzac's implementation (separate project, already built). HTML email bodies with template management and drip sequences. Deferred 2026-04-20 — ruled wasted work given the larger system is designed elsewhere. Current transactional email lives in `server/utils/resend.js` + inline in `server/api/auth/login.post.js`, `server/routes/oidc/interaction/login.post.ts`, `server/api/admin/{members,pre-registrants}/invite.post.js`. Copy dump at `docs/email-copy-dump.md`. See memory: `project_email_automation_future`.
|
||||
- [ ] **Receipts for event ticket purchases (Phase 2).** Phase 1 receipts only cover membership payments. Event tickets — especially guest purchases without member accounts — need a receipt flow. Likely an emailed PDF/HTML receipt at purchase time. Build target: June–Oct 2026, live Jan 2027. See memory: `project_receipts`.
|
||||
- [ ] **Series/event waitlist.** Admin can configure `tickets.waitlist.enabled` and `maxSize`; `server/utils/tickets.js` returns `waitlistAvailable: true` when full; `app/components/SeriesPassPurchase.vue:341` and `EventTicketPurchase.vue` have stub `handleJoinWaitlist` that toasts "Waitlist Coming Soon." No server endpoint, no confirmation email, no `event_waitlisted` activity hook. Either implement end-to-end or hide the button by removing the `v-if="availability?.waitlistAvailable"` branches in `EventSeriesTicketCard.vue:175` and `EventTicketCard.vue:73`.
|
||||
- [ ] **ASVS Phase 4.** File-upload validation pipeline, granular RBAC, credential encryption.
|
||||
|
||||
---
|
||||
|
||||
## Wave-Slack pilot follow-ups
|
||||
|
||||
- [ ] **`/api/auth/member` doesn't return `slackInvited`.** Dashboard's Slack-coming note is gated on `memberData.slackInvited`, which is always `undefined` client-side, so the note shows for *every* active member regardless of state. Real bug. Add `slackInvited` (and `slackInvitedAt`) to the auth/member response. Surfaced by wave-slack §7.2 e2e (skipped pending this fix). Flagged 2026-04-30.
|
||||
- [ ] **Admin members list row mutation isn't reactive.** `markSlackInvited` in `app/pages/admin/members/index.vue` does `Object.assign(member, res.member)` on a plain object inside a `useFetch` array; Vue doesn't react, so the "Mark as Slack invited" button stays visible until a manual reload. Fix: `members.value[i] = { ...members.value[i], ...res.member }` or `splice`. Detail page uses the right pattern (covered by §6.6). Surfaced by wave-slack §6.2 e2e (skipped pending this fix). Flagged 2026-04-30.
|
||||
- [ ] **Deprecated `slackInviteStatus` field still serialized.** Removed from UI but still on `Member` documents and the `/api/admin/members` payload. Project it away in the API response and run a one-shot `$unset` cleanup. Surfaced by wave-slack §6.7 e2e. Flagged 2026-04-30.
|
||||
- [ ] **Spec vs shipped-UI mismatch on wave language.** `docs/specs/wave-based-slack-onboarding-tests.md` §7.5 asserts "no wave/cohort/batch language" in the dashboard note, but the shipped welcome-email and dashboard copy say "monthly onboarding waves." Decide which side wins; update the other.
|
||||
- [ ] **E2E coverage for `e2e/wave-slack-onboarding.spec.js`.** 9 of 16 scaffolded tests now passing (admin Slack-invited button + non-trivial dashboard cases). 7 remain skipped pending the bugs above (7.2, 6.2), seeding gaps (7.4 — no dev endpoint to mint members of arbitrary status), Open Questions (7.8, 6.9), or spec-vs-UI conflicts (7.5, 6.7).
|
||||
- [ ] **Pilot exit decision (~8 weeks post-launch).** Either restore `server/_archive/utils/checkSlackJoins.js` + its plugin if polling is needed, or delete the archive permanently. Driven by whether the manual-invite cadence is sustainable post-pilot.
|
||||
- [ ] **`slack_invite_failed` enum slug cleanup.** Detector and alert removed in `d15458b`, but the slug remains in `server/models/adminAlertDismissal.js` enum so historical dismissal rows continue to validate. Full removal needs a one-shot cleanup of stale dismissal rows in the DB. Roll into a future schema-tidy pass.
|
||||
|
||||
---
|
||||
|
||||
## Simplify-pass follow-ups (still open)
|
||||
|
||||
Items surfaced during the 2026-04-29 /simplify review. The 2026-04-30 small-wins batch shipped 3 items (STATUS_LABELS dedup, ImageUpload focus, signupBridge rename). Remaining:
|
||||
|
||||
- [ ] **Extract `.tint-candle` / `.tint-ember` utility classes.** The `color-mix(in srgb, var(--candle) 15%, transparent)` + matching border pattern is now inlined as `style=""` in ~9 sites across `EventSeriesTicketCard.vue`, `SeriesPassPurchase.vue`, `NaturalDateInput.vue`, `ImageUpload.vue`. Promote to utility classes in `app/assets/css/main.css` so future tints don't keep multiplying inline styles (and so `:hover` / `:focus` variants are reachable).
|
||||
- [ ] **Audit `member &&` truthy checks in sibling ticket/subscription routes.** Commit `f66455e` fixed `server/api/events/[id]/tickets/available.get.js:115` to use `hasMemberAccess(member)`. Same anti-pattern likely exists in adjacent routes (`tickets/purchase.post.js`, subscription endpoints). Guests/suspended/cancelled members would currently look like full members for any feature gated on truthiness alone.
|
||||
- [ ] **STATUS_LABELS dedup — verify.** The 2026-04-30 small-wins batch claimed STATUS_LABELS dedup, but `e2e/admin-members.spec.js` expansion found an inline copy still at `app/pages/admin/members/index.vue:491` and another at `app/pages/member/account.vue:420`. Either the previous dedup was partial or a new copy was reintroduced — confirm and finish dedup into a shared constants module.
|
||||
- [ ] **`app/pages/admin/members/[id].vue` status select still hand-written.** Commit `441a5f5` aligned the index page's status `<select>` to `STATUS_LABELS`, but the detail page (`[id].vue`) still hand-codes raw status options. Refactor to drive from the same constant.
|
||||
|
||||
---
|
||||
|
||||
## Optional / low-priority
|
||||
|
||||
- [ ] **Welcome-email Slack-timing mention.** Currently the welcome email doesn't mention Slack timing — the dashboard carries that note. Could add a one-line "Slack invitation comes in monthly waves — there may be a short wait" if the dashboard turns out not to be enough signal.
|
||||
|
||||
---
|
||||
|
||||
## E2e infrastructure gaps
|
||||
|
||||
Surfaced during the 2026-04-30 e2e expansion. None block a green suite, but each blocks specific coverage from being added.
|
||||
|
||||
- [ ] **Other email routes still send real emails in dev mode.** The `ALLOW_DEV_TEST_ENDPOINTS` short-circuit was added to `server/api/admin/pre-registrants/invite.post.js` (which calls `new Resend(...)` directly), but the five wrapper functions in `server/utils/resend.js` (event registration, cancellation, waitlist, series pass, welcome) still dispatch live. Either add the same gate to each wrapper, or refactor the wrappers into a single `sendEmail({ from, to, subject, text, html })` helper holding the gate centrally — would also dedupe ~5 near-identical try/catch blocks.
|
||||
- [ ] **No dev endpoint to seed members of arbitrary status.** Wave-slack §7.4 (note hidden for suspended/cancelled/guest) is gated on this. `/api/dev/test-login` only mints an `active` admin. A minimal `/api/dev/members.post` accepting `{ email, status, slackInvited, ... }` would unblock many more dashboard-state e2e tests.
|
||||
- [ ] **SSR `useFetch` blocks `page.route` mocking.** Page-level fetches in `[slug].vue` files run during SSR and can't be intercepted client-side. Affects: hidden-event 404 e2e, any test that needs a mocked event payload before client hydration. Either expose a client-side fetch alternative, add a server-side test mock layer, or accept that DB seeding is required for these cases.
|
||||
- [ ] **Self-cancel block on paid event registrations not e2e-tested.** Requires seeding a logged-in member with a paid registration row. Out of scope for this round.
|
||||
- [ ] **Visual snapshot for `join — desktop` is stale.** 12,676px diff (2% of image) from layout drift. Regenerate via `npx playwright test --update-snapshots e2e/visual/pages.spec.js` once a designer eyeballs the diff.
|
||||
- [ ] **E2e cross-file races on admin specs.** With `fullyParallel: false` + `workers: 4` + `retries: 1`, ~1 admin CRUD test still fails per full-suite run (rotates between `admin-events` CRUD, `board` page-loads, and wave-slack §6.4). Each passes 100% in isolation. Root cause: tests anchor on "first row" / "any visible button" rather than uniquely-identified data, so they race when other admin specs mutate the shared dev DB. Proper fix is per-test data isolation: each test creates its own scoped record with a `Date.now()` suffix and queries by that exact identifier. Out of scope for the e2e expansion.
|
||||
|
||||
---
|
||||
|
||||
## Deeplink memories
|
||||
|
||||
- `project_post_launch_backlog.md` — high-level digest of this file
|
||||
- `project_launch_readiness.md` — cutover status (NOT YET happened)
|
||||
- `project_launch_flow_map.md` — onboarding flow + Slack wave model
|
||||
- `project_pre_registrants.md` — invitation system + pre-reg lifecycle
|
||||
- `project_helcim_plan_model.md` — cadence-keyed plan model
|
||||
- `project_contribution_amount_redesign.md` — arbitrary $ amount + guidance presets
|
||||
- `project_receipts.md` — Phase 1 done, Phase 2 pending
|
||||
- `project_email_automation_future.md` — Tranzac reference for full system
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
# Launch Readiness
|
||||
|
||||
**Status as of 2026-04-30. Cutover has not happened yet.** Code is on local `main`; deploy steps below still need to execute.
|
||||
**Status as of 2026-04-20.** Target launch: before 2026-05-01.
|
||||
|
||||
Pre-cutover deploy checklist is the live content on this page. Everything else (post-launch work, bylaws decoupling, deferred features, simplify follow-ups, a11y) lives in [`BACKLOG.md`](./BACKLOG.md). Completed launch-blocker items are archived — see `~/.claude/projects/-Users-jennie-Sites-ghostguild-org/memory/project_launch_readiness_archive.md`.
|
||||
Single source of truth for work remaining before cutover. P0 blocks launch; P1 is strongly preferred but survivable. Completed items are archived — see `~/.claude/projects/-Users-jennie-Sites-ghostguild-org/memory/project_launch_readiness_archive.md`. Post-launch backlog lives in `docs/TODO.md`.
|
||||
|
||||
---
|
||||
|
||||
|
|
@ -106,7 +106,63 @@ None outstanding. All launch-blocking flows verified via local dev or cloudflare
|
|||
|
||||
---
|
||||
|
||||
## Post-launch & deferred work
|
||||
## Bylaws decoupling — follow-ups (added 2026-04-18)
|
||||
|
||||
Bylaws decoupling, post-launch a11y, ASVS Phase 4, deferred features, simplify-pass follow-ups, known gotchas, wave-Slack pilot follow-ups — **everything that isn't a deploy step has moved to [`BACKLOG.md`](./BACKLOG.md).**
|
||||
Context: bylaws are being amended to remove automatic termination for nonpayment. Membership status will be fully decoupled from payment status; failed payments trigger committee outreach, not status change. Copy + UI access gates already aligned in `useMemberStatus.js` and `account.vue` (2026-04-18). Server-side status gating shipped as B2 (see archive). The behavioral changes below remain.
|
||||
|
||||
Not blocking launch — the amendment hasn't passed yet, and the user-visible copy/UI is already consistent. Pick up once the amendment is ratified.
|
||||
|
||||
### B1. `cancel-subscription` flips status to `pending_payment`
|
||||
- `server/api/members/cancel-subscription.post.js:31,48`
|
||||
- When a member cancels their paid subscription, status is set to `pending_payment` and contribution amount to `0`. Under the new model, cancelling a payment plan moves the member to the $0 contribution — status should stay `active`.
|
||||
- **Fix:** change `status: 'pending_payment'` → `status: 'active'` in both the `findByIdAndUpdate` payload (line 31) and the response (line 48). Comment at line 26 also needs updating ("(not cancelled) so member can re-subscribe" → reflect new framing).
|
||||
- Add coverage in `tests/server/api/cancel-subscription.test.js` if it doesn't already exist.
|
||||
|
||||
### B3. Vestigial `pending_payment` status
|
||||
- Once payment is fully decoupled, `pending_payment` no longer gates anything and is functionally equivalent to `active`. Consider removing it from the enum (`server/models/member.js:38`, `server/utils/schemas.js:299`) and treating new signups as `active` from the moment of account creation.
|
||||
- Touches: signup flow (`helcim/customer.post.js:34`, `invite/accept.post.js:48`), admin filter UI (`app/pages/admin/members/index.vue:45,382,499,1145`, `[id].vue:69,286`), admin alerts (`server/utils/adminAlerts.js:22,100-116`, `server/models/adminAlertDismissal.js:6`), and a data migration to flip existing `pending_payment` rows to `active`.
|
||||
- Larger refactor — break out into its own ticket once B1 lands.
|
||||
|
||||
### B4. Admin "Pending Payment" filter label (cosmetic)
|
||||
- `app/pages/admin/members/index.vue:45,499`, `[id].vue:69` show `pending_payment` as "Pending Payment". If B3 removes the status entirely, this disappears too. If we keep `pending_payment` for now, rename in admin UI to "Payment setup incomplete" so admins also stop conflating it with membership state.
|
||||
|
||||
---
|
||||
|
||||
## Post-launch backlog
|
||||
|
||||
See `docs/TODO.md` for:
|
||||
- Button minimum target size (WCAG AAA 2.5.5).
|
||||
- `/oidc/interaction/[uid]` routing quirk.
|
||||
- Admin layout migration from `guild-*` tokens to zine spec.
|
||||
- Admin dashboard quick-action button contrast.
|
||||
- Members table NAME column clipping.
|
||||
- OWASP ASVS L1 Phase 4 (file-upload validation pipeline, granular RBAC, credential encryption).
|
||||
- `tickets/available.get.js:115` `memberSavings` block reports `$0 saved` for inactive members — cosmetic; suppress comparison block when `!hasMemberAccess(member)` if it ever surfaces in UI.
|
||||
- Simplify-pass follow-ups (2026-04-25): source-grep test bloat, login/verify rate-limit gap, stringly-typed `metadata.type`, reconcile-payments sequential loop, stale `new Date()` in events list, `loadPublicSeries` helper extraction.
|
||||
|
||||
### Known gotchas worth addressing post-launch
|
||||
|
||||
- **Subscription cache fed wrong field on CREATE.** `subscription.post.js` and `update-contribution.post.js` read `subscription.nextBillingDate` from Helcim's CREATE response, but Helcim returns `dateBilling`. The lazy refresh in `subscription.get.js` masks this (handles both shapes), so next-charge rendering works — but the cache starts empty. Fix at the CREATE sites so the cache is correct from first write.
|
||||
- **Admin edit does not sync Helcim `recurringAmount`.** `/admin/members/[id]` PUT writes `contributionAmount` direct to Mongo by design. Admins must PATCH Helcim manually. Worth surfacing in admin UI or docs.
|
||||
- **Cadence switch rejected on active subscriptions.** `update-contribution.post.js:184-189` refuses cadence changes mid-subscription; no UI toggle exists on `/member/account`. Adding cadence switch would require a Helcim subscription replacement flow, not a plain update.
|
||||
- **`SeriesPassPurchase.vue` doesn't auto-refresh after purchase.** (Observed 2026-04-21 during Phase 4 series-pass functional tests.) Component's local `$fetch` to `/api/series/{id}/tickets/available` fires on mount + `userEmail` watch, but isn't re-invoked after a successful purchase — the "already registered" state only appears on next navigation. Parent page calls `refreshNuxtData()` but the component doesn't participate in it. Fix: call `fetchPassInfo()` after the success toast in `handleSubmit`, or lift the fetch to `useAsyncData` so it can be refreshed from outside.
|
||||
- **S2 test fixture `id`/`slug` inconsistency.** (Local dev only.) Seeded S2 series has `id: 'test-s2-drop-in-allowed'` but `slug: 'test-s2-drop-in-allowed-series'`. Doesn't affect prod — fix the seed script if anyone re-runs fixtures and is confused why `id`-based Mongo queries return empty.
|
||||
|
||||
### Events-surface visual audit — deferred items (2026-04-21)
|
||||
|
||||
Context: Phase 4 audit against `docs/specs/events-visual-audit-findings.md` fixed all critical phantom-palette, rounded-corner, CTA-mismatch, and input-styling issues across `EventTicketCard`, `EventTicketPurchase`, `EventSeriesTicketCard`, `SeriesPassPurchase`. Items below were explicitly deferred or out of reach.
|
||||
|
||||
- **Success-state color convention (4 instances).** "You're Registered!" blocks use `--candle` (gold) instead of `--green`. Touches `EventSeriesTicketCard.vue:186-196` (still uses phantom `candlelight-*` classes — preserved byte-for-byte pending decision) and registered-state wrappers in `SeriesPassPurchase.vue`. Needs a UX call on whether success should render gold (zine-consistent) or green (semantic). Once decided, finish the phantom-palette removal on those 4 lines.
|
||||
- **Sidebar breakpoint unverified.** `app/layouts/default.vue:89` hides the sidebar at ≤1024px per spec. Browser `resize_window` tool refused viewport changes during the audit, so the actual crossover and any layout shift at 1023–1025px was never visually confirmed. Do a manual responsive check before declaring the sidebar pattern shipped.
|
||||
- **`EventTicketPurchase.vue:469` magic padding.** `.consent-hint { padding-left: 24px; }` is a hardcoded offset to align the hint under the checkbox text. Cosmetic; swap for a gap/grid approach when touching the consent block next.
|
||||
- **Toast API rename unverified.** Nuxt UI v4 may have renamed `toast.add({ timeout })` → `{ duration }`. Current `SeriesPassPurchase.vue` toasts still pass `timeout`. No visible breakage, but worth confirming against current Nuxt UI docs.
|
||||
- **`.section-label` extraction candidate.** Several audited files repeat the same uppercase/letter-spaced small label pattern inline. Low-priority refactor into a utility class in `main.css`.
|
||||
- **Past-events toggle component.** Existing, untouched this pass; noted in findings doc as a future consistency check.
|
||||
|
||||
### Contribution-amount redesign — cosmetic cleanup (naming only, not behavior)
|
||||
- Rename admin members column header "Tier" → "Contribution" (`app/pages/admin/members/index.vue:265`).
|
||||
- Delete dead `app/components/TierPicker.vue`.
|
||||
- Update stale tier comment in `app/composables/useMemberPayment.js:59`.
|
||||
- Update error log message referencing "tier" in `server/api/members/update-contribution.post.js:221`.
|
||||
- Rename `handleUpdateTier` handler in `app/pages/member/account.vue`.
|
||||
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 315 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 167 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 168 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 237 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 232 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 290 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 133 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 100 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 201 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 130 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 181 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 100 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 287 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 142 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 282 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 154 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 267 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 138 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 204 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 244 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 138 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 253 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 126 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 282 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 194 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 154 KiB |
|
|
@ -7,20 +7,16 @@ const publicPages = [
|
|||
{ name: "Join", path: "/join" },
|
||||
{ name: "Events", path: "/events" },
|
||||
{ name: "Coming Soon", path: "/coming-soon" },
|
||||
{ name: "Accept Invite", path: "/accept-invite" },
|
||||
];
|
||||
|
||||
const memberPages = [
|
||||
{ name: "Member Dashboard", path: "/member/dashboard" },
|
||||
{ name: "Member Profile", path: "/member/profile" },
|
||||
{ name: "Member Account", path: "/member/account" },
|
||||
{ name: "Board", path: "/board" },
|
||||
];
|
||||
|
||||
const adminPages = [
|
||||
{ name: "Admin Members", path: "/admin/members" },
|
||||
{ name: "Admin Events Create", path: "/admin/events/create" },
|
||||
{ name: "Admin Pre-Registrants", path: "/admin/pre-registrants" },
|
||||
];
|
||||
|
||||
test.describe("accessibility — public pages", () => {
|
||||
|
|
|
|||
|
|
@ -1,170 +0,0 @@
|
|||
import { test, expect } from '@playwright/test'
|
||||
|
||||
const FAKE_TOKEN = 'fake-invite-token-for-e2e'
|
||||
const FAKE_PREREG_ID = '000000000000000000000001'
|
||||
|
||||
async function mockVerifyOk(page, overrides = {}) {
|
||||
await page.route('**/api/invite/verify', async (route) => {
|
||||
await route.fulfill({
|
||||
status: 200,
|
||||
contentType: 'application/json',
|
||||
body: JSON.stringify({
|
||||
preRegistrationId: FAKE_PREREG_ID,
|
||||
name: overrides.name ?? 'Pre Registered User',
|
||||
email: overrides.email ?? `prereg-${Date.now()}@example.com`,
|
||||
city: overrides.city ?? 'Vancouver, BC',
|
||||
}),
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
async function mockAcceptFree(page) {
|
||||
await page.route('**/api/invite/accept', async (route) => {
|
||||
await route.fulfill({
|
||||
status: 200,
|
||||
contentType: 'application/json',
|
||||
body: JSON.stringify({
|
||||
success: true,
|
||||
requiresPayment: false,
|
||||
redirectUrl: '/member/dashboard',
|
||||
member: {
|
||||
id: 'mem-1',
|
||||
email: 'prereg@example.com',
|
||||
name: 'Pre Registered User',
|
||||
circle: 'community',
|
||||
contributionAmount: 0,
|
||||
status: 'active',
|
||||
},
|
||||
}),
|
||||
})
|
||||
})
|
||||
await page.route('**/api/auth/status', async (route) => {
|
||||
await route.fulfill({
|
||||
status: 200,
|
||||
contentType: 'application/json',
|
||||
body: JSON.stringify({
|
||||
authenticated: true,
|
||||
member: { id: 'mem-1', name: 'Pre Registered User', status: 'active' },
|
||||
status: 'active',
|
||||
}),
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
async function gotoAcceptInvite(page) {
|
||||
await page.goto(`/accept-invite#${FAKE_TOKEN}`)
|
||||
}
|
||||
|
||||
test.describe('Accept Invite — pre-registrant signup', () => {
|
||||
test('verifies invitation and shows form fields', async ({ page }) => {
|
||||
await mockVerifyOk(page, { name: 'Ada Lovelace', email: 'ada@example.com' })
|
||||
await gotoAcceptInvite(page)
|
||||
|
||||
await expect(page.locator('#accept-name')).toBeVisible()
|
||||
await expect(page.locator('#accept-name')).toHaveValue('Ada Lovelace')
|
||||
await expect(page.locator('#accept-email')).toHaveValue('ada@example.com')
|
||||
await expect(page.locator('#circle-community')).toBeAttached()
|
||||
await expect(page.locator('#circle-founder')).toBeAttached()
|
||||
await expect(page.locator('#circle-practitioner')).toBeAttached()
|
||||
await expect(page.locator('#accept-cadence-monthly')).toBeAttached()
|
||||
await expect(page.locator('#accept-cadence-annual')).toBeAttached()
|
||||
await expect(page.locator('#accept-contribution')).toBeVisible()
|
||||
await expect(page.locator('.contribution-preset-chip').first()).toBeVisible()
|
||||
await expect(page.locator('.form-submit')).toBeVisible()
|
||||
})
|
||||
|
||||
test('shows error when no token in URL hash', async ({ page }) => {
|
||||
await page.goto('/accept-invite')
|
||||
await expect(page.getByRole('heading', { name: 'Invitation Error' })).toBeVisible()
|
||||
await expect(page.locator('.error-box')).toContainText(/No invitation token/)
|
||||
})
|
||||
|
||||
test('shows error when token verification fails', async ({ page }) => {
|
||||
await page.route('**/api/invite/verify', async (route) => {
|
||||
await route.fulfill({
|
||||
status: 401,
|
||||
contentType: 'application/json',
|
||||
body: JSON.stringify({ statusCode: 401, statusMessage: 'Invalid or expired invitation link' }),
|
||||
})
|
||||
})
|
||||
await gotoAcceptInvite(page)
|
||||
await expect(page.getByRole('heading', { name: 'Invitation Error' })).toBeVisible()
|
||||
await expect(page.locator('.error-box')).toContainText(/Invalid or expired/)
|
||||
})
|
||||
|
||||
test('submit disabled until name + agreement filled', async ({ page }) => {
|
||||
await mockVerifyOk(page, { name: '' })
|
||||
await gotoAcceptInvite(page)
|
||||
|
||||
await expect(page.locator('#accept-name')).toBeVisible()
|
||||
await expect(page.locator('.form-submit')).toBeDisabled()
|
||||
|
||||
await page.locator('#accept-name').fill('New Member')
|
||||
await expect(page.locator('.form-submit')).toBeDisabled()
|
||||
|
||||
await page.getByRole('checkbox', { name: /Community Guidelines/ }).check()
|
||||
await expect(page.locator('.form-submit')).toBeEnabled()
|
||||
})
|
||||
|
||||
test('cadence toggle updates billing summary total', async ({ page }) => {
|
||||
await mockVerifyOk(page)
|
||||
await gotoAcceptInvite(page)
|
||||
|
||||
await expect(page.locator('#accept-contribution')).toBeVisible()
|
||||
await page.locator('#accept-contribution').fill('10')
|
||||
|
||||
await page.locator('label[for="accept-cadence-monthly"]').click()
|
||||
await expect(page.locator('.billing-summary')).toContainText('$10 today')
|
||||
|
||||
await page.locator('label[for="accept-cadence-annual"]').click()
|
||||
await expect(page.locator('.billing-summary')).toContainText('$120 today')
|
||||
await expect(page.locator('.billing-summary')).toContainText('$10/month')
|
||||
})
|
||||
|
||||
test('preset chip sets contribution amount', async ({ page }) => {
|
||||
await mockVerifyOk(page)
|
||||
await gotoAcceptInvite(page)
|
||||
|
||||
await expect(page.locator('.contribution-preset-chip').first()).toBeVisible()
|
||||
const chip = page.locator('.contribution-preset-chip').nth(1)
|
||||
const chipText = await chip.textContent()
|
||||
const expected = chipText.replace(/[^0-9]/g, '')
|
||||
|
||||
await chip.click()
|
||||
await expect(page.locator('#accept-contribution')).toHaveValue(expected)
|
||||
})
|
||||
|
||||
test('free tier happy path shows welcome state', async ({ page }) => {
|
||||
await mockVerifyOk(page, { name: 'Free Tester', email: `free-${Date.now()}@example.com` })
|
||||
await mockAcceptFree(page)
|
||||
await gotoAcceptInvite(page)
|
||||
|
||||
await expect(page.locator('#accept-name')).toHaveValue('Free Tester')
|
||||
await page.locator('#circle-community').check({ force: true })
|
||||
await page.locator('#accept-contribution').fill('0')
|
||||
await page.getByRole('checkbox', { name: /Community Guidelines/ }).check()
|
||||
|
||||
await expect(page.locator('.form-submit')).toBeEnabled()
|
||||
await expect(page.locator('.form-submit')).toContainText(/Accept Invitation/)
|
||||
|
||||
await page.locator('.form-submit').click()
|
||||
|
||||
await expect(
|
||||
page.getByRole('heading', { name: 'Welcome to Ghost Guild!' })
|
||||
).toBeVisible({ timeout: 15000 })
|
||||
})
|
||||
|
||||
test('paid tier submit button copy switches to Continue to Payment', async ({ page }) => {
|
||||
await mockVerifyOk(page)
|
||||
await gotoAcceptInvite(page)
|
||||
|
||||
await page.locator('#accept-contribution').fill('10')
|
||||
await page.getByRole('checkbox', { name: /Community Guidelines/ }).check()
|
||||
await expect(page.locator('.form-submit')).toContainText(/Continue to Payment/)
|
||||
})
|
||||
|
||||
// Skipped: full paid-tier submission requires intercepting HelcimPay.js modal
|
||||
// (external script loads an iframe and posts a message back to verifyPayment).
|
||||
// Feasible but out of scope for this initial coverage pass.
|
||||
test.skip('paid tier full flow with mocked HelcimPay', async () => {})
|
||||
})
|
||||
|
|
@ -53,116 +53,3 @@ test.describe('Admin events access control', () => {
|
|||
expect(page.url()).not.toContain('/admin/events')
|
||||
})
|
||||
})
|
||||
|
||||
test.describe('Admin events CRUD', () => {
|
||||
test('create, edit, and delete an event', async ({ adminPage }) => {
|
||||
const suffix = Date.now().toString().slice(-6)
|
||||
const title = `e2e-event-${suffix}`
|
||||
const editedTitle = `e2e-event-${suffix}-edited`
|
||||
|
||||
// Re-prime the auth cookie immediately before this multi-step flow.
|
||||
// The shared test-admin account's tokenVersion is bumped whenever
|
||||
// auth.spec.js's logout test runs in parallel, which would otherwise
|
||||
// surface mid-flow as "Session has been revoked" on the first POST.
|
||||
const loginRes = await adminPage.context().request.get('/api/dev/test-login', { maxRedirects: 0 })
|
||||
if (loginRes.status() !== 302) {
|
||||
throw new Error(`Failed to refresh admin session: ${loginRes.status()}`)
|
||||
}
|
||||
|
||||
// --- Create ---
|
||||
await adminPage.goto('/admin/events/create')
|
||||
await expect(adminPage.locator('h1')).toContainText('Create Event')
|
||||
// Ensure Vue has hydrated (initial $fetch for series/tags has resolved)
|
||||
// before interacting — under cross-file load, hydration can lag and a
|
||||
// pre-hydration submit will native-POST against an empty form.
|
||||
await adminPage.waitForLoadState('networkidle')
|
||||
|
||||
await adminPage
|
||||
.getByPlaceholder('Enter a clear, descriptive event title')
|
||||
.fill(title)
|
||||
|
||||
await adminPage
|
||||
.getByPlaceholder(
|
||||
'Provide a clear description of what attendees can expect from this event'
|
||||
)
|
||||
.fill('e2e test event description')
|
||||
|
||||
await adminPage
|
||||
.getByPlaceholder('e.g., https://zoom.us/j/123... or #channel-name')
|
||||
.fill('https://example.com/zoom')
|
||||
|
||||
const startInput = adminPage.getByPlaceholder(
|
||||
"e.g., 'tomorrow at 3pm', 'next Friday at 9am'"
|
||||
)
|
||||
await startInput.fill('next Tuesday at 3pm')
|
||||
await startInput.blur()
|
||||
|
||||
const endInput = adminPage.getByPlaceholder(
|
||||
"e.g., 'tomorrow at 5pm', 'next Friday at 11am'"
|
||||
)
|
||||
await endInput.fill('next Tuesday at 5pm')
|
||||
await endInput.blur()
|
||||
|
||||
await adminPage.getByRole('button', { name: 'Create Event' }).click()
|
||||
|
||||
// The form posts via $fetch and then auto-redirects after a 1.5s setTimeout.
|
||||
// Under cross-file load that auto-redirect can race against waitForURL.
|
||||
// Wait for the surfaced success/error state, fail fast on error, then
|
||||
// navigate explicitly so subsequent assertions are deterministic.
|
||||
await expect(
|
||||
adminPage.locator('.success-box').or(adminPage.locator('.error-box'))
|
||||
).toBeVisible({ timeout: 15000 })
|
||||
await expect(adminPage.locator('.success-box')).toBeVisible()
|
||||
await adminPage.goto('/admin/events')
|
||||
await adminPage.waitForLoadState('networkidle')
|
||||
|
||||
// Filter to just our event — orphan rows from prior failed runs can push
|
||||
// the new row off page 1 of the paginated list.
|
||||
await adminPage.getByPlaceholder('Search events...').fill(title)
|
||||
const row = adminPage.locator('tr', { hasText: title })
|
||||
await expect(row).toBeVisible({ timeout: 10000 })
|
||||
|
||||
// --- Edit ---
|
||||
// Find the event ID from the row's "View" link (href is /events/<slug-or-id>),
|
||||
// and use the row's Edit button. Pair the click with waitForURL so we don't
|
||||
// miss the navigation event under load.
|
||||
await Promise.all([
|
||||
adminPage.waitForURL(/\/admin\/events\/create\?edit=/, { timeout: 15000 }),
|
||||
row.getByRole('button', { name: 'Edit' }).click(),
|
||||
])
|
||||
await expect(adminPage.locator('h1')).toContainText('Edit Event')
|
||||
|
||||
const titleInput = adminPage.getByPlaceholder(
|
||||
'Enter a clear, descriptive event title'
|
||||
)
|
||||
await titleInput.fill(editedTitle)
|
||||
|
||||
await adminPage.getByRole('button', { name: 'Update Event' }).click()
|
||||
|
||||
await expect(
|
||||
adminPage.locator('.success-box').or(adminPage.locator('.error-box'))
|
||||
).toBeVisible({ timeout: 15000 })
|
||||
await expect(adminPage.locator('.success-box')).toBeVisible()
|
||||
await adminPage.goto('/admin/events')
|
||||
await adminPage.waitForLoadState('networkidle')
|
||||
|
||||
// Filter to the edited event's unique title for the same pagination reason.
|
||||
await adminPage.getByPlaceholder('Search events...').fill(editedTitle)
|
||||
const editedRow = adminPage.locator('tr', { hasText: editedTitle })
|
||||
await expect(editedRow).toBeVisible({ timeout: 10000 })
|
||||
|
||||
// --- Delete (custom modal, not browser dialog) ---
|
||||
await editedRow.getByRole('button', { name: 'Del' }).click()
|
||||
await expect(
|
||||
adminPage.getByRole('heading', { name: 'Delete Event' })
|
||||
).toBeVisible()
|
||||
await adminPage
|
||||
.locator('.modal')
|
||||
.getByRole('button', { name: 'Delete' })
|
||||
.click()
|
||||
|
||||
await expect(
|
||||
adminPage.locator('tr', { hasText: editedTitle })
|
||||
).toHaveCount(0, { timeout: 10000 })
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -66,68 +66,4 @@ test.describe("Admin members page", () => {
|
|||
adminPage.getByPlaceholder("email@example.com"),
|
||||
).toBeVisible();
|
||||
});
|
||||
|
||||
test("create member, status select reflects STATUS_LABELS, change persists, detail page renders", async ({ adminPage }) => {
|
||||
const stamp = Date.now();
|
||||
const memberName = `E2E Member ${stamp}`;
|
||||
const memberEmail = `e2e-member-${stamp}@example.test`;
|
||||
|
||||
await adminPage.goto("/admin/members");
|
||||
await adminPage.waitForLoadState("networkidle");
|
||||
await expect(adminPage.locator("h1")).toHaveText("Members");
|
||||
|
||||
await adminPage.getByRole("button", { name: "Add Member" }).click();
|
||||
await adminPage.getByPlaceholder("Full name").fill(memberName);
|
||||
await adminPage.getByPlaceholder("email@example.com").fill(memberEmail);
|
||||
await adminPage.getByRole("button", { name: "Create Member" }).click();
|
||||
|
||||
// Verify the new member shows up via search
|
||||
const searchInput = adminPage.getByPlaceholder("Search members...");
|
||||
await expect(searchInput).toBeVisible({ timeout: 10000 });
|
||||
await searchInput.fill(memberEmail);
|
||||
|
||||
const memberRow = adminPage.locator("tr", { hasText: memberEmail });
|
||||
await expect(memberRow).toBeVisible({ timeout: 10000 });
|
||||
await expect(memberRow.getByText(memberName)).toBeVisible();
|
||||
|
||||
// Open the edit modal for this member, where the STATUS_LABELS-driven <select> lives
|
||||
await memberRow.getByRole("button", { name: "Edit" }).click();
|
||||
|
||||
const statusSelect = adminPage.locator(".modal select").filter({ hasText: "Active" });
|
||||
await expect(statusSelect).toBeVisible({ timeout: 10000 });
|
||||
|
||||
// STATUS_LABELS keys (values) and the rendered labels
|
||||
const expectedOptions = [
|
||||
{ value: "active", label: "Active" },
|
||||
{ value: "pending_payment", label: "Payment setup incomplete" },
|
||||
{ value: "suspended", label: "Paused" },
|
||||
{ value: "cancelled", label: "Closed" },
|
||||
];
|
||||
for (const { value, label } of expectedOptions) {
|
||||
const opt = statusSelect.locator(`option[value="${value}"]`);
|
||||
await expect(opt).toHaveCount(1);
|
||||
await expect(opt).toHaveText(label);
|
||||
}
|
||||
|
||||
// Change status to suspended and save
|
||||
await statusSelect.selectOption("suspended");
|
||||
await adminPage.getByRole("button", { name: "Save Changes" }).click();
|
||||
|
||||
// Modal closes; verify the row badge reflects the new status
|
||||
await expect(adminPage.locator(".modal")).toHaveCount(0, { timeout: 10000 });
|
||||
await expect(memberRow.getByText("Paused")).toBeVisible({ timeout: 10000 });
|
||||
|
||||
// Reload to confirm persistence
|
||||
await adminPage.reload();
|
||||
await adminPage.waitForLoadState("networkidle");
|
||||
await adminPage.getByPlaceholder("Search members...").fill(memberEmail);
|
||||
const reloadedRow = adminPage.locator("tr", { hasText: memberEmail });
|
||||
await expect(reloadedRow.getByText("Paused")).toBeVisible({ timeout: 10000 });
|
||||
|
||||
// Click the member name (link to detail page) and verify URL + heading
|
||||
await reloadedRow.getByRole("link", { name: memberName }).click();
|
||||
await adminPage.waitForURL(/\/admin\/members\/[a-f0-9]{24}$/, { timeout: 10000 });
|
||||
await expect(adminPage.locator("h1")).toHaveText(memberName);
|
||||
await expect(adminPage.locator(".member-email")).toHaveText(memberEmail);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,111 +0,0 @@
|
|||
import { test, expect } from './helpers/fixtures.js'
|
||||
|
||||
test.describe('Admin pre-registrants page', () => {
|
||||
test('page loads for admin', async ({ adminPage }) => {
|
||||
await adminPage.goto('/admin/pre-registrants')
|
||||
|
||||
await expect(adminPage.getByRole('heading', { name: 'Pre-Registrants' })).toBeVisible({
|
||||
timeout: 15000,
|
||||
})
|
||||
|
||||
await expect(
|
||||
adminPage.locator('table').or(adminPage.getByText('No pre-registrants found matching your criteria')),
|
||||
).toBeVisible({ timeout: 15000 })
|
||||
})
|
||||
|
||||
test('header action buttons render', async ({ adminPage }) => {
|
||||
await adminPage.goto('/admin/pre-registrants')
|
||||
await expect(adminPage.getByRole('heading', { name: 'Pre-Registrants' })).toBeVisible({
|
||||
timeout: 15000,
|
||||
})
|
||||
|
||||
await expect(adminPage.getByRole('button', { name: /^Mark as Selected/ })).toBeVisible()
|
||||
await expect(adminPage.getByRole('button', { name: /^Send Invites/ })).toBeVisible()
|
||||
})
|
||||
|
||||
test('search input filters list without crashing', async ({ adminPage }) => {
|
||||
await adminPage.goto('/admin/pre-registrants')
|
||||
await adminPage.waitForLoadState('networkidle')
|
||||
|
||||
const search = adminPage.getByPlaceholder('Search by name, email, city, role...')
|
||||
await expect(search).toBeVisible({ timeout: 15000 })
|
||||
|
||||
await search.fill(`nonexistent-prereg-${Date.now()}`)
|
||||
|
||||
await expect(
|
||||
adminPage.getByText('No pre-registrants found matching your criteria'),
|
||||
).toBeVisible({ timeout: 10000 })
|
||||
})
|
||||
|
||||
test('status filter changes selection', async ({ adminPage }) => {
|
||||
await adminPage.goto('/admin/pre-registrants')
|
||||
await adminPage.waitForLoadState('networkidle')
|
||||
|
||||
const statusFilter = adminPage.getByLabel('Filter by status')
|
||||
await expect(statusFilter).toBeVisible({ timeout: 15000 })
|
||||
|
||||
await statusFilter.selectOption('expired')
|
||||
await expect(statusFilter).toHaveValue('expired')
|
||||
|
||||
await expect(
|
||||
adminPage.locator('table').or(adminPage.getByText('No pre-registrants found matching your criteria')),
|
||||
).toBeVisible({ timeout: 10000 })
|
||||
|
||||
await statusFilter.selectOption('')
|
||||
await expect(statusFilter).toHaveValue('')
|
||||
})
|
||||
|
||||
test('Send Invites button is disabled with no selection', async ({ adminPage }) => {
|
||||
await adminPage.goto('/admin/pre-registrants')
|
||||
await expect(adminPage.getByRole('heading', { name: 'Pre-Registrants' })).toBeVisible({
|
||||
timeout: 15000,
|
||||
})
|
||||
|
||||
await expect(adminPage.getByRole('button', { name: 'Send Invites (0)' })).toBeDisabled()
|
||||
await expect(adminPage.getByRole('button', { name: 'Mark as Selected (0)' })).toBeDisabled()
|
||||
})
|
||||
|
||||
test('send invite action', async ({ adminPage }) => {
|
||||
await adminPage.goto('/admin/pre-registrants')
|
||||
await adminPage.waitForLoadState('networkidle')
|
||||
await expect(adminPage.getByRole('heading', { name: 'Pre-Registrants' })).toBeVisible({
|
||||
timeout: 15000,
|
||||
})
|
||||
|
||||
// Filter to invitable statuses; pick the first row if available.
|
||||
const statusFilter = adminPage.getByLabel('Filter by status')
|
||||
await statusFilter.selectOption('pending')
|
||||
await adminPage.waitForLoadState('networkidle')
|
||||
|
||||
const firstRow = adminPage.locator('tbody tr').first()
|
||||
if (await firstRow.count() === 0) {
|
||||
test.skip(true, 'No pending pre-registrants in dev DB to invite')
|
||||
return
|
||||
}
|
||||
|
||||
await firstRow.locator('.col-name').click()
|
||||
const sendButton = adminPage.getByRole('button', { name: /^Send Invites \(\d+\)/ })
|
||||
await expect(sendButton).toBeEnabled()
|
||||
await sendButton.click()
|
||||
|
||||
await expect(adminPage.getByRole('heading', { name: 'Send Invitation Emails' })).toBeVisible()
|
||||
|
||||
const submitButton = adminPage.getByRole('button', { name: /^Send \d+ invitation/ })
|
||||
await submitButton.click()
|
||||
|
||||
// ALLOW_DEV_TEST_ENDPOINTS=true short-circuits the Resend call; result still reports sent.
|
||||
await expect(adminPage.getByText(/^\d+ sent$/)).toBeVisible({ timeout: 15000 })
|
||||
})
|
||||
|
||||
test('non-admin redirect', async ({ browser }) => {
|
||||
const context = await browser.newContext()
|
||||
const page = await context.newPage()
|
||||
|
||||
await page.goto('/admin/pre-registrants')
|
||||
|
||||
await page.waitForURL((url) => !url.pathname.startsWith('/admin'))
|
||||
expect(page.url()).not.toContain('/admin/pre-registrants')
|
||||
|
||||
await context.close()
|
||||
})
|
||||
})
|
||||
|
|
@ -1,65 +0,0 @@
|
|||
import { test, expect } from './helpers/fixtures.js'
|
||||
|
||||
test.describe('Admin series management page', () => {
|
||||
test('series list loads for admin', async ({ adminPage }) => {
|
||||
await adminPage.goto('/admin/series-management')
|
||||
await expect(adminPage.getByRole('heading', { name: 'Series', level: 1 })).toBeVisible({
|
||||
timeout: 15000,
|
||||
})
|
||||
await expect(adminPage.getByRole('link', { name: 'Create Series' })).toBeVisible()
|
||||
})
|
||||
})
|
||||
|
||||
test.describe('Admin series access control', () => {
|
||||
test('non-admin redirect', async ({ page }) => {
|
||||
await page.goto('/admin/series-management')
|
||||
await page.waitForURL((url) => !url.pathname.startsWith('/admin'))
|
||||
expect(page.url()).not.toContain('/admin/series-management')
|
||||
})
|
||||
})
|
||||
|
||||
test.describe('Admin series CRUD', () => {
|
||||
test('create and edit a series', async ({ adminPage }) => {
|
||||
const suffix = Date.now().toString().slice(-6)
|
||||
const title = `e2e-series-${suffix}`
|
||||
const description = 'e2e test series description'
|
||||
const editedDescription = 'e2e test series description edited'
|
||||
|
||||
// --- Create ---
|
||||
await adminPage.goto('/admin/series/create')
|
||||
await expect(adminPage.locator('h1')).toContainText('Create New Series')
|
||||
|
||||
await adminPage
|
||||
.getByPlaceholder('e.g., Cooperative Game Development Fundamentals')
|
||||
.fill(title)
|
||||
|
||||
await adminPage
|
||||
.getByPlaceholder('Describe what the series covers and its goals')
|
||||
.fill(description)
|
||||
|
||||
await adminPage.getByRole('button', { name: 'Create Series' }).click()
|
||||
|
||||
await adminPage.waitForURL('**/admin/series-management', { timeout: 15000 })
|
||||
|
||||
const card = adminPage.locator('.series-card', { hasText: title })
|
||||
await expect(card).toBeVisible({ timeout: 10000 })
|
||||
await expect(card).toContainText(description)
|
||||
|
||||
// --- Edit (in-page modal) ---
|
||||
await card.getByRole('button', { name: 'Edit' }).click()
|
||||
await expect(adminPage.getByRole('heading', { name: 'Edit Series' })).toBeVisible()
|
||||
|
||||
const descInput = adminPage.locator('textarea[placeholder="Brief description of this series"]')
|
||||
await descInput.fill(editedDescription)
|
||||
await adminPage.getByRole('button', { name: 'Save Changes' }).click()
|
||||
|
||||
const editedCard = adminPage.locator('.series-card', { hasText: title })
|
||||
await expect(editedCard).toContainText(editedDescription, { timeout: 10000 })
|
||||
})
|
||||
|
||||
// Delete is skipped: the series-management page's "Delete" button only
|
||||
// unlinks events from the series via PUT /api/admin/events/:id; it does
|
||||
// not call DELETE /api/admin/series/:id, so the series record remains.
|
||||
// No UI affordance currently exists to remove an empty series.
|
||||
test.skip('delete a series', async () => {})
|
||||
})
|
||||
|
|
@ -1,85 +0,0 @@
|
|||
import { test, expect } from './helpers/fixtures.js'
|
||||
|
||||
const WHITELISTED_KEYS = ['homepage.wiki_feature']
|
||||
|
||||
test.describe('Admin site content page', () => {
|
||||
test('page loads for admin', async ({ adminPage }) => {
|
||||
await adminPage.goto('/admin/site-content')
|
||||
await expect(adminPage.getByRole('heading', { name: 'Site Content' })).toBeVisible({
|
||||
timeout: 15000,
|
||||
})
|
||||
})
|
||||
|
||||
test('renders one block per whitelisted key', async ({ adminPage }) => {
|
||||
await adminPage.goto('/admin/site-content')
|
||||
await adminPage.waitForLoadState('networkidle')
|
||||
await expect(adminPage.getByRole('heading', { name: 'Site Content' })).toBeVisible({
|
||||
timeout: 15000,
|
||||
})
|
||||
|
||||
const blocks = adminPage.locator('.content-block')
|
||||
await expect(blocks).toHaveCount(WHITELISTED_KEYS.length)
|
||||
|
||||
for (const key of WHITELISTED_KEYS) {
|
||||
await expect(adminPage.locator('.block-key', { hasText: key })).toBeVisible()
|
||||
}
|
||||
})
|
||||
|
||||
test('edit, save, persist, and reflect on public page', async ({ adminPage }) => {
|
||||
const key = 'homepage.wiki_feature'
|
||||
|
||||
await adminPage.goto('/admin/site-content')
|
||||
await adminPage.waitForLoadState('networkidle')
|
||||
await expect(adminPage.getByRole('heading', { name: 'Site Content' })).toBeVisible({
|
||||
timeout: 15000,
|
||||
})
|
||||
|
||||
const original = await adminPage.evaluate(
|
||||
async (k) => await (await fetch(`/api/site-content/${k}`)).json(),
|
||||
key,
|
||||
)
|
||||
const originalTitle = original.title || ''
|
||||
const originalBody = original.body || ''
|
||||
|
||||
const stamp = Date.now()
|
||||
const newTitle = `e2e title ${stamp}`
|
||||
const newBody = `e2e body paragraph ${stamp}`
|
||||
|
||||
const block = adminPage.locator('.content-block', {
|
||||
has: adminPage.locator('.block-key', { hasText: key }),
|
||||
})
|
||||
await expect(block).toBeVisible()
|
||||
|
||||
const titleInput = block.locator('input[type="text"]')
|
||||
const bodyTextarea = block.locator('textarea')
|
||||
|
||||
await titleInput.fill(newTitle)
|
||||
await bodyTextarea.fill(newBody)
|
||||
await block.getByRole('button', { name: 'Save' }).click()
|
||||
|
||||
await expect(block.locator('.block-meta')).toContainText('Updated', { timeout: 10000 })
|
||||
|
||||
await adminPage.reload()
|
||||
await adminPage.waitForLoadState('networkidle')
|
||||
const reloadedBlock = adminPage.locator('.content-block', {
|
||||
has: adminPage.locator('.block-key', { hasText: key }),
|
||||
})
|
||||
await expect(reloadedBlock.locator('input[type="text"]')).toHaveValue(newTitle)
|
||||
await expect(reloadedBlock.locator('textarea')).toHaveValue(newBody)
|
||||
|
||||
await adminPage.goto('/')
|
||||
await adminPage.waitForLoadState('networkidle')
|
||||
await expect(adminPage.getByText(newBody)).toBeVisible({ timeout: 15000 })
|
||||
|
||||
await adminPage.evaluate(
|
||||
async ({ k, t, b }) => {
|
||||
await fetch(`/api/admin/site-content/${k}`, {
|
||||
method: 'PUT',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ title: t, body: b }),
|
||||
})
|
||||
},
|
||||
{ k: key, t: originalTitle, b: originalBody },
|
||||
)
|
||||
})
|
||||
})
|
||||
|
|
@ -1,34 +1,13 @@
|
|||
import { test, expect } from './helpers/fixtures.js'
|
||||
import { loginAsMember } from './helpers/auth.js'
|
||||
|
||||
// The default `memberPage` fixture authenticates as test-admin@ghostguild.dev,
|
||||
// the same account auth.spec.js's logout test revokes mid-suite. Bypass the
|
||||
// fixture and use a seeded, non-shared member instead so cross-file logout
|
||||
// can't strand this file mid-flow.
|
||||
const SEEDED_MEMBER_EMAIL = 'riley.johnson@cooperativedev.org'
|
||||
|
||||
const newMemberPage = async (browser) => {
|
||||
const context = await browser.newContext()
|
||||
const page = await context.newPage()
|
||||
await loginAsMember(page, SEEDED_MEMBER_EMAIL)
|
||||
return { context, page }
|
||||
}
|
||||
|
||||
test.describe('Board page', () => {
|
||||
test('page loads for authenticated member', async ({ browser }) => {
|
||||
const { context, page: memberPage } = await newMemberPage(browser)
|
||||
try {
|
||||
test('page loads for authenticated member', async ({ memberPage }) => {
|
||||
await memberPage.goto('/board')
|
||||
await expect(memberPage.getByRole('heading', { name: 'Bulletin Board' })).toBeVisible({ timeout: 15000 })
|
||||
await expect(memberPage.getByRole('heading', { name: 'Board' })).toBeVisible({ timeout: 15000 })
|
||||
await expect(memberPage.getByRole('button', { name: '+ New Post' }).first()).toBeVisible()
|
||||
} finally {
|
||||
await context.close()
|
||||
}
|
||||
})
|
||||
|
||||
test('clicking New Post reveals the form', async ({ browser }) => {
|
||||
const { context, page: memberPage } = await newMemberPage(browser)
|
||||
try {
|
||||
test('clicking New Post reveals the form', async ({ memberPage }) => {
|
||||
await memberPage.goto('/board')
|
||||
await memberPage.waitForLoadState('networkidle')
|
||||
await expect(memberPage.getByRole('button', { name: '+ New Post' }).first()).toBeVisible({
|
||||
|
|
@ -40,16 +19,11 @@ test.describe('Board page', () => {
|
|||
await expect(memberPage.getByRole('heading', { name: 'New post' })).toBeVisible()
|
||||
await expect(memberPage.locator('#post-title')).toBeVisible()
|
||||
await expect(memberPage.locator('#post-seeking')).toBeVisible()
|
||||
} finally {
|
||||
await context.close()
|
||||
}
|
||||
})
|
||||
|
||||
test('tags drawer toggles open and closed', async ({ browser }) => {
|
||||
const { context, page: memberPage } = await newMemberPage(browser)
|
||||
try {
|
||||
test('tags drawer toggles open and closed', async ({ memberPage }) => {
|
||||
await memberPage.goto('/board')
|
||||
await expect(memberPage.getByRole('heading', { name: 'Bulletin Board' })).toBeVisible({ timeout: 15000 })
|
||||
await expect(memberPage.getByRole('heading', { name: 'Board' })).toBeVisible({ timeout: 15000 })
|
||||
|
||||
const drawerToggle = memberPage.getByRole('button', { name: /^Tags\.\.\./ })
|
||||
// Drawer toggle only appears if cooperative tags exist — skip quietly if not
|
||||
|
|
@ -63,14 +37,9 @@ test.describe('Board page', () => {
|
|||
|
||||
await drawerToggle.click()
|
||||
await expect(memberPage.getByText('Filter:')).not.toBeVisible()
|
||||
} finally {
|
||||
await context.close()
|
||||
}
|
||||
})
|
||||
|
||||
test('create, edit, and delete own post', async ({ browser }) => {
|
||||
const { context, page: memberPage } = await newMemberPage(browser)
|
||||
try {
|
||||
test('create, edit, and delete own post', async ({ memberPage }) => {
|
||||
await memberPage.goto('/board')
|
||||
await memberPage.waitForLoadState('networkidle')
|
||||
await expect(memberPage.getByRole('button', { name: '+ New Post' }).first()).toBeVisible({
|
||||
|
|
@ -116,8 +85,5 @@ test.describe('Board page', () => {
|
|||
await expect(memberPage.getByRole('heading', { name: editedTitle })).not.toBeVisible({
|
||||
timeout: 10000,
|
||||
})
|
||||
} finally {
|
||||
await context.close()
|
||||
}
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -67,128 +67,3 @@ test.describe('Events list page', () => {
|
|||
await expect(page.locator('h1')).toBeVisible()
|
||||
})
|
||||
})
|
||||
|
||||
async function navigateToFirstEventDetail(page) {
|
||||
await page.goto('/events')
|
||||
await page.locator('.past-toggle').click()
|
||||
await page.waitForLoadState('networkidle')
|
||||
const eventLinks = page.locator('.event-row a')
|
||||
const count = await eventLinks.count()
|
||||
if (count === 0) return null
|
||||
const href = await eventLinks.first().getAttribute('href')
|
||||
return href
|
||||
}
|
||||
|
||||
test.describe('Event detail — ticket gating', () => {
|
||||
test('series-pass-required shows pass-required notice instead of buy button', async ({ page }) => {
|
||||
const href = await navigateToFirstEventDetail(page)
|
||||
test.skip(!href, 'No events in dev DB to navigate against')
|
||||
|
||||
await page.route('**/api/events/*/tickets/available**', async (route) => {
|
||||
await route.fulfill({
|
||||
status: 200,
|
||||
contentType: 'application/json',
|
||||
body: JSON.stringify({
|
||||
available: false,
|
||||
reason: 'series_pass_required',
|
||||
requiresSeriesPass: true,
|
||||
series: { id: 'series-stub', slug: 'series-stub', title: 'Stub Series' }
|
||||
})
|
||||
})
|
||||
})
|
||||
await page.route('**/api/events/*/check-series-access**', async (route) => {
|
||||
await route.fulfill({
|
||||
status: 200,
|
||||
contentType: 'application/json',
|
||||
body: JSON.stringify({ requiresSeriesPass: false })
|
||||
})
|
||||
})
|
||||
|
||||
await page.locator(`.event-row a[href="${href}"]`).first().click()
|
||||
await page.waitForURL(`**${href}`)
|
||||
|
||||
const ticketPanel = page.locator('.event-ticket-purchase')
|
||||
await expect(ticketPanel.locator('.ticket-status', { hasText: 'Series Pass Required' })).toBeVisible()
|
||||
await expect(ticketPanel.locator('button', { hasText: /Pay |Register for this event|Complete Registration/ })).toHaveCount(0)
|
||||
await expect(ticketPanel.locator('a[href="/series/series-stub"] button')).toBeVisible()
|
||||
})
|
||||
|
||||
test('memberSavings line is hidden for anonymous viewers', async ({ page }) => {
|
||||
const href = await navigateToFirstEventDetail(page)
|
||||
test.skip(!href, 'No events in dev DB to navigate against')
|
||||
|
||||
await page.route('**/api/events/*/tickets/available**', async (route) => {
|
||||
await route.fulfill({
|
||||
status: 200,
|
||||
contentType: 'application/json',
|
||||
body: JSON.stringify({
|
||||
available: true,
|
||||
alreadyRegistered: false,
|
||||
isFree: false,
|
||||
isMember: false,
|
||||
name: 'General Admission',
|
||||
formattedPrice: '$25.00',
|
||||
remaining: 10,
|
||||
memberSavings: 0,
|
||||
publicTicket: null
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
await page.locator(`.event-row a[href="${href}"]`).first().click()
|
||||
await page.waitForURL(`**${href}`)
|
||||
|
||||
const ticketCard = page.locator('.ticket-card')
|
||||
await expect(ticketCard).toBeVisible()
|
||||
await expect(page.locator('.ticket-savings')).toHaveCount(0)
|
||||
await expect(page.locator('text=/save .* as a member/i')).toHaveCount(0)
|
||||
})
|
||||
|
||||
test('memberSavings line is shown when API reports savings', async ({ page }) => {
|
||||
const href = await navigateToFirstEventDetail(page)
|
||||
test.skip(!href, 'No events in dev DB to navigate against')
|
||||
|
||||
await page.route('**/api/events/*/tickets/available**', async (route) => {
|
||||
await route.fulfill({
|
||||
status: 200,
|
||||
contentType: 'application/json',
|
||||
body: JSON.stringify({
|
||||
available: true,
|
||||
alreadyRegistered: false,
|
||||
isFree: false,
|
||||
isMember: true,
|
||||
name: 'Member Ticket',
|
||||
formattedPrice: '$10.00',
|
||||
remaining: 10,
|
||||
memberSavings: 15,
|
||||
publicTicket: { formattedPrice: '$25.00' }
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
await page.locator(`.event-row a[href="${href}"]`).first().click()
|
||||
await page.waitForURL(`**${href}`)
|
||||
|
||||
const savings = page.locator('.ticket-savings')
|
||||
await expect(savings).toBeVisible()
|
||||
await expect(savings).toContainText(/save/i)
|
||||
})
|
||||
|
||||
test.skip('hidden event returns 404', async () => {
|
||||
// Skipped: hidden-event gating happens during SSR useFetch in [slug].vue,
|
||||
// which page.route cannot intercept. Verifying this gate requires either
|
||||
// seeding a hidden event in the dev DB or a server-side mock layer.
|
||||
})
|
||||
|
||||
test.skip('past-deadline event shows registration-closed copy', async () => {
|
||||
// Skipped: when the available endpoint returns reason
|
||||
// "Registration deadline has passed", the current UI surfaces it as the
|
||||
// generic "Event Sold Out" panel — there is no distinct "Registration
|
||||
// closed" string to assert against without changing the component.
|
||||
})
|
||||
|
||||
test.skip('member with paid registration cannot self-cancel', async () => {
|
||||
// Skipped: requires seeding an authed member with a paid registration in
|
||||
// the DB, which is out of scope for API-level mocking.
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,32 +1,36 @@
|
|||
/**
|
||||
* Login helpers using dev endpoints.
|
||||
*
|
||||
* Implementation note: hits the dev endpoints via the APIRequestContext
|
||||
* (no page navigation). The Set-Cookie response writes auth-token to the
|
||||
* BrowserContext's cookie jar, so any subsequent page.goto() is authed.
|
||||
* Avoids the Nuxt-dev networkidle race that made page.goto-based login flaky.
|
||||
* These set real httpOnly JWT cookies so all middleware works naturally.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Login as admin via the dev test-login endpoint.
|
||||
* Creates a test admin user if none exists and sets the auth cookie.
|
||||
* Waits for networkidle so the client-side auth check (admin middleware +
|
||||
* auth-init plugin) completes before the test navigates anywhere.
|
||||
*/
|
||||
export async function loginAsAdmin(page) {
|
||||
const res = await page.context().request.get('/api/dev/test-login', { maxRedirects: 0 })
|
||||
if (res.status() !== 302) {
|
||||
throw new Error(`/api/dev/test-login returned ${res.status()}; expected 302`)
|
||||
}
|
||||
const cookies = await page.context().cookies()
|
||||
if (!cookies.find((c) => c.name === 'auth-token')) {
|
||||
throw new Error('/api/dev/test-login did not set auth-token cookie')
|
||||
await page.goto('/api/dev/test-login', { waitUntil: 'domcontentloaded' })
|
||||
|
||||
// The endpoint sets the cookie and redirects to /admin.
|
||||
// waitForURL fires as soon as the URL changes — not when JS finishes.
|
||||
// waitForLoadState('networkidle') ensures the auth-init plugin and admin
|
||||
// middleware have both completed their checkMemberStatus() calls before
|
||||
// the test proceeds.
|
||||
try {
|
||||
await page.waitForURL(/\/admin/, { timeout: 15000 })
|
||||
await page.waitForLoadState('networkidle')
|
||||
} catch {
|
||||
// Cookie should be set even if redirect failed — navigate manually
|
||||
await page.goto('/admin', { waitUntil: 'networkidle' })
|
||||
await page.waitForURL(/\/admin/)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Login as a specific member by email via the dev member-login endpoint.
|
||||
*/
|
||||
export async function loginAsMember(page, email) {
|
||||
const res = await page.context().request.get(
|
||||
`/api/dev/member-login?email=${encodeURIComponent(email)}`,
|
||||
{ maxRedirects: 0 }
|
||||
)
|
||||
if (res.status() !== 302) {
|
||||
throw new Error(`/api/dev/member-login returned ${res.status()}; expected 302`)
|
||||
}
|
||||
const cookies = await page.context().cookies()
|
||||
if (!cookies.find((c) => c.name === 'auth-token')) {
|
||||
throw new Error('/api/dev/member-login did not set auth-token cookie')
|
||||
}
|
||||
await page.goto(`/api/dev/member-login?email=${encodeURIComponent(email)}`, { waitUntil: 'domcontentloaded' })
|
||||
await page.waitForURL(/\/member\//)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -104,104 +104,6 @@ test.describe('Join page — member signup flow', () => {
|
|||
).toBeVisible({ timeout: 15000 })
|
||||
})
|
||||
|
||||
test('cadence toggle updates billing summary to annual ×12', async ({ page }) => {
|
||||
await page.goto('/join')
|
||||
await page.waitForLoadState('networkidle')
|
||||
|
||||
await page.locator('#join-contribution').fill('10')
|
||||
await page.locator('label[for="cadence-annual"]').click()
|
||||
|
||||
const summary = page.locator('.billing-summary')
|
||||
await expect(summary).toBeVisible()
|
||||
await expect(summary).toContainText('$120 today')
|
||||
await expect(summary).toContainText('$10/month × 12')
|
||||
await expect(summary).toContainText('$120 every year')
|
||||
|
||||
await page.locator('label[for="cadence-monthly"]').click()
|
||||
await expect(summary).toContainText('$10 today')
|
||||
await expect(summary).toContainText('$10 every month')
|
||||
})
|
||||
|
||||
test('contribution guidance label changes with amount tier', async ({ page }) => {
|
||||
await page.goto('/join')
|
||||
await page.waitForLoadState('networkidle')
|
||||
|
||||
const guidance = page.locator('.contribution-guidance')
|
||||
|
||||
await page.locator('#join-contribution').fill('5')
|
||||
await expect(guidance).toHaveText(/I can contribute/)
|
||||
|
||||
await page.locator('#join-contribution').fill('30')
|
||||
await expect(guidance).toHaveText(/I can support others too/)
|
||||
})
|
||||
|
||||
test('paid tier flow reaches success state with HelcimPay stubbed', async ({ page }) => {
|
||||
const uniqueEmail = `test-e2e-paid-${Date.now()}@example.com`
|
||||
|
||||
// Stub HelcimPay window globals before the page loads so the composable's
|
||||
// script-load path is bypassed and we resolve verifyPayment synchronously.
|
||||
await page.addInitScript(() => {
|
||||
window.appendHelcimPayIframe = (checkoutToken) => {
|
||||
const eventName = 'helcim-pay-js-' + checkoutToken
|
||||
setTimeout(() => {
|
||||
window.postMessage({
|
||||
eventName,
|
||||
eventStatus: 'SUCCESS',
|
||||
eventMessage: JSON.stringify({
|
||||
data: {
|
||||
data: {
|
||||
transactionId: 'stub-txn-1',
|
||||
cardToken: 'stub-card-token-1',
|
||||
cardNumber: '4111111111111234',
|
||||
cardType: 'visa'
|
||||
}
|
||||
}
|
||||
})
|
||||
}, '*')
|
||||
}, 50)
|
||||
}
|
||||
window.removeHelcimPayIframe = () => {}
|
||||
})
|
||||
|
||||
await page.goto('/join')
|
||||
await page.waitForLoadState('networkidle')
|
||||
|
||||
await mockHelcimAPIs(page)
|
||||
|
||||
await page.route('**/api/helcim/initialize-payment', async (route) => {
|
||||
return route.fulfill({
|
||||
status: 200,
|
||||
contentType: 'application/json',
|
||||
body: JSON.stringify({
|
||||
success: true,
|
||||
checkoutToken: 'stub-checkout-token',
|
||||
secretToken: 'stub-secret-token'
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
await page.route('**/api/helcim/verify-payment', async (route) => {
|
||||
return route.fulfill({
|
||||
status: 200,
|
||||
contentType: 'application/json',
|
||||
body: JSON.stringify({ success: true })
|
||||
})
|
||||
})
|
||||
|
||||
await page.locator('#join-name').fill('Paid E2E User')
|
||||
await page.locator('#join-email').fill(uniqueEmail)
|
||||
await page.locator('#circle-community').check({ force: true })
|
||||
await page.locator('#join-contribution').fill('15')
|
||||
await page.getByRole('checkbox', { name: /Community Guidelines/ }).check()
|
||||
|
||||
await expect(page.locator('.form-submit')).toBeEnabled()
|
||||
await page.locator('.form-submit').click()
|
||||
|
||||
await expect(
|
||||
page.getByRole('heading', { name: 'Welcome to Ghost Guild!' })
|
||||
).toBeVisible({ timeout: 15000 })
|
||||
})
|
||||
|
||||
test('duplicate email shows error', async ({ page }) => {
|
||||
const duplicateEmail = `test-e2e-dup-${Date.now()}@example.com`
|
||||
|
||||
|
|
|
|||
180
e2e/visual/pages.spec.js
Normal file
180
e2e/visual/pages.spec.js
Normal file
|
|
@ -0,0 +1,180 @@
|
|||
import { test, expect } from '@playwright/test'
|
||||
import { loginAsAdmin } from '../helpers/auth.js'
|
||||
import path from 'path'
|
||||
import fs from 'fs'
|
||||
|
||||
const viewports = {
|
||||
desktop: { width: 1280, height: 720 },
|
||||
mobile: { width: 375, height: 667 },
|
||||
}
|
||||
|
||||
const publicPages = [
|
||||
{ name: 'home', path: '/' },
|
||||
{ name: 'join', path: '/join' },
|
||||
{ name: 'events', path: '/events' },
|
||||
{ name: 'coming-soon', path: '/coming-soon' },
|
||||
// about and members have no auth middleware — accessible publicly
|
||||
{ name: 'about', path: '/about' },
|
||||
{ name: 'members', path: '/members' },
|
||||
]
|
||||
|
||||
const authenticatedPages = [
|
||||
{ name: 'member-dashboard', path: '/member/dashboard' },
|
||||
{ name: 'member-profile', path: '/member/profile' },
|
||||
{ name: 'admin-members', path: '/admin/members' },
|
||||
{ name: 'admin-events-create', path: '/admin/events/create' },
|
||||
// New authenticated pages
|
||||
{ name: 'member-account', path: '/member/account' },
|
||||
{ name: 'connections', path: '/connections' },
|
||||
{ name: 'admin-dashboard', path: '/admin' },
|
||||
]
|
||||
|
||||
// Pages that need mobile coverage captured while authenticated.
|
||||
// These cover column-collapse breakpoints critical for the page-shell refactor.
|
||||
// Snapshots use the -mobile-auth suffix to distinguish from the public mobile loop
|
||||
// (which also captures about-mobile unauthenticated, so names must not collide).
|
||||
const authenticatedMobilePages = [
|
||||
{ name: 'about', path: '/about' },
|
||||
{ name: 'member-dashboard', path: '/member/dashboard' },
|
||||
{ name: 'member-profile', path: '/member/profile' },
|
||||
{ name: 'member-account', path: '/member/account' },
|
||||
{ name: 'connections', path: '/connections' },
|
||||
]
|
||||
|
||||
// Path where the saved admin auth state (cookies) will be stored within a run.
|
||||
const authStatePath = path.resolve('e2e/.auth/admin.json')
|
||||
|
||||
// Wait for fonts and images to load before taking screenshots
|
||||
async function waitForStable(page) {
|
||||
await page.waitForLoadState('networkidle')
|
||||
// Wait for web fonts to load
|
||||
await page.evaluate(() => document.fonts.ready)
|
||||
}
|
||||
|
||||
// Common mask selectors for dynamic content
|
||||
function commonMasks(page) {
|
||||
return [
|
||||
// Dates and times throughout the app
|
||||
page.locator('.event-date'),
|
||||
page.locator('.event-count'),
|
||||
page.locator('time'),
|
||||
page.locator('.member-since'),
|
||||
// Activity log timestamps
|
||||
page.locator('.tl-time'),
|
||||
// Admin dashboard stat values (member counts, revenue, etc.)
|
||||
page.locator('.stat-val'),
|
||||
// Recent member join dates in admin dashboard
|
||||
page.locator('.item-date'),
|
||||
// Member avatars (ghost images may not load deterministically)
|
||||
page.locator('.mc-avatar'),
|
||||
page.locator('.cc-avatar'),
|
||||
page.locator('.profile-avatar'),
|
||||
// Member count text in members page filter bar
|
||||
page.locator('.filter-count'),
|
||||
// Connections page: filter bar and suggestions vary based on tag/topic
|
||||
// state and async fetch ordering. Mask them to keep the structural
|
||||
// (PageShell + page-level) regression coverage stable.
|
||||
page.locator('.filter-bar'),
|
||||
page.locator('.skills-bar'),
|
||||
page.locator('.connections-section'),
|
||||
page.locator('.loading-state'),
|
||||
]
|
||||
}
|
||||
|
||||
// All visual tests run serially in a single top-level describe block.
|
||||
//
|
||||
// Auth is handled with a beforeAll that saves the cookie to disk once. All
|
||||
// authenticated sub-describes load from that saved state, avoiding repeated
|
||||
// /api/dev/test-login calls that exhaust the dev server's MongoDB connections.
|
||||
test.describe('visual regression', () => {
|
||||
test.describe.configure({ mode: 'serial' })
|
||||
|
||||
// Log in once before all tests and save the auth cookie.
|
||||
// serial mode guarantees this runs before any test in this describe tree.
|
||||
test.beforeAll(async ({ browser }) => {
|
||||
fs.mkdirSync(path.dirname(authStatePath), { recursive: true })
|
||||
const page = await browser.newPage()
|
||||
await loginAsAdmin(page)
|
||||
await page.context().storageState({ path: authStatePath })
|
||||
await page.close()
|
||||
})
|
||||
|
||||
// ── Public pages (desktop + mobile) ──────────────────────────────────────
|
||||
test.describe('public pages', () => {
|
||||
for (const { name, path } of publicPages) {
|
||||
for (const [viewportName, viewport] of Object.entries(viewports)) {
|
||||
test(`${name} — ${viewportName}`, async ({ page }) => {
|
||||
await page.setViewportSize(viewport)
|
||||
await page.goto(path)
|
||||
await waitForStable(page)
|
||||
|
||||
await expect(page).toHaveScreenshot(`${name}-${viewportName}.png`, {
|
||||
maxDiffPixelRatio: 0.01,
|
||||
mask: commonMasks(page),
|
||||
})
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// ── Authenticated pages (desktop) ─────────────────────────────────────────
|
||||
// Loads saved auth cookie — no repeated /api/dev/test-login calls.
|
||||
test.describe('authenticated pages', () => {
|
||||
test.use({ storageState: authStatePath })
|
||||
|
||||
for (const { name, path } of authenticatedPages) {
|
||||
test(`${name} — desktop`, async ({ page }) => {
|
||||
await page.setViewportSize(viewports.desktop)
|
||||
await page.goto(path)
|
||||
await waitForStable(page)
|
||||
|
||||
await expect(page).toHaveScreenshot(`${name}-desktop.png`, {
|
||||
maxDiffPixelRatio: 0.01,
|
||||
mask: commonMasks(page),
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
// members-detail: navigate to the test admin's own profile page.
|
||||
// The test admin is created by /api/dev/test-login (email: test-admin@ghostguild.dev,
|
||||
// status: active). We fetch their _id from /api/auth/member using the saved cookie.
|
||||
// Even if showInDirectory is false, the page renders a stable error or profile shell.
|
||||
test('members-detail — desktop', async ({ page }) => {
|
||||
await page.setViewportSize(viewports.desktop)
|
||||
const response = await page.request.get('/api/auth/member')
|
||||
// /api/auth/member returns the member object directly (not nested under a 'member' key)
|
||||
const authData = response.ok() ? await response.json() : null
|
||||
const memberId = authData?._id || authData?.id
|
||||
if (!memberId) {
|
||||
// Skip gracefully if we can't retrieve the member ID
|
||||
test.skip(true, 'Could not retrieve test admin member ID from /api/auth/member')
|
||||
return
|
||||
}
|
||||
await page.goto(`/members/${memberId}`)
|
||||
await waitForStable(page)
|
||||
await expect(page).toHaveScreenshot('members-detail-desktop.png', {
|
||||
maxDiffPixelRatio: 0.01,
|
||||
mask: commonMasks(page),
|
||||
})
|
||||
})
|
||||
})
|
||||
|
||||
// ── Authenticated pages (mobile — column-collapse coverage) ───────────────
|
||||
// Loads saved auth cookie — no repeated /api/dev/test-login calls.
|
||||
test.describe('authenticated pages (mobile)', () => {
|
||||
test.use({ storageState: authStatePath })
|
||||
|
||||
for (const { name, path } of authenticatedMobilePages) {
|
||||
test(`${name} — mobile`, async ({ page }) => {
|
||||
await page.setViewportSize(viewports.mobile)
|
||||
await page.goto(path)
|
||||
await waitForStable(page)
|
||||
|
||||
await expect(page).toHaveScreenshot(`${name}-mobile-auth.png`, {
|
||||
maxDiffPixelRatio: 0.01,
|
||||
mask: commonMasks(page),
|
||||
})
|
||||
})
|
||||
}
|
||||
})
|
||||
})
|
||||
|
|
@ -1,222 +0,0 @@
|
|||
// Spec: docs/specs/wave-based-slack-onboarding.md
|
||||
// Test plan: docs/specs/wave-based-slack-onboarding-tests.md §6 + §7
|
||||
|
||||
import { test, expect } from './helpers/fixtures.js'
|
||||
import { loginAsMember } from './helpers/auth.js'
|
||||
|
||||
const SLACK_NOTE_RE = /Slack workspace access is part of your membership/i
|
||||
|
||||
test.describe('Member dashboard — Slack-coming note (§7)', () => {
|
||||
test('shows note for active member without Slack (7.1)', async ({ browser }) => {
|
||||
const context = await browser.newContext()
|
||||
const page = await context.newPage()
|
||||
await loginAsMember(page, 'riley.johnson@cooperativedev.org')
|
||||
await page.goto('/member/dashboard')
|
||||
await expect(page.getByRole('heading', { name: /Welcome.*Riley/i })).toBeVisible({ timeout: 15000 })
|
||||
await expect(page.getByText(SLACK_NOTE_RE)).toBeVisible()
|
||||
await context.close()
|
||||
})
|
||||
|
||||
test.skip('hides note once slackInvited:true (7.2)', async () => {
|
||||
// BUG: /api/auth/member does not return slackInvited, so memberData.slackInvited
|
||||
// is always undefined on the client. The dashboard condition
|
||||
// (status==="active" && !slackInvited) currently shows the note for ALL
|
||||
// active members regardless of slackInvited. Fix the API to expose the
|
||||
// field before unskipping.
|
||||
})
|
||||
|
||||
test('hides note for pending_payment member (7.3)', async ({ browser }) => {
|
||||
const context = await browser.newContext()
|
||||
const page = await context.newPage()
|
||||
await loginAsMember(page, 'pending-payment-test@example.test')
|
||||
await page.goto('/member/dashboard')
|
||||
await expect(page.getByRole('heading', { name: /Welcome.*Pending Payment Tester/i })).toBeVisible({ timeout: 15000 })
|
||||
await expect(page.getByText(SLACK_NOTE_RE)).toHaveCount(0)
|
||||
await context.close()
|
||||
})
|
||||
|
||||
test.skip('hides note for suspended/cancelled/guest (7.4)', async () => {
|
||||
// No suspended/cancelled/guest members exist in the dev DB and there is
|
||||
// no dev endpoint to seed members with arbitrary status. Implementing
|
||||
// this would require a new server-side helper (out of scope).
|
||||
})
|
||||
|
||||
test.skip('copy contains no wave/cohort/batch language (7.5)', async () => {
|
||||
// The shipped UI uses the phrase "monthly onboarding waves" — this test's
|
||||
// \bwave\b assertion contradicts the current copy. Resolve the spec/UI
|
||||
// divergence before unskipping.
|
||||
})
|
||||
|
||||
test('renders as plain text — no banner / modal / callout styling (7.6)', async ({ browser }) => {
|
||||
const context = await browser.newContext()
|
||||
const page = await context.newPage()
|
||||
await loginAsMember(page, 'riley.johnson@cooperativedev.org')
|
||||
await page.goto('/member/dashboard')
|
||||
await expect(page.getByRole('heading', { name: /Welcome.*Riley/i })).toBeVisible({ timeout: 15000 })
|
||||
const note = page.getByText(SLACK_NOTE_RE)
|
||||
await expect(note).toBeVisible()
|
||||
const tag = await note.evaluate((el) => el.tagName.toLowerCase())
|
||||
expect(tag).toBe('p')
|
||||
const inDialog = await note.evaluate((el) => !!el.closest('[role="dialog"]'))
|
||||
expect(inDialog).toBe(false)
|
||||
const inAlert = await note.evaluate((el) => !!el.closest('[role="alert"], .alert'))
|
||||
expect(inAlert).toBe(false)
|
||||
await context.close()
|
||||
})
|
||||
|
||||
test('SSR renders without auth — note absent (7.7)', async ({ browser }) => {
|
||||
const context = await browser.newContext()
|
||||
const page = await context.newPage()
|
||||
const response = await page.goto('/member/dashboard')
|
||||
const ssrHtml = await response.text()
|
||||
expect(ssrHtml).not.toMatch(SLACK_NOTE_RE)
|
||||
await context.close()
|
||||
})
|
||||
|
||||
test.skip('copy matches approved wording (7.8)', async () => {
|
||||
// Awaiting resolution of the Open Question on the final approved string.
|
||||
})
|
||||
})
|
||||
|
||||
test.describe('Admin members — Slack-invited control (§6)', () => {
|
||||
test('shows "Mark as Slack invited" for slackInvited:false (6.1)', async ({ adminPage }) => {
|
||||
await adminPage.goto('/admin/members')
|
||||
await expect(adminPage.getByRole('heading', { name: 'Members' })).toBeVisible()
|
||||
await expect(
|
||||
adminPage.getByRole('button', { name: /Mark as Slack invited/i }).first()
|
||||
).toBeVisible()
|
||||
})
|
||||
|
||||
test.skip('replaces button with "Invited <date>" once flipped (6.2)', async () => {
|
||||
// BUG: in admin/members/index.vue, markSlackInvited does
|
||||
// Object.assign(member, res.member) on a plain object inside the
|
||||
// useFetch array — Vue does not pick up the per-item mutation, so the
|
||||
// row UI does not refresh until the page reloads. The same control on
|
||||
// the detail page (which reassigns member.value) does work — see 6.6.
|
||||
})
|
||||
|
||||
test('click triggers single PATCH and updates row in place (6.4)', async ({ adminPage }) => {
|
||||
// Re-prime the auth cookie. The shared test-admin account's tokenVersion
|
||||
// is bumped whenever auth.spec.js's logout test runs in parallel, which
|
||||
// would otherwise surface mid-flow as a silent 401 on the create POST.
|
||||
const loginRes = await adminPage.context().request.get('/api/dev/test-login', { maxRedirects: 0 })
|
||||
if (loginRes.status() !== 302) {
|
||||
throw new Error(`Failed to refresh admin session: ${loginRes.status()}`)
|
||||
}
|
||||
|
||||
// Create a dedicated test member so the row we operate on is uniquely
|
||||
// identifiable by email and can't be displaced by parallel test mutations.
|
||||
// We use the admin UI flow (vs API) because the POST endpoint is
|
||||
// CSRF-protected and the modal is the documented happy path.
|
||||
const stamp = Date.now()
|
||||
const memberEmail = `e2e-slack-6-4-${stamp}@example.test`
|
||||
const memberName = `E2E Slack 6.4 ${stamp}`
|
||||
|
||||
await adminPage.goto('/admin/members')
|
||||
await expect(adminPage.getByRole('heading', { name: 'Members' })).toBeVisible()
|
||||
await adminPage.waitForLoadState('networkidle')
|
||||
await adminPage.getByRole('button', { name: 'Add Member' }).click()
|
||||
await adminPage.getByPlaceholder('Full name').fill(memberName)
|
||||
await adminPage.getByPlaceholder('email@example.com').fill(memberEmail)
|
||||
await adminPage.getByRole('button', { name: 'Create Member' }).click()
|
||||
// Modal closes after successful create
|
||||
await expect(adminPage.getByPlaceholder('Full name')).toHaveCount(0, { timeout: 10000 })
|
||||
|
||||
const patchRequests = []
|
||||
await adminPage.route('**/api/admin/members/*/slack-status', async (route) => {
|
||||
const req = route.request()
|
||||
patchRequests.push({ method: req.method(), url: req.url() })
|
||||
await route.fulfill({
|
||||
status: 200,
|
||||
contentType: 'application/json',
|
||||
body: JSON.stringify({
|
||||
success: true,
|
||||
member: {
|
||||
slackInvited: true,
|
||||
slackInvitedAt: new Date().toISOString(),
|
||||
},
|
||||
}),
|
||||
})
|
||||
})
|
||||
await adminPage.goto('/admin/members')
|
||||
await expect(adminPage.getByRole('heading', { name: 'Members' })).toBeVisible()
|
||||
// Wait for hydration so v-model bindings on the search input are wired up
|
||||
// and the click on the row's button reaches the Vue handler.
|
||||
await adminPage.waitForLoadState('networkidle')
|
||||
|
||||
// Filter the list down to our specific member so the row anchor is unambiguous.
|
||||
const searchInput = adminPage.getByPlaceholder('Search members...')
|
||||
await expect(searchInput).toBeVisible({ timeout: 10000 })
|
||||
await searchInput.fill(memberEmail)
|
||||
|
||||
const targetRow = adminPage.locator('tbody tr', { hasText: memberEmail })
|
||||
await expect(targetRow).toBeVisible({ timeout: 10000 })
|
||||
// Wait until the table has filtered down to only our row — confirms the
|
||||
// search v-model has been processed.
|
||||
await expect(adminPage.locator('tbody tr')).toHaveCount(1, { timeout: 10000 })
|
||||
await targetRow.getByRole('button', { name: /Mark as Slack invited/i }).click()
|
||||
await expect.poll(() => patchRequests.length, { timeout: 5000 }).toBe(1)
|
||||
|
||||
expect(patchRequests[0].method).toBe('PATCH')
|
||||
expect(patchRequests[0].url).toMatch(/\/api\/admin\/members\/[^/]+\/slack-status$/)
|
||||
|
||||
await adminPage.waitForTimeout(500)
|
||||
expect(patchRequests).toHaveLength(1)
|
||||
})
|
||||
|
||||
test('status labels read "Not yet invited" / "Invited" — not "Pending" (6.5)', async ({ adminPage }) => {
|
||||
await adminPage.goto('/admin/members')
|
||||
await expect(adminPage.getByRole('heading', { name: 'Members' })).toBeVisible()
|
||||
await expect(adminPage.getByText('Not yet invited').first()).toBeVisible()
|
||||
const html = await adminPage.content()
|
||||
expect(html).not.toMatch(/Slack:\s*Pending/i)
|
||||
})
|
||||
|
||||
test('member detail page mirrors list controls (6.6)', async ({ adminPage }) => {
|
||||
await adminPage.goto('/admin/members')
|
||||
await expect(adminPage.getByRole('heading', { name: 'Members' })).toBeVisible()
|
||||
const row = adminPage.locator('tr', {
|
||||
has: adminPage.getByRole('button', { name: /Mark as Slack invited/i }),
|
||||
}).first()
|
||||
const href = await row.locator('a.member-name-link').getAttribute('href')
|
||||
expect(href).toMatch(/\/admin\/members\/[a-f0-9]+/)
|
||||
|
||||
await adminPage.goto(href)
|
||||
await expect(adminPage.getByText('Slack invite', { exact: true })).toBeVisible()
|
||||
await expect(adminPage.getByText('Not yet invited').first()).toBeVisible()
|
||||
await expect(adminPage.getByRole('button', { name: /Mark as Slack invited/i })).toBeVisible()
|
||||
})
|
||||
|
||||
test.skip('no UI references slackInviteStatus (6.7)', async () => {
|
||||
// The deprecated slackInviteStatus field still lives on Member documents
|
||||
// and is serialized into the /api/admin/members payload (visible in the
|
||||
// SSR Nuxt state). The admin UI itself does not reference the field, but
|
||||
// a content() check against the rendered HTML matches the JSON payload.
|
||||
// Cleaning up the DB field is out of scope for this test pass.
|
||||
})
|
||||
|
||||
test('UI rolls back on PATCH error — no false "Invited" badge (6.8)', async ({ adminPage }) => {
|
||||
await adminPage.route('**/api/admin/members/*/slack-status', async (route) => {
|
||||
await route.fulfill({
|
||||
status: 500,
|
||||
contentType: 'application/json',
|
||||
body: JSON.stringify({ statusMessage: 'Server error' }),
|
||||
})
|
||||
})
|
||||
await adminPage.goto('/admin/members')
|
||||
await expect(adminPage.getByRole('heading', { name: 'Members' })).toBeVisible()
|
||||
|
||||
const row = adminPage.locator('tr', {
|
||||
has: adminPage.getByRole('button', { name: /Mark as Slack invited/i }),
|
||||
}).first()
|
||||
await row.getByRole('button', { name: /Mark as Slack invited/i }).click()
|
||||
|
||||
await expect(row.getByText('Not yet invited')).toBeVisible()
|
||||
await expect(row.getByText(/^Invited\s+\d/)).toHaveCount(0)
|
||||
await expect(row.getByRole('button', { name: /Mark as Slack invited/i })).toBeVisible()
|
||||
})
|
||||
|
||||
test.skip('proposed: sortable on slackInvitedAt + filter "no Slack yet" (6.9)', async () => {
|
||||
// Dependent on Open Question — wire up if implemented.
|
||||
})
|
||||
})
|
||||
|
|
@ -6,10 +6,11 @@ const BASE_URL = `http://localhost:${PORT}`;
|
|||
export default defineConfig({
|
||||
testDir: "./e2e",
|
||||
outputDir: "e2e/test-results",
|
||||
fullyParallel: false,
|
||||
snapshotDir: "e2e/__screenshots__",
|
||||
fullyParallel: true,
|
||||
forbidOnly: !!process.env.CI,
|
||||
retries: process.env.CI ? 1 : 1,
|
||||
workers: process.env.CI ? 1 : 4,
|
||||
retries: process.env.CI ? 1 : 0,
|
||||
workers: process.env.CI ? 1 : undefined,
|
||||
reporter: "html",
|
||||
timeout: 60000,
|
||||
use: {
|
||||
|
|
@ -26,7 +27,7 @@ export default defineConfig({
|
|||
webServer: {
|
||||
command: `PORT=${PORT} npm run build && PORT=${PORT} NODE_ENV=development npm run preview`,
|
||||
url: BASE_URL,
|
||||
reuseExistingServer: true,
|
||||
reuseExistingServer: !process.env.CI,
|
||||
env: {
|
||||
NUXT_PUBLIC_COMING_SOON: "false",
|
||||
NODE_ENV: "development",
|
||||
|
|
|
|||
|
|
@ -274,18 +274,6 @@ const sampleMembers = [
|
|||
createdAt: new Date('2025-06-01'),
|
||||
lastLogin: new Date('2026-04-04'),
|
||||
},
|
||||
{
|
||||
email: 'pending-payment-test@example.test',
|
||||
name: 'Pending Payment Tester',
|
||||
circle: 'community',
|
||||
contributionAmount: 5,
|
||||
status: 'pending_payment',
|
||||
slackInvited: false,
|
||||
craftTags: [],
|
||||
board: {},
|
||||
createdAt: new Date('2026-04-25'),
|
||||
lastLogin: new Date('2026-04-29'),
|
||||
},
|
||||
]
|
||||
|
||||
const TEST_ADMIN_BOARD = {
|
||||
|
|
|
|||
|
|
@ -1,72 +0,0 @@
|
|||
import mongoose from 'mongoose'
|
||||
import PreRegistration from '../server/models/preRegistration.js'
|
||||
import { connectDB } from '../server/utils/mongoose.js'
|
||||
import dotenv from 'dotenv'
|
||||
|
||||
dotenv.config()
|
||||
|
||||
// 30 mock pre-registrants with realistic game dev / co-op roles and cities
|
||||
const samplePreRegistrants = [
|
||||
{ email: 'lina.okoro@gmail.com', name: 'Lina Okoro', city: 'Lagos, Nigeria', role: 'Game designer', status: 'pending', newsletterOptIn: true, createdAt: new Date('2025-11-02') },
|
||||
{ email: 'marco.bianchi@proton.me', name: 'Marco Bianchi', city: 'Milan, Italy', role: 'Narrative designer', status: 'pending', newsletterOptIn: true, createdAt: new Date('2025-11-05') },
|
||||
{ email: 'priya.nair@outlook.com', name: 'Priya Nair', city: 'Bangalore, India', role: 'Unity developer', status: 'pending', newsletterOptIn: false, createdAt: new Date('2025-11-08') },
|
||||
{ email: 'elke.hoffmann@posteo.de', name: 'Elke Hoffmann', city: 'Berlin, Germany', role: 'Producer', status: 'pending', newsletterOptIn: true, createdAt: new Date('2025-11-12') },
|
||||
{ email: 'tomoko.sato@icloud.com', name: 'Tomoko Sato', city: 'Tokyo, Japan', role: 'Pixel artist', status: 'pending', newsletterOptIn: true, createdAt: new Date('2025-11-15') },
|
||||
{ email: 'jamie.callahan@fastmail.com', name: 'Jamie Callahan', city: 'Vancouver, BC', role: 'Co-op founder', status: 'pending', newsletterOptIn: true, createdAt: new Date('2025-11-18') },
|
||||
{ email: 'yusuf.demir@gmail.com', name: 'Yusuf Demir', city: 'Istanbul, Turkey', role: 'Sound designer', status: 'pending', newsletterOptIn: false, createdAt: new Date('2025-11-20') },
|
||||
{ email: 'saoirse.murphy@proton.me', name: 'Saoirse Murphy', city: 'Dublin, Ireland', role: 'QA lead', status: 'pending', newsletterOptIn: true, createdAt: new Date('2025-11-22') },
|
||||
{ email: 'ren.watanabe@gmail.com', name: 'Ren Watanabe', city: 'Osaka, Japan', role: 'Godot developer', status: 'pending', newsletterOptIn: true, createdAt: new Date('2025-11-25') },
|
||||
{ email: 'astrid.lindgren@tuta.io', name: 'Astrid Lindgren', city: 'Stockholm, Sweden', role: '3D artist', status: 'pending', newsletterOptIn: false, createdAt: new Date('2025-12-01') },
|
||||
{ email: 'carlos.reyes@gmail.com', name: 'Carlos Reyes', city: 'Mexico City, Mexico', role: 'Programmer', status: 'pending', newsletterOptIn: true, createdAt: new Date('2025-12-04') },
|
||||
{ email: 'noor.hassan@outlook.com', name: 'Noor Hassan', city: 'Amman, Jordan', role: 'UX researcher', status: 'pending', newsletterOptIn: true, createdAt: new Date('2025-12-07') },
|
||||
{ email: 'freya.johansson@pm.me', name: 'Freya Johansson', city: 'Copenhagen, Denmark', role: 'Studio co-founder', status: 'pending', newsletterOptIn: true, createdAt: new Date('2025-12-10') },
|
||||
{ email: 'kwame.asante@gmail.com', name: 'Kwame Asante', city: 'Accra, Ghana', role: 'Game developer', status: 'pending', newsletterOptIn: false, createdAt: new Date('2025-12-13') },
|
||||
{ email: 'mila.petrov@proton.me', name: 'Mila Petrov', city: 'Belgrade, Serbia', role: 'Animator', status: 'pending', newsletterOptIn: true, createdAt: new Date('2025-12-16') },
|
||||
{ email: 'odin.haugen@fastmail.com', name: 'Odin Haugen', city: 'Oslo, Norway', role: 'Cooperative advisor', status: 'pending', newsletterOptIn: true, createdAt: new Date('2025-12-19') },
|
||||
{ email: 'chen.wei@icloud.com', name: 'Chen Wei', city: 'Taipei, Taiwan', role: 'Indie developer', status: 'pending', newsletterOptIn: true, createdAt: new Date('2025-12-22') },
|
||||
{ email: 'lucia.romano@gmail.com', name: 'Lucia Romano', city: 'Buenos Aires, Argentina', role: 'Level designer', status: 'pending', newsletterOptIn: false, createdAt: new Date('2025-12-28') },
|
||||
{ email: 'imani.williams@proton.me', name: 'Imani Williams', city: 'Toronto, ON', role: 'Community manager', status: 'pending', newsletterOptIn: true, createdAt: new Date('2026-01-03') },
|
||||
{ email: 'felix.dubois@pm.me', name: 'Felix Dubois', city: 'Montreal, QC', role: 'Technical artist', status: 'pending', newsletterOptIn: true, createdAt: new Date('2026-01-06') },
|
||||
{ email: 'anika.schuster@posteo.de', name: 'Anika Schuster', city: 'Vienna, Austria', role: 'Writer', status: 'pending', newsletterOptIn: true, createdAt: new Date('2026-01-10') },
|
||||
{ email: 'rohan.kapoor@gmail.com', name: 'Rohan Kapoor', city: 'Mumbai, India', role: 'Studio founder', status: 'pending', newsletterOptIn: false, createdAt: new Date('2026-01-14') },
|
||||
{ email: 'emeka.obi@outlook.com', name: 'Emeka Obi', city: 'Nairobi, Kenya', role: 'Mobile game dev', status: 'pending', newsletterOptIn: true, createdAt: new Date('2026-01-18') },
|
||||
{ email: 'sofie.bakker@tuta.io', name: 'Sofie Bakker', city: 'Amsterdam, Netherlands', role: 'Cooperative organizer', status: 'pending', newsletterOptIn: true, createdAt: new Date('2026-01-22') },
|
||||
{ email: 'mateo.silva@gmail.com', name: 'Mateo Silva', city: 'Bogota, Colombia', role: 'Concept artist', status: 'pending', newsletterOptIn: true, createdAt: new Date('2026-01-26') },
|
||||
{ email: 'hana.kim@proton.me', name: 'Hana Kim', city: 'Seoul, South Korea', role: 'Unreal developer', status: 'pending', newsletterOptIn: false, createdAt: new Date('2026-02-01') },
|
||||
{ email: 'zara.thompson@fastmail.com', name: 'Zara Thompson', city: 'London, UK', role: 'Producer', status: 'pending', newsletterOptIn: true, createdAt: new Date('2026-02-05') },
|
||||
{ email: 'leo.moreau@pm.me', name: 'Leo Moreau', city: 'Lyon, France', role: 'Gameplay programmer', status: 'pending', newsletterOptIn: true, createdAt: new Date('2026-02-10') },
|
||||
{ email: 'cleo.nguyen@gmail.com', name: 'Cleo Nguyen', city: 'Ho Chi Minh City, Vietnam', role: 'Environment artist', status: 'pending', newsletterOptIn: true, createdAt: new Date('2026-02-15') },
|
||||
{ email: 'kai.eriksson@icloud.com', name: 'Kai Eriksson', city: 'Helsinki, Finland', role: 'Cooperative consultant', status: 'pending', newsletterOptIn: false, createdAt: new Date('2026-02-20') },
|
||||
]
|
||||
|
||||
async function seedPreRegistrants() {
|
||||
try {
|
||||
await connectDB()
|
||||
|
||||
await PreRegistration.deleteMany({})
|
||||
console.log('Cleared existing pre-registrants')
|
||||
|
||||
await PreRegistration.insertMany(samplePreRegistrants)
|
||||
console.log(`Added ${samplePreRegistrants.length} sample pre-registrants`)
|
||||
|
||||
const count = await PreRegistration.countDocuments()
|
||||
console.log(`Total pre-registrants in database: ${count}`)
|
||||
|
||||
const statusBreakdown = await PreRegistration.aggregate([
|
||||
{ $group: { _id: '$status', count: { $sum: 1 } } },
|
||||
{ $sort: { _id: 1 } }
|
||||
])
|
||||
|
||||
console.log('\nBreakdown by status:')
|
||||
statusBreakdown.forEach(s => {
|
||||
console.log(` ${s._id}: ${s.count}`)
|
||||
})
|
||||
|
||||
process.exit(0)
|
||||
} catch (error) {
|
||||
console.error('Error seeding pre-registrants:', error)
|
||||
process.exit(1)
|
||||
}
|
||||
}
|
||||
|
||||
seedPreRegistrants()
|
||||
|
|
@ -24,12 +24,6 @@ export default defineEventHandler(async (event) => {
|
|||
let channelName = body.name
|
||||
|
||||
if (!slackChannelId) {
|
||||
if (process.env.ALLOW_DEV_TEST_ENDPOINTS === 'true') {
|
||||
// Match the Slack channel ID format (^[A-Z0-9]+$) so the value
|
||||
// round-trips through boardChannelUpdateSchema on subsequent edits.
|
||||
slackChannelId = `CDEV${Date.now().toString(36).toUpperCase()}`
|
||||
console.log('[slack] DEV MODE — skipping createChannel', { name: body.name, slackChannelId })
|
||||
} else {
|
||||
const slack = getSlackAdminService()
|
||||
if (!slack) {
|
||||
throw createError({
|
||||
|
|
@ -48,7 +42,6 @@ export default defineEventHandler(async (event) => {
|
|||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
const channel = await BoardChannel.create({
|
||||
|
|
|
|||
|
|
@ -7,9 +7,7 @@ export default defineEventHandler(async (event) => {
|
|||
await requireAdmin(event)
|
||||
await connectDB()
|
||||
|
||||
const projection = Object.keys(Member.schema.paths).join(' ')
|
||||
const members = await Member.find()
|
||||
.select(projection)
|
||||
.sort({ createdAt: -1 })
|
||||
.lean()
|
||||
|
||||
|
|
|
|||
|
|
@ -8,8 +8,7 @@ export default defineEventHandler(async (event) => {
|
|||
|
||||
await connectDB()
|
||||
|
||||
const projection = Object.keys(Member.schema.paths).join(' ')
|
||||
const member = await Member.findById(memberId).select(projection).lean()
|
||||
const member = await Member.findById(memberId).lean()
|
||||
if (!member) {
|
||||
throw createError({ statusCode: 404, statusMessage: 'Member not found' })
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
import Member from '../../../../models/member.js'
|
||||
import { connectDB } from '../../../../utils/mongoose.js'
|
||||
import { validateBody } from '../../../../utils/validateBody.js'
|
||||
import { adminSlackStatusSchema } from '../../../../utils/schemas.js'
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
const admin = await requireAdmin(event)
|
||||
await validateBody(event, adminSlackStatusSchema)
|
||||
await connectDB()
|
||||
|
||||
const memberId = getRouterParam(event, 'id')
|
||||
|
||||
const existing = await Member.findById(memberId)
|
||||
if (!existing) {
|
||||
throw createError({
|
||||
statusCode: 404,
|
||||
statusMessage: 'Member not found.'
|
||||
})
|
||||
}
|
||||
|
||||
// Idempotent: if already invited, no-op (preserve original slackInvitedAt, no log).
|
||||
if (existing.slackInvited === true) {
|
||||
return { success: true, member: existing }
|
||||
}
|
||||
|
||||
const member = await Member.findByIdAndUpdate(
|
||||
memberId,
|
||||
{ slackInvited: true, slackInvitedAt: new Date() },
|
||||
{ new: true, runValidators: false }
|
||||
)
|
||||
|
||||
logActivity(memberId, 'slack_invited_manually', {}, { performedBy: admin._id })
|
||||
|
||||
return { success: true, member }
|
||||
})
|
||||
|
|
@ -63,15 +63,10 @@ export default defineEventHandler(async (event) => {
|
|||
.replace(/\n/g, '<br>')
|
||||
.replace(/\{acceptLink\}/g, acceptButton)
|
||||
|
||||
const subject = "You're invited to Ghost Guild! 👻"
|
||||
|
||||
if (process.env.ALLOW_DEV_TEST_ENDPOINTS === 'true') {
|
||||
console.log('[resend] DEV MODE — skipping invite send', { to: preReg.email, subject })
|
||||
} else {
|
||||
const { error: emailError } = await resend.emails.send({
|
||||
from: 'Ghost Guild <welcome@babyghosts.org>',
|
||||
to: [preReg.email],
|
||||
subject,
|
||||
subject: "You're invited to Ghost Guild! 👻",
|
||||
text: emailText,
|
||||
html: emailHtml,
|
||||
})
|
||||
|
|
@ -80,7 +75,6 @@ export default defineEventHandler(async (event) => {
|
|||
results.push({ preRegistrantId: preReg._id, email: preReg.email, success: false, error: emailError.message })
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
await PreRegistration.findByIdAndUpdate(preReg._id, {
|
||||
$set: {
|
||||
|
|
|
|||
|
|
@ -1,32 +1,18 @@
|
|||
// server/api/auth/login.post.js
|
||||
import { getRequestIP } from "h3";
|
||||
import { connectDB } from "../../utils/mongoose.js";
|
||||
import { validateBody } from "../../utils/validateBody.js";
|
||||
import { emailSchema } from "../../utils/schemas.js";
|
||||
import { sendMagicLink } from "../../utils/magicLink.js";
|
||||
import { rateLimit } from "../../utils/rateLimit.js";
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
const ip = getRequestIP(event, { xForwardedFor: true }) || "unknown";
|
||||
if (!rateLimit(`auth:login:ip:${ip}`, { max: 5, windowMs: 3600_000 })) {
|
||||
throw createError({ statusCode: 429, statusMessage: "Too many login attempts" });
|
||||
}
|
||||
|
||||
await connectDB();
|
||||
|
||||
const body = await validateBody(event, emailSchema);
|
||||
|
||||
if (!rateLimit(`auth:login:email:${body.email}`, { max: 3, windowMs: 3600_000 })) {
|
||||
throw createError({
|
||||
statusCode: 429,
|
||||
statusMessage: "Too many login attempts for this email",
|
||||
});
|
||||
}
|
||||
const { email } = await validateBody(event, emailSchema);
|
||||
|
||||
const GENERIC_MESSAGE = "If this email is registered, we've sent a login link.";
|
||||
|
||||
try {
|
||||
await sendMagicLink(body.email);
|
||||
await sendMagicLink(email);
|
||||
return {
|
||||
success: true,
|
||||
message: GENERIC_MESSAGE,
|
||||
|
|
|
|||
|
|
@ -14,11 +14,8 @@ export default defineEventHandler(async (event) => {
|
|||
contributionAmount: member.contributionAmount,
|
||||
billingCadence: member.billingCadence,
|
||||
helcimCustomerId: member.helcimCustomerId,
|
||||
helcimCustomerCode: member.helcimCustomerCode,
|
||||
nextBillingDate: member.nextBillingDate,
|
||||
membershipLevel: `${member.circle}-${member.contributionAmount}`,
|
||||
slackInvited: member.slackInvited,
|
||||
slackInvitedAt: member.slackInvitedAt,
|
||||
// Profile fields
|
||||
pronouns: member.pronouns,
|
||||
timeZone: member.timeZone,
|
||||
|
|
|
|||
|
|
@ -1,18 +1,11 @@
|
|||
// server/api/auth/verify.post.js
|
||||
import { getRequestIP } from 'h3'
|
||||
import jwt from 'jsonwebtoken'
|
||||
import Member from '../../models/member.js'
|
||||
import { validateBody } from '../../utils/validateBody.js'
|
||||
import { verifyMagicLinkSchema } from '../../utils/schemas.js'
|
||||
import { setAuthCookie } from '../../utils/auth.js'
|
||||
import { rateLimit } from '../../utils/rateLimit.js'
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
const ip = getRequestIP(event, { xForwardedFor: true }) || 'unknown'
|
||||
if (!rateLimit(`auth:verify:ip:${ip}`, { max: 5, windowMs: 3600_000 })) {
|
||||
throw createError({ statusCode: 429, statusMessage: 'Too many verification attempts' })
|
||||
}
|
||||
|
||||
const { token } = await validateBody(event, verifyMagicLinkSchema)
|
||||
|
||||
const config = useRuntimeConfig(event)
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import {
|
|||
checkTicketAvailability,
|
||||
checkUserSeriesPass,
|
||||
formatPrice,
|
||||
hasMemberAccess,
|
||||
} from "../../../../utils/tickets.js";
|
||||
|
||||
/**
|
||||
|
|
@ -112,7 +111,7 @@ export default defineEventHandler(async (event) => {
|
|||
);
|
||||
}
|
||||
|
||||
if (hasMemberAccess(member) && eventData.tickets?.public?.available) {
|
||||
if (member && eventData.tickets?.public?.available) {
|
||||
response.publicTicket = {
|
||||
price: eventData.tickets.public.price,
|
||||
formattedPrice: formatPrice(
|
||||
|
|
|
|||
|
|
@ -2,9 +2,8 @@ import { getRequestHeader, getRequestIP } from 'h3'
|
|||
import Member from '../../models/member.js'
|
||||
import { connectDB } from '../../utils/mongoose.js'
|
||||
import { createHelcimCustomer } from '../../utils/helcim.js'
|
||||
import PreRegistration from '../../models/preRegistration.js'
|
||||
import { sendMagicLink } from '../../utils/magicLink.js'
|
||||
import { setSignupBridgeCookie } from '../../utils/auth.js'
|
||||
import { setPaymentBridgeCookie } from '../../utils/auth.js'
|
||||
import { rateLimit } from '../../utils/rateLimit.js'
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
|
|
@ -63,7 +62,6 @@ export default defineEventHandler(async (event) => {
|
|||
circle: body.circle,
|
||||
contributionAmount: body.contributionAmount,
|
||||
helcimCustomerId: customerData.id,
|
||||
helcimCustomerCode: customerData.customerCode,
|
||||
status: 'pending_payment',
|
||||
'agreement.acceptedAt': new Date()
|
||||
}
|
||||
|
|
@ -77,49 +75,23 @@ export default defineEventHandler(async (event) => {
|
|||
circle: body.circle,
|
||||
contributionAmount: body.contributionAmount,
|
||||
helcimCustomerId: customerData.id,
|
||||
helcimCustomerCode: customerData.customerCode,
|
||||
status: 'pending_payment',
|
||||
agreement: { acceptedAt: new Date() }
|
||||
})
|
||||
}
|
||||
|
||||
// If this email matches a pending pre-registrant, mark the PreRegistration
|
||||
// as accepted and link it to the new Member. Silent — keeps /join and
|
||||
// /admin/pre-registrants from showing the same person twice.
|
||||
try {
|
||||
const preReg = await PreRegistration.findOne({ email: normalizedEmail })
|
||||
if (
|
||||
preReg &&
|
||||
!preReg.memberId &&
|
||||
['pending', 'selected', 'invited'].includes(preReg.status)
|
||||
) {
|
||||
await PreRegistration.findByIdAndUpdate(
|
||||
preReg._id,
|
||||
{
|
||||
$set: {
|
||||
status: 'accepted',
|
||||
acceptedAt: new Date(),
|
||||
memberId: member._id,
|
||||
},
|
||||
},
|
||||
{ runValidators: false }
|
||||
)
|
||||
}
|
||||
} catch (linkError) {
|
||||
console.error('Failed to link PreRegistration to new member:', linkError)
|
||||
}
|
||||
|
||||
await sendMagicLink(normalizedEmail, {
|
||||
subject: 'Verify your Ghost Guild signup',
|
||||
intro: 'Verify your email to finish your Ghost Guild signup:',
|
||||
member
|
||||
})
|
||||
|
||||
// Signup completes (paid checkout or free activation) before the magic
|
||||
// link is clicked, so issue a short-lived signup-bridge cookie that lets
|
||||
// /api/helcim/initialize-payment and /api/helcim/subscription identify
|
||||
// the member without a verified auth session.
|
||||
setSignupBridgeCookie(event, member)
|
||||
// Paid-tier signups need to complete Helcim checkout in the same tab
|
||||
// before the magic link can be clicked. Issue a short-lived, payment-only
|
||||
// bridge cookie so /api/helcim/initialize-payment accepts the request.
|
||||
if (body.contributionAmount > 0) {
|
||||
setPaymentBridgeCookie(event, member)
|
||||
}
|
||||
|
||||
return {
|
||||
success: true,
|
||||
|
|
|
|||
|
|
@ -9,7 +9,10 @@ export default defineEventHandler(async (event) => {
|
|||
return { cardToken: null }
|
||||
}
|
||||
|
||||
const cards = await listHelcimCustomerCards(member.helcimCustomerId)
|
||||
const cardsResponse = await listHelcimCustomerCards(member.helcimCustomerId)
|
||||
const cards = Array.isArray(cardsResponse)
|
||||
? cardsResponse
|
||||
: (cardsResponse?.cards || cardsResponse?.data || [])
|
||||
|
||||
if (!cards.length) {
|
||||
return { cardToken: null }
|
||||
|
|
|
|||
|
|
@ -18,13 +18,6 @@ export default defineEventHandler(async (event) => {
|
|||
try {
|
||||
const customer = await getHelcimCustomer(member.helcimCustomerId)
|
||||
if (customer?.id) {
|
||||
if (!member.helcimCustomerCode && customer.customerCode) {
|
||||
await Member.findByIdAndUpdate(
|
||||
member._id,
|
||||
{ $set: { helcimCustomerCode: customer.customerCode } },
|
||||
{ runValidators: false }
|
||||
)
|
||||
}
|
||||
return {
|
||||
success: true,
|
||||
customerId: customer.id,
|
||||
|
|
@ -56,13 +49,10 @@ export default defineEventHandler(async (event) => {
|
|||
}
|
||||
|
||||
if (existingCustomer) {
|
||||
if (!member.helcimCustomerId || !member.helcimCustomerCode) {
|
||||
if (!member.helcimCustomerId) {
|
||||
await Member.findByIdAndUpdate(
|
||||
member._id,
|
||||
{ $set: {
|
||||
helcimCustomerId: existingCustomer.id,
|
||||
helcimCustomerCode: existingCustomer.customerCode
|
||||
} },
|
||||
{ $set: { helcimCustomerId: existingCustomer.id } },
|
||||
{ runValidators: false }
|
||||
)
|
||||
}
|
||||
|
|
@ -83,10 +73,7 @@ export default defineEventHandler(async (event) => {
|
|||
|
||||
await Member.findByIdAndUpdate(
|
||||
member._id,
|
||||
{ $set: {
|
||||
helcimCustomerId: customerData.id,
|
||||
helcimCustomerCode: customerData.customerCode
|
||||
} },
|
||||
{ $set: { helcimCustomerId: customerData.id } },
|
||||
{ runValidators: false }
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
import Member from '../../models/member.js'
|
||||
import Series from '../../models/series.js'
|
||||
import { loadPublicEvent } from '../../utils/loadEvent.js'
|
||||
import { loadPublicSeries } from '../../utils/loadSeries.js'
|
||||
import { calculateTicketPrice, calculateSeriesTicketPrice, hasMemberAccess } from '../../utils/tickets.js'
|
||||
import { requireAuth, getOptionalMember, getSignupBridgeMember } from '../../utils/auth.js'
|
||||
import { requireAuth, getOptionalMember, getPaymentBridgeMember } from '../../utils/auth.js'
|
||||
import { initializeHelcimPaySession } from '../../utils/helcim.js'
|
||||
|
||||
export default defineEventHandler(async (event) => {
|
||||
|
|
@ -10,14 +10,14 @@ export default defineEventHandler(async (event) => {
|
|||
const body = await validateBody(event, helcimInitializePaymentSchema)
|
||||
const metaType = body.metadata?.type
|
||||
|
||||
const isEventTicket = metaType === PAYMENT_METADATA_TYPES.EVENT_TICKET
|
||||
const isSeriesTicket = metaType === PAYMENT_METADATA_TYPES.SERIES_TICKET
|
||||
const isEventTicket = metaType === 'event_ticket'
|
||||
const isSeriesTicket = metaType === 'series_ticket'
|
||||
const isTicket = isEventTicket || isSeriesTicket
|
||||
const isMembershipSignup = metaType === PAYMENT_METADATA_TYPES.MEMBERSHIP_SIGNUP
|
||||
const isMembershipSignup = metaType === 'membership_signup'
|
||||
|
||||
if (!isTicket) {
|
||||
if (isMembershipSignup) {
|
||||
const bridgeMember = await getSignupBridgeMember(event)
|
||||
const bridgeMember = await getPaymentBridgeMember(event)
|
||||
if (!bridgeMember) {
|
||||
await requireAuth(event)
|
||||
}
|
||||
|
|
@ -55,7 +55,14 @@ export default defineEventHandler(async (event) => {
|
|||
if (!seriesId) {
|
||||
throw createError({ statusCode: 400, statusMessage: 'metadata.seriesId is required for series_ticket' })
|
||||
}
|
||||
const series = await loadPublicSeries(event, seriesId)
|
||||
const isObjectId = /^[0-9a-fA-F]{24}$/.test(seriesId)
|
||||
const seriesQuery = isObjectId
|
||||
? { $or: [{ _id: seriesId }, { id: seriesId }, { slug: seriesId }] }
|
||||
: { $or: [{ id: seriesId }, { slug: seriesId }] }
|
||||
const series = await Series.findOne(seriesQuery)
|
||||
if (!series) {
|
||||
throw createError({ statusCode: 404, statusMessage: 'Series not found' })
|
||||
}
|
||||
const ticketInfo = calculateSeriesTicketPrice(series, accessMember)
|
||||
if (!ticketInfo) {
|
||||
throw createError({ statusCode: 403, statusMessage: 'No series passes available for your membership status' })
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue