Skip to content

Commit

Permalink
Merge branch 'master' into feature/participant-details-visible
Browse files Browse the repository at this point in the history
  • Loading branch information
googol committed Jul 17, 2016
2 parents d9eb123 + 293d9ea commit ec0a522
Show file tree
Hide file tree
Showing 23 changed files with 50 additions and 48 deletions.
5 changes: 0 additions & 5 deletions src/client/actions.js

This file was deleted.

5 changes: 5 additions & 0 deletions src/client/actions/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// Tämä tiedosto kokoaa kaikki actions-kansion tiedostot yhteen moduuliin

export { getParticipantActions } from './ParticipantActions';
export { getRegistryUserActions } from './RegistryUserActions';
export { getSearchFilterActions } from './SearchFilterActions';
22 changes: 0 additions & 22 deletions src/client/components.js

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import _ from 'lodash';
import { Nav } from 'react-bootstrap';
import { getNavigationItem } from '../components';
import { getNavigationItem } from '../../components';

export function getMainNavigation() {
const NavigationItem = getNavigationItem();
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { NavItem } from 'react-bootstrap';
import { NavLinkItem } from '../components';
import { NavLinkItem } from '../../components';

export function getNavigationItem() {
class NavigationItem extends React.Component {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import React from 'react';
import _ from 'lodash';
import moment from 'moment';
import { Row, Col, Panel, Button } from 'react-bootstrap';
import { Presence } from '../components';
import { PresenceHistory } from '../components';
import { PropertyTextArea } from '../components';
import { Presence } from '../../components';
import { PresenceHistory } from '../../components';
import { PropertyTextArea } from '../../components';

export function getParticipantDetailsPage(participantStore, participantActions) {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { Table } from 'react-bootstrap';
import moment from 'moment';
import { getPresenceLabel } from './Presence';
import { getPresenceLabel } from '../../components';

moment.locale('fi');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { getListOffsetSelectorContainer } from './containers/ListOffsetSelectorC
import { getParticipantRowsContainer } from './containers/ParticipantRowsContainer';
import { getQuickFilterContainer } from './containers/QuickFilterContainer';
import { getParticipantCount } from './containers/ParticipantCount';
import { getPresenceLabel } from '../Presence';
import { getPresenceLabel } from '../../components';

function getOrder(query) {
try {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { Link } from 'react-router';
import { Input } from 'react-bootstrap';
import { Presence } from '../components';
import { Presence } from '../../components';

class LinkCell extends React.Component {
render() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { Input } from 'react-bootstrap';
import { getPresenceLabel } from '../../Presence';
import { getPresenceLabel } from '../../../components';

export function getPresenceFilterContainer() {
const property = 'presence';
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { getListSortingSelector } from '../components';
import { getListSortingSelector } from '../../components';

export function getSortableHeaderCell() {
const ListSortingSelector = getListSortingSelector();
Expand Down
24 changes: 24 additions & 0 deletions src/client/components/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// Tämä tiedosto kokoaa kaikki components-kansion exportit yhteen moduuliin
export { getApp } from './App/App';
export { getHomepage } from './Homepage';
export { getParticipantListPage } from './ParticipantListPage/ParticipantListPage';
export { getParticipantSidebar } from './ParticipantListPage/ParticipantSidebar';
export { defaultSidebar } from './App/DefaultSidebar';
export { getParticipantDetailsPage } from './ParticipantDetailsPage/ParticipantDetailsPage';
export { ParticipantRow } from './ParticipantListPage/ParticipantRow';
export { ListOffsetSelector } from './Util/ListOffsetSelector';
export { getUserManagementPage } from './RegistryUserListPage/UserManagementPage';
export { NavLinkItem } from './App/NavLinkItem';
export { getListSortingSelector } from './Util/ListSortingSelector';
export { getSortableHeaderCell } from './Util/SortableHeaderCell';
export { getPropertySelect } from './Util/PropertySelect';
export { getDebouncedTextField } from './Util/DebouncedTextField';
export { getMainNavigation } from './App/MainNavigation';
export { getNavigationItem } from './App/NavigationItem';
export { getLoginPromptPage } from './LoginPromptPage';
export { getPresenceLabel } from './Util/Presence';
export { getPresenceColor } from './Util/Presence';
export { Presence } from './Util/Presence';
export { PresenceHistory } from './ParticipantDetailsPage/PresenceHistory';
export { getLogin } from './OfflineLogin';
export { PropertyTextArea } from './PropertyTextArea';
5 changes: 0 additions & 5 deletions src/client/stores.js

This file was deleted.

5 changes: 5 additions & 0 deletions src/client/stores/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// Tämä tiedosto kokoaa kaikki stores-kansion tiedostot yhteen moduuliin

export { getParticipantStore } from './ParticipantStore';
export { getRegistryUserStore } from './RegistryUserStore';
export { getSearchFilterStore } from './SearchFilterStore';
6 changes: 0 additions & 6 deletions src/client/utils.js

This file was deleted.

6 changes: 6 additions & 0 deletions src/client/utils/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Tämä tiedosto kokoaa kaikki utils-kansion tiedostot yhteen moduuliin

export { getRestfulResource } from './RestfulResource';
export { pureShouldComponentUpdate } from './pureShouldComponentUpdate';
export { changeQueryParameter, changeQueryParameters } from './changeQueryParameters';
export { restrictComponent } from './restrictComponent';

0 comments on commit ec0a522

Please sign in to comment.