diff --git a/frontend/pages/admin/index.vue b/frontend/pages/admin/index.vue index a5d20e8..be35d49 100644 --- a/frontend/pages/admin/index.vue +++ b/frontend/pages/admin/index.vue @@ -27,14 +27,12 @@ const adminItems: AdminItem[] = [ desc: 'View a list of users, and search for users based on name or email, then edit or delete them', href: '/admin/users', }, - /* { title: 'User Merge', icon: 'pi pi-user-minus', desc: 'Merge two user accounts into one, retaining all data', - href: '/admin/user-merge', + href: '/admin/merge', }, - */ ] diff --git a/frontend/pages/admin/merge.vue b/frontend/pages/admin/merge.vue new file mode 100644 index 0000000..2540e3f --- /dev/null +++ b/frontend/pages/admin/merge.vue @@ -0,0 +1,87 @@ + + +