diff --git a/web/settings/account-settings.css b/web/settings/account-settings.css --- a/web/settings/account-settings.css +++ b/web/settings/account-settings.css @@ -1,3 +1,12 @@ +.outer { + flex-direction: row; + display: flex; +} + +.switcher { + border-right: 1px solid var(--border-color); +} + .container { padding: 40px; width: 456px; diff --git a/web/settings/account-settings.react.js b/web/settings/account-settings.react.js --- a/web/settings/account-settings.react.js +++ b/web/settings/account-settings.react.js @@ -12,6 +12,7 @@ import Button from '../components/button.react'; import { useSelector } from '../redux/redux-utils'; +import SettingsSwitcher from '../sidebar/settings-switcher.react'; import SWMansionIcon from '../SWMansionIcon.react'; import css from './account-settings.css'; import PasswordChangeModal from './password-change-modal'; @@ -54,44 +55,49 @@ const { username } = currentUserInfo; return ( -
-

My Account

-
- +
+
+ +
+
+

My Account

+
+
    +
  • +

    + {'Logged in as '} + {username} +

    + +
  • +
  • + Password + + ****** + + + + +
  • +
  • + Friend List + +
  • +
  • + Block List + +
  • +
+
); diff --git a/web/settings/danger-zone.css b/web/settings/danger-zone.css --- a/web/settings/danger-zone.css +++ b/web/settings/danger-zone.css @@ -1,3 +1,12 @@ +.outer { + flex-direction: row; + display: flex; +} + +.switcher { + border-right: 1px solid var(--border-color); +} + .container { padding: 40px; width: 343px; diff --git a/web/settings/danger-zone.react.js b/web/settings/danger-zone.react.js --- a/web/settings/danger-zone.react.js +++ b/web/settings/danger-zone.react.js @@ -5,6 +5,7 @@ import { useModalContext } from 'lib/components/modal-provider.react'; import Button, { buttonThemes } from '../components/button.react'; +import SettingsSwitcher from '../sidebar/settings-switcher.react'; import AccountDeleteModal from './account-delete-modal.react'; import css from './danger-zone.css'; @@ -16,21 +17,26 @@ ); return ( -
-

Danger Zone

-
Delete Account
- -

- Your account will be permanently deleted. There is no way to reverse - this. -

+
+
+ +
+
+

Danger Zone

+
Delete Account
+ +

+ Your account will be permanently deleted. There is no way to reverse + this. +

+
); }