summaryrefslogtreecommitdiff
path: root/web/source/settings/admin/emoji/local/detail.js
diff options
context:
space:
mode:
authorLibravatar f0x52 <f0x@cthu.lu>2023-03-29 12:18:45 +0200
committerLibravatar GitHub <noreply@github.com>2023-03-29 12:18:45 +0200
commit0746ef741a51bd8f92ca5e07dfb9f35b66f4cf06 (patch)
tree3c70da50eea8bad5db78dff5ce3a7a93dfefa36b /web/source/settings/admin/emoji/local/detail.js
parent[bugfix] Remove unique constraint on public_key (#1653) (diff)
downloadgotosocial-0746ef741a51bd8f92ca5e07dfb9f35b66f4cf06.tar.xz
[frontend] Settings navigation design (#1652)
* change header image alignment (cherry picked from commit df1bb339a5c597a2b668cedb3dafec5a390df120) * big mess navigation refactor * bit of cleanup * minor css tweaks * fix error rendering code for remote emoji * refactor navigation structure code * refactor styling * fix className * stash * restructure navigation generation * url wildcard formatting * remove un-implemented User menu entry * remove commented lines * clarify permissions check * invert permissions logic for clarity
Diffstat (limited to 'web/source/settings/admin/emoji/local/detail.js')
-rw-r--r--web/source/settings/admin/emoji/local/detail.js15
1 files changed, 8 insertions, 7 deletions
diff --git a/web/source/settings/admin/emoji/local/detail.js b/web/source/settings/admin/emoji/local/detail.js
index 101652686..6b583b0b9 100644
--- a/web/source/settings/admin/emoji/local/detail.js
+++ b/web/source/settings/admin/emoji/local/detail.js
@@ -28,6 +28,7 @@ const { useComboBoxInput, useFileInput, useValue } = require("../../../lib/form"
const { CategorySelect } = require("../category-select");
const useFormSubmit = require("../../../lib/form/submit");
+const { useBaseUrl } = require("../../../lib/navigation/util");
const FakeToot = require("../../../components/fake-toot");
const FormWithData = require("../../../lib/form/form-with-data");
@@ -36,16 +37,15 @@ const { FileInput } = require("../../../components/form/inputs");
const MutationButton = require("../../../components/form/mutation-button");
const { Error } = require("../../../components/error");
-const base = "/settings/custom-emoji/local";
-
-module.exports = function EmojiDetailRoute() {
- let [_match, params] = useRoute(`${base}/:emojiId`);
+module.exports = function EmojiDetailRoute({ }) {
+ const baseUrl = useBaseUrl();
+ let [_match, params] = useRoute(`${baseUrl}/:emojiId`);
if (params?.emojiId == undefined) {
- return <Redirect to={base} />;
+ return <Redirect to={baseUrl} />;
} else {
return (
<div className="emoji-detail">
- <Link to={base}><a>&lt; go back</a></Link>
+ <Link to={baseUrl}><a>&lt; go back</a></Link>
<FormWithData dataQuery={query.useGetEmojiQuery} queryArg={params.emojiId} DataForm={EmojiDetailForm} />
</div>
);
@@ -53,6 +53,7 @@ module.exports = function EmojiDetailRoute() {
};
function EmojiDetailForm({ data: emoji }) {
+ const baseUrl = useBaseUrl();
const form = {
id: useValue("id", emoji.id),
category: useComboBoxInput("category", { source: emoji }),
@@ -78,7 +79,7 @@ function EmojiDetailForm({ data: emoji }) {
const [deleteEmoji, deleteResult] = query.useDeleteEmojiMutation();
if (deleteResult.isSuccess) {
- return <Redirect to={base} />;
+ return <Redirect to={baseUrl} />;
}
return (