From 4b8d7bd952dd97091d1baddeab10213e9c38cef3 Mon Sep 17 00:00:00 2001
From: f0x52 <f0x@cthu.lu>
Date: Sun, 11 Dec 2022 16:00:23 +0100
Subject: [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
---
 web/source/settings/index.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'web/source/settings/index.js')

diff --git a/web/source/settings/index.js b/web/source/settings/index.js
index 58afe5d28..b087f945c 100644
--- a/web/source/settings/index.js
+++ b/web/source/settings/index.js
@@ -32,6 +32,7 @@ const oauth = require("./redux/reducers/oauth").actions;
 const { AuthenticationError } = require("./lib/errors");
 
 const Login = require("./components/login");
+const Loading = require("./components/loading");
 
 require("./style.css");
 
@@ -46,7 +47,11 @@ const nav = {
 		"Instance Settings": require("./admin/settings.js"),
 		"Actions": require("./admin/actions"),
 		"Federation": require("./admin/federation.js"),
-		"Custom Emoji": require("./admin/emoji"),
+	},
+	"Custom Emoji": {
+		adminOnly: true,
+		"Local": require("./admin/emoji/local"),
+		"Remote": require("./admin/emoji/remote"),
 	}
 };
 
@@ -167,7 +172,7 @@ function App() {
 function Main() {
 	return (
 		<Provider store={store}>
-			<PersistGate loading={"loading..."} persistor={persistor}>
+			<PersistGate loading={<section><Loading/></section>} persistor={persistor}>
 				<App />
 			</PersistGate>
 		</Provider>
-- 
cgit v1.2.3