diff --git a/src/client/actions.js b/src/client/actions.js deleted file mode 100644 index f8f4ef3b..00000000 --- a/src/client/actions.js +++ /dev/null @@ -1,5 +0,0 @@ -// Tämä tiedosto kokoaa kaikki actions-kansion tiedostot yhteen moduuliin - -export { getParticipantActions } from './actions/ParticipantActions'; -export { getRegistryUserActions } from './actions/RegistryUserActions'; -export { getSearchFilterActions } from './actions/SearchFilterActions'; diff --git a/src/client/actions/index.js b/src/client/actions/index.js new file mode 100644 index 00000000..55a0145a --- /dev/null +++ b/src/client/actions/index.js @@ -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'; diff --git a/src/client/components.js b/src/client/components.js deleted file mode 100644 index 1438380a..00000000 --- a/src/client/components.js +++ /dev/null @@ -1,22 +0,0 @@ -// Tämä tiedosto kokoaa kaikki components-kansion exportit yhteen moduuliin -export { getApp } from './components/App/App'; -export { getHomepage } from './components/Homepage'; -export { getParticipantListPage } from './components/ParticipantListPage/ParticipantListPage'; -export { getParticipantSidebar } from './components/ParticipantListPage/ParticipantSidebar'; -export { defaultSidebar } from './components/DefaultSidebar'; -export { getParticipantDetailsPage } from './components/ParticipantDetailsPage'; -export { ParticipantRow } from './components/ParticipantRow'; -export { ListOffsetSelector } from './components/ListOffsetSelector'; -export { getUserManagementPage } from './components/RegistryUserListPage/UserManagementPage'; -export { NavLinkItem } from './components/NavLinkItem'; -export { getListSortingSelector } from './components/ListSortingSelector'; -export { getSortableHeaderCell } from './components/SortableHeaderCell'; -export { getPropertySelect } from './components/PropertySelect'; -export { getDebouncedTextField } from './components/DebouncedTextField'; -export { getMainNavigation } from './components/MainNavigation'; -export { getNavigationItem } from './components/NavigationItem'; -export { getLoginPromptPage } from './components/LoginPromptPage'; -export { Presence } from './components/Presence'; -export { PresenceHistory } from './components/PresenceHistory'; -export { getLogin } from './components/OfflineLogin'; -export { PropertyTextArea } from './components/PropertyTextArea'; diff --git a/src/client/components/DefaultSidebar.jsx b/src/client/components/App/DefaultSidebar.jsx similarity index 100% rename from src/client/components/DefaultSidebar.jsx rename to src/client/components/App/DefaultSidebar.jsx diff --git a/src/client/components/MainNavigation.jsx b/src/client/components/App/MainNavigation.jsx similarity index 96% rename from src/client/components/MainNavigation.jsx rename to src/client/components/App/MainNavigation.jsx index e10e6420..4500fa5d 100644 --- a/src/client/components/MainNavigation.jsx +++ b/src/client/components/App/MainNavigation.jsx @@ -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(); diff --git a/src/client/components/NavLinkItem.jsx b/src/client/components/App/NavLinkItem.jsx similarity index 100% rename from src/client/components/NavLinkItem.jsx rename to src/client/components/App/NavLinkItem.jsx diff --git a/src/client/components/NavigationItem.jsx b/src/client/components/App/NavigationItem.jsx similarity index 93% rename from src/client/components/NavigationItem.jsx rename to src/client/components/App/NavigationItem.jsx index b85c8e1a..94fb99d7 100644 --- a/src/client/components/NavigationItem.jsx +++ b/src/client/components/App/NavigationItem.jsx @@ -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 { diff --git a/src/client/components/ParticipantDetailsPage.jsx b/src/client/components/ParticipantDetailsPage/ParticipantDetailsPage.jsx similarity index 98% rename from src/client/components/ParticipantDetailsPage.jsx rename to src/client/components/ParticipantDetailsPage/ParticipantDetailsPage.jsx index d3d9fa95..1d646bea 100644 --- a/src/client/components/ParticipantDetailsPage.jsx +++ b/src/client/components/ParticipantDetailsPage/ParticipantDetailsPage.jsx @@ -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) { diff --git a/src/client/components/PresenceHistory.jsx b/src/client/components/ParticipantDetailsPage/PresenceHistory.jsx similarity index 93% rename from src/client/components/PresenceHistory.jsx rename to src/client/components/ParticipantDetailsPage/PresenceHistory.jsx index b8da388a..be1c7a9e 100644 --- a/src/client/components/PresenceHistory.jsx +++ b/src/client/components/ParticipantDetailsPage/PresenceHistory.jsx @@ -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'); diff --git a/src/client/components/ParticipantListPage/ParticipantListPage.jsx b/src/client/components/ParticipantListPage/ParticipantListPage.jsx index 55535ac1..4a238598 100644 --- a/src/client/components/ParticipantListPage/ParticipantListPage.jsx +++ b/src/client/components/ParticipantListPage/ParticipantListPage.jsx @@ -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 { diff --git a/src/client/components/ParticipantRow.jsx b/src/client/components/ParticipantListPage/ParticipantRow.jsx similarity index 98% rename from src/client/components/ParticipantRow.jsx rename to src/client/components/ParticipantListPage/ParticipantRow.jsx index b16ae914..282aedcc 100644 --- a/src/client/components/ParticipantRow.jsx +++ b/src/client/components/ParticipantListPage/ParticipantRow.jsx @@ -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() { diff --git a/src/client/components/ParticipantListPage/containers/PresenceFilterContainer.jsx b/src/client/components/ParticipantListPage/containers/PresenceFilterContainer.jsx index e20a1db9..949f836c 100644 --- a/src/client/components/ParticipantListPage/containers/PresenceFilterContainer.jsx +++ b/src/client/components/ParticipantListPage/containers/PresenceFilterContainer.jsx @@ -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'; diff --git a/src/client/components/DebouncedTextField.jsx b/src/client/components/Util/DebouncedTextField.jsx similarity index 100% rename from src/client/components/DebouncedTextField.jsx rename to src/client/components/Util/DebouncedTextField.jsx diff --git a/src/client/components/ListOffsetSelector.jsx b/src/client/components/Util/ListOffsetSelector.jsx similarity index 100% rename from src/client/components/ListOffsetSelector.jsx rename to src/client/components/Util/ListOffsetSelector.jsx diff --git a/src/client/components/ListSortingSelector.jsx b/src/client/components/Util/ListSortingSelector.jsx similarity index 100% rename from src/client/components/ListSortingSelector.jsx rename to src/client/components/Util/ListSortingSelector.jsx diff --git a/src/client/components/Presence.jsx b/src/client/components/Util/Presence.jsx similarity index 100% rename from src/client/components/Presence.jsx rename to src/client/components/Util/Presence.jsx diff --git a/src/client/components/PropertySelect.jsx b/src/client/components/Util/PropertySelect.jsx similarity index 100% rename from src/client/components/PropertySelect.jsx rename to src/client/components/Util/PropertySelect.jsx diff --git a/src/client/components/SortableHeaderCell.jsx b/src/client/components/Util/SortableHeaderCell.jsx similarity index 87% rename from src/client/components/SortableHeaderCell.jsx rename to src/client/components/Util/SortableHeaderCell.jsx index 040dba29..121bbc00 100644 --- a/src/client/components/SortableHeaderCell.jsx +++ b/src/client/components/Util/SortableHeaderCell.jsx @@ -1,5 +1,5 @@ import React from 'react'; -import { getListSortingSelector } from '../components'; +import { getListSortingSelector } from '../../components'; export function getSortableHeaderCell() { const ListSortingSelector = getListSortingSelector(); diff --git a/src/client/components/index.js b/src/client/components/index.js new file mode 100644 index 00000000..3c4821af --- /dev/null +++ b/src/client/components/index.js @@ -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'; diff --git a/src/client/stores.js b/src/client/stores.js deleted file mode 100644 index 50d944a4..00000000 --- a/src/client/stores.js +++ /dev/null @@ -1,5 +0,0 @@ -// Tämä tiedosto kokoaa kaikki stores-kansion tiedostot yhteen moduuliin - -export { getParticipantStore } from './stores/ParticipantStore'; -export { getRegistryUserStore } from './stores/RegistryUserStore'; -export { getSearchFilterStore } from './stores/SearchFilterStore'; diff --git a/src/client/stores/index.js b/src/client/stores/index.js new file mode 100644 index 00000000..55729aac --- /dev/null +++ b/src/client/stores/index.js @@ -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'; diff --git a/src/client/utils.js b/src/client/utils.js deleted file mode 100644 index dd2a89be..00000000 --- a/src/client/utils.js +++ /dev/null @@ -1,6 +0,0 @@ -// Tämä tiedosto kokoaa kaikki utils-kansion tiedostot yhteen moduuliin - -export { getRestfulResource } from './utils/RestfulResource'; -export { pureShouldComponentUpdate } from './utils/pureShouldComponentUpdate'; -export { changeQueryParameter, changeQueryParameters } from './utils/changeQueryParameters'; -export { restrictComponent } from './utils/restrictComponent'; diff --git a/src/client/utils/index.js b/src/client/utils/index.js new file mode 100644 index 00000000..2e471589 --- /dev/null +++ b/src/client/utils/index.js @@ -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';