diff options
| author |  f0x52 <f0x@cthu.lu> | 2023-03-29 12:18:45 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-03-29 12:18:45 +0200 |
| commit | 0746ef741a51bd8f92ca5e07dfb9f35b66f4cf06 (patch) | |
| tree | 3c70da50eea8bad5db78dff5ce3a7a93dfefa36b /web/source/settings/admin/federation | |
| parent | [bugfix] Remove unique constraint on public_key (#1653) (diff) | |
| download | gotosocial-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/federation')
| -rw-r--r-- | web/source/settings/admin/federation/import-export/form.jsx | 2 | ||||
| -rw-r--r-- | web/source/settings/admin/federation/import-export/index.jsx | 4 | ||||
| -rw-r--r-- | web/source/settings/admin/federation/index.js | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/web/source/settings/admin/federation/import-export/form.jsx b/web/source/settings/admin/federation/import-export/form.jsx index 1cb8d2d74..a6967b8f0 100644 --- a/web/source/settings/admin/federation/import-export/form.jsx +++ b/web/source/settings/admin/federation/import-export/form.jsx @@ -79,7 +79,7 @@ module.exports = function ImportExportForm({ form, submitParse, parseResult }) { showError={false} /> <label className="button with-icon"> - <i class="fa fa-fw " aria-hidden="true" /> + <i className="fa fa-fw " aria-hidden="true" /> Import file <input type="file" diff --git a/web/source/settings/admin/federation/import-export/index.jsx b/web/source/settings/admin/federation/import-export/index.jsx index 415698bb3..7126b4e89 100644 --- a/web/source/settings/admin/federation/import-export/index.jsx +++ b/web/source/settings/admin/federation/import-export/index.jsx @@ -33,9 +33,7 @@ const useFormSubmit = require("../../../lib/form/submit"); const ProcessImport = require("./process"); const ImportExportForm = require("./form"); -const baseUrl = "/settings/admin/federation/import-export"; - -module.exports = function ImportExport() { +module.exports = function ImportExport({ baseUrl }) { const form = { domains: useTextInput("domains"), exportType: useTextInput("exportType", { defaultValue: "plain", dontReset: true }) diff --git a/web/source/settings/admin/federation/index.js b/web/source/settings/admin/federation/index.js index f4d0a01d2..081d34113 100644 --- a/web/source/settings/admin/federation/index.js +++ b/web/source/settings/admin/federation/index.js @@ -22,13 +22,11 @@ const React = require("react"); const { Switch, Route } = require("wouter"); -const baseUrl = `/settings/admin/federation`; - const InstanceOverview = require("./overview"); const InstanceDetail = require("./detail"); const InstanceImportExport = require("./import-export"); -module.exports = function Federation({ }) { +module.exports = function Federation({ baseUrl }) { return ( <Switch> <Route path={`${baseUrl}/import-export/:list?`}> |