From 5951405a2d6865b3f60dd89933fbd763a049492d Mon Sep 17 00:00:00 2001 From: Razzwan Date: Thu, 17 Dec 2020 15:22:01 +0200 Subject: [PATCH] fix: fix height of proposal form feat: more clear redux store structure fix: unit tests config fix: removed useless aliases, which was moved to other folder --- package.json | 4 +--- src/{actions => @store/arc}/arcActions.ts | 6 +++--- src/{actions => @store}/async.ts | 0 src/{reducers => @store}/index.ts | 8 ++++---- .../notifications/notifications.reducer.ts} | 0 .../notifications}/notifications.ts | 4 ++-- src/{actions => @store/profiles}/profilesActions.ts | 6 +++--- src/{reducers => @store/profiles}/profilesReducer.ts | 2 +- src/{actions => @store/ui}/uiActions.ts | 4 ++-- src/{reducers => @store/ui}/uiReducer.ts | 0 src/{actions => @store/web3}/web3Actions.ts | 11 ++++++----- src/{reducers => @store/web3}/web3Reducer.ts | 0 src/arc.ts | 2 +- src/components/Account/AccountImage.tsx | 2 +- src/components/Account/AccountPopup.tsx | 6 +++--- src/components/Account/AccountProfileName.tsx | 2 +- src/components/Account/AccountProfilePage.tsx | 8 ++++---- src/components/Buidlhub/Registration.tsx | 2 +- src/components/Dao/DaoContainer.tsx | 8 ++++---- src/components/Dao/DaoMember.tsx | 2 +- src/components/Dao/DaoMembersPage.tsx | 6 +++--- src/components/Dao/DaoSchemesPage.tsx | 2 +- src/components/DaoCreator/index.tsx | 2 +- src/components/Daos/DaosPage.tsx | 2 +- src/components/Notification/Notification.tsx | 2 +- src/components/Proposal/ActionButton.tsx | 8 ++++---- .../SchemeForms/CreateContributionRewardProposal.tsx | 4 ++-- .../SchemeForms/CreateGenericMultiCallProposal.tsx | 4 ++-- .../SchemeForms/CreateKnownGenericSchemeProposal.tsx | 6 +++--- .../SchemeForms/CreateSchemeRegistrarProposal.tsx | 4 ++-- .../CreateUnknownGenericSchemeProposal.tsx | 4 ++-- src/components/Proposal/Create/index.ts | 2 +- src/components/Proposal/ProposalData.tsx | 4 ++-- .../Proposal/ProposalSummary/ProposalSummary.tsx | 2 +- .../ProposalSummaryContributionReward.tsx | 2 +- .../ProposalSummaryKnownGenericScheme.tsx | 2 +- .../ProposalSummaryMultiCallGenericScheme.tsx | 2 +- .../ProposalSummarySchemeRegistrar.tsx | 2 +- .../ProposalSummaryUnknownGenericScheme.tsx | 2 +- src/components/Proposal/Staking/StakeButtons.tsx | 6 +++--- src/components/Proposal/Voting/VoteBreakdown.tsx | 2 +- src/components/Proposal/Voting/VoteButtons.tsx | 4 ++-- src/components/Proposal/Voting/VotersModal.tsx | 6 +++--- src/components/Redemptions/RedemptionsMenu.tsx | 8 ++++---- src/components/Redemptions/RedemptionsPage.tsx | 6 +++--- .../Competition/Card.tsx | 4 ++-- .../Competition/CreateProposal.tsx | 4 ++-- .../Competition/CreateSubmission.tsx | 2 +- .../Competition/Details.tsx | 6 +++--- .../Competition/SubmissionDetails.tsx | 4 ++-- .../Competition/utils.ts | 4 ++-- src/components/Scheme/ReputationFromToken.tsx | 8 ++++---- src/components/Scheme/SchemeContainer.tsx | 4 ++-- src/components/Scheme/SchemeProposalsPage.tsx | 2 +- src/components/Shared/CopyToClipboard.tsx | 2 +- src/components/Shared/FollowButton.tsx | 8 ++++---- src/components/Shared/PreTransactionModal.tsx | 4 ++-- src/components/Shared/SimpleMessagePopup.tsx | 4 ++-- src/components/Shared/ThreeboxModal.tsx | 2 +- src/components/Shared/TrainingTooltip.tsx | 2 +- src/components/Shared/UserSearchField.tsx | 4 ++-- src/configureStore.ts | 2 +- src/layouts/AppContainer.tsx | 12 ++++++------ src/layouts/Header.tsx | 10 +++++----- src/layouts/SidebarMenu.tsx | 4 ++-- webpack.base.config.js | 4 +--- 66 files changed, 132 insertions(+), 135 deletions(-) rename src/{actions => @store/arc}/arcActions.ts (97%) rename src/{actions => @store}/async.ts (100%) rename src/{reducers => @store}/index.ts (58%) rename src/{reducers/notifications.ts => @store/notifications/notifications.reducer.ts} (100%) rename src/{selectors => @store/notifications}/notifications.ts (77%) rename src/{actions => @store/profiles}/profilesActions.ts (96%) rename src/{reducers => @store/profiles}/profilesReducer.ts (98%) rename src/{actions => @store/ui}/uiActions.ts (96%) rename src/{reducers => @store/ui}/uiReducer.ts (100%) rename src/{actions => @store/web3}/web3Actions.ts (89%) rename src/{reducers => @store/web3}/web3Reducer.ts (100%) diff --git a/package.json b/package.json index 22a36c3f4..c2ba833b2 100644 --- a/package.json +++ b/package.json @@ -35,16 +35,14 @@ "moduleNameMapper": { "\\.(scss|css|less|svg|png|jpg)$": "identity-obj-proxy", "^arc": "/src/arc", - "^actions/(.*)$": "/src/actions/$1", "^components(.*)$": "/src/components$1", + "^@store(.*)$": "/src/@store$1", "^data/(.*)$": "/data/$1", "^genericSchemeRegistry(.*)$": "/src/genericSchemeRegistry$1", "^crxRegistry(.*)$": "/src/crxRegistry$1", "^layouts/(.*)$": "/src/layouts/$1", "^lib/(.*)$": "/src/lib/$1", "^pages": "/src/pages", - "^reducers/(.*)$": "/src/reducers/$1", - "^selectors/(.*)$": "/src/selectors/$1", "^src/(.*)$": "/src/$1" }, "setupFiles": [ diff --git a/src/actions/arcActions.ts b/src/@store/arc/arcActions.ts similarity index 97% rename from src/actions/arcActions.ts rename to src/@store/arc/arcActions.ts index 6b6309f93..18a141c23 100644 --- a/src/actions/arcActions.ts +++ b/src/@store/arc/arcActions.ts @@ -1,9 +1,9 @@ import { Address, DAO, IProposalCreateOptions, IProposalOutcome, ITransactionState, ITransactionUpdate, ReputationFromTokenScheme, Scheme } from "@daostack/arc.js"; -import { IAsyncAction } from "actions/async"; +import { IAsyncAction } from "@store/async"; import { toWei, getArcByDAOAddress } from "lib/util"; import { IRedemptionState } from "lib/proposalHelpers"; -import { IRootState } from "reducers/index"; -import { NotificationStatus, showNotification } from "reducers/notifications"; +import { IRootState } from "@store/index"; +import { NotificationStatus, showNotification } from "@store/notifications/notifications.reducer"; import * as Redux from "redux"; import { ThunkAction } from "redux-thunk"; diff --git a/src/actions/async.ts b/src/@store/async.ts similarity index 100% rename from src/actions/async.ts rename to src/@store/async.ts diff --git a/src/reducers/index.ts b/src/@store/index.ts similarity index 58% rename from src/reducers/index.ts rename to src/@store/index.ts index 8c81e12a7..d995b8a68 100644 --- a/src/reducers/index.ts +++ b/src/@store/index.ts @@ -1,9 +1,9 @@ import { routerReducer } from "react-router-redux"; import { combineReducers } from "redux"; -import { INotificationsState, notificationsReducer } from "./notifications"; -import profilesReducer, { IProfilesState } from "./profilesReducer"; -import uiReducer, { IUIState } from "./uiReducer"; -import web3Reducer, { IWeb3State } from "./web3Reducer"; +import { INotificationsState, notificationsReducer } from "@store/notifications/notifications.reducer"; +import profilesReducer, { IProfilesState } from "@store/profiles/profilesReducer"; +import uiReducer, { IUIState } from "@store/ui/uiReducer"; +import web3Reducer, { IWeb3State } from "@store/web3/web3Reducer"; export interface IRootState { notifications: INotificationsState; diff --git a/src/reducers/notifications.ts b/src/@store/notifications/notifications.reducer.ts similarity index 100% rename from src/reducers/notifications.ts rename to src/@store/notifications/notifications.reducer.ts diff --git a/src/selectors/notifications.ts b/src/@store/notifications/notifications.ts similarity index 77% rename from src/selectors/notifications.ts rename to src/@store/notifications/notifications.ts index a2c5eaf04..6250c9425 100644 --- a/src/selectors/notifications.ts +++ b/src/@store/notifications/notifications.ts @@ -1,6 +1,6 @@ -import { INotificationsState, INotification } from "reducers/notifications"; +import { INotificationsState, INotification } from "@store/notifications/notifications.reducer"; import { createSelector } from "reselect"; -import { IRootState } from "../reducers"; +import { IRootState } from "@store/index"; const notifications = (state: IRootState): INotificationsState => state.notifications; diff --git a/src/actions/profilesActions.ts b/src/@store/profiles/profilesActions.ts similarity index 96% rename from src/actions/profilesActions.ts rename to src/@store/profiles/profilesActions.ts index c66f4b6cc..9f5d88b38 100644 --- a/src/actions/profilesActions.ts +++ b/src/@store/profiles/profilesActions.ts @@ -1,11 +1,11 @@ import * as Box from "3box"; -import { AsyncActionSequence, IAsyncAction } from "actions/async"; +import { AsyncActionSequence, IAsyncAction } from "@store/async"; import { getWeb3Provider } from "arc"; import Analytics from "lib/analytics"; -import { NotificationStatus, showNotification } from "reducers/notifications"; -import { ActionTypes, FollowType, newProfile } from "reducers/profilesReducer"; +import { NotificationStatus, showNotification } from "@store/notifications/notifications.reducer"; +import { ActionTypes, FollowType, newProfile } from "@store/profiles/profilesReducer"; import { arrayRemove } from "lib/util"; // Load account profile data from our database for all the "members" of the DAO diff --git a/src/reducers/profilesReducer.ts b/src/@store/profiles/profilesReducer.ts similarity index 98% rename from src/reducers/profilesReducer.ts rename to src/@store/profiles/profilesReducer.ts index 0db1ef131..4a1052e94 100644 --- a/src/reducers/profilesReducer.ts +++ b/src/@store/profiles/profilesReducer.ts @@ -1,6 +1,6 @@ import * as update from "immutability-helper"; -import { AsyncActionSequence } from "actions/async"; +import { AsyncActionSequence } from "@store/async"; export enum ActionTypes { GET_PROFILE_DATA = "GET_PROFILE_DATA", diff --git a/src/actions/uiActions.ts b/src/@store/ui/uiActions.ts similarity index 96% rename from src/actions/uiActions.ts rename to src/@store/ui/uiActions.ts index 1abad2f66..50f1c0cbc 100644 --- a/src/actions/uiActions.ts +++ b/src/@store/ui/uiActions.ts @@ -1,7 +1,7 @@ import * as Redux from "redux"; -import { IRootState } from "reducers"; -import { ActionTypes } from "reducers/uiReducer"; +import { IRootState } from "@store/index"; +import { ActionTypes } from "@store/ui/uiReducer"; import { ISimpleMessagePopupProps } from "components/Shared/SimpleMessagePopup"; export function showTour() { diff --git a/src/reducers/uiReducer.ts b/src/@store/ui/uiReducer.ts similarity index 100% rename from src/reducers/uiReducer.ts rename to src/@store/ui/uiReducer.ts diff --git a/src/actions/web3Actions.ts b/src/@store/web3/web3Actions.ts similarity index 89% rename from src/actions/web3Actions.ts rename to src/@store/web3/web3Actions.ts index 80b69dfb7..bbf35cf65 100644 --- a/src/actions/web3Actions.ts +++ b/src/@store/web3/web3Actions.ts @@ -1,11 +1,12 @@ -import * as Sentry from "@sentry/browser"; -import { getProfile } from "actions/profilesActions"; import { getWeb3ProviderInfo, getProviderNetworkName } from "arc"; +import * as Sentry from "@sentry/browser"; +import * as Redux from "redux"; + import Analytics from "lib/analytics"; -import { ActionTypes, IWeb3State } from "reducers/web3Reducer"; -import * as Redux from "redux"; -import { IAsyncAction } from "./async"; +import { IAsyncAction } from "@store/async"; +import { getProfile } from "@store/profiles/profilesActions"; +import { ActionTypes, IWeb3State } from "@store/web3/web3Reducer"; export type ConnectAction = IAsyncAction<"WEB3_CONNECT", void, IWeb3State>; diff --git a/src/reducers/web3Reducer.ts b/src/@store/web3/web3Reducer.ts similarity index 100% rename from src/reducers/web3Reducer.ts rename to src/@store/web3/web3Reducer.ts diff --git a/src/arc.ts b/src/arc.ts index a1ad02771..72b43c1ab 100644 --- a/src/arc.ts +++ b/src/arc.ts @@ -1,4 +1,4 @@ -import { NotificationStatus } from "reducers/notifications"; +import { NotificationStatus } from "@store/notifications/notifications.reducer"; import { getNetworkId, getNetworkName, targetedNetwork, targetNetworks, Networks } from "./lib/util"; import { settings } from "./settings"; import { Address, Arc } from "@daostack/arc.js"; diff --git a/src/components/Account/AccountImage.tsx b/src/components/Account/AccountImage.tsx index 74b70c13a..74c6b2297 100644 --- a/src/components/Account/AccountImage.tsx +++ b/src/components/Account/AccountImage.tsx @@ -1,6 +1,6 @@ import { createDataURL } from "ethereum-blockies-png"; import * as React from "react"; -import { IProfileState } from "reducers/profilesReducer"; +import { IProfileState } from "@store/profiles/profilesReducer"; import * as css from "./Account.scss"; diff --git a/src/components/Account/AccountPopup.tsx b/src/components/Account/AccountPopup.tsx index a54f1923b..f4b34b14a 100644 --- a/src/components/Account/AccountPopup.tsx +++ b/src/components/Account/AccountPopup.tsx @@ -1,6 +1,6 @@ import { Address, IDAOState, IMemberState } from "@daostack/arc.js"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { getProfile } from "actions/profilesActions"; +import { getProfile } from "@store/profiles/profilesActions"; import AccountImage from "components/Account/AccountImage"; import AccountProfileName from "components/Account/AccountProfileName"; import Reputation from "components/Account/Reputation"; @@ -9,8 +9,8 @@ import withSubscription, { ISubscriptionProps } from "components/Shared/withSubs import CopyToClipboard, { IconColor } from "components/Shared/CopyToClipboard"; import * as React from "react"; import { connect } from "react-redux"; -import { IRootState } from "reducers"; -import { IProfileState } from "reducers/profilesReducer"; +import { IRootState } from "@store"; +import { IProfileState } from "@store/profiles/profilesReducer"; import * as BN from "bn.js"; diff --git a/src/components/Account/AccountProfileName.tsx b/src/components/Account/AccountProfileName.tsx index c4a1207ed..96f735439 100644 --- a/src/components/Account/AccountProfileName.tsx +++ b/src/components/Account/AccountProfileName.tsx @@ -1,7 +1,7 @@ import * as React from "react"; import { Link } from "react-router-dom"; -import { IProfileState } from "reducers/profilesReducer"; +import { IProfileState } from "@store/profiles/profilesReducer"; import * as classNames from "classnames"; diff --git a/src/components/Account/AccountProfilePage.tsx b/src/components/Account/AccountProfilePage.tsx index 11fb2573f..8bf5eed3e 100644 --- a/src/components/Account/AccountProfilePage.tsx +++ b/src/components/Account/AccountProfilePage.tsx @@ -1,6 +1,6 @@ import { IDAOState, IMemberState, DAO } from "@daostack/arc.js"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; -import { getProfile, updateProfile } from "actions/profilesActions"; +import { getProfile, updateProfile } from "@store/profiles/profilesActions"; import { enableWalletProvider } from "arc"; import classNames from "classnames"; import AccountImage from "components/Account/AccountImage"; @@ -19,9 +19,9 @@ import { BreadcrumbsItem } from "react-breadcrumbs-dynamic"; import { Helmet } from "react-helmet"; import { connect } from "react-redux"; import { RouteComponentProps } from "react-router-dom"; -import { IRootState } from "reducers"; -import { showNotification } from "reducers/notifications"; -import { IProfileState } from "reducers/profilesReducer"; +import { IRootState } from "@store"; +import { showNotification } from "@store/notifications/notifications.reducer"; +import { IProfileState } from "@store/profiles/profilesReducer"; import { combineLatest, of } from "rxjs"; import Loading from "components/Shared/Loading"; import * as css from "./Account.scss"; diff --git a/src/components/Buidlhub/Registration.tsx b/src/components/Buidlhub/Registration.tsx index 64606f1e7..067d08c18 100644 --- a/src/components/Buidlhub/Registration.tsx +++ b/src/components/Buidlhub/Registration.tsx @@ -1,7 +1,7 @@ import * as css from "./Registration.scss"; import * as React from "react"; import {connect} from "react-redux"; -import { IRootState } from "reducers"; +import { IRootState } from "@store"; import cn from "classnames"; import BuidlhubClient, {IBuidlhubClient} from "./BuidlhubClient"; diff --git a/src/components/Dao/DaoContainer.tsx b/src/components/Dao/DaoContainer.tsx index 8d244e27d..9e353431e 100644 --- a/src/components/Dao/DaoContainer.tsx +++ b/src/components/Dao/DaoContainer.tsx @@ -1,5 +1,5 @@ import { IDAOState, Member, Scheme } from "@daostack/arc.js"; -import { getProfilesForAddresses } from "actions/profilesActions"; +import { getProfilesForAddresses } from "@store/profiles/profilesActions"; import CreateProposalPage from "components/Proposal/Create"; import ProposalDetailsPage from "components/Proposal/ProposalDetailsPage"; import SchemeContainer from "components/Scheme/SchemeContainer"; @@ -11,9 +11,9 @@ import { Helmet } from "react-helmet"; import { connect } from "react-redux"; import { Route, RouteComponentProps, Switch } from "react-router-dom"; import { ModalRoute } from "react-router-modal"; -import { IRootState } from "reducers"; -import { showNotification } from "reducers/notifications"; -import { IProfileState } from "reducers/profilesReducer"; +import { IRootState } from "@store"; +import { showNotification } from "@store/notifications/notifications.reducer"; +import { IProfileState } from "@store/profiles/profilesReducer"; import DetailsPageRouter from "components/Scheme/ContributionRewardExtRewarders/DetailsPageRouter"; import { combineLatest, Subscription } from "rxjs"; import DaoSchemesPage from "./DaoSchemesPage"; diff --git a/src/components/Dao/DaoMember.tsx b/src/components/Dao/DaoMember.tsx index f8d95511e..01993e696 100644 --- a/src/components/Dao/DaoMember.tsx +++ b/src/components/Dao/DaoMember.tsx @@ -8,7 +8,7 @@ import withSubscription, { ISubscriptionProps } from "components/Shared/withSubs import { fromWei } from "lib/util"; import * as React from "react"; import { Link } from "react-router-dom"; -import { IProfileState } from "reducers/profilesReducer"; +import { IProfileState } from "@store/profiles/profilesReducer"; import * as css from "./Dao.scss"; interface IProps extends ISubscriptionProps { diff --git a/src/components/Dao/DaoMembersPage.tsx b/src/components/Dao/DaoMembersPage.tsx index 88c221aed..9f96347a6 100644 --- a/src/components/Dao/DaoMembersPage.tsx +++ b/src/components/Dao/DaoMembersPage.tsx @@ -1,5 +1,5 @@ import { IDAOState, Member } from "@daostack/arc.js"; -import { getProfile } from "actions/profilesActions"; +import { getProfile } from "@store/profiles/profilesActions"; import Loading from "components/Shared/Loading"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; import Analytics from "lib/analytics"; @@ -10,8 +10,8 @@ import InfiniteScroll from "react-infinite-scroll-component"; import { connect } from "react-redux"; import { RouteComponentProps } from "react-router-dom"; import * as Sticky from "react-stickynode"; -import { IRootState } from "reducers"; -import { IProfilesState } from "reducers/profilesReducer"; +import { IRootState } from "@store"; +import { IProfilesState } from "@store/profiles/profilesReducer"; import DaoMember from "./DaoMember"; import * as css from "./Dao.scss"; diff --git a/src/components/Dao/DaoSchemesPage.tsx b/src/components/Dao/DaoSchemesPage.tsx index 4a9f5783b..a562080af 100644 --- a/src/components/Dao/DaoSchemesPage.tsx +++ b/src/components/Dao/DaoSchemesPage.tsx @@ -19,7 +19,7 @@ import { RouteComponentProps } from "react-router-dom"; import * as Sticky from "react-stickynode"; import { CSSTransition, TransitionGroup } from "react-transition-group"; import { connect } from "react-redux"; -import { showNotification } from "reducers/notifications"; +import { showNotification } from "@store/notifications/notifications.reducer"; import { combineLatest, Observable, of } from "rxjs"; import { mergeMap } from "rxjs/operators"; import * as css from "./DaoSchemesPage.scss"; diff --git a/src/components/DaoCreator/index.tsx b/src/components/DaoCreator/index.tsx index de0c632e1..d7887afac 100644 --- a/src/components/DaoCreator/index.tsx +++ b/src/components/DaoCreator/index.tsx @@ -1,7 +1,7 @@ import * as React from "react"; import { connect } from "react-redux"; import { Prompt } from "react-router-dom"; -import { showNotification } from "reducers/notifications"; +import { showNotification } from "@store/notifications/notifications.reducer"; import { enableWalletProvider, getWeb3Provider } from "arc"; import { getNetworkName } from "lib/util"; diff --git a/src/components/Daos/DaosPage.tsx b/src/components/Daos/DaosPage.tsx index 99d00aeb9..1b4913ff4 100644 --- a/src/components/Daos/DaosPage.tsx +++ b/src/components/Daos/DaosPage.tsx @@ -11,7 +11,7 @@ import { BreadcrumbsItem } from "react-breadcrumbs-dynamic"; import InfiniteScroll from "react-infinite-scroll-component"; import { connect } from "react-redux"; import { Link } from "react-router-dom"; -import { IRootState } from "reducers"; +import { IRootState } from "@store"; import { combineLatest, of } from "rxjs"; import { first } from "rxjs/operators"; import cn from "classnames"; diff --git a/src/components/Notification/Notification.tsx b/src/components/Notification/Notification.tsx index 8780a45d9..e1df5ea8a 100644 --- a/src/components/Notification/Notification.tsx +++ b/src/components/Notification/Notification.tsx @@ -2,7 +2,7 @@ import * as classNames from "classnames"; import { copyToClipboard } from "lib/util"; import * as React from "react"; import Linkify from "react-linkify"; -import { NotificationStatus, showNotification } from "reducers/notifications"; +import { NotificationStatus, showNotification } from "@store/notifications/notifications.reducer"; import Tooltip from "rc-tooltip"; import * as css from "./Notification.scss"; diff --git a/src/components/Proposal/ActionButton.tsx b/src/components/Proposal/ActionButton.tsx index 4aa116881..694783d3c 100644 --- a/src/components/Proposal/ActionButton.tsx +++ b/src/components/Proposal/ActionButton.tsx @@ -1,5 +1,5 @@ import { Address, IDAOState, IProposalOutcome, IProposalStage, IProposalState, IRewardState, Token } from "@daostack/arc.js"; -import { executeProposal, redeemProposal, executeCalls } from "actions/arcActions"; +import { executeProposal, redeemProposal, executeCalls } from "@store/arc/arcActions"; import { enableWalletProvider } from "arc"; import classNames from "classnames"; import { ActionTypes, default as PreTransactionModal } from "components/Shared/PreTransactionModal"; @@ -9,9 +9,9 @@ import { Page } from "pages"; import Tooltip from "rc-tooltip"; import * as React from "react"; import { connect } from "react-redux"; -import { IRootState } from "reducers"; -import { showNotification } from "reducers/notifications"; -import { IProfileState } from "reducers/profilesReducer"; +import { IRootState } from "@store"; +import { showNotification } from "@store/notifications/notifications.reducer"; +import { IProfileState } from "@store/profiles/profilesReducer"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; import { of, combineLatest, Observable } from "rxjs"; import * as css from "./ActionButton.scss"; diff --git a/src/components/Proposal/Create/SchemeForms/CreateContributionRewardProposal.tsx b/src/components/Proposal/Create/SchemeForms/CreateContributionRewardProposal.tsx index 9f79ac723..c9bb34035 100644 --- a/src/components/Proposal/Create/SchemeForms/CreateContributionRewardProposal.tsx +++ b/src/components/Proposal/Create/SchemeForms/CreateContributionRewardProposal.tsx @@ -1,7 +1,7 @@ import * as React from "react"; import { connect } from "react-redux"; import { IDAOState, ISchemeState, Address } from "@daostack/arc.js"; -import { createProposal } from "actions/arcActions"; +import { createProposal } from "@store/arc/arcActions"; import { enableWalletProvider } from "arc"; import { ErrorMessage, Field, Form, Formik, FormikProps } from "formik"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; @@ -10,7 +10,7 @@ import TagsSelector from "components/Proposal/Create/SchemeForms/TagsSelector"; import TrainingTooltip from "components/Shared/TrainingTooltip"; import Analytics from "lib/analytics"; import { baseTokenName, supportedTokens, toBaseUnit, tokenDetails, toWei, isValidUrl, isAddress, getArcByDAOAddress, getNetworkByDAOAddress } from "lib/util"; -import { showNotification, NotificationStatus } from "reducers/notifications"; +import { showNotification, NotificationStatus } from "@store/notifications/notifications.reducer"; import { exportUrl, importUrlValues } from "lib/proposalUtils"; import * as css from "components/Proposal/Create/CreateProposal.scss"; import MarkdownField from "./MarkdownField"; diff --git a/src/components/Proposal/Create/SchemeForms/CreateGenericMultiCallProposal.tsx b/src/components/Proposal/Create/SchemeForms/CreateGenericMultiCallProposal.tsx index cfd195736..42f0810d7 100644 --- a/src/components/Proposal/Create/SchemeForms/CreateGenericMultiCallProposal.tsx +++ b/src/components/Proposal/Create/SchemeForms/CreateGenericMultiCallProposal.tsx @@ -1,11 +1,11 @@ import { ISchemeState } from "@daostack/arc.js"; -import { createProposal } from "actions/arcActions"; +import { createProposal } from "@store/arc/arcActions"; import { enableWalletProvider } from "arc"; import { ErrorMessage, Field, Form, Formik, FormikProps, FieldArray } from "formik"; import Analytics from "lib/analytics"; import * as React from "react"; import { connect } from "react-redux"; -import { showNotification, NotificationStatus } from "reducers/notifications"; +import { showNotification, NotificationStatus } from "@store/notifications/notifications.reducer"; import { baseTokenName, isValidUrl, isAddress, linkToEtherScan, getContractName, toWei, getNetworkByDAOAddress, getArcByDAOAddress} from "lib/util"; import { exportUrl, importUrlValues } from "lib/proposalUtils"; import TagsSelector from "components/Proposal/Create/SchemeForms/TagsSelector"; diff --git a/src/components/Proposal/Create/SchemeForms/CreateKnownGenericSchemeProposal.tsx b/src/components/Proposal/Create/SchemeForms/CreateKnownGenericSchemeProposal.tsx index 16abd393f..8be31a1b8 100644 --- a/src/components/Proposal/Create/SchemeForms/CreateKnownGenericSchemeProposal.tsx +++ b/src/components/Proposal/Create/SchemeForms/CreateKnownGenericSchemeProposal.tsx @@ -10,9 +10,9 @@ import Interweave from "interweave"; import { Action, ActionField, GenericSchemeInfo } from "genericSchemeRegistry"; -import { IRootState } from "reducers"; -import { NotificationStatus, showNotification } from "reducers/notifications"; -import * as arcActions from "actions/arcActions"; +import { IRootState } from "@store"; +import { NotificationStatus, showNotification } from "@store/notifications/notifications.reducer"; +import * as arcActions from "@store/arc/arcActions"; import Analytics from "lib/analytics"; import { isValidUrl, getArcByDAOAddress, getNetworkByDAOAddress } from "lib/util"; diff --git a/src/components/Proposal/Create/SchemeForms/CreateSchemeRegistrarProposal.tsx b/src/components/Proposal/Create/SchemeForms/CreateSchemeRegistrarProposal.tsx index a8a63b87d..f0204a5eb 100644 --- a/src/components/Proposal/Create/SchemeForms/CreateSchemeRegistrarProposal.tsx +++ b/src/components/Proposal/Create/SchemeForms/CreateSchemeRegistrarProposal.tsx @@ -6,8 +6,8 @@ import withSubscription, { ISubscriptionProps } from "components/Shared/withSubs import TagsSelector from "components/Proposal/Create/SchemeForms/TagsSelector"; import TrainingTooltip from "components/Shared/TrainingTooltip"; -import { createProposal } from "actions/arcActions"; -import { showNotification, NotificationStatus } from "reducers/notifications"; +import { createProposal } from "@store/arc/arcActions"; +import { showNotification, NotificationStatus } from "@store/notifications/notifications.reducer"; import Analytics from "lib/analytics"; import { isValidUrl, getNetworkByDAOAddress, getArcByAddress, getArcByDAOAddress } from "lib/util"; import { GetSchemeIsActiveActions, getSchemeIsActive, REQUIRED_SCHEME_PERMISSIONS, schemeNameAndAddress, SchemePermissions, schemeNameFromAddress } from "lib/schemeUtils"; diff --git a/src/components/Proposal/Create/SchemeForms/CreateUnknownGenericSchemeProposal.tsx b/src/components/Proposal/Create/SchemeForms/CreateUnknownGenericSchemeProposal.tsx index 84c4c1532..1296e13a1 100644 --- a/src/components/Proposal/Create/SchemeForms/CreateUnknownGenericSchemeProposal.tsx +++ b/src/components/Proposal/Create/SchemeForms/CreateUnknownGenericSchemeProposal.tsx @@ -1,11 +1,11 @@ import { ISchemeState } from "@daostack/arc.js"; -import { createProposal } from "actions/arcActions"; +import { createProposal } from "@store/arc/arcActions"; import { enableWalletProvider } from "arc"; import { ErrorMessage, Field, Form, Formik, FormikProps } from "formik"; import Analytics from "lib/analytics"; import * as React from "react"; import { connect } from "react-redux"; -import { showNotification, NotificationStatus } from "reducers/notifications"; +import { showNotification, NotificationStatus } from "@store/notifications/notifications.reducer"; import { baseTokenName, isValidUrl, getNetworkByDAOAddress, getArcByDAOAddress } from "lib/util"; import { exportUrl, importUrlValues } from "lib/proposalUtils"; import TagsSelector from "components/Proposal/Create/SchemeForms/TagsSelector"; diff --git a/src/components/Proposal/Create/index.ts b/src/components/Proposal/Create/index.ts index fb792a720..36083f831 100644 --- a/src/components/Proposal/Create/index.ts +++ b/src/components/Proposal/Create/index.ts @@ -1,7 +1,7 @@ import { History } from "history"; import { connect } from "react-redux"; import { RouteComponentProps } from "react-router-dom"; -import { IRootState } from "reducers"; +import { IRootState } from "@store"; import { of } from "rxjs"; import { Address } from "@daostack/arc.js"; diff --git a/src/components/Proposal/ProposalData.tsx b/src/components/Proposal/ProposalData.tsx index 79a9b441b..2c33a4165 100644 --- a/src/components/Proposal/ProposalData.tsx +++ b/src/components/Proposal/ProposalData.tsx @@ -6,9 +6,9 @@ import withSubscription, { ISubscriptionProps } from "components/Shared/withSubs import * as moment from "moment"; import * as React from "react"; import { connect } from "react-redux"; -import { IRootState } from "reducers"; +import { IRootState } from "@store"; import { closingTime } from "lib/proposalHelpers"; -import { IProfileState } from "reducers/profilesReducer"; +import { IProfileState } from "@store/profiles/profilesReducer"; import { combineLatest, concat, of, Observable } from "rxjs"; import { map, mergeMap } from "rxjs/operators"; diff --git a/src/components/Proposal/ProposalSummary/ProposalSummary.tsx b/src/components/Proposal/ProposalSummary/ProposalSummary.tsx index d4f41d661..785efc647 100644 --- a/src/components/Proposal/ProposalSummary/ProposalSummary.tsx +++ b/src/components/Proposal/ProposalSummary/ProposalSummary.tsx @@ -2,7 +2,7 @@ import { IDAOState, IProposalState, IProposalType } from "@daostack/arc.js"; import classNames from "classnames"; import { GenericSchemeRegistry } from "genericSchemeRegistry"; import * as React from "react"; -import { IProfileState } from "reducers/profilesReducer"; +import { IProfileState } from "@store/profiles/profilesReducer"; import * as css from "./ProposalSummary.scss"; import ProposalSummaryContributionReward from "./ProposalSummaryContributionReward"; import ProposalSummaryKnownGenericScheme from "./ProposalSummaryKnownGenericScheme"; diff --git a/src/components/Proposal/ProposalSummary/ProposalSummaryContributionReward.tsx b/src/components/Proposal/ProposalSummary/ProposalSummaryContributionReward.tsx index 89c24a96f..91d304e32 100644 --- a/src/components/Proposal/ProposalSummary/ProposalSummaryContributionReward.tsx +++ b/src/components/Proposal/ProposalSummary/ProposalSummaryContributionReward.tsx @@ -3,7 +3,7 @@ import classNames from "classnames"; import AccountPopup from "components/Account/AccountPopup"; import AccountProfileName from "components/Account/AccountProfileName"; import * as React from "react"; -import { IProfileState } from "reducers/profilesReducer"; +import { IProfileState } from "@store/profiles/profilesReducer"; import RewardsString from "../RewardsString"; import * as css from "./ProposalSummary.scss"; diff --git a/src/components/Proposal/ProposalSummary/ProposalSummaryKnownGenericScheme.tsx b/src/components/Proposal/ProposalSummary/ProposalSummaryKnownGenericScheme.tsx index 6e65f7870..3b8cbfc17 100644 --- a/src/components/Proposal/ProposalSummary/ProposalSummaryKnownGenericScheme.tsx +++ b/src/components/Proposal/ProposalSummary/ProposalSummaryKnownGenericScheme.tsx @@ -4,7 +4,7 @@ import { GenericSchemeInfo } from "genericSchemeRegistry"; import { linkToEtherScan, formatTokens, truncateWithEllipses, getNetworkByDAOAddress } from "lib/util"; import CopyToClipboard from "components/Shared/CopyToClipboard"; import * as React from "react"; -import { IProfileState } from "reducers/profilesReducer"; +import { IProfileState } from "@store/profiles/profilesReducer"; import * as css from "./ProposalSummary.scss"; import ProposalSummaryDutchX from "./ProposalSummaryDutchX"; import ProposalSummaryStandardBounties from "./ProposalSummaryStandardBounties"; diff --git a/src/components/Proposal/ProposalSummary/ProposalSummaryMultiCallGenericScheme.tsx b/src/components/Proposal/ProposalSummary/ProposalSummaryMultiCallGenericScheme.tsx index d37cad711..2c07fa56c 100644 --- a/src/components/Proposal/ProposalSummary/ProposalSummaryMultiCallGenericScheme.tsx +++ b/src/components/Proposal/ProposalSummary/ProposalSummaryMultiCallGenericScheme.tsx @@ -2,7 +2,7 @@ import { IDAOState, IProposalState } from "@daostack/arc.js"; import classNames from "classnames"; import { linkToEtherScan, baseTokenName, truncateWithEllipses, buf2hex, getContractName, fromWei, getNetworkByDAOAddress } from "lib/util"; import * as React from "react"; -import { IProfileState } from "reducers/profilesReducer"; +import { IProfileState } from "@store/profiles/profilesReducer"; import * as css from "./ProposalSummary.scss"; import * as BN from "bn.js"; import CopyToClipboard from "components/Shared/CopyToClipboard"; diff --git a/src/components/Proposal/ProposalSummary/ProposalSummarySchemeRegistrar.tsx b/src/components/Proposal/ProposalSummary/ProposalSummarySchemeRegistrar.tsx index 236d78714..cd2f551a1 100644 --- a/src/components/Proposal/ProposalSummary/ProposalSummarySchemeRegistrar.tsx +++ b/src/components/Proposal/ProposalSummary/ProposalSummarySchemeRegistrar.tsx @@ -4,7 +4,7 @@ import { getNetworkByDAOAddress, getNetworkName, linkToEtherScan } from "lib/uti import CopyToClipboard from "components/Shared/CopyToClipboard"; import { schemeNameAndAddress } from "lib/schemeUtils"; import * as React from "react"; -import { IProfileState } from "reducers/profilesReducer"; +import { IProfileState } from "@store/profiles/profilesReducer"; import * as css from "./ProposalSummary.scss"; interface IExternalProps { diff --git a/src/components/Proposal/ProposalSummary/ProposalSummaryUnknownGenericScheme.tsx b/src/components/Proposal/ProposalSummary/ProposalSummaryUnknownGenericScheme.tsx index 88ef6fd2b..5b19d49e9 100644 --- a/src/components/Proposal/ProposalSummary/ProposalSummaryUnknownGenericScheme.tsx +++ b/src/components/Proposal/ProposalSummary/ProposalSummaryUnknownGenericScheme.tsx @@ -2,7 +2,7 @@ import { IDAOState, IProposalState } from "@daostack/arc.js"; import classNames from "classnames"; import { linkToEtherScan, formatTokens, getNetworkByDAOAddress } from "lib/util"; import * as React from "react"; -import { IProfileState } from "reducers/profilesReducer"; +import { IProfileState } from "@store/profiles/profilesReducer"; import * as css from "./ProposalSummary.scss"; interface IProps { diff --git a/src/components/Proposal/Staking/StakeButtons.tsx b/src/components/Proposal/Staking/StakeButtons.tsx index 1723389c0..bfa08ffe7 100644 --- a/src/components/Proposal/Staking/StakeButtons.tsx +++ b/src/components/Proposal/Staking/StakeButtons.tsx @@ -1,5 +1,5 @@ import { Address, IDAOState, IProposalOutcome, IProposalStage, IProposalState, Stake } from "@daostack/arc.js"; -import { approveStakingGens, stakeProposal } from "actions/arcActions"; +import { approveStakingGens, stakeProposal } from "@store/arc/arcActions"; import { enableWalletProvider } from "arc"; import * as BN from "bn.js"; @@ -12,8 +12,8 @@ import Tooltip from "rc-tooltip"; import * as React from "react"; import { connect } from "react-redux"; import { Modal } from "react-router-modal"; -import { showNotification } from "reducers/notifications"; -import { IProfileState } from "reducers/profilesReducer"; +import { showNotification } from "@store/notifications/notifications.reducer"; +import { IProfileState } from "@store/profiles/profilesReducer"; import * as css from "./StakeButtons.scss"; diff --git a/src/components/Proposal/Voting/VoteBreakdown.tsx b/src/components/Proposal/Voting/VoteBreakdown.tsx index 9e40d9166..2b6c49e93 100644 --- a/src/components/Proposal/Voting/VoteBreakdown.tsx +++ b/src/components/Proposal/Voting/VoteBreakdown.tsx @@ -7,7 +7,7 @@ import Reputation from "components/Account/Reputation"; import { getNetworkByDAOAddress } from "lib/util"; import * as React from "react"; import { connect } from "react-redux"; -import { showNotification } from "reducers/notifications"; +import { showNotification } from "@store/notifications/notifications.reducer"; import * as css from "./VoteBreakdown.scss"; interface IExternalProps { diff --git a/src/components/Proposal/Voting/VoteButtons.tsx b/src/components/Proposal/Voting/VoteButtons.tsx index 7554b5f66..0f052ddd3 100644 --- a/src/components/Proposal/Voting/VoteButtons.tsx +++ b/src/components/Proposal/Voting/VoteButtons.tsx @@ -1,5 +1,5 @@ import { Address, IDAOState, IMemberState, IProposalOutcome, IProposalStage, IProposalState } from "@daostack/arc.js"; -import { voteOnProposal } from "actions/arcActions"; +import { voteOnProposal } from "@store/arc/arcActions"; import { enableWalletProvider } from "arc"; import * as BN from "bn.js"; @@ -11,7 +11,7 @@ import { fromWei, getNetworkByDAOAddress, targetedNetwork } from "lib/util"; import { Page } from "pages"; import * as React from "react"; import { connect } from "react-redux"; -import { showNotification } from "reducers/notifications"; +import { showNotification } from "@store/notifications/notifications.reducer"; import * as css from "./VoteButtons.scss"; interface IExternalProps { diff --git a/src/components/Proposal/Voting/VotersModal.tsx b/src/components/Proposal/Voting/VotersModal.tsx index 8f9418c34..e1bfa46b0 100644 --- a/src/components/Proposal/Voting/VotersModal.tsx +++ b/src/components/Proposal/Voting/VotersModal.tsx @@ -1,5 +1,5 @@ import { Address, IDAOState, IProposalOutcome, IProposalState, Vote } from "@daostack/arc.js"; -import { getProfile } from "actions/profilesActions"; +import { getProfile } from "@store/profiles/profilesActions"; import classNames from "classnames"; import AccountImage from "components/Account/AccountImage"; import AccountProfileName from "components/Account/AccountProfileName"; @@ -7,8 +7,8 @@ import Reputation from "components/Account/Reputation"; import ModalPopup from "components/Shared/ModalPopup"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; import * as React from "react"; -import { IProfileState, IProfilesState } from "reducers/profilesReducer"; -import { IRootState } from "reducers"; +import { IProfileState, IProfilesState } from "@store/profiles/profilesReducer"; +import { IRootState } from "@store"; import { connect } from "react-redux"; import VoteGraph from "./VoteGraph"; import { getArcByDAOAddress } from "lib/util"; diff --git a/src/components/Redemptions/RedemptionsMenu.tsx b/src/components/Redemptions/RedemptionsMenu.tsx index b3a1051c9..d103ab06d 100644 --- a/src/components/Redemptions/RedemptionsMenu.tsx +++ b/src/components/Redemptions/RedemptionsMenu.tsx @@ -1,6 +1,6 @@ import { Address, IDAOState, IProposalState, IRewardState, Proposal, Reward } from "@daostack/arc.js"; import { enableWalletProvider } from "arc"; -import { redeemProposal } from "actions/arcActions"; +import { redeemProposal } from "@store/arc/arcActions"; import * as BN from "bn.js"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; @@ -12,9 +12,9 @@ import { Page } from "pages"; import * as React from "react"; import { connect } from "react-redux"; import { Link } from "react-router-dom"; -import { IRootState } from "reducers"; -import { showNotification } from "reducers/notifications"; -import { IProfileState } from "reducers/profilesReducer"; +import { IRootState } from "@store"; +import { showNotification } from "@store/notifications/notifications.reducer"; +import { IProfileState } from "@store/profiles/profilesReducer"; import { combineLatest, concat, Observable, of } from "rxjs"; import { defaultIfEmpty, map, mergeMap } from "rxjs/operators"; import * as css from "./RedemptionsMenu.scss"; diff --git a/src/components/Redemptions/RedemptionsPage.tsx b/src/components/Redemptions/RedemptionsPage.tsx index 8a6588a38..688889565 100644 --- a/src/components/Redemptions/RedemptionsPage.tsx +++ b/src/components/Redemptions/RedemptionsPage.tsx @@ -1,6 +1,6 @@ import { Address, DAOFieldsFragment, IContributionReward, IDAOState, IRewardState, Proposal } from "@daostack/arc.js"; import { enableWalletProvider, getArcs } from "arc"; -import { redeemProposal } from "actions/arcActions"; +import { redeemProposal } from "@store/arc/arcActions"; import * as BN from "bn.js"; import Loading from "components/Shared/Loading"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; @@ -13,8 +13,8 @@ import * as React from "react"; import { BreadcrumbsItem } from "react-breadcrumbs-dynamic"; import { connect } from "react-redux"; import * as Sticky from "react-stickynode"; -import { IRootState } from "reducers"; -import { showNotification } from "reducers/notifications"; +import { IRootState } from "@store"; +import { showNotification } from "@store/notifications/notifications.reducer"; import { of, concat } from "rxjs"; import { map, first } from "rxjs/operators"; import ProposalCard from "../Proposal/ProposalCard"; diff --git a/src/components/Scheme/ContributionRewardExtRewarders/Competition/Card.tsx b/src/components/Scheme/ContributionRewardExtRewarders/Competition/Card.tsx index f8c4738be..5f7179f03 100644 --- a/src/components/Scheme/ContributionRewardExtRewarders/Competition/Card.tsx +++ b/src/components/Scheme/ContributionRewardExtRewarders/Competition/Card.tsx @@ -2,8 +2,8 @@ import AccountPopup from "components/Account/AccountPopup"; import AccountProfileName from "components/Account/AccountProfileName"; import { humanProposalTitle } from "lib/util"; import RewardsString from "components/Proposal/RewardsString"; -import { IProfileState } from "reducers/profilesReducer"; -import { IRootState } from "reducers"; +import { IProfileState } from "@store/profiles/profilesReducer"; +import { IRootState } from "@store"; import CountdownText from "components/Scheme/ContributionRewardExtRewarders/Competition/CountdownText"; import { connect } from "react-redux"; import { IDAOState, IProposalState } from "@daostack/arc.js"; diff --git a/src/components/Scheme/ContributionRewardExtRewarders/Competition/CreateProposal.tsx b/src/components/Scheme/ContributionRewardExtRewarders/Competition/CreateProposal.tsx index c680075e3..de7898509 100644 --- a/src/components/Scheme/ContributionRewardExtRewarders/Competition/CreateProposal.tsx +++ b/src/components/Scheme/ContributionRewardExtRewarders/Competition/CreateProposal.tsx @@ -1,5 +1,5 @@ import { IDAOState, ISchemeState, IProposalCreateOptionsCompetition } from "@daostack/arc.js"; -import * as arcActions from "actions/arcActions"; +import * as arcActions from "@store/arc/arcActions"; import { enableWalletProvider, getArc } from "arc"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; import { ErrorMessage, Field, Form, Formik, FormikProps } from "formik"; @@ -7,7 +7,7 @@ import { baseTokenName, supportedTokens, toBaseUnit, tokenDetails, toWei, isVali import * as React from "react"; import { connect } from "react-redux"; import Select from "react-select"; -import { showNotification, NotificationStatus } from "reducers/notifications"; +import { showNotification, NotificationStatus } from "@store/notifications/notifications.reducer"; import TagsSelector from "components/Proposal/Create/SchemeForms/TagsSelector"; import TrainingTooltip from "components/Shared/TrainingTooltip"; import * as css from "components/Proposal/Create/CreateProposal.scss"; diff --git a/src/components/Scheme/ContributionRewardExtRewarders/Competition/CreateSubmission.tsx b/src/components/Scheme/ContributionRewardExtRewarders/Competition/CreateSubmission.tsx index c34189120..f2ef00aa3 100644 --- a/src/components/Scheme/ContributionRewardExtRewarders/Competition/CreateSubmission.tsx +++ b/src/components/Scheme/ContributionRewardExtRewarders/Competition/CreateSubmission.tsx @@ -10,7 +10,7 @@ import UserSearchField from "components/Shared/UserSearchField"; import { ICreateSubmissionOptions } from "./utils"; import * as css from "./Competitions.scss"; import { exportUrl, importUrlValues } from "lib/proposalUtils"; -import { showNotification, NotificationStatus } from "reducers/notifications"; +import { showNotification, NotificationStatus } from "@store/notifications/notifications.reducer"; import { connect } from "react-redux"; interface IDispatchProps { diff --git a/src/components/Scheme/ContributionRewardExtRewarders/Competition/Details.tsx b/src/components/Scheme/ContributionRewardExtRewarders/Competition/Details.tsx index 2bdd0c4a9..d6428173d 100644 --- a/src/components/Scheme/ContributionRewardExtRewarders/Competition/Details.tsx +++ b/src/components/Scheme/ContributionRewardExtRewarders/Competition/Details.tsx @@ -1,10 +1,10 @@ -import { IRootState } from "reducers"; -import { IProfilesState } from "reducers/profilesReducer"; +import { IRootState } from "@store"; +import { IProfilesState } from "@store/profiles/profilesReducer"; import { humanProposalTitle, formatFriendlyDateForLocalTimezone, formatTokens, isAddress, getArcByDAOAddress, getNetworkByDAOAddress } from "lib/util"; import { schemeName } from "lib/schemeUtils"; import TagsSelector from "components/Proposal/Create/SchemeForms/TagsSelector"; import RewardsString from "components/Proposal/RewardsString"; -import { showNotification } from "reducers/notifications"; +import { showNotification } from "@store/notifications/notifications.reducer"; import { enableWalletProvider, getArc } from "arc"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; import AccountPopup from "components/Account/AccountPopup"; diff --git a/src/components/Scheme/ContributionRewardExtRewarders/Competition/SubmissionDetails.tsx b/src/components/Scheme/ContributionRewardExtRewarders/Competition/SubmissionDetails.tsx index a91ac3fae..ccfed7f90 100644 --- a/src/components/Scheme/ContributionRewardExtRewarders/Competition/SubmissionDetails.tsx +++ b/src/components/Scheme/ContributionRewardExtRewarders/Competition/SubmissionDetails.tsx @@ -4,12 +4,12 @@ import * as React from "react"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; import { ensureHttps, formatFriendlyDateForLocalTimezone, formatTokens, getArcByDAOAddress } from "lib/util"; -import { IRootState } from "reducers"; +import { IRootState } from "@store"; import { connect } from "react-redux"; import classNames from "classnames"; import AccountPopup from "components/Account/AccountPopup"; import AccountProfileName from "components/Account/AccountProfileName"; -import { IProfilesState } from "reducers/profilesReducer"; +import { IProfilesState } from "@store/profiles/profilesReducer"; import { combineLatest, of } from "rxjs"; import Tooltip from "rc-tooltip"; import TagsSelector from "components/Proposal/Create/SchemeForms/TagsSelector"; diff --git a/src/components/Scheme/ContributionRewardExtRewarders/Competition/utils.ts b/src/components/Scheme/ContributionRewardExtRewarders/Competition/utils.ts index c7e3ada25..a34b0905d 100644 --- a/src/components/Scheme/ContributionRewardExtRewarders/Competition/utils.ts +++ b/src/components/Scheme/ContributionRewardExtRewarders/Competition/utils.ts @@ -10,8 +10,8 @@ import { ThunkAction } from "redux-thunk"; import * as moment from "moment"; import { getArc } from "arc"; -import { operationNotifierObserver } from "actions/arcActions"; -import { IRootState } from "reducers"; +import { operationNotifierObserver } from "@store/arc/arcActions"; +import { IRootState } from "@store"; import { Observable, of } from "rxjs"; import { map, mergeMap, toArray, first } from "rxjs/operators"; import { GRAPH_POLL_INTERVAL } from "../../../../settings"; diff --git a/src/components/Scheme/ReputationFromToken.tsx b/src/components/Scheme/ReputationFromToken.tsx index 47f8b1ac9..7df12e905 100644 --- a/src/components/Scheme/ReputationFromToken.tsx +++ b/src/components/Scheme/ReputationFromToken.tsx @@ -5,8 +5,8 @@ import { getWeb3Provider, getArcSettings } from "arc"; import { soliditySHA3 } from "ethereumjs-abi"; import { parse } from "query-string"; import { RouteComponentProps } from "react-router-dom"; -import { NotificationStatus } from "reducers/notifications"; -import { redeemReputationFromToken } from "actions/arcActions"; +import { NotificationStatus } from "@store/notifications/notifications.reducer"; +import { redeemReputationFromToken } from "@store/arc/arcActions"; import { enableWalletProvider, getArc } from "arc"; import { ErrorMessage, Field, Form, Formik, FormikProps } from "formik"; import { fromWei, getArcByDAOAddress, getNetworkByDAOAddress } from "lib/util"; @@ -15,8 +15,8 @@ import * as React from "react"; import { BreadcrumbsItem } from "react-breadcrumbs-dynamic"; import * as Sticky from "react-stickynode"; import { connect } from "react-redux"; -import { IRootState } from "reducers"; -import { showNotification } from "reducers/notifications"; +import { IRootState } from "@store"; +import { showNotification } from "@store/notifications/notifications.reducer"; import * as schemeCss from "./Scheme.scss"; import * as css from "./ReputationFromToken.scss"; diff --git a/src/components/Scheme/SchemeContainer.tsx b/src/components/Scheme/SchemeContainer.tsx index 26de70c65..e3a47e112 100644 --- a/src/components/Scheme/SchemeContainer.tsx +++ b/src/components/Scheme/SchemeContainer.tsx @@ -11,8 +11,8 @@ import { BreadcrumbsItem } from "react-breadcrumbs-dynamic"; import { Helmet } from "react-helmet"; import { Link, Route, RouteComponentProps, Switch } from "react-router-dom"; import * as Sticky from "react-stickynode"; -import { showNotification } from "reducers/notifications"; -import { IRootState } from "reducers"; +import { showNotification } from "@store/notifications/notifications.reducer"; +import { IRootState } from "@store"; import { connect } from "react-redux"; import TrainingTooltip from "components/Shared/TrainingTooltip"; import { combineLatest, Observable, of } from "rxjs"; diff --git a/src/components/Scheme/SchemeProposalsPage.tsx b/src/components/Scheme/SchemeProposalsPage.tsx index 141541a97..96fa89346 100644 --- a/src/components/Scheme/SchemeProposalsPage.tsx +++ b/src/components/Scheme/SchemeProposalsPage.tsx @@ -14,7 +14,7 @@ import { Link } from "react-router-dom"; import { CSSTransition, TransitionGroup } from "react-transition-group"; import { Observable, combineLatest } from "rxjs"; import { connect } from "react-redux"; -import { showNotification } from "reducers/notifications"; +import { showNotification } from "@store/notifications/notifications.reducer"; import TrainingTooltip from "components/Shared/TrainingTooltip"; import ProposalCard from "../Proposal/ProposalCard"; import * as css from "./SchemeProposals.scss"; diff --git a/src/components/Shared/CopyToClipboard.tsx b/src/components/Shared/CopyToClipboard.tsx index a04463095..1466dda61 100644 --- a/src/components/Shared/CopyToClipboard.tsx +++ b/src/components/Shared/CopyToClipboard.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import { NotificationStatus, showNotification } from "reducers/notifications"; +import { NotificationStatus, showNotification } from "@store/notifications/notifications.reducer"; import * as css from "./CopyToClipboard.scss"; import { connect } from "react-redux"; import { copyToClipboard } from "lib/util"; diff --git a/src/components/Shared/FollowButton.tsx b/src/components/Shared/FollowButton.tsx index 49fa8d504..cdc77a7a0 100644 --- a/src/components/Shared/FollowButton.tsx +++ b/src/components/Shared/FollowButton.tsx @@ -1,13 +1,13 @@ -import { toggleFollow } from "actions/profilesActions"; +import { toggleFollow } from "@store/profiles/profilesActions"; import { enableWalletProvider } from "arc"; import classNames from "classnames"; import ThreeboxModal from "components/Shared/ThreeboxModal"; import Tooltip from "rc-tooltip"; import * as React from "react"; import { connect } from "react-redux"; -import { showNotification } from "reducers/notifications"; -import { IRootState } from "reducers"; -import { FollowType, IProfileState } from "reducers/profilesReducer"; +import { showNotification } from "@store/notifications/notifications.reducer"; +import { IRootState } from "@store"; +import { FollowType, IProfileState } from "@store/profiles/profilesReducer"; import { Networks } from "lib/util"; import * as css from "./FollowButton.scss"; diff --git a/src/components/Shared/PreTransactionModal.tsx b/src/components/Shared/PreTransactionModal.tsx index 90ec031fc..b8b79111e 100644 --- a/src/components/Shared/PreTransactionModal.tsx +++ b/src/components/Shared/PreTransactionModal.tsx @@ -13,8 +13,8 @@ import Tooltip from "rc-tooltip"; import * as React from "react"; import { connect } from "react-redux"; import { Modal } from "react-router-modal"; -import { showNotification } from "reducers/notifications"; -import { IProfileState } from "reducers/profilesReducer"; +import { showNotification } from "@store/notifications/notifications.reducer"; +import { IProfileState } from "@store/profiles/profilesReducer"; import * as css from "./PreTransactionModal.scss"; export enum ActionTypes { diff --git a/src/components/Shared/SimpleMessagePopup.tsx b/src/components/Shared/SimpleMessagePopup.tsx index 81bad6efb..af2ef0157 100644 --- a/src/components/Shared/SimpleMessagePopup.tsx +++ b/src/components/Shared/SimpleMessagePopup.tsx @@ -1,9 +1,9 @@ -import * as uiActions from "actions/uiActions"; +import * as uiActions from "@store/ui/uiActions"; import ModalPopup from "./ModalPopup"; import * as React from "react"; import * as css from "./SimpleMessagePopup.scss"; import { connect } from "react-redux"; -import { IRootState } from "reducers"; +import { IRootState } from "@store"; interface IDispatchProps { hideSimpleMessage: typeof uiActions.hideSimpleMessage; diff --git a/src/components/Shared/ThreeboxModal.tsx b/src/components/Shared/ThreeboxModal.tsx index 7258714f2..fc00dee08 100644 --- a/src/components/Shared/ThreeboxModal.tsx +++ b/src/components/Shared/ThreeboxModal.tsx @@ -1,7 +1,7 @@ import * as React from "react"; import { connect } from "react-redux"; import ModalPopup from "components/Shared/ModalPopup"; -import { showNotification } from "reducers/notifications"; +import { showNotification } from "@store/notifications/notifications.reducer"; import * as css from "./ThreeboxModal.scss"; interface IProps { diff --git a/src/components/Shared/TrainingTooltip.tsx b/src/components/Shared/TrainingTooltip.tsx index d48df2827..1b760ca26 100644 --- a/src/components/Shared/TrainingTooltip.tsx +++ b/src/components/Shared/TrainingTooltip.tsx @@ -1,7 +1,7 @@ import {default as Tooltip, RCTooltip} from "rc-tooltip"; import * as React from "react"; import "./TrainingTooltip.scss"; -import { IRootState } from "reducers"; +import { IRootState } from "@store"; import { connect } from "react-redux"; interface IAppStateProps { diff --git a/src/components/Shared/UserSearchField.tsx b/src/components/Shared/UserSearchField.tsx index 070541c8e..8eb521031 100644 --- a/src/components/Shared/UserSearchField.tsx +++ b/src/components/Shared/UserSearchField.tsx @@ -2,8 +2,8 @@ import { Member } from "@daostack/arc.js"; import * as React from "react"; import * as Autosuggest from "react-autosuggest"; import { connect } from "react-redux"; -import { IRootState } from "reducers"; -import { IProfilesState, IProfileState } from "reducers/profilesReducer"; +import { IRootState } from "@store"; +import { IProfilesState, IProfileState } from "@store/profiles/profilesReducer"; import { first } from "rxjs/operators"; import AccountImage from "components/Account/AccountImage"; import Loading from "components/Shared/Loading"; diff --git a/src/configureStore.ts b/src/configureStore.ts index 41be86a27..6b1e3d332 100644 --- a/src/configureStore.ts +++ b/src/configureStore.ts @@ -3,7 +3,7 @@ import { routerMiddleware } from "react-router-redux"; import { applyMiddleware, createStore } from "redux"; import { composeWithDevTools } from "redux-devtools-extension"; import thunkMiddleware from "redux-thunk"; -import reducers from "./reducers"; +import reducers from "@store"; export const history = createBrowserHistory(); diff --git a/src/layouts/AppContainer.tsx b/src/layouts/AppContainer.tsx index 05eb27ea2..b547dccb0 100644 --- a/src/layouts/AppContainer.tsx +++ b/src/layouts/AppContainer.tsx @@ -1,12 +1,12 @@ -import * as uiActions from "actions/uiActions"; -import { threeBoxLogout } from "actions/profilesActions"; -import { setCurrentAccount } from "actions/web3Actions"; +import * as uiActions from "@store/ui/uiActions"; +import { threeBoxLogout } from "@store/profiles/profilesActions"; +import { setCurrentAccount } from "@store/web3/web3Actions"; import Notification, { NotificationViewStatus } from "components/Notification/Notification"; import Analytics from "lib/analytics"; import Header from "layouts/Header"; import SidebarMenu from "layouts/SidebarMenu"; -import { IRootState } from "reducers"; -import { dismissNotification, INotificationsState, NotificationStatus, showNotification, INotification } from "reducers/notifications"; +import { IRootState } from "@store"; +import { dismissNotification, INotificationsState, NotificationStatus, showNotification, INotification } from "@store/notifications/notifications.reducer"; import { getCachedAccount, cacheWeb3Info, logout, pollForAccountChanges } from "arc"; import ErrorUncaught from "components/Errors/ErrorUncaught"; import { parse } from "query-string"; @@ -20,7 +20,7 @@ import { History } from "history"; import classNames from "classnames"; import { captureException, withScope } from "@sentry/browser"; import { Address } from "@daostack/arc.js"; -import { sortedNotifications } from "../selectors/notifications"; +import { sortedNotifications } from "@store/notifications/notifications"; import * as css from "./App.scss"; import SimpleMessagePopup, { ISimpleMessagePopupProps } from "components/Shared/SimpleMessagePopup"; import { initializeUtils, getNetworkName } from "lib/util"; diff --git a/src/layouts/Header.tsx b/src/layouts/Header.tsx index d82151c8a..8abfd88fb 100644 --- a/src/layouts/Header.tsx +++ b/src/layouts/Header.tsx @@ -1,14 +1,14 @@ -import * as uiActions from "actions/uiActions"; -import { threeBoxLogout } from "actions/profilesActions"; +import * as uiActions from "@store/ui/uiActions"; +import { threeBoxLogout } from "@store/profiles/profilesActions"; import { enableWalletProvider, getAccountIsEnabled, logout, getWeb3ProviderInfo, getWeb3Provider, providerHasConfigUi, getArcs } from "arc"; import AccountImage from "components/Account/AccountImage"; import AccountProfileName from "components/Account/AccountProfileName"; import RedemptionsButton from "components/Redemptions/RedemptionsButton"; import withSubscription, { ISubscriptionProps } from "components/Shared/withSubscription"; import CopyToClipboard from "components/Shared/CopyToClipboard"; -import { IRootState } from "reducers"; -import { showNotification } from "reducers/notifications"; -import { IProfileState } from "reducers/profilesReducer"; +import { IRootState } from "@store"; +import { showNotification } from "@store/notifications/notifications.reducer"; +import { IProfileState } from "@store/profiles/profilesReducer"; import TrainingTooltip from "components/Shared/TrainingTooltip"; import { parse } from "query-string"; import * as React from "react"; diff --git a/src/layouts/SidebarMenu.tsx b/src/layouts/SidebarMenu.tsx index 6e5480884..968a91e0d 100644 --- a/src/layouts/SidebarMenu.tsx +++ b/src/layouts/SidebarMenu.tsx @@ -1,5 +1,5 @@ import { IDAOState, Token } from "@daostack/arc.js"; -import { hideMenu } from "actions/uiActions"; +import { hideMenu } from "@store/ui/uiActions"; import TrainingTooltip from "components/Shared/TrainingTooltip"; import * as BN from "bn.js"; @@ -13,7 +13,7 @@ import { parse } from "query-string"; import * as React from "react"; import { matchPath, Link, RouteComponentProps } from "react-router-dom"; import { first } from "rxjs/operators"; -import { IRootState } from "reducers"; +import { IRootState } from "@store"; import { connect } from "react-redux"; import { of } from "rxjs"; diff --git a/webpack.base.config.js b/webpack.base.config.js index 7340800ed..937ced8cd 100644 --- a/webpack.base.config.js +++ b/webpack.base.config.js @@ -19,8 +19,8 @@ module.exports = { alias: { arc: resolve("src/arc"), - actions: resolve("src/actions"), components: resolve("src/components"), + "@store": resolve("src/@store"), constants: resolve("src/constants"), data: resolve("data"), genericSchemeRegistry: resolve("src/genericSchemeRegistry"), @@ -28,8 +28,6 @@ module.exports = { layouts: resolve("src/layouts"), lib: resolve("src/lib"), pages: resolve("src/pages"), - reducers: resolve("src/reducers"), - selectors: resolve("src/selectors"), src: resolve("src"), "ipfs-api": "ipfs-api/dist", "bn.js": "bn.js/lib/bn.js"