diff options
author | 2022-12-11 16:00:23 +0100 | |
---|---|---|
committer | 2022-12-11 16:00:23 +0100 | |
commit | 4b8d7bd952dd97091d1baddeab10213e9c38cef3 (patch) | |
tree | 368b80e82590ca85c031b9d720dc7dd7c4fbbb6b /web/source/settings/admin/federation.js | |
parent | [docs] Serve static assets with nginx (#1251) (diff) | |
download | gotosocial-4b8d7bd952dd97091d1baddeab10213e9c38cef3.tar.xz |
[frogend] Emoji copy "Steal this look" (#1222)
* split emoji into local and remote, allow looking up remote emoji by toot url
* optimize some/all filtering
* fix local emoji routes
* implement copy action
* shortcode validation, don't wipe form on error
* copy & disable PATCH
* remove local toot acceptance for testing
* unused import
* parse emoji from account and status, get web_url from status uri
* fix url parse
* submit button loading info
* actually send category
* code cleanup, distinguish between account and status responses
* use loading icons
* fix loading icon on federation page
* require Loading element
* remove unused require
* query explanation, small accessibility tweaks
Diffstat (limited to 'web/source/settings/admin/federation.js')
-rw-r--r-- | web/source/settings/admin/federation.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/web/source/settings/admin/federation.js b/web/source/settings/admin/federation.js index 753024e58..f1023d365 100644 --- a/web/source/settings/admin/federation.js +++ b/web/source/settings/admin/federation.js @@ -30,6 +30,7 @@ const api = require("../lib/api"); const adminActions = require("../redux/reducers/admin").actions; const submit = require("../lib/submit"); const BackButton = require("../components/back-button"); +const Loading = require("../components/loading"); const base = "/settings/admin/federation"; @@ -56,7 +57,9 @@ module.exports = function AdminSettings() { return ( <div> <h1>Federation</h1> - Loading... + <div> + <Loading/> + </div> </div> ); } @@ -321,7 +324,7 @@ function InstancePage({domain, Form}) { const [statusMsg, setStatus] = React.useState(""); if (entry == undefined) { - return "Loading..."; + return <Loading/>; } const updateBlock = submit( |