Organize components, use webpack import aliases

This commit is contained in:
Ken-Håvard Lieng 2017-06-21 08:40:28 +02:00
parent f174d98107
commit 86c5451edb
50 changed files with 269 additions and 133 deletions

View file

@ -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 = () => {

View file

@ -1,7 +0,0 @@
import React from 'react';
const Navicon = ({ toggleMenu }) => (
<i className="icon-menu navicon" onClick={toggleMenu} />
);
export default Navicon;

View file

@ -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}>

View file

@ -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 = () => {

View file

@ -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() {

View file

@ -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;

View file

@ -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 = {

View file

@ -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() {

View file

@ -0,0 +1,3 @@
import Chat from './Chat';
export default Chat;

View file

@ -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 = {

View file

@ -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';

View file

@ -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 = {

View file

@ -0,0 +1,7 @@
import React from 'react';
const Navicon = ({ onClick }) => (
<i className="icon-menu navicon" onClick={onClick} />
);
export default Navicon;