addOrder now starts moving the robot #85
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
oktay-sen
added a commit
that referenced
this pull request
Feb 6, 2019
* Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs
Merged
oktay-sen
added a commit
that referenced
this pull request
Feb 6, 2019
* Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs
oktay-sen
pushed a commit
that referenced
this pull request
Feb 25, 2019
* Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2
oktay-sen
added a commit
that referenced
this pull request
Feb 25, 2019
* Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Added Robot Schema * Added missing stuff to schema * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * Removed unnecessary conditions on some endpoints. * Added error handling to schema * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2 * Added `npm run randomid` * Added some fields to the API schema (non-breaking changes) * Fixed merge issues and inconsistencies in fake_db.json * Making an order now correctly reduces the quantity of items instead of removing them. Also added GET /db for debugging.
oktay-sen
pushed a commit
that referenced
this pull request
Feb 26, 2019
* Added Harry's website * Added jest * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Added Robot Schema * Added missing stuff to schema * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * Switch from Firebase to Axios requests. CORS module on server * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Basic structure * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * Update menu structure * Implemented register, login and cookie-based session. * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * Removed unnecessary conditions on some endpoints. * Added error handling to schema * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2 * Added `npm run randomid` * Added some fields to the API schema (non-breaking changes) * Fixed merge issues and inconsistencies in fake_db.json * Making an order now correctly reduces the quantity of items instead of removing them. Also added GET /db for debugging. * Warehouses - Index, create and edit, working and finished * Finished adding and listing items * Finished adding and listing items * New logo * Fixed server failing large requests
oktay-sen
added a commit
that referenced
this pull request
Feb 26, 2019
* Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Added LoadingActivity and WarehouseListActivity * Added login button to WarehouseListActivity * Renamed MainActivity to WarehouseActivity * LoginActivity now works from any activity * WIP WarehouseActivity * Added Robot Schema * Added missing stuff to schema * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Minor visual changes * Moved auth documentation to README.md * Removed unnecessary line * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * WIP Upgrade app to api v2 * Added getOrders to app * Removed unnecessary conditions on some endpoints. * Added error handling to schema * Updated app's server requests to v2 * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2 * Added `npm run randomid` * Added some fields to the API schema (non-breaking changes) * Fixed merge issues and inconsistencies in fake_db.json * Making an order now correctly reduces the quantity of items instead of removing them. Also added GET /db for debugging. * Added recent small change to api v2 to app * Some of the visualization of data from server now works. * Added login menu and navigation improvements * WIP * Added add to cart dialog to app * WIP View cart dialog * Added ViewOrder dialog and the ability to make orders * Fixed some bugs on the server.
oktay-sen
pushed a commit
that referenced
this pull request
Feb 26, 2019
* Added Harry's website * Added jest * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Added Robot Schema * Added missing stuff to schema * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * Switch from Firebase to Axios requests. CORS module on server * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Basic structure * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * Update menu structure * Implemented register, login and cookie-based session. * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * Removed unnecessary conditions on some endpoints. * Added error handling to schema * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2 * Added `npm run randomid` * Added some fields to the API schema (non-breaking changes) * Fixed merge issues and inconsistencies in fake_db.json * Making an order now correctly reduces the quantity of items instead of removing them. Also added GET /db for debugging. * Warehouses - Index, create and edit, working and finished * Finished adding and listing items * Finished adding and listing items * New logo * Slight redesign changes * Slight redesign changes * Create item fix * Better error handling * pulling beta * Brushing out design and func * Polished website for demo 2 * Polished website for demo 2
oktay-sen
added a commit
that referenced
this pull request
Mar 1, 2019
* Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * changed marking number * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Demo 1 (#87) (#88) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added pull request template * Removed .idea * add method for getting RGB values * cleaned up code * Robot now stops when the server starts. * I73 (#95) * start detect marker * stop on blue * Add if statements for reverse * Add if statements for reverse for real * Add detect marking and control files * Reverse on blue line * Blue defaults to stop * Fixed a bug with incorrect use of new ObjectID() * I93 real auth (#100) * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * i94-api-schema (#97) * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Added Robot Schema * Added missing stuff to schema * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * Added error handling to schema * Changes from meeting on 23 Feb 2019 * I99 server v2 (#118) * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Added Robot Schema * Added missing stuff to schema * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * Removed unnecessary conditions on some endpoints. * Added error handling to schema * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2 * Added `npm run randomid` * Added some fields to the API schema (non-breaking changes) * Fixed merge issues and inconsistencies in fake_db.json * Making an order now correctly reduces the quantity of items instead of removing them. Also added GET /db for debugging. * I75 (#119) * Added Harry's website * Added jest * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Added Robot Schema * Added missing stuff to schema * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * Switch from Firebase to Axios requests. CORS module on server * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Basic structure * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * Update menu structure * Implemented register, login and cookie-based session. * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * Removed unnecessary conditions on some endpoints. * Added error handling to schema * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2 * Added `npm run randomid` * Added some fields to the API schema (non-breaking changes) * Fixed merge issues and inconsistencies in fake_db.json * Making an order now correctly reduces the quantity of items instead of removing them. Also added GET /db for debugging. * Warehouses - Index, create and edit, working and finished * Finished adding and listing items * Finished adding and listing items * New logo * Fixed server failing large requests * Fixed warehouse not updating properly (#122) * I123 add delete item (#124) * Updated schema with get item by id and delete item by id * Implemented get/delete item by id * Fixed typo and added 404 checks * Updated fake db * Updated fake DB with another warehouse * I98 app ui (#127) * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Added LoadingActivity and WarehouseListActivity * Added login button to WarehouseListActivity * Renamed MainActivity to WarehouseActivity * LoginActivity now works from any activity * WIP WarehouseActivity * Added Robot Schema * Added missing stuff to schema * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Minor visual changes * Moved auth documentation to README.md * Removed unnecessary line * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * WIP Upgrade app to api v2 * Added getOrders to app * Removed unnecessary conditions on some endpoints. * Added error handling to schema * Updated app's server requests to v2 * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2 * Added `npm run randomid` * Added some fields to the API schema (non-breaking changes) * Fixed merge issues and inconsistencies in fake_db.json * Making an order now correctly reduces the quantity of items instead of removing them. Also added GET /db for debugging. * Added recent small change to api v2 to app * Some of the visualization of data from server now works. * Added login menu and navigation improvements * WIP * Added add to cart dialog to app * WIP View cart dialog * Added ViewOrder dialog and the ability to make orders * Fixed some bugs on the server. * I75 (#120) * Added Harry's website * Added jest * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Added Robot Schema * Added missing stuff to schema * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * Switch from Firebase to Axios requests. CORS module on server * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Basic structure * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * Update menu structure * Implemented register, login and cookie-based session. * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * Removed unnecessary conditions on some endpoints. * Added error handling to schema * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2 * Added `npm run randomid` * Added some fields to the API schema (non-breaking changes) * Fixed merge issues and inconsistencies in fake_db.json * Making an order now correctly reduces the quantity of items instead of removing them. Also added GET /db for debugging. * Warehouses - Index, create and edit, working and finished * Finished adding and listing items * Finished adding and listing items * New logo * Slight redesign changes * Slight redesign changes * Create item fix * Better error handling * pulling beta * Brushing out design and func * Polished website for demo 2 * Polished website for demo 2 * Fixed app crashing on Android P and up
oktay-sen
pushed a commit
that referenced
this pull request
Mar 2, 2019
* Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Follow path forwards and backwards if threading didnt exist * Follow path forwards and backwards if threading didnt exist * Added Robot Schema * Added missing stuff to schema * Fix threading issue and reorganise code * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * Move sideways count blue markers * try reversing to get back on line * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * move side to side * Removed unnecessary conditions on some endpoints. * Added error handling to schema * get back on line method * ignore blue after travelling sideways until a green marker is seen * renamed followLineServer to followLine * change run methods to have distance and reverse parameters * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2 * Added `npm run randomid` * Added some fields to the API schema (non-breaking changes) * Fixed merge issues and inconsistencies in fake_db.json * Making an order now correctly reduces the quantity of items instead of removing them. Also added GET /db for debugging. * Updated with Kieran's Stuff * Intergrated Kieran's Changes * cleaned up code * Demo 2 Fixes * make sideways movement work with current arena layout * if sideways instruction arrives after forwards/backwards bob will keep moving until he sees blue * add follow path * integrated get back on line * Updated model
freddiejbawden
added a commit
that referenced
this pull request
Mar 13, 2019
* Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Follow path forwards and backwards if threading didnt exist * Follow path forwards and backwards if threading didnt exist * Added Robot Schema * Added missing stuff to schema * Fix threading issue and reorganise code * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * Move sideways count blue markers * try reversing to get back on line * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * move side to side * Removed unnecessary conditions on some endpoints. * Added error handling to schema * get back on line method * ignore blue after travelling sideways until a green marker is seen * renamed followLineServer to followLine * change run methods to have distance and reverse parameters * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2 * Added `npm run randomid` * Added some fields to the API schema (non-breaking changes) * Fixed merge issues and inconsistencies in fake_db.json * Making an order now correctly reduces the quantity of items instead of removing them. Also added GET /db for debugging. * Updated with Kieran's Stuff * Intergrated Kieran's Changes * cleaned up code * Demo 2 Fixes * make sideways movement work with current arena layout * if sideways instruction arrives after forwards/backwards bob will keep moving until he sees blue * add follow path * integrated get back on line * Added Robot Endpoint * Added tcp folder * Object recognition through black and white image * Robot moves on TCP * Server Fixes * Connects to EV3 and starts motor * Move servo motor from 0 to 90 degrees * Bluetooth * Removed Client and server for bt test * Added Git Ignore * Threaded Listener * Reset everything * Fixed again again again * ev3 beep * Time to make our own sandbox * See ya later sandbox * add grabber.py * add grabbing functions * Change to grabber * changed stuff for testing * it be like that sometimes * do some grabbing * Testing connection * Added Retry for server and close sockets with each message * Finished reliablity additions and move in and grab steps * add shelfy movement * Hold until input * bump to stop * Grab motion fixes * Changes to SCHEMA * Fixes to schema
oktay-sen
added a commit
that referenced
this pull request
Mar 13, 2019
* Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * changed marking number * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Demo 1 (#87) (#88) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added pull request template * Removed .idea * add method for getting RGB values * cleaned up code * Robot now stops when the server starts. * I73 (#95) * start detect marker * stop on blue * Add if statements for reverse * Add if statements for reverse for real * Add detect marking and control files * Reverse on blue line * Blue defaults to stop * Fixed a bug with incorrect use of new ObjectID() * I93 real auth (#100) * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * i94-api-schema (#97) * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Added Robot Schema * Added missing stuff to schema * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * Added error handling to schema * Changes from meeting on 23 Feb 2019 * I99 server v2 (#118) * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Added Robot Schema * Added missing stuff to schema * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * Removed unnecessary conditions on some endpoints. * Added error handling to schema * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2 * Added `npm run randomid` * Added some fields to the API schema (non-breaking changes) * Fixed merge issues and inconsistencies in fake_db.json * Making an order now correctly reduces the quantity of items instead of removing them. Also added GET /db for debugging. * I75 (#119) * Added Harry's website * Added jest * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Added Robot Schema * Added missing stuff to schema * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * Switch from Firebase to Axios requests. CORS module on server * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Basic structure * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * Update menu structure * Implemented register, login and cookie-based session. * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * Removed unnecessary conditions on some endpoints. * Added error handling to schema * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2 * Added `npm run randomid` * Added some fields to the API schema (non-breaking changes) * Fixed merge issues and inconsistencies in fake_db.json * Making an order now correctly reduces the quantity of items instead of removing them. Also added GET /db for debugging. * Warehouses - Index, create and edit, working and finished * Finished adding and listing items * Finished adding and listing items * New logo * Fixed server failing large requests * Fixed warehouse not updating properly (#122) * I123 add delete item (#124) * Updated schema with get item by id and delete item by id * Implemented get/delete item by id * Fixed typo and added 404 checks * Updated fake db * Updated fake DB with another warehouse * I98 app ui (#127) * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Added LoadingActivity and WarehouseListActivity * Added login button to WarehouseListActivity * Renamed MainActivity to WarehouseActivity * LoginActivity now works from any activity * WIP WarehouseActivity * Added Robot Schema * Added missing stuff to schema * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Minor visual changes * Moved auth documentation to README.md * Removed unnecessary line * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * WIP Upgrade app to api v2 * Added getOrders to app * Removed unnecessary conditions on some endpoints. * Added error handling to schema * Updated app's server requests to v2 * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2 * Added `npm run randomid` * Added some fields to the API schema (non-breaking changes) * Fixed merge issues and inconsistencies in fake_db.json * Making an order now correctly reduces the quantity of items instead of removing them. Also added GET /db for debugging. * Added recent small change to api v2 to app * Some of the visualization of data from server now works. * Added login menu and navigation improvements * WIP * Added add to cart dialog to app * WIP View cart dialog * Added ViewOrder dialog and the ability to make orders * Fixed some bugs on the server. * I75 (#120) * Added Harry's website * Added jest * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Added Robot Schema * Added missing stuff to schema * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * Switch from Firebase to Axios requests. CORS module on server * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Basic structure * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * Update menu structure * Implemented register, login and cookie-based session. * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * Removed unnecessary conditions on some endpoints. * Added error handling to schema * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2 * Added `npm run randomid` * Added some fields to the API schema (non-breaking changes) * Fixed merge issues and inconsistencies in fake_db.json * Making an order now correctly reduces the quantity of items instead of removing them. Also added GET /db for debugging. * Warehouses - Index, create and edit, working and finished * Finished adding and listing items * Finished adding and listing items * New logo * Slight redesign changes * Slight redesign changes * Create item fix * Better error handling * pulling beta * Brushing out design and func * Polished website for demo 2 * Polished website for demo 2 * Fixed app crashing on Android P and up * I96 follow path (#128) * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Follow path forwards and backwards if threading didnt exist * Follow path forwards and backwards if threading didnt exist * Added Robot Schema * Added missing stuff to schema * Fix threading issue and reorganise code * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * Move sideways count blue markers * try reversing to get back on line * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * move side to side * Removed unnecessary conditions on some endpoints. * Added error handling to schema * get back on line method * ignore blue after travelling sideways until a green marker is seen * renamed followLineServer to followLine * change run methods to have distance and reverse parameters * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2 * Added `npm run randomid` * Added some fields to the API schema (non-breaking changes) * Fixed merge issues and inconsistencies in fake_db.json * Making an order now correctly reduces the quantity of items instead of removing them. Also added GET /db for debugging. * Updated with Kieran's Stuff * Intergrated Kieran's Changes * cleaned up code * Demo 2 Fixes * make sideways movement work with current arena layout * if sideways instruction arrives after forwards/backwards bob will keep moving until he sees blue * add follow path * integrated get back on line * Updated model * I131 integration tests (#132) * Removed unnecessary file * Added clearDB function * Initial integration testing implementation * Changed names of the tests * Added more auth tests * Fixed typo * Added Procfile * Added heroku deployment * Working on fixing travis deployment * Updated .travis.yml * Fixing tests not running * Fixing tests not running * Reworked travis.yml * Trying to fix travis still * Added /commit to server, which redirects to the commit this build originated from. * Fixed /commit on the server * Fixed typo * Fixed /commit * Fixed /commit once again * Still fixing /commit * Fixed /commit for the last time * Yet another fix for /commit * Another fix for /commit * Fix for /commit * I144 sideways movement (#145) * make control into class * fixes PID control * finesse code for forward and backward movement * implement sideways movement * Added /reset and changed env variable options (#148) * Minor fix for heroku * I149 api route (#150) * Updated schema to add /api in front of all routes. * Added /api to server routes. * Added /api to requests on the website. * Added /api to all requests in android * Added /api to mongo_client.py requests * Added /api to responseTest's /ping request * Increased api level in android * Added website deployment to heroku as well * Fixed heroku deployment * FIxed website deployment again * Website deployment correctly points to heroku * I146 app demo 3 (#152) * Removed legacy MainActivity * Implemented image loading on warehouse items. * Added cloud zeroconf bypass * Added item images * Added OrdersActivity * Added qr code library to app * Added bob logo to app * Relative api routes (#154) * Added heroku to cors rules in server. * Disabled CORS check. * I146 app demo 3 (#155) * Removed legacy MainActivity * Implemented image loading on warehouse items. * Added cloud zeroconf bypass * Added item images * Added OrdersActivity * Added qr code library to app * Added bob logo to app * Added ViewOrderDialog * Added qr code generation * Added quality of life improvements to shopping cart. * I146 app demo 3 (#158) * Removed legacy MainActivity * Implemented image loading on warehouse items. * Added cloud zeroconf bypass * Added item images * Added OrdersActivity * Added qr code library to app * Added bob logo to app * Added ViewOrderDialog * Added qr code generation * Added quality of life improvements to shopping cart. * Fixed out of stock items appearing in the app. * Added warehouse markers to the map * Added READY_TO_COLLECT order status to app * Added getOrderById and updateOrderStatus for merchants (#159) * I153 web qr scan (#156) * Relative api routes * Implemented QR Scanning and Order retrieving * I146 app demo 3 (#160) * Removed legacy MainActivity * Implemented image loading on warehouse items. * Added cloud zeroconf bypass * Added item images * Added OrdersActivity * Added qr code library to app * Added bob logo to app * Added ViewOrderDialog * Added qr code generation * Added quality of life improvements to shopping cart. * Fixed out of stock items appearing in the app. * Added warehouse markers to the map * Added READY_TO_COLLECT order status to app * Added post-order-submission screen & fixed server crashing * Fixed status colors not working properly * I146 app demo 3 (#161) * Removed legacy MainActivity * Implemented image loading on warehouse items. * Added cloud zeroconf bypass * Added item images * Added OrdersActivity * Added qr code library to app * Added bob logo to app * Added ViewOrderDialog * Added qr code generation * Added quality of life improvements to shopping cart. * Fixed out of stock items appearing in the app. * Added warehouse markers to the map * Added READY_TO_COLLECT order status to app * Added post-order-submission screen & fixed server crashing * Fixed status colors not working properly * Fixed refreshing after order etc not working. * Fixed bad merge * I153 web qr scan (#163) * Relative api routes * Implemented QR Scanning and Order retrieving * Order completion. Bob App download link * I141 tcp connection (#162) * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Follow path forwards and backwards if threading didnt exist * Follow path forwards and backwards if threading didnt exist * Added Robot Schema * Added missing stuff to schema * Fix threading issue and reorganise code * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * Move sideways count blue markers * try reversing to get back on line * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * move side to side * Removed unnecessary conditions on some endpoints. * Added error handling to schema * get back on line method * ignore blue after travelling sideways until a green marker is seen * renamed followLineServer to followLine * change run methods to have distance and reverse parameters * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server …
oktay-sen
added a commit
that referenced
this pull request
Apr 9, 2019
* Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * changed marking number * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Demo 1 (#87) (#88) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added pull request template * Removed .idea * add method for getting RGB values * cleaned up code * Robot now stops when the server starts. * I73 (#95) * start detect marker * stop on blue * Add if statements for reverse * Add if statements for reverse for real * Add detect marking and control files * Reverse on blue line * Blue defaults to stop * Fixed a bug with incorrect use of new ObjectID() * I93 real auth (#100) * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * i94-api-schema (#97) * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Added Robot Schema * Added missing stuff to schema * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * Added error handling to schema * Changes from meeting on 23 Feb 2019 * I99 server v2 (#118) * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Added Robot Schema * Added missing stuff to schema * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * Removed unnecessary conditions on some endpoints. * Added error handling to schema * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2 * Added `npm run randomid` * Added some fields to the API schema (non-breaking changes) * Fixed merge issues and inconsistencies in fake_db.json * Making an order now correctly reduces the quantity of items instead of removing them. Also added GET /db for debugging. * I75 (#119) * Added Harry's website * Added jest * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Added Robot Schema * Added missing stuff to schema * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * Switch from Firebase to Axios requests. CORS module on server * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Basic structure * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * Update menu structure * Implemented register, login and cookie-based session. * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * Removed unnecessary conditions on some endpoints. * Added error handling to schema * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2 * Added `npm run randomid` * Added some fields to the API schema (non-breaking changes) * Fixed merge issues and inconsistencies in fake_db.json * Making an order now correctly reduces the quantity of items instead of removing them. Also added GET /db for debugging. * Warehouses - Index, create and edit, working and finished * Finished adding and listing items * Finished adding and listing items * New logo * Fixed server failing large requests * Fixed warehouse not updating properly (#122) * I123 add delete item (#124) * Updated schema with get item by id and delete item by id * Implemented get/delete item by id * Fixed typo and added 404 checks * Updated fake db * Updated fake DB with another warehouse * I98 app ui (#127) * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Added LoadingActivity and WarehouseListActivity * Added login button to WarehouseListActivity * Renamed MainActivity to WarehouseActivity * LoginActivity now works from any activity * WIP WarehouseActivity * Added Robot Schema * Added missing stuff to schema * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Minor visual changes * Moved auth documentation to README.md * Removed unnecessary line * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * WIP Upgrade app to api v2 * Added getOrders to app * Removed unnecessary conditions on some endpoints. * Added error handling to schema * Updated app's server requests to v2 * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2 * Added `npm run randomid` * Added some fields to the API schema (non-breaking changes) * Fixed merge issues and inconsistencies in fake_db.json * Making an order now correctly reduces the quantity of items instead of removing them. Also added GET /db for debugging. * Added recent small change to api v2 to app * Some of the visualization of data from server now works. * Added login menu and navigation improvements * WIP * Added add to cart dialog to app * WIP View cart dialog * Added ViewOrder dialog and the ability to make orders * Fixed some bugs on the server. * I75 (#120) * Added Harry's website * Added jest * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Added Robot Schema * Added missing stuff to schema * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * Switch from Firebase to Axios requests. CORS module on server * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Basic structure * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * Update menu structure * Implemented register, login and cookie-based session. * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * Removed unnecessary conditions on some endpoints. * Added error handling to schema * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2 * Added `npm run randomid` * Added some fields to the API schema (non-breaking changes) * Fixed merge issues and inconsistencies in fake_db.json * Making an order now correctly reduces the quantity of items instead of removing them. Also added GET /db for debugging. * Warehouses - Index, create and edit, working and finished * Finished adding and listing items * Finished adding and listing items * New logo * Slight redesign changes * Slight redesign changes * Create item fix * Better error handling * pulling beta * Brushing out design and func * Polished website for demo 2 * Polished website for demo 2 * Fixed app crashing on Android P and up * Removed unnecessary file * Added clearDB function * Initial integration testing implementation * Changed names of the tests * Added more auth tests * I96 follow path (#128) * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Follow path forwards and backwards if threading didnt exist * Follow path forwards and backwards if threading didnt exist * Added Robot Schema * Added missing stuff to schema * Fix threading issue and reorganise code * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * Move sideways count blue markers * try reversing to get back on line * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * move side to side * Removed unnecessary conditions on some endpoints. * Added error handling to schema * get back on line method * ignore blue after travelling sideways until a green marker is seen * renamed followLineServer to followLine * change run methods to have distance and reverse parameters * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Removed the server directory * Removed the server directory (#50) * Added jest testing to firebase functions. * Jest temporarily passes without tests. * I51 (#52) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * I51 (#53) * Removed the server directory * Added jest testing to firebase functions. * Jest temporarily passes without tests. * Fixed travis deployment not working * Potential fix for firebase deployment * Fixed firebase functions deployment on Travis * Added master firebase project to travis deploy * I55 (#58) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * I56 (#67) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * I45 (#57) * move robot forward using both motors * add skeleton class for detecting line * create line follower object in toddler * try to fix but everything breaks * add detectLine * makes BOB sidestep * detect colour * can differentiate between black line and white paper * move but can't stay on line * use 2 colour sensors * Merge branch 'i56' of https://github.com/Assis10t/assis10t into i56 Conflicts: ev3/detectLine.py * stops bob only turning right * follow line decently * make code nicer * I58 (#69) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * I66 (#70) * start detect marker * add stop method * add runner on separate thread * bOb stops when detecting green line * beobe stops after 3 lines man * I71 (#72) * start detect marker * stop on blue * I60 Connected Android to server (#74) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Fixed minor things * App can display list of items * Re-added addItem and getItems * Fixed app not connecting to server * Added ability to refresh list of items * Implemented adding order on android * Adding order now removes the items in it from the database * I76 (#79) * start detect marker * stop on blue * added function for sideways movement * I78 Basic authentication (#83) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * Added back button to LoginActivity * I81 Bypass zeroconf (#84) * Login works on the server & mini website. * Implemented Android login. * Added zeroconf bypass * addOrder now starts moving the robot (#85) * I58 (#86) * Removed firebase folder * Removed firebase functions deployment from travis.yaml * Random IntelliJ changes * Made initial hello world server * Added more packages * Minor change to README * Minor change to README * Basic implementation of a CRUD server with mongodb * Added Bonjour Publisher and Client * added bonjour * Robot comms teset * WIP makefile * Re-added package-lock.json * Robot turns on when button pressed * Android can now find server via zeroconf * Added test mode for when disconnected from robot * Refactored ServerConnection * Updated server name in android * Added turn off on * Added Feedback * Added Off/On Switch * Final touches * Updated Website * additional changes * Added Input Verification * Merge beta * Fixed merge issues and other bugs * Added Robot Pathfinding JS * Added More Pathfinding] * Get Next Job Added to Index.js * basic pathfinding * Added Order Updating * WIP * WIP * WIP changes for robot command * Added mongo_client * Mongo Client gets new orders * Updated To Server V2 * Added `npm run randomid` * Added some fields to the API schema (non-breaking changes) * Fixed merge issues and inconsistencies in fake_db.json * Making an order now correctly reduces the quantity of items instead of removing them. Also added GET /db for debugging. * Updated with Kieran's Stuff * Intergrated Kieran's Changes * cleaned up code * Demo 2 Fixes * make sideways movement work with current arena layout * if sideways instruction arrives after forwards/backwards bob will keep moving until he sees blue * add follow path * integrated get back on line * Updated model * Fixed typo * I131 integration tests (#132) * Removed unnecessary file * Added clearDB function * Initial integration testing implementation * Changed names of the tests * Added more auth tests * Fixed typo * Added tests about warehouses * Added Procfile * Added heroku deployment * Working on fixing travis deployment * Updated .travis.yml * Fixing tests not running * Fixing tests not running * Reworked travis.yml * Trying to fix travis still * Added /commit to server, which redirects to the commit this build originated from. * Fixed /commit on the server * Fixed typo * Fixed /commit * Fixed /commit once again * Still fixing /commit * Fixed /commit for the last time * Yet another fix for /commit * Another fix for /commit * Fix for /commit * I144 sideways movement (#145) * make control into class * fixes PID control * finesse code for forward and backward movement * implement sideways movement * Added /reset and changed env variable options (#148) * Minor fix for heroku * I149 api route (#150) * Updated schema to add /api in front of all routes. * Added /api to server routes. * Added /api to requests on the website. * Added /api to all requests in android * Added /api to mongo_client.py requests * Added /api to responseTest's /ping request * Increased api level in android * Added website deployment to heroku as well * Fixed heroku deployment * FIxed website deployment again * Website deployment correctly points to heroku * I146 app demo 3 (#152) * Removed legacy MainActivity * Implemented image loading on warehouse items. * Added cloud zeroconf bypass * Added item images * Added OrdersActivity * Added qr code library to app * Added bob logo to app * Relative api routes (#154) * Added heroku to cors rules in server. * Disabled CORS check. * I146 app demo 3 (#155) * Removed legacy MainActivity * Implemented image loading on warehouse items. * Added cloud zeroconf bypass * Added item images * Added OrdersActivity * Added qr code library to app * Added bob logo to app * Added ViewOrderDialog * Added qr code generation * Added quality of life improvements to shopping cart. * I146 app demo 3 (#158) * Removed legacy MainActivity * Implemented image loading on warehouse items. * Added cloud zeroconf bypass * Added item images * Added OrdersActivity * Added qr code library to app * Added bob logo to app * Added ViewOrderDialog * Added qr code generation * Added quality of life improvements to shopping cart. * Fixed out of stock items appearing in the app. * Added warehouse markers to the map * Added READY_TO_COLLECT order status to app * Added getOrderById and updateOrderStatus for merchants (#159) * I153 web qr scan (#156) * Relative api routes * Implemented QR Scanning and Order retrieving * I146 app demo 3 (#160) * Removed legacy MainActivity * Implemented image loading on warehouse items. * Added cloud zeroconf bypass * Added item images * Added OrdersActivity * Added qr code library to app * Added bob logo to app * Added ViewOrderDialog * Added qr code generation * Added quality of life improvements to shopping cart. * Fixed out of stock items appearing in the app. * Added warehouse markers to the map * Added READY_TO_COLLECT order status to app * Added post-order-submission screen & fixed server crashing * Fixed status colors not working properly * I146 app demo 3 (#161) * Removed legacy MainActivity * Implemented image loading on warehouse items. * Added cloud zeroconf bypass * Added item images * Added OrdersActivity * Added qr code library to app * Added bob logo to app * Added ViewOrderDialog * Added qr code generation * Added quality of life improvements to shopping cart. * Fixed out of stock items appearing in the app. * Added warehouse markers to the map * Added READY_TO_COLLECT order status to app * Added post-order-submission screen & fixed server crashing * Fixed status colors not working properly * Fixed refreshing after order etc not working. * Fixed bad merge * I153 web qr scan (#163) * Relative api routes * Implemented QR Scanning and Order retrieving * Order completion. Bob App download link * I141 tcp connection (#162) * Added randomToken() function * updated createUser and authUser * Fixed authUser not resolving if username or pass is not found * WIP withAuth modifier * Made initial schema with current api * Marked every API file with version 1 * WIP Initial schema v2 * Follow path forwards and backwards if threading didnt exist * Follow path forwards and backwards if threading didnt exist * Added Robot Schema * Added missing stuff to schema * Fix threading issue and reorganise code * Auth implementation with username check only. * FIxed bugs in auth after testing * Removed leftover auth code from previous implementation * Moved auth documentation to README.md * Removed unnecessary line * WIP Updating order endpoints to v2 * Updated most warehouse endpoints to v2 * Added more checks to addItem * Fixed typo * Fixed slight error in schema * Updated schema so location is a geopoint instead of a query * Move sideways count blue markers * try reversing to get back on line * I104 memory mongo (#107) * Added mongodb-memory-server dependency * Refactored db.js to use async/await * Fixed small typo in refactoring * Refactored model.js to use promises and fixed a few bugs along the way * Added fake in-memory mongodb option to the server * Added automatic initialization of the fake database with fake data. * npm run dev uses fake db by default * Added npm run dev-real option * move side to side * Removed unnecessary conditions on some endpoints. * Added error handling to schema * get back on line method * ignore blue after travelling sideways until a green marker is seen * renamed followLineServer to followLine * change run methods to have distance and reverse parameters * Added POST /warehouse to server * Added more example data to fakedb * Fixed a few bugs with the server * I41 (#113) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to structure and README * Generating warehouse floor states from .csv file * Removed print * Path Finding Starting * Demo 1 (#87) * Added android project * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * I34 (#40) * Added travis config file * travis now tests the server at the correct directory * Added build status image to main README.md * Fixed server tests in travis * Added beta branch build status to README.md * I32 (#36) * Set up server npm project * Implemented basic TCP socket server * Added RobotConnection tests * Added README.md * Added note about Prettier. * I35 (#42) * added directory for robot software * added toddler * Removed root .idea * create MOTOR_FORWARD variable * I37 (#48) * Added Firebase Functions to server * Moved Firebase project to root and reset changes made to server project * Added README.md and tidied firebase.json * Added Content to README.md * Changes to index.js * Final Updates to struct…
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #82