diff --git a/app/pages/collections/new.vue b/app/pages/collections/new.vue
index 7bbdb487..26b29f7a 100644
--- a/app/pages/collections/new.vue
+++ b/app/pages/collections/new.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/app/pages/me/devices.vue b/app/pages/me/devices.vue
index 22c365b6..53bb3154 100644
--- a/app/pages/me/devices.vue
+++ b/app/pages/me/devices.vue
@@ -1,5 +1,5 @@
-
diff --git a/app/pages/me/devices.vue b/app/pages/me/devices.vue
index 22c365b6..53bb3154 100644
--- a/app/pages/me/devices.vue
+++ b/app/pages/me/devices.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/layers/identity/app/layouts/account.vue b/layers/identity/app/layouts/account.vue
new file mode 100644
index 00000000..c05c48ce
--- /dev/null
+++ b/layers/identity/app/layouts/account.vue
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+ @{{ state.user.login }}
+
+
+
+
+
+
+
+
+ skilld
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/layers/identity/app/layouts/auth.vue b/layers/identity/app/layouts/auth.vue
new file mode 100644
index 00000000..5f99dfcc
--- /dev/null
+++ b/layers/identity/app/layouts/auth.vue
@@ -0,0 +1,19 @@
+
+
+
+
+
+ skilld.dev
+
+
+
+
+
+
+
+
+
diff --git a/layers/identity/app/pages/login.vue b/layers/identity/app/pages/login.vue
index 87e68925..0abf02bc 100644
--- a/layers/identity/app/pages/login.vue
+++ b/layers/identity/app/pages/login.vue
@@ -1,7 +1,7 @@
-
-
+
+
Sign in to skilld
-
+
Like skills, build collections, and get the weekly: changes to your skills, plus what devs are talking about. We ask for your public profile and email address.
diff --git a/layers/identity/app/pages/me/index.vue b/layers/identity/app/pages/me/index.vue
index c0f6a712..2e89bb5f 100644
--- a/layers/identity/app/pages/me/index.vue
+++ b/layers/identity/app/pages/me/index.vue
@@ -8,13 +8,11 @@ import type {
IdentitySubscriptionRef,
} from '../../../shared/contracts/account'
import type { StarsSyncResponse } from '../../utils/sync-starred-repos'
-import { avatarProxyUrl } from '#shared/image-proxy'
import { accountDeletionConfirmed } from '../../../shared/contracts/account'
-import AgentSetupCard from '../../components/_AgentSetupCard.vue'
import { identityAccountQueries, identityAccountQueryOptions } from '../../queries/account'
import { syncStarredRepos } from '../../utils/sync-starred-repos'
-definePageMeta({ middleware: ['auth'] })
+definePageMeta({ layout: 'account', middleware: ['auth'] })
interface LikedSkill {
owner: string
@@ -160,12 +158,16 @@ function sourceDescription(source: string): string {
return 'Added to your digest'
}
-useSeoMeta({ title: 'Your dashboard', robots: 'noindex' })
-
const route = useRoute()
+const view = computed(() => {
+ const value = route.query.view
+ return value === 'email' || value === 'repositories' || value === 'account' ? value : 'skills'
+})
+const viewTitle = computed(() => ({ skills: 'Your skills', email: 'Email updates', repositories: 'Repository coverage', account: 'Account' })[view.value])
+useSeoMeta({ title: viewTitle, robots: 'noindex' })
const toast = useToast()
async function clearWelcomeQuery() {
- await navigateTo({ path: route.path, query: {} }, { replace: true })
+ await navigateTo({ path: route.path, query: { ...route.query, welcome: undefined } }, { replace: true })
}
onMounted(() => {
if (route.query.welcome === '1') {
@@ -243,7 +245,7 @@ async function deleteAccount() {
-
+
{{ accountError ? 'Could not load your account' : 'Loading your account' }}
@@ -251,47 +253,13 @@ async function deleteAccount() {
-
-
-
- ![]()
-
-
- {{ me?.name || `@${me?.login}` }}
-
-
- @{{ me.login }}
-
-
-
-
-
+
+
+ {{ viewTitle }}
+
-
-
+
+
@@ -302,9 +270,12 @@ async function deleteAccount() {
Like a skill to keep it here. We track meaningful changes and include them in your digest.
-
- {{ likedSkills.length }} {{ likedSkills.length === 1 ? 'skill' : 'skills' }}
-
+
+
+ {{ likedSkills.length }} {{ likedSkills.length === 1 ? 'skill' : 'skills' }}
+
+
-
+
Watch what you've already starred
diff --git a/layers/identity/app/pages/onboarding/email.vue b/layers/identity/app/pages/onboarding/email.vue
index a60f2021..7adb9698 100644
--- a/layers/identity/app/pages/onboarding/email.vue
+++ b/layers/identity/app/pages/onboarding/email.vue
@@ -2,7 +2,7 @@
import type { IdentityEmailPatchBody, IdentityMutationResponse } from '../../../shared/contracts/account'
import { identityAccountQueries, identityAccountQueryOptions } from '../../queries/account'
-definePageMeta({ middleware: ['auth'] })
+definePageMeta({ layout: 'auth', middleware: ['auth'] })
const { data: me, error: accountError, status: accountStatus, refresh: retryAccount } = await useNuxtRpcQuery(identityAccountQueries.me(), identityAccountQueryOptions)
const { fetchSession } = useAuth()
@@ -59,7 +59,7 @@ useSeoMeta({ title: 'Email opt-in', robots: 'noindex' })
-
+
Email
diff --git a/layers/marketing/app/pages/developers.vue b/layers/marketing/app/pages/developers.vue
index a8891c0f..bbdd2b3a 100644
--- a/layers/marketing/app/pages/developers.vue
+++ b/layers/marketing/app/pages/developers.vue
@@ -18,6 +18,8 @@ import {
} from '../utils/developer-setup'
import { pageRobots } from '../utils/page-admissions'
+definePageMeta({ layout: 'account' })
+
const route = useRoute()
const mode = computed(() => {
const parsed = setupModeSchema.safeParse(route.query.setup)
@@ -53,7 +55,7 @@ const uiClass = 'font-medium text-default'
-
+
Developers
diff --git a/test/unit/email-form-submit.test.ts b/test/unit/email-form-submit.test.ts
index 499d6e79..7968cc58 100644
--- a/test/unit/email-form-submit.test.ts
+++ b/test/unit/email-form-submit.test.ts
@@ -49,7 +49,7 @@ beforeEach(() => {
describe.each(screens)('$name email submission', ({ component, form: selector }) => {
async function mountForm() {
- const wrapper = await mountSuspended(component, { attachTo: document.body })
+ const wrapper = await mountSuspended(component, { attachTo: document.body, route: component === Account ? '/me?view=email' : '/onboarding/email' })
if (component === Account)
await wrapper.get('button[aria-controls="email-settings-form"]').trigger('click')
return { wrapper, form: wrapper.get(selector) }
diff --git a/test/unit/me-watchlist.test.ts b/test/unit/me-watchlist.test.ts
index 2caf8adf..33da9667 100644
--- a/test/unit/me-watchlist.test.ts
+++ b/test/unit/me-watchlist.test.ts
@@ -137,9 +137,10 @@ mockNuxtImport('useActionFailure', () => {
return () => () => vi.fn()
})
-async function mountPage() {
+async function mountPage(view: 'skills' | 'email' | 'repositories' | 'account' = 'skills') {
return await mountSuspended(
await import('../../layers/identity/app/pages/me/index.vue').then(module => module.default),
+ { route: view === 'skills' ? '/' : `/?view=${view}` },
)
}
@@ -224,19 +225,19 @@ describe('account skill watchlist', () => {
it('recovers account settings after the initial account load fails', async () => {
account.value = undefined
accountError.value = new Error('offline')
- const wrapper = await mountPage()
+ const wrapper = await mountPage('email')
expect(wrapper.text()).toContain('Could not load your account')
expect(wrapper.text()).not.toContain('No email set')
await buttonWithText(wrapper, 'Retry').trigger('click')
await flushPromises()
- expect(wrapper.get('h1').text()).toBe('Your skills')
+ expect(wrapper.get('h1').text()).toBe('Email updates')
await wrapper.get('button[aria-controls="email-settings-form"]').trigger('click')
expect((wrapper.get('input[type="email"]').element as HTMLInputElement).value).toBe('harlan@example.com')
})
it('shows watched repository failures instead of an empty collection', async () => {
subscriptionsError.value = new Error('offline')
- const wrapper = await mountPage()
+ const wrapper = await mountPage('repositories')
expect(wrapper.text()).toContain('Could not load watched Repositories')
expect(wrapper.text()).not.toContain('Add a skill to start watching its source.')
await buttonWithText(wrapper, 'Retry').trigger('click')
@@ -249,17 +250,47 @@ describe('account skill watchlist', () => {
expect(wrapper.get('h1').text()).toBe('Your skills')
expect(wrapper.get('[aria-label="Your skills"]').text()).toContain('nuxt')
expect(wrapper.get('[aria-label="Your skills"]').text()).toContain('Build full-stack Vue applications with Nuxt.')
+ expect(wrapper.text()).not.toContain('Weekly email')
+ expect(wrapper.text()).not.toContain('Delete account')
+ })
+
+ it('switches account views without mixing their controls', async () => {
+ const wrapper = await mountPage()
+ const router = wrapper.vm.$router
+
+ await router.push('/?view=account')
+ await flushPromises()
+ expect(wrapper.get('h1').text()).toBe('Account')
+ expect(wrapper.text()).toContain('Privacy')
+ expect(wrapper.text()).toContain('Delete account')
+ expect(wrapper.text()).not.toContain('Weekly email')
+ expect(wrapper.text()).not.toContain('Build full-stack Vue applications with Nuxt.')
+
+ await router.push('/?view=email')
+ await flushPromises()
+ expect(wrapper.get('h1').text()).toBe('Email updates')
+ expect(wrapper.text()).toContain('Weekly email')
+ expect(wrapper.text()).not.toContain('Delete account')
+
+ await router.push('/?view=unknown')
+ await flushPromises()
+ expect(wrapper.get('h1').text()).toBe('Your skills')
+ expect(wrapper.text()).not.toContain('Privacy')
+ wrapper.unmount()
})
- it('removes the final skill and its derived source from the rendered page', async () => {
+ it('removes the final skill and updates repository coverage', async () => {
const wrapper = await mountPage()
await wrapper.get('button[aria-label="Remove nuxt from your skills"]').trigger('click')
await flushPromises()
expect(wrapper.text()).toContain('Add your first skill')
+ const router = wrapper.vm.$router
+ await router.push('/?view=repositories')
+ await flushPromises()
expect(wrapper.text()).toContain('Add a skill to start watching its source.')
- expect(wrapper.text()).not.toContain('View repositories')
+ expect(wrapper.text()).not.toContain('antfu/skills')
})
it('disables skill removal while the request is pending', async () => {
@@ -277,7 +308,7 @@ describe('account skill watchlist', () => {
})
it('refreshes the visible account timestamp after syncing GitHub stars', async () => {
- const wrapper = await mountPage()
+ const wrapper = await mountPage('repositories')
const before = paragraphWithText(wrapper, 'Last GitHub import:').text()
await buttonWithText(wrapper, 'Import stars again').trigger('click')
@@ -300,7 +331,7 @@ describe('account skill watchlist', () => {
it('shows separate email choices and disables saving while pending', async () => {
releaseEmailSave = () => {}
- const wrapper = await mountPage()
+ const wrapper = await mountPage('email')
expect(wrapper.text()).toContain('Weekly email')
expect(wrapper.text()).toContain('Monthly digest')
await wrapper.get('button[aria-controls="email-settings-form"]').trigger('click')
@@ -316,7 +347,7 @@ describe('account skill watchlist', () => {
})
it('connects the email address label to its textbox', async () => {
- const wrapper = await mountPage()
+ const wrapper = await mountPage('email')
document.body.append(wrapper.element)
await wrapper.get('button[aria-controls="email-settings-form"]').trigger('click')
const input = wrapper.get('input[type="email"]').element as HTMLInputElement
@@ -327,7 +358,7 @@ describe('account skill watchlist', () => {
})
it('saves the weekly email and monthly digest as separate choices', async () => {
- const wrapper = await mountPage()
+ const wrapper = await mountPage('email')
await wrapper.get('button[aria-controls="email-settings-form"]').trigger('click')
const labels = wrapper.findAll('label')
const weekly = labels.find(label => label.text().includes('weekly email'))
diff --git a/layers/identity/app/layouts/account.vue b/layers/identity/app/layouts/account.vue
new file mode 100644
index 00000000..c05c48ce
--- /dev/null
+++ b/layers/identity/app/layouts/account.vue
@@ -0,0 +1,109 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ skilld
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/layers/identity/app/layouts/auth.vue b/layers/identity/app/layouts/auth.vue
new file mode 100644
index 00000000..5f99dfcc
--- /dev/null
+++ b/layers/identity/app/layouts/auth.vue
@@ -0,0 +1,19 @@
+
+
-
+
+
+
+
+
+ @{{ state.user.login }}
+
+
+
+
+
+
+
+ skilld.dev
+
+
+
+
+
+
+
+
diff --git a/layers/identity/app/pages/login.vue b/layers/identity/app/pages/login.vue
index 87e68925..0abf02bc 100644
--- a/layers/identity/app/pages/login.vue
+++ b/layers/identity/app/pages/login.vue
@@ -1,7 +1,7 @@
-
+
+
+
+
Sign in to skilld
-+
Like skills, build collections, and get the weekly: changes to your skills, plus what devs are talking about. We ask for your public profile and email address.
diff --git a/layers/identity/app/pages/me/index.vue b/layers/identity/app/pages/me/index.vue
index c0f6a712..2e89bb5f 100644
--- a/layers/identity/app/pages/me/index.vue
+++ b/layers/identity/app/pages/me/index.vue
@@ -8,13 +8,11 @@ import type {
IdentitySubscriptionRef,
} from '../../../shared/contracts/account'
import type { StarsSyncResponse } from '../../utils/sync-starred-repos'
-import { avatarProxyUrl } from '#shared/image-proxy'
import { accountDeletionConfirmed } from '../../../shared/contracts/account'
-import AgentSetupCard from '../../components/_AgentSetupCard.vue'
import { identityAccountQueries, identityAccountQueryOptions } from '../../queries/account'
import { syncStarredRepos } from '../../utils/sync-starred-repos'
-definePageMeta({ middleware: ['auth'] })
+definePageMeta({ layout: 'account', middleware: ['auth'] })
interface LikedSkill {
owner: string
@@ -160,12 +158,16 @@ function sourceDescription(source: string): string {
return 'Added to your digest'
}
-useSeoMeta({ title: 'Your dashboard', robots: 'noindex' })
-
const route = useRoute()
+const view = computed(() => {
+ const value = route.query.view
+ return value === 'email' || value === 'repositories' || value === 'account' ? value : 'skills'
+})
+const viewTitle = computed(() => ({ skills: 'Your skills', email: 'Email updates', repositories: 'Repository coverage', account: 'Account' })[view.value])
+useSeoMeta({ title: viewTitle, robots: 'noindex' })
const toast = useToast()
async function clearWelcomeQuery() {
- await navigateTo({ path: route.path, query: {} }, { replace: true })
+ await navigateTo({ path: route.path, query: { ...route.query, welcome: undefined } }, { replace: true })
}
onMounted(() => {
if (route.query.welcome === '1') {
@@ -243,7 +245,7 @@ async function deleteAccount() {
-
+
{{ accountError ? 'Could not load your account' : 'Loading your account' }}
@@ -251,47 +253,13 @@ async function deleteAccount() {
-
-
-
+
+
{{ accountError ? 'Could not load your account' : 'Loading your account' }}
@@ -251,47 +253,13 @@ async function deleteAccount() {
- ![]()
-
-
-
- - {{ me?.name || `@${me?.login}` }} -
-- @{{ me.login }} -
-
-
- + {{ viewTitle }} +
-
-
+
+
-
+
Watch what you've already starred
diff --git a/layers/identity/app/pages/onboarding/email.vue b/layers/identity/app/pages/onboarding/email.vue
index a60f2021..7adb9698 100644
--- a/layers/identity/app/pages/onboarding/email.vue
+++ b/layers/identity/app/pages/onboarding/email.vue
@@ -2,7 +2,7 @@
import type { IdentityEmailPatchBody, IdentityMutationResponse } from '../../../shared/contracts/account'
import { identityAccountQueries, identityAccountQueryOptions } from '../../queries/account'
-definePageMeta({ middleware: ['auth'] })
+definePageMeta({ layout: 'auth', middleware: ['auth'] })
const { data: me, error: accountError, status: accountStatus, refresh: retryAccount } = await useNuxtRpcQuery(identityAccountQueries.me(), identityAccountQueryOptions)
const { fetchSession } = useAuth()
@@ -59,7 +59,7 @@ useSeoMeta({ title: 'Email opt-in', robots: 'noindex' })
-
@@ -302,9 +270,12 @@ async function deleteAccount() {
Like a skill to keep it here. We track meaningful changes and include them in your digest.
- - {{ likedSkills.length }} {{ likedSkills.length === 1 ? 'skill' : 'skills' }} -
+
+
+ {{ likedSkills.length }} {{ likedSkills.length === 1 ? 'skill' : 'skills' }} +
+
@@ -352,7 +323,7 @@ async function deleteAccount() {
{{ skill.description }}
-
+
Watching for changes
@@ -383,21 +354,15 @@ async function deleteAccount() {
-