|
|
@ -10,11 +10,8 @@ import { |
|
|
|
UserGroupState, |
|
|
|
UserGroupState, |
|
|
|
GroupState, |
|
|
|
GroupState, |
|
|
|
MainGroupData, |
|
|
|
MainGroupData, |
|
|
|
<<<<<<< HEAD |
|
|
|
SelectData, |
|
|
|
SelectData |
|
|
|
|
|
|
|
======= |
|
|
|
|
|
|
|
SelectGroupData |
|
|
|
SelectGroupData |
|
|
|
>>>>>>> c23747b2de282357d7d8522636559c3d986c93e1 |
|
|
|
|
|
|
|
} from '../models/basisGroupModel'; |
|
|
|
} from '../models/basisGroupModel'; |
|
|
|
|
|
|
|
|
|
|
|
//# 나의 그룹 목록 조회
|
|
|
|
//# 나의 그룹 목록 조회
|
|
|
@ -106,13 +103,12 @@ const GROUP_MAIN_LIST_REQUEST = 'basis/group/GROUP_MAIN_LIST_REQUEST'; |
|
|
|
const GROUP_MAIN_LIST_SUCCESS = 'basis/group/GROUP_MAIN_LIST_SUCCESS'; |
|
|
|
const GROUP_MAIN_LIST_SUCCESS = 'basis/group/GROUP_MAIN_LIST_SUCCESS'; |
|
|
|
const GROUP_MAIN_LIST_FAILURE = 'basis/group/GROUP_MAIN_LIST_FAILURE'; |
|
|
|
const GROUP_MAIN_LIST_FAILURE = 'basis/group/GROUP_MAIN_LIST_FAILURE'; |
|
|
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
|
|
|
//그룹 선택
|
|
|
|
//그룹 선택
|
|
|
|
const SELECT_GROUP = 'basis/group/SELECT_GROUP'; |
|
|
|
const SELECT_GROUP = 'basis/group/SELECT_GROUP'; |
|
|
|
======= |
|
|
|
|
|
|
|
//# 그룹 선택
|
|
|
|
//# 그룹 선택
|
|
|
|
const ROUP_SELECT = 'basis/group/select'; |
|
|
|
const ROUP_SELECT = 'basis/group/select'; |
|
|
|
>>>>>>> c23747b2de282357d7d8522636559c3d986c93e1 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
export const MY_LIST = createAsyncAction( |
|
|
|
export const MY_LIST = createAsyncAction( |
|
|
|
MY_LIST_REQUEST, |
|
|
|
MY_LIST_REQUEST, |
|
|
@ -220,11 +216,9 @@ export const USER_DELEGATE = createAsyncAction( |
|
|
|
USER_DELEGATE_FAILURE |
|
|
|
USER_DELEGATE_FAILURE |
|
|
|
)<UserGroupState, string, AxiosError>(); |
|
|
|
)<UserGroupState, string, AxiosError>(); |
|
|
|
|
|
|
|
|
|
|
|
<<<<<<< HEAD |
|
|
|
|
|
|
|
export const SELECT = createAction(SELECT_GROUP)<SelectData>(); |
|
|
|
export const SELECT = createAction(SELECT_GROUP)<SelectData>(); |
|
|
|
======= |
|
|
|
|
|
|
|
export const USER_GROUP_SELECT = createAction(ROUP_SELECT)<SelectGroupData>(); |
|
|
|
|
|
|
|
>>>>>>> c23747b2de282357d7d8522636559c3d986c93e1 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
const actions = { |
|
|
|
const actions = { |
|
|
|
MY_LIST, |
|
|
|
MY_LIST, |
|
|
@ -245,11 +239,7 @@ const actions = { |
|
|
|
USER_DELEGATE, |
|
|
|
USER_DELEGATE, |
|
|
|
GROUP_MYLIST, |
|
|
|
GROUP_MYLIST, |
|
|
|
GROUP_MAIN_LIST, |
|
|
|
GROUP_MAIN_LIST, |
|
|
|
<<<<<<< HEAD |
|
|
|
|
|
|
|
SELECT |
|
|
|
SELECT |
|
|
|
======= |
|
|
|
|
|
|
|
USER_GROUP_SELECT |
|
|
|
|
|
|
|
>>>>>>> c23747b2de282357d7d8522636559c3d986c93e1 |
|
|
|
|
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|