diff --git a/.gitignore b/.gitignore
index 71e39b9..099d08e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,6 @@ typings/
*.lock
/services/node/package-lock.json
+/DMT/.idea/
+.idea/
+.scannerwork/
\ No newline at end of file
diff --git a/DMT/.gitignore b/DMT/.gitignore
index 2b11622..1ed5686 100644
--- a/DMT/.gitignore
+++ b/DMT/.gitignore
@@ -9,3 +9,5 @@ npm-debug.*
web-build/
web-report/
/*.lock
+
+.idea/
diff --git a/DMT/.idea/DMT.iml b/DMT/.idea/DMT.iml
deleted file mode 100644
index 24643cc..0000000
--- a/DMT/.idea/DMT.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/DMT/.idea/encodings.xml b/DMT/.idea/encodings.xml
deleted file mode 100644
index 15a15b2..0000000
--- a/DMT/.idea/encodings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/DMT/.idea/misc.xml b/DMT/.idea/misc.xml
deleted file mode 100644
index 24eb271..0000000
--- a/DMT/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/DMT/.idea/modules.xml b/DMT/.idea/modules.xml
deleted file mode 100644
index a796769..0000000
--- a/DMT/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/DMT/.idea/vcs.xml b/DMT/.idea/vcs.xml
deleted file mode 100644
index 6c0b863..0000000
--- a/DMT/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/DMT/App.js b/DMT/App.js
index 4b06ae7..708d9af 100644
--- a/DMT/App.js
+++ b/DMT/App.js
@@ -7,9 +7,14 @@ import RevenueLicense from './components/RevenueLicense'
import MyVehicles from './components/MyVehicles'
import Logout from './components/actions/Logout'
import Reload from './components/commons/Reload'
-import {ScrollView} from 'react-native';
+import {ScrollView, View} from 'react-native';
import {Image} from "react-native-elements";
import {createAppContainer, createDrawerNavigator, createSwitchNavigator, DrawerItems} from 'react-navigation'
+import configs from "./config.json"
+import FineManagement from "./components/FineManagement";
+
+import SignInScreen from "./components/SignInScreen";
+import PaymentGateway from "./components/PaymentGateway";
export default class App extends React.Component {
@@ -23,10 +28,12 @@ export default class App extends React.Component {
const customDrawerContent = (props) => (
-
+
+
+
)
@@ -44,6 +51,11 @@ const DrawerNavigator = createDrawerNavigator({
headerVisible: false,
},
initialRouteName: 'Home',
+ contentOptions: {
+ activeLabelStyle: {
+ color: configs.theme
+ }
+ },
contentComponent: customDrawerContent,
}
);
@@ -54,6 +66,7 @@ const DrawerNavigatorLoginUsers = createDrawerNavigator({
VehicleDetails: {screen: VehicleDetails},
RevenueLicense: {screen: RevenueLicense},
MyVehicles: {screen: MyVehicles},
+ FineManagement: {screen: FineManagement},
Logout: {screen: Logout}
},
{
@@ -62,12 +75,19 @@ const DrawerNavigatorLoginUsers = createDrawerNavigator({
headerVisible: false,
},
initialRouteName: 'Home',
+ contentOptions: {
+ activeLabelStyle: {
+ color: configs.theme
+ }
+ },
contentComponent: customDrawerContent,
}
);
const SwitchNavigator = createSwitchNavigator({
Reload: {screen: Reload},
+ SignIn: SignInScreen,
+ PaymentGateway: PaymentGateway,
App: DrawerNavigator,
UserApp: DrawerNavigatorLoginUsers
},
diff --git a/DMT/app.json b/DMT/app.json
index 431ad3e..c48e4c6 100644
--- a/DMT/app.json
+++ b/DMT/app.json
@@ -1,7 +1,7 @@
{
"expo": {
"name": "DMT",
- "slug": "first-rn-app",
+ "slug": "dmt",
"privacy": "public",
"sdkVersion": "33.0.0",
"platforms": [
@@ -27,7 +27,12 @@
"supportsTablet": true
},
"android": {
- "package": "com.tmg"
+ "package": "com.tmg",
+ "permissions": [
+ "CAMERA",
+ "READ_EXTERNAL_STORAGE",
+ "WRITE_EXTERNAL_STORAGE"
+ ]
}
}
}
\ No newline at end of file
diff --git a/DMT/assets/OngoingNumberIcons/bigTruckIcon.png b/DMT/assets/OngoingNumberIcons/bigTruckIcon.png
new file mode 100644
index 0000000..9fb5887
Binary files /dev/null and b/DMT/assets/OngoingNumberIcons/bigTruckIcon.png differ
diff --git a/DMT/assets/OngoingNumberIcons/buldozerIcon.png b/DMT/assets/OngoingNumberIcons/buldozerIcon.png
new file mode 100644
index 0000000..47f83d5
Binary files /dev/null and b/DMT/assets/OngoingNumberIcons/buldozerIcon.png differ
diff --git a/DMT/assets/OngoingNumberIcons/busIcon.png b/DMT/assets/OngoingNumberIcons/busIcon.png
new file mode 100644
index 0000000..1394f35
Binary files /dev/null and b/DMT/assets/OngoingNumberIcons/busIcon.png differ
diff --git a/DMT/assets/OngoingNumberIcons/carIcon.png b/DMT/assets/OngoingNumberIcons/carIcon.png
new file mode 100644
index 0000000..d0a4211
Binary files /dev/null and b/DMT/assets/OngoingNumberIcons/carIcon.png differ
diff --git a/DMT/assets/OngoingNumberIcons/cementIcon.png b/DMT/assets/OngoingNumberIcons/cementIcon.png
new file mode 100644
index 0000000..09022ba
Binary files /dev/null and b/DMT/assets/OngoingNumberIcons/cementIcon.png differ
diff --git a/DMT/assets/OngoingNumberIcons/commercialIcon.png b/DMT/assets/OngoingNumberIcons/commercialIcon.png
new file mode 100644
index 0000000..106d774
Binary files /dev/null and b/DMT/assets/OngoingNumberIcons/commercialIcon.png differ
diff --git a/DMT/assets/OngoingNumberIcons/excavatorIcon.png b/DMT/assets/OngoingNumberIcons/excavatorIcon.png
new file mode 100644
index 0000000..2a04efa
Binary files /dev/null and b/DMT/assets/OngoingNumberIcons/excavatorIcon.png differ
diff --git a/DMT/assets/OngoingNumberIcons/forkLiftIcon.png b/DMT/assets/OngoingNumberIcons/forkLiftIcon.png
new file mode 100644
index 0000000..808c521
Binary files /dev/null and b/DMT/assets/OngoingNumberIcons/forkLiftIcon.png differ
diff --git a/DMT/assets/OngoingNumberIcons/lorryIcon.png b/DMT/assets/OngoingNumberIcons/lorryIcon.png
new file mode 100644
index 0000000..e2228a4
Binary files /dev/null and b/DMT/assets/OngoingNumberIcons/lorryIcon.png differ
diff --git a/DMT/assets/OngoingNumberIcons/panzerIcon.png b/DMT/assets/OngoingNumberIcons/panzerIcon.png
new file mode 100644
index 0000000..d089583
Binary files /dev/null and b/DMT/assets/OngoingNumberIcons/panzerIcon.png differ
diff --git a/DMT/assets/OngoingNumberIcons/primeMoverIcon.png b/DMT/assets/OngoingNumberIcons/primeMoverIcon.png
new file mode 100644
index 0000000..664375d
Binary files /dev/null and b/DMT/assets/OngoingNumberIcons/primeMoverIcon.png differ
diff --git a/DMT/assets/OngoingNumberIcons/singleCabIcon.png b/DMT/assets/OngoingNumberIcons/singleCabIcon.png
new file mode 100644
index 0000000..5d6782c
Binary files /dev/null and b/DMT/assets/OngoingNumberIcons/singleCabIcon.png differ
diff --git a/DMT/assets/OngoingNumberIcons/tractorTrailerIcon.png b/DMT/assets/OngoingNumberIcons/tractorTrailerIcon.png
new file mode 100644
index 0000000..3292b0a
Binary files /dev/null and b/DMT/assets/OngoingNumberIcons/tractorTrailerIcon.png differ
diff --git a/DMT/assets/OngoingNumberIcons/trailerIcon.png b/DMT/assets/OngoingNumberIcons/trailerIcon.png
new file mode 100644
index 0000000..d9cba27
Binary files /dev/null and b/DMT/assets/OngoingNumberIcons/trailerIcon.png differ
diff --git a/DMT/assets/drawer_image - Copy.png b/DMT/assets/drawer_image - Copy.png
index 5d1bc29..98955d9 100644
Binary files a/DMT/assets/drawer_image - Copy.png and b/DMT/assets/drawer_image - Copy.png differ
diff --git a/DMT/assets/drawer_image.png b/DMT/assets/drawer_image.png
index 379a56c..0f954a0 100644
Binary files a/DMT/assets/drawer_image.png and b/DMT/assets/drawer_image.png differ
diff --git a/DMT/assets/home_logo.png b/DMT/assets/home_logo.png
new file mode 100644
index 0000000..aa475a5
Binary files /dev/null and b/DMT/assets/home_logo.png differ
diff --git a/DMT/assets/icon - Copy.png b/DMT/assets/icon - Copy.png
deleted file mode 100644
index d28cd2f..0000000
Binary files a/DMT/assets/icon - Copy.png and /dev/null differ
diff --git a/DMT/assets/icon-copy.png b/DMT/assets/icon-copy.png
new file mode 100644
index 0000000..a5b387e
Binary files /dev/null and b/DMT/assets/icon-copy.png differ
diff --git a/DMT/assets/icon.png b/DMT/assets/icon.png
index af9247c..d28cd2f 100644
Binary files a/DMT/assets/icon.png and b/DMT/assets/icon.png differ
diff --git a/DMT/assets/icons/email.png b/DMT/assets/icons/email.png
new file mode 100644
index 0000000..c056545
Binary files /dev/null and b/DMT/assets/icons/email.png differ
diff --git a/DMT/assets/icons/fine_management.png b/DMT/assets/icons/fine_management.png
new file mode 100644
index 0000000..7a1330c
Binary files /dev/null and b/DMT/assets/icons/fine_management.png differ
diff --git a/DMT/assets/icons/firstName.png b/DMT/assets/icons/firstName.png
new file mode 100644
index 0000000..f57bf14
Binary files /dev/null and b/DMT/assets/icons/firstName.png differ
diff --git a/DMT/assets/icons/home.png b/DMT/assets/icons/home.png
index 9563284..353d732 100644
Binary files a/DMT/assets/icons/home.png and b/DMT/assets/icons/home.png differ
diff --git a/DMT/assets/icons/left_arrow.png b/DMT/assets/icons/left_arrow.png
new file mode 100644
index 0000000..dd52599
Binary files /dev/null and b/DMT/assets/icons/left_arrow.png differ
diff --git a/DMT/assets/icons/logged_user.png b/DMT/assets/icons/logged_user.png
index ae07978..4c94fa5 100644
Binary files a/DMT/assets/icons/logged_user.png and b/DMT/assets/icons/logged_user.png differ
diff --git a/DMT/assets/icons/login.png b/DMT/assets/icons/login.png
index ee5c5db..304eadc 100644
Binary files a/DMT/assets/icons/login.png and b/DMT/assets/icons/login.png differ
diff --git a/DMT/assets/icons/login_black.png b/DMT/assets/icons/login_black.png
index d7a743e..1a13a4e 100644
Binary files a/DMT/assets/icons/login_black.png and b/DMT/assets/icons/login_black.png differ
diff --git a/DMT/assets/icons/login_logo.png b/DMT/assets/icons/login_logo.png
new file mode 100644
index 0000000..a8b4c02
Binary files /dev/null and b/DMT/assets/icons/login_logo.png differ
diff --git a/DMT/assets/icons/logout.png b/DMT/assets/icons/logout.png
index e727fa8..96bb074 100644
Binary files a/DMT/assets/icons/logout.png and b/DMT/assets/icons/logout.png differ
diff --git a/DMT/assets/icons/my_vehicle.png b/DMT/assets/icons/my_vehicle.png
index d320d33..ac22581 100644
Binary files a/DMT/assets/icons/my_vehicle.png and b/DMT/assets/icons/my_vehicle.png differ
diff --git a/DMT/assets/icons/ongoing_numbers.png b/DMT/assets/icons/ongoing_numbers.png
index 9c750af..75d82eb 100644
Binary files a/DMT/assets/icons/ongoing_numbers.png and b/DMT/assets/icons/ongoing_numbers.png differ
diff --git a/DMT/assets/icons/password.png b/DMT/assets/icons/password.png
new file mode 100644
index 0000000..07fa8dc
Binary files /dev/null and b/DMT/assets/icons/password.png differ
diff --git a/DMT/assets/icons/revenue_license.png b/DMT/assets/icons/revenue_license.png
index aecb0c8..8fd1116 100644
Binary files a/DMT/assets/icons/revenue_license.png and b/DMT/assets/icons/revenue_license.png differ
diff --git a/DMT/assets/icons/user_reg.png b/DMT/assets/icons/user_reg.png
new file mode 100644
index 0000000..60d61f6
Binary files /dev/null and b/DMT/assets/icons/user_reg.png differ
diff --git a/DMT/assets/icons/user_reg2.png b/DMT/assets/icons/user_reg2.png
new file mode 100644
index 0000000..14a2458
Binary files /dev/null and b/DMT/assets/icons/user_reg2.png differ
diff --git a/DMT/assets/icons/user_reg3.png b/DMT/assets/icons/user_reg3.png
new file mode 100644
index 0000000..753ffb6
Binary files /dev/null and b/DMT/assets/icons/user_reg3.png differ
diff --git a/DMT/assets/icons/username.png b/DMT/assets/icons/username.png
new file mode 100644
index 0000000..01f7a89
Binary files /dev/null and b/DMT/assets/icons/username.png differ
diff --git a/DMT/assets/icons/vehicle_info.png b/DMT/assets/icons/vehicle_info.png
index 72461ba..0e5a3dd 100644
Binary files a/DMT/assets/icons/vehicle_info.png and b/DMT/assets/icons/vehicle_info.png differ
diff --git a/DMT/assets/ongoing_numbers.jpg b/DMT/assets/ongoing_numbers.jpg
index 8e99bb2..b821bdd 100644
Binary files a/DMT/assets/ongoing_numbers.jpg and b/DMT/assets/ongoing_numbers.jpg differ
diff --git a/DMT/assets/vehicle_details.jpg b/DMT/assets/vehicle_details.jpg
index bb87834..f619bda 100644
Binary files a/DMT/assets/vehicle_details.jpg and b/DMT/assets/vehicle_details.jpg differ
diff --git a/DMT/components/FineManagement.js b/DMT/components/FineManagement.js
new file mode 100644
index 0000000..57a7a06
--- /dev/null
+++ b/DMT/components/FineManagement.js
@@ -0,0 +1,175 @@
+import React from "react"
+import {AsyncStorage, Image, ScrollView, Text, View, StyleSheet} from "react-native";
+import AppHeader from "./commons/AppHeader";
+import {Button, Card, Icon, Avatar} from "react-native-elements";
+import configs from "../config";
+
+
+export default class HomeScreen extends React.Component {
+ static navigationOptions = {
+ title: "Fine Management",
+ drawerIcon: (
+
+ )
+ };
+
+ state = {
+ fineDetails: [],
+ name: "Ranmal Dewage",
+ licenseDetails: "B54356789",
+ loading: false
+ }
+
+ componentDidMount() {
+ const PUSH_ENDPOINT = configs.dmtUrl + "/fines/"
+ fetch(PUSH_ENDPOINT).then(res => res.json()).then(res => {
+ this.setState({
+ fineDetails: res
+ })
+ });
+ }
+
+ render() {
+ const {navigate} = this.props.navigation;
+ return (
+ <>
+
+
+
+
+
+ Name : {this.state.name}
+ License No : {this.state.licenseDetails}
+
+
+ {this.state.fineDetails.length != 0 && this.state.fineDetails.map((fine) => {
+ const ref = "REF : " + fine.ref
+ return
+
+ Vehicle Number
+ : {fine.vehicleNumber}
+
+
+ Fined Date
+ : {fine.finedDate}
+
+
+ Fined Place
+ : {fine.finedPlace}
+
+
+ Fine Due Date
+ : {fine.fineDueDate}
+
+
+ Reason
+ : {fine.reason}
+
+
+ Amount
+ : Rs.{fine.amount}
+
+
+ Status
+ : {fine.status}
+
+
+ {fine.status === "NOT PAID" && }
+ buttonStyle={{
+ backgroundColor: '#15B867',
+ borderRadius: 15,
+ marginLeft: 0,
+ marginRight: 0,
+ marginBottom: 0,
+ borderWidth: 0
+ }}
+ onPress={() => navigate('PaymentGateway', {
+ name: this.state.name,
+ licenseNumber: this.state.licenseDetails,
+ ref: fine.ref,
+ vno: fine.vehicleNumber,
+ amount: fine.amount
+ })}
+ title=' PAY NOW'/>}
+
+
+
+ })}
+
+
+
+
+
+
+ );
+ }
+}
+
+const styles = StyleSheet.create({
+ profileText1: {
+ margin: 8,
+ fontSize: 20,
+ textAlign: "left"
+ },
+ profileText2: {
+ margin: 8,
+ fontSize: 20,
+ textAlign: "left",
+ color: "rgb(0,102,102)"
+ }
+});
\ No newline at end of file
diff --git a/DMT/components/HomeScreen.js b/DMT/components/HomeScreen.js
index 1ebfb06..e9b288d 100644
--- a/DMT/components/HomeScreen.js
+++ b/DMT/components/HomeScreen.js
@@ -1,9 +1,10 @@
-import React from 'react';
-import {AsyncStorage, Image, ScrollView, Text} from 'react-native';
-import {Button, Card, Icon} from "react-native-elements";
+import React from 'react'
+import {AsyncStorage, Image, ScrollView, Text, View} from 'react-native'
+import {Button, Card, Icon} from "react-native-elements"
import Footer from './commons/Footer'
import RevenueLicense from './RevenueLicense'
-import AppHeader from "./commons/AppHeader";
+import AppHeader from "./commons/AppHeader"
+import configs from "../config.json"
export default class HomeScreen extends React.Component {
static navigationOptions = {
@@ -27,6 +28,12 @@ export default class HomeScreen extends React.Component {
<>
+ {/**/}
+ {/**/}
+ {/**/}
navigate('OngoingNumbers')}
title='Ongoing Numbers'
@@ -37,13 +44,17 @@ export default class HomeScreen extends React.Component {
service.
}
+ icon={}
buttonStyle={{
borderRadius: 0,
marginLeft: 0,
marginRight: 0,
marginBottom: 0,
- borderWidth: 1
+ borderWidth: 1,
+ borderColor: configs.theme
+ }}
+ titleStyle={{
+ color: configs.theme
}}
type="outline"
onPress={() => navigate('OngoingNumbers')}
@@ -57,13 +68,17 @@ export default class HomeScreen extends React.Component {
You can get the details of a registered vehicle through this service.
}
+ icon={}
buttonStyle={{
borderRadius: 0,
marginLeft: 0,
marginRight: 0,
marginBottom: 0,
- borderWidth: 1
+ borderWidth: 1,
+ borderColor: configs.theme
+ }}
+ titleStyle={{
+ color: configs.theme
}}
type="outline"
onPress={() => navigate('VehicleDetails')}
@@ -80,13 +95,17 @@ export default class HomeScreen extends React.Component {
Land vehicles, Three wheelers, Motor car A-Z online using this service.
}
+ icon={}
buttonStyle={{
borderRadius: 0,
marginLeft: 0,
marginRight: 0,
marginBottom: 0,
- borderWidth: 1
+ borderWidth: 1,
+ borderColor: configs.theme
+ }}
+ titleStyle={{
+ color: configs.theme
}}
type="outline"
onPress={() => navigate('RevenueLicense')}
diff --git a/DMT/components/LoginScreen.js b/DMT/components/LoginScreen.js
index b0f9db0..8a4a8ea 100644
--- a/DMT/components/LoginScreen.js
+++ b/DMT/components/LoginScreen.js
@@ -1,7 +1,15 @@
import React from 'react';
-import {AsyncStorage, Image, Text, ToastAndroid} from 'react-native';
-import {Button} from "react-native-elements";
+import {Image, StyleSheet, View, AsyncStorage, ScrollView, ToastAndroid, KeyboardAvoidingView, Text} from 'react-native';
+import MaterialButtonPrimary1 from "./login_symbols/MaterialButtonPrimary1";
+import MaterialButtonViolet from "./login_symbols/MaterialButtonViolet";
+import MaterialCheckboxWithLabel1 from "./login_symbols/MaterialCheckboxWithLabel1";
+import MaterialButtonWithVioletText1 from "./login_symbols/MaterialButtonWithVioletText1";
+import LoginTextBox from "./login_symbols/LoginTextBox";
+import LoginHeader from "./login_symbols/LoginHeader";
import {registerForPushNotificationsAsync} from "./functions/DmtNotification";
+import {loginUser} from "./functions/Services";
+import configs from "../config";
+import {SocialIcon} from "react-native-elements";
export default class LoginScreen extends React.Component {
static navigationOptions = {
@@ -11,61 +19,208 @@ export default class LoginScreen extends React.Component {
)
};
- componentDidMount() {
- this.setUser()
+ state = {
+ email: '',
+ password: '',
+ remember: false
}
- setUser = async () => {
- const user = {
- id: 1,
- fname: "Tenusha",
- lname: "Guruge",
- email: "tenusha@gmail.com"
+ handleChange = (name, value) => {
+ this.setState({[name]: value})
+ }
+
+ handleSubmit = async () => {
+ // TODO
+ if (this.state.email && this.state.password) {
+ const userObj = {
+ email: this.state.email,
+ password: this.state.password
+ };
+
+ await loginUser(userObj).then(async data => {
+ if (data) {
+ let user = data;
+ await AsyncStorage.setItem("dmt_user", JSON.stringify(user))
+
+ // enable notification
+ registerForPushNotificationsAsync().catch(err => {
+ ToastAndroid.showWithGravityAndOffset(
+ 'notification server error!',
+ ToastAndroid.SHORT,
+ ToastAndroid.BOTTOM,
+ 25,
+ 100,
+ );
+ })
+ this.props.navigation.navigate("UserApp")
+ } else {
+ ToastAndroid.showWithGravityAndOffset(
+ 'Invalid email or password !',
+ ToastAndroid.LONG,
+ ToastAndroid.BOTTOM,
+ 25,
+ 100,
+ );
+ }
+ }).catch(err => {
+ ToastAndroid.showWithGravityAndOffset(
+ 'Invalid email or password !',
+ ToastAndroid.LONG,
+ ToastAndroid.BOTTOM,
+ 25,
+ 100,
+ );
+ });
+
+ } else {
+ ToastAndroid.showWithGravityAndOffset(
+ 'Please fill required fields!',
+ ToastAndroid.SHORT,
+ ToastAndroid.BOTTOM,
+ 25,
+ 100,
+ );
}
+ }
+
+ handleSignUp = async () => {
+ this.props.navigation.navigate("SignIn")
+ }
- AsyncStorage.setItem("dmt_user", JSON.stringify(user))
- console.log("set User")
+ handleToggle = () => {
+ this.setState({remember: !this.state.remember})
}
render() {
const {navigate} = this.props.navigation;
return (
- <>
- Login
-
+
);
}
+
+ getBarColor = fines => {
+ if (fines === 0) {
+ return "green"
+ } else if (fines <= 2) {
+ return "orange"
+ } else {
+ return "red"
+ }
+ }
}
const styles = StyleSheet.create({
@@ -197,5 +306,10 @@ const styles = StyleSheet.create({
padding: 10,
width: "100%",
height: 100,
+ },
+ materialButtonPrimary: {
+ width: 150,
+ height: 36,
+ margin: 10
}
});
\ No newline at end of file
diff --git a/DMT/components/OngoingNumbers.js b/DMT/components/OngoingNumbers.js
index e23d914..082f94e 100644
--- a/DMT/components/OngoingNumbers.js
+++ b/DMT/components/OngoingNumbers.js
@@ -1,6 +1,36 @@
import React from 'react';
-import {Image, Text} from 'react-native';
+import {Image, Text, FlatList, Dimensions, View, StyleSheet} from 'react-native';
import AppHeader from "./commons/AppHeader";
+import configs from "../config";
+
+const data = [
+ {key: 'CAR', img: require('../assets/OngoingNumberIcons/carIcon.png'), licNo: 'LW-2006'},
+ {key: 'LORRY TRAILER BOWSER', img: require('../assets/OngoingNumberIcons/bigTruckIcon.png'), licNo: 'CBI-2956'},
+ {key: 'LAND VEHICLE (SMALL)', img: require('../assets/OngoingNumberIcons/buldozerIcon.png'), licNo: 'LW-2006'},
+ {key: 'DUAL PURPOSE (COMMERCIAL)', img: require('../assets/OngoingNumberIcons/busIcon.png'), licNo: 'ND-9377'},
+ {key: 'NON AGRICULTURAL LAND', img: require('../assets/OngoingNumberIcons/cementIcon.png'), licNo: 'LW-2006'},
+ {key: 'COMMERCIAL', img: require('../assets/OngoingNumberIcons/commercialIcon.png'), licNo: 'PJ-8138'},
+ {key: 'LAND VEHICLE', img: require('../assets/OngoingNumberIcons/excavatorIcon.png'), licNo: 'LV-0345'},
+ {key: 'FORK LIFT', img: require('../assets/OngoingNumberIcons/forkLiftIcon.png'), licNo: 'PZ-0541'},
+ {key: 'MOTOR LORRY (COMMERCIAL)', img: require('../assets/OngoingNumberIcons/lorryIcon.png'), licNo: 'RG-1187'},
+ {key: 'SPECIAL PURPOSE', img: require('../assets/OngoingNumberIcons/panzerIcon.png'), licNo: 'LZ-0219'},
+ {key: 'PRIME MOVER', img: require('../assets/OngoingNumberIcons/primeMoverIcon.png'), licNo: 'LO-2345'},
+ {key: 'SINGLE CAB', img: require('../assets/OngoingNumberIcons/singleCabIcon.png'), licNo: 'DAH-1876'},
+ {key: 'TRACTOR TRAILER BOWSER', img: require('../assets/OngoingNumberIcons/tractorTrailerIcon.png'), licNo: 'ZB-0886'},
+ {key: 'OTHER', img: require('../assets/OngoingNumberIcons/trailerIcon.png'), licNo: 'RY-5467'}
+
+];
+
+const formatData = (data, numOfColumns) => {
+ const numberOfFullRows = Math.floor(data.length / numOfColumns);
+
+ let numOfElementsInLastRow = data.length - (numberOfFullRows * numOfColumns);
+ while (numOfElementsInLastRow !== numOfColumns && numOfElementsInLastRow !== 0) {
+ data.push({key: `blank-${numOfElementsInLastRow}`, empty: true});
+ numOfElementsInLastRow = numOfElementsInLastRow + 1;
+ }
+ return data;
+};
export default class OngoingNumbers extends React.Component {
static navigationOptions = {
@@ -10,13 +40,71 @@ export default class OngoingNumbers extends React.Component {
)
};
+ renderItem = ({item, index}) => {
+ if (item.empty === true) {
+ return
+ }
+ return (
+
+
+ {item.key}
+ {/*The next ongoing number is:*/}
+ {item.licNo}
+
+ )
+ };
+
render() {
const {navigate} = this.props.navigation;
return (
<>
-
- Ongoing Numbers
+
+
);
}
-}
\ No newline at end of file
+}
+
+const styles = StyleSheet.create({
+ container: {
+ flex: 1,
+ marginVertical: 0,
+ },
+ item: {
+ backgroundColor: '#fff',
+ alignItems: 'center',
+ justifyContent: 'center',
+ flex: 1,
+ margin: 2,
+ borderWidth: 1,
+ borderColor: configs.theme,
+ height: Dimensions.get('window').width / 2,
+ },
+ itemImage: {
+ width: Dimensions.get('window').width / 2 - 60,
+ height: Dimensions.get('window').width / 2 - 150,
+ marginBottom: 10,
+ resizeMode: 'contain'
+ },
+ itemInvisible: {
+ backgroundColor: 'transparent'
+ },
+ itemText: {
+ color: '#000',
+ fontWeight: 'bold',
+ fontSize: 16,
+ textAlign: 'center',
+ marginBottom: 10
+ },
+ itemLicenceNo: {
+ color: configs.theme,
+ fontWeight: 'bold',
+ fontSize: 20
+ }
+});
\ No newline at end of file
diff --git a/DMT/components/PaymentGateway.js b/DMT/components/PaymentGateway.js
new file mode 100644
index 0000000..8006dbb
--- /dev/null
+++ b/DMT/components/PaymentGateway.js
@@ -0,0 +1,199 @@
+import React from 'react';
+import {ScrollView, View, Text, StyleSheet, ToastAndroid, KeyboardAvoidingView, Dimensions} from 'react-native';
+import {Header, Icon, Button, Card} from "react-native-elements"
+import CustomTextField from "./commons/CustomTextField";
+import {formatCardNumber, formatExpiryDate} from "./functions/UitilityFunctions"
+import configs from "../config";
+
+
+export default class PaymentGateway extends React.Component {
+ static navigationOptions = {
+ title: 'PaymentGateway'
+ };
+
+ state = {
+ cardNo: '',
+ cvvNo: '',
+ expDate: '',
+ textColor: '#2089dc'
+ };
+
+ handleChange = (name, value) => {
+
+ if (name === 'expDate') {
+ if (value.length <= 2) {
+ value = value.replace(/\D/g, '');
+ } else if (value.length > 3) {
+ let temp = value.substring(3).replace(/\D/g, '');
+ value = value.substring(0, 3) + temp;
+ }
+ } else {
+ value = value.replace(/\D/g, '');
+ }
+
+ if (name === 'cardNo') {
+ if (value.length <= 16) {
+ let tempValue = formatCardNumber(value);
+ this.setState({[name]: tempValue})
+ }
+ } else if (name === 'expDate') {
+ if (value.length <= 5) {
+ let tempValue = formatExpiryDate(value);
+ this.setState({[name]: tempValue});
+ }
+ } else if (name === 'cvvNo') {
+ if (value.length <= 3) {
+ this.setState({[name]: value});
+ }
+ } else {
+ this.setState({[name]: value})
+ }
+ };
+
+ handleSubmit = () => {
+ if (this.state.cardNo === '' || this.state.expDate === '' || this.state.cvvNo === '') {
+ ToastAndroid.showWithGravityAndOffset(
+ 'Please fill all the respective fields!',
+ ToastAndroid.SHORT,
+ ToastAndroid.BOTTOM,
+ 25,
+ 100,
+ );
+ } else {
+ this.props.navigation.navigate("Home")
+ }
+ };
+
+
+ render() {
+ const {navigation} = this.props;
+ const {navigate} = this.props.navigation;
+ const name = navigation.getParam("name", "No Name");
+ const licenseNumber = navigation.getParam("licenseNumber", "No licenseNumber");
+ const ref = navigation.getParam("ref", "No Reference");
+ const vno = navigation.getParam("vno", "No Vehicle Number");
+ const amount = navigation.getParam("amount", "No Amount");
+
+ return (
+
+
+ this.props.navigation.navigate("FineManagement")}
+ />}
+ centerComponent={{
+ text: 'PAYMENT', style: {color: 'black', fontWeight: "bold"}
+ }}
+ />
+
+
+
+ Name
+ : {name}
+
+
+ License Number
+ : {licenseNumber}
+
+
+ Reference ID
+ : {ref}
+
+
+ Vehicle Number
+ : {vno}
+
+
+ Amount
+ : {amount}
+
+
+ this.handleChange('cardNo', value)}/>
+
+
+
+ this.handleChange('expDate', value)}
+ />
+
+
+
+
+
+ this.handleChange('cvvNo', value)}/>
+
+
+
+
+
+
+
+
+
+
+
+ );
+ }
+}
+
+const styles = StyleSheet.create({
+ materialMessageTextbox: {
+ padding: 10,
+ width: "100%",
+ height: 100,
+ },
+ materialButtonPrimary: {
+ width: 150,
+ height: 36,
+ margin: 10
+ }
+});
+
diff --git a/DMT/components/RevenueLicense.js b/DMT/components/RevenueLicense.js
index b0b4eff..67f41e9 100644
--- a/DMT/components/RevenueLicense.js
+++ b/DMT/components/RevenueLicense.js
@@ -63,7 +63,7 @@ export default class RevenueLicense extends React.Component {
render() {
const {navigate} = this.props.navigation;
const data = this.state.License_Expiry_Date ?
- <>
+
- License Issued Date : {this.state.License_Issued_Date}
- Vehicle Reg No : {this.state.Vehicle_Reg_No}
- License Expiry Date : {this.state.License_Expiry_Date}
- License No : {this.state.License_No}
+
+ Vehicle Reg No
+ : {this.state.Vehicle_Reg_No}
+
+
+
+ License No
+ : {this.state.License_No}
+
+
+
+ License Issued Date
+ : {this.state.License_Issued_Date}
+
+
+
+ License Expiry Date
+ : {this.state.License_Expiry_Date}
+
- : null
+ : null
return (
diff --git a/DMT/components/SignInScreen.js b/DMT/components/SignInScreen.js
new file mode 100644
index 0000000..e3fb122
--- /dev/null
+++ b/DMT/components/SignInScreen.js
@@ -0,0 +1,267 @@
+import React from 'react';
+import {
+ Image,
+ KeyboardAvoidingView,
+ ScrollView,
+ StyleSheet,
+ ToastAndroid,
+ TouchableHighlight,
+ View
+} from 'react-native';
+import MaterialButtonPrimary1 from "./login_symbols/MaterialButtonPrimary1";
+import MaterialButtonViolet from "./login_symbols/MaterialButtonViolet";
+import LoginTextBox from "./login_symbols/LoginTextBox";
+import LoginHeader from "./login_symbols/LoginHeader";
+import {Avatar} from "react-native-elements";
+import {registerUser} from "./functions/Services";
+import * as ImagePicker from 'expo-image-picker';
+
+export default class LoginScreen extends React.Component {
+ static navigationOptions = {
+ title: 'SignIn'
+ };
+
+ state = {
+ email: '',
+ password: '',
+ rpassword: '',
+ license: '',
+ firstName: '',
+ lastName: '',
+ image: null,
+ }
+
+ componentDidMount() {
+ // this.getPermissionAsync().catch(err => console.log(err));
+ }
+
+ handleChange = (name, value) => {
+ this.setState({[name]: value})
+ }
+
+ handleSubmit = async () => {
+ const data = this.state
+ if (data.license && data.email && data.password && data.rpassword && data.firstName && data.lastName) {
+ if (data.password === data.rpassword) {
+ const profilePic = new FormData()
+ profilePic.append('photo', {uri: this.state.image, name: this.state.image});
+ const userObj = {
+ firstName: data.firstName,
+ lastName: data.lastName,
+ password: data.password,
+ email: data.email,
+ license: data.license
+ };
+ await registerUser(userObj).then(async res => {
+ if (res && res.responseCode === '01') {
+ ToastAndroid.showWithGravityAndOffset(
+ res.reason,
+ ToastAndroid.SHORT,
+ ToastAndroid.BOTTOM,
+ 25,
+ 100,
+ );
+ } else if (res) {
+ this.props.navigation.navigate("Login")
+ ToastAndroid.showWithGravityAndOffset(
+ 'Registration successful! please login...',
+ ToastAndroid.SHORT,
+ ToastAndroid.BOTTOM,
+ 25,
+ 100,
+ );
+ } else {
+ ToastAndroid.showWithGravityAndOffset(
+ 'Unable to register new user. please try again !',
+ ToastAndroid.LONG,
+ ToastAndroid.BOTTOM,
+ 25,
+ 100,
+ );
+ }
+ }).catch(err => {
+ ToastAndroid.showWithGravityAndOffset(
+ 'Unable to register new user. please try again !',
+ ToastAndroid.LONG,
+ ToastAndroid.BOTTOM,
+ 25,
+ 100,
+ );
+ });
+ } else {
+ ToastAndroid.showWithGravityAndOffset(
+ 'Password and confirm password does not match!',
+ ToastAndroid.SHORT,
+ ToastAndroid.BOTTOM,
+ 25,
+ 100,
+ );
+ }
+ } else {
+ ToastAndroid.showWithGravityAndOffset(
+ 'Please fill required fields!',
+ ToastAndroid.SHORT,
+ ToastAndroid.BOTTOM,
+ 25,
+ 100,
+ );
+ }
+ }
+
+ handleLogin = async () => {
+ this.props.navigation.navigate("Login")
+ }
+
+ handleToggle = () => {
+ this.setState({remember: !this.state.remember})
+ }
+
+ // getPermissionAsync = async () => {
+ // if (Constants.platform.ios) {
+ // const {status} = await Permissions.askAsync(Permissions.CAMERA_ROLL);
+ // if (status !== 'granted') {
+ // alert('Sorry, we need camera roll permissions to make this work!');
+ // }
+ // }
+ // }
+
+ _pickImage = async () => {
+ let result = await ImagePicker.launchImageLibraryAsync({
+ mediaTypes: ImagePicker.MediaTypeOptions.All,
+ allowsEditing: true,
+ aspect: [4, 3],
+ });
+
+ console.log(result);
+
+ if (!result.cancelled) {
+ this.setState({image: result.uri});
+ }
+ };
+
+ render() {
+ const {navigate} = this.props.navigation;
+ const avatar = this.state.image ? :
+ return (
+
+
+
+
+ {/**/}
+ {/**/}
+
+ {/**/}
+ {avatar}
+
+
+
+ this.handleChange('firstName', value)}/>
+
+
+
+ this.handleChange('lastName', value)}/>
+
+
+
+ this.handleChange('license', value)}/>
+
+
+
+ this.handleChange('email', value)}/>
+
+
+
+ this.handleChange('password', value)}/>
+
+
+
+ this.handleChange('rpassword', value)}/>
+
+
+
+
+
+
+ );
+ }
+}
+
+const styles = StyleSheet.create({
+ root: {
+ flex: 1,
+ backgroundColor: "rgb(255,255,255)"
+ },
+ materialFixedLabelTextbox: {
+ margin: 10,
+ height: 50,
+ width: "80%"
+ },
+ materialButtonPrimary1: {
+ height: 40,
+ opacity: 1,
+ marginLeft: 15,
+ marginRight: 15,
+ marginBottom: 10
+ },
+ materialButtonViolet: {
+ height: 40,
+ marginLeft: 15,
+ marginRight: 15
+ },
+ materialCheckboxWithLabel1: {
+ margin: 20,
+ height: 40,
+ },
+ materialButtonWithVioletText1: {
+ marginTop: 20,
+ height: 36,
+ },
+ profileImgContainer: {
+ height: 130,
+ width: 130,
+ borderRadius: 40,
+ },
+ profileImg: {
+ height: 130,
+ width: 130,
+ borderRadius: 40,
+ }
+});
\ No newline at end of file
diff --git a/DMT/components/VehicleDetails.js b/DMT/components/VehicleDetails.js
index 5081542..c2772dd 100644
--- a/DMT/components/VehicleDetails.js
+++ b/DMT/components/VehicleDetails.js
@@ -1,6 +1,9 @@
import React from 'react';
-import {Image, Text} from 'react-native';
+import {Image, ScrollView, StyleSheet, Text, ToastAndroid, View} from 'react-native';
import AppHeader from "./commons/AppHeader";
+import CustomTextField from "./commons/CustomTextField";
+import {Button, Card} from "react-native-elements";
+import configs from "../config";
export default class VehicleDetails extends React.Component {
static navigationOptions = {
@@ -9,14 +12,178 @@ export default class VehicleDetails extends React.Component {
)
};
+ state = {
+ display: false,
+ vehicleNo: '',
+ vehicleDetails: []
+
+ }
+
+ getVehicle = () => {
+ const PUSH_ENDPOINT = configs.dmtUrl + "/slvehicles/" + this.state.vehicleNo
+ fetch(PUSH_ENDPOINT).then(res => res.json()).then(res => {
+ this.setState({
+ vehicleDetails: res
+ })
+ if (res.length == 0) {
+ ToastAndroid.showWithGravityAndOffset(
+ 'Not a Valid Vehicle Number',
+ ToastAndroid.LONG,
+ ToastAndroid.BOTTOM,
+ 25,
+ 100,
+ )
+ }
+ });
+
+ }
+
+ handleChange = (name, value) => {
+ this.setState({[name]: value})
+ }
+
+ handleDisplay = () => {
+ this.setState({display: !this.state.display})
+ }
+
+ handleSubmit = async () => {
+ if (this.state.vehicleNo === '') {
+ ToastAndroid.showWithGravityAndOffset(
+ 'Enter Valid Vehicle Number',
+ ToastAndroid.LONG,
+ ToastAndroid.BOTTOM,
+ 25,
+ 100,
+ );
+ } else {
+ await this.getVehicle()
+ }
+ }
render() {
const {navigate} = this.props.navigation;
return (
<>
- Vehicle Details
+
+ this.handleChange('vehicleNo', value)}
+ />
+
+
+
+
+
+ {this.state.vehicleDetails.length != 0 && this.state.vehicleDetails.map((vehicle) => {
+ return
+
+ Vehicle Number
+ : {vehicle.vehicleNumber}
+
+
+ Vehicle Owner
+ : {vehicle.vehicleOwner}
+
+
+ Engine Number
+ : {vehicle.engineNumber}
+
+
+ Class
+ : {vehicle.class}
+
+
+ Manufacturer
+ : {vehicle.manufacturer}
+
+
+ Model
+ : {vehicle.model}
+
+
+ Year
+ : {vehicle.year}
+
+
+ })}
+
+
+
+
+
);
}
-}
\ No newline at end of file
+}
+
+
+const styles = StyleSheet.create({
+ materialMessageTextbox: {
+ padding: 10,
+ width: "100%",
+ height: 100,
+ }
+});
\ No newline at end of file
diff --git a/DMT/components/commons/AppHeader.js b/DMT/components/commons/AppHeader.js
index ad05583..b89acc8 100644
--- a/DMT/components/commons/AppHeader.js
+++ b/DMT/components/commons/AppHeader.js
@@ -1,6 +1,7 @@
-import React from 'react';
-import {Button, Header, Icon} from "react-native-elements";
-import {AsyncStorage, Image} from "react-native";
+import React from 'react'
+import {Button, Header, Icon, Avatar} from "react-native-elements"
+import {AsyncStorage, Image} from "react-native"
+import configs from "../../config.json"
export default class AppHeader extends React.Component {
@@ -16,13 +17,32 @@ export default class AppHeader extends React.Component {
}
render() {
+ //
const userIcon = this.state.user ?
- :
+ :
- const navigateTo = this.state.user ? "Home" : "Login"
+ const navigateTo = this.state.user ? "MyVehicles" : "Login"
+ const centerComponent = this.props.title === 'DMT' ? }
+ buttonStyle={{
+ borderRadius: 0,
+ marginLeft: 0,
+ marginRight: 0,
+ marginBottom: 0
+ }}/> : {text: this.props.title, style: {color: '#fff', fontSize: 20}}
return (
}
buttonStyle={{
borderRadius: 0,
@@ -32,9 +52,11 @@ export default class AppHeader extends React.Component {
}}
onPress={() => this.props.navigation.openDrawer()}/>}
- centerComponent={{text: this.props.title, style: {color: '#fff', fontSize: 20}}}
+ // centerComponent={{text: this.props.title, style: {color: '#fff', fontSize: 20}}}
+ centerComponent={centerComponent}
rightComponent={