From f97596689fc8fea987911e4194110d5f9928adb8 Mon Sep 17 00:00:00 2001 From: jamesjulich <51384945+jamesjulich@users.noreply.github.com> Date: Sun, 12 Sep 2021 22:25:58 -0500 Subject: [PATCH] Move files and rename classes. --- .../image-upload/ImageUpload.jsx | 14 +++++++------- .../image-upload/ImageUpload.scss | 10 +++++----- .../profile-editor/ProfileEditor.jsx | 6 +++--- .../profile-editor/ProfileEditor.scss | 6 +++--- src/app/organisms/settings/Settings.jsx | 7 ++++--- 5 files changed, 22 insertions(+), 21 deletions(-) rename src/app/{atoms => molecules}/image-upload/ImageUpload.jsx (76%) rename src/app/{atoms => molecules}/image-upload/ImageUpload.scss (58%) rename src/app/{molecules => organisms}/profile-editor/ProfileEditor.jsx (87%) rename src/app/{molecules => organisms}/profile-editor/ProfileEditor.scss (75%) diff --git a/src/app/atoms/image-upload/ImageUpload.jsx b/src/app/molecules/image-upload/ImageUpload.jsx similarity index 76% rename from src/app/atoms/image-upload/ImageUpload.jsx rename to src/app/molecules/image-upload/ImageUpload.jsx index e8a26714..992d5bca 100644 --- a/src/app/atoms/image-upload/ImageUpload.jsx +++ b/src/app/molecules/image-upload/ImageUpload.jsx @@ -3,10 +3,10 @@ import PropTypes from 'prop-types'; import initMatrix from '../../../client/initMatrix'; -import GenIC from '../../../../public/res/ic/outlined/settings.svg'; -import Avatar from '../avatar/Avatar'; +import SettingsIC from '../../../../public/res/ic/outlined/settings.svg'; +import Avatar from '../../atoms/avatar/Avatar'; -import RawIcon from '../system-icons/RawIcon'; +import RawIcon from '../../atoms/system-icons/RawIcon'; import './ImageUpload.scss'; function ImageUpload({ @@ -29,8 +29,8 @@ function ImageUpload({ } return ( - diff --git a/src/app/atoms/image-upload/ImageUpload.scss b/src/app/molecules/image-upload/ImageUpload.scss similarity index 58% rename from src/app/atoms/image-upload/ImageUpload.scss rename to src/app/molecules/image-upload/ImageUpload.scss index c7118ba8..dbf2bace 100644 --- a/src/app/atoms/image-upload/ImageUpload.scss +++ b/src/app/molecules/image-upload/ImageUpload.scss @@ -1,20 +1,20 @@ -.img-upload-container { +.img-upload { display: flex; flex-direction: row-reverse; width: 80px; height: 80px; } -.img-upload-container:hover { +.img-upload:hover { cursor: pointer; } -.img-upload-mask { +.img-upload__mask { mask: url('../../../../public/res/svg/avatar-clip.svg'); - //width: 80px; + -webkit-mask: url('../../../../public/res/svg/avatar-clip.svg'); } -.img-upload-icon { +.img-upload__icon { z-index: 1; position: absolute; } \ No newline at end of file diff --git a/src/app/molecules/profile-editor/ProfileEditor.jsx b/src/app/organisms/profile-editor/ProfileEditor.jsx similarity index 87% rename from src/app/molecules/profile-editor/ProfileEditor.jsx rename to src/app/organisms/profile-editor/ProfileEditor.jsx index 797c4003..61cd896d 100644 --- a/src/app/molecules/profile-editor/ProfileEditor.jsx +++ b/src/app/organisms/profile-editor/ProfileEditor.jsx @@ -5,7 +5,7 @@ import initMatrix from '../../../client/initMatrix'; import colorMXID from '../../../util/colorMXID'; import Button from '../../atoms/button/Button'; -import ImageUpload from '../../atoms/image-upload/ImageUpload'; +import ImageUpload from '../../molecules/image-upload/ImageUpload'; import Input from '../../atoms/input/Input'; import Text from '../../atoms/text/Text'; @@ -45,12 +45,12 @@ function ProfileEditor({ return (
-
+
Display name of  {mx.getUserId()} - +
diff --git a/src/app/molecules/profile-editor/ProfileEditor.scss b/src/app/organisms/profile-editor/ProfileEditor.scss similarity index 75% rename from src/app/molecules/profile-editor/ProfileEditor.scss rename to src/app/organisms/profile-editor/ProfileEditor.scss index 98a453aa..015b920f 100644 --- a/src/app/molecules/profile-editor/ProfileEditor.scss +++ b/src/app/organisms/profile-editor/ProfileEditor.scss @@ -3,11 +3,11 @@ align-items: end; } -.img-upload-container { +.img-upload { margin-right: var(--sp-normal) } -.display-name-input-container { +.profile-editor__input-container { display: flex; flex-direction: column; margin-right: var(--sp-normal); @@ -15,7 +15,7 @@ max-width: 400px; } -.display-name-input-container > .text-b3 { +.profile-editor__input-container > .text-b3 { margin-bottom: var(--sp-ultra-tight) } diff --git a/src/app/organisms/settings/Settings.jsx b/src/app/organisms/settings/Settings.jsx index 91be164f..f97c942c 100644 --- a/src/app/organisms/settings/Settings.jsx +++ b/src/app/organisms/settings/Settings.jsx @@ -14,10 +14,11 @@ import SegmentedControls from '../../atoms/segmented-controls/SegmentedControls' import PopupWindow, { PWContentSelector } from '../../molecules/popup-window/PopupWindow'; import SettingTile from '../../molecules/setting-tile/SettingTile'; -import ProfileEditor from '../../molecules/profile-editor/ProfileEditor'; import ImportE2ERoomKeys from '../../molecules/import-e2e-room-keys/ImportE2ERoomKeys'; -import GenIC from '../../../../public/res/ic/outlined/settings.svg'; +import ProfileEditor from '../profile-editor/ProfileEditor'; + +import SettingsIC from '../../../../public/res/ic/outlined/settings.svg'; import SunIC from '../../../../public/res/ic/outlined/sun.svg'; import LockIC from '../../../../public/res/ic/outlined/lock.svg'; import InfoIC from '../../../../public/res/ic/outlined/info.svg'; @@ -120,7 +121,7 @@ function AboutSection() { function Settings({ isOpen, onRequestClose }) { const settingSections = [{ name: 'General', - iconSrc: GenIC, + iconSrc: SettingsIC, render() { return ; },