From 5249294a166c901469eeac1d3297e913b4a125e7 Mon Sep 17 00:00:00 2001 From: f0x52 Date: Mon, 3 Oct 2022 16:46:38 +0200 Subject: [chore] Bundler restructure (#880) * re-structure bundler, settings panel files * add more info logging * tidy up CSS syntax errors * split into lib/ files * livereloading server * fix factor function for production builds * remove testing console.log * default to production env, saves 300kb bundle size --- web/source/settings/components/error.jsx | 45 +++++++ web/source/settings/components/fake-toot.jsx | 43 +++++++ web/source/settings/components/form-fields.jsx | 167 +++++++++++++++++++++++++ web/source/settings/components/languages.jsx | 98 +++++++++++++++ web/source/settings/components/login.jsx | 102 +++++++++++++++ web/source/settings/components/nav-button.jsx | 33 +++++ web/source/settings/components/submit.jsx | 35 ++++++ 7 files changed, 523 insertions(+) create mode 100644 web/source/settings/components/error.jsx create mode 100644 web/source/settings/components/fake-toot.jsx create mode 100644 web/source/settings/components/form-fields.jsx create mode 100644 web/source/settings/components/languages.jsx create mode 100644 web/source/settings/components/login.jsx create mode 100644 web/source/settings/components/nav-button.jsx create mode 100644 web/source/settings/components/submit.jsx (limited to 'web/source/settings/components') diff --git a/web/source/settings/components/error.jsx b/web/source/settings/components/error.jsx new file mode 100644 index 000000000..13dc686b7 --- /dev/null +++ b/web/source/settings/components/error.jsx @@ -0,0 +1,45 @@ +/* + GoToSocial + Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +"use strict"; + +const Promise = require("bluebird"); +const React = require("react"); + +module.exports = function ErrorFallback({error, resetErrorBoundary}) { + return ( +
+

+ {"An error occured, please report this on the "} + GoToSocial issue tracker + {" or "} + Matrix support room. +
Include the details below: +

+ 
+				{error.name}: {error.message}
+
+ 
+				{error.stack}
+
+

+ or refresh the page +

+
+ ); +}; \ No newline at end of file diff --git a/web/source/settings/components/fake-toot.jsx b/web/source/settings/components/fake-toot.jsx new file mode 100644 index 000000000..f79e24eb9 --- /dev/null +++ b/web/source/settings/components/fake-toot.jsx @@ -0,0 +1,43 @@ +/* + GoToSocial + Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +"use strict"; + +const React = require("react"); +const Redux = require("react-redux"); + +module.exports = function FakeToot({children}) { + const account = Redux.useSelector((state) => state.user.profile); + + return ( +
+
+ + + + {account.display_name.trim().length > 0 ? account.display_name : account.username} + @{account.username} +
+
+ {children} +
+
+
+
+ ); +}; \ No newline at end of file diff --git a/web/source/settings/components/form-fields.jsx b/web/source/settings/components/form-fields.jsx new file mode 100644 index 000000000..cb402c3b2 --- /dev/null +++ b/web/source/settings/components/form-fields.jsx @@ -0,0 +1,167 @@ +/* + GoToSocial + Copyright (C) 2021-2022 GoToSocial Authors admin@gotosocial.org + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +"use strict"; + +const React = require("react"); +const Redux = require("react-redux"); +const d = require("dotty"); +const prettierBytes = require("prettier-bytes"); + +function eventListeners(dispatch, setter, obj) { + return { + onTextChange: function (key) { + return function (e) { + dispatch(setter([key, e.target.value])); + }; + }, + + onCheckChange: function (key) { + return function (e) { + dispatch(setter([key, e.target.checked])); + }; + }, + + onFileChange: function (key, withPreview) { + return function (e) { + let file = e.target.files[0]; + if (withPreview) { + let old = d.get(obj, key); + if (old != undefined) { + URL.revokeObjectURL(old); // no error revoking a non-Object URL as provided by instance + } + let objectURL = URL.createObjectURL(file); + dispatch(setter([key, objectURL])); + } + dispatch(setter([`${key}File`, file])); + }; + } + }; +} + +function get(state, id, defaultVal) { + let value; + if (id.includes(".")) { + value = d.get(state, id); + } else { + value = state[id]; + } + if (value == undefined) { + value = defaultVal; + } + return value; +} + +// function removeFile(name) { +// return function(e) { +// e.preventDefault(); +// dispatch(user.setProfileVal([name, ""])); +// dispatch(user.setProfileVal([`${name}File`, ""])); +// }; +// } + +module.exports = { + formFields: function formFields(setter, selector) { + function FormField({ + type, id, name, className="", placeHolder="", fileType="", children=null, + options=null, inputProps={}, withPreview=true, showSize=false, maxSize=Infinity + }) { + const dispatch = Redux.useDispatch(); + let state = Redux.useSelector(selector); + let { + onTextChange, + onCheckChange, + onFileChange + } = eventListeners(dispatch, setter, state); + + let field; + let defaultLabel = true; + if (type == "text") { + field = ; + } else if (type == "textarea") { + field =