Remove Common/Icon

resource/js/components/Common/Icon.js

@@ -1,29 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-export default class Icon extends React.Component {
-
-  render() {
-    const name = this.props.name || null;
-    const isSpin = this.props.spin ? ' fa-spinner' : '';
-
-    if (!name) {
-      return '';
-    }
-
-    return (
-      <i className={`fa fa-${name} ${isSpin}`} />
-    );
-  }
-}
-
-// TODO: support size and so far
-Icon.propTypes = {
-  name: PropTypes.string.isRequired,
-  spin: PropTypes.bool,
-};
-
-Icon.defaltProps = {
-  spin: false,
-};
-

resource/js/components/PageAttachment.js

@@ -1,6 +1,5 @@
 import React from 'react';
 
-import Icon from './Common/Icon';
 import PageAttachmentList from './PageAttachment/PageAttachmentList';
 import DeleteAttachmentModal from './PageAttachment/DeleteAttachmentModal';
 

resource/js/components/PageAttachment/Attachment.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import Icon from '../Common/Icon';
 import User from '../User/User';
 
 export default class Attachment extends React.Component {
@@ -13,10 +12,10 @@ export default class Attachment extends React.Component {
 
   iconNameByFormat(format) {
     if (format.match(/image\/.+/i)) {
-      return 'file-image-o';
+      return 'fa fa-file-image-o';
     }
 
-    return 'file-o';
+    return 'fa fa-file-o';
   }
 
   _onAttachmentDeleteClicked(event) {
@@ -42,7 +41,7 @@ export default class Attachment extends React.Component {
     return (
       <li>
           <User user={attachment.creator} />
-          <Icon name={formatIcon} />
+          <i className={formatIcon}></i>
 
           <a href={attachment.url}> {attachment.originalName}</a>
 

resource/js/components/PageAttachment/DeleteAttachmentModal.js

@@ -2,7 +2,6 @@ import React from 'react';
 import Button from 'react-bootstrap/es/Button';
 import Modal from 'react-bootstrap/es/Modal';
 
-import Icon from '../Common/Icon';
 import User from '../User/User';
 
 export default class DeleteAttachmentModal extends React.Component {
@@ -30,7 +29,7 @@ export default class DeleteAttachmentModal extends React.Component {
 
     return (
         <p className="attachment-delete-file">
-          <Icon name="file-o" />
+          <i className="fa fa-file-o"></i>
         </p>
     );
   }

resource/js/components/PageHistory.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-import Icon from './Common/Icon';
 import PageRevisionList from './PageHistory/PageRevisionList';
 
 export default class PageHistory extends React.Component {
@@ -118,7 +117,6 @@ export default class PageHistory extends React.Component {
   render() {
     return (
       <div>
-        <h1><Icon name="history" /> History</h1>
         <PageRevisionList
           revisions={this.state.revisions}
           diffOpened={this.state.diffOpened}

resource/js/components/PageHistory/Revision.js

@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import UserDate     from '../Common/UserDate';
-import Icon         from '../Common/Icon';
 import UserPicture  from '../User/UserPicture';
 
 export default class Revision extends React.Component {