Copy and layout improvements.
This commit is contained in:
parent
39eb9e039a
commit
02222a5c16
20 changed files with 464 additions and 652 deletions
|
|
@ -1,332 +0,0 @@
|
|||
<template>
|
||||
<PageShell
|
||||
title="Activity Log"
|
||||
subtitle="Your recent activity"
|
||||
>
|
||||
<ColumnsLayout cols="events-sidebar" :limit="5">
|
||||
<ClientOnly>
|
||||
<!-- Loading State -->
|
||||
<div v-if="loading && !entries.length" class="state-box">
|
||||
<div class="spinner"></div>
|
||||
<p class="state-text">Loading activity...</p>
|
||||
</div>
|
||||
|
||||
<!-- Timeline -->
|
||||
<div v-else-if="entries.length" class="timeline-wrap">
|
||||
<div class="timeline">
|
||||
<div v-for="entry in entries" :key="entry._id" class="tl-item">
|
||||
<div class="tl-dot">
|
||||
<UIcon :name="getActivity(entry).icon" class="tl-icon" />
|
||||
</div>
|
||||
<div class="tl-time">{{ formatDate(entry.timestamp) }}</div>
|
||||
<div class="tl-text">
|
||||
<template v-if="getActivity(entry).link">
|
||||
<span>{{ getActivity(entry).text.split(getActivity(entry).linkText)[0] }}</span>
|
||||
<NuxtLink :to="getActivity(entry).link" class="tl-link">{{ getActivity(entry).linkText }}</NuxtLink>
|
||||
</template>
|
||||
<span v-else>{{ getActivity(entry).text }}</span>
|
||||
<span v-if="entry.performedBy" class="tl-admin-badge">admin</span>
|
||||
</div>
|
||||
|
||||
<!-- Email body expandable -->
|
||||
<div v-if="entry.type === 'email_sent' && getActivity(entry).emailBody" class="tl-email">
|
||||
<button class="tl-email-toggle" @click="toggleEmail(entry._id)">
|
||||
{{ expandedEmails[entry._id] ? 'Hide email' : 'View email' }}
|
||||
</button>
|
||||
<div v-if="expandedEmails[entry._id]" class="dashed-box tl-email-body">
|
||||
<pre>{{ getActivity(entry).emailBody }}</pre>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Load More -->
|
||||
<div v-if="hasMore" class="load-more">
|
||||
<button class="btn" :disabled="loadingMore" @click="loadMore">
|
||||
{{ loadingMore ? 'Loading...' : 'Load More' }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Empty State -->
|
||||
<div v-else class="state-box">
|
||||
<div class="state-icon">
|
||||
<UIcon name="i-lucide-activity" />
|
||||
</div>
|
||||
<h2 class="state-heading">No activity yet</h2>
|
||||
<p class="state-text">Your activity will appear here as you use the Guild</p>
|
||||
</div>
|
||||
|
||||
<template #fallback>
|
||||
<div class="state-box">
|
||||
<div class="spinner"></div>
|
||||
<p class="state-text">Loading activity...</p>
|
||||
</div>
|
||||
</template>
|
||||
</ClientOnly>
|
||||
</ColumnsLayout>
|
||||
</PageShell>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { formatActivity } from '~/utils/activityText'
|
||||
|
||||
const entries = ref([])
|
||||
const loading = ref(false)
|
||||
const loadingMore = ref(false)
|
||||
const hasMore = ref(false)
|
||||
const nextCursor = ref(null)
|
||||
const expandedEmails = ref({})
|
||||
|
||||
const getActivity = (entry) => formatActivity(entry)
|
||||
|
||||
const toggleEmail = (id) => {
|
||||
expandedEmails.value[id] = !expandedEmails.value[id]
|
||||
}
|
||||
|
||||
const formatDate = (date) => {
|
||||
const now = new Date()
|
||||
const d = new Date(date)
|
||||
const diffInSeconds = Math.floor((now - d) / 1000)
|
||||
|
||||
if (diffInSeconds < 60) return 'just now'
|
||||
if (diffInSeconds < 3600) return `${Math.floor(diffInSeconds / 60)} minutes ago`
|
||||
if (diffInSeconds < 86400) return `${Math.floor(diffInSeconds / 3600)} hours ago`
|
||||
if (diffInSeconds < 604800) return `${Math.floor(diffInSeconds / 86400)} days ago`
|
||||
|
||||
return d.toLocaleDateString('en-US', {
|
||||
month: 'short',
|
||||
day: 'numeric',
|
||||
year: d.getFullYear() !== now.getFullYear() ? 'numeric' : undefined
|
||||
})
|
||||
}
|
||||
|
||||
const loadEntries = async () => {
|
||||
loading.value = true
|
||||
try {
|
||||
const data = await $fetch('/api/members/me/activity', {
|
||||
params: { limit: 20 }
|
||||
})
|
||||
entries.value = data.entries
|
||||
hasMore.value = data.hasMore
|
||||
nextCursor.value = data.nextCursor
|
||||
} catch (err) {
|
||||
console.error('Failed to load activity:', err)
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const loadMore = async () => {
|
||||
if (!nextCursor.value) return
|
||||
loadingMore.value = true
|
||||
try {
|
||||
const data = await $fetch('/api/members/me/activity', {
|
||||
params: { limit: 20, before: nextCursor.value }
|
||||
})
|
||||
entries.value.push(...data.entries)
|
||||
hasMore.value = data.hasMore
|
||||
nextCursor.value = data.nextCursor
|
||||
} catch (err) {
|
||||
console.error('Failed to load more activity:', err)
|
||||
} finally {
|
||||
loadingMore.value = false
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(loadEntries)
|
||||
|
||||
useHead({ title: 'Activity Log - Ghost Guild' })
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
/* ---- STATE BOXES ---- */
|
||||
.state-box {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
padding: 64px 32px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.state-icon {
|
||||
width: 48px;
|
||||
height: 48px;
|
||||
border: 1px dashed var(--border);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
margin-bottom: 16px;
|
||||
color: var(--text-faint);
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
.state-heading {
|
||||
font-family: 'Brygada 1918', serif;
|
||||
font-size: 18px;
|
||||
font-weight: 600;
|
||||
color: var(--text-bright);
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
|
||||
.state-text {
|
||||
font-size: 12px;
|
||||
color: var(--text-dim);
|
||||
margin-bottom: 20px;
|
||||
max-width: 320px;
|
||||
}
|
||||
|
||||
.spinner {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
border: 2px dashed var(--candle);
|
||||
border-top-color: transparent;
|
||||
border-radius: 50%;
|
||||
animation: spin 0.8s linear infinite;
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
|
||||
@keyframes spin {
|
||||
to { transform: rotate(360deg); }
|
||||
}
|
||||
|
||||
/* ---- TIMELINE ---- */
|
||||
.timeline-wrap {
|
||||
padding: 24px 32px 48px;
|
||||
}
|
||||
|
||||
.timeline {
|
||||
position: relative;
|
||||
padding-left: 32px;
|
||||
}
|
||||
|
||||
.timeline::before {
|
||||
content: '';
|
||||
position: absolute;
|
||||
left: 11px;
|
||||
top: 0;
|
||||
bottom: 0;
|
||||
width: 1px;
|
||||
border-left: 1px dashed var(--border);
|
||||
}
|
||||
|
||||
.tl-item {
|
||||
position: relative;
|
||||
padding: 0 0 24px;
|
||||
}
|
||||
|
||||
.tl-item:last-child {
|
||||
padding-bottom: 0;
|
||||
}
|
||||
|
||||
.tl-dot {
|
||||
position: absolute;
|
||||
left: -32px;
|
||||
top: 2px;
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
background: var(--bg);
|
||||
border: 1px dashed var(--border);
|
||||
font-size: 12px;
|
||||
color: var(--text-dim);
|
||||
}
|
||||
|
||||
.tl-icon {
|
||||
width: 12px;
|
||||
height: 12px;
|
||||
}
|
||||
|
||||
.tl-time {
|
||||
font-size: 11px;
|
||||
color: var(--text-faint);
|
||||
margin-bottom: 2px;
|
||||
}
|
||||
|
||||
.tl-text {
|
||||
font-size: 13px;
|
||||
color: var(--text);
|
||||
line-height: 1.5;
|
||||
display: flex;
|
||||
align-items: baseline;
|
||||
gap: 4px;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.tl-link {
|
||||
color: var(--candle);
|
||||
text-decoration: none;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.tl-link:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
.tl-admin-badge {
|
||||
font-size: 10px;
|
||||
color: var(--text-faint);
|
||||
border: 1px dashed var(--border);
|
||||
padding: 1px 5px;
|
||||
margin-left: 4px;
|
||||
}
|
||||
|
||||
/* ---- EMAIL EXPANDABLE ---- */
|
||||
.tl-email {
|
||||
margin-top: 4px;
|
||||
}
|
||||
|
||||
.tl-email-toggle {
|
||||
font-family: 'Commit Mono', monospace;
|
||||
font-size: 11px;
|
||||
color: var(--text-faint);
|
||||
background: none;
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
padding: 0;
|
||||
transition: color 0.15s;
|
||||
}
|
||||
|
||||
.tl-email-toggle:hover {
|
||||
color: var(--candle);
|
||||
}
|
||||
|
||||
.tl-email-body {
|
||||
margin-top: 6px;
|
||||
padding: 12px;
|
||||
font-size: 12px;
|
||||
color: var(--text-dim);
|
||||
line-height: 1.6;
|
||||
max-height: 300px;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.tl-email-body pre {
|
||||
white-space: pre-wrap;
|
||||
word-break: break-word;
|
||||
font-family: 'Commit Mono', monospace;
|
||||
font-size: 12px;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
/* ---- LOAD MORE ---- */
|
||||
.load-more {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
padding-top: 8px;
|
||||
}
|
||||
|
||||
/* ---- RESPONSIVE ---- */
|
||||
@media (max-width: 768px) {
|
||||
.timeline-wrap {
|
||||
padding: 20px 20px 40px;
|
||||
}
|
||||
|
||||
.state-box {
|
||||
padding: 48px 20px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -90,8 +90,8 @@
|
|||
<strong>How to Subscribe to Your Calendar</strong>
|
||||
<button
|
||||
type="button"
|
||||
@click="showCalendarInstructions = false"
|
||||
class="ci-close"
|
||||
@click="showCalendarInstructions = false"
|
||||
>
|
||||
×
|
||||
</button>
|
||||
|
|
@ -192,14 +192,14 @@
|
|||
</div>
|
||||
|
||||
<div class="content-block">
|
||||
<div class="section-label">Community</div>
|
||||
<div class="section-label">Bulletin Board</div>
|
||||
<DashedBox>
|
||||
<p class="peer-text">
|
||||
Connect with other members through shared interests and
|
||||
Make offers and requests related to shared interests and
|
||||
cooperative topics.
|
||||
</p>
|
||||
<NuxtLink to="/board" class="section-link">
|
||||
Browse the board →
|
||||
Browse the Bulletin Board →
|
||||
</NuxtLink>
|
||||
</DashedBox>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -25,10 +25,7 @@
|
|||
|
||||
<template v-else>
|
||||
<!-- PAGE HEADER -->
|
||||
<PageHeader
|
||||
title="Edit Profile"
|
||||
subtitle="How you appear to other members"
|
||||
>
|
||||
<PageHeader title="Edit Profile">
|
||||
<NuxtLink
|
||||
v-if="
|
||||
memberId &&
|
||||
|
|
@ -234,6 +231,44 @@
|
|||
</div>
|
||||
</div>
|
||||
</PageSection>
|
||||
|
||||
<PageSection divider="top">
|
||||
<div class="section-label">Recent Activity</div>
|
||||
|
||||
<div v-if="activityLoading" class="activity-empty">
|
||||
Loading activity…
|
||||
</div>
|
||||
<ul v-else-if="recentActivity.length" class="activity-list">
|
||||
<li
|
||||
v-for="entry in recentActivity"
|
||||
:key="entry._id"
|
||||
class="activity-item"
|
||||
>
|
||||
<div class="activity-time">
|
||||
{{ formatActivityTime(entry.timestamp) }}
|
||||
</div>
|
||||
<div class="activity-text">
|
||||
<template v-if="formatActivity(entry).link">
|
||||
<span>{{
|
||||
formatActivity(entry).text.split(
|
||||
formatActivity(entry).linkText,
|
||||
)[0]
|
||||
}}</span>
|
||||
<NuxtLink
|
||||
:to="formatActivity(entry).link"
|
||||
class="activity-link"
|
||||
>
|
||||
{{ formatActivity(entry).linkText }}
|
||||
</NuxtLink>
|
||||
</template>
|
||||
<span v-else>{{ formatActivity(entry).text }}</span>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
<div v-else class="activity-empty">
|
||||
Your activity will appear here as you use the Guild.
|
||||
</div>
|
||||
</PageSection>
|
||||
</template>
|
||||
</ColumnsLayout>
|
||||
|
||||
|
|
@ -269,6 +304,7 @@
|
|||
<script setup>
|
||||
import { MEMBER_STATUSES } from "~/composables/useMemberStatus";
|
||||
import { TIMEZONE_OPTIONS } from "~/config/timezones";
|
||||
import { formatActivity } from "~/utils/activityText";
|
||||
|
||||
definePageMeta({
|
||||
middleware: "auth",
|
||||
|
|
@ -333,13 +369,8 @@ const timezoneItems = computed(() => {
|
|||
const notificationToggles = [
|
||||
{
|
||||
key: "events",
|
||||
label: "Event reminders",
|
||||
sub: "Get notified about upcoming events",
|
||||
},
|
||||
{
|
||||
key: "updates",
|
||||
label: "Community updates",
|
||||
sub: "New posts from members you follow",
|
||||
label: "Registration & cancellation emails",
|
||||
sub: "Confirmation when you register for an event, and notice if it's cancelled",
|
||||
},
|
||||
];
|
||||
|
||||
|
|
@ -370,7 +401,6 @@ const formData = reactive({
|
|||
boardSlackHandle: "",
|
||||
notifications: {
|
||||
events: true,
|
||||
updates: true,
|
||||
},
|
||||
});
|
||||
|
||||
|
|
@ -378,6 +408,39 @@ const loading = ref(false);
|
|||
const saving = ref(false);
|
||||
const initialData = ref(null);
|
||||
|
||||
const recentActivity = ref([]);
|
||||
const activityLoading = ref(false);
|
||||
|
||||
const formatActivityTime = (date) => {
|
||||
const now = new Date();
|
||||
const d = new Date(date);
|
||||
const diff = Math.floor((now - d) / 1000);
|
||||
if (diff < 60) return "just now";
|
||||
if (diff < 3600) return `${Math.floor(diff / 60)}m ago`;
|
||||
if (diff < 86400) return `${Math.floor(diff / 3600)}h ago`;
|
||||
if (diff < 604800) return `${Math.floor(diff / 86400)}d ago`;
|
||||
return d.toLocaleDateString("en-US", {
|
||||
month: "short",
|
||||
day: "numeric",
|
||||
year: d.getFullYear() !== now.getFullYear() ? "numeric" : undefined,
|
||||
});
|
||||
};
|
||||
|
||||
const loadRecentActivity = async () => {
|
||||
activityLoading.value = true;
|
||||
try {
|
||||
const data = await $fetch("/api/members/me/activity", {
|
||||
params: { limit: 5 },
|
||||
});
|
||||
recentActivity.value = data.entries || [];
|
||||
} catch (err) {
|
||||
console.error("Failed to load activity:", err);
|
||||
recentActivity.value = [];
|
||||
} finally {
|
||||
activityLoading.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
const memberId = computed(() => memberData.value?._id || memberData.value?.id);
|
||||
|
||||
const hasChanges = computed(() => {
|
||||
|
|
@ -405,7 +468,6 @@ const loadProfile = () => {
|
|||
|
||||
const notifs = memberData.value.notifications || {};
|
||||
formData.notifications.events = notifs.events ?? true;
|
||||
formData.notifications.updates = notifs.updates ?? true;
|
||||
|
||||
initialData.value = JSON.parse(JSON.stringify(formData));
|
||||
};
|
||||
|
|
@ -458,7 +520,10 @@ onMounted(async () => {
|
|||
loadProfile();
|
||||
|
||||
if (memberId.value) {
|
||||
await fetchPosts({ author: memberId.value });
|
||||
await Promise.allSettled([
|
||||
fetchPosts({ author: memberId.value }),
|
||||
loadRecentActivity(),
|
||||
]);
|
||||
}
|
||||
});
|
||||
|
||||
|
|
@ -712,6 +777,41 @@ useHead({
|
|||
color: var(--ember);
|
||||
}
|
||||
|
||||
/* ---- RECENT ACTIVITY ---- */
|
||||
.activity-list {
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
border-top: 1px dashed var(--border);
|
||||
}
|
||||
.activity-item {
|
||||
padding: 8px 0;
|
||||
border-bottom: 1px dashed var(--border);
|
||||
font-size: 12px;
|
||||
color: var(--text);
|
||||
line-height: 1.5;
|
||||
}
|
||||
.activity-time {
|
||||
font-size: 10px;
|
||||
color: var(--text-faint);
|
||||
margin-bottom: 2px;
|
||||
}
|
||||
.activity-text {
|
||||
color: var(--text);
|
||||
}
|
||||
.activity-link {
|
||||
color: var(--candle);
|
||||
text-decoration: none;
|
||||
}
|
||||
.activity-link:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
.activity-empty {
|
||||
font-size: 12px;
|
||||
color: var(--text-faint);
|
||||
padding: 10px 0;
|
||||
}
|
||||
|
||||
/* ---- DISABLED BUTTON ---- */
|
||||
.btn:disabled {
|
||||
opacity: 0.4;
|
||||
|
|
@ -743,84 +843,3 @@ useHead({
|
|||
}
|
||||
</style>
|
||||
|
||||
<style>
|
||||
/* Non-scoped: targets USelectMenu button root which does not inherit scoped data attribute. */
|
||||
button.timezone-select {
|
||||
display: flex !important;
|
||||
width: 100%;
|
||||
padding: 5px 8px !important;
|
||||
font-family: "Commit Mono", monospace !important;
|
||||
font-size: 13px !important;
|
||||
color: var(--text-bright) !important;
|
||||
background: var(--input-bg) !important;
|
||||
border: 1px solid var(--border) !important;
|
||||
border-radius: 0 !important;
|
||||
box-shadow: none !important;
|
||||
outline: none !important;
|
||||
min-height: 0;
|
||||
--tw-ring-shadow: 0 0 #0000;
|
||||
--tw-ring-offset-shadow: 0 0 #0000;
|
||||
--tw-ring-color: transparent;
|
||||
}
|
||||
|
||||
button.timezone-select:hover {
|
||||
background: var(--input-bg) !important;
|
||||
}
|
||||
|
||||
button.timezone-select:focus,
|
||||
button.timezone-select:focus-visible,
|
||||
button.timezone-select[aria-expanded="true"] {
|
||||
border-color: var(--candle) !important;
|
||||
}
|
||||
|
||||
/* Popup content (portalled to body) */
|
||||
.tz-content {
|
||||
background: var(--input-bg) !important;
|
||||
border: 1px solid var(--border) !important;
|
||||
border-radius: 0 !important;
|
||||
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.12) !important;
|
||||
--tw-ring-shadow: 0 0 #0000 !important;
|
||||
--tw-ring-offset-shadow: 0 0 #0000 !important;
|
||||
font-family: "Commit Mono", monospace !important;
|
||||
}
|
||||
|
||||
/* Search input wrapper inside popup */
|
||||
.tz-input {
|
||||
border-bottom: 1px dashed var(--border) !important;
|
||||
}
|
||||
|
||||
.tz-input input {
|
||||
font-family: "Commit Mono", monospace !important;
|
||||
font-size: 13px !important;
|
||||
color: var(--text-bright) !important;
|
||||
background: transparent !important;
|
||||
border-radius: 0 !important;
|
||||
padding: 6px 8px !important;
|
||||
box-shadow: none !important;
|
||||
--tw-ring-shadow: 0 0 #0000 !important;
|
||||
--tw-ring-offset-shadow: 0 0 #0000 !important;
|
||||
}
|
||||
|
||||
/* Option rows */
|
||||
.tz-item {
|
||||
font-family: "Commit Mono", monospace !important;
|
||||
font-size: 13px !important;
|
||||
color: var(--text) !important;
|
||||
border-radius: 0 !important;
|
||||
padding: 6px 8px !important;
|
||||
}
|
||||
|
||||
.tz-item::before {
|
||||
border-radius: 0 !important;
|
||||
}
|
||||
|
||||
.tz-item[data-highlighted]::before,
|
||||
.tz-item[data-highlighted]:not([data-disabled])::before {
|
||||
background: var(--surface-hover) !important;
|
||||
}
|
||||
|
||||
.tz-item[data-highlighted],
|
||||
.tz-item[data-highlighted]:not([data-disabled]) {
|
||||
color: var(--text-bright) !important;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue