mirrors
/
gotosocial
mirror of
1
Fork 0
Code Issues Releases Activity

fix user settings redux keys

This commit is contained in:
f0x 2022-09-16 21:01:58 +02:00
parent df401fb929
commit d6a2801d49
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/source/settings-panel/components/form-fields.jsx
View File

@ -134,8 +134,7 @@ module.exports = {
let label = <label htmlFor={id}>{name}</label>; let label = <label htmlFor={id}>{name}</label>;
return ( return (
<div className={`form-field ${type}`}> <div className={`form-field ${type}`}>
{defaultLabel ? label : null} {defaultLabel ? label : null} {field}
{field}
{children} {children}
</div> </div>
); );

1
web/source/settings-panel/lib/api/user.js
View File

@ -19,7 +19,6 @@
"use strict"; "use strict";
const Promise = require("bluebird"); const Promise = require("bluebird");
const d = require("dotty");
const user = require("../../redux/reducers/user").actions; const user = require("../../redux/reducers/user").actions;

3
web/source/settings-panel/redux/reducers/user.js
View File

@ -29,6 +29,9 @@ module.exports = createSlice({
}, },
reducers: { reducers: {
setAccount: (state, {payload}) => { setAccount: (state, {payload}) => {
if (payload.source != undefined && payload.source.language != undefined) {
payload.source.language = payload.source.language.toUpperCase();
}
state.profile = payload; state.profile = payload;
// /user/settings only needs a copy of the 'source' obj // /user/settings only needs a copy of the 'source' obj
state.settings = { state.settings = {

10
web/source/settings-panel/user/settings.js
View File

@ -32,7 +32,7 @@ const Submit = require("../components/submit");
const { const {
Checkbox, Checkbox,
Select, Select,
} = require("../components/form-fields").formFields(user.setProfileVal, (state) => state.user.profile); } = require("../components/form-fields").formFields(user.setSettingsVal, (state) => state.user.settings);
module.exports = function UserSettings() { module.exports = function UserSettings() {
const dispatch = Redux.useDispatch(); const dispatch = Redux.useDispatch();
@ -49,11 +49,11 @@ module.exports = function UserSettings() {
<> <>
<div className="user-settings"> <div className="user-settings">
<h1>Post settings</h1> <h1>Post settings</h1>
<Select id="language" name="Default post language" options={ <Select id="source.language" name="Default post language" options={
<Languages/> <Languages/>
}> }>
</Select> </Select>
<Select id="privacy" name="Default post privacy" options={ <Select id="source.privacy" name="Default post privacy" options={
<> <>
<option value="private">Private / followers-only</option> <option value="private">Private / followers-only</option>
<option value="unlisted">Unlisted</option> <option value="unlisted">Unlisted</option>
@ -62,7 +62,7 @@ module.exports = function UserSettings() {
}> }>
<a href="https://docs.gotosocial.org/en/latest/user_guide/posts/#privacy-settings" target="_blank" className="moreinfolink" rel="noreferrer">Learn more about post privacy settings (opens in a new tab)</a> <a href="https://docs.gotosocial.org/en/latest/user_guide/posts/#privacy-settings" target="_blank" className="moreinfolink" rel="noreferrer">Learn more about post privacy settings (opens in a new tab)</a>
</Select> </Select>
<Select id="format" name="Default post format" options={ <Select id="source.format" name="Default post format" options={
<> <>
<option value="plain">Plain (default)</option> <option value="plain">Plain (default)</option>
<option value="markdown">Markdown</option> <option value="markdown">Markdown</option>
@ -71,7 +71,7 @@ module.exports = function UserSettings() {
<a href="https://docs.gotosocial.org/en/latest/user_guide/posts/#input-types" target="_blank" className="moreinfolink" rel="noreferrer">Learn more about post format settings (opens in a new tab)</a> <a href="https://docs.gotosocial.org/en/latest/user_guide/posts/#input-types" target="_blank" className="moreinfolink" rel="noreferrer">Learn more about post format settings (opens in a new tab)</a>
</Select> </Select>
<Checkbox <Checkbox
id="sensitive" id="source.sensitive"
name="Mark my posts as sensitive by default" name="Mark my posts as sensitive by default"
/> />