Skip to content
This repository was archived by the owner on Dec 4, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# Changelog

## Unreleased
- Use react entities as self imported
([#56](https://github.com/fs/react-base/pull/56))

## 1.0.0 - 2016-09-15
- Upgrade dependencies
Expand Down
4 changes: 2 additions & 2 deletions app/components/about/index.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';
import React, { Component } from 'react';
import { Link } from 'react-router';
import { Grid } from 'react-bootstrap';
import { paths } from 'helpers/routes';

export default class About extends React.Component {
export default class About extends Component {
id = 'test_id'

render() {
Expand Down
4 changes: 2 additions & 2 deletions app/components/application/index.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React from 'react';
import React, { Component } from 'react';
import Header from 'components/header';
import Modals from 'components/modals';
import Footer from 'components/footer';
import styles from './styles';

export default class Application extends React.Component {
export default class Application extends Component {
render() {
return (
<div className={ styles.layout }>
Expand Down
8 changes: 4 additions & 4 deletions app/components/article/index.jsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';
import React, { Component, PropTypes } from 'react';

export default class Article extends React.Component {
export default class Article extends Component {
static propTypes = {
params: React.PropTypes.shape({
id: React.PropTypes.string
params: PropTypes.shape({
id: PropTypes.string
})
}

Expand Down
4 changes: 2 additions & 2 deletions app/components/footer/index.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import React, { Component } from 'react';
import styles from './styles';

export default class Footer extends React.Component {
export default class Footer extends Component {
render() {
return (
<footer className={ styles.footer }>
Expand Down
4 changes: 2 additions & 2 deletions app/components/header/index.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React from 'react';
import React, { Component } from 'react';
import { Navbar } from 'react-bootstrap';
import NavigationLeft from 'components/navigation/left';
import NavigationRight from 'components/navigation/right';
import { paths } from 'helpers/routes';

export default class Header extends React.Component {
export default class Header extends Component {
render() {
const links = [
{ title: 'Home', route: paths.home() },
Expand Down
4 changes: 2 additions & 2 deletions app/components/home/index.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import React, { Component } from 'react';
import { Grid, Jumbotron } from 'react-bootstrap';

export default class Home extends React.Component {
export default class Home extends Component {
render() {
return (
<Grid>
Expand Down
4 changes: 2 additions & 2 deletions app/components/main/index.jsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React from 'react';
import React, { Component } from 'react';
import connectToStores from 'alt-utils/lib/connectToStores';
import TodoLayout from 'components/todo/layout';
import Home from 'components/home';
import session from 'services/session';

@connectToStores
export default class Main extends React.Component {
export default class Main extends Component {
static getStores(props) {
return [session.store()];
}
Expand Down
6 changes: 3 additions & 3 deletions app/components/modals/index.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, { Component, PropTypes } from 'react';
import connectToStores from 'alt-utils/lib/connectToStores';
import ApplicationStore from 'stores/application';
import TodoModal from 'components/todoModal';
Expand All @@ -12,9 +12,9 @@ const MODALS = {
};

@connectToStores
export default class Modals extends React.Component {
export default class Modals extends Component {
static propTypes = {
modalName: React.PropTypes.string.isRequired
modalName: PropTypes.string.isRequired
}

static getStores(props) {
Expand Down
10 changes: 5 additions & 5 deletions app/components/navigation/index.jsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React from 'react';
import React, { Component, PropTypes } from 'react';
import { Link } from 'react-router';

export default class Navigation extends React.Component {
export default class Navigation extends Component {
static propTypes = {
item: React.PropTypes.shape({
route: React.PropTypes.string,
title: React.PropTypes.string
item: PropTypes.shape({
route: PropTypes.string,
title: PropTypes.string
})
}

Expand Down
12 changes: 6 additions & 6 deletions app/components/navigation/left.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React from 'react';
import React, { Component, PropTypes } from 'react';
import { Nav } from 'react-bootstrap';
import NavigationItem from 'components/navigation';

export default class NavigationLeft extends React.Component {
export default class NavigationLeft extends Component {
static propTypes = {
items: React.PropTypes.arrayOf(
React.PropTypes.shape({
route: React.PropTypes.string,
title: React.PropTypes.string
items: PropTypes.arrayOf(
PropTypes.shape({
route: PropTypes.string,
title: PropTypes.string
})
)
}
Expand Down
4 changes: 2 additions & 2 deletions app/components/navigation/right.jsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React from 'react';
import React, { Component } from 'react';
import connectToStores from 'alt-utils/lib/connectToStores';
import { Nav, NavItem } from 'react-bootstrap';
import ApplicationActions from 'actions/application';
import session from 'services/session';

@connectToStores
export default class NavigationRight extends React.Component {
export default class NavigationRight extends Component {
static getStores(props) {
return [session.store()];
}
Expand Down
12 changes: 6 additions & 6 deletions app/components/signinModal/index.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, { Component, PropTypes } from 'react';
import connectToStores from 'alt-utils/lib/connectToStores';
import {
Modal,
Expand All @@ -14,12 +14,12 @@ import ApplicationStore from 'stores/application';
import SigninStore from 'stores/signin';

@connectToStores
export default class SigninModal extends React.Component {
export default class SigninModal extends Component {
static propTypes = {
isModalOpen: React.PropTypes.bool,
user: React.PropTypes.shape({
email: React.PropTypes.string,
password: React.PropTypes.string
isModalOpen: PropTypes.bool,
user: PropTypes.shape({
email: PropTypes.string,
password: PropTypes.string
})
}

Expand Down
16 changes: 8 additions & 8 deletions app/components/signupModal/index.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, { Component, PropTypes } from 'react';
import connectToStores from 'alt-utils/lib/connectToStores';
import {
Modal,
Expand All @@ -13,14 +13,14 @@ import SignupStore from 'stores/signup';
import ApplicationStore from 'stores/application';

@connectToStores
export default class SignupModal extends React.Component {
export default class SignupModal extends Component {
static propTypes = {
isModalOpen: React.PropTypes.bool,
user: React.PropTypes.shape({
name: React.PropTypes.string,
email: React.PropTypes.string,
password: React.PropTypes.string,
passwordConfirmation: React.PropTypes.string
isModalOpen: PropTypes.bool,
user: PropTypes.shape({
name: PropTypes.string,
email: PropTypes.string,
password: PropTypes.string,
passwordConfirmation: PropTypes.string
})
}

Expand Down
12 changes: 6 additions & 6 deletions app/components/todo/index.jsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import React from 'react';
import React, { Component, PropTypes } from 'react';
import CSSTransitionGroup from 'react-addons-css-transition-group';
import { ListGroupItem } from 'react-bootstrap';
import TodosActions from 'actions/todos';
import styles from './styles';

export default class Todo extends React.Component {
export default class Todo extends Component {
static propTypes = {
todo: React.PropTypes.shape({
id: React.PropTypes.number,
isComplete: React.PropTypes.bool,
name: React.PropTypes.string
todo: PropTypes.shape({
id: PropTypes.number,
isComplete: PropTypes.bool,
name: PropTypes.string
})
}

Expand Down
14 changes: 7 additions & 7 deletions app/components/todo/layout.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, { Component, PropTypes } from 'react';
import connectToStores from 'alt-utils/lib/connectToStores';
import {
Grid,
Expand All @@ -13,13 +13,13 @@ import TodoList from 'components/todo/list';
import styles from './styles';

@connectToStores
export default class TodoLayout extends React.Component {
export default class TodoLayout extends Component {
static propTypes = {
todos: React.PropTypes.arrayOf(
React.PropTypes.shape({
id: React.PropTypes.id,
isComplete: React.PropTypes.bool,
name: React.PropTypes.string
todos: PropTypes.arrayOf(
PropTypes.shape({
id: PropTypes.id,
isComplete: PropTypes.bool,
name: PropTypes.string
})
)
}
Expand Down
14 changes: 7 additions & 7 deletions app/components/todo/list.jsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import React from 'react';
import React, { Component, PropTypes } from 'react';
import { ListGroup } from 'react-bootstrap';
import Todo from 'components/todo';

export default class TodoList extends React.Component {
export default class TodoList extends Component {
static propTypes = {
todos: React.PropTypes.arrayOf(
React.PropTypes.shape({
id: React.PropTypes.id,
isComplete: React.PropTypes.bool,
name: React.PropTypes.string
todos: PropTypes.arrayOf(
PropTypes.shape({
id: PropTypes.id,
isComplete: PropTypes.bool,
name: PropTypes.string
})
)
}
Expand Down
12 changes: 6 additions & 6 deletions app/components/todoModal/index.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, { Component, PropTypes } from 'react';
import connectToStores from 'alt-utils/lib/connectToStores';
import {
Modal,
Expand All @@ -13,12 +13,12 @@ import TodoStore from 'stores/todo';
import ApplicationStore from 'stores/application';

@connectToStores
export default class TodoModal extends React.Component {
export default class TodoModal extends Component {
static propTypes = {
isModalOpen: React.PropTypes.bool,
todo: React.PropTypes.shape({
name: React.PropTypes.string,
isComplete: React.PropTypes.bool
isModalOpen: PropTypes.bool,
todo: PropTypes.shape({
name: PropTypes.string,
isComplete: PropTypes.bool
})
}

Expand Down