+
Ā© {{ currentYear }} Ghost Guild
Enter your email to receive a login link
{{ @@ -76,15 +76,15 @@ { const themes = { - blue: "bg-gradient-to-br from-blue-50 to-indigo-100 dark:from-gray-900 dark:to-gray-800", - purple: - "bg-gradient-to-br from-purple-50 to-violet-100 dark:from-gray-900 dark:to-purple-900/20", - emerald: - "bg-gradient-to-br from-emerald-50 to-teal-100 dark:from-gray-900 dark:to-emerald-900/20", - gray: "bg-gray-50 dark:bg-gray-900", + blue: "bg-gradient-to-br from-blue-50 to-indigo-100", + purple: "bg-gradient-to-br from-purple-50 to-violet-100", + emerald: "bg-gradient-to-br from-emerald-50 to-teal-100", + gray: "bg-neutral-100", ethereal: "bg-gradient-to-br from-ghost-900 via-ghost-800 to-whisper-900 halftone-texture", }; diff --git a/app/components/PrivacyToggle.vue b/app/components/PrivacyToggle.vue index 8b0ca9a..968fefb 100644 --- a/app/components/PrivacyToggle.vue +++ b/app/components/PrivacyToggle.vue @@ -1,25 +1,22 @@ - - {{ label }}: - + + {{ label }}: + - Public - - Members Private @@ -31,17 +28,43 @@ const props = defineProps({ modelValue: { type: String, - default: 'members' + default: "members", }, label: { type: String, - default: 'Privacy' - } -}) + default: "Privacy", + }, +}); -const emit = defineEmits(['update:modelValue']) +const emit = defineEmits(["update:modelValue"]); const updateValue = (value) => { - emit('update:modelValue', value) -} + emit("update:modelValue", value); +}; + + diff --git a/app/components/UpdateCard.vue b/app/components/UpdateCard.vue index af76bc1..12b029f 100644 --- a/app/components/UpdateCard.vue +++ b/app/components/UpdateCard.vue @@ -12,7 +12,7 @@ /> {{ update.author?.name?.charAt(0)?.toUpperCase() || "?" }} @@ -23,30 +23,30 @@ - + {{ update.author.name }} Unknown Member - + {{ formatDate(update.createdAt) }} - (edited) + (edited) Private Public @@ -73,12 +73,12 @@ - + {{ update.content.substring(0, 300) }}... Read more @@ -100,14 +100,14 @@ - + View full update - + Comments (coming soon) diff --git a/app/components/UpdateForm.vue b/app/components/UpdateForm.vue index 286e77b..4b813e4 100644 --- a/app/components/UpdateForm.vue +++ b/app/components/UpdateForm.vue @@ -11,19 +11,19 @@ - - Privacy Settings + + Privacy Settings - Public - + Public + Visible to everyone, including non-members @@ -34,11 +34,11 @@ v-model="formData.privacy" type="radio" value="members" - class="w-4 h-4 text-stone-400" + class="w-4 h-4 text-ghost-400" /> - Members Only - + Members Only + Only visible to Ghost Guild members @@ -49,11 +49,11 @@ v-model="formData.privacy" type="radio" value="private" - class="w-4 h-4 text-stone-400" + class="w-4 h-4 text-ghost-400" /> - Private - Only visible to you + Private + Only visible to you @@ -66,15 +66,17 @@ - Enable Comments - + Enable Comments + Allow members to comment on this update - + Cancel diff --git a/app/composables/useAuth.js b/app/composables/useAuth.js index 9e37046..b4c23b5 100644 --- a/app/composables/useAuth.js +++ b/app/composables/useAuth.js @@ -1,46 +1,54 @@ export const useAuth = () => { - const memberData = useState('auth.member', () => null) - - const isAuthenticated = computed(() => !!memberData.value) - - const isMember = computed(() => !!memberData.value) + const memberData = useState("auth.member", () => null); + + const isAuthenticated = computed(() => !!memberData.value); + + const isMember = computed(() => !!memberData.value); const checkMemberStatus = async () => { - console.log('š checkMemberStatus called') - console.log(' - Current memberData:', !!memberData.value) - + console.log("š checkMemberStatus called"); + console.log(" - Current memberData:", !!memberData.value); + try { - console.log(' - Making API call to /api/auth/member...') - const response = await $fetch('/api/auth/member') - console.log(' - API response received:', { email: response.email, id: response.id }) - memberData.value = response - console.log(' - ā Member authenticated successfully') - return true + console.log(" - Making API call to /api/auth/member..."); + const response = await $fetch("/api/auth/member"); + console.log(" - API response received:", { + email: response.email, + id: response.id, + }); + memberData.value = response; + console.log(" - ā Member authenticated successfully"); + return true; } catch (error) { - console.error(' - ā Failed to fetch member status:', error.statusCode, error.statusMessage) - memberData.value = null - console.log(' - Cleared memberData') - return false + console.error( + " - ā Failed to fetch member status:", + error.statusCode, + error.statusMessage, + ); + memberData.value = null; + console.log(" - Cleared memberData"); + return false; } - } + }; const logout = async () => { try { - await $fetch('/api/auth/logout', { - method: 'POST' - }) - memberData.value = null - await navigateTo('/') + await $fetch("/api/auth/logout", { + method: "POST", + }); + memberData.value = null; + await navigateTo("/"); } catch (error) { - console.error('Logout failed:', error) + console.error("Logout failed:", error); } - } + }; return { isAuthenticated: readonly(isAuthenticated), isMember: readonly(isMember), memberData: readonly(memberData), checkMemberStatus, - logout - } -} \ No newline at end of file + fetchMember: checkMemberStatus, // Alias for consistency + logout, + }; +}; diff --git a/app/composables/usePeerSupport.js b/app/composables/usePeerSupport.js new file mode 100644 index 0000000..125d75c --- /dev/null +++ b/app/composables/usePeerSupport.js @@ -0,0 +1,16 @@ +export const usePeerSupport = () => { + const updateSettings = async (settings) => { + return await $fetch('/api/members/me/peer-support', { + method: 'PATCH', + body: settings + }); + }; + + const getSupporters = async (topic) => { + return await $fetch('/api/peer-support', { + query: topic ? { topic } : {} + }); + }; + + return { updateSettings, getSupporters }; +}; diff --git a/app/layouts/default.vue b/app/layouts/default.vue index 07411f7..0078326 100644 --- a/app/layouts/default.vue +++ b/app/layouts/default.vue @@ -1,5 +1,5 @@ - + + + + + + Ghost Guild + + + + + - + - - + + + + + + + + + + + diff --git a/app/pages/about.vue b/app/pages/about.vue index cbc7469..af38426 100644 --- a/app/pages/about.vue +++ b/app/pages/about.vue @@ -9,22 +9,22 @@ /> - + - + How Ghost Guild Works - + Everyone gets everything. Your circle reflects where you are in your cooperative journey. Your financial contribution reflects what you can afford. These are completely separate choices. Equal access: The entire knowledge commons, all @@ -49,13 +49,13 @@ - + - + Find Your Circle - + Circles help us provide relevant guidance and connect you with others at similar stages. Choose based on where you are, not what you want to access. @@ -63,21 +63,19 @@ - - + + Community Circle - + You're exploring what cooperatives could mean for your work - + Where you might be: - + Curious about alternatives to traditional studio structures @@ -88,12 +86,10 @@ - + We'll help you navigate: - + Understanding cooperative basics Connecting with others asking similar questions Exploring real examples from game studios @@ -102,12 +98,10 @@ - + You might be: - + Individual game workers Researchers and students Industry allies and supporters @@ -117,11 +111,11 @@ - - + + Founder Circle - + You're actively building or transitioning to a cooperative model @@ -188,11 +182,11 @@ - - + + Practitioner Circle - + You're operating a cooperative and contributing to the field @@ -246,14 +240,14 @@ - + - + Important Notes - + Movement between circles is fluid. As you move along in your journey, you can shift circles anytime. Just let us diff --git a/app/pages/contact.vue b/app/pages/contact.vue index 4cdd7af..28f72cf 100644 --- a/app/pages/contact.vue +++ b/app/pages/contact.vue @@ -4,13 +4,13 @@ Get in Touch - + We'd be happy to answer any questions you might have about Ghost Guild @@ -21,7 +21,7 @@ - + Send us a message (or email hello@ghostguild.org) @@ -79,7 +79,7 @@ :loading="isSubmitting" :disabled="!isFormValid" size="xl" - class="px-12 border border-ghost-600 text-stone-200 hover:bg-ghost-800 hover:border-whisper-500 hover:ethereal-text transition-all duration-500" + class="px-12 border border-ghost-600 text-ghost-200 hover:bg-ghost-800 hover:border-whisper-500 hover:ethereal-text transition-all duration-500" > Send Message @@ -98,7 +98,7 @@ - + {{ error }} diff --git a/app/pages/events/[id].vue b/app/pages/events/[id].vue index 3b3eea1..42820e9 100644 --- a/app/pages/events/[id].vue +++ b/app/pages/events/[id].vue @@ -1,27 +1,27 @@ - Loading event details... + Loading event details... - Event Not Found - + Event Not Found + The event you're looking for doesn't exist. @@ -64,11 +64,11 @@ - + - + - Date - + Date + {{ formatDate(event.startDate) }} @@ -86,8 +86,8 @@ - Time - + Time + {{ formatTime(event.startDate, event.endDate) }} @@ -96,8 +96,8 @@ - Location - + Location + {{ event.location }} @@ -153,7 +153,7 @@ > - Recommended for: @@ -170,15 +170,15 @@ - + About This Event - + {{ event.description }} - + Event Agenda @@ -192,7 +192,7 @@ > {{ index + 1 }} - {{ item }} + {{ item }} @@ -201,7 +201,7 @@ v-if="event.speakers && event.speakers.length > 0" class="mt-8" > - + Speakers @@ -211,21 +211,21 @@ class="flex items-start space-x-4" > - + {{ speaker.name }} - + {{ speaker.role }} - + {{ speaker.bio }} @@ -237,9 +237,9 @@ - + Register for This Event @@ -322,7 +322,7 @@ Full Name @@ -338,7 +338,7 @@ Email Address @@ -354,7 +354,7 @@ Membership Status @@ -388,16 +388,16 @@ - Event Capacity + Event Capacity - + {{ event.registeredCount || 0 }} / {{ event.maxAttendees }} - - Questions? - + + Questions? + If you have any questions about this event please drop us a line. - + - + {{ event.start.getDate() }} - + {{ event.start.toLocaleDateString("en-US", { month: "short", @@ -42,7 +42,7 @@ {{ event.title }} @@ -53,7 +53,7 @@ /> - + {{ event.content }} @@ -72,7 +72,7 @@ @@ -83,10 +83,10 @@ - Loading events... + Loading events... - Loading calendar... + Loading calendar... @@ -130,14 +130,14 @@ - + Active Event Series - + Multi-part workshops and recurring events designed to deepen your knowledge and build community connections. @@ -149,7 +149,7 @@ {{ formatSeriesType(series.type) }} - + {{ series.eventCount }} events - + {{ series.title }} - + {{ series.description }} @@ -186,22 +186,22 @@ > {{ event.series?.position || "?" }} - {{ event.title }} + {{ event.title }} - + {{ formatEventDate(event.startDate) }} +{{ series.events.length - 3 }} more events - + {{ formatDateRange(series.startDate, series.endDate) }} - + - + Attend Our Events - + Our events are ,Lorem ipsum, dolor sit amet consectetur adipisicing elit. Quibusdam exercitationem delectus ab voluptates aspernatur, quia deleniti aut maxime, veniam @@ -244,7 +244,7 @@ dolorum alias nulla! - + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris @@ -265,31 +265,31 @@ - + Monthly Meetups - + Casual knowledge sharing sessions - + Workshops - + Hands-on learning about cooperative and worker-centric business models - + Social Events - + Game nights, socials, and more diff --git a/app/pages/index.vue b/app/pages/index.vue index d9d048c..73d3886 100644 --- a/app/pages/index.vue +++ b/app/pages/index.vue @@ -5,14 +5,14 @@ Become a Ghostie - + A community for creatives and game devs exploring cooperative models @@ -33,7 +33,7 @@ Join Us Today ā @@ -55,13 +55,13 @@ > - {{ circle.label }} - + {{ circle.label }} + {{ circle.description }} - + {{ feature }} ā¢ @@ -77,7 +77,7 @@ - Why Join? + Why Join? @@ -86,11 +86,11 @@ /> - + Lorem ipsum dolor sit amet, consectetur adipiscing elit. - + Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation. @@ -98,7 +98,7 @@ ? diff --git a/app/pages/join.vue b/app/pages/join.vue index 2356e07..68e806f 100644 --- a/app/pages/join.vue +++ b/app/pages/join.vue @@ -9,13 +9,13 @@ /> - + - + Membership Sign Up - + Choose your circle to connect with others at your stage. Choose your contribution based on what you can afford. Everyone gets full access. @@ -30,8 +30,8 @@ :class="[ 'w-10 h-10 rounded-full flex items-center justify-center font-semibold', currentStep >= 1 - ? 'bg-gray-900 dark:bg-white text-white dark:text-gray-900' - : 'bg-gray-200 dark:bg-gray-700 text-gray-500', + ? 'bg-neutral-900 text-neutral-50' + : 'bg-neutral-200 text-neutral-500', ]" > 1 @@ -39,21 +39,16 @@ Information - + @@ -63,8 +58,8 @@ :class="[ 'w-10 h-10 rounded-full flex items-center justify-center font-semibold', currentStep >= 2 - ? 'bg-gray-900 dark:bg-white text-white dark:text-gray-900' - : 'bg-gray-200 dark:bg-gray-700 text-gray-500', + ? 'bg-neutral-900 text-neutral-50' + : 'bg-neutral-200 text-neutral-500', ]" > 2 @@ -72,18 +67,16 @@ Payment - + @@ -93,8 +86,8 @@ :class="[ 'w-10 h-10 rounded-full flex items-center justify-center font-semibold', currentStep >= 3 - ? 'bg-gray-900 dark:bg-white text-white dark:text-gray-900' - : 'bg-gray-200 dark:bg-gray-700 text-gray-500', + ? 'bg-neutral-900 text-neutral-50' + : 'bg-neutral-200 text-neutral-500', ]" > 3 @@ -103,9 +96,7 @@ Confirmation @@ -120,7 +111,7 @@ - + @@ -154,8 +145,8 @@ class="flex flex-col p-6 rounded-lg border-2 cursor-pointer transition-all hover:shadow-md" :class=" form.circle === option.value - ? 'border-gray-900 dark:border-white bg-gray-50 dark:bg-gray-800' - : 'border-gray-200 dark:border-gray-700 hover:border-gray-400 dark:hover:border-gray-500' + ? 'border-neutral-900 bg-[--ui-bg]' + : 'border-neutral-200 hover:border-neutral-400' " > {{ option.label }} - + {{ option.description }} - + Not sure? Start with Community - you can always move. @@ -213,23 +204,23 @@ - + Payment Information - + You're signing up for the {{ selectedTier.label }} plan - + ${{ selectedTier.amount }} CAD / month - - + + Click "Complete Payment" below to open the secure payment modal and verify your payment method. @@ -254,11 +245,11 @@ - + Welcome to Ghost Guild! @@ -283,43 +274,39 @@ - + Membership Details: - Name: + Name: {{ form.name }} - Email: + Email: {{ form.email }} - Circle: + Circle: {{ form.circle }} - - Contribution: - + Contribution: {{ selectedTier.label }} - Member ID: + Member ID: {{ customerCode }} - + We've sent a confirmation email to {{ form.email }} with your membership details. - - + + You will be automatically redirected to your dashboard in a few seconds... @@ -339,14 +326,14 @@ - + - + How Ghost Guild Works - + Every member gets everything. Your circle helps you find relevant content and peers. Your contribution helps sustain our solidarity economy. @@ -355,13 +342,11 @@ - - + + Full Access - + Complete resource library All workshops and events Slack community @@ -371,13 +356,11 @@ - - + + Circle-Specific Guidance - + Curated resources for your stage Connection with peers on similar journeys Relevant workshop recommendations @@ -390,25 +373,23 @@ - + 1 - + Pick your circle - + Where are you in your co-op journey? Select based on where you are in your cooperative journey - exploring, building, or practicing. Not sure? Start with Community. @@ -419,18 +400,16 @@ 2 - + Choose your contribution - + What can you afford? ($0-50+/month) Choose based on your financial capacity. From $0 for those who need support to $50+ for those who can sponsor others. You can adjust anytime. @@ -441,18 +420,16 @@ 3 - + Join the community - + Get instant access to everything. Fill out your profile, agree to our community guidelines, and complete payment (if applicable). You'll get instant access to our community. diff --git a/app/pages/login.vue b/app/pages/login.vue index 5a8cb6d..6d4bb2e 100644 --- a/app/pages/login.vue +++ b/app/pages/login.vue @@ -1,7 +1,7 @@ - - + - + Passwordless Login - + Enter your email to receive a secure login link - + @@ -34,7 +36,7 @@ - + @@ -46,8 +48,9 @@ - - We'll send you a secure login link via email. No password needed! + + We'll send you a secure login link via email. No password + needed! @@ -66,23 +69,31 @@ - - - ā Magic link sent! Check your email and click the link to sign in. + + + ā Magic link sent! Check your email and click the link to sign + in. - - - ā {{ loginError }} - + + ā {{ loginError }} - - Don't have an account? - + + Don't have an account? + Join Ghost Guild @@ -92,19 +103,25 @@ - + - + Forgot Password - + Enter your email to receive a password reset link - - + + - + @@ -129,8 +146,9 @@ - - We'll send you a secure link to reset your password. Check your email inbox and spam folder. + + We'll send you a secure link to reset your password. Check your + email inbox and spam folder. @@ -150,41 +168,44 @@ - - + + ā Password reset link sent! Check your email. - - - ā {{ resetError }} - + + ā {{ resetError }} - + - - Sign In - - + Sign In + - - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ready to access your account and connect with the community? + + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ready to + access your account and connect with the community? - - @@ -195,13 +216,13 @@ - + - + Access Your Dashboard - + @@ -209,53 +230,59 @@ - - - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Once you're logged in, you'll have access to: + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Once + you're logged in, you'll have access to: - + - Community forums and discussions + Community forums and discussions - Member directory and networking + Member directory and networking - Educational resources and workshops + Educational resources and workshops - Cooperative development tools + Cooperative development tools - Mentorship opportunities + Mentorship opportunities - Project collaboration spaces + Project collaboration spaces - - New to Ghost Guild? - - + New to Ghost Guild? + Create Your Account @@ -266,112 +293,112 @@ \ No newline at end of file +}; + diff --git a/app/pages/member/dashboard.vue b/app/pages/member/dashboard.vue index 1a6093a..ecc6243 100644 --- a/app/pages/member/dashboard.vue +++ b/app/pages/member/dashboard.vue @@ -18,7 +18,7 @@ - Loading your dashboard... + Loading your dashboard... @@ -36,10 +36,10 @@ - + Welcome to Ghost Guild, {{ memberData?.name }}! - + Your membership is active and you're part of our cooperative community. @@ -53,7 +53,7 @@ {{ memberData?.name?.charAt(0)?.toUpperCase() }} @@ -63,13 +63,13 @@ - Circle: + Circle: {{ memberData?.circle }} - Contribution: + Contribution: ${{ memberData?.contributionTier }} CAD/month @@ -86,28 +86,16 @@ }" > - + Quick Links - - - - - Post an Update - - @@ -120,7 +108,7 @@ @@ -133,7 +121,7 @@ @@ -146,7 +134,7 @@ @@ -179,10 +167,10 @@ - + Upcoming Events - + Discover and register for community events and workshops. @@ -191,7 +179,7 @@ to="/events" variant="outline" size="sm" - class="border-ghost-600 text-stone-200 hover:bg-ghost-800 hover:border-whisper-500" + class="border-ghost-600 text-ghost-200 hover:bg-ghost-800 hover:border-whisper-500" > View Events @@ -217,8 +205,8 @@ - Community - + Community + Connect with other members in your circle and beyond. @@ -227,7 +215,7 @@ to="/members" variant="outline" size="sm" - class="border-ghost-600 text-stone-200 hover:bg-ghost-800 hover:border-whisper-500" + class="border-ghost-600 text-ghost-200 hover:bg-ghost-800 hover:border-whisper-500" > Browse Members @@ -253,10 +241,10 @@ - + Account Settings - + Manage your profile and membership settings. @@ -265,7 +253,7 @@ to="/member/profile#account" variant="outline" size="sm" - class="border-ghost-600 text-stone-200 hover:bg-ghost-800 hover:border-whisper-500" + class="border-ghost-600 text-ghost-200 hover:bg-ghost-800 hover:border-whisper-500" > Manage Account @@ -283,14 +271,14 @@ > - + Your Upcoming Events Browse All Events @@ -334,10 +322,10 @@ /> - + {{ evt.title }} - + {{ formatEventDate(evt.startDate) }} @@ -351,7 +339,7 @@ @@ -361,108 +349,20 @@ - + You haven't registered for any upcoming events Browse Events - - - - - - - Community Pulse - - - View All - - - - - - - - - - - - - - {{ update.author.name.charAt(0).toUpperCase() }} - - - - - {{ update.author?.name }} - - - {{ formatTimeAgo(update.createdAt) }} - - - - {{ update.content }} - - - Read more - - - - - - - - No community updates yet - - Post the First Update - - - @@ -471,8 +371,6 @@ diff --git a/app/pages/updates/[id]/edit.vue b/app/pages/updates/[id]/edit.vue deleted file mode 100644 index b11e603..0000000 --- a/app/pages/updates/[id]/edit.vue +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - Loading update... - - - - - - - - - - ā Update saved successfully! - - - - - - Update not found - - Back to Updates - - - - - - - - diff --git a/app/pages/updates/[id]/index.vue b/app/pages/updates/[id]/index.vue deleted file mode 100644 index b1d6c99..0000000 --- a/app/pages/updates/[id]/index.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - - - - Loading update... - - - - - - - - - - Comments - Comments coming soon - - - - - - Back to Updates - - - - - - - {{ error }} - - Back to Updates - - - - - - - - - - - Cancel - - - Delete - - - - - - - - diff --git a/app/pages/updates/index.vue b/app/pages/updates/index.vue deleted file mode 100644 index dde1f05..0000000 --- a/app/pages/updates/index.vue +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - New Update - - - - - - - Loading updates... - - - - - - - - - - - Load More - - - - - - - - - - - - - No updates yet - - - Be the first to share an update with the community! - - - Post Your First Update - - - - - - - - - - - Cancel - - - Delete - - - - - - - - diff --git a/app/pages/updates/new.vue b/app/pages/updates/new.vue deleted file mode 100644 index b8f0a12..0000000 --- a/app/pages/updates/new.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - ā Update posted successfully! - - - - - - - - diff --git a/app/pages/updates/user/[id].vue b/app/pages/updates/user/[id].vue deleted file mode 100644 index e58f4a4..0000000 --- a/app/pages/updates/user/[id].vue +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - Loading updates... - - - - - - - - - - - Load More - - - - - - - - - - - - - No updates yet - - - {{ user?.name || "This user" }} hasn't posted any updates. - - - - - - - - - - - Cancel - - - Delete - - - - - - - - diff --git a/scripts/migrate-profile-fields.js b/scripts/migrate-profile-fields.js new file mode 100644 index 0000000..7a9ba72 --- /dev/null +++ b/scripts/migrate-profile-fields.js @@ -0,0 +1,163 @@ +/** + * Migration Script: Profile Fields Restructure + * + * This script migrates member data from the old schema to the new schema: + * - Removes `skills` field + * - Converts `offering` from String to { text: String, tags: [String] } + * - Converts `lookingFor` from String to { text: String, tags: [String] } + * - Converts `peerSupport.topics` to `peerSupport.skillTopics` and `peerSupport.supportTopics` + * - Removes `privacy.skills` + */ + +import mongoose from 'mongoose'; +import Member from '../server/models/member.js'; +import { connectDB } from '../server/utils/mongoose.js'; + +// Curated list of conversational support topics +const CONVERSATIONAL_TOPICS = [ + 'Co-founder relationships', + 'Burnout prevention', + 'Impostor syndrome', + 'Work-life boundaries', + 'Conflict resolution', + 'General chat & support', +]; + +async function migrateProfileFields() { + try { + await connectDB(); + console.log('Connected to database'); + + // Find all members + const members = await Member.find({}); + console.log(`Found ${members.length} members to migrate`); + + let migratedCount = 0; + let skippedCount = 0; + + for (const member of members) { + let needsUpdate = false; + const updates = {}; + + // Migrate skills -> offering.tags (if offering doesn't have tags yet) + if (member.skills && member.skills.length > 0) { + console.log(`\nMember ${member.name} (${member.email}):`); + console.log(` - Has skills: ${member.skills.join(', ')}`); + + // If offering is still a string, convert it and add skills as tags + if (typeof member.offering === 'string') { + updates['offering'] = { + text: member.offering || '', + tags: member.skills, // Move skills to offering tags + }; + console.log(` - Migrating skills to offering.tags`); + needsUpdate = true; + } + + // Remove skills field + updates.$unset = { skills: 1 }; + needsUpdate = true; + } + + // Migrate offering from string to object (if not already done) + if (typeof member.offering === 'string' && !updates['offering']) { + updates['offering'] = { + text: member.offering || '', + tags: [], + }; + console.log(` - Converting offering to object structure`); + needsUpdate = true; + } + + // Migrate lookingFor from string to object + if (typeof member.lookingFor === 'string') { + updates['lookingFor'] = { + text: member.lookingFor || '', + tags: [], + }; + console.log(` - Converting lookingFor to object structure`); + needsUpdate = true; + } + + // Migrate peer support topics + if (member.peerSupport?.topics && member.peerSupport.topics.length > 0) { + const skillTopics = []; + const supportTopics = []; + + // Split topics into skill-based and conversational + for (const topic of member.peerSupport.topics) { + if (CONVERSATIONAL_TOPICS.includes(topic)) { + supportTopics.push(topic); + } else { + skillTopics.push(topic); + } + } + + updates['peerSupport.skillTopics'] = skillTopics; + updates['peerSupport.supportTopics'] = supportTopics; + updates['$unset'] = { + ...(updates['$unset'] || {}), + 'peerSupport.topics': 1 + }; + + console.log(` - Splitting peer support topics:`); + console.log(` Skill topics: ${skillTopics.join(', ') || 'none'}`); + console.log(` Support topics: ${supportTopics.join(', ') || 'none'}`); + needsUpdate = true; + } + + // Remove privacy.skills if it exists + if (member.privacy?.skills) { + updates['$unset'] = { + ...(updates['$unset'] || {}), + 'privacy.skills': 1 + }; + needsUpdate = true; + } + + // Apply updates + if (needsUpdate) { + const updateOps = { ...updates }; + const unsetOps = updateOps.$unset; + delete updateOps.$unset; + + const finalUpdate = {}; + if (Object.keys(updateOps).length > 0) { + finalUpdate.$set = updateOps; + } + if (unsetOps && Object.keys(unsetOps).length > 0) { + finalUpdate.$unset = unsetOps; + } + + await Member.updateOne({ _id: member._id }, finalUpdate); + console.log(` ā Updated`); + migratedCount++; + } else { + skippedCount++; + } + } + + console.log('\n=== Migration Complete ==='); + console.log(`Total members: ${members.length}`); + console.log(`Migrated: ${migratedCount}`); + console.log(`Skipped (already migrated): ${skippedCount}`); + + } catch (error) { + console.error('Migration error:', error); + throw error; + } finally { + await mongoose.connection.close(); + console.log('\nDatabase connection closed'); + } +} + +// Run migration +migrateProfileFields() + .then(() => { + console.log('\nā Migration script completed successfully'); + process.exit(0); + }) + .catch((error) => { + console.error('\nā Migration script failed:', error); + process.exit(1); + }); diff --git a/server/api/auth/member.get.js b/server/api/auth/member.get.js index fdbbac4..d5e2a91 100644 --- a/server/api/auth/member.get.js +++ b/server/api/auth/member.get.js @@ -41,13 +41,14 @@ export default defineEventHandler(async (event) => { avatar: member.avatar, studio: member.studio, bio: member.bio, - skills: member.skills, location: member.location, socialLinks: member.socialLinks, offering: member.offering, lookingFor: member.lookingFor, showInDirectory: member.showInDirectory, privacy: member.privacy, + // Peer support + peerSupport: member.peerSupport, }; } catch (err) { console.error("Token verification error:", err); diff --git a/server/api/members/directory.get.js b/server/api/members/directory.get.js index 3c37b01..70c614e 100644 --- a/server/api/members/directory.get.js +++ b/server/api/members/directory.get.js @@ -24,7 +24,9 @@ export default defineEventHandler(async (event) => { const query = getQuery(event); const search = query.search || ""; const circle = query.circle || ""; - const skills = query.skills ? query.skills.split(",") : []; + const tags = query.tags ? query.tags.split(",") : []; + const peerSupport = query.peerSupport || ""; + const topics = query.topics ? query.topics.split(",") : []; // Build query const dbQuery = { @@ -37,6 +39,11 @@ export default defineEventHandler(async (event) => { dbQuery.circle = circle; } + // Filter by peer support availability + if (peerSupport === "true") { + dbQuery["peerSupport.enabled"] = true; + } + // Search by name or bio if (search) { dbQuery.$or = [ @@ -45,15 +52,41 @@ export default defineEventHandler(async (event) => { ]; } - // Filter by skills - if (skills.length > 0) { - dbQuery.skills = { $in: skills }; + // Filter by tags (search in offering.tags or lookingFor.tags) + if (tags.length > 0) { + dbQuery.$or = [ + { "offering.tags": { $in: tags } }, + { "lookingFor.tags": { $in: tags } }, + ]; + // If search is also present, combine with AND + if (search) { + dbQuery.$and = [ + { + $or: [ + { name: { $regex: search, $options: "i" } }, + { bio: { $regex: search, $options: "i" } }, + ], + }, + { + $or: [ + { "offering.tags": { $in: tags } }, + { "lookingFor.tags": { $in: tags } }, + ], + }, + ]; + delete dbQuery.$or; + } + } + + // Filter by peer support topics + if (topics.length > 0) { + dbQuery["peerSupport.topics"] = { $in: topics }; } try { const members = await Member.find(dbQuery) .select( - "name pronouns timeZone avatar studio bio skills location socialLinks offering lookingFor privacy circle createdAt" + "name pronouns timeZone avatar studio bio location socialLinks offering lookingFor privacy circle peerSupport slackUserId createdAt", ) .sort({ createdAt: -1 }) .lean(); @@ -83,26 +116,42 @@ export default defineEventHandler(async (event) => { if (isVisible("timeZone")) filtered.timeZone = member.timeZone; if (isVisible("studio")) filtered.studio = member.studio; if (isVisible("bio")) filtered.bio = member.bio; - if (isVisible("skills")) filtered.skills = member.skills; if (isVisible("location")) filtered.location = member.location; if (isVisible("socialLinks")) filtered.socialLinks = member.socialLinks; if (isVisible("offering")) filtered.offering = member.offering; if (isVisible("lookingFor")) filtered.lookingFor = member.lookingFor; + // Always show peer support if enabled (it's opt-in, so public by nature) + if (member.peerSupport?.enabled) { + filtered.peerSupport = member.peerSupport; + filtered.slackUserId = member.slackUserId; + } + return filtered; }); - // Get unique skills for filter options - const allSkills = members - .flatMap((m) => m.skills || []) - .filter((skill, index, self) => self.indexOf(skill) === index) + // Get unique tags for filter options (from both offering and lookingFor) + const allTags = members + .flatMap((m) => [ + ...(m.offering?.tags || []), + ...(m.lookingFor?.tags || []), + ]) + .filter((tag, index, self) => self.indexOf(tag) === index) + .sort(); + + // Get unique peer support topics + const allTopics = members + .filter((m) => m.peerSupport?.enabled) + .flatMap((m) => m.peerSupport?.topics || []) + .filter((topic, index, self) => self.indexOf(topic) === index) .sort(); return { members: filteredMembers, totalCount: filteredMembers.length, filters: { - availableSkills: allSkills, + availableSkills: allTags, + availableTopics: allTopics, }, }; } catch (error) { diff --git a/server/api/members/me/peer-support.patch.js b/server/api/members/me/peer-support.patch.js new file mode 100644 index 0000000..e9b9887 --- /dev/null +++ b/server/api/members/me/peer-support.patch.js @@ -0,0 +1,120 @@ +import jwt from "jsonwebtoken"; +import Member from "../../../models/member.js"; +import { connectDB } from "../../../utils/mongoose.js"; + +export default defineEventHandler(async (event) => { + await connectDB(); + + const token = getCookie(event, "auth-token"); + + if (!token) { + throw createError({ + statusCode: 401, + statusMessage: "Not authenticated", + }); + } + + let memberId; + try { + const decoded = jwt.verify(token, process.env.JWT_SECRET); + memberId = decoded.memberId; + } catch (err) { + throw createError({ + statusCode: 401, + statusMessage: "Invalid or expired token", + }); + } + + const body = await readBody(event); + + // Build update object for peer support settings + const updateData = { + "peerSupport.enabled": body.enabled || false, + "peerSupport.skillTopics": body.skillTopics || [], + "peerSupport.supportTopics": body.supportTopics || [], + "peerSupport.availability": body.availability || "", + "peerSupport.personalMessage": body.personalMessage || "", + "peerSupport.slackUsername": body.slackUsername || "", + }; + + // If Slack username provided and peer support enabled, try to fetch Slack user ID + if (body.enabled && body.slackUsername) { + try { + console.log( + `[Peer Support] Attempting to fetch Slack user ID for: ${body.slackUsername}`, + ); + + // Dynamically import the Slack service + const { getSlackService } = await import("../../../utils/slack.ts"); + const slackService = getSlackService(); + + if (slackService) { + console.log( + "[Peer Support] Slack service initialized, looking up user...", + ); + const slackUserId = await slackService.findUserIdByUsername( + body.slackUsername, + ); + + if (slackUserId) { + updateData["slackUserId"] = slackUserId; + console.log( + `[Peer Support] ā Found Slack user ID for ${body.slackUsername}: ${slackUserId}`, + ); + + // Now get/create the DM channel + console.log("[Peer Support] Opening DM channel..."); + const dmChannelId = await slackService.openDMChannel(slackUserId); + + if (dmChannelId) { + updateData["peerSupport.slackDMChannelId"] = dmChannelId; + console.log(`[Peer Support] ā Got DM channel ID: ${dmChannelId}`); + } else { + console.warn("[Peer Support] Could not get DM channel ID"); + } + } else { + console.warn( + `[Peer Support] Could not find Slack user ID for username: ${body.slackUsername}`, + ); + } + } else { + console.log( + "[Peer Support] Slack service not configured, skipping user ID lookup", + ); + } + } catch (error) { + console.error( + "[Peer Support] Error fetching Slack user ID:", + error.message, + ); + console.error("[Peer Support] Stack trace:", error.stack); + // Continue anyway - we'll still save the username + } + } + + try { + const member = await Member.findByIdAndUpdate( + memberId, + { $set: updateData }, + { new: true, runValidators: true }, + ); + + if (!member) { + throw createError({ + statusCode: 404, + statusMessage: "Member not found", + }); + } + + return { + success: true, + peerSupport: member.peerSupport, + }; + } catch (error) { + console.error("Peer support update error:", error); + throw createError({ + statusCode: 500, + statusMessage: "Failed to update peer support settings", + }); + } +}); diff --git a/server/api/members/profile.patch.js b/server/api/members/profile.patch.js index 1a7c03a..67eb598 100644 --- a/server/api/members/profile.patch.js +++ b/server/api/members/profile.patch.js @@ -34,11 +34,8 @@ export default defineEventHandler(async (event) => { "avatar", "studio", "bio", - "skills", "location", "socialLinks", - "offering", - "lookingFor", "showInDirectory", "helcimCustomerId", ]; @@ -50,7 +47,6 @@ export default defineEventHandler(async (event) => { "avatarPrivacy", "studioPrivacy", "bioPrivacy", - "skillsPrivacy", "locationPrivacy", "socialLinksPrivacy", "offeringPrivacy", @@ -66,6 +62,20 @@ export default defineEventHandler(async (event) => { } }); + // Handle offering and lookingFor separately (nested objects) + if (body.offering !== undefined) { + updateData.offering = { + text: body.offering.text || "", + tags: body.offering.tags || [], + }; + } + if (body.lookingFor !== undefined) { + updateData.lookingFor = { + text: body.lookingFor.text || "", + tags: body.lookingFor.tags || [], + }; + } + // Handle privacy settings privacyFields.forEach((privacyField) => { if (body[privacyField] !== undefined) { @@ -100,7 +110,6 @@ export default defineEventHandler(async (event) => { avatar: member.avatar, studio: member.studio, bio: member.bio, - skills: member.skills, location: member.location, socialLinks: member.socialLinks, offering: member.offering, diff --git a/server/api/peer-support.get.js b/server/api/peer-support.get.js new file mode 100644 index 0000000..04c5977 --- /dev/null +++ b/server/api/peer-support.get.js @@ -0,0 +1,63 @@ +import jwt from "jsonwebtoken"; +import Member from "../models/member.js"; +import { connectDB } from "../utils/mongoose.js"; + +export default defineEventHandler(async (event) => { + await connectDB(); + + // Check if user is authenticated (optional for this endpoint) + const token = getCookie(event, "auth-token"); + let isAuthenticated = false; + + if (token) { + try { + jwt.verify(token, process.env.JWT_SECRET); + isAuthenticated = true; + } catch (err) { + isAuthenticated = false; + } + } + + const query = getQuery(event); + const topic = query.topic; + + // Build query for peer supporters + const dbQuery = { + "peerSupport.enabled": true, + status: "active", + }; + + // Filter by topic if specified + if (topic) { + dbQuery["peerSupport.topics"] = topic; + } + + try { + const supporters = await Member.find(dbQuery) + .select( + "name avatar circle peerSupport slackUserId createdAt" + ) + .sort({ createdAt: -1 }) + .lean(); + + // Get unique topics for filter options + const allTopics = supporters + .flatMap((supporter) => supporter.peerSupport?.topics || []) + .filter((topic, index, self) => self.indexOf(topic) === index) + .sort(); + + return { + supporters, + totalCount: supporters.length, + filters: { + availableTopics: allTopics, + }, + }; + } catch (error) { + console.error("Peer support fetch error:", error); + throw createError({ + statusCode: 500, + statusMessage: "Failed to fetch peer supporters", + }); + } +}); diff --git a/server/api/test/peer-support-debug.get.js b/server/api/test/peer-support-debug.get.js new file mode 100644 index 0000000..09c169d --- /dev/null +++ b/server/api/test/peer-support-debug.get.js @@ -0,0 +1,28 @@ +import jwt from "jsonwebtoken"; +import Member from "../../models/member.js"; +import { connectDB } from "../../utils/mongoose.js"; + +export default defineEventHandler(async (event) => { + await connectDB(); + + const token = getCookie(event, "auth-token"); + if (!token) { + throw createError({ statusCode: 401, statusMessage: "Not authenticated" }); + } + + let memberId; + try { + const decoded = jwt.verify(token, process.env.JWT_SECRET); + memberId = decoded.memberId; + } catch (err) { + throw createError({ statusCode: 401, statusMessage: "Invalid token" }); + } + + const member = await Member.findById(memberId).select("name peerSupport slackUserId"); + + return { + name: member.name, + peerSupport: member.peerSupport, + slackUserId: member.slackUserId, + }; +}); diff --git a/server/migrations/fix-offering-lookingfor-structure.js b/server/migrations/fix-offering-lookingfor-structure.js new file mode 100644 index 0000000..4410d48 --- /dev/null +++ b/server/migrations/fix-offering-lookingfor-structure.js @@ -0,0 +1,62 @@ +// Migration to fix offering and lookingFor field structure +// Run this once to convert string values to object structure +import mongoose from "mongoose"; +import Member from "../models/member.js"; +import { connectDB } from "../utils/mongoose.js"; + +async function migrateOfferingLookingFor() { + await connectDB(); + + console.log("Starting migration: fixing offering and lookingFor structure..."); + + try { + // Find all members where offering or lookingFor is a string (not an object) + const members = await Member.find({ + $or: [ + { offering: { $type: "string" } }, + { lookingFor: { $type: "string" } }, + ], + }); + + console.log(`Found ${members.length} members to migrate`); + + for (const member of members) { + const updates = {}; + + // Convert offering if it's a string + if (typeof member.offering === "string") { + updates.offering = { + text: member.offering, + tags: [], + }; + console.log( + `Converting offering for member ${member._id}: "${member.offering}"`, + ); + } + + // Convert lookingFor if it's a string + if (typeof member.lookingFor === "string") { + updates.lookingFor = { + text: member.lookingFor, + tags: [], + }; + console.log( + `Converting lookingFor for member ${member._id}: "${member.lookingFor}"`, + ); + } + + // Update the member + if (Object.keys(updates).length > 0) { + await Member.findByIdAndUpdate(member._id, { $set: updates }); + } + } + + console.log("Migration completed successfully!"); + process.exit(0); + } catch (error) { + console.error("Migration failed:", error); + process.exit(1); + } +} + +migrateOfferingLookingFor(); diff --git a/server/models/member.js b/server/models/member.js index 0212ce4..7dcdad0 100644 --- a/server/models/member.js +++ b/server/models/member.js @@ -51,7 +51,6 @@ const memberSchema = new mongoose.Schema({ avatar: String, studio: String, bio: String, - skills: [String], location: String, socialLinks: { mastodon: String, @@ -59,10 +58,27 @@ const memberSchema = new mongoose.Schema({ website: String, other: String, }, - offering: String, - lookingFor: String, + offering: { + text: String, + tags: [String], + }, + lookingFor: { + text: String, + tags: [String], + }, showInDirectory: { type: Boolean, default: true }, + // Peer support settings + peerSupport: { + enabled: { type: Boolean, default: false }, + skillTopics: [String], // Auto-populated from offering.tags, editable + supportTopics: [String], // Curated conversational/emotional support topics + availability: String, + personalMessage: String, + slackUsername: String, + slackDMChannelId: String, // DM channel ID for direct messaging + }, + // Privacy settings for profile fields privacy: { pronouns: { @@ -90,11 +106,6 @@ const memberSchema = new mongoose.Schema({ enum: ["public", "members", "private"], default: "members", }, - skills: { - type: String, - enum: ["public", "members", "private"], - default: "members", - }, location: { type: String, enum: ["public", "members", "private"], diff --git a/server/utils/slack.ts b/server/utils/slack.ts index 3547694..875bae3 100644 --- a/server/utils/slack.ts +++ b/server/utils/slack.ts @@ -14,7 +14,7 @@ export class SlackService { */ async inviteUserToSlack( email: string, - realName: string + realName: string, ): Promise<{ success: boolean; userId?: string; @@ -34,7 +34,7 @@ export class SlackService { }); console.log( - `Successfully invited existing user ${email} to vetting channel` + `Successfully invited existing user ${email} to vetting channel`, ); return { success: true, @@ -65,7 +65,7 @@ export class SlackService { if (inviteResponse.ok && inviteResponse.user) { console.log( - `Successfully invited ${email} to workspace as single-channel guest` + `Successfully invited ${email} to workspace as single-channel guest`, ); return { success: true, @@ -79,7 +79,7 @@ export class SlackService { console.log( `Admin API not available or failed: ${ adminError.data?.error || adminError.message - }` + }`, ); // Fall back to manual process @@ -113,6 +113,67 @@ export class SlackService { } } + /** + * Find user ID by username (display name or real name) + */ + async findUserIdByUsername(username: string): Promise { + try { + const cleanUsername = username.replace("@", "").toLowerCase(); + + // List all users and search for matching username + const response = await this.client.users.list(); + + if (!response.members) { + return null; + } + + // Search for user by name or display_name + const user = response.members.find((member: any) => { + const name = member.name?.toLowerCase() || ""; + const realName = member.real_name?.toLowerCase() || ""; + const displayName = member.profile?.display_name?.toLowerCase() || ""; + + return ( + name === cleanUsername || + displayName === cleanUsername || + realName.includes(cleanUsername) + ); + }); + + return user?.id || null; + } catch (error) { + console.error("Error looking up Slack user by username:", error); + return null; + } + } + + /** + * Open/get a DM channel with a user and return the channel ID + * This creates or opens a DM conversation and returns the channel ID (starts with D) + */ + async openDMChannel(userId: string): Promise { + try { + const response = await this.client.conversations.open({ + users: userId, + }); + + if (response.ok && response.channel?.id) { + console.log( + `Opened DM channel for user ${userId}: ${response.channel.id}`, + ); + return response.channel.id; + } + + return null; + } catch (error: any) { + console.error( + "Error opening DM channel:", + error.data?.error || error.message, + ); + return null; + } + } + /** * Send a notification to the vetting channel about a new member */ @@ -121,7 +182,7 @@ export class SlackService { memberEmail: string, circle: string, contributionTier: string, - invitationStatus: string = "manual_invitation_required" + invitationStatus: string = "manual_invitation_required", ): Promise { try { let statusMessage = ""; @@ -224,7 +285,7 @@ export function getSlackService(): SlackService | null { if (!config.slackBotToken || !config.slackVettingChannelId) { console.warn( - "Slack integration not configured - missing bot token or channel ID" + "Slack integration not configured - missing bot token or channel ID", ); return null; }
Everyone gets everything. Your circle reflects where you are in your cooperative journey. Your financial contribution reflects what you can afford. These are completely separate choices.
Circles help us provide relevant guidance and connect you with others at similar stages. Choose based on where you are, not what you want to access. @@ -63,21 +63,19 @@
You're exploring what cooperatives could mean for your work
You're actively building or transitioning to a cooperative model
You're operating a cooperative and contributing to the field
Movement between circles is fluid. As you move along in your journey, you can shift circles anytime. Just let us diff --git a/app/pages/contact.vue b/app/pages/contact.vue index 4cdd7af..28f72cf 100644 --- a/app/pages/contact.vue +++ b/app/pages/contact.vue @@ -4,13 +4,13 @@ Get in Touch - + We'd be happy to answer any questions you might have about Ghost Guild @@ -21,7 +21,7 @@ - + Send us a message (or email hello@ghostguild.org) @@ -79,7 +79,7 @@ :loading="isSubmitting" :disabled="!isFormValid" size="xl" - class="px-12 border border-ghost-600 text-stone-200 hover:bg-ghost-800 hover:border-whisper-500 hover:ethereal-text transition-all duration-500" + class="px-12 border border-ghost-600 text-ghost-200 hover:bg-ghost-800 hover:border-whisper-500 hover:ethereal-text transition-all duration-500" > Send Message @@ -98,7 +98,7 @@ - + {{ error }} diff --git a/app/pages/events/[id].vue b/app/pages/events/[id].vue index 3b3eea1..42820e9 100644 --- a/app/pages/events/[id].vue +++ b/app/pages/events/[id].vue @@ -1,27 +1,27 @@ - Loading event details... + Loading event details... - Event Not Found - + Event Not Found + The event you're looking for doesn't exist. @@ -64,11 +64,11 @@ - + - + - Date - + Date + {{ formatDate(event.startDate) }} @@ -86,8 +86,8 @@ - Time - + Time + {{ formatTime(event.startDate, event.endDate) }} @@ -96,8 +96,8 @@ - Location - + Location + {{ event.location }} @@ -153,7 +153,7 @@ > - Recommended for: @@ -170,15 +170,15 @@ - + About This Event - + {{ event.description }} - + Event Agenda @@ -192,7 +192,7 @@ > {{ index + 1 }} - {{ item }} + {{ item }} @@ -201,7 +201,7 @@ v-if="event.speakers && event.speakers.length > 0" class="mt-8" > - + Speakers @@ -211,21 +211,21 @@ class="flex items-start space-x-4" > - + {{ speaker.name }} - + {{ speaker.role }} - + {{ speaker.bio }} @@ -237,9 +237,9 @@ - + Register for This Event @@ -322,7 +322,7 @@ Full Name @@ -338,7 +338,7 @@ Email Address @@ -354,7 +354,7 @@ Membership Status @@ -388,16 +388,16 @@ - Event Capacity + Event Capacity - + {{ event.registeredCount || 0 }} / {{ event.maxAttendees }} - - Questions? - + + Questions? + If you have any questions about this event please drop us a line. - + - + {{ event.start.getDate() }} - + {{ event.start.toLocaleDateString("en-US", { month: "short", @@ -42,7 +42,7 @@ {{ event.title }} @@ -53,7 +53,7 @@ /> - + {{ event.content }} @@ -72,7 +72,7 @@ @@ -83,10 +83,10 @@ - Loading events... + Loading events... - Loading calendar... + Loading calendar... @@ -130,14 +130,14 @@ - + Active Event Series - + Multi-part workshops and recurring events designed to deepen your knowledge and build community connections. @@ -149,7 +149,7 @@ {{ formatSeriesType(series.type) }} - + {{ series.eventCount }} events - + {{ series.title }} - + {{ series.description }} @@ -186,22 +186,22 @@ > {{ event.series?.position || "?" }} - {{ event.title }} + {{ event.title }} - + {{ formatEventDate(event.startDate) }} +{{ series.events.length - 3 }} more events - + {{ formatDateRange(series.startDate, series.endDate) }} - + - + Attend Our Events - + Our events are ,Lorem ipsum, dolor sit amet consectetur adipisicing elit. Quibusdam exercitationem delectus ab voluptates aspernatur, quia deleniti aut maxime, veniam @@ -244,7 +244,7 @@ dolorum alias nulla! - + Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris @@ -265,31 +265,31 @@ - + Monthly Meetups - + Casual knowledge sharing sessions - + Workshops - + Hands-on learning about cooperative and worker-centric business models - + Social Events - + Game nights, socials, and more diff --git a/app/pages/index.vue b/app/pages/index.vue index d9d048c..73d3886 100644 --- a/app/pages/index.vue +++ b/app/pages/index.vue @@ -5,14 +5,14 @@ Become a Ghostie - + A community for creatives and game devs exploring cooperative models @@ -33,7 +33,7 @@ Join Us Today ā @@ -55,13 +55,13 @@ > - {{ circle.label }} - + {{ circle.label }} + {{ circle.description }} - + {{ feature }} ā¢ @@ -77,7 +77,7 @@ - Why Join? + Why Join? @@ -86,11 +86,11 @@ /> - + Lorem ipsum dolor sit amet, consectetur adipiscing elit. - + Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation. @@ -98,7 +98,7 @@ ? diff --git a/app/pages/join.vue b/app/pages/join.vue index 2356e07..68e806f 100644 --- a/app/pages/join.vue +++ b/app/pages/join.vue @@ -9,13 +9,13 @@ /> - + - + Membership Sign Up - + Choose your circle to connect with others at your stage. Choose your contribution based on what you can afford. Everyone gets full access. @@ -30,8 +30,8 @@ :class="[ 'w-10 h-10 rounded-full flex items-center justify-center font-semibold', currentStep >= 1 - ? 'bg-gray-900 dark:bg-white text-white dark:text-gray-900' - : 'bg-gray-200 dark:bg-gray-700 text-gray-500', + ? 'bg-neutral-900 text-neutral-50' + : 'bg-neutral-200 text-neutral-500', ]" > 1 @@ -39,21 +39,16 @@ Information - + @@ -63,8 +58,8 @@ :class="[ 'w-10 h-10 rounded-full flex items-center justify-center font-semibold', currentStep >= 2 - ? 'bg-gray-900 dark:bg-white text-white dark:text-gray-900' - : 'bg-gray-200 dark:bg-gray-700 text-gray-500', + ? 'bg-neutral-900 text-neutral-50' + : 'bg-neutral-200 text-neutral-500', ]" > 2 @@ -72,18 +67,16 @@ Payment - + @@ -93,8 +86,8 @@ :class="[ 'w-10 h-10 rounded-full flex items-center justify-center font-semibold', currentStep >= 3 - ? 'bg-gray-900 dark:bg-white text-white dark:text-gray-900' - : 'bg-gray-200 dark:bg-gray-700 text-gray-500', + ? 'bg-neutral-900 text-neutral-50' + : 'bg-neutral-200 text-neutral-500', ]" > 3 @@ -103,9 +96,7 @@ Confirmation @@ -120,7 +111,7 @@ - + @@ -154,8 +145,8 @@ class="flex flex-col p-6 rounded-lg border-2 cursor-pointer transition-all hover:shadow-md" :class=" form.circle === option.value - ? 'border-gray-900 dark:border-white bg-gray-50 dark:bg-gray-800' - : 'border-gray-200 dark:border-gray-700 hover:border-gray-400 dark:hover:border-gray-500' + ? 'border-neutral-900 bg-[--ui-bg]' + : 'border-neutral-200 hover:border-neutral-400' " > {{ option.label }} - + {{ option.description }} - + Not sure? Start with Community - you can always move. @@ -213,23 +204,23 @@ - + Payment Information - + You're signing up for the {{ selectedTier.label }} plan - + ${{ selectedTier.amount }} CAD / month - - + + Click "Complete Payment" below to open the secure payment modal and verify your payment method. @@ -254,11 +245,11 @@ - + Welcome to Ghost Guild! @@ -283,43 +274,39 @@ - + Membership Details: - Name: + Name: {{ form.name }} - Email: + Email: {{ form.email }} - Circle: + Circle: {{ form.circle }} - - Contribution: - + Contribution: {{ selectedTier.label }} - Member ID: + Member ID: {{ customerCode }} - + We've sent a confirmation email to {{ form.email }} with your membership details. - - + + You will be automatically redirected to your dashboard in a few seconds... @@ -339,14 +326,14 @@ - + - + How Ghost Guild Works - + Every member gets everything. Your circle helps you find relevant content and peers. Your contribution helps sustain our solidarity economy. @@ -355,13 +342,11 @@ - - + + Full Access - + Complete resource library All workshops and events Slack community @@ -371,13 +356,11 @@ - - + + Circle-Specific Guidance - + Curated resources for your stage Connection with peers on similar journeys Relevant workshop recommendations @@ -390,25 +373,23 @@ - + 1 - + Pick your circle - + Where are you in your co-op journey? Select based on where you are in your cooperative journey - exploring, building, or practicing. Not sure? Start with Community. @@ -419,18 +400,16 @@ 2 - + Choose your contribution - + What can you afford? ($0-50+/month) Choose based on your financial capacity. From $0 for those who need support to $50+ for those who can sponsor others. You can adjust anytime. @@ -441,18 +420,16 @@ 3 - + Join the community - + Get instant access to everything. Fill out your profile, agree to our community guidelines, and complete payment (if applicable). You'll get instant access to our community. diff --git a/app/pages/login.vue b/app/pages/login.vue index 5a8cb6d..6d4bb2e 100644 --- a/app/pages/login.vue +++ b/app/pages/login.vue @@ -1,7 +1,7 @@ - - + - + Passwordless Login - + Enter your email to receive a secure login link - + @@ -34,7 +36,7 @@ - + @@ -46,8 +48,9 @@ - - We'll send you a secure login link via email. No password needed! + + We'll send you a secure login link via email. No password + needed! @@ -66,23 +69,31 @@ - - - ā Magic link sent! Check your email and click the link to sign in. + + + ā Magic link sent! Check your email and click the link to sign + in. - - - ā {{ loginError }} - + + ā {{ loginError }} - - Don't have an account? - + + Don't have an account? + Join Ghost Guild @@ -92,19 +103,25 @@ - + - + Forgot Password - + Enter your email to receive a password reset link - - + + - + @@ -129,8 +146,9 @@ - - We'll send you a secure link to reset your password. Check your email inbox and spam folder. + + We'll send you a secure link to reset your password. Check your + email inbox and spam folder. @@ -150,41 +168,44 @@ - - + + ā Password reset link sent! Check your email. - - - ā {{ resetError }} - + + ā {{ resetError }} - + - - Sign In - - + Sign In + - - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ready to access your account and connect with the community? + + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ready to + access your account and connect with the community? - - @@ -195,13 +216,13 @@ - + - + Access Your Dashboard - + @@ -209,53 +230,59 @@ - - - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Once you're logged in, you'll have access to: + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Once + you're logged in, you'll have access to: - + - Community forums and discussions + Community forums and discussions - Member directory and networking + Member directory and networking - Educational resources and workshops + Educational resources and workshops - Cooperative development tools + Cooperative development tools - Mentorship opportunities + Mentorship opportunities - Project collaboration spaces + Project collaboration spaces - - New to Ghost Guild? - - + New to Ghost Guild? + Create Your Account @@ -266,112 +293,112 @@ \ No newline at end of file +}; + diff --git a/app/pages/member/dashboard.vue b/app/pages/member/dashboard.vue index 1a6093a..ecc6243 100644 --- a/app/pages/member/dashboard.vue +++ b/app/pages/member/dashboard.vue @@ -18,7 +18,7 @@ - Loading your dashboard... + Loading your dashboard... @@ -36,10 +36,10 @@ - + Welcome to Ghost Guild, {{ memberData?.name }}! - + Your membership is active and you're part of our cooperative community. @@ -53,7 +53,7 @@ {{ memberData?.name?.charAt(0)?.toUpperCase() }} @@ -63,13 +63,13 @@ - Circle: + Circle: {{ memberData?.circle }} - Contribution: + Contribution: ${{ memberData?.contributionTier }} CAD/month @@ -86,28 +86,16 @@ }" > - + Quick Links - - - - - Post an Update - - @@ -120,7 +108,7 @@ @@ -133,7 +121,7 @@ @@ -146,7 +134,7 @@ @@ -179,10 +167,10 @@ - + Upcoming Events - + Discover and register for community events and workshops. @@ -191,7 +179,7 @@ to="/events" variant="outline" size="sm" - class="border-ghost-600 text-stone-200 hover:bg-ghost-800 hover:border-whisper-500" + class="border-ghost-600 text-ghost-200 hover:bg-ghost-800 hover:border-whisper-500" > View Events @@ -217,8 +205,8 @@ - Community - + Community + Connect with other members in your circle and beyond. @@ -227,7 +215,7 @@ to="/members" variant="outline" size="sm" - class="border-ghost-600 text-stone-200 hover:bg-ghost-800 hover:border-whisper-500" + class="border-ghost-600 text-ghost-200 hover:bg-ghost-800 hover:border-whisper-500" > Browse Members @@ -253,10 +241,10 @@ - + Account Settings - + Manage your profile and membership settings. @@ -265,7 +253,7 @@ to="/member/profile#account" variant="outline" size="sm" - class="border-ghost-600 text-stone-200 hover:bg-ghost-800 hover:border-whisper-500" + class="border-ghost-600 text-ghost-200 hover:bg-ghost-800 hover:border-whisper-500" > Manage Account @@ -283,14 +271,14 @@ > - + Your Upcoming Events Browse All Events @@ -334,10 +322,10 @@ /> - + {{ evt.title }} - + {{ formatEventDate(evt.startDate) }} @@ -351,7 +339,7 @@ @@ -361,108 +349,20 @@ - + You haven't registered for any upcoming events Browse Events - - - - - - - Community Pulse - - - View All - - - - - - - - - - - - - - {{ update.author.name.charAt(0).toUpperCase() }} - - - - - {{ update.author?.name }} - - - {{ formatTimeAgo(update.createdAt) }} - - - - {{ update.content }} - - - Read more - - - - - - - - No community updates yet - - Post the First Update - - - @@ -471,8 +371,6 @@ diff --git a/app/pages/updates/[id]/edit.vue b/app/pages/updates/[id]/edit.vue deleted file mode 100644 index b11e603..0000000 --- a/app/pages/updates/[id]/edit.vue +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - Loading update... - - - - - - - - - - ā Update saved successfully! - - - - - - Update not found - - Back to Updates - - - - - - - - diff --git a/app/pages/updates/[id]/index.vue b/app/pages/updates/[id]/index.vue deleted file mode 100644 index b1d6c99..0000000 --- a/app/pages/updates/[id]/index.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - - - - Loading update... - - - - - - - - - - Comments - Comments coming soon - - - - - - Back to Updates - - - - - - - {{ error }} - - Back to Updates - - - - - - - - - - - Cancel - - - Delete - - - - - - - - diff --git a/app/pages/updates/index.vue b/app/pages/updates/index.vue deleted file mode 100644 index dde1f05..0000000 --- a/app/pages/updates/index.vue +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - New Update - - - - - - - Loading updates... - - - - - - - - - - - Load More - - - - - - - - - - - - - No updates yet - - - Be the first to share an update with the community! - - - Post Your First Update - - - - - - - - - - - Cancel - - - Delete - - - - - - - - diff --git a/app/pages/updates/new.vue b/app/pages/updates/new.vue deleted file mode 100644 index b8f0a12..0000000 --- a/app/pages/updates/new.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - ā Update posted successfully! - - - - - - - - diff --git a/app/pages/updates/user/[id].vue b/app/pages/updates/user/[id].vue deleted file mode 100644 index e58f4a4..0000000 --- a/app/pages/updates/user/[id].vue +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - Loading updates... - - - - - - - - - - - Load More - - - - - - - - - - - - - No updates yet - - - {{ user?.name || "This user" }} hasn't posted any updates. - - - - - - - - - - - Cancel - - - Delete - - - - - - - - diff --git a/scripts/migrate-profile-fields.js b/scripts/migrate-profile-fields.js new file mode 100644 index 0000000..7a9ba72 --- /dev/null +++ b/scripts/migrate-profile-fields.js @@ -0,0 +1,163 @@ +/** + * Migration Script: Profile Fields Restructure + * + * This script migrates member data from the old schema to the new schema: + * - Removes `skills` field + * - Converts `offering` from String to { text: String, tags: [String] } + * - Converts `lookingFor` from String to { text: String, tags: [String] } + * - Converts `peerSupport.topics` to `peerSupport.skillTopics` and `peerSupport.supportTopics` + * - Removes `privacy.skills` + */ + +import mongoose from 'mongoose'; +import Member from '../server/models/member.js'; +import { connectDB } from '../server/utils/mongoose.js'; + +// Curated list of conversational support topics +const CONVERSATIONAL_TOPICS = [ + 'Co-founder relationships', + 'Burnout prevention', + 'Impostor syndrome', + 'Work-life boundaries', + 'Conflict resolution', + 'General chat & support', +]; + +async function migrateProfileFields() { + try { + await connectDB(); + console.log('Connected to database'); + + // Find all members + const members = await Member.find({}); + console.log(`Found ${members.length} members to migrate`); + + let migratedCount = 0; + let skippedCount = 0; + + for (const member of members) { + let needsUpdate = false; + const updates = {}; + + // Migrate skills -> offering.tags (if offering doesn't have tags yet) + if (member.skills && member.skills.length > 0) { + console.log(`\nMember ${member.name} (${member.email}):`); + console.log(` - Has skills: ${member.skills.join(', ')}`); + + // If offering is still a string, convert it and add skills as tags + if (typeof member.offering === 'string') { + updates['offering'] = { + text: member.offering || '', + tags: member.skills, // Move skills to offering tags + }; + console.log(` - Migrating skills to offering.tags`); + needsUpdate = true; + } + + // Remove skills field + updates.$unset = { skills: 1 }; + needsUpdate = true; + } + + // Migrate offering from string to object (if not already done) + if (typeof member.offering === 'string' && !updates['offering']) { + updates['offering'] = { + text: member.offering || '', + tags: [], + }; + console.log(` - Converting offering to object structure`); + needsUpdate = true; + } + + // Migrate lookingFor from string to object + if (typeof member.lookingFor === 'string') { + updates['lookingFor'] = { + text: member.lookingFor || '', + tags: [], + }; + console.log(` - Converting lookingFor to object structure`); + needsUpdate = true; + } + + // Migrate peer support topics + if (member.peerSupport?.topics && member.peerSupport.topics.length > 0) { + const skillTopics = []; + const supportTopics = []; + + // Split topics into skill-based and conversational + for (const topic of member.peerSupport.topics) { + if (CONVERSATIONAL_TOPICS.includes(topic)) { + supportTopics.push(topic); + } else { + skillTopics.push(topic); + } + } + + updates['peerSupport.skillTopics'] = skillTopics; + updates['peerSupport.supportTopics'] = supportTopics; + updates['$unset'] = { + ...(updates['$unset'] || {}), + 'peerSupport.topics': 1 + }; + + console.log(` - Splitting peer support topics:`); + console.log(` Skill topics: ${skillTopics.join(', ') || 'none'}`); + console.log(` Support topics: ${supportTopics.join(', ') || 'none'}`); + needsUpdate = true; + } + + // Remove privacy.skills if it exists + if (member.privacy?.skills) { + updates['$unset'] = { + ...(updates['$unset'] || {}), + 'privacy.skills': 1 + }; + needsUpdate = true; + } + + // Apply updates + if (needsUpdate) { + const updateOps = { ...updates }; + const unsetOps = updateOps.$unset; + delete updateOps.$unset; + + const finalUpdate = {}; + if (Object.keys(updateOps).length > 0) { + finalUpdate.$set = updateOps; + } + if (unsetOps && Object.keys(unsetOps).length > 0) { + finalUpdate.$unset = unsetOps; + } + + await Member.updateOne({ _id: member._id }, finalUpdate); + console.log(` ā Updated`); + migratedCount++; + } else { + skippedCount++; + } + } + + console.log('\n=== Migration Complete ==='); + console.log(`Total members: ${members.length}`); + console.log(`Migrated: ${migratedCount}`); + console.log(`Skipped (already migrated): ${skippedCount}`); + + } catch (error) { + console.error('Migration error:', error); + throw error; + } finally { + await mongoose.connection.close(); + console.log('\nDatabase connection closed'); + } +} + +// Run migration +migrateProfileFields() + .then(() => { + console.log('\nā Migration script completed successfully'); + process.exit(0); + }) + .catch((error) => { + console.error('\nā Migration script failed:', error); + process.exit(1); + }); diff --git a/server/api/auth/member.get.js b/server/api/auth/member.get.js index fdbbac4..d5e2a91 100644 --- a/server/api/auth/member.get.js +++ b/server/api/auth/member.get.js @@ -41,13 +41,14 @@ export default defineEventHandler(async (event) => { avatar: member.avatar, studio: member.studio, bio: member.bio, - skills: member.skills, location: member.location, socialLinks: member.socialLinks, offering: member.offering, lookingFor: member.lookingFor, showInDirectory: member.showInDirectory, privacy: member.privacy, + // Peer support + peerSupport: member.peerSupport, }; } catch (err) { console.error("Token verification error:", err); diff --git a/server/api/members/directory.get.js b/server/api/members/directory.get.js index 3c37b01..70c614e 100644 --- a/server/api/members/directory.get.js +++ b/server/api/members/directory.get.js @@ -24,7 +24,9 @@ export default defineEventHandler(async (event) => { const query = getQuery(event); const search = query.search || ""; const circle = query.circle || ""; - const skills = query.skills ? query.skills.split(",") : []; + const tags = query.tags ? query.tags.split(",") : []; + const peerSupport = query.peerSupport || ""; + const topics = query.topics ? query.topics.split(",") : []; // Build query const dbQuery = { @@ -37,6 +39,11 @@ export default defineEventHandler(async (event) => { dbQuery.circle = circle; } + // Filter by peer support availability + if (peerSupport === "true") { + dbQuery["peerSupport.enabled"] = true; + } + // Search by name or bio if (search) { dbQuery.$or = [ @@ -45,15 +52,41 @@ export default defineEventHandler(async (event) => { ]; } - // Filter by skills - if (skills.length > 0) { - dbQuery.skills = { $in: skills }; + // Filter by tags (search in offering.tags or lookingFor.tags) + if (tags.length > 0) { + dbQuery.$or = [ + { "offering.tags": { $in: tags } }, + { "lookingFor.tags": { $in: tags } }, + ]; + // If search is also present, combine with AND + if (search) { + dbQuery.$and = [ + { + $or: [ + { name: { $regex: search, $options: "i" } }, + { bio: { $regex: search, $options: "i" } }, + ], + }, + { + $or: [ + { "offering.tags": { $in: tags } }, + { "lookingFor.tags": { $in: tags } }, + ], + }, + ]; + delete dbQuery.$or; + } + } + + // Filter by peer support topics + if (topics.length > 0) { + dbQuery["peerSupport.topics"] = { $in: topics }; } try { const members = await Member.find(dbQuery) .select( - "name pronouns timeZone avatar studio bio skills location socialLinks offering lookingFor privacy circle createdAt" + "name pronouns timeZone avatar studio bio location socialLinks offering lookingFor privacy circle peerSupport slackUserId createdAt", ) .sort({ createdAt: -1 }) .lean(); @@ -83,26 +116,42 @@ export default defineEventHandler(async (event) => { if (isVisible("timeZone")) filtered.timeZone = member.timeZone; if (isVisible("studio")) filtered.studio = member.studio; if (isVisible("bio")) filtered.bio = member.bio; - if (isVisible("skills")) filtered.skills = member.skills; if (isVisible("location")) filtered.location = member.location; if (isVisible("socialLinks")) filtered.socialLinks = member.socialLinks; if (isVisible("offering")) filtered.offering = member.offering; if (isVisible("lookingFor")) filtered.lookingFor = member.lookingFor; + // Always show peer support if enabled (it's opt-in, so public by nature) + if (member.peerSupport?.enabled) { + filtered.peerSupport = member.peerSupport; + filtered.slackUserId = member.slackUserId; + } + return filtered; }); - // Get unique skills for filter options - const allSkills = members - .flatMap((m) => m.skills || []) - .filter((skill, index, self) => self.indexOf(skill) === index) + // Get unique tags for filter options (from both offering and lookingFor) + const allTags = members + .flatMap((m) => [ + ...(m.offering?.tags || []), + ...(m.lookingFor?.tags || []), + ]) + .filter((tag, index, self) => self.indexOf(tag) === index) + .sort(); + + // Get unique peer support topics + const allTopics = members + .filter((m) => m.peerSupport?.enabled) + .flatMap((m) => m.peerSupport?.topics || []) + .filter((topic, index, self) => self.indexOf(topic) === index) .sort(); return { members: filteredMembers, totalCount: filteredMembers.length, filters: { - availableSkills: allSkills, + availableSkills: allTags, + availableTopics: allTopics, }, }; } catch (error) { diff --git a/server/api/members/me/peer-support.patch.js b/server/api/members/me/peer-support.patch.js new file mode 100644 index 0000000..e9b9887 --- /dev/null +++ b/server/api/members/me/peer-support.patch.js @@ -0,0 +1,120 @@ +import jwt from "jsonwebtoken"; +import Member from "../../../models/member.js"; +import { connectDB } from "../../../utils/mongoose.js"; + +export default defineEventHandler(async (event) => { + await connectDB(); + + const token = getCookie(event, "auth-token"); + + if (!token) { + throw createError({ + statusCode: 401, + statusMessage: "Not authenticated", + }); + } + + let memberId; + try { + const decoded = jwt.verify(token, process.env.JWT_SECRET); + memberId = decoded.memberId; + } catch (err) { + throw createError({ + statusCode: 401, + statusMessage: "Invalid or expired token", + }); + } + + const body = await readBody(event); + + // Build update object for peer support settings + const updateData = { + "peerSupport.enabled": body.enabled || false, + "peerSupport.skillTopics": body.skillTopics || [], + "peerSupport.supportTopics": body.supportTopics || [], + "peerSupport.availability": body.availability || "", + "peerSupport.personalMessage": body.personalMessage || "", + "peerSupport.slackUsername": body.slackUsername || "", + }; + + // If Slack username provided and peer support enabled, try to fetch Slack user ID + if (body.enabled && body.slackUsername) { + try { + console.log( + `[Peer Support] Attempting to fetch Slack user ID for: ${body.slackUsername}`, + ); + + // Dynamically import the Slack service + const { getSlackService } = await import("../../../utils/slack.ts"); + const slackService = getSlackService(); + + if (slackService) { + console.log( + "[Peer Support] Slack service initialized, looking up user...", + ); + const slackUserId = await slackService.findUserIdByUsername( + body.slackUsername, + ); + + if (slackUserId) { + updateData["slackUserId"] = slackUserId; + console.log( + `[Peer Support] ā Found Slack user ID for ${body.slackUsername}: ${slackUserId}`, + ); + + // Now get/create the DM channel + console.log("[Peer Support] Opening DM channel..."); + const dmChannelId = await slackService.openDMChannel(slackUserId); + + if (dmChannelId) { + updateData["peerSupport.slackDMChannelId"] = dmChannelId; + console.log(`[Peer Support] ā Got DM channel ID: ${dmChannelId}`); + } else { + console.warn("[Peer Support] Could not get DM channel ID"); + } + } else { + console.warn( + `[Peer Support] Could not find Slack user ID for username: ${body.slackUsername}`, + ); + } + } else { + console.log( + "[Peer Support] Slack service not configured, skipping user ID lookup", + ); + } + } catch (error) { + console.error( + "[Peer Support] Error fetching Slack user ID:", + error.message, + ); + console.error("[Peer Support] Stack trace:", error.stack); + // Continue anyway - we'll still save the username + } + } + + try { + const member = await Member.findByIdAndUpdate( + memberId, + { $set: updateData }, + { new: true, runValidators: true }, + ); + + if (!member) { + throw createError({ + statusCode: 404, + statusMessage: "Member not found", + }); + } + + return { + success: true, + peerSupport: member.peerSupport, + }; + } catch (error) { + console.error("Peer support update error:", error); + throw createError({ + statusCode: 500, + statusMessage: "Failed to update peer support settings", + }); + } +}); diff --git a/server/api/members/profile.patch.js b/server/api/members/profile.patch.js index 1a7c03a..67eb598 100644 --- a/server/api/members/profile.patch.js +++ b/server/api/members/profile.patch.js @@ -34,11 +34,8 @@ export default defineEventHandler(async (event) => { "avatar", "studio", "bio", - "skills", "location", "socialLinks", - "offering", - "lookingFor", "showInDirectory", "helcimCustomerId", ]; @@ -50,7 +47,6 @@ export default defineEventHandler(async (event) => { "avatarPrivacy", "studioPrivacy", "bioPrivacy", - "skillsPrivacy", "locationPrivacy", "socialLinksPrivacy", "offeringPrivacy", @@ -66,6 +62,20 @@ export default defineEventHandler(async (event) => { } }); + // Handle offering and lookingFor separately (nested objects) + if (body.offering !== undefined) { + updateData.offering = { + text: body.offering.text || "", + tags: body.offering.tags || [], + }; + } + if (body.lookingFor !== undefined) { + updateData.lookingFor = { + text: body.lookingFor.text || "", + tags: body.lookingFor.tags || [], + }; + } + // Handle privacy settings privacyFields.forEach((privacyField) => { if (body[privacyField] !== undefined) { @@ -100,7 +110,6 @@ export default defineEventHandler(async (event) => { avatar: member.avatar, studio: member.studio, bio: member.bio, - skills: member.skills, location: member.location, socialLinks: member.socialLinks, offering: member.offering, diff --git a/server/api/peer-support.get.js b/server/api/peer-support.get.js new file mode 100644 index 0000000..04c5977 --- /dev/null +++ b/server/api/peer-support.get.js @@ -0,0 +1,63 @@ +import jwt from "jsonwebtoken"; +import Member from "../models/member.js"; +import { connectDB } from "../utils/mongoose.js"; + +export default defineEventHandler(async (event) => { + await connectDB(); + + // Check if user is authenticated (optional for this endpoint) + const token = getCookie(event, "auth-token"); + let isAuthenticated = false; + + if (token) { + try { + jwt.verify(token, process.env.JWT_SECRET); + isAuthenticated = true; + } catch (err) { + isAuthenticated = false; + } + } + + const query = getQuery(event); + const topic = query.topic; + + // Build query for peer supporters + const dbQuery = { + "peerSupport.enabled": true, + status: "active", + }; + + // Filter by topic if specified + if (topic) { + dbQuery["peerSupport.topics"] = topic; + } + + try { + const supporters = await Member.find(dbQuery) + .select( + "name avatar circle peerSupport slackUserId createdAt" + ) + .sort({ createdAt: -1 }) + .lean(); + + // Get unique topics for filter options + const allTopics = supporters + .flatMap((supporter) => supporter.peerSupport?.topics || []) + .filter((topic, index, self) => self.indexOf(topic) === index) + .sort(); + + return { + supporters, + totalCount: supporters.length, + filters: { + availableTopics: allTopics, + }, + }; + } catch (error) { + console.error("Peer support fetch error:", error); + throw createError({ + statusCode: 500, + statusMessage: "Failed to fetch peer supporters", + }); + } +}); diff --git a/server/api/test/peer-support-debug.get.js b/server/api/test/peer-support-debug.get.js new file mode 100644 index 0000000..09c169d --- /dev/null +++ b/server/api/test/peer-support-debug.get.js @@ -0,0 +1,28 @@ +import jwt from "jsonwebtoken"; +import Member from "../../models/member.js"; +import { connectDB } from "../../utils/mongoose.js"; + +export default defineEventHandler(async (event) => { + await connectDB(); + + const token = getCookie(event, "auth-token"); + if (!token) { + throw createError({ statusCode: 401, statusMessage: "Not authenticated" }); + } + + let memberId; + try { + const decoded = jwt.verify(token, process.env.JWT_SECRET); + memberId = decoded.memberId; + } catch (err) { + throw createError({ statusCode: 401, statusMessage: "Invalid token" }); + } + + const member = await Member.findById(memberId).select("name peerSupport slackUserId"); + + return { + name: member.name, + peerSupport: member.peerSupport, + slackUserId: member.slackUserId, + }; +}); diff --git a/server/migrations/fix-offering-lookingfor-structure.js b/server/migrations/fix-offering-lookingfor-structure.js new file mode 100644 index 0000000..4410d48 --- /dev/null +++ b/server/migrations/fix-offering-lookingfor-structure.js @@ -0,0 +1,62 @@ +// Migration to fix offering and lookingFor field structure +// Run this once to convert string values to object structure +import mongoose from "mongoose"; +import Member from "../models/member.js"; +import { connectDB } from "../utils/mongoose.js"; + +async function migrateOfferingLookingFor() { + await connectDB(); + + console.log("Starting migration: fixing offering and lookingFor structure..."); + + try { + // Find all members where offering or lookingFor is a string (not an object) + const members = await Member.find({ + $or: [ + { offering: { $type: "string" } }, + { lookingFor: { $type: "string" } }, + ], + }); + + console.log(`Found ${members.length} members to migrate`); + + for (const member of members) { + const updates = {}; + + // Convert offering if it's a string + if (typeof member.offering === "string") { + updates.offering = { + text: member.offering, + tags: [], + }; + console.log( + `Converting offering for member ${member._id}: "${member.offering}"`, + ); + } + + // Convert lookingFor if it's a string + if (typeof member.lookingFor === "string") { + updates.lookingFor = { + text: member.lookingFor, + tags: [], + }; + console.log( + `Converting lookingFor for member ${member._id}: "${member.lookingFor}"`, + ); + } + + // Update the member + if (Object.keys(updates).length > 0) { + await Member.findByIdAndUpdate(member._id, { $set: updates }); + } + } + + console.log("Migration completed successfully!"); + process.exit(0); + } catch (error) { + console.error("Migration failed:", error); + process.exit(1); + } +} + +migrateOfferingLookingFor(); diff --git a/server/models/member.js b/server/models/member.js index 0212ce4..7dcdad0 100644 --- a/server/models/member.js +++ b/server/models/member.js @@ -51,7 +51,6 @@ const memberSchema = new mongoose.Schema({ avatar: String, studio: String, bio: String, - skills: [String], location: String, socialLinks: { mastodon: String, @@ -59,10 +58,27 @@ const memberSchema = new mongoose.Schema({ website: String, other: String, }, - offering: String, - lookingFor: String, + offering: { + text: String, + tags: [String], + }, + lookingFor: { + text: String, + tags: [String], + }, showInDirectory: { type: Boolean, default: true }, + // Peer support settings + peerSupport: { + enabled: { type: Boolean, default: false }, + skillTopics: [String], // Auto-populated from offering.tags, editable + supportTopics: [String], // Curated conversational/emotional support topics + availability: String, + personalMessage: String, + slackUsername: String, + slackDMChannelId: String, // DM channel ID for direct messaging + }, + // Privacy settings for profile fields privacy: { pronouns: { @@ -90,11 +106,6 @@ const memberSchema = new mongoose.Schema({ enum: ["public", "members", "private"], default: "members", }, - skills: { - type: String, - enum: ["public", "members", "private"], - default: "members", - }, location: { type: String, enum: ["public", "members", "private"], diff --git a/server/utils/slack.ts b/server/utils/slack.ts index 3547694..875bae3 100644 --- a/server/utils/slack.ts +++ b/server/utils/slack.ts @@ -14,7 +14,7 @@ export class SlackService { */ async inviteUserToSlack( email: string, - realName: string + realName: string, ): Promise<{ success: boolean; userId?: string; @@ -34,7 +34,7 @@ export class SlackService { }); console.log( - `Successfully invited existing user ${email} to vetting channel` + `Successfully invited existing user ${email} to vetting channel`, ); return { success: true, @@ -65,7 +65,7 @@ export class SlackService { if (inviteResponse.ok && inviteResponse.user) { console.log( - `Successfully invited ${email} to workspace as single-channel guest` + `Successfully invited ${email} to workspace as single-channel guest`, ); return { success: true, @@ -79,7 +79,7 @@ export class SlackService { console.log( `Admin API not available or failed: ${ adminError.data?.error || adminError.message - }` + }`, ); // Fall back to manual process @@ -113,6 +113,67 @@ export class SlackService { } } + /** + * Find user ID by username (display name or real name) + */ + async findUserIdByUsername(username: string): Promise { + try { + const cleanUsername = username.replace("@", "").toLowerCase(); + + // List all users and search for matching username + const response = await this.client.users.list(); + + if (!response.members) { + return null; + } + + // Search for user by name or display_name + const user = response.members.find((member: any) => { + const name = member.name?.toLowerCase() || ""; + const realName = member.real_name?.toLowerCase() || ""; + const displayName = member.profile?.display_name?.toLowerCase() || ""; + + return ( + name === cleanUsername || + displayName === cleanUsername || + realName.includes(cleanUsername) + ); + }); + + return user?.id || null; + } catch (error) { + console.error("Error looking up Slack user by username:", error); + return null; + } + } + + /** + * Open/get a DM channel with a user and return the channel ID + * This creates or opens a DM conversation and returns the channel ID (starts with D) + */ + async openDMChannel(userId: string): Promise { + try { + const response = await this.client.conversations.open({ + users: userId, + }); + + if (response.ok && response.channel?.id) { + console.log( + `Opened DM channel for user ${userId}: ${response.channel.id}`, + ); + return response.channel.id; + } + + return null; + } catch (error: any) { + console.error( + "Error opening DM channel:", + error.data?.error || error.message, + ); + return null; + } + } + /** * Send a notification to the vetting channel about a new member */ @@ -121,7 +182,7 @@ export class SlackService { memberEmail: string, circle: string, contributionTier: string, - invitationStatus: string = "manual_invitation_required" + invitationStatus: string = "manual_invitation_required", ): Promise { try { let statusMessage = ""; @@ -224,7 +285,7 @@ export function getSlackService(): SlackService | null { if (!config.slackBotToken || !config.slackVettingChannelId) { console.warn( - "Slack integration not configured - missing bot token or channel ID" + "Slack integration not configured - missing bot token or channel ID", ); return null; }
We'd be happy to answer any questions you might have about Ghost Guild
{{ error }}
Loading event details...
The event you're looking for doesn't exist.
Date
{{ formatDate(event.startDate) }}
Time
{{ formatTime(event.startDate, event.endDate) }}
Location
{{ event.location }}
{{ event.description }}
{{ speaker.name }}
{{ speaker.role }}
{{ speaker.bio }}
If you have any questions about this event please drop us a line.
{{ event.content }}
Loading events...
Loading calendar...
Multi-part workshops and recurring events designed to deepen your knowledge and build community connections.
{{ series.description }}
Our events are ,Lorem ipsum, dolor sit amet consectetur adipisicing elit. Quibusdam exercitationem delectus ab voluptates aspernatur, quia deleniti aut maxime, veniam @@ -244,7 +244,7 @@ dolorum alias nulla!
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris @@ -265,31 +265,31 @@
Casual knowledge sharing sessions
Hands-on learning about cooperative and worker-centric business models
Game nights, socials, and more
A community for creatives and game devs exploring cooperative models
{{ circle.description }}
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation. @@ -98,7 +98,7 @@
Choose your circle to connect with others at your stage. Choose your contribution based on what you can afford. Everyone gets full access. @@ -30,8 +30,8 @@ :class="[ 'w-10 h-10 rounded-full flex items-center justify-center font-semibold', currentStep >= 1 - ? 'bg-gray-900 dark:bg-white text-white dark:text-gray-900' - : 'bg-gray-200 dark:bg-gray-700 text-gray-500', + ? 'bg-neutral-900 text-neutral-50' + : 'bg-neutral-200 text-neutral-500', ]" > 1 @@ -39,21 +39,16 @@ Information
Not sure? Start with Community - you can always move.
You're signing up for the {{ selectedTier.label }} plan
${{ selectedTier.amount }} CAD / month
Click "Complete Payment" below to open the secure payment modal and verify your payment method.
We've sent a confirmation email to {{ form.email }} with your membership details.
You will be automatically redirected to your dashboard in a few seconds...
Every member gets everything. Your circle helps you find relevant content and peers. Your contribution helps sustain our solidarity economy. @@ -355,13 +342,11 @@
Where are you in your co-op journey? Select based on where you are in your cooperative journey - exploring, building, or practicing. Not sure? Start with Community. @@ -419,18 +400,16 @@
What can you afford? ($0-50+/month) Choose based on your financial capacity. From $0 for those who need support to $50+ for those who can sponsor others. You can adjust anytime. @@ -441,18 +420,16 @@
Get instant access to everything. Fill out your profile, agree to our community guidelines, and complete payment (if applicable). You'll get instant access to our community. diff --git a/app/pages/login.vue b/app/pages/login.vue index 5a8cb6d..6d4bb2e 100644 --- a/app/pages/login.vue +++ b/app/pages/login.vue @@ -1,7 +1,7 @@ - - + - + Passwordless Login - + Enter your email to receive a secure login link - + @@ -34,7 +36,7 @@ - + @@ -46,8 +48,9 @@ - - We'll send you a secure login link via email. No password needed! + + We'll send you a secure login link via email. No password + needed! @@ -66,23 +69,31 @@ - - - ā Magic link sent! Check your email and click the link to sign in. + + + ā Magic link sent! Check your email and click the link to sign + in. - - - ā {{ loginError }} - + + ā {{ loginError }} - - Don't have an account? - + + Don't have an account? + Join Ghost Guild @@ -92,19 +103,25 @@ - + - + Forgot Password - + Enter your email to receive a password reset link - - + + - + @@ -129,8 +146,9 @@ - - We'll send you a secure link to reset your password. Check your email inbox and spam folder. + + We'll send you a secure link to reset your password. Check your + email inbox and spam folder. @@ -150,41 +168,44 @@ - - + + ā Password reset link sent! Check your email. - - - ā {{ resetError }} - + + ā {{ resetError }} - + - - Sign In - - + Sign In + - - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ready to access your account and connect with the community? + + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ready to + access your account and connect with the community? - - @@ -195,13 +216,13 @@ - + - + Access Your Dashboard - + @@ -209,53 +230,59 @@ - - - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Once you're logged in, you'll have access to: + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Once + you're logged in, you'll have access to: - + - Community forums and discussions + Community forums and discussions - Member directory and networking + Member directory and networking - Educational resources and workshops + Educational resources and workshops - Cooperative development tools + Cooperative development tools - Mentorship opportunities + Mentorship opportunities - Project collaboration spaces + Project collaboration spaces - - New to Ghost Guild? - - + New to Ghost Guild? + Create Your Account @@ -266,112 +293,112 @@ \ No newline at end of file +}; + diff --git a/app/pages/member/dashboard.vue b/app/pages/member/dashboard.vue index 1a6093a..ecc6243 100644 --- a/app/pages/member/dashboard.vue +++ b/app/pages/member/dashboard.vue @@ -18,7 +18,7 @@ - Loading your dashboard... + Loading your dashboard... @@ -36,10 +36,10 @@ - + Welcome to Ghost Guild, {{ memberData?.name }}! - + Your membership is active and you're part of our cooperative community. @@ -53,7 +53,7 @@ {{ memberData?.name?.charAt(0)?.toUpperCase() }} @@ -63,13 +63,13 @@ - Circle: + Circle: {{ memberData?.circle }} - Contribution: + Contribution: ${{ memberData?.contributionTier }} CAD/month @@ -86,28 +86,16 @@ }" > - + Quick Links - - - - - Post an Update - - @@ -120,7 +108,7 @@ @@ -133,7 +121,7 @@ @@ -146,7 +134,7 @@ @@ -179,10 +167,10 @@ - + Upcoming Events - + Discover and register for community events and workshops. @@ -191,7 +179,7 @@ to="/events" variant="outline" size="sm" - class="border-ghost-600 text-stone-200 hover:bg-ghost-800 hover:border-whisper-500" + class="border-ghost-600 text-ghost-200 hover:bg-ghost-800 hover:border-whisper-500" > View Events @@ -217,8 +205,8 @@ - Community - + Community + Connect with other members in your circle and beyond. @@ -227,7 +215,7 @@ to="/members" variant="outline" size="sm" - class="border-ghost-600 text-stone-200 hover:bg-ghost-800 hover:border-whisper-500" + class="border-ghost-600 text-ghost-200 hover:bg-ghost-800 hover:border-whisper-500" > Browse Members @@ -253,10 +241,10 @@ - + Account Settings - + Manage your profile and membership settings. @@ -265,7 +253,7 @@ to="/member/profile#account" variant="outline" size="sm" - class="border-ghost-600 text-stone-200 hover:bg-ghost-800 hover:border-whisper-500" + class="border-ghost-600 text-ghost-200 hover:bg-ghost-800 hover:border-whisper-500" > Manage Account @@ -283,14 +271,14 @@ > - + Your Upcoming Events Browse All Events @@ -334,10 +322,10 @@ /> - + {{ evt.title }} - + {{ formatEventDate(evt.startDate) }} @@ -351,7 +339,7 @@ @@ -361,108 +349,20 @@ - + You haven't registered for any upcoming events Browse Events - - - - - - - Community Pulse - - - View All - - - - - - - - - - - - - - {{ update.author.name.charAt(0).toUpperCase() }} - - - - - {{ update.author?.name }} - - - {{ formatTimeAgo(update.createdAt) }} - - - - {{ update.content }} - - - Read more - - - - - - - - No community updates yet - - Post the First Update - - - @@ -471,8 +371,6 @@ diff --git a/app/pages/updates/[id]/edit.vue b/app/pages/updates/[id]/edit.vue deleted file mode 100644 index b11e603..0000000 --- a/app/pages/updates/[id]/edit.vue +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - Loading update... - - - - - - - - - - ā Update saved successfully! - - - - - - Update not found - - Back to Updates - - - - - - - - diff --git a/app/pages/updates/[id]/index.vue b/app/pages/updates/[id]/index.vue deleted file mode 100644 index b1d6c99..0000000 --- a/app/pages/updates/[id]/index.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - - - - Loading update... - - - - - - - - - - Comments - Comments coming soon - - - - - - Back to Updates - - - - - - - {{ error }} - - Back to Updates - - - - - - - - - - - Cancel - - - Delete - - - - - - - - diff --git a/app/pages/updates/index.vue b/app/pages/updates/index.vue deleted file mode 100644 index dde1f05..0000000 --- a/app/pages/updates/index.vue +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - New Update - - - - - - - Loading updates... - - - - - - - - - - - Load More - - - - - - - - - - - - - No updates yet - - - Be the first to share an update with the community! - - - Post Your First Update - - - - - - - - - - - Cancel - - - Delete - - - - - - - - diff --git a/app/pages/updates/new.vue b/app/pages/updates/new.vue deleted file mode 100644 index b8f0a12..0000000 --- a/app/pages/updates/new.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - ā Update posted successfully! - - - - - - - - diff --git a/app/pages/updates/user/[id].vue b/app/pages/updates/user/[id].vue deleted file mode 100644 index e58f4a4..0000000 --- a/app/pages/updates/user/[id].vue +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - Loading updates... - - - - - - - - - - - Load More - - - - - - - - - - - - - No updates yet - - - {{ user?.name || "This user" }} hasn't posted any updates. - - - - - - - - - - - Cancel - - - Delete - - - - - - - - diff --git a/scripts/migrate-profile-fields.js b/scripts/migrate-profile-fields.js new file mode 100644 index 0000000..7a9ba72 --- /dev/null +++ b/scripts/migrate-profile-fields.js @@ -0,0 +1,163 @@ +/** + * Migration Script: Profile Fields Restructure + * + * This script migrates member data from the old schema to the new schema: + * - Removes `skills` field + * - Converts `offering` from String to { text: String, tags: [String] } + * - Converts `lookingFor` from String to { text: String, tags: [String] } + * - Converts `peerSupport.topics` to `peerSupport.skillTopics` and `peerSupport.supportTopics` + * - Removes `privacy.skills` + */ + +import mongoose from 'mongoose'; +import Member from '../server/models/member.js'; +import { connectDB } from '../server/utils/mongoose.js'; + +// Curated list of conversational support topics +const CONVERSATIONAL_TOPICS = [ + 'Co-founder relationships', + 'Burnout prevention', + 'Impostor syndrome', + 'Work-life boundaries', + 'Conflict resolution', + 'General chat & support', +]; + +async function migrateProfileFields() { + try { + await connectDB(); + console.log('Connected to database'); + + // Find all members + const members = await Member.find({}); + console.log(`Found ${members.length} members to migrate`); + + let migratedCount = 0; + let skippedCount = 0; + + for (const member of members) { + let needsUpdate = false; + const updates = {}; + + // Migrate skills -> offering.tags (if offering doesn't have tags yet) + if (member.skills && member.skills.length > 0) { + console.log(`\nMember ${member.name} (${member.email}):`); + console.log(` - Has skills: ${member.skills.join(', ')}`); + + // If offering is still a string, convert it and add skills as tags + if (typeof member.offering === 'string') { + updates['offering'] = { + text: member.offering || '', + tags: member.skills, // Move skills to offering tags + }; + console.log(` - Migrating skills to offering.tags`); + needsUpdate = true; + } + + // Remove skills field + updates.$unset = { skills: 1 }; + needsUpdate = true; + } + + // Migrate offering from string to object (if not already done) + if (typeof member.offering === 'string' && !updates['offering']) { + updates['offering'] = { + text: member.offering || '', + tags: [], + }; + console.log(` - Converting offering to object structure`); + needsUpdate = true; + } + + // Migrate lookingFor from string to object + if (typeof member.lookingFor === 'string') { + updates['lookingFor'] = { + text: member.lookingFor || '', + tags: [], + }; + console.log(` - Converting lookingFor to object structure`); + needsUpdate = true; + } + + // Migrate peer support topics + if (member.peerSupport?.topics && member.peerSupport.topics.length > 0) { + const skillTopics = []; + const supportTopics = []; + + // Split topics into skill-based and conversational + for (const topic of member.peerSupport.topics) { + if (CONVERSATIONAL_TOPICS.includes(topic)) { + supportTopics.push(topic); + } else { + skillTopics.push(topic); + } + } + + updates['peerSupport.skillTopics'] = skillTopics; + updates['peerSupport.supportTopics'] = supportTopics; + updates['$unset'] = { + ...(updates['$unset'] || {}), + 'peerSupport.topics': 1 + }; + + console.log(` - Splitting peer support topics:`); + console.log(` Skill topics: ${skillTopics.join(', ') || 'none'}`); + console.log(` Support topics: ${supportTopics.join(', ') || 'none'}`); + needsUpdate = true; + } + + // Remove privacy.skills if it exists + if (member.privacy?.skills) { + updates['$unset'] = { + ...(updates['$unset'] || {}), + 'privacy.skills': 1 + }; + needsUpdate = true; + } + + // Apply updates + if (needsUpdate) { + const updateOps = { ...updates }; + const unsetOps = updateOps.$unset; + delete updateOps.$unset; + + const finalUpdate = {}; + if (Object.keys(updateOps).length > 0) { + finalUpdate.$set = updateOps; + } + if (unsetOps && Object.keys(unsetOps).length > 0) { + finalUpdate.$unset = unsetOps; + } + + await Member.updateOne({ _id: member._id }, finalUpdate); + console.log(` ā Updated`); + migratedCount++; + } else { + skippedCount++; + } + } + + console.log('\n=== Migration Complete ==='); + console.log(`Total members: ${members.length}`); + console.log(`Migrated: ${migratedCount}`); + console.log(`Skipped (already migrated): ${skippedCount}`); + + } catch (error) { + console.error('Migration error:', error); + throw error; + } finally { + await mongoose.connection.close(); + console.log('\nDatabase connection closed'); + } +} + +// Run migration +migrateProfileFields() + .then(() => { + console.log('\nā Migration script completed successfully'); + process.exit(0); + }) + .catch((error) => { + console.error('\nā Migration script failed:', error); + process.exit(1); + }); diff --git a/server/api/auth/member.get.js b/server/api/auth/member.get.js index fdbbac4..d5e2a91 100644 --- a/server/api/auth/member.get.js +++ b/server/api/auth/member.get.js @@ -41,13 +41,14 @@ export default defineEventHandler(async (event) => { avatar: member.avatar, studio: member.studio, bio: member.bio, - skills: member.skills, location: member.location, socialLinks: member.socialLinks, offering: member.offering, lookingFor: member.lookingFor, showInDirectory: member.showInDirectory, privacy: member.privacy, + // Peer support + peerSupport: member.peerSupport, }; } catch (err) { console.error("Token verification error:", err); diff --git a/server/api/members/directory.get.js b/server/api/members/directory.get.js index 3c37b01..70c614e 100644 --- a/server/api/members/directory.get.js +++ b/server/api/members/directory.get.js @@ -24,7 +24,9 @@ export default defineEventHandler(async (event) => { const query = getQuery(event); const search = query.search || ""; const circle = query.circle || ""; - const skills = query.skills ? query.skills.split(",") : []; + const tags = query.tags ? query.tags.split(",") : []; + const peerSupport = query.peerSupport || ""; + const topics = query.topics ? query.topics.split(",") : []; // Build query const dbQuery = { @@ -37,6 +39,11 @@ export default defineEventHandler(async (event) => { dbQuery.circle = circle; } + // Filter by peer support availability + if (peerSupport === "true") { + dbQuery["peerSupport.enabled"] = true; + } + // Search by name or bio if (search) { dbQuery.$or = [ @@ -45,15 +52,41 @@ export default defineEventHandler(async (event) => { ]; } - // Filter by skills - if (skills.length > 0) { - dbQuery.skills = { $in: skills }; + // Filter by tags (search in offering.tags or lookingFor.tags) + if (tags.length > 0) { + dbQuery.$or = [ + { "offering.tags": { $in: tags } }, + { "lookingFor.tags": { $in: tags } }, + ]; + // If search is also present, combine with AND + if (search) { + dbQuery.$and = [ + { + $or: [ + { name: { $regex: search, $options: "i" } }, + { bio: { $regex: search, $options: "i" } }, + ], + }, + { + $or: [ + { "offering.tags": { $in: tags } }, + { "lookingFor.tags": { $in: tags } }, + ], + }, + ]; + delete dbQuery.$or; + } + } + + // Filter by peer support topics + if (topics.length > 0) { + dbQuery["peerSupport.topics"] = { $in: topics }; } try { const members = await Member.find(dbQuery) .select( - "name pronouns timeZone avatar studio bio skills location socialLinks offering lookingFor privacy circle createdAt" + "name pronouns timeZone avatar studio bio location socialLinks offering lookingFor privacy circle peerSupport slackUserId createdAt", ) .sort({ createdAt: -1 }) .lean(); @@ -83,26 +116,42 @@ export default defineEventHandler(async (event) => { if (isVisible("timeZone")) filtered.timeZone = member.timeZone; if (isVisible("studio")) filtered.studio = member.studio; if (isVisible("bio")) filtered.bio = member.bio; - if (isVisible("skills")) filtered.skills = member.skills; if (isVisible("location")) filtered.location = member.location; if (isVisible("socialLinks")) filtered.socialLinks = member.socialLinks; if (isVisible("offering")) filtered.offering = member.offering; if (isVisible("lookingFor")) filtered.lookingFor = member.lookingFor; + // Always show peer support if enabled (it's opt-in, so public by nature) + if (member.peerSupport?.enabled) { + filtered.peerSupport = member.peerSupport; + filtered.slackUserId = member.slackUserId; + } + return filtered; }); - // Get unique skills for filter options - const allSkills = members - .flatMap((m) => m.skills || []) - .filter((skill, index, self) => self.indexOf(skill) === index) + // Get unique tags for filter options (from both offering and lookingFor) + const allTags = members + .flatMap((m) => [ + ...(m.offering?.tags || []), + ...(m.lookingFor?.tags || []), + ]) + .filter((tag, index, self) => self.indexOf(tag) === index) + .sort(); + + // Get unique peer support topics + const allTopics = members + .filter((m) => m.peerSupport?.enabled) + .flatMap((m) => m.peerSupport?.topics || []) + .filter((topic, index, self) => self.indexOf(topic) === index) .sort(); return { members: filteredMembers, totalCount: filteredMembers.length, filters: { - availableSkills: allSkills, + availableSkills: allTags, + availableTopics: allTopics, }, }; } catch (error) { diff --git a/server/api/members/me/peer-support.patch.js b/server/api/members/me/peer-support.patch.js new file mode 100644 index 0000000..e9b9887 --- /dev/null +++ b/server/api/members/me/peer-support.patch.js @@ -0,0 +1,120 @@ +import jwt from "jsonwebtoken"; +import Member from "../../../models/member.js"; +import { connectDB } from "../../../utils/mongoose.js"; + +export default defineEventHandler(async (event) => { + await connectDB(); + + const token = getCookie(event, "auth-token"); + + if (!token) { + throw createError({ + statusCode: 401, + statusMessage: "Not authenticated", + }); + } + + let memberId; + try { + const decoded = jwt.verify(token, process.env.JWT_SECRET); + memberId = decoded.memberId; + } catch (err) { + throw createError({ + statusCode: 401, + statusMessage: "Invalid or expired token", + }); + } + + const body = await readBody(event); + + // Build update object for peer support settings + const updateData = { + "peerSupport.enabled": body.enabled || false, + "peerSupport.skillTopics": body.skillTopics || [], + "peerSupport.supportTopics": body.supportTopics || [], + "peerSupport.availability": body.availability || "", + "peerSupport.personalMessage": body.personalMessage || "", + "peerSupport.slackUsername": body.slackUsername || "", + }; + + // If Slack username provided and peer support enabled, try to fetch Slack user ID + if (body.enabled && body.slackUsername) { + try { + console.log( + `[Peer Support] Attempting to fetch Slack user ID for: ${body.slackUsername}`, + ); + + // Dynamically import the Slack service + const { getSlackService } = await import("../../../utils/slack.ts"); + const slackService = getSlackService(); + + if (slackService) { + console.log( + "[Peer Support] Slack service initialized, looking up user...", + ); + const slackUserId = await slackService.findUserIdByUsername( + body.slackUsername, + ); + + if (slackUserId) { + updateData["slackUserId"] = slackUserId; + console.log( + `[Peer Support] ā Found Slack user ID for ${body.slackUsername}: ${slackUserId}`, + ); + + // Now get/create the DM channel + console.log("[Peer Support] Opening DM channel..."); + const dmChannelId = await slackService.openDMChannel(slackUserId); + + if (dmChannelId) { + updateData["peerSupport.slackDMChannelId"] = dmChannelId; + console.log(`[Peer Support] ā Got DM channel ID: ${dmChannelId}`); + } else { + console.warn("[Peer Support] Could not get DM channel ID"); + } + } else { + console.warn( + `[Peer Support] Could not find Slack user ID for username: ${body.slackUsername}`, + ); + } + } else { + console.log( + "[Peer Support] Slack service not configured, skipping user ID lookup", + ); + } + } catch (error) { + console.error( + "[Peer Support] Error fetching Slack user ID:", + error.message, + ); + console.error("[Peer Support] Stack trace:", error.stack); + // Continue anyway - we'll still save the username + } + } + + try { + const member = await Member.findByIdAndUpdate( + memberId, + { $set: updateData }, + { new: true, runValidators: true }, + ); + + if (!member) { + throw createError({ + statusCode: 404, + statusMessage: "Member not found", + }); + } + + return { + success: true, + peerSupport: member.peerSupport, + }; + } catch (error) { + console.error("Peer support update error:", error); + throw createError({ + statusCode: 500, + statusMessage: "Failed to update peer support settings", + }); + } +}); diff --git a/server/api/members/profile.patch.js b/server/api/members/profile.patch.js index 1a7c03a..67eb598 100644 --- a/server/api/members/profile.patch.js +++ b/server/api/members/profile.patch.js @@ -34,11 +34,8 @@ export default defineEventHandler(async (event) => { "avatar", "studio", "bio", - "skills", "location", "socialLinks", - "offering", - "lookingFor", "showInDirectory", "helcimCustomerId", ]; @@ -50,7 +47,6 @@ export default defineEventHandler(async (event) => { "avatarPrivacy", "studioPrivacy", "bioPrivacy", - "skillsPrivacy", "locationPrivacy", "socialLinksPrivacy", "offeringPrivacy", @@ -66,6 +62,20 @@ export default defineEventHandler(async (event) => { } }); + // Handle offering and lookingFor separately (nested objects) + if (body.offering !== undefined) { + updateData.offering = { + text: body.offering.text || "", + tags: body.offering.tags || [], + }; + } + if (body.lookingFor !== undefined) { + updateData.lookingFor = { + text: body.lookingFor.text || "", + tags: body.lookingFor.tags || [], + }; + } + // Handle privacy settings privacyFields.forEach((privacyField) => { if (body[privacyField] !== undefined) { @@ -100,7 +110,6 @@ export default defineEventHandler(async (event) => { avatar: member.avatar, studio: member.studio, bio: member.bio, - skills: member.skills, location: member.location, socialLinks: member.socialLinks, offering: member.offering, diff --git a/server/api/peer-support.get.js b/server/api/peer-support.get.js new file mode 100644 index 0000000..04c5977 --- /dev/null +++ b/server/api/peer-support.get.js @@ -0,0 +1,63 @@ +import jwt from "jsonwebtoken"; +import Member from "../models/member.js"; +import { connectDB } from "../utils/mongoose.js"; + +export default defineEventHandler(async (event) => { + await connectDB(); + + // Check if user is authenticated (optional for this endpoint) + const token = getCookie(event, "auth-token"); + let isAuthenticated = false; + + if (token) { + try { + jwt.verify(token, process.env.JWT_SECRET); + isAuthenticated = true; + } catch (err) { + isAuthenticated = false; + } + } + + const query = getQuery(event); + const topic = query.topic; + + // Build query for peer supporters + const dbQuery = { + "peerSupport.enabled": true, + status: "active", + }; + + // Filter by topic if specified + if (topic) { + dbQuery["peerSupport.topics"] = topic; + } + + try { + const supporters = await Member.find(dbQuery) + .select( + "name avatar circle peerSupport slackUserId createdAt" + ) + .sort({ createdAt: -1 }) + .lean(); + + // Get unique topics for filter options + const allTopics = supporters + .flatMap((supporter) => supporter.peerSupport?.topics || []) + .filter((topic, index, self) => self.indexOf(topic) === index) + .sort(); + + return { + supporters, + totalCount: supporters.length, + filters: { + availableTopics: allTopics, + }, + }; + } catch (error) { + console.error("Peer support fetch error:", error); + throw createError({ + statusCode: 500, + statusMessage: "Failed to fetch peer supporters", + }); + } +}); diff --git a/server/api/test/peer-support-debug.get.js b/server/api/test/peer-support-debug.get.js new file mode 100644 index 0000000..09c169d --- /dev/null +++ b/server/api/test/peer-support-debug.get.js @@ -0,0 +1,28 @@ +import jwt from "jsonwebtoken"; +import Member from "../../models/member.js"; +import { connectDB } from "../../utils/mongoose.js"; + +export default defineEventHandler(async (event) => { + await connectDB(); + + const token = getCookie(event, "auth-token"); + if (!token) { + throw createError({ statusCode: 401, statusMessage: "Not authenticated" }); + } + + let memberId; + try { + const decoded = jwt.verify(token, process.env.JWT_SECRET); + memberId = decoded.memberId; + } catch (err) { + throw createError({ statusCode: 401, statusMessage: "Invalid token" }); + } + + const member = await Member.findById(memberId).select("name peerSupport slackUserId"); + + return { + name: member.name, + peerSupport: member.peerSupport, + slackUserId: member.slackUserId, + }; +}); diff --git a/server/migrations/fix-offering-lookingfor-structure.js b/server/migrations/fix-offering-lookingfor-structure.js new file mode 100644 index 0000000..4410d48 --- /dev/null +++ b/server/migrations/fix-offering-lookingfor-structure.js @@ -0,0 +1,62 @@ +// Migration to fix offering and lookingFor field structure +// Run this once to convert string values to object structure +import mongoose from "mongoose"; +import Member from "../models/member.js"; +import { connectDB } from "../utils/mongoose.js"; + +async function migrateOfferingLookingFor() { + await connectDB(); + + console.log("Starting migration: fixing offering and lookingFor structure..."); + + try { + // Find all members where offering or lookingFor is a string (not an object) + const members = await Member.find({ + $or: [ + { offering: { $type: "string" } }, + { lookingFor: { $type: "string" } }, + ], + }); + + console.log(`Found ${members.length} members to migrate`); + + for (const member of members) { + const updates = {}; + + // Convert offering if it's a string + if (typeof member.offering === "string") { + updates.offering = { + text: member.offering, + tags: [], + }; + console.log( + `Converting offering for member ${member._id}: "${member.offering}"`, + ); + } + + // Convert lookingFor if it's a string + if (typeof member.lookingFor === "string") { + updates.lookingFor = { + text: member.lookingFor, + tags: [], + }; + console.log( + `Converting lookingFor for member ${member._id}: "${member.lookingFor}"`, + ); + } + + // Update the member + if (Object.keys(updates).length > 0) { + await Member.findByIdAndUpdate(member._id, { $set: updates }); + } + } + + console.log("Migration completed successfully!"); + process.exit(0); + } catch (error) { + console.error("Migration failed:", error); + process.exit(1); + } +} + +migrateOfferingLookingFor(); diff --git a/server/models/member.js b/server/models/member.js index 0212ce4..7dcdad0 100644 --- a/server/models/member.js +++ b/server/models/member.js @@ -51,7 +51,6 @@ const memberSchema = new mongoose.Schema({ avatar: String, studio: String, bio: String, - skills: [String], location: String, socialLinks: { mastodon: String, @@ -59,10 +58,27 @@ const memberSchema = new mongoose.Schema({ website: String, other: String, }, - offering: String, - lookingFor: String, + offering: { + text: String, + tags: [String], + }, + lookingFor: { + text: String, + tags: [String], + }, showInDirectory: { type: Boolean, default: true }, + // Peer support settings + peerSupport: { + enabled: { type: Boolean, default: false }, + skillTopics: [String], // Auto-populated from offering.tags, editable + supportTopics: [String], // Curated conversational/emotional support topics + availability: String, + personalMessage: String, + slackUsername: String, + slackDMChannelId: String, // DM channel ID for direct messaging + }, + // Privacy settings for profile fields privacy: { pronouns: { @@ -90,11 +106,6 @@ const memberSchema = new mongoose.Schema({ enum: ["public", "members", "private"], default: "members", }, - skills: { - type: String, - enum: ["public", "members", "private"], - default: "members", - }, location: { type: String, enum: ["public", "members", "private"], diff --git a/server/utils/slack.ts b/server/utils/slack.ts index 3547694..875bae3 100644 --- a/server/utils/slack.ts +++ b/server/utils/slack.ts @@ -14,7 +14,7 @@ export class SlackService { */ async inviteUserToSlack( email: string, - realName: string + realName: string, ): Promise<{ success: boolean; userId?: string; @@ -34,7 +34,7 @@ export class SlackService { }); console.log( - `Successfully invited existing user ${email} to vetting channel` + `Successfully invited existing user ${email} to vetting channel`, ); return { success: true, @@ -65,7 +65,7 @@ export class SlackService { if (inviteResponse.ok && inviteResponse.user) { console.log( - `Successfully invited ${email} to workspace as single-channel guest` + `Successfully invited ${email} to workspace as single-channel guest`, ); return { success: true, @@ -79,7 +79,7 @@ export class SlackService { console.log( `Admin API not available or failed: ${ adminError.data?.error || adminError.message - }` + }`, ); // Fall back to manual process @@ -113,6 +113,67 @@ export class SlackService { } } + /** + * Find user ID by username (display name or real name) + */ + async findUserIdByUsername(username: string): Promise { + try { + const cleanUsername = username.replace("@", "").toLowerCase(); + + // List all users and search for matching username + const response = await this.client.users.list(); + + if (!response.members) { + return null; + } + + // Search for user by name or display_name + const user = response.members.find((member: any) => { + const name = member.name?.toLowerCase() || ""; + const realName = member.real_name?.toLowerCase() || ""; + const displayName = member.profile?.display_name?.toLowerCase() || ""; + + return ( + name === cleanUsername || + displayName === cleanUsername || + realName.includes(cleanUsername) + ); + }); + + return user?.id || null; + } catch (error) { + console.error("Error looking up Slack user by username:", error); + return null; + } + } + + /** + * Open/get a DM channel with a user and return the channel ID + * This creates or opens a DM conversation and returns the channel ID (starts with D) + */ + async openDMChannel(userId: string): Promise { + try { + const response = await this.client.conversations.open({ + users: userId, + }); + + if (response.ok && response.channel?.id) { + console.log( + `Opened DM channel for user ${userId}: ${response.channel.id}`, + ); + return response.channel.id; + } + + return null; + } catch (error: any) { + console.error( + "Error opening DM channel:", + error.data?.error || error.message, + ); + return null; + } + } + /** * Send a notification to the vetting channel about a new member */ @@ -121,7 +182,7 @@ export class SlackService { memberEmail: string, circle: string, contributionTier: string, - invitationStatus: string = "manual_invitation_required" + invitationStatus: string = "manual_invitation_required", ): Promise { try { let statusMessage = ""; @@ -224,7 +285,7 @@ export function getSlackService(): SlackService | null { if (!config.slackBotToken || !config.slackVettingChannelId) { console.warn( - "Slack integration not configured - missing bot token or channel ID" + "Slack integration not configured - missing bot token or channel ID", ); return null; }
Enter your email to receive a secure login link
- We'll send you a secure login link via email. No password needed! +
+ We'll send you a secure login link via email. No password + needed!
- ā Magic link sent! Check your email and click the link to sign in. +
+ ā Magic link sent! Check your email and click the link to sign + in.
- ā {{ loginError }} -
ā {{ loginError }}
- Don't have an account? - + + Don't have an account? + Join Ghost Guild @@ -92,19 +103,25 @@ - + - + Forgot Password - + Enter your email to receive a password reset link - - + + - + @@ -129,8 +146,9 @@ - - We'll send you a secure link to reset your password. Check your email inbox and spam folder. + + We'll send you a secure link to reset your password. Check your + email inbox and spam folder. @@ -150,41 +168,44 @@ - - + + ā Password reset link sent! Check your email. - - - ā {{ resetError }} - + + ā {{ resetError }} - + - - Sign In - - + Sign In + - - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ready to access your account and connect with the community? + + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ready to + access your account and connect with the community? - - @@ -195,13 +216,13 @@ - + - + Access Your Dashboard - + @@ -209,53 +230,59 @@ - - - Lorem ipsum dolor sit amet, consectetur adipiscing elit. Once you're logged in, you'll have access to: + + + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Once + you're logged in, you'll have access to: - + - Community forums and discussions + Community forums and discussions - Member directory and networking + Member directory and networking - Educational resources and workshops + Educational resources and workshops - Cooperative development tools + Cooperative development tools - Mentorship opportunities + Mentorship opportunities - Project collaboration spaces + Project collaboration spaces - - New to Ghost Guild? - - + New to Ghost Guild? + Create Your Account @@ -266,112 +293,112 @@ \ No newline at end of file +}; + diff --git a/app/pages/member/dashboard.vue b/app/pages/member/dashboard.vue index 1a6093a..ecc6243 100644 --- a/app/pages/member/dashboard.vue +++ b/app/pages/member/dashboard.vue @@ -18,7 +18,7 @@ - Loading your dashboard... + Loading your dashboard... @@ -36,10 +36,10 @@ - + Welcome to Ghost Guild, {{ memberData?.name }}! - + Your membership is active and you're part of our cooperative community. @@ -53,7 +53,7 @@ {{ memberData?.name?.charAt(0)?.toUpperCase() }} @@ -63,13 +63,13 @@ - Circle: + Circle: {{ memberData?.circle }} - Contribution: + Contribution: ${{ memberData?.contributionTier }} CAD/month @@ -86,28 +86,16 @@ }" > - + Quick Links - - - - - Post an Update - - @@ -120,7 +108,7 @@ @@ -133,7 +121,7 @@ @@ -146,7 +134,7 @@ @@ -179,10 +167,10 @@ - + Upcoming Events - + Discover and register for community events and workshops. @@ -191,7 +179,7 @@ to="/events" variant="outline" size="sm" - class="border-ghost-600 text-stone-200 hover:bg-ghost-800 hover:border-whisper-500" + class="border-ghost-600 text-ghost-200 hover:bg-ghost-800 hover:border-whisper-500" > View Events @@ -217,8 +205,8 @@ - Community - + Community + Connect with other members in your circle and beyond. @@ -227,7 +215,7 @@ to="/members" variant="outline" size="sm" - class="border-ghost-600 text-stone-200 hover:bg-ghost-800 hover:border-whisper-500" + class="border-ghost-600 text-ghost-200 hover:bg-ghost-800 hover:border-whisper-500" > Browse Members @@ -253,10 +241,10 @@ - + Account Settings - + Manage your profile and membership settings. @@ -265,7 +253,7 @@ to="/member/profile#account" variant="outline" size="sm" - class="border-ghost-600 text-stone-200 hover:bg-ghost-800 hover:border-whisper-500" + class="border-ghost-600 text-ghost-200 hover:bg-ghost-800 hover:border-whisper-500" > Manage Account @@ -283,14 +271,14 @@ > - + Your Upcoming Events Browse All Events @@ -334,10 +322,10 @@ /> - + {{ evt.title }} - + {{ formatEventDate(evt.startDate) }} @@ -351,7 +339,7 @@ @@ -361,108 +349,20 @@ - + You haven't registered for any upcoming events Browse Events - - - - - - - Community Pulse - - - View All - - - - - - - - - - - - - - {{ update.author.name.charAt(0).toUpperCase() }} - - - - - {{ update.author?.name }} - - - {{ formatTimeAgo(update.createdAt) }} - - - - {{ update.content }} - - - Read more - - - - - - - - No community updates yet - - Post the First Update - - - @@ -471,8 +371,6 @@ diff --git a/app/pages/updates/[id]/edit.vue b/app/pages/updates/[id]/edit.vue deleted file mode 100644 index b11e603..0000000 --- a/app/pages/updates/[id]/edit.vue +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - Loading update... - - - - - - - - - - ā Update saved successfully! - - - - - - Update not found - - Back to Updates - - - - - - - - diff --git a/app/pages/updates/[id]/index.vue b/app/pages/updates/[id]/index.vue deleted file mode 100644 index b1d6c99..0000000 --- a/app/pages/updates/[id]/index.vue +++ /dev/null @@ -1,153 +0,0 @@ - - - - - - - - - - - Loading update... - - - - - - - - - - Comments - Comments coming soon - - - - - - Back to Updates - - - - - - - {{ error }} - - Back to Updates - - - - - - - - - - - Cancel - - - Delete - - - - - - - - diff --git a/app/pages/updates/index.vue b/app/pages/updates/index.vue deleted file mode 100644 index dde1f05..0000000 --- a/app/pages/updates/index.vue +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - New Update - - - - - - - Loading updates... - - - - - - - - - - - Load More - - - - - - - - - - - - - No updates yet - - - Be the first to share an update with the community! - - - Post Your First Update - - - - - - - - - - - Cancel - - - Delete - - - - - - - - diff --git a/app/pages/updates/new.vue b/app/pages/updates/new.vue deleted file mode 100644 index b8f0a12..0000000 --- a/app/pages/updates/new.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - ā Update posted successfully! - - - - - - - - diff --git a/app/pages/updates/user/[id].vue b/app/pages/updates/user/[id].vue deleted file mode 100644 index e58f4a4..0000000 --- a/app/pages/updates/user/[id].vue +++ /dev/null @@ -1,193 +0,0 @@ - - - - - - - - - - - Loading updates... - - - - - - - - - - - Load More - - - - - - - - - - - - - No updates yet - - - {{ user?.name || "This user" }} hasn't posted any updates. - - - - - - - - - - - Cancel - - - Delete - - - - - - - - diff --git a/scripts/migrate-profile-fields.js b/scripts/migrate-profile-fields.js new file mode 100644 index 0000000..7a9ba72 --- /dev/null +++ b/scripts/migrate-profile-fields.js @@ -0,0 +1,163 @@ +/** + * Migration Script: Profile Fields Restructure + * + * This script migrates member data from the old schema to the new schema: + * - Removes `skills` field + * - Converts `offering` from String to { text: String, tags: [String] } + * - Converts `lookingFor` from String to { text: String, tags: [String] } + * - Converts `peerSupport.topics` to `peerSupport.skillTopics` and `peerSupport.supportTopics` + * - Removes `privacy.skills` + */ + +import mongoose from 'mongoose'; +import Member from '../server/models/member.js'; +import { connectDB } from '../server/utils/mongoose.js'; + +// Curated list of conversational support topics +const CONVERSATIONAL_TOPICS = [ + 'Co-founder relationships', + 'Burnout prevention', + 'Impostor syndrome', + 'Work-life boundaries', + 'Conflict resolution', + 'General chat & support', +]; + +async function migrateProfileFields() { + try { + await connectDB(); + console.log('Connected to database'); + + // Find all members + const members = await Member.find({}); + console.log(`Found ${members.length} members to migrate`); + + let migratedCount = 0; + let skippedCount = 0; + + for (const member of members) { + let needsUpdate = false; + const updates = {}; + + // Migrate skills -> offering.tags (if offering doesn't have tags yet) + if (member.skills && member.skills.length > 0) { + console.log(`\nMember ${member.name} (${member.email}):`); + console.log(` - Has skills: ${member.skills.join(', ')}`); + + // If offering is still a string, convert it and add skills as tags + if (typeof member.offering === 'string') { + updates['offering'] = { + text: member.offering || '', + tags: member.skills, // Move skills to offering tags + }; + console.log(` - Migrating skills to offering.tags`); + needsUpdate = true; + } + + // Remove skills field + updates.$unset = { skills: 1 }; + needsUpdate = true; + } + + // Migrate offering from string to object (if not already done) + if (typeof member.offering === 'string' && !updates['offering']) { + updates['offering'] = { + text: member.offering || '', + tags: [], + }; + console.log(` - Converting offering to object structure`); + needsUpdate = true; + } + + // Migrate lookingFor from string to object + if (typeof member.lookingFor === 'string') { + updates['lookingFor'] = { + text: member.lookingFor || '', + tags: [], + }; + console.log(` - Converting lookingFor to object structure`); + needsUpdate = true; + } + + // Migrate peer support topics + if (member.peerSupport?.topics && member.peerSupport.topics.length > 0) { + const skillTopics = []; + const supportTopics = []; + + // Split topics into skill-based and conversational + for (const topic of member.peerSupport.topics) { + if (CONVERSATIONAL_TOPICS.includes(topic)) { + supportTopics.push(topic); + } else { + skillTopics.push(topic); + } + } + + updates['peerSupport.skillTopics'] = skillTopics; + updates['peerSupport.supportTopics'] = supportTopics; + updates['$unset'] = { + ...(updates['$unset'] || {}), + 'peerSupport.topics': 1 + }; + + console.log(` - Splitting peer support topics:`); + console.log(` Skill topics: ${skillTopics.join(', ') || 'none'}`); + console.log(` Support topics: ${supportTopics.join(', ') || 'none'}`); + needsUpdate = true; + } + + // Remove privacy.skills if it exists + if (member.privacy?.skills) { + updates['$unset'] = { + ...(updates['$unset'] || {}), + 'privacy.skills': 1 + }; + needsUpdate = true; + } + + // Apply updates + if (needsUpdate) { + const updateOps = { ...updates }; + const unsetOps = updateOps.$unset; + delete updateOps.$unset; + + const finalUpdate = {}; + if (Object.keys(updateOps).length > 0) { + finalUpdate.$set = updateOps; + } + if (unsetOps && Object.keys(unsetOps).length > 0) { + finalUpdate.$unset = unsetOps; + } + + await Member.updateOne({ _id: member._id }, finalUpdate); + console.log(` ā Updated`); + migratedCount++; + } else { + skippedCount++; + } + } + + console.log('\n=== Migration Complete ==='); + console.log(`Total members: ${members.length}`); + console.log(`Migrated: ${migratedCount}`); + console.log(`Skipped (already migrated): ${skippedCount}`); + + } catch (error) { + console.error('Migration error:', error); + throw error; + } finally { + await mongoose.connection.close(); + console.log('\nDatabase connection closed'); + } +} + +// Run migration +migrateProfileFields() + .then(() => { + console.log('\nā Migration script completed successfully'); + process.exit(0); + }) + .catch((error) => { + console.error('\nā Migration script failed:', error); + process.exit(1); + }); diff --git a/server/api/auth/member.get.js b/server/api/auth/member.get.js index fdbbac4..d5e2a91 100644 --- a/server/api/auth/member.get.js +++ b/server/api/auth/member.get.js @@ -41,13 +41,14 @@ export default defineEventHandler(async (event) => { avatar: member.avatar, studio: member.studio, bio: member.bio, - skills: member.skills, location: member.location, socialLinks: member.socialLinks, offering: member.offering, lookingFor: member.lookingFor, showInDirectory: member.showInDirectory, privacy: member.privacy, + // Peer support + peerSupport: member.peerSupport, }; } catch (err) { console.error("Token verification error:", err); diff --git a/server/api/members/directory.get.js b/server/api/members/directory.get.js index 3c37b01..70c614e 100644 --- a/server/api/members/directory.get.js +++ b/server/api/members/directory.get.js @@ -24,7 +24,9 @@ export default defineEventHandler(async (event) => { const query = getQuery(event); const search = query.search || ""; const circle = query.circle || ""; - const skills = query.skills ? query.skills.split(",") : []; + const tags = query.tags ? query.tags.split(",") : []; + const peerSupport = query.peerSupport || ""; + const topics = query.topics ? query.topics.split(",") : []; // Build query const dbQuery = { @@ -37,6 +39,11 @@ export default defineEventHandler(async (event) => { dbQuery.circle = circle; } + // Filter by peer support availability + if (peerSupport === "true") { + dbQuery["peerSupport.enabled"] = true; + } + // Search by name or bio if (search) { dbQuery.$or = [ @@ -45,15 +52,41 @@ export default defineEventHandler(async (event) => { ]; } - // Filter by skills - if (skills.length > 0) { - dbQuery.skills = { $in: skills }; + // Filter by tags (search in offering.tags or lookingFor.tags) + if (tags.length > 0) { + dbQuery.$or = [ + { "offering.tags": { $in: tags } }, + { "lookingFor.tags": { $in: tags } }, + ]; + // If search is also present, combine with AND + if (search) { + dbQuery.$and = [ + { + $or: [ + { name: { $regex: search, $options: "i" } }, + { bio: { $regex: search, $options: "i" } }, + ], + }, + { + $or: [ + { "offering.tags": { $in: tags } }, + { "lookingFor.tags": { $in: tags } }, + ], + }, + ]; + delete dbQuery.$or; + } + } + + // Filter by peer support topics + if (topics.length > 0) { + dbQuery["peerSupport.topics"] = { $in: topics }; } try { const members = await Member.find(dbQuery) .select( - "name pronouns timeZone avatar studio bio skills location socialLinks offering lookingFor privacy circle createdAt" + "name pronouns timeZone avatar studio bio location socialLinks offering lookingFor privacy circle peerSupport slackUserId createdAt", ) .sort({ createdAt: -1 }) .lean(); @@ -83,26 +116,42 @@ export default defineEventHandler(async (event) => { if (isVisible("timeZone")) filtered.timeZone = member.timeZone; if (isVisible("studio")) filtered.studio = member.studio; if (isVisible("bio")) filtered.bio = member.bio; - if (isVisible("skills")) filtered.skills = member.skills; if (isVisible("location")) filtered.location = member.location; if (isVisible("socialLinks")) filtered.socialLinks = member.socialLinks; if (isVisible("offering")) filtered.offering = member.offering; if (isVisible("lookingFor")) filtered.lookingFor = member.lookingFor; + // Always show peer support if enabled (it's opt-in, so public by nature) + if (member.peerSupport?.enabled) { + filtered.peerSupport = member.peerSupport; + filtered.slackUserId = member.slackUserId; + } + return filtered; }); - // Get unique skills for filter options - const allSkills = members - .flatMap((m) => m.skills || []) - .filter((skill, index, self) => self.indexOf(skill) === index) + // Get unique tags for filter options (from both offering and lookingFor) + const allTags = members + .flatMap((m) => [ + ...(m.offering?.tags || []), + ...(m.lookingFor?.tags || []), + ]) + .filter((tag, index, self) => self.indexOf(tag) === index) + .sort(); + + // Get unique peer support topics + const allTopics = members + .filter((m) => m.peerSupport?.enabled) + .flatMap((m) => m.peerSupport?.topics || []) + .filter((topic, index, self) => self.indexOf(topic) === index) .sort(); return { members: filteredMembers, totalCount: filteredMembers.length, filters: { - availableSkills: allSkills, + availableSkills: allTags, + availableTopics: allTopics, }, }; } catch (error) { diff --git a/server/api/members/me/peer-support.patch.js b/server/api/members/me/peer-support.patch.js new file mode 100644 index 0000000..e9b9887 --- /dev/null +++ b/server/api/members/me/peer-support.patch.js @@ -0,0 +1,120 @@ +import jwt from "jsonwebtoken"; +import Member from "../../../models/member.js"; +import { connectDB } from "../../../utils/mongoose.js"; + +export default defineEventHandler(async (event) => { + await connectDB(); + + const token = getCookie(event, "auth-token"); + + if (!token) { + throw createError({ + statusCode: 401, + statusMessage: "Not authenticated", + }); + } + + let memberId; + try { + const decoded = jwt.verify(token, process.env.JWT_SECRET); + memberId = decoded.memberId; + } catch (err) { + throw createError({ + statusCode: 401, + statusMessage: "Invalid or expired token", + }); + } + + const body = await readBody(event); + + // Build update object for peer support settings + const updateData = { + "peerSupport.enabled": body.enabled || false, + "peerSupport.skillTopics": body.skillTopics || [], + "peerSupport.supportTopics": body.supportTopics || [], + "peerSupport.availability": body.availability || "", + "peerSupport.personalMessage": body.personalMessage || "", + "peerSupport.slackUsername": body.slackUsername || "", + }; + + // If Slack username provided and peer support enabled, try to fetch Slack user ID + if (body.enabled && body.slackUsername) { + try { + console.log( + `[Peer Support] Attempting to fetch Slack user ID for: ${body.slackUsername}`, + ); + + // Dynamically import the Slack service + const { getSlackService } = await import("../../../utils/slack.ts"); + const slackService = getSlackService(); + + if (slackService) { + console.log( + "[Peer Support] Slack service initialized, looking up user...", + ); + const slackUserId = await slackService.findUserIdByUsername( + body.slackUsername, + ); + + if (slackUserId) { + updateData["slackUserId"] = slackUserId; + console.log( + `[Peer Support] ā Found Slack user ID for ${body.slackUsername}: ${slackUserId}`, + ); + + // Now get/create the DM channel + console.log("[Peer Support] Opening DM channel..."); + const dmChannelId = await slackService.openDMChannel(slackUserId); + + if (dmChannelId) { + updateData["peerSupport.slackDMChannelId"] = dmChannelId; + console.log(`[Peer Support] ā Got DM channel ID: ${dmChannelId}`); + } else { + console.warn("[Peer Support] Could not get DM channel ID"); + } + } else { + console.warn( + `[Peer Support] Could not find Slack user ID for username: ${body.slackUsername}`, + ); + } + } else { + console.log( + "[Peer Support] Slack service not configured, skipping user ID lookup", + ); + } + } catch (error) { + console.error( + "[Peer Support] Error fetching Slack user ID:", + error.message, + ); + console.error("[Peer Support] Stack trace:", error.stack); + // Continue anyway - we'll still save the username + } + } + + try { + const member = await Member.findByIdAndUpdate( + memberId, + { $set: updateData }, + { new: true, runValidators: true }, + ); + + if (!member) { + throw createError({ + statusCode: 404, + statusMessage: "Member not found", + }); + } + + return { + success: true, + peerSupport: member.peerSupport, + }; + } catch (error) { + console.error("Peer support update error:", error); + throw createError({ + statusCode: 500, + statusMessage: "Failed to update peer support settings", + }); + } +}); diff --git a/server/api/members/profile.patch.js b/server/api/members/profile.patch.js index 1a7c03a..67eb598 100644 --- a/server/api/members/profile.patch.js +++ b/server/api/members/profile.patch.js @@ -34,11 +34,8 @@ export default defineEventHandler(async (event) => { "avatar", "studio", "bio", - "skills", "location", "socialLinks", - "offering", - "lookingFor", "showInDirectory", "helcimCustomerId", ]; @@ -50,7 +47,6 @@ export default defineEventHandler(async (event) => { "avatarPrivacy", "studioPrivacy", "bioPrivacy", - "skillsPrivacy", "locationPrivacy", "socialLinksPrivacy", "offeringPrivacy", @@ -66,6 +62,20 @@ export default defineEventHandler(async (event) => { } }); + // Handle offering and lookingFor separately (nested objects) + if (body.offering !== undefined) { + updateData.offering = { + text: body.offering.text || "", + tags: body.offering.tags || [], + }; + } + if (body.lookingFor !== undefined) { + updateData.lookingFor = { + text: body.lookingFor.text || "", + tags: body.lookingFor.tags || [], + }; + } + // Handle privacy settings privacyFields.forEach((privacyField) => { if (body[privacyField] !== undefined) { @@ -100,7 +110,6 @@ export default defineEventHandler(async (event) => { avatar: member.avatar, studio: member.studio, bio: member.bio, - skills: member.skills, location: member.location, socialLinks: member.socialLinks, offering: member.offering, diff --git a/server/api/peer-support.get.js b/server/api/peer-support.get.js new file mode 100644 index 0000000..04c5977 --- /dev/null +++ b/server/api/peer-support.get.js @@ -0,0 +1,63 @@ +import jwt from "jsonwebtoken"; +import Member from "../models/member.js"; +import { connectDB } from "../utils/mongoose.js"; + +export default defineEventHandler(async (event) => { + await connectDB(); + + // Check if user is authenticated (optional for this endpoint) + const token = getCookie(event, "auth-token"); + let isAuthenticated = false; + + if (token) { + try { + jwt.verify(token, process.env.JWT_SECRET); + isAuthenticated = true; + } catch (err) { + isAuthenticated = false; + } + } + + const query = getQuery(event); + const topic = query.topic; + + // Build query for peer supporters + const dbQuery = { + "peerSupport.enabled": true, + status: "active", + }; + + // Filter by topic if specified + if (topic) { + dbQuery["peerSupport.topics"] = topic; + } + + try { + const supporters = await Member.find(dbQuery) + .select( + "name avatar circle peerSupport slackUserId createdAt" + ) + .sort({ createdAt: -1 }) + .lean(); + + // Get unique topics for filter options + const allTopics = supporters + .flatMap((supporter) => supporter.peerSupport?.topics || []) + .filter((topic, index, self) => self.indexOf(topic) === index) + .sort(); + + return { + supporters, + totalCount: supporters.length, + filters: { + availableTopics: allTopics, + }, + }; + } catch (error) { + console.error("Peer support fetch error:", error); + throw createError({ + statusCode: 500, + statusMessage: "Failed to fetch peer supporters", + }); + } +}); diff --git a/server/api/test/peer-support-debug.get.js b/server/api/test/peer-support-debug.get.js new file mode 100644 index 0000000..09c169d --- /dev/null +++ b/server/api/test/peer-support-debug.get.js @@ -0,0 +1,28 @@ +import jwt from "jsonwebtoken"; +import Member from "../../models/member.js"; +import { connectDB } from "../../utils/mongoose.js"; + +export default defineEventHandler(async (event) => { + await connectDB(); + + const token = getCookie(event, "auth-token"); + if (!token) { + throw createError({ statusCode: 401, statusMessage: "Not authenticated" }); + } + + let memberId; + try { + const decoded = jwt.verify(token, process.env.JWT_SECRET); + memberId = decoded.memberId; + } catch (err) { + throw createError({ statusCode: 401, statusMessage: "Invalid token" }); + } + + const member = await Member.findById(memberId).select("name peerSupport slackUserId"); + + return { + name: member.name, + peerSupport: member.peerSupport, + slackUserId: member.slackUserId, + }; +}); diff --git a/server/migrations/fix-offering-lookingfor-structure.js b/server/migrations/fix-offering-lookingfor-structure.js new file mode 100644 index 0000000..4410d48 --- /dev/null +++ b/server/migrations/fix-offering-lookingfor-structure.js @@ -0,0 +1,62 @@ +// Migration to fix offering and lookingFor field structure +// Run this once to convert string values to object structure +import mongoose from "mongoose"; +import Member from "../models/member.js"; +import { connectDB } from "../utils/mongoose.js"; + +async function migrateOfferingLookingFor() { + await connectDB(); + + console.log("Starting migration: fixing offering and lookingFor structure..."); + + try { + // Find all members where offering or lookingFor is a string (not an object) + const members = await Member.find({ + $or: [ + { offering: { $type: "string" } }, + { lookingFor: { $type: "string" } }, + ], + }); + + console.log(`Found ${members.length} members to migrate`); + + for (const member of members) { + const updates = {}; + + // Convert offering if it's a string + if (typeof member.offering === "string") { + updates.offering = { + text: member.offering, + tags: [], + }; + console.log( + `Converting offering for member ${member._id}: "${member.offering}"`, + ); + } + + // Convert lookingFor if it's a string + if (typeof member.lookingFor === "string") { + updates.lookingFor = { + text: member.lookingFor, + tags: [], + }; + console.log( + `Converting lookingFor for member ${member._id}: "${member.lookingFor}"`, + ); + } + + // Update the member + if (Object.keys(updates).length > 0) { + await Member.findByIdAndUpdate(member._id, { $set: updates }); + } + } + + console.log("Migration completed successfully!"); + process.exit(0); + } catch (error) { + console.error("Migration failed:", error); + process.exit(1); + } +} + +migrateOfferingLookingFor(); diff --git a/server/models/member.js b/server/models/member.js index 0212ce4..7dcdad0 100644 --- a/server/models/member.js +++ b/server/models/member.js @@ -51,7 +51,6 @@ const memberSchema = new mongoose.Schema({ avatar: String, studio: String, bio: String, - skills: [String], location: String, socialLinks: { mastodon: String, @@ -59,10 +58,27 @@ const memberSchema = new mongoose.Schema({ website: String, other: String, }, - offering: String, - lookingFor: String, + offering: { + text: String, + tags: [String], + }, + lookingFor: { + text: String, + tags: [String], + }, showInDirectory: { type: Boolean, default: true }, + // Peer support settings + peerSupport: { + enabled: { type: Boolean, default: false }, + skillTopics: [String], // Auto-populated from offering.tags, editable + supportTopics: [String], // Curated conversational/emotional support topics + availability: String, + personalMessage: String, + slackUsername: String, + slackDMChannelId: String, // DM channel ID for direct messaging + }, + // Privacy settings for profile fields privacy: { pronouns: { @@ -90,11 +106,6 @@ const memberSchema = new mongoose.Schema({ enum: ["public", "members", "private"], default: "members", }, - skills: { - type: String, - enum: ["public", "members", "private"], - default: "members", - }, location: { type: String, enum: ["public", "members", "private"], diff --git a/server/utils/slack.ts b/server/utils/slack.ts index 3547694..875bae3 100644 --- a/server/utils/slack.ts +++ b/server/utils/slack.ts @@ -14,7 +14,7 @@ export class SlackService { */ async inviteUserToSlack( email: string, - realName: string + realName: string, ): Promise<{ success: boolean; userId?: string; @@ -34,7 +34,7 @@ export class SlackService { }); console.log( - `Successfully invited existing user ${email} to vetting channel` + `Successfully invited existing user ${email} to vetting channel`, ); return { success: true, @@ -65,7 +65,7 @@ export class SlackService { if (inviteResponse.ok && inviteResponse.user) { console.log( - `Successfully invited ${email} to workspace as single-channel guest` + `Successfully invited ${email} to workspace as single-channel guest`, ); return { success: true, @@ -79,7 +79,7 @@ export class SlackService { console.log( `Admin API not available or failed: ${ adminError.data?.error || adminError.message - }` + }`, ); // Fall back to manual process @@ -113,6 +113,67 @@ export class SlackService { } } + /** + * Find user ID by username (display name or real name) + */ + async findUserIdByUsername(username: string): Promise { + try { + const cleanUsername = username.replace("@", "").toLowerCase(); + + // List all users and search for matching username + const response = await this.client.users.list(); + + if (!response.members) { + return null; + } + + // Search for user by name or display_name + const user = response.members.find((member: any) => { + const name = member.name?.toLowerCase() || ""; + const realName = member.real_name?.toLowerCase() || ""; + const displayName = member.profile?.display_name?.toLowerCase() || ""; + + return ( + name === cleanUsername || + displayName === cleanUsername || + realName.includes(cleanUsername) + ); + }); + + return user?.id || null; + } catch (error) { + console.error("Error looking up Slack user by username:", error); + return null; + } + } + + /** + * Open/get a DM channel with a user and return the channel ID + * This creates or opens a DM conversation and returns the channel ID (starts with D) + */ + async openDMChannel(userId: string): Promise { + try { + const response = await this.client.conversations.open({ + users: userId, + }); + + if (response.ok && response.channel?.id) { + console.log( + `Opened DM channel for user ${userId}: ${response.channel.id}`, + ); + return response.channel.id; + } + + return null; + } catch (error: any) { + console.error( + "Error opening DM channel:", + error.data?.error || error.message, + ); + return null; + } + } + /** * Send a notification to the vetting channel about a new member */ @@ -121,7 +182,7 @@ export class SlackService { memberEmail: string, circle: string, contributionTier: string, - invitationStatus: string = "manual_invitation_required" + invitationStatus: string = "manual_invitation_required", ): Promise { try { let statusMessage = ""; @@ -224,7 +285,7 @@ export function getSlackService(): SlackService | null { if (!config.slackBotToken || !config.slackVettingChannelId) { console.warn( - "Slack integration not configured - missing bot token or channel ID" + "Slack integration not configured - missing bot token or channel ID", ); return null; }
+ Don't have an account? + Join Ghost Guild
Enter your email to receive a password reset link
- We'll send you a secure link to reset your password. Check your email inbox and spam folder. +
+ We'll send you a secure link to reset your password. Check your + email inbox and spam folder.
ā Password reset link sent! Check your email.
- ā {{ resetError }} -
ā {{ resetError }}
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ready to access your account and connect with the community? +
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Ready to + access your account and connect with the community?
- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Once you're logged in, you'll have access to: +
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Once + you're logged in, you'll have access to:
- New to Ghost Guild? -
New to Ghost Guild?
Loading your dashboard...
Your membership is active and you're part of our cooperative community.
Discover and register for community events and workshops.
Connect with other members in your circle and beyond.
Manage your profile and membership settings.
You haven't registered for any upcoming events
- {{ update.content }} -
No community updates yet
Loading update...
ā Update saved successfully!
Update not found
Comments coming soon
Loading updates...
- Be the first to share an update with the community! -
ā Update posted successfully!
- {{ user?.name || "This user" }} hasn't posted any updates. -