diff --git a/frontend/src/components/DomainSelector.vue b/frontend/src/components/DomainSelector.vue
index c0ea828..e2cb112 100644
--- a/frontend/src/components/DomainSelector.vue
+++ b/frontend/src/components/DomainSelector.vue
@@ -22,7 +22,9 @@ const userStore = useAuthStore();
.q-btn.disabled.customized-disabled-btn {
opacity: 1 !important;
cursor: default !important;
-
+ .q-icon.q-btn-dropdown__arrow {
+ display: none;
+ }
* {
cursor: default !important;
}
diff --git a/frontend/src/components/UserInfoButton.vue b/frontend/src/components/UserInfoButton.vue
new file mode 100644
index 0000000..ac98544
--- /dev/null
+++ b/frontend/src/components/UserInfoButton.vue
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
{{ userInfo.fullName }}
+
{{ userInfo.email }}
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/layouts/MainLayout.vue b/frontend/src/layouts/MainLayout.vue
index 9ad772c..925bcd7 100644
--- a/frontend/src/layouts/MainLayout.vue
+++ b/frontend/src/layouts/MainLayout.vue
@@ -8,7 +8,7 @@
V{{ version }}
-
+
@@ -37,6 +37,7 @@
import { computed, onMounted, reactive } from 'vue';
import EssentialLink, { EssentialLinkProps } from 'components/EssentialLink.vue';
import DomainSelector from 'components/DomainSelector.vue';
+import UserInfoButton from 'components/UserInfoButton.vue';
import { useAuthStore } from 'stores/useAuthStore';
import { useRoute } from 'vue-router';
diff --git a/frontend/src/pages/TenantDomain.vue b/frontend/src/pages/TenantDomain.vue
index 39ce625..04d2be8 100644
--- a/frontend/src/pages/TenantDomain.vue
+++ b/frontend/src/pages/TenantDomain.vue
@@ -31,6 +31,13 @@
+
+
+ 自分
+ {{ p.row.owner.fullName }}
+
+
+
@@ -171,7 +178,7 @@ const columns = [
{ name: 'active', label: '', align: 'left', field: 'domainActive', classes: inactiveRowClass },
{ name: 'url', label: 'URL', field: 'url', align: 'left', sortable: true, classes: inactiveRowClass },
{ name: 'user', label: 'ログイン名', field: 'user', align: 'left', classes: inactiveRowClass },
- { name: 'owner', label: '所有者', field: (row: IDomainOwnerDisplay) => row.owner.fullName, align: 'left', classes: inactiveRowClass },
+ { name: 'owner', label: '所有者', field: '', align: 'left', classes: inactiveRowClass },
{ name: 'actions', label: '', field: 'actions', classes: inactiveRowClass }
];
diff --git a/frontend/src/pages/UserDomain.vue b/frontend/src/pages/UserDomain.vue
index 6890950..481a3d2 100644
--- a/frontend/src/pages/UserDomain.vue
+++ b/frontend/src/pages/UserDomain.vue
@@ -36,8 +36,7 @@
既定
既定にする
-
- ドメイン所有者でないため、操作できません
+
削除
@@ -168,10 +167,6 @@ const isActive = computed(() => (id: number) => {
return id == activeDomainId.value;
});
-const isNotOwner = computed(() => (ownerId: string) => {
- return ownerId !== authStore.userId;
-});
-
const getDomain = async (userId? : string) => {
rowIds.clear();
const resp = await api.get(`api/defaultdomain`);
diff --git a/frontend/src/stores/useAuthStore.ts b/frontend/src/stores/useAuthStore.ts
index bff56c5..f45296c 100644
--- a/frontend/src/stores/useAuthStore.ts
+++ b/frontend/src/stores/useAuthStore.ts
@@ -8,6 +8,7 @@ import { useAppStore } from './useAppStore';
interface UserInfo {
firstName: string;
lastName: string;
+ fullName: string;
email: string;
}
@@ -83,6 +84,7 @@ export const useAuthStore = defineStore('auth', {
return {
firstName: resp.first_name,
lastName: resp.last_name,
+ fullName: resp.last_name + ' ' + resp.first_name,
email: resp.email,
}
},