diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index a2f5908281d070150700378b64a84c7db1f97aa1..60a58f04998849ccc06bee3d815425b56e9052aa 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index 1b523998081149a985cef0cdf89045b9ed29964a..8cd388435b137a51382885201b70298bc1eb20fe 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index ff10afd6e182edb2b1a63c8f984e9070d9f950ba..eff217411edb2d56b60b74a3fca91b59e9e7ec2a 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index 115a4c768a20c9e13185c17043f4c4d12dd4632a..c5f6b286c1eac85b306780b8d8c50a7eb265e52d 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index dcd3cd8083358269d6ed7894726283bb9bcbbfea..d322d372fe96c4d62230203d2cd6852d41b2b3ee 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 459ca609d3ae0d3943ab44cdc27feef9256dc6d7..13535975369a4a221aa90829334ca7cc4f9329f5 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 8ca12fe024be86e868d14e91120a6902f8e88ac6..6a829cf030e5ddfd1fffd8a6c4f98b55edfe7c7e 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 8e19b410a1b15ff180f3dacac19395fe3046cdec..d43ac8e33e64ed9b2c856891e19ce8b972b53d99 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index b824ebdd48db917eea2e67a82260a100371f8a24..87b0824fe93beafab3b7bb289652b49423b09900 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 4c19a13c239cb67b8a2134ddd5f325db1d2d5bee..27346833172e61e05ba1f3fd2a4160df6f683ecc 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/src/config/index.ts b/src/config/index.ts new file mode 100644 index 0000000000000000000000000000000000000000..6d2ebe0059f3b31862ac76dd3e012cbb7ff13ac4 --- /dev/null +++ b/src/config/index.ts @@ -0,0 +1,8 @@ +export default { + apiEndpoint: 'https://meu.anawork.com/api/', + //apiEndpoint: 'https://gateway.dev.meu-solutions.com/techport/api/', + imageEndPoint: 'https://techmart.meu-solutions.com', + siteURL: 'https://saigon-business.erp.meu-solutions.com', + ONE_SIGNAL_KEY: '6f4f8bd1-9b43-4067-8175-c0052140e891', + axiosTimeout: 10000, +}; diff --git a/src/network/ApiService.js b/src/network/ApiService.js index 6ce42840954c476ea5ad1b4f62522229778fac56..2c1d85fddc81e1c899ad0544f92c02a2411ef16e 100644 --- a/src/network/ApiService.js +++ b/src/network/ApiService.js @@ -8,9 +8,7 @@ import {ToastMessage} from '../utils/MessageUtil'; import api from './axios'; const createAPI = () => { - // const APIInstant = require('axios').default.create() const APIInstant = require('axios').default.create(); - //console.log('createAPI', api.getBaseURL()); APIInstant.defaults.baseURL = api.getBaseURL(); APIInstant.defaults.timeout = 40000; APIInstant.defaults.headers = {'Content-Type': 'application/json'}; diff --git a/src/network/axios.js b/src/network/axios.js index 2729781f36136585ca926dc2b1281037cb8bdc47..28e617d0c139c5d5b24ad37e0602e5357ff45ddb 100644 --- a/src/network/axios.js +++ b/src/network/axios.js @@ -1,23 +1,10 @@ -import {create, isCancel} from 'apisauce'; +import {create} from 'apisauce'; import {Platform} from 'react-native'; -import SInfo from 'react-native-sensitive-info'; -const rax = require('retry-axios'); +import config from '../config'; const api = create({ - baseURL: '', + baseURL: config.apiEndpoint, timeout: Platform.OS === 'ios' ? 6000 : 2500, }); -SInfo.getItem('token', { - sharedPreferencesName: 'token', - keychainService: 'myToken', -}).then(value => { - api.setHeader('Authorization', `Bearer ${value}`); -}); -SInfo.getItem('domain', { - sharedPreferencesName: 'domain', - keychainService: 'myDomain', -}).then(value => { - api.setBaseURL(value); -}); export default api; diff --git a/src/screens/authentication/introduction/IntroductionContainer.js b/src/screens/authentication/introduction/IntroductionContainer.js index 8f2f465dac47c3229255c997ede0977dc2fe6539..08377f9dbe3217cbfe77559b29caeef2cccb0955 100644 --- a/src/screens/authentication/introduction/IntroductionContainer.js +++ b/src/screens/authentication/introduction/IntroductionContainer.js @@ -44,7 +44,7 @@ const IntroductionContainer = props => { } }; const navigateToDomain = () => { - RootNavigation.navigate(APP_NAVIGATE_SCREEN.SERVER) + RootNavigation.navigate(APP_NAVIGATE_SCREEN.LOGIN) } const introProps = { indexSwiper,