Import ImageCropModal

- Implement ImageCropModal
- Add isDefaultLogo in GrowiNavbar

packages/app/src/components/Me/ProfileImageSettings.tsx

@@ -7,12 +7,12 @@ import AppContainer from '~/client/services/AppContainer';
 import { toastSuccess, toastError } from '~/client/util/apiNotification';
 import { apiPost } from '~/client/util/apiv1-client';
 import { apiv3Put } from '~/client/util/apiv3-client';
+import ImageCropModal from '~/components/Common/ImageCropModal';
 import { useCurrentUser } from '~/stores/context';
 import { generateGravatarSrc, GRAVATAR_DEFAULT } from '~/utils/gravatar';
 
 import { withUnstatedContainers } from '../UnstatedUtils';
 
-import ImageCropModal from './ImageCropModal';
 
 const DEFAULT_IMAGE = '/images/icons/user.svg';
 
@@ -166,10 +166,11 @@ const ProfileImageSettings = (props: Props): JSX.Element => {
       </div>
 
       <ImageCropModal
-        show={showImageCropModal}
+        isShow={showImageCropModal}
         src={imageCropSrc}
         onModalClose={() => setShowImageCropModal(false)}
         onCropCompleted={cropCompletedHandler}
+        isCircular
       />
 
       <div className="row my-3">

packages/app/src/components/Navbar/GrowiNavbar.tsx

@@ -123,12 +123,12 @@ const GrowiNavbar = (props) => {
   const { appContainer } = props;
   const { currentUser } = appContainer;
   const {
-    crowi, isSearchServiceConfigured, uploadedLogoSrc,
+    crowi, isSearchServiceConfigured, uploadedLogoSrc, isDefaultLogo,
   } = appContainer.config;
 
   const { data: isDeviceSmallerThanMd } = useIsDeviceSmallerThanMd();
   const { data: isSearchPage } = useIsSearchPage();
-  const logoSrc = uploadedLogoSrc != null ? uploadedLogoSrc : null;
+  const logoSrc = (!isDefaultLogo && uploadedLogoSrc != null) ? uploadedLogoSrc : null;
   return (
     <>
       {/* Brand Logo  */}