abner/for-legacy-web
1
0
Fork 1
mirror of https://github.com/stoatchat/for-legacy-web.git synced 2026-03-07 09:25:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add correct submit buttons to form modals

Browse Source
This commit is contained in:
Paul Makles
2022-07-06 12:49:24 +01:00
parent f9c6f5cd9d
commit 705dcd001b
16 changed files with 91 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/controllers/modals/components/AddFriend.tsx
View File

@@ -1,3 +1,5 @@
import { Text } from "preact-i18n";
import { ModalForm } from "@revoltchat/ui";
import { noop } from "../../../lib/js";
@@ -26,6 +28,9 @@ export default function AddFriend({ ...props }: ModalProps<"add_friend">) {
callback={({ username }) =>
client.api.post(`/users/friend`, { username }).then(noop)
}
submit={{
children: <Text id="app.special.modals.actions.ok" />,
}}
/>
);
}

4
src/controllers/modals/components/BanMember.tsx
View File

@@ -41,6 +41,10 @@ export default function BanMember({
callback={async ({ reason }) =>
void (await member.server!.banUser(member._id.user, { reason }))
}
submit={{
palette: "error",
children: <Text id="app.special.modals.actions.ban" />,
}}
/>
);
}

6
src/controllers/modals/components/Confirmation.tsx
View File

@@ -96,6 +96,12 @@ export default function Confirmation(
break;
}
}}
submit={{
palette: "error",
children: (
<Text id={`app.special.modals.actions.${event[1]}`} />
),
}}
/>
);
}

3
src/controllers/modals/components/CreateCategory.tsx
View File

@@ -39,6 +39,9 @@ export default function CreateCategory({
],
});
}}
submit={{
children: <Text id="app.special.modals.actions.create" />,
}}
/>
);
}

3
src/controllers/modals/components/CreateChannel.tsx
View File

@@ -67,6 +67,9 @@ export default function CreateChannel({
);
}
}}
submit={{
children: <Text id="app.special.modals.actions.create" />,
}}
/>
);
}

3
src/controllers/modals/components/CreateGroup.tsx
View File

@@ -40,6 +40,9 @@ export default function CreateGroup({ ...props }: ModalProps<"create_group">) {
history.push(`/channel/${group._id}`);
}}
submit={{
children: <Text id="app.special.modals.actions.create" />,
}}
/>
);
}

12
src/controllers/modals/components/CreateInvite.tsx
View File

@@ -71,6 +71,18 @@ export default function CreateInvite({
},
}}
callback={noopAsync}
submit={{
children: <Text id="app.special.modals.actions.ok" />,
}}
actions={[
{
children: <Text id="app.context_menu.copy_link" />,
onClick: () =>
modalController.writeText(
`${window.location.protocol}//${window.location.host}/invite/${code}`,
),
},
]}
/>
);
}

3
src/controllers/modals/components/CreateRole.tsx
View File

@@ -30,6 +30,9 @@ export default function CreateRole({
const role = await server.createRole(name);
callback(role.id);
}}
submit={{
children: <Text id="app.special.modals.actions.create" />,
}}
/>
);
}

3
src/controllers/modals/components/CreateServer.tsx
View File

@@ -52,6 +52,9 @@ export default function CreateServer({
history.push(`/server/${server._id}`);
}}
submit={{
children: <Text id="app.special.modals.actions.create" />,
}}
/>
);
}

3
src/controllers/modals/components/CustomStatus.tsx
View File

@@ -38,6 +38,9 @@ export default function CustomStatus({
},
})
}
submit={{
children: <Text id="app.special.modals.actions.save" />,
}}
/>
);
}

4
src/controllers/modals/components/DeleteMessage.tsx
View File

@@ -30,6 +30,10 @@ export default function DeleteMessage({
},
}}
callback={() => target.delete()}
submit={{
palette: "error",
children: <Text id="app.special.modals.actions.delete" />,
}}
/>
);
}

3
src/controllers/modals/components/ImportTheme.tsx
View File

@@ -27,6 +27,9 @@ export default function ImportTheme({ ...props }: ModalProps<"import_theme">) {
callback={async ({ data }) =>
state.settings.theme.hydrate(JSON.parse(data))
}
submit={{
children: <Text id="app.special.modals.actions.ok" />,
}}
/>
);
}

4
src/controllers/modals/components/KickMember.tsx
View File

@@ -33,6 +33,10 @@ export default function KickMember({
},
}}
callback={() => member.kick()}
submit={{
palette: "error",
children: <Text id="app.special.modals.actions.kick" />,
}}
/>
);
}

57
src/lib/ContextMenus.tsx
View File

@@ -669,35 +669,36 @@ export default function ContextMenus() {
userId !== uid &&
uid !== server.owner
) {
if (serverPermissions & Permission.KickMembers)
generateAction(
{
action: "kick_member",
target: client.members.getKey({
server: server._id,
user: user!._id,
})!,
},
undefined, // this is needed because generateAction uses positional, not named parameters
undefined,
null,
"var(--error)", // the only relevant part really
);
const member = client.members.getKey({
server: server._id,
user: user!._id,
})!;
if (serverPermissions & Permission.BanMembers)
generateAction(
{
action: "ban_member",
target: client.members.getKey({
server: server._id,
user: user!._id,
})!,
},
undefined,
undefined,
null,
"var(--error)",
);
if (member) {
if (serverPermissions & Permission.KickMembers)
generateAction(
{
action: "kick_member",
target: member,
},
undefined, // this is needed because generateAction uses positional, not named parameters
undefined,
null,
"var(--error)", // the only relevant part really
);
if (serverPermissions & Permission.BanMembers)
generateAction(
{
action: "ban_member",
target: member,
},
undefined,
undefined,
null,
"var(--error)",
);
}
}
}