diff --git a/packages/client/src/components/PeopleArticle/MainButton/index.js b/packages/client/src/components/PeopleArticle/MainButton/index.js index 67f8cd8506..34a0bbb8d7 100644 --- a/packages/client/src/components/PeopleArticle/MainButton/index.js +++ b/packages/client/src/components/PeopleArticle/MainButton/index.js @@ -1,6 +1,7 @@ import InvitationLinkReactSvgUrl from "PUBLIC_DIR/images/invitation.link.react.svg?url"; import PlaneReactSvgUrl from "PUBLIC_DIR/images/plane.react.svg?url"; import ImportReactSvgUrl from "PUBLIC_DIR/images/import.react.svg?url"; +import AddEmployeeReactSvgUrl from "ASSETS/images/add.employee.react.svg?url"; import React from "react"; //import PropTypes from "prop-types"; import { withRouter } from "react-router"; @@ -99,7 +100,7 @@ class ArticleMainButtonContent extends React.Component { icon: combineUrl( window.DocSpaceConfig?.proxy?.url, homepage, - "/images/add.employee.react.svg" + AddEmployeeReactSvgUrl ), label: userCaption, onClick: this.goToEmployeeCreate, diff --git a/packages/client/src/components/panels/InvitePanel/sub-components/Item.js b/packages/client/src/components/panels/InvitePanel/sub-components/Item.js index aef346979b..cfd68f69bf 100644 --- a/packages/client/src/components/panels/InvitePanel/sub-components/Item.js +++ b/packages/client/src/components/panels/InvitePanel/sub-components/Item.js @@ -1,4 +1,5 @@ import InfoEditReactSvgUrl from "PUBLIC_DIR/images/info.edit.react.svg?url"; +import AtReactSvgUrl from "PUBLIC_DIR/images/@.react.svg"; import React, { useState, useEffect } from "react"; import Text from "@docspace/components/text"; @@ -30,7 +31,7 @@ const Item = ({ const { avatar, displayName, email, id, errors, access } = item; const name = !!avatar ? (displayName !== "" ? displayName : email) : email; - const source = !!avatar ? avatar : "/static/images/@.react.svg"; + const source = !!avatar ? avatar : AtReactSvgUrl; const [edit, setEdit] = useState(false); const [inputValue, setInputValue] = useState(name); diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/History/HistoryBlock.js b/packages/client/src/pages/Home/InfoPanel/Body/views/History/HistoryBlock.js index 809189e3c7..cb5ec76dfd 100644 --- a/packages/client/src/pages/Home/InfoPanel/Body/views/History/HistoryBlock.js +++ b/packages/client/src/pages/Home/InfoPanel/Body/views/History/HistoryBlock.js @@ -1,5 +1,5 @@ import React from "react"; - +import AtReactSvgUrl from "PUBLIC_DIR/images/@.react.svg"; import Avatar from "@docspace/components/avatar"; import Text from "@docspace/components/text"; import HistoryBlockMessage from "./HistoryBlockMessage"; @@ -39,9 +39,7 @@ const HistoryBlock = ({ size="min" source={ initiator.avatarSmall || - (initiator.displayName - ? "" - : initiator.email && "/static/images/@.react.svg") + (initiator.displayName ? "" : initiator.email && AtReactSvgUrl) } userName={initiator.displayName} /> diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js index 8741854c6c..943d2e04c6 100644 --- a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js +++ b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js @@ -1,5 +1,5 @@ import React, { useState } from "react"; - +import AtReactSvgUrl from "PUBLIC_DIR/images/@.react.svg"; import { StyledUser } from "../../styles/members"; import Avatar from "@docspace/components/avatar"; import { ComboBox } from "@docspace/components"; @@ -71,7 +71,7 @@ const User = ({ role="user" className="avatar" size="min" - source={isExpect ? "/static/images/@.react.svg" : user.avatar || ""} + source={isExpect ? AtReactSvgUrl : user.avatar || ""} userName={isExpect ? "" : user.displayName} /> diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js index 853ef2f309..6f5266fa7d 100644 --- a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js +++ b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/index.js @@ -5,6 +5,9 @@ import toastr from "@docspace/components/toast/toastr"; import { FolderType } from "@docspace/common/constants"; import Loaders from "@docspace/common/components/Loaders"; +import PersonPlusReactSvgUrl from "PUBLIC_DIR/images/person+.react.svg"; +import EmailPlusReactSvgUrl from "PUBLIC_DIR/images/e-mail+.react.svg"; + import { StyledUserList, StyledUserTypeHeader } from "../../styles/members"; import { ShareAccessRights } from "@docspace/common/constants"; @@ -150,7 +153,7 @@ const Members = ({ id="info_add-user" className={"icon"} title={t("Common:AddUsers")} - iconName="/static/images/person+.react.svg" + iconName={PersonPlusReactSvgUrl} isFill={true} onClick={onClickInviteUsers} size={16} @@ -183,7 +186,7 @@ const Members = ({ { const { avatarSmall, hasAvatar } = item.createdBy; - const avatarSource = hasAvatar - ? avatarSmall - : "/images/default_user_photo_size_32-32.png"; + const avatarSource = hasAvatar ? avatarSmall : DefaultUserPhotoSize32PngUrl; return ( diff --git a/packages/client/src/store/UsersStore.js b/packages/client/src/store/UsersStore.js index 7e836e05fb..1ced5b0793 100644 --- a/packages/client/src/store/UsersStore.js +++ b/packages/client/src/store/UsersStore.js @@ -1,4 +1,5 @@ import { makeAutoObservable, runInAction } from "mobx"; +import DefaultUserPhotoSize32PngUrl from "ASSETS_DIR/images/default_user_photo_size_32-32.png?url"; import api from "@docspace/common/api"; import { EmployeeStatus, @@ -388,9 +389,7 @@ class UsersStore { status ); - const currentAvatar = hasAvatar - ? avatar - : "/images/default_user_photo_size_32-32.png"; + const currentAvatar = hasAvatar ? avatar : DefaultUserPhotoSize32PngUrl; return { id,