From 9b139b632098e6741b10fa87ff6224dcb5045947 Mon Sep 17 00:00:00 2001 From: f0x52 Date: Wed, 18 Jan 2023 14:45:14 +0100 Subject: [frogend] Settings refactor (#1318) * yakshave new form field structure * fully refactor user profile settings form * use rtk query api for profile settings * refactor user post settings * refactor password change form * refactor admin settings * FormWithData structure for user forms * admin actions refactor * whitespace * fix user settings data prop * remove superfluous logging * cleanup old code * refactor federation/suspend (overview, detail) * mostly abstracted (emoji) checkbox list * refactor parse-from-toot * refactor custom-emoji, progress on federation bulk * loading icon styling to prevent big spinny * refactor federation import-export interface * cleanup old files * [chore] Update/add license headers for 2023 * redux fixes * text-field exports * appease the linter * refactor authentication with RTK Query * fix login/logout state transition weirdness * fixes/cleanup * small linter-related fixes * add eslint license header check, fix existing files * remove old code, clarify comment * clarify suspend on subdomains * collapse if/else * fa-fw width info comment --- web/source/settings/components/fake-profile.jsx | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'web/source/settings/components/fake-profile.jsx') diff --git a/web/source/settings/components/fake-profile.jsx b/web/source/settings/components/fake-profile.jsx index 8afccf2cc..c326605d9 100644 --- a/web/source/settings/components/fake-profile.jsx +++ b/web/source/settings/components/fake-profile.jsx @@ -19,24 +19,21 @@ "use strict"; const React = require("react"); -const Redux = require("react-redux"); - -module.exports = function FakeProfile({}) { - const account = Redux.useSelector(state => state.user.profile); +module.exports = function FakeProfile({ avatar, header, display_name, username, role }) { return ( // Keep in sync with web/template/profile.tmpl
- {account.header + {header
- {account.avatar -
{account.display_name.trim().length > 0 ? account.display_name : account.username}
+ {avatar +
{display_name.trim().length > 0 ? display_name : username}
-
@{account.username}
- {(account.role && account.role != "user") && -
{account.role}
+
@{username}
+ {(role && role != "user") && +
{role}
}
-- cgit v1.2.3