Merge pull request #2628 from weseek/imprv/adjust-icon-components-path-and-names

Imprv/adjust icon components path and names

src/client/js/components/Navbar/GrowiNavbar.jsx

@@ -7,7 +7,7 @@ import { withUnstatedContainers } from '../UnstatedUtils';
 import NavigationContainer from '../../services/NavigationContainer';
 import AppContainer from '../../services/AppContainer';
 
-import GrowiLogo from '../GrowiLogo';
+import GrowiLogo from '../Icons/GrowiLogo';
 
 import PersonalDropdown from './PersonalDropdown';
 import GlobalSearch from './GlobalSearch';

src/client/js/components/PageAccessoriesModal.jsx

@@ -7,10 +7,10 @@ import {
 
 import { withTranslation } from 'react-i18next';
 
-import PageList from './PageList';
-import TimeLine from './TimeLine';
-import RecentChanges from './RecentChanges';
-import Attachment from './Attachment';
+import PageListIcon from './Icons/PageListIcon';
+import TimeLineIcon from './Icons/TimeLineIcon';
+import RecentChangesIcon from './Icons/RecentChangesIcon';
+import AttachmentIcon from './Icons/AttachmentIcon';
 
 import { withUnstatedContainers } from './UnstatedUtils';
 import PageContainer from '../services/PageContainer';
@@ -46,7 +46,7 @@ const PageAccessoriesModal = (props) => {
               <NavLink
                 onClick={() => { switchTabHandler('pageList') }}
               >
-                <PageList />
+                <PageListIcon />
                 { t('page_list') }
               </NavLink>
             </NavItem>
@@ -54,7 +54,7 @@ const PageAccessoriesModal = (props) => {
               <NavLink
                 onClick={() => { switchTabHandler('timeLine') }}
               >
-                <TimeLine />
+                <TimeLineIcon />
                 { t('Timeline View') }
               </NavLink>
             </NavItem>
@@ -62,7 +62,7 @@ const PageAccessoriesModal = (props) => {
               <NavLink
                 onClick={() => { switchTabHandler('recentChanges') }}
               >
-                <RecentChanges />
+                <RecentChangesIcon />
                 { t('History') }
               </NavLink>
             </NavItem>
@@ -70,7 +70,7 @@ const PageAccessoriesModal = (props) => {
               <NavLink
                 onClick={() => { switchTabHandler('attachment') }}
               >
-                <Attachment />
+                <AttachmentIcon />
                 { t('attachment_data') }
               </NavLink>
             </NavItem>

src/client/js/components/TopOfTableContents.jsx

@@ -5,10 +5,10 @@ import { withTranslation } from 'react-i18next';
 
 import PageContainer from '../services/PageContainer';
 
-import PageList from './PageList';
-import TimeLine from './TimeLine';
-import RecentChanges from './RecentChanges';
-import Attachment from './Attachment';
+import PageListIcon from './Icons/PageListIcon';
+import TimeLineIcon from './Icons/TimeLineIcon';
+import RecentChangesIcon from './Icons/RecentChangesIcon';
+import AttachmentIcon from './Icons/AttachmentIcon';
 
 import PageAccessoriesModal from './PageAccessoriesModal';
 
@@ -53,19 +53,19 @@ const TopOfTableContents = (props) => {
     <>
       <div className="top-of-table-contents d-flex align-items-end pb-1">
         <button type="button" className="bg-transparent border-0" onClick={() => openPageAccessoriesModal('pageList')}>
-          <PageList />
+          <PageListIcon />
         </button>
 
         <button type="button" className="bg-transparent border-0 active" onClick={() => openPageAccessoriesModal('timeLine')}>
-          <TimeLine />
+          <TimeLineIcon />
         </button>
 
         <button type="button" className="bg-transparent border-0" onClick={() => openPageAccessoriesModal('recentChanges')}>
-          <RecentChanges />
+          <RecentChangesIcon />
         </button>
 
         <button type="button" className="bg-transparent border-0" onClick={() => openPageAccessoriesModal('attachment')}>
-          <Attachment />
+          <AttachmentIcon />
         </button>
         {/* [TODO: setting Footprints' icon by GW-3308] */}
         <div