Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Santhosh
Agile24X7-Mobile-singledb
Commits
5c4c2cc0
Commit
5c4c2cc0
authored
3 years ago
by
santhosh
Browse files
Options
Download
Email Patches
Plain Diff
build
parent
07cc5533
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
src/CommonComponents/AdminChatUser.js
+6
-7
src/CommonComponents/AdminChatUser.js
src/CommonComponents/GroupChat.js
+3
-4
src/CommonComponents/GroupChat.js
src/CommonComponents/TaskChat.js
+3
-4
src/CommonComponents/TaskChat.js
src/CommonComponents/UserChat.js
+3
-4
src/CommonComponents/UserChat.js
src/LaunchScreens/Support.js
+3
-3
src/LaunchScreens/Support.js
src/UserComponents/UserGroupChat.js
+5
-6
src/UserComponents/UserGroupChat.js
src/UserComponents/UserSupport.js
+3
-3
src/UserComponents/UserSupport.js
src/WebServices/RestClient.js
+10
-6
src/WebServices/RestClient.js
with
36 additions
and
37 deletions
+36
-37
src/CommonComponents/AdminChatUser.js
View file @
5c4c2cc0
...
...
@@ -28,7 +28,7 @@ import AsyncStorage from '@react-native-community/async-storage';
import
{
Title
,
Container
,
Content
,
Header
,
Right
,
Left
,
Body
,
Tab
,
Tabs
,
TabHeading
,
Footer
,
Item
,
Input
,
FooterTab
,
Subtitle
}
from
'
native-base
'
;
import
moment
from
"
moment
"
;
import
NetInfo
from
'
@react-native-community/netinfo
'
;
import
{
API
}
from
"
../WebServices/RestClient
"
;
import
{
API
,
CHATAPI
}
from
"
../WebServices/RestClient
"
;
import
log
from
'
../LogFile/Log
'
;
import
{
launchCamera
,
launchImageLibrary
}
from
'
react-native-image-picker
'
;
...
...
@@ -355,13 +355,12 @@ export default class AdminChatUser extends Component {
data
.
append
(
'
sendBy
'
,
userToken
)
data
.
append
(
'
receivedBy
'
,
this
.
props
.
navigation
.
state
.
params
.
empId
)
data
.
append
(
'
messagedBy
'
,
userToken
)
data
.
append
(
'
api
'
,
'
https://api-single.agile24x7.com/release
'
)
data
.
append
(
'
api
'
,
CHATAPI
)
data
.
append
(
'
reply_id
'
,
this
.
state
.
commentDetails
.
id
?
this
.
state
.
commentDetails
.
id
:
""
)
let
res1
=
await
fetch
(
'
https://api-single.agile24x7.com/release/squad_send_file.php
'
,
let
res1
=
await
fetch
(
API
+
'
squad_send_file.php
'
,
{
method
:
'
post
'
,
body
:
data
,
...
...
@@ -467,7 +466,7 @@ export default class AdminChatUser extends Component {
<
View
style
=
{[
styles
.
itemReply
,
itemStyleReply
]}
>
<
View
style
=
{{
padding
:
5
,
}}
>
{
itemStyle
===
styles
.
itemOut
?
<
View
style
=
{{
flexDirection
:
'
row
'
}}
><
Text
style
=
{{
fontSize
:
12
,
color
:
'
orange
'
}}
>
{
item
.
reply_username
}
<
/Text></
View
>
:
<
View
style
=
{{
flexDirection
:
'
row
'
}}
><
Text
style
=
{{
fontSize
:
12
,
color
:
'
blue
'
}}
>
{
item
.
username
}
<
/Text></
View
>
}
{
item
.
reply_path
!==
""
?
<
Image
source
=
{{
uri
:
item
.
reply_path
}}
style
=
{{
width
:
210
,
height
:
50
}}
/> : null
}
{
item
.
reply_path
!==
null
?
<
Image
source
=
{{
uri
:
item
.
reply_path
}}
style
=
{{
width
:
210
,
height
:
50
}}
/> : null
}
<
Text
style
=
{{
width
:
210
}}
selectable
=
{
true
}
key
=
{
Math
.
random
()}
>
{
item
.
reply_message
}
<
/Text
>
{
!
inMessage
&&
this
.
renderDate
(
moment
(
item
.
messagedTime
).
format
(
'
MM.DD.YYYY hh:mm:ss
'
))}
...
...
@@ -477,7 +476,7 @@ export default class AdminChatUser extends Component {
<
View
style
=
{[
styles
.
itemown
,
itemStyle
]}
>
<
View
style
=
{{
padding
:
5
,
}}
>
{
itemStyle
===
styles
.
itemOut
?
<
View
style
=
{{
flexDirection
:
'
row
'
}}
><
Text
style
=
{{
fontSize
:
12
,
color
:
'
orange
'
}}
>
{
item
.
username
}
<
/Text><TouchableOpacity onPress={
()
=> this.handlecom
(
item
)
} ><Icon color={'#C0C0C0'} size=
{25}
style={{ marginLeft: 10 }} name="reply" /
><
/TouchableOpacity></
View
>
:
<
View
style
=
{{
flexDirection
:
'
row
'
}}
><
Text
style
=
{{
fontSize
:
12
,
color
:
'
blue
'
}}
>
{
item
.
username
}
<
/Text><TouchableOpacity onPress={
()
=> this.handlecom
(
item
)
} ><Icon color={'#C0C0C0'} size=
{25}
style={{ marginLeft: 10 }} name="reply" /
><
/TouchableOpacity></
View
>
}
{
item
.
path
!==
""
?
<
Image
source
=
{{
uri
:
item
.
path
}}
style
=
{
styles
.
imageview
}
/> : null
}
{
item
.
path
!==
null
?
<
Image
source
=
{{
uri
:
item
.
path
}}
style
=
{
styles
.
imageview
}
/> : null
}
<
Text
style
=
{{
width
:
210
}}
selectable
=
{
true
}
key
=
{
Math
.
random
()}
>
{
item
.
message
}
<
/Text
>
{
!
inMessage
&&
this
.
renderDate
(
moment
(
item
.
messagedTime
).
format
(
'
MM.DD.YYYY hh:mm:ss
'
))}
{
inMessage
&&
this
.
renderDate
(
moment
(
item
.
messagedTime
).
format
(
'
MM.DD.YYYY hh:mm:ss
'
))}
...
...
@@ -488,7 +487,7 @@ export default class AdminChatUser extends Component {
<
View
style
=
{[
styles
.
itemSingle
,
itemStyleSingle
]}
>
<
View
style
=
{{
padding
:
5
,
}}
>
{
itemStyle
===
styles
.
itemOut
?
<
View
style
=
{{
flexDirection
:
'
row
'
}}
><
Text
style
=
{{
fontSize
:
12
,
color
:
'
orange
'
}}
>
{
item
.
username
}
<
/Text><TouchableOpacity onPress={
()
=> this.handlecom
(
item
)
} ><Icon color={'#C0C0C0'} size=
{25}
style={{ marginLeft: 10 }} name="reply" /
><
/TouchableOpacity></
View
>
:
<
View
style
=
{{
flexDirection
:
'
row
'
}}
><
Text
style
=
{{
fontSize
:
12
,
color
:
'
blue
'
}}
>
{
item
.
username
}
<
/Text><TouchableOpacity onPress={
()
=> this.handlecom
(
item
)
} ><Icon color={'#C0C0C0'} size=
{25}
style={{ marginLeft: 10 }} name="reply" /
><
/TouchableOpacity></
View
>
}
{
item
.
path
!==
""
?
<
Image
source
=
{{
uri
:
item
.
path
}}
style
=
{
styles
.
imageview
}
/> : null
}
{
item
.
path
!==
null
?
<
Image
source
=
{{
uri
:
item
.
path
}}
style
=
{
styles
.
imageview
}
/> : null
}
<
Text
style
=
{{
width
:
210
}}
selectable
=
{
true
}
key
=
{
Math
.
random
()}
>
{
item
.
message
}
<
/Text
>
{
!
inMessage
&&
this
.
renderDate
(
moment
(
item
.
messagedTime
).
format
(
'
MM.DD.YYYY hh:mm:ss
'
))}
{
inMessage
&&
this
.
renderDate
(
moment
(
item
.
messagedTime
).
format
(
'
MM.DD.YYYY hh:mm:ss
'
))}
...
...
This diff is collapsed.
Click to expand it.
src/CommonComponents/GroupChat.js
View file @
5c4c2cc0
...
...
@@ -28,7 +28,7 @@ import AsyncStorage from '@react-native-community/async-storage';
import
{
Title
,
Container
,
Content
,
Header
,
Right
,
Left
,
Body
,
Tab
,
Tabs
,
TabHeading
,
Footer
,
Item
,
Input
,
FooterTab
,
Subtitle
}
from
'
native-base
'
;
import
NetInfo
from
'
@react-native-community/netinfo
'
;
import
{
API
}
from
"
../WebServices/RestClient
"
;
import
{
API
,
CHATAPI
}
from
"
../WebServices/RestClient
"
;
import
log
from
'
../LogFile/Log
'
;
import
{
EMPLOYEEID
}
from
'
./Header
'
;
...
...
@@ -706,15 +706,14 @@ export default class GroupChat extends Component {
data
.
append
(
'
corp_code
'
,
cropcode
)
data
.
append
(
'
groupId
'
,
groupId
)
data
.
append
(
'
messagedBy
'
,
userToken
)
data
.
append
(
'
api
'
,
'
https://api-single.agile24x7.com/release
'
)
data
.
append
(
'
api
'
,
CHATAPI
)
data
.
append
(
'
groupName
'
,
this
.
state
.
groupName
);
data
.
append
(
'
groupEmail
'
,
this
.
state
.
members_email
);
data
.
append
(
'
reply_id
'
,
this
.
state
.
commentDetails
.
id
?
this
.
state
.
commentDetails
.
id
:
""
)
let
res1
=
await
fetch
(
'
https://api-single.agile24x7.com/release/group_chat1.php
'
,
let
res1
=
await
fetch
(
API
+
'
group_chat1.php
'
,
{
method
:
'
post
'
,
body
:
data
,
...
...
This diff is collapsed.
Click to expand it.
src/CommonComponents/TaskChat.js
View file @
5c4c2cc0
...
...
@@ -28,7 +28,7 @@ import AsyncStorage from '@react-native-community/async-storage';
import
{
Title
,
Container
,
Content
,
Header
,
Right
,
Left
,
Body
,
Tab
,
Tabs
,
TabHeading
,
Footer
,
Item
,
Input
,
FooterTab
,
Subtitle
}
from
'
native-base
'
;
import
NetInfo
from
'
@react-native-community/netinfo
'
;
import
{
API
}
from
"
../WebServices/RestClient
"
;
import
{
API
,
CHATAPI
}
from
"
../WebServices/RestClient
"
;
import
log
from
'
../LogFile/Log
'
;
import
{
EMPLOYEEID
}
from
'
./Header
'
;
import
moment
from
"
moment
"
;
...
...
@@ -698,15 +698,14 @@ export default class TaskChat extends Component {
data
.
append
(
'
corp_code
'
,
cropcode
)
data
.
append
(
'
groupId
'
,
groupId
)
data
.
append
(
'
messagedBy
'
,
userToken
)
data
.
append
(
'
api
'
,
'
https://api-single.agile24x7.com/release
'
)
data
.
append
(
'
api
'
,
CHATAPI
)
data
.
append
(
'
groupName
'
,
this
.
state
.
groupName
);
data
.
append
(
'
groupEmail
'
,
this
.
state
.
members_email
);
data
.
append
(
'
reply_id
'
,
this
.
state
.
commentDetails
.
id
?
this
.
state
.
commentDetails
.
id
:
""
)
let
res1
=
await
fetch
(
'
https://api-single.agile24x7.com/release/user_story_chat1.php
'
,
let
res1
=
await
fetch
(
API
+
'
user_story_chat1.php
'
,
{
method
:
'
post
'
,
body
:
data
,
...
...
This diff is collapsed.
Click to expand it.
src/CommonComponents/UserChat.js
View file @
5c4c2cc0
...
...
@@ -28,7 +28,7 @@ import AsyncStorage from '@react-native-community/async-storage';
import
{
Title
,
Container
,
Content
,
Header
,
Right
,
Left
,
Body
,
Tab
,
Tabs
,
TabHeading
,
Footer
,
Item
,
Input
,
FooterTab
,
Subtitle
}
from
'
native-base
'
;
import
moment
from
"
moment
"
;
import
NetInfo
from
'
@react-native-community/netinfo
'
;
import
{
API
}
from
"
../WebServices/RestClient
"
;
import
{
API
,
CHATAPI
}
from
"
../WebServices/RestClient
"
;
import
log
from
'
../LogFile/Log
'
;
import
{
launchCamera
,
launchImageLibrary
}
from
'
react-native-image-picker
'
;
...
...
@@ -295,15 +295,14 @@ export default class UserChat extends Component {
data
.
append
(
'
corp_code
'
,
cropcode
)
data
.
append
(
'
projectId
'
,
projectId
)
data
.
append
(
'
messagedBy
'
,
userToken
)
data
.
append
(
'
api
'
,
'
https://api-single.agile24x7.com/release
'
)
data
.
append
(
'
api
'
,
CHATAPI
)
data
.
append
(
'
sendBy
'
,
userToken
);
data
.
append
(
'
receivedBy
'
,
this
.
props
.
navigation
.
state
.
params
.
empId
);
data
.
append
(
'
reply_id
'
,
this
.
state
.
commentDetails
.
id
?
this
.
state
.
commentDetails
.
id
:
""
)
let
res1
=
await
fetch
(
'
https://api-single.agile24x7.com/release/userChat1.php
'
,
let
res1
=
await
fetch
(
API
+
'
userChat1.php
'
,
{
method
:
'
post
'
,
body
:
data
,
...
...
This diff is collapsed.
Click to expand it.
src/LaunchScreens/Support.js
View file @
5c4c2cc0
...
...
@@ -12,7 +12,7 @@ import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
import
SearchableDropdown
from
'
react-native-searchable-dropdown
'
;
import
AsyncStorage
from
'
@react-native-community/async-storage
'
;
// import { tsMethodSignature } from '@babel/types';
import
{
API
}
from
"
../WebServices/RestClient
"
;
import
{
API
,
CHATAPI
}
from
"
../WebServices/RestClient
"
;
import
NetInfo
from
'
@react-native-community/netinfo
'
;
import
Snackbar
from
'
react-native-snackbar
'
;
import
ModalSelector
from
'
react-native-modal-selector
'
;
...
...
@@ -70,7 +70,7 @@ export default class UserSupport extends Component {
name
:
images
.
assets
[
0
].
fileName
,
})
data
.
append
(
'
action
'
,
'
releaseBug
'
);
data
.
append
(
'
api
'
,
'
https://api-single.agile24x7.com/release
'
);
data
.
append
(
'
api
'
,
CHATAPI
);
data
.
append
(
'
bug_one_sen
'
,
bug_one_sen
);
data
.
append
(
'
email_to_contact
'
,
userName
);
data
.
append
(
'
steps_for_bug
'
,
steps_for_bug
);
...
...
@@ -135,7 +135,7 @@ reportBug(){
const
data
=
new
FormData
();
data
.
append
(
'
file
'
,
''
)
data
.
append
(
'
action
'
,
'
releaseBug
'
);
data
.
append
(
'
api
'
,
'
https://api-single.agile24x7.com/release
'
);
data
.
append
(
'
api
'
,
CHATAPI
);
data
.
append
(
'
bug_one_sen
'
,
bug_one_sen
);
data
.
append
(
'
email_to_contact
'
,
userName
);
data
.
append
(
'
steps_for_bug
'
,
steps_for_bug
);
...
...
This diff is collapsed.
Click to expand it.
src/UserComponents/UserGroupChat.js
View file @
5c4c2cc0
...
...
@@ -40,6 +40,7 @@ import {
}
from
'
react-native-indicators
'
;
import
{
PROJECTNO
,
TITLE
,
ADDPROJECT
,
REQUESTED_BY
,
RELEASEOWNER
,
PROJECTSTATUS
,
RO
,
VERIFY
,
DELETE
}
from
'
../CommonComponents/Header
'
;
import
MultiSelect
from
'
react-native-multiple-select
'
;
import
{
ScrollView
}
from
'
react-native-gesture-handler
'
;
class
ListItem
extends
React
.
Component
{
...
...
@@ -326,7 +327,7 @@ class ListItem extends React.Component {
// empSorted.length > 0 ? empSorted.map((group, index) => {
return
(
<
View
style
=
{
Number
(
item
.
taskStatus
)
===
1
?
styles
.
buttonContainer
:
styles
.
buttonContainer1
}
>
<
Scroll
View
style
=
{
Number
(
item
.
taskStatus
)
===
1
?
styles
.
buttonContainer
:
styles
.
buttonContainer1
}
>
{
/* <TouchableOpacity onPress={this.props.Module}> */
}
{
/* <TouchableOpacity onPress={this.props.MainTask}> */
}
<
View
style
=
{
styles
.
signup
}
>
...
...
@@ -359,7 +360,7 @@ class ListItem extends React.Component {
<
/View
>
<
/View
>
{
/* </TouchableOpacity> */
}
<
/View
>
<
/
Scroll
View
>
)
...
...
@@ -1524,7 +1525,7 @@ export default class UserGroupChat extends Component {
behavior
=
{
Platform
.
OS
===
"
ios
"
?
"
padding
"
:
"
height
"
}
style
=
{
styles
.
container
}
>
<
TouchableWithoutFeedback
onPress
=
{
Keyboard
.
dismiss
}
>
{
/*
<TouchableWithoutFeedback onPress={Keyboard.dismiss}>
*/
}
<
Container
style
=
{{
height
:
Dimensions
.
get
(
'
window
'
).
height
}}
>
<
NavigationEvents
onDidFocus
=
{()
=>
this
.
onRefresh
()}
...
...
@@ -1772,7 +1773,7 @@ export default class UserGroupChat extends Component {
<
/View
>
<
/Container
>
<
/TouchableWithoutFeedback
>
{
/*
</TouchableWithoutFeedback>
*/
}
<
/KeyboardAvoidingView
>
);
}
...
...
@@ -1865,7 +1866,6 @@ const styles = StyleSheet.create({
marginLeft
:
4
,
},
buttonContainer1
:
{
width
:
wp
(
'
98%
'
),
...
...
@@ -2006,7 +2006,6 @@ const styles = StyleSheet.create({
position
:
'
relative
'
,
marginBottom
:
10
,
},
signUpText
:
{
fontSize
:
13
,
...
...
This diff is collapsed.
Click to expand it.
src/UserComponents/UserSupport.js
View file @
5c4c2cc0
...
...
@@ -12,7 +12,7 @@ import Icon from 'react-native-vector-icons/MaterialCommunityIcons';
import
SearchableDropdown
from
'
react-native-searchable-dropdown
'
;
import
AsyncStorage
from
'
@react-native-community/async-storage
'
;
// import { tsMethodSignature } from '@babel/types';
import
{
API
}
from
"
../WebServices/RestClient
"
;
import
{
API
,
CHATAPI
}
from
"
../WebServices/RestClient
"
;
import
NetInfo
from
'
@react-native-community/netinfo
'
;
import
Snackbar
from
'
react-native-snackbar
'
;
import
ModalSelector
from
'
react-native-modal-selector
'
;
...
...
@@ -70,7 +70,7 @@ export default class UserSupport extends Component {
name
:
images
.
assets
[
0
].
fileName
,
})
data
.
append
(
'
action
'
,
'
releaseBug
'
);
data
.
append
(
'
api
'
,
'
https://api-single.agile24x7.com/release
'
);
data
.
append
(
'
api
'
,
CHATAPI
);
data
.
append
(
'
bug_one_sen
'
,
bug_one_sen
);
data
.
append
(
'
email_to_contact
'
,
userName
);
data
.
append
(
'
steps_for_bug
'
,
steps_for_bug
);
...
...
@@ -135,7 +135,7 @@ reportBug(){
const
data
=
new
FormData
();
data
.
append
(
'
file
'
,
''
)
data
.
append
(
'
action
'
,
'
releaseBug
'
);
data
.
append
(
'
api
'
,
'
https://api-single.agile24x7.com/release
'
);
data
.
append
(
'
api
'
,
CHATAPI
);
data
.
append
(
'
bug_one_sen
'
,
bug_one_sen
);
data
.
append
(
'
email_to_contact
'
,
userName
);
data
.
append
(
'
steps_for_bug
'
,
steps_for_bug
);
...
...
This diff is collapsed.
Click to expand it.
src/WebServices/RestClient.js
View file @
5c4c2cc0
/*****MySql********/
//pre production environment (development)
export
const
API
=
"
https://api-single.agile24x7.com/release/
"
;
export
const
ReportsAPI
=
"
https://testapiv2reporting.agile24x7.com/
"
;
export
const
Client_URL
=
"
https://sdtest.agile24x7.com/#/
"
;
// export const API = "https://api-single.agile24x7.com/release/";
// export const CHATAPI = "https://api-single.agile24x7.com/release";
// export const ReportsAPI = "https://testapiv2reporting.agile24x7.com/";
// export const Client_URL = "https://sdtest.agile24x7.com/#/";
//production environment
// export const API = "https://api-single.agile24x7.com/Migration/";
// export const CHATAPI = "https://api-single.agile24x7.com/Migration";
// export const ReportsAPI = "https://apiv2reporting.agile24x7.com/";
// export const Client_URL = "https://novisync.agile24x7.com/#/";
...
...
@@ -16,11 +18,13 @@ export const Client_URL = "https://sdtest.agile24x7.com/#/";
// //pre production environment (development)
// export const API = "https://api-single.agile24x7.com/pg_migration/";
// export const CHATAPI = "https://api-single.agile24x7.com/pg_migration";
// export const ReportsAPI = "https://pgtestreporting.agile24x7.com/";
// export const Client_URL = "https://pgtest.agile24x7.com/#/";
//production environment
// export const API = "https://api-single.agile24x7.com/pg_prod/";
// export const ReportsAPI = "https://pgreporting.agile24x7.com/";
// export const Client_URL = "https://www.agile24x7.com/#/";
\ No newline at end of file
export
const
API
=
"
https://api-single.agile24x7.com/pg_prod/
"
;
export
const
CHATAPI
=
"
https://api-single.agile24x7.com/pg_prod
"
;
export
const
ReportsAPI
=
"
https://pgreporting.agile24x7.com/
"
;
export
const
Client_URL
=
"
https://www.agile24x7.com/#/
"
;
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment