Add file attachments

client/src/components/UserSettingsModal/AccountPane/AccountPane.jsx

@@ -17,15 +17,15 @@ const AccountPane = React.memo(
     email,
     name,
     username,
-    avatar,
+    avatarUrl,
     phone,
     organization,
-    isAvatarUploading,
+    isAvatarUpdating,
     usernameUpdateForm,
     emailUpdateForm,
     passwordUpdateForm,
     onUpdate,
-    onAvatarUpload,
+    onAvatarUpdate,
     onUsernameUpdate,
     onUsernameUpdateMessageDismiss,
     onEmailUpdate,
@@ -37,18 +37,18 @@ const AccountPane = React.memo(
 
     const handleAvatarDelete = useCallback(() => {
       onUpdate({
-        avatar: null,
+        avatarUrl: null,
       });
     }, [onUpdate]);
 
     return (
       <Tab.Pane attached={false} className={styles.wrapper}>
         <EditAvatarPopup
-          defaultValue={avatar}
-          onUpload={onAvatarUpload}
+          defaultValue={avatarUrl}
+          onUpdate={onAvatarUpdate}
           onDelete={handleAvatarDelete}
         >
-          <User name={name} avatar={avatar} size="massive" isDisabled={isAvatarUploading} />
+          <User name={name} avatarUrl={avatarUrl} size="massive" isDisabled={isAvatarUpdating} />
         </EditAvatarPopup>
         <br />
         <br />
@@ -123,17 +123,17 @@ AccountPane.propTypes = {
   email: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,
   username: PropTypes.string,
-  avatar: PropTypes.string,
+  avatarUrl: PropTypes.string,
   phone: PropTypes.string,
   organization: PropTypes.string,
-  isAvatarUploading: PropTypes.bool.isRequired,
+  isAvatarUpdating: PropTypes.bool.isRequired,
   /* eslint-disable react/forbid-prop-types */
   usernameUpdateForm: PropTypes.object.isRequired,
   emailUpdateForm: PropTypes.object.isRequired,
   passwordUpdateForm: PropTypes.object.isRequired,
   /* eslint-enable react/forbid-prop-types */
   onUpdate: PropTypes.func.isRequired,
-  onAvatarUpload: PropTypes.func.isRequired,
+  onAvatarUpdate: PropTypes.func.isRequired,
   onUsernameUpdate: PropTypes.func.isRequired,
   onUsernameUpdateMessageDismiss: PropTypes.func.isRequired,
   onEmailUpdate: PropTypes.func.isRequired,
@@ -144,7 +144,7 @@ AccountPane.propTypes = {
 
 AccountPane.defaultProps = {
   username: undefined,
-  avatar: undefined,
+  avatarUrl: undefined,
   phone: undefined,
   organization: undefined,
 };

client/src/components/UserSettingsModal/AccountPane/EditAvatarPopup.jsx

@@ -3,23 +3,24 @@ import PropTypes from 'prop-types';
 import { useTranslation } from 'react-i18next';
 import { Button } from 'semantic-ui-react';
 import { withPopup } from '../../../lib/popup';
-import { Popup } from '../../../lib/custom-ui';
+import { FilePicker, Popup } from '../../../lib/custom-ui';
 
 import styles from './EditAvatarPopup.module.css';
 
-const EditAvatarStep = React.memo(({ defaultValue, onUpload, onDelete, onClose }) => {
+const EditAvatarStep = React.memo(({ defaultValue, onUpdate, onDelete, onClose }) => {
   const [t] = useTranslation();
 
   const field = useRef(null);
 
-  const handleFieldChange = useCallback(
-    ({ target }) => {
-      if (target.files[0]) {
-        onUpload(target.files[0]);
-        onClose();
-      }
+  const handleFileSelect = useCallback(
+    (file) => {
+      onUpdate({
+        file,
+      });
+
+      onClose();
     },
-    [onUpload, onClose],
+    [onUpdate, onClose],
   );
 
   const handleDeleteClick = useCallback(() => {
@@ -39,15 +40,14 @@ const EditAvatarStep = React.memo(({ defaultValue, onUpload, onDelete, onClose }
         })}
       </Popup.Header>
       <Popup.Content>
-        <div className={styles.input}>
-          <Button content={t('action.uploadNewAvatar')} className={styles.customButton} />
-          <input
-            ref={field}
-            type="file"
-            accept="image/*"
-            className={styles.file}
-            onChange={handleFieldChange}
-          />
+        <div className={styles.action}>
+          <FilePicker accept="image/*" onSelect={handleFileSelect}>
+            <Button
+              ref={field}
+              content={t('action.uploadNewAvatar')}
+              className={styles.actionButton}
+            />
+          </FilePicker>
         </div>
         {defaultValue && (
           <Button negative content={t('action.deleteAvatar')} onClick={handleDeleteClick} />
@@ -59,7 +59,7 @@ const EditAvatarStep = React.memo(({ defaultValue, onUpload, onDelete, onClose }
 
 EditAvatarStep.propTypes = {
   defaultValue: PropTypes.string,
-  onUpload: PropTypes.func.isRequired,
+  onUpdate: PropTypes.func.isRequired,
   onDelete: PropTypes.func.isRequired,
   onClose: PropTypes.func.isRequired,
 };

client/src/components/UserSettingsModal/AccountPane/EditAvatarPopup.module.css

@@ -1,25 +1,4 @@
-.customButton {
-  background: transparent !important;
-  color: #6b808c !important;
-  font-weight: normal !important;
-  height: 36px;
-  line-height: 24px !important;
-  padding: 6px 12px !important;
-  text-align: left !important;
-  text-decoration: underline !important;
-}
-
-.file {
-  bottom: 0;
-  left: 0;
-  opacity: 0;
-  position: absolute;
-  right: 0;
-  top: 0;
-  z-index: 1;
-}
-
-.input {
+.action {
   border: none;
   display: inline-block;
   height: 36px;
@@ -29,6 +8,18 @@
   width: 100%;
 }
 
-.input:hover {
+.action:hover {
   background: #e9e9e9 !important;
 }
+
+.actionButton {
+  background: transparent !important;
+  color: #6b808c !important;
+  font-weight: normal !important;
+  height: 36px;
+  line-height: 24px !important;
+  padding: 6px 12px !important;
+  text-align: left !important;
+  text-decoration: underline !important;
+  width: 100%;
+}

client/src/components/UserSettingsModal/UserSettingsModal.jsx

@@ -11,16 +11,16 @@ const UserSettingsModal = React.memo(
     email,
     name,
     username,
-    avatar,
+    avatarUrl,
     phone,
     organization,
     subscribeToOwnCards,
-    isAvatarUploading,
+    isAvatarUpdating,
     usernameUpdateForm,
     emailUpdateForm,
     passwordUpdateForm,
     onUpdate,
-    onAvatarUpload,
+    onAvatarUpdate,
     onUsernameUpdate,
     onUsernameUpdateMessageDismiss,
     onEmailUpdate,
@@ -41,15 +41,15 @@ const UserSettingsModal = React.memo(
             email={email}
             name={name}
             username={username}
-            avatar={avatar}
+            avatarUrl={avatarUrl}
             phone={phone}
             organization={organization}
-            isAvatarUploading={isAvatarUploading}
+            isAvatarUpdating={isAvatarUpdating}
             usernameUpdateForm={usernameUpdateForm}
             emailUpdateForm={emailUpdateForm}
             passwordUpdateForm={passwordUpdateForm}
             onUpdate={onUpdate}
-            onAvatarUpload={onAvatarUpload}
+            onAvatarUpdate={onAvatarUpdate}
             onUsernameUpdate={onUsernameUpdate}
             onUsernameUpdateMessageDismiss={onUsernameUpdateMessageDismiss}
             onEmailUpdate={onEmailUpdate}
@@ -89,18 +89,18 @@ UserSettingsModal.propTypes = {
   email: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,
   username: PropTypes.string,
-  avatar: PropTypes.string,
+  avatarUrl: PropTypes.string,
   phone: PropTypes.string,
   organization: PropTypes.string,
   subscribeToOwnCards: PropTypes.bool.isRequired,
-  isAvatarUploading: PropTypes.bool.isRequired,
+  isAvatarUpdating: PropTypes.bool.isRequired,
   /* eslint-disable react/forbid-prop-types */
   usernameUpdateForm: PropTypes.object.isRequired,
   emailUpdateForm: PropTypes.object.isRequired,
   passwordUpdateForm: PropTypes.object.isRequired,
   /* eslint-enable react/forbid-prop-types */
   onUpdate: PropTypes.func.isRequired,
-  onAvatarUpload: PropTypes.func.isRequired,
+  onAvatarUpdate: PropTypes.func.isRequired,
   onUsernameUpdate: PropTypes.func.isRequired,
   onUsernameUpdateMessageDismiss: PropTypes.func.isRequired,
   onEmailUpdate: PropTypes.func.isRequired,
@@ -112,7 +112,7 @@ UserSettingsModal.propTypes = {
 
 UserSettingsModal.defaultProps = {
   username: undefined,
-  avatar: undefined,
+  avatarUrl: undefined,
   phone: undefined,
   organization: undefined,
 };