Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: #48 resolve conflict
Browse files Browse the repository at this point in the history
vuhuucuong committed Feb 12, 2020
1 parent 115163e commit ecc9fb8
Showing 25 changed files with 26 additions and 18 deletions.
1 change: 1 addition & 0 deletions packages/aml-checklist/src/sagas/auth.ts
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@ import ActionTypes from '@/constants/action-types'
import { authLoginSuccess, authLoginFailure } from '@/actions/auth'
import { LoginParams, LoginSession, setUserSession, removeSession, redirectToLogout } from '@reapit/cognito-auth'
import { COOKIE_SESSION_KEY_AML_APP } from '../constants/api'
import { logger } from 'logger'

export const doLogin = function*({ data }: Action<LoginParams>) {
try {
1 change: 1 addition & 0 deletions packages/aml-checklist/src/sagas/result.ts
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ import { resultReceiveData, resultRequestDataFailure, ContactsParams } from '@/a
import { queryParams } from '@/utils/query-params'
import { CONTACTS_PER_PAGE } from '@/constants/paginator'
import { initAuthorizedRequestHeaders } from '@/utils/api'
import { logger } from 'logger'

export const resultFetch = function*(params: Action<ContactsParams>) {
try {
2 changes: 1 addition & 1 deletion packages/aml-checklist/src/tests/badges/badge-branches.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/aml-checklist/src/tests/badges/badge-lines.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/geo-diary/src/sagas/auth.ts
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@ import { authLoginSuccess, authLoginFailure } from '@/actions/auth'
import { LoginParams, LoginSession, setUserSession, removeSession, redirectToLogout } from '@reapit/cognito-auth'
import { COOKIE_SESSION_KEY_GEO_DIARY } from '../constants/api'
import store from '@/core/store'
import { logger } from 'logger'

export const doLogin = function*({ data }: Action<LoginParams>) {
try {
2 changes: 1 addition & 1 deletion packages/geo-diary/src/sagas/next-appointment.ts
Original file line number Diff line number Diff line change
@@ -102,7 +102,7 @@ export const validateNextAppointment = function*({ data: travelMode }: Action<st
)
}
} catch (err) {
console.error(err.message)
logger(err)
yield put(nextAppointmentClear())
}
} else {
2 changes: 1 addition & 1 deletion packages/geo-diary/src/tests/badges/badge-branches.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/geo-diary/src/tests/badges/badge-functions.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/geo-diary/src/tests/badges/badge-lines.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/geo-diary/src/tests/badges/badge-statements.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/lifetime-legal/src/sagas/auth.ts
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@ import ActionTypes from '@/constants/action-types'
import { authLoginSuccess, authLoginFailure } from '@/actions/auth'
import { LoginSession, LoginParams, setUserSession, removeSession, redirectToLogout } from '@reapit/cognito-auth'
import { COOKIE_SESSION_KEY_LTL_APP } from '../constants/api'
import { logger } from 'logger'

export const doLogin = function*({ data }: Action<LoginParams>) {
try {
1 change: 1 addition & 0 deletions packages/lifetime-legal/src/sagas/results.ts
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@ import { Action } from '@/types/core'
import { resultReceiveData, resultRequestDataFailure, ContactsParams } from '@/actions/results'
import { initAuthorizedRequestHeaders } from '@/utils/api'
import { fetchContacts } from './api'
import { logger } from 'logger'

export const resultFetch = function*(params: Action<ContactsParams>) {
try {
Loading

0 comments on commit ecc9fb8

Please sign in to comment.