diff --git a/external/lang b/external/lang index 588b882a3acca644c2f65b67cd341c88fd97989d..4ef73335436f3118d660cec24ff7972d3ccd5984 160000 --- a/external/lang +++ b/external/lang @@ -1 +1 @@ -Subproject commit 588b882a3acca644c2f65b67cd341c88fd97989d +Subproject commit 4ef73335436f3118d660cec24ff7972d3ccd5984 diff --git a/src/components/common/messaging/MessageBox.tsx b/src/components/common/messaging/MessageBox.tsx index 1141d9aa18e356a0b75790abdd6afef0db6cbc47..19ab5ce92507363e17d46ede8c52032d102f59c1 100644 --- a/src/components/common/messaging/MessageBox.tsx +++ b/src/components/common/messaging/MessageBox.tsx @@ -64,7 +64,7 @@ const Blocked = styled.div` svg { flex-shrink: 0; - margin-inline-end: 8px; + margin-inline-end: 10px; } `; diff --git a/src/components/navigation/items/Item.module.scss b/src/components/navigation/items/Item.module.scss index afb54073e11499cf50e037a5dd17004be53dd1dc..fb855f0ab23c79f59025ab4228cd763effdcd2e4 100644 --- a/src/components/navigation/items/Item.module.scss +++ b/src/components/navigation/items/Item.module.scss @@ -17,11 +17,15 @@ color: var(--tertiary-foreground); &.normal { - height: 38px; + height: 42px; } &.compact { height: 32px; + + &[data-mobile="true"] { // TOFIX: make sure this works on mobile + height: 50px; + } } &.user { @@ -65,6 +69,7 @@ } &.avatar { + display: flex; flex-shrink: 0; } diff --git a/src/pages/settings/server/Members.tsx b/src/pages/settings/server/Members.tsx index b569e71afcda26451413104da704755282d396aa..e7d30a6f0f8ff2eec6931b2d42ee7ed53d0d29ba 100644 --- a/src/pages/settings/server/Members.tsx +++ b/src/pages/settings/server/Members.tsx @@ -1,7 +1,7 @@ +import styles from './Panes.module.scss'; import { useEffect, useState } from "preact/hooks"; import { Servers } from "revolt.js/dist/api/objects"; -import Checkbox from "../../../components/ui/Checkbox"; -import Tip from "../../../components/ui/Tip"; +import UserIcon from "../../../components/common/user/UserIcon"; import { useForceUpdate, useUsers } from "../../../context/revoltjs/hooks"; interface Props { @@ -21,37 +21,15 @@ export function Members({ server }: Props) { }, [ ]); return ( - <div> - <Tip warning>This section is under construction.</Tip> - { members && members.length > 0 && users?.map(x => x && <div> - <br/> - <br/> - <br/> - - <span>@{x.username}</span> - { server.roles && Object.keys(server.roles).map(id => { - let role = server.roles?.[id]!; - let member = members.find(y => x._id === y._id.user)!; - - return ( - <Checkbox checked={member.roles?.includes(id) ?? false} onChange={selected => { - let roles = (member.roles ?? []).filter(z => z !== id); - if (selected) roles.push(id); - - ctx.client.servers.members.editMember(server._id, x._id, { roles }); - setMembers( - [ - ...members.filter(e => e._id.user !== x._id), - { - ...member, - roles - } - ] - ); - }}>{ role.name }</Checkbox> - ) - }) } - </div>) } + <div className={styles.members}> + <div className={styles.subtitle}> + X Members + </div> + { members && members.length > 0 && users?.map(x => x && + <div className={styles.member}> + <div>@{x.username}</div> + </div>) + } </div> ); } diff --git a/src/pages/settings/server/Panes.module.scss b/src/pages/settings/server/Panes.module.scss index ba25ba08e2a329a336198447906234411dadc079..91e4cb3b9f4993dc65a5982f00d915882ef7d9f7 100644 --- a/src/pages/settings/server/Panes.module.scss +++ b/src/pages/settings/server/Panes.module.scss @@ -55,3 +55,24 @@ } } } + +.members { + + .subtitle { + display: flex; + justify-content: space-between; + font-size: 13px; + text-transform: uppercase; + color: var(--secondary-foreground); + font-weight: 700; + } + + .member { + gap: 8px; + padding: 10px; + display: flex; + align-items: center; + flex-direction: row; + background: var(--secondary-background); + } +} \ No newline at end of file