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

website/assets/sass/style.sass

@@ -8,8 +8,8 @@
 // Colors
 $primary: #c045b6 
 $primary-light: #e86be5
-$link: #00D848 
-$link-light: #38F987
+$link: #529eba 
+$link-light: #82c4dc
 $text: #333
 
 // $link-invert: $blue-invert
@@ -358,7 +358,11 @@ $shadow: 0 .1rem .4rem .1rem rgba(41, 41, 41, 0.1)
  background: $primary
  &.is-link
  background: $gradient-link
- box-shadow: $shadow-link
+ // box-shadow: $shadow-link
+ color: #fff
+
+ &:hover
+ color: #fff
 
  &:before
  background: $link
@@ -681,30 +685,30 @@ main
  .main-content 
  padding-top: $header-height
 
- &:before
- content: ""
- width: 14rem
- height: 20rem
- position: absolute
- z-index: 0
- top: 2rem
- right: 0
+ // &:before
+ //  content: ""
+ //  width: 14rem
+ //  height: 20rem
+ //  position: absolute
+ //  z-index: 0
+ //  top: 2rem
+ //  right: 0
  // background: url('../images/svg/purple-mesh-rotate.svg') center no-repeat
 
- @include tablet
- display: none
- &:after
- content: ""
- width: 30rem
- height: 30rem
- position: absolute
- z-index: 0
- top: 60%
- right: 0
- // background: url('../images/svg/green-donut.svg') center no-repeat
+ // @include tablet
+ //  display: none
+ // &:after
+ //  content: ""
+ //  width: 30rem
+ //  height: 30rem
+ //  position: absolute
+ //  z-index: 0
+ //  top: 60%
+ //  right: 0
+ //  // background: url('../images/svg/green-donut.svg') center no-repeat
 
- @include tablet
- display: none
+ //  @include tablet
+ //  display: none
 
 .has-bckg-grey
  background: #eee

website/components/AbsFooter.vue

@@ -31,8 +31,8 @@
  <svg viewBox="0 0 1330 419" class="footer-bckg">
  <defs>
  <linearGradient x1="105.189448%" y1="108.514767%" x2="0%" y2="21.3648885%" id="linearGradient-1">
- <stop stop-color="#004FFF" offset="0%"></stop>
- <stop stop-color="#0093FF" offset="100%"></stop>
+ <stop stop-color="#529eba" offset="0%"></stop>
+ <stop stop-color="#82c4dc" offset="100%"></stop>
  </linearGradient>
  <linearGradient x1="90.7814356%" y1="19.4594161%" x2="8.02921532%" y2="86.6485037%" id="linearGradient-2">
  <stop stop-color="#FFFFFF" offset="0%"></stop>