diff --git a/front/src/components/common/ActionTable.vue b/front/src/components/common/ActionTable.vue index 0fa4a46c6..a983125c6 100644 --- a/front/src/components/common/ActionTable.vue +++ b/front/src/components/common/ActionTable.vue @@ -5,6 +5,8 @@ import { ref, computed, reactive, watch } from 'vue' import { useI18n } from 'vue-i18n' import DangerousButton from '~/components/common/DangerousButton.vue' +import Layout from '~/components/ui/Layout.vue' +import Button from '~/components/ui/Button.vue' import axios from 'axios' @@ -171,72 +173,71 @@ const launchAction = async () => { {{ t('components.common.ActionTable.message.needsRefresh') }} - + /> -
-
-
- - + - -
-
- - {{ t('components.common.ActionTable.button.go') }} -
-
-
+

{{ t('components.common.ActionTable.header.error') }} @@ -282,10 +282,10 @@ const launchAction = async () => { {{ error }} -

-
+

@@ -297,8 +297,8 @@ const launchAction = async () => { name="action-success-footer" :result="result" /> -

-
+ + diff --git a/front/src/components/manage/users/InvitationForm.vue b/front/src/components/manage/users/InvitationForm.vue index fd92e2233..e41f7035e 100644 --- a/front/src/components/manage/users/InvitationForm.vue +++ b/front/src/components/manage/users/InvitationForm.vue @@ -8,6 +8,12 @@ import { useStore } from '~/store' import axios from 'axios' +import Layout from '~/components/ui/Layout.vue' +import Button from '~/components/ui/Button.vue' +import Alert from '~/components/ui/Alert.vue' +import Spacer from '~/components/ui/Spacer.vue' +import Input from '~/components/ui/Input.vue' + interface Invitation { code: string } @@ -47,14 +53,14 @@ const getUrl = (code: string) => store.getters['instance/absoluteUrl'](router.re diff --git a/front/src/components/manage/users/InvitationsTable.vue b/front/src/components/manage/users/InvitationsTable.vue index bd8f9d5a5..a46e2e66c 100644 --- a/front/src/components/manage/users/InvitationsTable.vue +++ b/front/src/components/manage/users/InvitationsTable.vue @@ -11,7 +11,11 @@ import moment from 'moment' import axios from 'axios' import ActionTable from '~/components/common/ActionTable.vue' -import Pagination from '~/components/vui/Pagination.vue' +import Pagination from '~/components/ui/Pagination.vue' +import Layout from '~/components/ui/Layout.vue' +import Input from '~/components/ui/Input.vue' +import Spacer from '~/components/ui/Spacer.vue' +import Loader from '~/components/ui/Loader.vue' import useSharedLabels from '~/composables/locale/useSharedLabels' import useOrdering from '~/composables/navigation/useOrdering' @@ -100,141 +104,139 @@ const labels = computed(() => ({ diff --git a/front/src/components/manage/users/UsersTable.vue b/front/src/components/manage/users/UsersTable.vue index 5d4fa1a41..df72d5c62 100644 --- a/front/src/components/manage/users/UsersTable.vue +++ b/front/src/components/manage/users/UsersTable.vue @@ -10,7 +10,11 @@ import { useI18n } from 'vue-i18n' import axios from 'axios' import ActionTable from '~/components/common/ActionTable.vue' -import Pagination from '~/components/vui/Pagination.vue' +import Pagination from '~/components/ui/Pagination.vue' + +import Layout from '~/components/ui/Layout.vue' +import Input from '~/components/ui/Input.vue' +import Spacer from '~/components/ui/Spacer.vue' import useSharedLabels from '~/composables/locale/useSharedLabels' import useErrorHandler from '~/composables/useErrorHandler' @@ -102,19 +106,25 @@ const labels = computed(() => ({ diff --git a/front/src/views/admin/users/Base.vue b/front/src/views/admin/users/Base.vue index bc4501ff1..06d7aab63 100644 --- a/front/src/views/admin/users/Base.vue +++ b/front/src/views/admin/users/Base.vue @@ -2,6 +2,10 @@ import { useI18n } from 'vue-i18n' import { computed } from 'vue' +import Layout from '~/components/ui/Layout.vue' +import Tabs from '~/components/ui/Tabs.vue' +import Tab from '~/components/ui/Tab.vue' + const { t } = useI18n() const labels = computed(() => ({ @@ -11,28 +15,22 @@ const labels = computed(() => ({