diff --git a/packages/nc-gui/components/account/UserList.vue b/packages/nc-gui/components/account/UserList.vue index 48c2eff0f3..578d984b85 100644 --- a/packages/nc-gui/components/account/UserList.vue +++ b/packages/nc-gui/components/account/UserList.vue @@ -1,11 +1,14 @@ - - {{ $t('title.userManagement') }} - - - - - - { - showUserModal = true - userMadalKey++ - } - " - > - - - {{ $t('activity.inviteUser') }} - - + + User Management + + + + + + + + + + + + Invite new user + + + - - + + + {{ $t('labels.email') }} + {{ $t('objects.role') }} + Actions + + + + + + - - - - - - - {{ text }} - - - - - - - - - {{ $t('labels.superAdmin') }} + + + + + {{ el.email }} + + + Super Admin { - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - {{ $t('activity.resendInvite') }} - - - - - - {{ $t('activity.copyInviteURL') }} - - - - - - - {{ $t('activity.copyPasswordResetURL') }} - - - - - - - - - - - - {{ record.email }} - - - - - - - {{ $t('general.delete') }} - - - - - + + + {{ $t('activity.resendInvite') }} + + + + {{ $t('activity.copyInviteURL') }} + + + + {{ $t('activity.copyPasswordResetURL') }} + + + + + + Remove user + + + + + + + + + + + + + + + + + + + {{ deleteModalInfo?.email }} + - - - - + + + + + diff --git a/packages/nc-gui/components/dashboard/settings/AppStore.vue b/packages/nc-gui/components/dashboard/settings/AppStore.vue index 93057278bf..c1db9f70d1 100644 --- a/packages/nc-gui/components/dashboard/settings/AppStore.vue +++ b/packages/nc-gui/components/dashboard/settings/AppStore.vue @@ -108,12 +108,12 @@ onMounted(async () => { - + diff --git a/packages/nc-gui/pages/account/index.vue b/packages/nc-gui/pages/account/index.vue index 885ba89e38..cbe7f83550 100644 --- a/packages/nc-gui/pages/account/index.vue +++ b/packages/nc-gui/pages/account/index.vue @@ -33,7 +33,7 @@ const logout = async () => { - + { > +<<<<<<< HEAD {{ $t('labels.backToWorkspace') }} +======= + Back to Projects +>>>>>>> a2f9e6a54 (fix: table ui base design and refactor type errros) - {{ $t('labels.account') }} + {{ $t('labels.account') }} { @click="navigateTo('/account/tokens')" > - + - {{ $t('title.tokens') }} + API {{ $t('title.tokens') }} { - +