Skip to content
This repository was archived by the owner on Dec 1, 2020. It is now read-only.

Commit 142313c

Browse files
author
Chutiphon.k
committed
Merge branch 'dev'
2 parents f2d2359 + 38e1efb commit 142313c

108 files changed

Lines changed: 3286 additions & 1975 deletions

File tree

Some content is hidden

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

‎app/ITimer/config.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const config = {
2-
host: 'http://localhost:9090'
2+
API: 'http://localhost:9090/api',
3+
SOCKET: 'http://localhost:9090'
34
}
45

56
export default config

‎app/ITimer/ios/ITimer.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@
14001400
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
14011401
GCC_WARN_UNUSED_FUNCTION = YES;
14021402
GCC_WARN_UNUSED_VARIABLE = YES;
1403-
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
1403+
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
14041404
MTL_ENABLE_DEBUG_INFO = YES;
14051405
ONLY_ACTIVE_ARCH = YES;
14061406
SDKROOT = iphoneos;
@@ -1438,7 +1438,7 @@
14381438
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
14391439
GCC_WARN_UNUSED_FUNCTION = YES;
14401440
GCC_WARN_UNUSED_VARIABLE = YES;
1441-
IPHONEOS_DEPLOYMENT_TARGET = 10.2;
1441+
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
14421442
MTL_ENABLE_DEBUG_INFO = NO;
14431443
SDKROOT = iphoneos;
14441444
VALIDATE_PRODUCT = YES;

‎app/ITimer/package.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"test": "jest"
88
},
99
"dependencies": {
10+
"add": "^2.0.6",
1011
"axios": "^0.15.3",
1112
"babel-preset-react-native-stage-0": "^1.0.1",
1213
"babel-preset-stage-0": "^6.22.0",
@@ -17,12 +18,14 @@
1718
"react-native-background-timer": "^1.0.0",
1819
"react-native-chart": "^1.0.8-beta",
1920
"react-native-modalbox": "^1.3.9",
21+
"react-native-responsive-dimensions": "^1.0.1",
2022
"react-native-router-flux": "^3.37.0",
2123
"react-redux": "^5.0.2",
2224
"redux": "^3.6.0",
2325
"redux-form": "^6.5.0",
2426
"redux-thunk": "^2.2.0",
25-
"socket.io-client": "^1.7.2"
27+
"socket.io-client": "^1.7.2",
28+
"yarn": "^0.22.0"
2629
},
2730
"devDependencies": {
2831
"babel-jest": "18.0.0",

‎app/ITimer/src/actions/competitions/getCompetitions.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const requestFail = (error) => {
2323
export default () => {
2424
return (dispatch) => {
2525
dispatch(requestFetch())
26-
const io = socket(config.host, {jsonp: false})
26+
const io = socket(config.SOCKET, {jsonp: false})
2727
io.on('competitions', (response) => {
2828
dispatch(requestSuccess(response))
2929
})

‎app/ITimer/src/actions/competitions/resetCompetitions.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const requestFailure = (err) => ({
1717

1818
export default () => dispatch => {
1919
dispatch(requestStart())
20-
axios.delete(`${config.host}/competitions`)
20+
axios.delete(`${config.API}/competitions`)
2121
.then((res) => {
2222
dispatch(requestSuccess(res))
2323
})

‎app/ITimer/src/actions/histories/getHistoriesByUserId.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const requestFailure = (err) => ({
1717

1818
export default (id) => dispatch => {
1919
dispatch(requestStart())
20-
axios.get(`${config.host}/users/${id}/histories`)
20+
axios.get(`${config.API}/users/${id}/histories`)
2121
.then((res) => {
2222
dispatch(requestSuccess(res))
2323
})

‎app/ITimer/src/actions/setting/getWifi.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const requestFailure = (err) => ({
1717

1818
export default () => dispatch => {
1919
dispatch(requestStart())
20-
axios.get(`${config.host}/wifi`)
20+
axios.get(`${config.API}/wifi`)
2121
.then((res) => {
2222
dispatch(requestSuccess(res))
2323
})

‎app/ITimer/src/actions/setting/postWifi.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const requestFailure = (err) => ({
1818

1919
export default (value) => dispatch => {
2020
dispatch(requestStart())
21-
axios.post(`${config.host}/wifi`, value)
21+
axios.post(`${config.API}/wifi`, value)
2222
.then((res) => {
2323
dispatch(requestSuccess(res))
2424
})

‎app/ITimer/src/actions/timers/getTimer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const requestFail = (error) => {
2323
export default () => {
2424
return (dispatch) => {
2525
dispatch(requestFetch())
26-
const io = socket(config.host, { jsonp: false })
26+
const io = socket(config.SOCKET, { jsonp: false })
2727
io.on('timer', (response) => {
2828
dispatch(requestSuccess(response))
2929
})

‎app/ITimer/src/actions/timers/setupTimer.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const requestFailure = (err) => ({
1717

1818
export default (value) => dispatch => {
1919
dispatch(requestStart())
20-
axios.post(`${config.host}/timers`, value)
20+
axios.post(`${config.API}/timers`, value)
2121
.then((res) => {
2222
dispatch(requestSuccess(res))
2323
})

0 commit comments

Comments
 (0)