Organize components, use webpack import aliases
This commit is contained in:
parent
f174d98107
commit
86c5451edb
50 changed files with 269 additions and 133 deletions
|
@ -1,9 +1,9 @@
|
|||
import React, { Component } from 'react';
|
||||
import Route from '../containers/Route';
|
||||
import Chat from '../containers/Chat';
|
||||
import Connect from '../containers/Connect';
|
||||
import Settings from '../containers/Settings';
|
||||
import TabList from '../components/TabList';
|
||||
import Route from 'containers/Route';
|
||||
import Chat from 'containers/Chat';
|
||||
import Connect from 'containers/Connect';
|
||||
import Settings from 'containers/Settings';
|
||||
import TabList from 'components/TabList';
|
||||
|
||||
export default class App extends Component {
|
||||
handleClick = () => {
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
import React from 'react';
|
||||
|
||||
const Navicon = ({ toggleMenu }) => (
|
||||
<i className="icon-menu navicon" onClick={toggleMenu} />
|
||||
);
|
||||
|
||||
export default Navicon;
|
|
@ -1,6 +1,6 @@
|
|||
import React from 'react';
|
||||
import { Provider } from 'react-redux';
|
||||
import App from '../containers/App';
|
||||
import App from 'containers/App';
|
||||
|
||||
const Root = ({ store }) => (
|
||||
<Provider store={store}>
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
import React, { Component } from 'react';
|
||||
import ChatTitle from '../ChatTitle';
|
||||
import Search from '../Search';
|
||||
import MessageBox from '../MessageBox';
|
||||
import MessageInput from '../MessageInput';
|
||||
import UserList from '../UserList';
|
||||
import ChatTitle from './ChatTitle';
|
||||
import Search from './Search';
|
||||
import MessageBox from './MessageBox';
|
||||
import MessageInput from './MessageInput';
|
||||
import UserList from './UserList';
|
||||
|
||||
export default class Chat extends Component {
|
||||
handleCloseClick = () => {
|
|
@ -1,9 +1,9 @@
|
|||
import React, { PureComponent } from 'react';
|
||||
import { List } from 'immutable';
|
||||
import Navicon from '../containers/Navicon';
|
||||
import Editable from './ui/Editable';
|
||||
import { isValidServerName } from '../state/servers';
|
||||
import { linkify } from '../util';
|
||||
import Navicon from 'containers/Navicon';
|
||||
import Editable from 'components/ui/Editable';
|
||||
import { isValidServerName } from 'state/servers';
|
||||
import { linkify } from 'util';
|
||||
|
||||
export default class ChatTitle extends PureComponent {
|
||||
render() {
|
|
@ -2,8 +2,8 @@ import React, { PureComponent } from 'react';
|
|||
import { List } from 'react-virtualized/dist/commonjs/List';
|
||||
import { AutoSizer } from 'react-virtualized/dist/commonjs/AutoSizer';
|
||||
import debounce from 'lodash/debounce';
|
||||
import { getScrollPos, saveScrollPos } from 'util/scrollPosition';
|
||||
import Message from './Message';
|
||||
import { getScrollPos, saveScrollPos } from '../util/scrollPosition';
|
||||
|
||||
const fetchThreshold = 500;
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
import React, { PureComponent } from 'react';
|
||||
import Editable from './ui/Editable';
|
||||
import Editable from 'components/ui/Editable';
|
||||
|
||||
export default class MessageInput extends PureComponent {
|
||||
state = {
|
|
@ -1,5 +1,5 @@
|
|||
import React, { PureComponent } from 'react';
|
||||
import { timestamp, linkify } from '../util';
|
||||
import { timestamp, linkify } from 'util';
|
||||
|
||||
export default class SearchResult extends PureComponent {
|
||||
render() {
|
3
client/src/js/components/pages/Chat/index.js
Normal file
3
client/src/js/components/pages/Chat/index.js
Normal file
|
@ -0,0 +1,3 @@
|
|||
import Chat from './Chat';
|
||||
|
||||
export default Chat;
|
|
@ -1,5 +1,5 @@
|
|||
import React, { Component } from 'react';
|
||||
import Navicon from '../../containers/Navicon';
|
||||
import Navicon from 'containers/Navicon';
|
||||
|
||||
export default class Connect extends Component {
|
||||
state = {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
import React from 'react';
|
||||
import Navicon from '../../containers/Navicon';
|
||||
import FileInput from '../FileInput';
|
||||
import Navicon from 'containers/Navicon';
|
||||
import FileInput from 'components/ui/FileInput';
|
||||
|
||||
const Settings = ({ settings, onCertChange, onKeyChange, uploadCert }) => {
|
||||
const status = settings.get('uploadingCert') ? 'Uploading...' : 'Upload';
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import React, { PureComponent } from 'react';
|
||||
import { stringWidth } from '../../util';
|
||||
import { stringWidth } from 'util';
|
||||
|
||||
export default class Editable extends PureComponent {
|
||||
static defaultProps = {
|
||||
|
|
7
client/src/js/components/ui/Navicon.js
Normal file
7
client/src/js/components/ui/Navicon.js
Normal file
|
@ -0,0 +1,7 @@
|
|||
import React from 'react';
|
||||
|
||||
const Navicon = ({ onClick }) => (
|
||||
<i className="icon-menu navicon" onClick={onClick} />
|
||||
);
|
||||
|
||||
export default Navicon;
|
Loading…
Add table
Add a link
Reference in a new issue