From f1e44757f01191e2c5592aa3b7d31c39d578e1b7 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Fri, 18 Jan 2019 20:22:36 -0700
Subject: [PATCH] Very early work on the "General" tab

---
 res/css/_components.scss                      |  2 +
 res/css/structures/_TabbedView.scss           |  2 +-
 .../views/dialogs/_UserSettingsDialog.scss    |  2 +-
 .../settings/tabs/_GeneralSettingsTab.scss    |  6 +++
 res/css/views/settings/tabs/_SettingsTab.scss | 13 +++++
 .../views/dialogs/UserSettingsDialog.js       |  3 +-
 .../views/settings/tabs/GeneralSettingsTab.js | 53 +++++++++++++++++++
 7 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 res/css/views/settings/tabs/_GeneralSettingsTab.scss
 create mode 100644 res/css/views/settings/tabs/_SettingsTab.scss
 create mode 100644 src/components/views/settings/tabs/GeneralSettingsTab.js

diff --git a/res/css/_components.scss b/res/css/_components.scss
index e60e74383f..c1e2cc29cd 100644
--- a/res/css/_components.scss
+++ b/res/css/_components.scss
@@ -124,6 +124,8 @@
 @import "./views/settings/_IntegrationsManager.scss";
 @import "./views/settings/_KeyBackupPanel.scss";
 @import "./views/settings/_Notifications.scss";
+@import "./views/settings/tabs/_GeneralSettingsTab.scss";
+@import "./views/settings/tabs/_SettingsTab.scss";
 @import "./views/voip/_CallView.scss";
 @import "./views/voip/_IncomingCallbox.scss";
 @import "./views/voip/_VideoView.scss";
diff --git a/res/css/structures/_TabbedView.scss b/res/css/structures/_TabbedView.scss
index 957e989f53..322e763000 100644
--- a/res/css/structures/_TabbedView.scss
+++ b/res/css/structures/_TabbedView.scss
@@ -82,7 +82,7 @@ limitations under the License.
 .mx_TabbedView_tabPanel {
   width: calc(100% - 320px);
   display: inline-block;
-  margin-left: 20px;
+  margin-left: 70px;
   flex-grow: 1;
 }
 
diff --git a/res/css/views/dialogs/_UserSettingsDialog.scss b/res/css/views/dialogs/_UserSettingsDialog.scss
index e98001fea4..75d89a1d06 100644
--- a/res/css/views/dialogs/_UserSettingsDialog.scss
+++ b/res/css/views/dialogs/_UserSettingsDialog.scss
@@ -4,7 +4,7 @@
   text-align: center;
   color: $dialog-title-fg-color;
   margin-top: 23px;
-  margin-bottom: 32px;
+  margin-bottom: 24px;
   padding: 0;
 }
 
diff --git a/res/css/views/settings/tabs/_GeneralSettingsTab.scss b/res/css/views/settings/tabs/_GeneralSettingsTab.scss
new file mode 100644
index 0000000000..b04975fc2d
--- /dev/null
+++ b/res/css/views/settings/tabs/_GeneralSettingsTab.scss
@@ -0,0 +1,6 @@
+.mx_GeneralSettingsTab_profile input {
+  display: block;
+  font-size: 14px;
+  padding: 5px;
+  border-radius: 4px;
+}
\ No newline at end of file
diff --git a/res/css/views/settings/tabs/_SettingsTab.scss b/res/css/views/settings/tabs/_SettingsTab.scss
new file mode 100644
index 0000000000..13e8b0ab51
--- /dev/null
+++ b/res/css/views/settings/tabs/_SettingsTab.scss
@@ -0,0 +1,13 @@
+.mx_SettingsTab_heading {
+  font-size: 20px;
+  font-weight: 600;
+}
+
+.mx_SettingsTab_subheading {
+  font-size: 14px;
+  display: block;
+}
+
+.mx_SettingsTab_section {
+  margin-top: 10px;
+}
\ No newline at end of file
diff --git a/src/components/views/dialogs/UserSettingsDialog.js b/src/components/views/dialogs/UserSettingsDialog.js
index 1896bd38e0..b5450c01b5 100644
--- a/src/components/views/dialogs/UserSettingsDialog.js
+++ b/src/components/views/dialogs/UserSettingsDialog.js
@@ -19,6 +19,7 @@ import PropTypes from 'prop-types';
 import {Tab, TabbedView} from "../../structures/TabbedView";
 import {_t, _td} from "../../../languageHandler";
 import AccessibleButton from "../elements/AccessibleButton";
+import GeneralSettingsTab from "../settings/tabs/GeneralSettingsTab";
 
 export default class UserSettingsDialog extends React.Component {
     static propTypes = {
@@ -27,7 +28,7 @@ export default class UserSettingsDialog extends React.Component {
 
     _getTabs() {
         return [
-            new Tab(_td("General"), <span className="mx_UserSettingsDialog_settingsIcon mx_TabbedView_maskedIcon" />, <div>General Test</div>),
+            new Tab(_td("General"), <span className="mx_UserSettingsDialog_settingsIcon mx_TabbedView_maskedIcon" />, <GeneralSettingsTab />),
             new Tab(_td("Notifications"), <span className="mx_UserSettingsDialog_bellIcon mx_TabbedView_maskedIcon" />, <div>Notifications Test</div>),
             new Tab(_td("Preferences"), <span className="mx_UserSettingsDialog_preferencesIcon mx_TabbedView_maskedIcon" />, <div>Preferences Test</div>),
             new Tab(_td("Voice & Video"), <span className="mx_UserSettingsDialog_voiceIcon mx_TabbedView_maskedIcon" />, <div>Voice Test</div>),
diff --git a/src/components/views/settings/tabs/GeneralSettingsTab.js b/src/components/views/settings/tabs/GeneralSettingsTab.js
new file mode 100644
index 0000000000..60f557d918
--- /dev/null
+++ b/src/components/views/settings/tabs/GeneralSettingsTab.js
@@ -0,0 +1,53 @@
+/*
+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 PropTypes from 'prop-types';
+import {_t} from "../../../../languageHandler";
+
+export default class GeneralSettingsTab extends React.Component {
+    static propTypes = {
+        onFinished: PropTypes.func.isRequired,
+    };
+
+    render() {
+        return (
+            <div className="mx_SettingsTab">
+                <div className="mx_SettingsTab_heading">{_t("General")}</div>
+                <div className="mx_GeneralSettingsTab_profile mx_SettingsTab_section">
+                    <span className="mx_SettingsTab_subheading">{_t("Profile")}</span>
+                    <input type="text" value="travis" />
+                    <input type="text" value="TravisR" />
+                </div>
+                <div className="mx_GeneralSettingsTab_profile mx_SettingsTab_section">
+                    <span className="mx_SettingsTab_subheading">{_t("Profile")}</span>
+                    <input type="text" value="travis" />
+                    <input type="text" value="TravisR" />
+                </div>
+                <div className="mx_GeneralSettingsTab_profile mx_SettingsTab_section">
+                    <span className="mx_SettingsTab_subheading">{_t("Profile")}</span>
+                    <input type="text" value="travis" />
+                    <input type="text" value="TravisR" />
+                </div>
+                <div className="mx_GeneralSettingsTab_profile mx_SettingsTab_section">
+                    <span className="mx_SettingsTab_subheading">{_t("Profile")}</span>
+                    <input type="text" value="travis" />
+                    <input type="text" value="TravisR" />
+                </div>
+            </div>
+        );
+    }
+}