From 89e0cfd8741b6763ca04e90558bccf4c3c380cfa Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Sat, 13 Apr 2024 13:25:10 +0200 Subject: [feature] Admin accounts endpoints; approve/reject sign-ups (#2826) * update settings panels, add pending overview + approve/deny functions * add admin accounts get, approve, reject * send approved/rejected emails * use signup URL * docs! * email * swagger * web linting * fix email tests * wee lil fixerinos * use new paging logic for GetAccounts() series of admin endpoints, small changes to query building * shuffle useAccountIDIn check *before* adding to query * fix parse from toot react error * use `netip.Addr` * put valid slices in globals * optimistic updates for account state --------- Co-authored-by: kim --- .../settings/components/form/mutation-button.jsx | 48 --------------- .../settings/components/form/mutation-button.tsx | 72 ++++++++++++++++++++++ 2 files changed, 72 insertions(+), 48 deletions(-) delete mode 100644 web/source/settings/components/form/mutation-button.jsx create mode 100644 web/source/settings/components/form/mutation-button.tsx (limited to 'web/source/settings/components/form') diff --git a/web/source/settings/components/form/mutation-button.jsx b/web/source/settings/components/form/mutation-button.jsx deleted file mode 100644 index 0eaf33912..000000000 --- a/web/source/settings/components/form/mutation-button.jsx +++ /dev/null @@ -1,48 +0,0 @@ -/* - GoToSocial - Copyright (C) GoToSocial Authors admin@gotosocial.org - SPDX-License-Identifier: AGPL-3.0-or-later - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . -*/ - -const React = require("react"); -const { Error } = require("../error"); - -module.exports = function MutationButton({ label, result, disabled, showError = true, className = "", wrapperClassName = "", ...inputProps }) { - let iconClass = ""; - const targetsThisButton = result.action == inputProps.name; // can also both be undefined, which is correct - - if (targetsThisButton) { - if (result.isLoading) { - iconClass = "fa-spin fa-refresh"; - } else if (result.isSuccess) { - iconClass = "fa-check fadeout"; - } - } - - return (
- {(showError && targetsThisButton && result.error) && - - } - -
- ); -}; \ No newline at end of file diff --git a/web/source/settings/components/form/mutation-button.tsx b/web/source/settings/components/form/mutation-button.tsx new file mode 100644 index 000000000..1e6d8c968 --- /dev/null +++ b/web/source/settings/components/form/mutation-button.tsx @@ -0,0 +1,72 @@ +/* + GoToSocial + Copyright (C) GoToSocial Authors admin@gotosocial.org + SPDX-License-Identifier: AGPL-3.0-or-later + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +import React from "react"; +import { Error } from "../error"; + +export interface MutationButtonProps extends React.DetailedHTMLProps, HTMLButtonElement> { + label: string, + result, + disabled: boolean, + showError?: boolean, + className?: string, + wrapperClassName?: string, +} + +export default function MutationButton({ + label, + result, + disabled, + showError = true, + className = "", + wrapperClassName = "", + ...inputProps +}: MutationButtonProps) { + let iconClass = ""; + // Can also both be undefined, which is correct. + const targetsThisButton = result.action == inputProps.name; + + if (targetsThisButton) { + if (result.isLoading) { + iconClass = " fa-spin fa-refresh"; + } else if (result.isSuccess) { + iconClass = " fa-check fadeout"; + } + } + + return ( +
+ {(showError && targetsThisButton && result.error) && + + } + +
+ ); +} -- cgit v1.2.3