diff --git a/web/src/components/ViewSetting.tsx b/web/src/components/ViewSetting.tsx
index 1250162..a66dc1a 100644
--- a/web/src/components/ViewSetting.tsx
+++ b/web/src/components/ViewSetting.tsx
@@ -22,7 +22,7 @@ const ViewSetting = () => {
}
- actionsClassName="top-7 !-right-2"
+ actionsClassName="top-8 !-right-2"
actions={
e.stopPropagation()}>
diff --git a/web/src/components/setting/UserSection.tsx b/web/src/components/setting/UserSection.tsx
index c931994..e7f350b 100644
--- a/web/src/components/setting/UserSection.tsx
+++ b/web/src/components/setting/UserSection.tsx
@@ -7,7 +7,7 @@ const MemberSection = () => {
const userStore = useUserStore();
const [showCreateUserDialog, setShowCreateUserDialog] = useState(false);
const [currentEditingUser, setCurrentEditingUser] = useState(undefined);
- const userList = Object.values(userStore.userMap);
+ const userList = Object.values(userStore.userMapById);
useEffect(() => {
userStore.fetchUserList();
diff --git a/web/src/stores/v1/user.ts b/web/src/stores/v1/user.ts
index 50db452..7f17abd 100644
--- a/web/src/stores/v1/user.ts
+++ b/web/src/stores/v1/user.ts
@@ -10,9 +10,7 @@ const convertResponseModelUser = (user: User): User => {
};
interface UserState {
- userMap: {
- [key: UserId]: User;
- };
+ userMapById: Record;
currentUserId?: UserId;
fetchUserList: () => Promise;
fetchCurrentUser: () => Promise;
@@ -24,10 +22,10 @@ interface UserState {
}
const useUserStore = create()((set, get) => ({
- userMap: {},
+ userMapById: {},
fetchUserList: async () => {
const { data: userList } = await api.getUserList();
- const userMap = get().userMap;
+ const userMap = get().userMapById;
userList.forEach((user) => {
userMap[user.id] = convertResponseModelUser(user);
});
@@ -37,13 +35,13 @@ const useUserStore = create()((set, get) => ({
fetchCurrentUser: async () => {
const { data } = await api.getMyselfUser();
const user = convertResponseModelUser(data);
- const userMap = get().userMap;
+ const userMap = get().userMapById;
userMap[user.id] = user;
- set({ userMap, currentUserId: user.id });
+ set({ userMapById: userMap, currentUserId: user.id });
return user;
},
getOrFetchUserById: async (id: UserId) => {
- const userMap = get().userMap;
+ const userMap = get().userMapById;
if (userMap[id]) {
return userMap[id] as User;
}
@@ -57,7 +55,7 @@ const useUserStore = create()((set, get) => ({
createUser: async (userCreate: UserCreate) => {
const { data } = await api.createUser(userCreate);
const user = convertResponseModelUser(data);
- const userMap = get().userMap;
+ const userMap = get().userMapById;
userMap[user.id] = user;
set(userMap);
return user;
@@ -65,16 +63,16 @@ const useUserStore = create()((set, get) => ({
patchUser: async (userPatch: UserPatch) => {
const { data } = await api.patchUser(userPatch);
const user = convertResponseModelUser(data);
- const userMap = get().userMap;
+ const userMap = get().userMapById;
userMap[user.id] = user;
set(userMap);
},
getUserById: (id: UserId) => {
- const userMap = get().userMap;
+ const userMap = get().userMapById;
return userMap[id] as User;
},
getCurrentUser: () => {
- const userMap = get().userMap;
+ const userMap = get().userMapById;
const currentUserId = get().currentUserId;
return userMap[currentUserId as UserId];
},
diff --git a/web/tailwind.config.js b/web/tailwind.config.js
index 3c5e8fa..c9583b5 100644
--- a/web/tailwind.config.js
+++ b/web/tailwind.config.js
@@ -5,7 +5,7 @@ module.exports = {
fontSize: {
xs: ".75rem",
sm: ".875rem",
- base: "0.95rem",
+ base: "1rem",
lg: "1.125rem",
xl: "1.25rem",
"2xl": "1.5rem",