imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move existing 3PID settings UX to account directory

Browse source
This commit is contained in:
J. Ryan Stinnett 2019-08-06 13:03:15 +01:00
parent aa0a2a579e
commit accb1eea9f
3 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/components/views/settings/EmailAddresses.js → src/components/views/settings/account/EmailAddresses.js
View file

@ -17,14 +17,14 @@ limitations under the License.
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import {_t} from "../../../languageHandler"; import {_t} from "../../../../languageHandler";
import MatrixClientPeg from "../../../MatrixClientPeg"; import MatrixClientPeg from "../../../../MatrixClientPeg";
import Field from "../elements/Field"; import Field from "../../elements/Field";
import AccessibleButton from "../elements/AccessibleButton"; import AccessibleButton from "../../elements/AccessibleButton";
import * as Email from "../../../email"; import * as Email from "../../../../email";
import AddThreepid from "../../../AddThreepid"; import AddThreepid from "../../../../AddThreepid";
const sdk = require('../../../index'); const sdk = require('../../../../index');
const Modal = require("../../../Modal"); const Modal = require("../../../../Modal");
/* /*
TODO: Improve the UX for everything in here. TODO: Improve the UX for everything in here.

16
src/components/views/settings/PhoneNumbers.js → src/components/views/settings/account/PhoneNumbers.js
View file

@ -17,14 +17,14 @@ limitations under the License.
import React from 'react'; import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import {_t} from "../../../languageHandler"; import {_t} from "../../../../languageHandler";
import MatrixClientPeg from "../../../MatrixClientPeg"; import MatrixClientPeg from "../../../../MatrixClientPeg";
import Field from "../elements/Field"; import Field from "../../elements/Field";
import AccessibleButton from "../elements/AccessibleButton"; import AccessibleButton from "../../elements/AccessibleButton";
import AddThreepid from "../../../AddThreepid"; import AddThreepid from "../../../../AddThreepid";
import CountryDropdown from "../auth/CountryDropdown"; import CountryDropdown from "../../auth/CountryDropdown";
const sdk = require('../../../index'); const sdk = require('../../../../index');
const Modal = require("../../../Modal"); const Modal = require("../../../../Modal");
/* /*
TODO: Improve the UX for everything in here. TODO: Improve the UX for everything in here.

6
src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
View file

@ -1,5 +1,6 @@
/* /*
Copyright 2019 New Vector Ltd Copyright 2019 New Vector Ltd
Copyright 2019 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -17,8 +18,6 @@ limitations under the License.
import React from 'react'; import React from 'react';
import {_t} from "../../../../../languageHandler"; import {_t} from "../../../../../languageHandler";
import ProfileSettings from "../../ProfileSettings"; import ProfileSettings from "../../ProfileSettings";
import EmailAddresses from "../../EmailAddresses";
import PhoneNumbers from "../../PhoneNumbers";
import Field from "../../../elements/Field"; import Field from "../../../elements/Field";
import * as languageHandler from "../../../../../languageHandler"; import * as languageHandler from "../../../../../languageHandler";
import {SettingLevel} from "../../../../../settings/SettingsStore"; import {SettingLevel} from "../../../../../settings/SettingsStore";
@ -110,6 +109,9 @@ export default class GeneralUserSettingsTab extends React.Component {
_renderAccountSection() { _renderAccountSection() {
const ChangePassword = sdk.getComponent("views.settings.ChangePassword"); const ChangePassword = sdk.getComponent("views.settings.ChangePassword");
const EmailAddresses = sdk.getComponent("views.settings.account.EmailAddresses");
const PhoneNumbers = sdk.getComponent("views.settings.account.PhoneNumbers");
const passwordChangeForm = ( const passwordChangeForm = (
<ChangePassword <ChangePassword
className="mx_GeneralUserSettingsTab_changePassword" className="mx_GeneralUserSettingsTab_changePassword"