Define the Boundry on drones

.ebextensions/.config

@@ -0,0 +1,5 @@
+option_settings:
+  aws:elb:loadbalancer:
+    ManagedSecurityGroup: sg-c62008b6
+  aws:elb:loadbalancer:
+    SecurityGroups: sg-c62008b6

.editorconfig

@@ -11,3 +11,5 @@ end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
+[Makefile]
+indent_style = tab

.elasticbeanstalk/config.yml

@@ -0,0 +1,25 @@
+branch-defaults:
+  INT-SKY-GRADD:
+    environment: missions-stg2
+    group_suffix: null
+  master:
+    environment: missions-stg
+    group_suffix: null
+environment-defaults:
+  missions-stg:
+    branch: null
+    repository: null
+global:
+  application_name: missions
+  branch: null
+  default_ec2_keyname: missions-stg-key
+  default_platform: Docker 17.09.1-ce
+  default_region: us-east-1
+  include_git_submodules: true
+  instance_profile: null
+  platform_name: null
+  platform_version: null
+  profile: eb-cli-dav
+  repository: null
+  sc: git
+  workspace_type: Application

.github/PULL_REQUEST_TEMPLATE.md

@@ -24,6 +24,7 @@
 - [ ] Bug fix (non-breaking change which fixes an issue)
 - [ ] New feature (non-breaking change which adds functionality)
 - [ ] Breaking change (fix or feature that would cause existing functionality to change)
+- [ ] Enhancement that improves upon existing functionality
 
 ## Checklist:
 <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->

.gitignore

@@ -21,3 +21,4 @@ yarn-debug.log*
 yarn-error.log*
 
 package-lock.json
+src/build

CONTRIBUTING.md

@@ -17,9 +17,10 @@ A lot of **missions** functionality came from pull requests sent by the develope
 - [x] Fork the repository from the [missions GitHub page](https://github.com/DAVFoundation/missions).
 - [x] Clone a copy to your local machine with `$ git clone git@github.com:YOUR-GITHUB-USER-NAME/missions.git`
 - [x] Run `npm install` to install all the packages
-- [x] Run `npm start` to build the project 
+- [x] Run `npm start` to build the project
 - [x] Open [http://localhost:3333/](http://localhost:3333/) to see your local instance of missions live.
-- [x] If you would like to see some simulated drones appear on the map, you will also need to set up the [Mission Control](https://github.com/DAVFoundation/missioncontrol/blob/master/CONTRIBUTING.md) project.
+- [x] If you would like to see some simulated drones appear on the map, you will also need to set up the [Mission Control](https://github.com/DAVFoundation/missioncontrol/blob/master/CONTRIBUTING.md) project as well as the [Captain-Sim](https://github.com/DAVFoundation/captain-sim/blob/master/CONTRIBUTING.md) project.
+- [x] To be able to make transactions on ethereum network, you need to set up [contracts](https://github.com/DAVFoundation/contracts) project, and set the build symlinks at missions/src, to point your build directory at contracts project, with `$ ln -sf /path/to/contracts/build /path/to/missions/src/build`.
 - [x] Now, code, code, code.
 - [x] Commit your local changes by using `$ git commit -m "nice detailed message here..."`
 - [x] Once you've made sure all your changes work correctly and have been committed, push your local changes back to github with `$ git push -u origin master`
@@ -28,7 +29,7 @@ A lot of **missions** functionality came from pull requests sent by the develope
 
 #### Important:
 
-* This project is just the client-facing side of missions. You can run it on its own and do some limited development, but you won't see any drones on the map, or get any responses to your requests for pickups. To get the full-experience, you will need to also [get **Mission Control** up and running](https://github.com/DAVFoundation/missioncontrol/blob/master/CONTRIBUTING.md) in a separate console window
+* This project is just the client-facing side of missions. You can run it on its own and do some limited development, but you won't see any drones on the map, or get any responses to your requests for pickups. To get the full-experience, you will need to also (https://github.com/DAVFoundation/missioncontrol/blob/master/CONTRIBUTING.md) in a separate console window
 * Please stick to the project's existing coding style. Coding styles don't need to have a consensus, they just need to be consistent :smile:
 * Push your changes to a topic branch in your fork of the repository. Your branch should be based on the `master` branch
 * When submitting a [pull request](https://help.github.com/articles/using-pull-requests/), please elaborate as much as possible about the change, your motivation for the change, etc.

Dockerfile

@@ -0,0 +1,10 @@
+FROM node:9
+RUN npm i -g webpack webpack-cli
+
+WORKDIR /app
+COPY . /app
+RUN npm i
+
+CMD npm run start-stg
+
+EXPOSE 3333

Dockerrun.aws.json

@@ -0,0 +1,10 @@
+{
+  "AWSEBDockerrunVersion": "1",
+  "Volumes": [
+    {
+      "ContainerDirectory": "/var/app",
+      "HostDirectory": "/var/app"
+    }
+  ],
+  "Logging": "/var/eb_log"
+}

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 DAV Foundation
+Copyright (c) 2019 DAV Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,26 +1,42 @@
 BUCKET=s3://missions.io/
-## deploy to staging
-STG_BUCKET=s3://missions-stg/
-all:
+STG_BUCKET=s3://stg.missions.io/
+WEBPACK=./node_modules/webpack/bin/webpack.js
+WEBPACK_DEV=./node_modules/webpack-dev-server/bin/webpack-dev-server.js
 
-setup:
-	@ npm i
+FORCE:
 
-start: setup
-	@ npm start
+setup: FORCE
+	@npm i
+	@rsync -a ../dav-js/build src
+
+start-sim: setup
+	@export APP=drone_simulation && export DOMAIN=mooving && ${WEBPACK_DEV} --config webpack.dev.js
+
+start-sky: setup
+	@export APP=drone_charging && ${WEBPACK_DEV} --config webpack.dev.js
+
+start-gradd: setup
+	@export APP=route_plan && ${WEBPACK_DEV} --config webpack.dev.js
+
+stop: FORCE
+	@npm run stop
 
 build: setup
-	@ npm run build
+	@rsync -a ../dav-js/build src
+	@npm run build
 
 publish: build
-	@ aws s3 cp --recursive --acl public-read dist/ ${BUCKET}
+	@aws s3 cp --recursive --acl public-read dist/ ${BUCKET}
 
 build-stg: setup
-	@ npm run build-stg
-
-create-aws-stg-env:
-	## create s3 bucket for missions
-	@aws s3api create-bucket --bucket missions-stg --region us-east-1
+	@rsync -a ../dav-js/build src
+	@export APP=drone_simulation && export DOMAIN=mooving && ${WEBPACK} --config webpack.stg.js
+	@export APP=route_plan && export DOMAIN=mooving && ${WEBPACK} --config webpack.stg.js
+	@export APP=drone_charging && export DOMAIN=mooving && ${WEBPACK} --config webpack.stg.js
+	@cp -r ./src/html/. ./dist/route_plan/html
 
 deploy-aws-stg-env: build-stg
-	@aws s3 cp --recursive --acl public-read dist/ ${STG_BUCKET}
+	@aws s3 cp --recursive --acl public-read dist/drone_simulation s3://mooving.io/
+	@aws s3 cp --recursive --acl public-read dist/route_plan s3://route-plan.mooving.io/
+	@aws s3 cp --recursive --acl public-read dist/drone_charging s3://drone-charging.mooving.io/
+	# @aws s3 cp --recursive --acl public-read dist/ ${STG_BUCKET}

README.md

@@ -6,9 +6,9 @@
 
 > By DAV
 
-Missions is the client facing side of the marketplace connecting DAV users looking to ship packages, with autonomous vehicles.
+Missions is the client facing side of the marketplace connecting DAV users with transportation service providers
 
-It demonstrates how a third party might build their own product, while integrating technologies provided by DAV, and provide a way for users and autonomous vehicles to transact.
+It demonstrates how a third party might build their own product, while integrating technologies provided by DAV, and provide a way for users and transportation services to interact and transact.
 
 ### Contributing Code, Reporting Bugs and Suggesting Features
 

docker-compose.yml

@@ -0,0 +1,21 @@
+version: '3'
+
+services:
+  missions:
+    build: .
+    command: 'npm run start'
+    ports:
+      - '3333:3333'
+    environment:
+      NODE_ENV: development
+      ETH_NODE_URL: http://dav-contracts:8545
+      MISSION_CONTROL_URL: http://mission-control:8443
+      BLOCKCHAIN_TYPE: NONE
+    networks:
+      - dav
+    external_links:
+      - missioncontrol_missioncontrol_1:mission-control
+      - dav-contracts:dav-contracts
+networks:
+  dav:
+    external: true

package.json

@@ -6,33 +6,44 @@
   "bugs": {
     "url": "https://github.com/DAVFoundation/missions/issues"
   },
-  "license": "MIT",
-  "author": "Tal Ater <tal@talater.com>",
   "repository": {
     "type": "git",
     "url": "https://github.com/DAVFoundation/missions.git"
   },
+  "license": "MIT",
+  "author": "Tal Ater <tal@talater.com>",
   "scripts": {
     "build": "webpack --config webpack.prod.js",
     "build-stg": "webpack --config webpack.stg.js",
     "start": "webpack-dev-server --config webpack.dev.js",
+    "start-stg": "webpack-dev-server --config webpack.stg.js",
+    "stop": "kill $(ps aux | grep 'webpack' | awk '{print $2}')",
     "test": "jest"
   },
+  "jest": {
+    "moduleNameMapper": {
+      "\\.(css|jpg|png|svg)$": "<rootDir>/empty-module.js"
+    }
+  },
   "dependencies": {
     "@turf/turf": "^5.1.6",
+    "callback-timeout": "^3.0.1",
     "mapbox-gl": "~0.44.1",
     "moment": "^2.20.1",
     "randomstring": "^1.1.5",
     "react": "^16.2.0",
-    "react-dom": "^16.2.0",
+    "react-dom": "^16.2.1",
     "react-geosuggest": "^2.7.0",
+    "react-rangeslider": "^2.2.0",
     "react-redux": "^5.0.7",
     "react-router-dom": "^4.2.2",
     "redux": "^3.7.2",
     "redux-actions": "^2.2.1",
     "redux-devtools-extension": "^2.13.2",
     "redux-promise-middleware": "5.0.0",
-    "turf": "^3.0.14"
+    "truffle-contract": "^3.0.4",
+    "turf": "^3.0.14",
+    "web3": "^1.0.0-beta.34"
   },
   "devDependencies": {
     "babel-core": "^6.26.0",
@@ -56,10 +67,5 @@
     "webpack": "^3.11.0",
     "webpack-dev-server": "^2.11.1",
     "webpack-merge": "^4.1.1"
-  },
-  "jest": {
-    "moduleNameMapper": {
-      "\\.(css|jpg|png|svg)$": "<rootDir>/empty-module.js"
-    }
   }
-}
+}

src/actions/index.js

@@ -1,25 +1,57 @@
-import { createAction } from 'redux-actions';
+import {
+  createAction
+} from 'redux-actions';
+
 import {
   fetchStatus as apiFetchStatus,
-  createNeed as apiCreateNeed,
+  updateMissionStatus as apiUpdateMissionStatus,
   fetchBids as apiFetchBids,
   chooseBid as apiChooseBid,
+  fetchSimulationDrones,
+  initWeb3,
   confirmTakeoff as apiConfirmTakeoff,
-} from '../lib/api';
+  initWeb3_NO_BLOCKCHAIN,
+  registerDavId as davRegisterDavId,
+  createMissionTransaction as davCreateMissionTransaction,
+  approveCompletedMission as davApproveCompletedMission
+} from '../lib/dav';
 
 export const updateApp = createAction('UPDATE_APP');
 
 export const updateStatus = createAction('UPDATE_STATUS', apiFetchStatus);
 
 export const updateStatusFulfilled = createAction('UPDATE_STATUS_FULFILLED');
 
+export const getSimulationDrones = createAction('GET_SIMULATION_DRONES', fetchSimulationDrones);
+export const getSimulationDronesFulfilled = createAction('GET_SIMULATION_DRONES_FULFILLED');
+
+export const verifyDavId = createAction('VERIFY_DAV_ID', initWeb3);
+
+export const verifyDavId_NO_BLOCKCHAIN = createAction('VERIFY_DAV_ID', initWeb3_NO_BLOCKCHAIN);
+
+export const updateDavId = createAction('UPDATE_DAV_ID');
+
+export const updateContractMissionIdMissionId = createAction('UPDATE_CONTRACT_MISSION_ID');
+
+export const registerDavId = createAction('REGISTER_DAV_ID', davRegisterDavId);
+
+export const registerDavIdFulfilled = createAction('REGISTER_DAV_ID_FULFILLED');
+
+export const unregisteredDavId = createAction('UNREGISTERED_DAV_ID');
+
+export const unlockWallet = createAction('UNLOCK_WALLET');
+
+export const closeWalletDialog = createAction('CLOSE_WALLET_DIALOG');
+
 export const updateMapCoords = createAction('UPDATE_MAP_COORDS');
 
 export const updateOrderDetails = createAction('UPDATE_ORDER_DETAILS');
 
 export const resetOrderDetails = createAction('RESET_ORDER_DETAILS');
 
-export const createNeed = createAction('CREATE_NEED', apiCreateNeed);
+export const createDroneDeliveryNeedFulfilled = createAction('CREATE_DRONEDELIVERY_NEED_FULFILLED');
+export const createDroneChargingNeedFulfilled = createAction('CREATE_CHARGING_NEED_FULFILLED');
+export const createRoutePlanNeedFulfilled = createAction('CREATE_ROUTEPLAN_NEED_FULFILLED');
 
 export const createNeedFulfilled = createAction('CREATE_NEED_FULFILLED');
 
@@ -33,13 +65,34 @@ export const chooseBidPending = createAction('CHOOSE_BID_PENDING');
 
 export const chooseBidFulfilled = createAction('CHOOSE_BID_FULFILLED');
 
-export const confirmTakeoff = createAction(
-  'CONFIRM_TAKEOFF',
-  apiConfirmTakeoff,
-);
+export const createMissionTransaction = createAction('CREATE_MISSION_TRANSACTION', davCreateMissionTransaction);
+
+export const createMissionTransactionFulfilled = createAction('CREATE_MISSION_TRANSACTION_FULFILLED');
+
+export const createMissionTransactionFailed = createAction('CREATE_MISSION_TRANSACTION_FAILED');
+
+export const approveCompletedMission = createAction('APPROVE_COMPLETED_MISSION', davApproveCompletedMission);
+
+export const confirmTakeoff = createAction('CONFIRM_TAKEOFF', apiConfirmTakeoff);
 
 export const confirmTakeoffPending = createAction('CONFIRM_TAKEOFF_PENDING');
 
-export const confirmTakeoffFulfilled = createAction(
-  'CONFIRM_TAKEOFF_FULFILLED',
-);
+export const confirmTakeoffFulfilled = createAction('CONFIRM_TAKEOFF_FULFILLED');
+
+
+export const confirmDroneDocking = createAction('CONFIRM_DRONE_DOCKING');
+
+export const updateMissionStatus = createAction('UPDATE_MISSION_STATUS', apiUpdateMissionStatus);
+// for charging mock purposes
+
+export const completeChargingMission = createAction('COMPLETE_CHARGING_MISSION');
+
+const apiStartChargingMission = (mission) => {
+  return new Promise(resolve => resolve({
+    mission
+  }));
+};
+
+export const startChargingMission = createAction('START_CHARGING_MISSION', apiStartChargingMission);
+
+export const startChargingMissionFulfilled = createAction('START_CHARGING_MISSION_FULFILLED');