Merge branch 'experimental' into travis/rsettings/tab/general

src/components/views/settings/tabs/FlairSettingsTab.js

@@ -0,0 +1,52 @@
+/*
+Copyright 2019 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import {_t} from "../../../../languageHandler";
+import {DragDropContext} from "react-beautiful-dnd";
+import GroupUserSettings from "../../groups/GroupUserSettings";
+import MatrixClientPeg from "../../../../MatrixClientPeg";
+import PropTypes from "prop-types";
+import {MatrixClient} from "matrix-js-sdk";
+
+export default class FlairSettingsTab extends React.Component {
+    static childContextTypes = {
+        matrixClient: PropTypes.instanceOf(MatrixClient),
+    };
+
+    constructor() {
+        super();
+    }
+
+    getChildContext() {
+        return {
+            matrixClient: MatrixClientPeg.get(),
+        };
+    }
+
+    render() {
+        return (
+            <div className="mx_SettingsTab">
+                <span className="mx_SettingsTab_heading">{_t("Flair")}</span>
+                <div className="mx_SettingsTab_section">
+                    <DragDropContext>
+                        <GroupUserSettings />
+                    </DragDropContext>
+                </div>
+            </div>
+        );
+    }
+}