refactor: rename contact with user

This commit is contained in:
Tristan Yang
2022-07-04 16:12:23 +08:00
parent 6083040e2b
commit 101dbdb5ee
76 changed files with 319 additions and 286 deletions
+4 -4
View File
@@ -58,11 +58,11 @@ export const Dates = {
};
export default function Date({ select = "", updateFilter }) {
// const { input, updateInput, contacts } = useFilteredUsers();
// const contacts=useSelector(store=>store.contacts);
// const { input, updateInput, users } = useFilteredUsers();
// const users=useSelector(store=>store.users);
// const uid=contacts.ids;
// const dataMap=contacts.byId;
// const uid=users.ids;
// const dataMap=users.byId;
const handleClick = (dur) => {
updateFilter({ date: dur });
};
+10 -10
View File
@@ -1,7 +1,7 @@
import styled from "styled-components";
import Search from "../Search";
import CheckSign from "../../../assets/icons/check.sign.svg";
import Contact from "../../../common/component/Contact";
import User from "../../../common/component/User";
import useFilteredUsers from "../../../common/hook/useFilteredUsers";
const Styled = styled.div`
@@ -28,7 +28,7 @@ const Styled = styled.div`
width: 100%;
display: flex;
flex-direction: column;
.contact {
.user {
position: relative;
cursor: pointer;
&.none {
@@ -49,11 +49,11 @@ const Styled = styled.div`
`;
export default function From({ select = "", updateFilter }) {
const { input, updateInput, contacts } = useFilteredUsers();
// const contacts=useSelector(store=>store.contacts);
const { input, updateInput, users } = useFilteredUsers();
// const users=useSelector(store=>store.users);
// const uid=contacts.ids;
// const dataMap=contacts.byId;
// const uid=users.ids;
// const dataMap=users.byId;
const handleClick = (uid) => {
updateFilter({ from: uid });
};
@@ -64,14 +64,14 @@ export default function From({ select = "", updateFilter }) {
<Search embed={true} value={input} updateSearchValue={updateInput} />
</div>
<ul className="list">
<li className="contact none" onClick={handleClick.bind(null, undefined)}>
<li className="user none" onClick={handleClick.bind(null, undefined)}>
Anyone
{!select && <CheckSign className="check" />}
</li>
{contacts.map(({ uid }) => {
{users.map(({ uid }) => {
return (
<li key={uid} className="contact" onClick={handleClick.bind(null, uid)}>
<Contact uid={uid} interactive={true} />
<li key={uid} className="user" onClick={handleClick.bind(null, uid)}>
<User uid={uid} interactive={true} />
{select == uid && <CheckSign className="check" />}
</li>
);
+4 -4
View File
@@ -78,11 +78,11 @@ export const FileTypes = {
}
};
export default function Type({ select = "", updateFilter }) {
// const { input, updateInput, contacts } = useFilteredUsers();
// const contacts=useSelector(store=>store.contacts);
// const { input, updateInput, users } = useFilteredUsers();
// const users=useSelector(store=>store.users);
// const uid=contacts.ids;
// const dataMap=contacts.byId;
// const uid=users.ids;
// const dataMap=users.byId;
const handleClick = (type) => {
updateFilter({ type });
};
+4 -4
View File
@@ -65,8 +65,8 @@ export default function Filter({ filter, updateFilter }) {
};
toggleFilterVisible(tmp);
};
const { contactMap, channelMap } = useAppSelector((store) => {
return { contactMap: store.contacts.byId, channelMap: store.channels.byId };
const { userMap, channelMap } = useAppSelector((store) => {
return { userMap: store.users.byId, channelMap: store.channels.byId };
});
const { from, channel, type, date } = filter;
@@ -91,9 +91,9 @@ export default function Filter({ filter, updateFilter }) {
onClick={toggleFilterVisible.bind(null, { from: true })}
>
{from && (
<Avatar className="avatar" name={contactMap[from].name} url={contactMap[from].avatar} />
<Avatar className="avatar" name={userMap[from].name} url={userMap[from].avatar} />
)}
<span className="txt">From {from && contactMap[from].name}</span>
<span className="txt">From {from && userMap[from].name}</span>
<ArrowDown className="arrow" />
</div>
</Tippy>