Yuki Takei 7 лет назад
Родитель
Сommit
2bd10e8fdf

+ 1 - 1
src/client/js/app.js

@@ -37,7 +37,7 @@ import BookmarkButton from './components/BookmarkButton';
 import LikeButton from './components/LikeButton';
 import LikeButton from './components/LikeButton';
 import PagePathAutoComplete from './components/PagePathAutoComplete';
 import PagePathAutoComplete from './components/PagePathAutoComplete';
 import RecentCreated from './components/RecentCreated/RecentCreated';
 import RecentCreated from './components/RecentCreated/RecentCreated';
-import UserPictureList from './components/Common/UserPictureList';
+import UserPictureList from './components/User/UserPictureList';
 
 
 import CustomCssEditor from './components/Admin/CustomCssEditor';
 import CustomCssEditor from './components/Admin/CustomCssEditor';
 import CustomScriptEditor from './components/Admin/CustomScriptEditor';
 import CustomScriptEditor from './components/Admin/CustomScriptEditor';

+ 2 - 2
src/client/js/components/PageComment/Comment.jsx

@@ -7,7 +7,7 @@ import RevisionBody from '../Page/RevisionBody';
 
 
 import ReactUtils from '../ReactUtils';
 import ReactUtils from '../ReactUtils';
 import UserPicture from '../User/UserPicture';
 import UserPicture from '../User/UserPicture';
-import UserPageLink from '../Common/UserPageLink';
+import Username from '../User/Username';
 
 
 /**
 /**
  *
  *
@@ -133,7 +133,7 @@ export default class Comment extends React.Component {
         </a>
         </a>
         <div className="page-comment-main">
         <div className="page-comment-main">
           <div className="page-comment-creator">
           <div className="page-comment-creator">
-            <UserPageLink user={creator} />
+            <Username user={creator} />
           </div>
           </div>
           <div className="page-comment-body">{commentBody}</div>
           <div className="page-comment-body">{commentBody}</div>
           <div className="page-comment-meta">
           <div className="page-comment-meta">

+ 3 - 3
src/client/js/components/PageHistory/Revision.jsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import React from 'react';
 import PropTypes from 'prop-types';
 import PropTypes from 'prop-types';
 
 
-import UserDate from '../Common/UserDate';
-import UserPageLink from '../Common/UserPageLink';
+import UserDate from '../User/UserDate';
+import Username from '../User/Username';
 import UserPicture from '../User/UserPicture';
 import UserPicture from '../User/UserPicture';
 
 
 export default class Revision extends React.Component {
 export default class Revision extends React.Component {
@@ -64,7 +64,7 @@ export default class Revision extends React.Component {
         </div>
         </div>
         <div className="m-l-10">
         <div className="m-l-10">
           <div className="revision-history-author">
           <div className="revision-history-author">
-            <strong><UserPageLink user={author}></UserPageLink></strong>
+            <strong><Username user={author}></Username></strong>
           </div>
           </div>
           <div className="revision-history-meta">
           <div className="revision-history-meta">
             <p>
             <p>

+ 0 - 0
src/client/js/components/User/User.js → src/client/js/components/User/User.jsx


+ 1 - 1
src/client/js/components/Common/UserPictureList.jsx → src/client/js/components/User/UserPictureList.jsx

@@ -4,7 +4,7 @@ import PropTypes from 'prop-types';
 import OverlayTrigger from 'react-bootstrap/es/OverlayTrigger';
 import OverlayTrigger from 'react-bootstrap/es/OverlayTrigger';
 import Tooltip from 'react-bootstrap/es/Tooltip';
 import Tooltip from 'react-bootstrap/es/Tooltip';
 
 
-import UserPicture from '../User/UserPicture';
+import UserPicture from './UserPicture';
 
 
 export default class UserPictureList extends React.Component {
 export default class UserPictureList extends React.Component {
 
 

+ 2 - 2
src/client/js/components/Common/UserPageLink.jsx → src/client/js/components/User/Username.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import React from 'react';
 import PropTypes from 'prop-types';
 import PropTypes from 'prop-types';
 
 
-export default class UserPageLink extends React.Component {
+export default class Username extends React.Component {
 
 
   render() {
   render() {
     const { user } = this.props;
     const { user } = this.props;
@@ -17,6 +17,6 @@ export default class UserPageLink extends React.Component {
 
 
 }
 }
 
 
-UserPageLink.propTypes = {
+Username.propTypes = {
   user: PropTypes.object.isRequired,
   user: PropTypes.object.isRequired,
 };
 };