diff --git a/client/src/constants/menuItems.js b/client/src/constants/menuItems.js
index cc0c1be..6ea00f8 100644
--- a/client/src/constants/menuItems.js
+++ b/client/src/constants/menuItems.js
@@ -1,4 +1,4 @@
-import DoorLockCharges from "../scenes/DoorLockCharges";
+import UploadDLockData from "../scenes/UploadDLockData";
import Home from "../scenes/Home";
export const mainMenuItems = [
@@ -9,9 +9,9 @@ export const mainMenuItems = [
component: Home,
},
{
- id: 'doorLockCharges',
- title: 'Door Lock Charges',
- url: '/door-lock-charges',
- component: DoorLockCharges,
+ id: 'uploadDLockData',
+ title: 'Upload DLock Data',
+ url: '/upload-dlock-data',
+ component: UploadDLockData,
},
];
diff --git a/client/src/scenes/DoorLockCharges/index.js b/client/src/scenes/DoorLockCharges/index.js
deleted file mode 100644
index 35a06bf..0000000
--- a/client/src/scenes/DoorLockCharges/index.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import React, { Component } from 'react';
-import { connect } from 'react-redux';
-
-import { Container, Form, Loader } from "semantic-ui-react";
-
-import MainMenu from '../../components/MainMenu';
-import { fetchDoorLockCharges } from "../../store/actions";
-
-class DoorLockCharges extends Component {
-
- render () {
- const { pending } = this.props.pending;
- return (
-
-
- Door Lock Charges
-
-
- {
- pending &&
- }
-
- );
- }
-}
-
-const mapStateToProps = state => ({
- incidents: state.doorLockCharges.incidents,
- pending: state.doorLockCharges.pending,
- error: state.doorLockCharges.error,
-});
-
-const mapDispatchToProps = (dispatch) => ({
- fetchDoorLockCharges: () => fetchDoorLockCharges(dispatch),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(DoorLockCharges);
diff --git a/client/src/scenes/Home/index.js b/client/src/scenes/Home/index.js
index f4012bf..9cd8925 100644
--- a/client/src/scenes/Home/index.js
+++ b/client/src/scenes/Home/index.js
@@ -1,37 +1,34 @@
import React, { Component } from 'react';
-import { Container } from 'semantic-ui-react';
+import { Container, Form } from "semantic-ui-react";
import MainMenu from '../../components/MainMenu';
class Home extends Component {
- state = {
- apiStatus: 'loading',
- };
-
- componentDidMount() {
- fetch('/api')
- .then(response => response.json())
- .then(result => {
- if (result.status === 1) {
- this.setState({apiStatus: 'working'});
- } else {
- this.setState({apiStatus: 'NOT WORKING !'});
- }
- })
- .catch(err => {
- this.setState({apiStatus: `ERROR : ${err}`});
- })
- }
render () {
- const {apiStatus} = this.state;
return (
- CRM Integration
+ Report
- Integration API Status : {apiStatus}
+
);
}
diff --git a/client/src/scenes/UploadDLockData/index.js b/client/src/scenes/UploadDLockData/index.js
new file mode 100644
index 0000000..b75da54
--- /dev/null
+++ b/client/src/scenes/UploadDLockData/index.js
@@ -0,0 +1,39 @@
+import React, { Component } from 'react';
+import { connect } from 'react-redux';
+
+import { Container, Form } from "semantic-ui-react";
+
+import MainMenu from '../../components/MainMenu';
+import { uploadDoorLockData } from "../../store/actions";
+
+class UploadDLockData extends Component {
+
+ render () {
+ return (
+
+
+ DLock Data
+
+
+
+ );
+ }
+}
+
+const mapStateToProps = (state) => ({
+
+});
+
+const mapDispatchToProps = (dispatch) => ({
+ uploadDoorLockData: () => uploadDoorLockData(dispatch),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(UploadDLockData);
diff --git a/client/src/store/actions/doorLockActions.js b/client/src/store/actions/doorLockActions.js
index 4b09c0a..9aa82ea 100644
--- a/client/src/store/actions/doorLockActions.js
+++ b/client/src/store/actions/doorLockActions.js
@@ -1,17 +1,17 @@
import {
- FETCH_DOOR_LOCK_CHARGES_PENDING,
- FETCH_DOOR_LOCK_CHARGES_SUCCESS,
- FETCH_DOOR_LOCK_CHARGES_FAILED
+ UPLOAD_DOOR_LOCK_DATA_PENDING,
+ UPLOAD_DOOR_LOCK_DATA_SUCCESS,
+ UPLOAD_DOOR_LOCK_DATA_FAILED
} from "../constants";
-export const fetchDoorLockCharges = (dispatch) => {
- dispatch({type: FETCH_DOOR_LOCK_CHARGES_PENDING});
- fetch('/api/doorLockCharges')
+export const uploadDoorLockData = (dispatch) => {
+ dispatch({type: UPLOAD_DOOR_LOCK_DATA_PENDING});
+ fetch('/api/doorLockData')
.then(response => response.json())
.then(data => {
- dispatch({type: FETCH_DOOR_LOCK_CHARGES_SUCCESS, payload: data})
+ dispatch({type: UPLOAD_DOOR_LOCK_DATA_SUCCESS, payload: data})
})
.catch(err => {
- dispatch({type: FETCH_DOOR_LOCK_CHARGES_FAILED, payload: err})
+ dispatch({type: UPLOAD_DOOR_LOCK_DATA_FAILED, payload: err})
})
};
diff --git a/client/src/store/constants.js b/client/src/store/constants.js
index 6dec00c..5034375 100644
--- a/client/src/store/constants.js
+++ b/client/src/store/constants.js
@@ -1,3 +1,3 @@
-export const FETCH_DOOR_LOCK_CHARGES_PENDING = 'FETCH_DOOR_LOCK_CHARGES_PENDING';
-export const FETCH_DOOR_LOCK_CHARGES_SUCCESS = 'FETCH_DOOR_LOCK_CHARGES_SUCCESS';
-export const FETCH_DOOR_LOCK_CHARGES_FAILED = 'FETCH_DOOR_LOCK_CHARGES_FAILED';
+export const UPLOAD_DOOR_LOCK_DATA_PENDING = 'UPLOAD_DOOR_LOCK_DATA_PENDING';
+export const UPLOAD_DOOR_LOCK_DATA_SUCCESS = 'UPLOAD_DOOR_LOCK_DATA_SUCCESS';
+export const UPLOAD_DOOR_LOCK_DATA_FAILED = 'UPLOAD_DOOR_LOCK_DATA_FAILED';
diff --git a/client/src/store/reducers/doorLockReducers.js b/client/src/store/reducers/doorLockReducers.js
index ad22ac5..759e4fd 100644
--- a/client/src/store/reducers/doorLockReducers.js
+++ b/client/src/store/reducers/doorLockReducers.js
@@ -1,30 +1,30 @@
import {
- FETCH_DOOR_LOCK_CHARGES_PENDING,
- FETCH_DOOR_LOCK_CHARGES_SUCCESS,
- FETCH_DOOR_LOCK_CHARGES_FAILED
+ UPLOAD_DOOR_LOCK_DATA_PENDING,
+ UPLOAD_DOOR_LOCK_DATA_SUCCESS,
+ UPLOAD_DOOR_LOCK_DATA_FAILED
} from "../constants";
const initialState = {
- incidents: [],
pending: false,
+ result: {},
error: '',
};
-export const doorLockCharges = (state, action) => {
+export const doorLockData = (state, action) => {
state = state || initialState;
action = action || {};
switch(action.type){
- case FETCH_DOOR_LOCK_CHARGES_PENDING:
+ case UPLOAD_DOOR_LOCK_DATA_PENDING:
return Object.assign({}, state, {
pending: true,
});
- case FETCH_DOOR_LOCK_CHARGES_SUCCESS:
+ case UPLOAD_DOOR_LOCK_DATA_SUCCESS:
return Object.assign({}, state, {
- incidents: action.payload,
pending: false,
+ result: action.payload,
});
- case FETCH_DOOR_LOCK_CHARGES_FAILED:
+ case UPLOAD_DOOR_LOCK_DATA_FAILED:
return Object.assign({}, state, {
pending: false,
error: action.payload,
diff --git a/client/src/store/reducers/index.js b/client/src/store/reducers/index.js
index 85381d2..274b7bd 100644
--- a/client/src/store/reducers/index.js
+++ b/client/src/store/reducers/index.js
@@ -1,8 +1,8 @@
import { combineReducers } from "redux";
-import { doorLockCharges} from "./doorLockReducers";
+import { doorLockData} from "./doorLockReducers";
export const rootReducer = combineReducers({
- doorLockCharges
+ doorLockData
});
diff --git a/controllers/doorLock.js b/controllers/doorLock.js
new file mode 100644
index 0000000..8376c64
--- /dev/null
+++ b/controllers/doorLock.js
@@ -0,0 +1,9 @@
+'use strict';
+
+const uploadDoorLockData = (req, res) => {
+ res.json({status: 'ok'});
+};
+
+module.exports = {
+ uploadDoorLockData,
+};
diff --git a/controllers/doorLockCharges.js b/controllers/doorLockCharges.js
deleted file mode 100644
index 54948f8..0000000
--- a/controllers/doorLockCharges.js
+++ /dev/null
@@ -1,22 +0,0 @@
-'use strict';
-
-const calculateDoorLockCharges = (req, res) => {
- res.json([
- {
- member: 'Dummy Member A',
- date: new Date(),
- room: 'Blue room',
- fee: 10,
- },
- {
- member: 'Dummy Member B',
- date: new Date(),
- room: 'White room',
- fee: 20,
- }
- ]);
-};
-
-module.exports = {
- calculateDoorLockCharges,
-};
diff --git a/routes/index.js b/routes/index.js
index 83ec460..f5a4487 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -1,12 +1,12 @@
'use strict';
const { apiStatusCheck } = require('../controllers/apiStatusCheck');
-const { calculateDoorLockCharges } = require('../controllers/doorLockCharges');
+const { uploadDoorLockData } = require('../controllers/doorLock');
const express = require('express');
const router = express.Router();
router.get('/', apiStatusCheck);
-router.get('/doorLockCharges', calculateDoorLockCharges);
+router.get('/doorLockData', uploadDoorLockData);
module.exports = router;