Skip to content

Commit b893d1a

Browse files
committed
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
1 parent ac7c940 commit b893d1a

File tree

70 files changed

+162
-139
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+162
-139
lines changed

package.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,14 @@
3535
"moduleNameMapper": {
3636
"\\.(scss|css|less|svg|png|jpg)$": "identity-obj-proxy",
3737
"^arc": "<rootDir>/src/arc",
38-
"^actions/(.*)$": "<rootDir>/src/actions/$1",
3938
"^components(.*)$": "<rootDir>/src/components$1",
39+
"^@store(.*)$": "<rootDir>/src/@store$1",
4040
"^data/(.*)$": "<rootDir>/data/$1",
4141
"^genericSchemeRegistry(.*)$": "<rootDir>/src/genericSchemeRegistry$1",
4242
"^crxRegistry(.*)$": "<rootDir>/src/crxRegistry$1",
4343
"^layouts/(.*)$": "<rootDir>/src/layouts/$1",
4444
"^lib/(.*)$": "<rootDir>/src/lib/$1",
4545
"^pages": "<rootDir>/src/pages",
46-
"^reducers/(.*)$": "<rootDir>/src/reducers/$1",
47-
"^selectors/(.*)$": "<rootDir>/src/selectors/$1",
4846
"^src/(.*)$": "<rootDir>/src/$1"
4947
},
5048
"setupFiles": [

src/actions/arcActions.ts renamed to src/@store/arc/arcActions.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { Address, DAO, IProposalCreateOptions, IProposalOutcome, ITransactionState, ITransactionUpdate, ReputationFromTokenScheme, Scheme } from "@daostack/arc.js";
2-
import { IAsyncAction } from "actions/async";
2+
import { IAsyncAction } from "@store/async";
33
import { toWei, getArcByDAOAddress } from "lib/util";
44
import { IRedemptionState } from "lib/proposalHelpers";
5-
import { IRootState } from "reducers/index";
6-
import { NotificationStatus, showNotification } from "reducers/notifications";
5+
import { IRootState } from "@store/index";
6+
import { NotificationStatus, showNotification } from "@store/notifications/notifications.reducer";
77
import * as Redux from "redux";
88
import { ThunkAction } from "redux-thunk";
99

File renamed without changes.

src/reducers/index.ts renamed to src/@store/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { routerReducer } from "react-router-redux";
22
import { combineReducers } from "redux";
3-
import { INotificationsState, notificationsReducer } from "./notifications";
4-
import profilesReducer, { IProfilesState } from "./profilesReducer";
5-
import uiReducer, { IUIState } from "./uiReducer";
6-
import web3Reducer, { IWeb3State } from "./web3Reducer";
3+
import { INotificationsState, notificationsReducer } from "@store/notifications/notifications.reducer";
4+
import profilesReducer, { IProfilesState } from "@store/profiles/profilesReducer";
5+
import uiReducer, { IUIState } from "@store/ui/uiReducer";
6+
import web3Reducer, { IWeb3State } from "@store/web3/web3Reducer";
77

88
export interface IRootState {
99
notifications: INotificationsState;
File renamed without changes.

src/selectors/notifications.ts renamed to src/@store/notifications/notifications.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { INotificationsState, INotification } from "reducers/notifications";
1+
import { INotificationsState, INotification } from "@store/notifications/notifications.reducer";
22
import { createSelector } from "reselect";
3-
import { IRootState } from "../reducers";
3+
import { IRootState } from "@store/index";
44

55
const notifications = (state: IRootState): INotificationsState => state.notifications;
66

src/actions/profilesActions.ts renamed to src/@store/profiles/profilesActions.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import * as Box from "3box";
22

3-
import { AsyncActionSequence, IAsyncAction } from "actions/async";
3+
import { AsyncActionSequence, IAsyncAction } from "@store/async";
44
import { getWeb3Provider } from "arc";
55
import Analytics from "lib/analytics";
66

7-
import { NotificationStatus, showNotification } from "reducers/notifications";
8-
import { ActionTypes, FollowType, newProfile } from "reducers/profilesReducer";
7+
import { NotificationStatus, showNotification } from "@store/notifications/notifications.reducer";
8+
import { ActionTypes, FollowType, newProfile } from "@store/profiles/profilesReducer";
99
import { arrayRemove } from "lib/util";
1010

1111
// Load account profile data from our database for all the "members" of the DAO

src/reducers/profilesReducer.ts renamed to src/@store/profiles/profilesReducer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as update from "immutability-helper";
22

3-
import { AsyncActionSequence } from "actions/async";
3+
import { AsyncActionSequence } from "@store/async";
44

55
export enum ActionTypes {
66
GET_PROFILE_DATA = "GET_PROFILE_DATA",

src/actions/uiActions.ts renamed to src/@store/ui/uiActions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as Redux from "redux";
22

3-
import { IRootState } from "reducers";
4-
import { ActionTypes } from "reducers/uiReducer";
3+
import { IRootState } from "@store/index";
4+
import { ActionTypes } from "@store/ui/uiReducer";
55
import { ISimpleMessagePopupProps } from "components/Shared/SimpleMessagePopup";
66

77
export function showTour() {
File renamed without changes.

0 commit comments

Comments
 (0)