feat: port UserProfile, Onboarding, CreateBot to legacy

This commit is contained in:
Paul Makles
2022-06-30 20:39:00 +01:00
parent cd402d2d65
commit 828f002efd
19 changed files with 155 additions and 129 deletions

View File

@@ -15,7 +15,7 @@ import { QueuedMessage } from "../../../mobx/stores/MessageQueue";
import { I18nError } from "../../../context/Locale";
import { useIntermediate } from "../../../context/intermediate/Intermediate";
import { useClient } from "../../../controllers/client/ClientController";
import { modalController } from "../../../controllers/modals/ModalController";
import Markdown from "../../markdown/Markdown";
import UserIcon from "../user/UserIcon";
import { Username } from "../user/UserShort";
@@ -70,7 +70,10 @@ const Message = observer(
: undefined;
const openProfile = () =>
openScreen({ id: "profile", user_id: message.author_id });
modalController.push({
type: "user_profile",
user_id: message.author_id,
});
const handleUserClick = (e: MouseEvent) => {
if (e.shiftKey && user?._id) {

View File

@@ -8,9 +8,8 @@ import { Text } from "preact-i18n";
import { internalEmit } from "../../../lib/eventEmitter";
import { useIntermediate } from "../../../context/intermediate/Intermediate";
import { useClient } from "../../../controllers/client/ClientController";
import { modalController } from "../../../controllers/modals/ModalController";
import UserIcon from "./UserIcon";
const BotBadge = styled.div`
@@ -125,9 +124,9 @@ export default function UserShort({
masquerade?: API.Masquerade;
showServerIdentity?: boolean;
}) {
const { openScreen } = useIntermediate();
const openProfile = () =>
user && openScreen({ id: "profile", user_id: user._id });
user &&
modalController.push({ type: "user_profile", user_id: user._id });
const handleUserClick = (e: MouseEvent) => {
if (e.shiftKey && user?._id) {

View File

@@ -8,11 +8,7 @@ import { memo } from "preact/compat";
import { internalEmit } from "../../../lib/eventEmitter";
import {
Screen,
useIntermediate,
} from "../../../context/intermediate/Intermediate";
import { modalController } from "../../../controllers/modals/ModalController";
import { UserButton } from "../items/ButtonItem";
export type MemberListGroup = {
@@ -55,15 +51,7 @@ const NoOomfie = styled.div`
`;
const ItemContent = memo(
({
item,
context,
openScreen,
}: {
item: User;
context: Channel;
openScreen: (screen: Screen) => void;
}) => (
({ item, context }: { item: User; context: Channel }) => (
<UserButton
key={item._id}
user={item}
@@ -77,13 +65,12 @@ const ItemContent = memo(
`<@${item._id}>`,
"mention",
);
} else
[
openScreen({
id: "profile",
user_id: item._id,
}),
];
} else {
modalController.push({
type: "user_profile",
user_id: item._id,
});
}
}}
/>
),
@@ -96,8 +83,6 @@ export default function MemberList({
entries: MemberListGroup[];
context: Channel;
}) {
const { openScreen } = useIntermediate();
return (
<GroupedVirtuoso
groupCounts={entries.map((x) => x.users.length)}
@@ -137,7 +122,8 @@ export default function MemberList({
server, see issue{" "}
<a
href="https://github.com/revoltchat/delta/issues/128"
target="_blank" rel="noreferrer">
target="_blank"
rel="noreferrer">
#128
</a>{" "}
for when this will be resolved.
@@ -158,11 +144,7 @@ export default function MemberList({
return (
<div>
<ItemContent
item={item}
context={context}
openScreen={openScreen}
/>
<ItemContent item={item} context={context} />
</div>
);
}}