diff --git a/.env.example b/.env.example index ecae912..f432fde 100644 --- a/.env.example +++ b/.env.example @@ -64,7 +64,7 @@ VITE_MARKET_NADDR=naddr1qqjxgdp4vv6rydej943n2dny956rwwf4943xzwfc95ekyd3evenrsvrr # # In LOCAL DEV with `npm run dev:all` use the per-app dev ports (defined # in the vite configs): -# VITE_HUB_ACTIVITIES_URL=http://localhost:5181 +# VITE_HUB_EVENTS_URL=http://localhost:5181 # VITE_HUB_LIBRA_URL=http://localhost:5180 # VITE_HUB_WALLET_URL=http://localhost:5182 # VITE_HUB_CHAT_URL=http://localhost:5183 @@ -74,7 +74,7 @@ VITE_MARKET_NADDR=naddr1qqjxgdp4vv6rydej943n2dny956rwwf4943xzwfc95ekyd3evenrsvrr # VITE_HUB_RESTAURANT_URL=http://localhost:5187 # # In PATH-MODE production (recommended for demo) — note the trailing slash: -# VITE_HUB_ACTIVITIES_URL=https://demo.example.com/activities/ +# VITE_HUB_EVENTS_URL=https://demo.example.com/events/ # VITE_HUB_LIBRA_URL=https://demo.example.com/libra/ # VITE_HUB_WALLET_URL=https://demo.example.com/wallet/ # VITE_HUB_CHAT_URL=https://demo.example.com/chat/ @@ -84,11 +84,11 @@ VITE_MARKET_NADDR=naddr1qqjxgdp4vv6rydej943n2dny956rwwf4943xzwfc95ekyd3evenrsvrr # VITE_HUB_RESTAURANT_URL=https://demo.example.com/restaurant/ # # In SUBDOMAIN-MODE production: -# VITE_HUB_ACTIVITIES_URL=https://sortir.example.com +# VITE_HUB_EVENTS_URL=https://sortir.example.com # VITE_HUB_LIBRA_URL=https://libra.example.com # ...etc # ─────────────────────────────────────────────────────────────────────── -VITE_HUB_ACTIVITIES_URL= +VITE_HUB_EVENTS_URL= VITE_HUB_LIBRA_URL= VITE_HUB_WALLET_URL= VITE_HUB_CHAT_URL= diff --git a/activities.html b/events.html similarity index 77% rename from activities.html rename to events.html index b555a4d..143d21a 100644 --- a/activities.html +++ b/events.html @@ -9,12 +9,12 @@ - Sortir — Activités + Sortir — Events - +
- + diff --git a/package.json b/package.json index 1770e19..5916f09 100644 --- a/package.json +++ b/package.json @@ -9,9 +9,9 @@ "build": "vue-tsc -b && vite build", "preview": "vite preview --host", "analyze": "vite build --mode analyze", - "dev:activities": "vite --host --config vite.activities.config.ts", - "build:activities": "vue-tsc -b && vite build --config vite.activities.config.ts", - "preview:activities": "vite preview --host --config vite.activities.config.ts", + "dev:events": "vite --host --config vite.events.config.ts", + "build:events": "vue-tsc -b && vite build --config vite.events.config.ts", + "preview:events": "vite preview --host --config vite.events.config.ts", "dev:libra": "vite --host --config vite.libra.config.ts", "build:libra": "vue-tsc -b && vite build --config vite.libra.config.ts", "preview:libra": "vite preview --host --config vite.libra.config.ts", @@ -33,8 +33,8 @@ "dev:restaurant": "vite --host --config vite.restaurant.config.ts", "build:restaurant": "vue-tsc -b && vite build --config vite.restaurant.config.ts", "preview:restaurant": "vite preview --host --config vite.restaurant.config.ts", - "dev:all": "concurrently -n hub,libra,sortir,wallet,chat,forum,market,tasks,restaurant -c blue,magenta,cyan,yellow,green,blue,red,gray,green \"npm:dev\" \"npm:dev:libra\" \"npm:dev:activities\" \"npm:dev:wallet\" \"npm:dev:chat\" \"npm:dev:forum\" \"npm:dev:market\" \"npm:dev:tasks\" \"npm:dev:restaurant\"", - "build:demo": "npm run build && VITE_BASE_PATH=/sortir/ npm run build:activities && VITE_BASE_PATH=/libra/ npm run build:libra && VITE_BASE_PATH=/wallet/ npm run build:wallet && VITE_BASE_PATH=/chat/ npm run build:chat && VITE_BASE_PATH=/forum/ npm run build:forum && VITE_BASE_PATH=/market/ npm run build:market && VITE_BASE_PATH=/tasks/ npm run build:tasks && VITE_BASE_PATH=/restaurant/ npm run build:restaurant", + "dev:all": "concurrently -n hub,libra,sortir,wallet,chat,forum,market,tasks,restaurant -c blue,magenta,cyan,yellow,green,blue,red,gray,green \"npm:dev\" \"npm:dev:libra\" \"npm:dev:events\" \"npm:dev:wallet\" \"npm:dev:chat\" \"npm:dev:forum\" \"npm:dev:market\" \"npm:dev:tasks\" \"npm:dev:restaurant\"", + "build:demo": "npm run build && VITE_BASE_PATH=/sortir/ npm run build:events && VITE_BASE_PATH=/libra/ npm run build:libra && VITE_BASE_PATH=/wallet/ npm run build:wallet && VITE_BASE_PATH=/chat/ npm run build:chat && VITE_BASE_PATH=/forum/ npm run build:forum && VITE_BASE_PATH=/market/ npm run build:market && VITE_BASE_PATH=/tasks/ npm run build:tasks && VITE_BASE_PATH=/restaurant/ npm run build:restaurant", "electron:dev": "concurrently \"vite --host\" \"electron-forge start\"", "electron:build": "vue-tsc -b && vite build && electron-builder", "electron:package": "electron-builder", diff --git a/src/app.config.ts b/src/app.config.ts index c1447ea..6753927 100644 --- a/src/app.config.ts +++ b/src/app.config.ts @@ -3,8 +3,8 @@ import type { AppConfig } from './core/types' /** * Minimal AIO hub configuration. * The all-in-one app at app.${domain} ships only the base module — - * each feature module (wallet, chat, market, tasks, forum, activities, - * libra) is now its own standalone PWA at its own subdomain. + * each feature module (wallet, chat, market, tasks, forum, events, + * libra) is now its own standalone PWA at its own subdomain. */ export const appConfig: AppConfig = { modules: { diff --git a/src/app.ts b/src/app.ts index 557c324..48ce5e9 100644 --- a/src/app.ts +++ b/src/app.ts @@ -20,7 +20,7 @@ import { installLenientAuthGuard, markAuthReady, catchAllRoute } from '@/lib/rou * * The all-in-one app at app.${domain} now ships only the base module * plus a chakra icon hub linking out to the standalone module apps - * (wallet, chat, market, tasks, forum, activities, libra). + * (wallet, chat, market, tasks, forum, events, libra). */ export async function createAppInstance() { console.log('🚀 Starting AIO hub...') diff --git a/src/composables/useModularNavigation.ts b/src/composables/useModularNavigation.ts index a29efd2..17a6abc 100644 --- a/src/composables/useModularNavigation.ts +++ b/src/composables/useModularNavigation.ts @@ -26,7 +26,7 @@ export function useModularNavigation() { items.push({ name: t('nav.home'), href: '/', requiresAuth: true }) // Add navigation items based on enabled modules - if (appConfig.modules.activities?.enabled) { + if (appConfig.modules.events?.enabled) { items.push({ name: t('nav.events'), href: '/events', @@ -67,14 +67,20 @@ export function useModularNavigation() { const userMenuItems = computed(() => { const items: NavigationItem[] = [] - // Activities module items (events + tickets) - if (appConfig.modules.activities?.enabled) { + // Events module items (tickets + my events) + if (appConfig.modules.events?.enabled) { items.push({ name: 'My Tickets', href: '/my-tickets', icon: 'Ticket', requiresAuth: true }) + items.push({ + name: 'My Events', + href: '/my-events', + icon: 'CalendarPlus', + requiresAuth: true + }) } // Market module items diff --git a/src/core/di-container.ts b/src/core/di-container.ts index fa6e762..f406812 100644 --- a/src/core/di-container.ts +++ b/src/core/di-container.ts @@ -147,9 +147,9 @@ export const SERVICE_TOKENS = { // Nostr transport (kind-21000 RPC over relays — LNbits backend) NOSTR_TRANSPORT_SERVICE: Symbol('nostrTransportService'), - // Activities services (Nostr-native events + ticketing module) - ACTIVITIES_NOSTR_SERVICE: Symbol('activitiesNostrService'), - ACTIVITIES_TICKET_API: Symbol('activitiesTicketApi'), + // Events services (Nostr-native NIP-52 calendar events + LNbits ticketing) + EVENTS_NOSTR_SERVICE: Symbol('eventsNostrService'), + EVENTS_TICKET_API: Symbol('eventsTicketApi'), TICKET_API: Symbol('ticketApi'), // Invoice services diff --git a/src/activities-app/App.vue b/src/events-app/App.vue similarity index 61% rename from src/activities-app/App.vue rename to src/events-app/App.vue index ac80413..2540dad 100644 --- a/src/activities-app/App.vue +++ b/src/events-app/App.vue @@ -7,38 +7,38 @@ import { CalendarDays, Map, Heart, Search, Plus } from 'lucide-vue-next' import AppShell from '@/components/layout/AppShell.vue' import type { BottomTab } from '@/components/layout/BottomNav.vue' import { useAuth } from '@/composables/useAuthService' -import { useActivitiesStore } from '@/modules/activities/stores/activities' -import { useActivities } from '@/modules/activities/composables/useActivities' -import { useApprovalState } from '@/modules/activities/composables/useApprovalState' +import { useEventsStore } from '@/modules/events/stores/events' +import { useEvents } from '@/modules/events/composables/useEvents' +import { useApprovalState } from '@/modules/events/composables/useApprovalState' import { injectService, SERVICE_TOKENS } from '@/core/di-container' -import type { TicketApiService } from '@/modules/activities/services/TicketApiService' -import type { CreateEventRequest } from '@/modules/activities/types/ticket' -import CreateEventDialog from '@/modules/activities/components/CreateEventDialog.vue' +import type { TicketApiService } from '@/modules/events/services/TicketApiService' +import type { CreateEventRequest } from '@/modules/events/types/ticket' +import CreateEventDialog from '@/modules/events/components/CreateEventDialog.vue' const route = useRoute() const router = useRouter() const { t } = useI18n() const { isAuthenticated, currentUser } = useAuth() -const activitiesStore = useActivitiesStore() +const eventsStore = useEventsStore() const { isAdmin, autoApprove } = useApprovalState() -// Used to merge own LNbits drafts into the activities feed right after +// Used to merge own LNbits drafts into the events feed right after // the user creates or edits an event — otherwise the new draft only -// surfaces on the next ActivitiesPage subscribe cycle. -const { loadOwnEvents } = useActivities() +// surfaces on the next EventsPage subscribe cycle. +const { loadOwnEvents } = useEvents() // Settings dropped — theme/lang/currency now live in the shared profile sheet. // Create lives in the bottom nav: when logged out, tapping it shows an // auth-prompt toast (mirroring BookmarkButton/RSVPButton) instead of // opening the dialog. Per-app placement deliberation tracked at #53. const tabs = computed(() => [ - { name: t('activities.nav.feed'), icon: Search, path: '/activities' }, - { name: t('activities.nav.calendar'), icon: CalendarDays, path: '/activities/calendar' }, + { name: t('events.nav.feed'), icon: Search, path: '/events' }, + { name: t('events.nav.calendar'), icon: CalendarDays, path: '/events/calendar' }, { - name: t('activities.createNew'), + name: t('events.createNew'), icon: Plus, onClick: () => { if (!isAuthenticated.value) { - toast.info('Log in to create an activity', { + toast.info('Log in to create an event', { action: { label: 'Log in', onClick: () => router.push('/login'), @@ -48,52 +48,52 @@ const tabs = computed(() => [ } // Defensively clear any lingering edit selection so the Create // tap always opens in Create mode regardless of a prior Edit. - activitiesStore.editingEvent = null - activitiesStore.showCreateDialog = true + eventsStore.editingEvent = null + eventsStore.showCreateDialog = true }, disabled: !isAuthenticated.value, }, - { name: t('activities.nav.map'), icon: Map, path: '/activities/map' }, + { name: t('events.nav.map'), icon: Map, path: '/events/map' }, { - name: t('activities.nav.favorites'), + name: t('events.nav.favorites'), icon: Heart, // path kept so the tab stays active-highlighted while the user is - // on /activities/favorites; onClick wins for the actual tap so we + // on /events/favorites; onClick wins for the actual tap so we // can gate on auth (mirrors the Create tab pattern above). - path: '/activities/favorites', + path: '/events/favorites', onClick: () => { if (!isAuthenticated.value) { - toast.info(t('activities.favorites.loginPrompt'), { + toast.info(t('events.favorites.loginPrompt'), { action: { - label: t('activities.favorites.logIn'), + label: t('events.favorites.logIn'), onClick: () => router.push('/login'), }, }) return } - router.push('/activities/favorites') + router.push('/events/favorites') }, disabled: !isAuthenticated.value, }, ]) -// Feed tab is active for the bare /activities route AND all sub-paths that -// aren't owned by another tab (e.g. /activities/ detail pages). +// Feed tab is active for the bare /events route AND all sub-paths that +// aren't owned by another tab (e.g. /events/ detail pages). function isActive(path: string): boolean { - if (path === '/activities') { + if (path === '/events') { return ( - route.path === '/activities' || - (route.path.startsWith('/activities/') && - !route.path.startsWith('/activities/calendar') && - !route.path.startsWith('/activities/map') && - !route.path.startsWith('/activities/favorites')) + route.path === '/events' || + (route.path.startsWith('/events/') && + !route.path.startsWith('/events/calendar') && + !route.path.startsWith('/events/map') && + !route.path.startsWith('/events/favorites')) ) } return route.path.startsWith(path) } // Dialog mount lives at shell level so the Create tab works from any route -// within the activities standalone, not just /activities. +// within the events standalone, not just /events. async function handleCreateEvent(eventData: CreateEventRequest) { const ticketApi = injectService(SERVICE_TOKENS.TICKET_API) as TicketApiService const invoiceKey = currentUser.value?.wallets?.[0]?.inkey @@ -105,7 +105,7 @@ async function handleUpdateEvent(eventId: string, eventData: CreateEventRequest) const ticketApi = injectService(SERVICE_TOKENS.TICKET_API) as TicketApiService // PUT /events/{id} requires the event's wallet admin key. const wallet = (currentUser.value?.wallets ?? []).find( - (w) => w.id === activitiesStore.editingEvent?.wallet, + (w) => w.id === eventsStore.editingEvent?.wallet, ) const adminKey = wallet?.adminkey if (!adminKey) { @@ -115,18 +115,18 @@ async function handleUpdateEvent(eventId: string, eventData: CreateEventRequest) } function handleDialogOpenChange(open: boolean) { - activitiesStore.showCreateDialog = open + eventsStore.showCreateDialog = open // Closing always clears the edit selection so the next "+ Create" // opens clean instead of inheriting the last-edited event. - if (!open) activitiesStore.editingEvent = null + if (!open) eventsStore.editingEvent = null }