Setup car view #29

Karyum · 2017-05-15T21:16:46Z

DO NOT MERGE

Untill @philawsophizing pull request is merged
close #25

Karyum · 2017-05-16T07:45:01Z

philawsophizing · 2017-05-16T07:45:28Z

@Karyum
Can you merge #28 (if you're happy with it) first then finish the car route with:

I updated the issue.

Karyum · 2017-05-16T08:35:06Z

Karyum added 9 commits May 15, 2017 15:35

adds a route for car

613f1a6

Merge branch 'master' into setupCarView

ec06b42

adds a car view and partial for header and make a route for them

bf44283

adds a map on the car page using leaflet #25

f6157eb

fix some issues with linter

baa9004

adds an arrived button and a back button to the car page

4a5107c

resolve merge conflict

6c048a3

adds some css to the page and refactor handlabars code #25

058dc63

adds css for the whole page #25

46667a2

Karyum requested a review from philawsophizing May 15, 2017 21:16

Karyum added 4 commits May 16, 2017 10:49

an attempt to escape merge conflict

1ca6042

resolve conflict

b58cffc

adds functionality to the back button in car page #25

a5611d9

adds functionality to the car route button #25

be6aa5d

Karyum and others added 2 commits May 16, 2017 11:38

remove some unused code

e73e509

Update .gitignore

bbbcc1b

philawsophizing approved these changes May 16, 2017

View reviewed changes

philawsophizing merged commit 8b59225 into master May 16, 2017

philawsophizing deleted the setupCarView branch May 16, 2017 08:48