diff options
| author | 2022-09-29 12:02:41 +0200 | |
|---|---|---|
| committer | 2022-09-29 12:02:41 +0200 | |
| commit | 938328cd077d40b75e0834d56ff8d43ad035fd2b (patch) | |
| tree | 76ed59a9adf8a40e83c99a3ea34ce7cb5a5f8877 /web/source/settings-panel/redux | |
| parent | [chore] simplify generating log entry caller information (#863) (diff) | |
| download | gotosocial-938328cd077d40b75e0834d56ff8d43ad035fd2b.tar.xz | |
[frontend] Unified panels (#812)
* settings panel restructuring
* clean up old Gin handlers
* colorscheme redesign, some other small css tweaks
* basic router layout, error boundary
* colorscheme redesign, some other small css tweaks
* kebab-case consistency
* superfluous padding on applist
* remove unused consts
* redux, whitespace changes..
* use .jsx extensions for components
* login flow up till app registration
* full redux oauth implementation, with basic error handling
* split oauth api functions
* oauth api revocation handling
* basic profile change submission
* move old dir
* profile overview
* fix keeping track of the wrong instance url (for different instance/api domains)
* use redux state for profile form
* delete old/index.js, old/basic.js, fully implemented
* implement old/user/profile.js
* implement password change
* remove debug logging
* support future api for removing files
* customize profile css
* remove unneeded wrapper components
* restructure form fields
* start on admin pages
* admin panel settings
* admin settings panel
* remove old/admin files
* add top-level redirect
* refactor/cleanup forms
* only do API checks on logged-in state
* admin-status based routing
* federation block routing
* federation blocks
* upgrade dependencies
* react 18 changes
* media cleanup
* fix useEffect hooks
* remove unused require
* custom emoji base
* emoji uploader
* delete last old panel files
* sidebar styling, remove unused page
* refactor submit functions
* fix sidebar boxshadow-border
* fix old css variables
* fix fake-toot avatar
* fix non-square emoji
* fix user settings redux keys
* properly get admin account contact from instance response
* Account.source default values
* source.status_format key
* mobile responsiveness
* mobile element tweaks
* proper redirect after removing block
* add redirects for old setting panel urls
* deletes
* fix mobile overflow
* clean up debug logging calls
Diffstat (limited to 'web/source/settings-panel/redux')
| -rw-r--r-- | web/source/settings-panel/redux/index.js | 48 | ||||
| -rw-r--r-- | web/source/settings-panel/redux/reducers/admin.js | 131 | ||||
| -rw-r--r-- | web/source/settings-panel/redux/reducers/instances.js | 42 | ||||
| -rw-r--r-- | web/source/settings-panel/redux/reducers/oauth.js | 52 | ||||
| -rw-r--r-- | web/source/settings-panel/redux/reducers/temporary.js | 32 | ||||
| -rw-r--r-- | web/source/settings-panel/redux/reducers/user.js | 51 | 
6 files changed, 356 insertions, 0 deletions
diff --git a/web/source/settings-panel/redux/index.js b/web/source/settings-panel/redux/index.js new file mode 100644 index 000000000..e0dbe9b23 --- /dev/null +++ b/web/source/settings-panel/redux/index.js @@ -0,0 +1,48 @@ +/* +	 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 <http://www.gnu.org/licenses/>. +*/ + +"use strict"; + +const { createStore, combineReducers, applyMiddleware } = require("redux"); +const { persistStore, persistReducer } = require("redux-persist"); +const thunk = require("redux-thunk").default; +const { composeWithDevTools } = require("redux-devtools-extension"); + +const persistConfig = { +	key: "gotosocial-settings", +	storage: require("redux-persist/lib/storage").default, +	stateReconciler: require("redux-persist/lib/stateReconciler/autoMergeLevel2").default, +	whitelist: ["oauth"], +	blacklist: ["temporary"] +}; + +const combinedReducers = combineReducers({ +	oauth: require("./reducers/oauth").reducer, +	instances: require("./reducers/instances").reducer, +	temporary: require("./reducers/temporary").reducer, +	user: require("./reducers/user").reducer, +	admin: require("./reducers/admin").reducer, +}); + +const persistedReducer = persistReducer(persistConfig, combinedReducers); +const composedEnhancer = composeWithDevTools(applyMiddleware(thunk)); + +const store = createStore(persistedReducer, composedEnhancer); +const persistor = persistStore(store); + +module.exports = { store, persistor };
\ No newline at end of file diff --git a/web/source/settings-panel/redux/reducers/admin.js b/web/source/settings-panel/redux/reducers/admin.js new file mode 100644 index 000000000..20d3d748d --- /dev/null +++ b/web/source/settings-panel/redux/reducers/admin.js @@ -0,0 +1,131 @@ +/* +	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 <http://www.gnu.org/licenses/>. +*/ + +"use strict"; + +const { createSlice } = require("@reduxjs/toolkit"); +const defaultValue = require("default-value"); + +function sortBlocks(blocks) { +	return blocks.sort((a, b) => { // alphabetical sort +		return a.domain.localeCompare(b.domain); +	}); +} + +function emptyBlock() { +	return { +		public_comment: "", +		private_comment: "", +		obfuscate: false +	}; +} + +function emptyEmojiForm() { +	return { +		shortcode: "" +	}; +} + +module.exports = createSlice({ +	name: "admin", +	initialState: { +		loadedBlockedInstances: false, +		blockedInstances: undefined, +		bulkBlock: { +			list: "", +			exportType: "plain", +			...emptyBlock() +		}, +		newInstanceBlocks: {}, +		emoji: {}, +		newEmoji: emptyEmojiForm() +	}, +	reducers: { +		setBlockedInstances: (state, { payload }) => { +			state.blockedInstances = {}; +			sortBlocks(payload).forEach((entry) => { +				state.blockedInstances[entry.domain] = entry; +			}); +			state.loadedBlockedInstances = true; +		}, + +		newDomainBlock: (state, { payload: [domain, data] }) => { +			if (data == undefined) { +				data = { +					new: true, +					domain, +					...emptyBlock() +				}; +			} +			state.newInstanceBlocks[domain] = data; +		}, + +		setDomainBlock: (state, { payload: [domain, data = {}] }) => { +			state.blockedInstances[domain] = data; +		}, + +		removeDomainBlock: (state, {payload: domain}) => { +			delete state.blockedInstances[domain]; +		}, + +		updateDomainBlockVal: (state, { payload: [domain, key, val] }) => { +			state.newInstanceBlocks[domain][key] = val; +		}, + +		updateBulkBlockVal: (state, { payload: [key, val] }) => { +			state.bulkBlock[key] = val; +		}, + +		resetBulkBlockVal: (state, { _payload }) => { +			state.bulkBlock = { +				list: "", +				exportType: "plain", +				...emptyBlock() +			}; +		}, + +		exportToField: (state, { _payload }) => { +			state.bulkBlock.list = Object.values(state.blockedInstances).map((entry) => { +				return entry.domain; +			}).join("\n"); +		}, + +		setEmoji: (state, {payload}) => { +			state.emoji = {}; +			payload.forEach((emoji) => { +				if (emoji.category == undefined) { +					emoji.category = "Unsorted"; +				} +				state.emoji[emoji.category] = defaultValue(state.emoji[emoji.category], []); +				state.emoji[emoji.category].push(emoji); +			}); +		}, + +		updateNewEmojiVal: (state, { payload: [key, val] }) => { +			state.newEmoji[key] = val; +		}, + +		addEmoji: (state, {payload: emoji}) => { +			if (emoji.category == undefined) { +				emoji.category = "Unsorted"; +			} +			state.emoji[emoji.category] = defaultValue(state.emoji[emoji.category], []); +			state.emoji[emoji.category].push(emoji); +		}, +	} +});
\ No newline at end of file diff --git a/web/source/settings-panel/redux/reducers/instances.js b/web/source/settings-panel/redux/reducers/instances.js new file mode 100644 index 000000000..3ad5bb7cb --- /dev/null +++ b/web/source/settings-panel/redux/reducers/instances.js @@ -0,0 +1,42 @@ +/* +	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 <http://www.gnu.org/licenses/>. +*/ + +"use strict"; + +const {createSlice} = require("@reduxjs/toolkit"); +const d = require("dotty"); + +module.exports = createSlice({ +	name: "instances", +	initialState: { +		info: {}, +	}, +	reducers: { +		setNamedInstanceInfo: (state, {payload}) => { +			let [key, info] = payload; +			state.info[key] = info; +		}, +		setInstanceInfo: (state, {payload}) => { +			state.current = payload; +			state.adminSettings = payload; +		}, +		setAdminSettingsVal: (state, {payload: [key, val]}) => { +			d.put(state.adminSettings, key, val); +		} +	} +});
\ No newline at end of file diff --git a/web/source/settings-panel/redux/reducers/oauth.js b/web/source/settings-panel/redux/reducers/oauth.js new file mode 100644 index 000000000..c332a7d06 --- /dev/null +++ b/web/source/settings-panel/redux/reducers/oauth.js @@ -0,0 +1,52 @@ +/* +	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 <http://www.gnu.org/licenses/>. +*/ + +"use strict"; + +const {createSlice} = require("@reduxjs/toolkit"); + +module.exports = createSlice({ +	name: "oauth", +	initialState: { +		loginState: 'none', +	}, +	reducers: { +		setInstance: (state, {payload}) => { +			state.instance = payload; +		}, +		setRegistration: (state, {payload}) => { +			state.registration = payload; +		}, +		setLoginState: (state, {payload}) => { +			state.loginState = payload; +		}, +		login: (state, {payload}) => { +			state.token = `${payload.token_type} ${payload.access_token}`; +			state.loginState = "login"; +		}, +		remove: (state, {_payload}) => { +			delete state.token; +			delete state.registration; +			delete state.isAdmin; +			state.loginState = "none"; +		}, +		setAdmin: (state, {payload}) => { +			state.isAdmin = payload; +		} +	} +});
\ No newline at end of file diff --git a/web/source/settings-panel/redux/reducers/temporary.js b/web/source/settings-panel/redux/reducers/temporary.js new file mode 100644 index 000000000..c887d2eee --- /dev/null +++ b/web/source/settings-panel/redux/reducers/temporary.js @@ -0,0 +1,32 @@ +/* +	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 <http://www.gnu.org/licenses/>. +*/ + +"use strict"; + +const {createSlice} = require("@reduxjs/toolkit"); + +module.exports = createSlice({ +	name: "temporary", +	initialState: { +	}, +	reducers: { +		setStatus: function(state, {payload}) { +			state.status = payload; +		} +	} +});
\ No newline at end of file diff --git a/web/source/settings-panel/redux/reducers/user.js b/web/source/settings-panel/redux/reducers/user.js new file mode 100644 index 000000000..b4463c9f9 --- /dev/null +++ b/web/source/settings-panel/redux/reducers/user.js @@ -0,0 +1,51 @@ +/* +	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 <http://www.gnu.org/licenses/>. +*/ + +"use strict"; + +const { createSlice } = require("@reduxjs/toolkit"); +const d = require("dotty"); +const defaultValue = require("default-value"); + +module.exports = createSlice({ +	name: "user", +	initialState: { +		profile: {}, +		settings: {} +	}, +	reducers: { +		setAccount: (state, { payload }) => { +			payload.source = defaultValue(payload.source, {}); +			payload.source.language = defaultValue(payload.source.language.toUpperCase(), "EN"); +			payload.source.status_format = defaultValue(payload.source.status_format, "plain"); +			payload.source.sensitive = defaultValue(payload.source.sensitive, false); + +			state.profile = payload; +			// /user/settings only needs a copy of the 'source' obj +			state.settings = { +				source: payload.source +			}; +		}, +		setProfileVal: (state, { payload: [key, val] }) => { +			d.put(state.profile, key, val); +		}, +		setSettingsVal: (state, { payload: [key, val] }) => { +			d.put(state.settings, key, val); +		} +	} +});
\ No newline at end of file  | 
