chore: update base font size

This commit is contained in:
Steven 2023-07-31 00:16:34 +08:00
parent f5463af7db
commit 6f9df9dfd7
4 changed files with 13 additions and 15 deletions

View File

@ -22,7 +22,7 @@ const ViewSetting = () => {
<Icon.Settings2 className="w-4 h-auto text-gray-500" />
</button>
}
actionsClassName="top-7 !-right-2"
actionsClassName="top-8 !-right-2"
actions={
<div className="w-52 p-2 pt-0 gap-2 flex flex-col justify-start items-start" onClick={(e) => e.stopPropagation()}>
<div className="w-full flex flex-row justify-between items-center mt-1">

View File

@ -7,7 +7,7 @@ const MemberSection = () => {
const userStore = useUserStore();
const [showCreateUserDialog, setShowCreateUserDialog] = useState<boolean>(false);
const [currentEditingUser, setCurrentEditingUser] = useState<User | undefined>(undefined);
const userList = Object.values(userStore.userMap);
const userList = Object.values(userStore.userMapById);
useEffect(() => {
userStore.fetchUserList();

View File

@ -10,9 +10,7 @@ const convertResponseModelUser = (user: User): User => {
};
interface UserState {
userMap: {
[key: UserId]: User;
};
userMapById: Record<UserId, User>;
currentUserId?: UserId;
fetchUserList: () => Promise<User[]>;
fetchCurrentUser: () => Promise<User>;
@ -24,10 +22,10 @@ interface UserState {
}
const useUserStore = create<UserState>()((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<UserState>()((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<UserState>()((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<UserState>()((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];
},

View File

@ -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",