From 637f188ebec71fe4b0b80bbab4592d4c269d7d93 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Tue, 17 Oct 2023 12:46:06 +0200
Subject: [feature] Allow import/export/creation of domain allows via admin
 panel (#2264)

* it's happening!

* aaa

* fix silly whoopsie

* it's working pa! it's working ma!

* model report parameters

* shuffle some more stuff around

* getting there

* oo hoo

* finish tidying up for now

* aaa

* fix use form submit errors

* peepee poo poo

* aaaaa

* ffff

* they see me typin', they hatin'

* boop

* aaa

* oooo

* typing typing tappa tappa

* almost done typing

* weee

* alright

* push it push it real good doo doo doo doo doo doo

* thingy no worky

* almost done

* mutation modifers not quite right

* hmm

* it works

* view blocks + allows nicely

* it works!

* typia install

* the old linterino

* linter plz
---
 web/source/settings/user/profile.js  | 16 +++++++++-------
 web/source/settings/user/settings.js |  4 ++--
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'web/source/settings/user')

diff --git a/web/source/settings/user/profile.js b/web/source/settings/user/profile.js
index 6c26bb406..b6daf175b 100644
--- a/web/source/settings/user/profile.js
+++ b/web/source/settings/user/profile.js
@@ -19,8 +19,6 @@
 
 const React = require("react");
 
-const query = require("../lib/query");
-
 const {
 	useTextInput,
 	useFileInput,
@@ -28,7 +26,7 @@ const {
 	useFieldArrayInput
 } = require("../lib/form");
 
-const useFormSubmit = require("../lib/form/submit");
+const useFormSubmit = require("../lib/form/submit").default;
 const { useWithFormContext, FormContext } = require("../lib/form/context");
 
 const {
@@ -38,14 +36,18 @@ const {
 	Checkbox
 } = require("../components/form/inputs");
 
-const FormWithData = require("../lib/form/form-with-data");
+const FormWithData = require("../lib/form/form-with-data").default;
 const FakeProfile = require("../components/fake-profile");
 const MutationButton = require("../components/form/mutation-button");
 
+const { useInstanceV1Query } = require("../lib/query");
+const { useUpdateCredentialsMutation } = require("../lib/query/user");
+const { useVerifyCredentialsQuery } = require("../lib/query/oauth");
+
 module.exports = function UserProfile() {
 	return (
 		<FormWithData
-			dataQuery={query.useVerifyCredentialsQuery}
+			dataQuery={useVerifyCredentialsQuery}
 			DataForm={UserProfileForm}
 		/>
 	);
@@ -64,7 +66,7 @@ function UserProfileForm({ data: profile }) {
 		- string custom_css (if enabled)
 	*/
 
-	const { data: instance } = query.useInstanceQuery();
+	const { data: instance } = useInstanceV1Query();
 	const instanceConfig = React.useMemo(() => {
 		return {
 			allowCustomCSS: instance?.configuration?.accounts?.allow_custom_css === true,
@@ -88,7 +90,7 @@ function UserProfileForm({ data: profile }) {
 		}),
 	};
 
-	const [submitForm, result] = useFormSubmit(form, query.useUpdateCredentialsMutation(), {
+	const [submitForm, result] = useFormSubmit(form, useUpdateCredentialsMutation(), {
 		onFinish: () => {
 			form.avatar.reset();
 			form.header.reset();
diff --git a/web/source/settings/user/settings.js b/web/source/settings/user/settings.js
index 2a23a87e0..31ea8c39a 100644
--- a/web/source/settings/user/settings.js
+++ b/web/source/settings/user/settings.js
@@ -26,7 +26,7 @@ const {
 	useBoolInput
 } = require("../lib/form");
 
-const useFormSubmit = require("../lib/form/submit");
+const useFormSubmit = require("../lib/form/submit").default;
 
 const {
 	Select,
@@ -34,7 +34,7 @@ const {
 	Checkbox
 } = require("../components/form/inputs");
 
-const FormWithData = require("../lib/form/form-with-data");
+const FormWithData = require("../lib/form/form-with-data").default;
 const Languages = require("../components/languages");
 const MutationButton = require("../components/form/mutation-button");
 
-- 
cgit v1.2.3