Skip to content

GitLab

Commit 090a8c07 authored by santhosh's avatar santhosh
Browse files

dashboard changes

parent c56f7716
master 2-postgress-agile-mobile 4-mysql-agile-mobile image-upload mysql-agile-mobile mysql-dev-agile-mobile postgress-agile-mobile postgress-dev-agile-mobile
Hide whitespace changes
Inline Side-by-side
Showing
with 50 additions and 34 deletions
+50 -34
src/LaunchScreens/Login.js
View file @ 090a8c07
......@@ -113,7 +113,7 @@ export default class Login extends Component {
// alert("deviceid" + userId)
if (userId === null) {
alert("Relogin Again")
alert("Your Device Id is not detected. \n Please relaunch app and Try again...")
this.setState({
username: '',
......
src/UserComponents/UserDashboard.js
View file @ 090a8c07
......@@ -13,9 +13,10 @@ import {
Keyboard
} from 'react-native';
// import { Chart, VerticalAxis, HorizontalAxis, Line } from 'react-native-responsive-linechart'
import { Icon, Title, Container, Content, Header, Right, Left, Body } from 'native-base';
import { Title, Container, Content, Header, Right, Left, Body } from 'native-base';
import { widthPercentageToDP as wp, heightPercentageToDP as hp } from 'react-native-responsive-screen';
import { TouchableOpacity } from 'react-native-gesture-handler';
import Icon from 'react-native-vector-icons/FontAwesome';
import AsyncStorage from '@react-native-community/async-storage';
import { ReportsAPI } from "../WebServices/RestClient";
import { API } from "../WebServices/RestClient";
......@@ -330,16 +331,20 @@ export default class UserDashboard extends Component {
borderBottomColor: '#ffffff',
justifyContent: 'space-between',
}}>
<View style={{ marginTop: 20 }}>
<View style={{ marginTop: 20 ,flexDirection:'row'}}>
<Icon name="plus-circle" style={{ color: 'white', paddingRight: 5 }} size={25} />
<TouchableOpacity onPress={this.openModal}>
<Text style={{ width: 300, borderRadius: 20, height: 45, flexDirection: 'row', color: 'white' }}>
<Text style={{ width: 100, borderRadius: 20, height: 45, flexDirection: 'row', color: 'white',padding:5 }}>
Add Project
</Text>
</TouchableOpacity>
</View>
<View style={{ marginTop: 20 }}>
<View style={{ marginTop: 20 ,flexDirection:'row'}}>
<TouchableOpacity onPress={this.logOutOption.bind(this)}>
<Text style={{ width: 300, borderRadius: 20, height: 45, flexDirection: 'row', color: 'white' }}>Logout</Text>
{/* <Text style={{ borderRadius: 20, height: 45,color: 'white' }}>Logout</Text> */}
<Icon name="power-off" style={{ color: 'white'}} size={25} />
</TouchableOpacity>
</View>
</Header>
......@@ -432,7 +437,7 @@ export default class UserDashboard extends Component {
</TouchableOpacity>
<TouchableOpacity style={styles.opencancel} onPress={this.closeModal}>
<Text style={{ color: 'black' }}>CANCEL</Text>
<Text style={{ color: 'white' }}>CANCEL</Text>
</TouchableOpacity>
</View>
......@@ -575,15 +580,15 @@ const styles = StyleSheet.create({
},
opencancel: {
flex: 1,
// flex: 1,
...Platform.select({
ios: {
backgroundColor: 'red', margin: 20, height: 30, alignItems:
"center", justifyContent: 'center'
backgroundColor: 'red', height: 30, margin: 5, alignItems:
"center", justifyContent: 'center',paddingLeft:10,paddingRight:10
},
android: {
backgroundColor: 'red', margin: 20, height: 30, alignItems:
"center", justifyContent: 'center'
backgroundColor: 'red', height: 30, margin: 5, alignItems:
"center", justifyContent: 'center',paddingLeft:10,paddingRight:10
},
}),
},
......@@ -592,11 +597,11 @@ const styles = StyleSheet.create({
...Platform.select({
ios: {
backgroundColor: 'green', height: 30, margin: 5, alignItems:
"center", justifyContent: 'center'
"center", justifyContent: 'center',paddingLeft:10,paddingRight:10
},
android: {
backgroundColor: 'green', height: 30, margin: 5, alignItems:
"center", justifyContent: 'center'
"center", justifyContent: 'center',paddingLeft:10,paddingRight:10
},
}),
},
......
src/UserComponents/UserMyTask.js
View file @ 090a8c07
......@@ -441,7 +441,8 @@ export default class MyTask extends Component {
// ToastAndroid.showWithGravity('"Enter sub Task', ToastAndroid.SHORT,ToastAndroid.CENTER);
// this.setState({ error1: 'Module Title ' });
}
else if (moment(startDate).format('YYYY.MM.DD') >= moment(targetDate).format('YYYY.MM.DD')) {
else if (startDate >= targetDate) {
// else if (moment(startDate).format('MM.DD.YYYY') >= moment(targetDate).format('YYYY.MM.DD')) {
log("Warn", "Start date should not be less than or equal to End date");
alert("Start date should not be less than or equal to End date")
// ToastAndroid.showWithGravity('"Enter sub Task', ToastAndroid.SHORT,ToastAndroid.CENTER);
......@@ -838,6 +839,8 @@ export default class MyTask extends Component {
</View>
</TouchableOpacity> */}
{(this.state.emp_role !== "Contributor") &&
<View style={styles.bottomView} >
<TouchableOpacity onPress={this.openModal} >
{/* <Icon name='lightbulb-o'color='white' type='MaterialCommunityIcons' size={30} /> */}
......@@ -846,7 +849,7 @@ export default class MyTask extends Component {
</View>
}
<Modal
offset={this.state.offset}
......@@ -874,9 +877,9 @@ export default class MyTask extends Component {
date={this.state.startDate}
mode="date"
placeholder="From Date"
format="YYYY-MM-DD"
minDate="2020-01-01"
maxDate="2080-12-31"
format="MM.DD.YYYY"
// minDate="2020-01-01"
// maxDate="2080-12-31"
// minDate="01-01-2019"
// maxDate="01-06-2075"
confirmBtnText="Ok"
......@@ -893,9 +896,9 @@ export default class MyTask extends Component {
date={this.state.targetDate}
mode="date"
placeholder="To Date"
format="YYYY-MM-DD"
minDate="2020-01-01"
maxDate="2080-12-31"
format="MM.DD.YYYY"
// minDate="2020-01-01"
// maxDate="2080-12-31"
// minDate="01-01-2019"
// maxDate="01-06-2075"
confirmBtnText="Ok"
......
src/WebServices/RestClient.js
View file @ 090a8c07
// ------------ Testing data single db
// export const API = "https://api-single.agile24x7.com/release/"; //production
// export const ReportsAPI = "https://apiv2reporting.agile24x7.com/"//Reports
/*MySql*/
//pre production environment (development)
export const API = "https://api-single.agile24x7.com/release/";
export const ReportsAPI = "https://apiv2reporting.agile24x7.com/";
export const Client_URL = "https://www.agile24x7.com/";
// ------------ Live data single db
/*Postgress*/
//pre production environment (development)
// export const API = "https://api-single.agile24x7.com/pg_migration/";
// export const ReportsAPI = "https://testapiv2reporting.agile24x7.com/";
// export const Client_URL = "https://pgtest.agile24x7.com/";
// export const ReportsAPI="https://testapiv2reporting.agile24x7.com/" //pre production"
// ------------ Live data single db
/*MySql*/
//production environment
// export const API = "https://api-single.agile24x7.com/Migration/";
// export const ReportsAPI = "https://apiv2reporting.agile24x7.com/";
// export const Client_URL = "https://sdtest.agile24x7.com/#/";
// export const API = "https://api-single.agile24x7.com/Migration/"; //production
// export const ReportsAPI = "https://apiv2reporting.agile24x7.com/"//Reports
/*Postgress*/
//production environment
// export const API = "https://api-single.agile24x7.com/Migration/";
// export const ReportsAPI = "https://apiv2reporting.agile24x7.com/";
// export const Client_URL = "https://www.agile24x7.com/";
// ------------ pgURls
export const API = "https://api-single.agile24x7.com/pg_migration/";
export const ReportsAPI = "https://pgreporting.agile24x7.com/";
export const Client_URL = "https://sdtest.agile24x7.com/#/";
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment