Submission - #7

Open

chongct wants to merge 163 commits into

wdi-sg:masterfrom

Commits on Feb 14, 2018

react setup
chongct
committed
01635b5
bootstrap setup
chongct
committed
0da0c5e
edited README.md
limjiechao
committed
6226319

Commits on Feb 15, 2018

functional map
chongct
committed
dd35eee
Merge branch 'master' of https://github.com/chongct/project-4
chongct
committed
b8a108f

Commits on Feb 16, 2018

locations connected to DB
chongct
committed
468e3cc
Merge branch 'chongct'
chongct
committed
222aee0

Commits on Feb 19, 2018

itinerary and per-day table components
limjiechao
committed
df8e59d
Test for getting target id

Wong Kin Ting
authored and
Wong Kin Ting
committed
0b0818d
Added routes, homecontroller
speedchan
committed
a639482
location controller CRD
chongct
committed
a796ae1
Merge branch 'backend' of https://github.com/chongct/project-4 into chongct

Wong Kin Ting
authored and
Wong Kin Ting
committed
de5af75
updated app.js with mock event add

Wong Kin Ting
authored and
Wong Kin Ting
committed
a236062
routes, homecontroller
speedchan
committed
5ba77e9
Event and Trip Model Added. Trip Controller Partial
keed
committed
19510e4

Commits on Feb 20, 2018

Updated Routes
keed
committed
8025acf
minor changes to amke sure everything is ok
speedchan
committed
ba47c63
commit for handing over to Speed
limjiechao
committed
8df188d
Merge branch 'UI-merge' of https://github.com/chongct/project-4 into UI-merge
speedchan
committed
5d489f6
Updated Routes,TripController and Server.js
keed
committed
c0fc881
Package Update
keed
committed
ff35b8f
Updated package.json
keed
committed
cfabb26
add btn in map
chongct
committed
93942f4
Current working build for testing Event Controller Functionalities

Wong Kin Ting
authored and
Wong Kin Ting
committed
03e2725
Merge branch 'UI-merge' of https://github.com/chongct/project-4 into UI-merge

Wong Kin Ting
authored and
Wong Kin Ting
committed
0fd04dd
ENV and Package.json
keed
committed
88c9fce
Procfile
keed
committed
001d610
merged home.js and related files
limjiechao
committed
380226d
Updated Package.json
keed
committed
ef2178b
styling changes
speedchan
committed
5bb0676
Merge branch 'UI-merge' of https://github.com/chongct/project-4 into UI-merge
speedchan
committed
6c02de4
Merge branch 'UI-merge' into spd
speedchan
committed
f95bf19
merged with CTs UI-merge
speedchan
committed
5f13cef
Displaying data in Locations Container

Wong Kin Ting
authored and
Wong Kin Ting
committed
ef1787f
Merge branch 'UI-merge' of https://github.com/chongct/project-4 into UI-merge

Wong Kin Ting
authored and
Wong Kin Ting
committed
0c7671e
Updated Package.json
keed
committed
3b3cd28
Locations Column Data Retrieval Setup.

Wong Kin Ting
authored and
Wong Kin Ting
committed
863c771
Update package.json
keed
committed
4c6471d
deleted fake homecontroller
speedchan
committed
c820c4b
Merge branch 'master' of https://github.com/chongct/project-4 into spd
speedchan
committed
f41bb2b
add locations function in progress
chongct
committed
0b55c2c
fix event controller
chongct
committed
259df48
add locations btn in progress
chongct
committed
8597e96
days and tabs

Edmund Teo
authored and
Edmund Teo
committed
aa35ebd
add from location to itinerary in progress

Edmund Teo
authored and
Edmund Teo
committed
985ef37

Commits on Feb 21, 2018

add location function completed
chongct
committed
f6cf697
minor changes
speedchan
committed
298bd01
Merge branch 'master' into spd
speedchan
committed
ca88c1a
responsive landing page
limjiechao
committed
76fa2bd
renamed App.css to Home.css to avoid conflicts
limjiechao
committed
658685b
Merge branch 'master' of https://github.com/chongct/project-4 into emjys-jc
limjiechao
committed
308303e
del location function completed
chongct
committed
7225e6a
Updated Package.json
keed
committed
f3b2c4e
Merge branch 'master' of https://github.com/chongct/project-4
limjiechao
committed
195d657
Updated for Deployment
keed
committed
bb488fa
modified searched locations list
limjiechao
committed
75803b4
Merge branch 'master' of https://github.com/chongct/project-4
limjiechao
committed
49cd331
date, event, itinerary

Edmund Teo
authored and
Edmund Teo
committed
2d65216
Updated API links
keed
committed
fcc5023
Merge branch 'master' of https://github.com/chongct/project-4
keed
committed
cef616a
Delete secrets.env
keed
authored
0aca92d
Updated gitignore
keed
committed
14e00ea
Merge branch 'master' of https://github.com/chongct/project-4
keed
committed
2ce54ff
UI changes!
speedchan
committed
9f053a5
fix model reference
chongct
committed
3d89498
Current build with connected update button

Wong Kin Ting
authored and
Wong Kin Ting
committed
e20e32d
Merge branch '20feb' of https://github.com/chongct/project-4 into 20feb

Wong Kin Ting
authored and
Wong Kin Ting
committed
303b02d
model routes and itinary

Edmund Teo
authored and
Edmund Teo
committed
b284b0d
Latest build with working refs for update

Wong Kin Ting
authored and
Wong Kin Ting
committed
a8c1715
merge for itinerary

Edmund Teo
authored and
Edmund Teo
committed
f20565e
event, app

Edmund Teo
authored and
Edmund Teo
committed
f542f84
merged spd with master
speedchan
committed
adf4f99
WOrking CRUD for events

Wong Kin Ting
authored and
Wong Kin Ting
committed
935d153
css changes
speedchan
committed
1d229ef
Merge branch '20feb' of https://github.com/chongct/project-4 into 20feb
speedchan
committed
ed40cfa
prepare to merger front end

Edmund Teo
authored and
Edmund Teo
committed
4799547
Merge branch '20feb' of https://github.com/chongct/project-4 into 20feb

Edmund Teo
authored and
Edmund Teo
committed
a9dc50a
updated the reverse order and latest

Edmund Teo
authored and
Edmund Teo
committed
709ed17

Commits on Feb 22, 2018

Latest build

Wong Kin Ting
authored and
Wong Kin Ting
committed
c22097a
Merge branch '20feb' of https://github.com/chongct/project-4 into 20feb

Wong Kin Ting
authored and
Wong Kin Ting
committed
b3e1782
mend merge errors
chongct
committed
918b8ff
spd change
speedchan
committed
e9d8181
fixed small erors
speedchan
committed
b861749
changes to Dates, DayTable, Locations

Edmund Teo
authored and
Edmund Teo
committed
4b4e2ab
fix merge errors
chongct
committed
b747d9e
fix merge errors
chongct
committed
b9ae7a4
Latest build with disconnected Events & Locations Models

Wong Kin Ting
authored and
Wong Kin Ting
committed
6758c15
Merge branch '21feb' of https://github.com/chongct/project-4 into 21feb

Wong Kin Ting
authored and
Wong Kin Ting
committed
5f757b2
Latest build

Wong Kin Ting
authored and
Wong Kin Ting
committed
2b91793
fixing css
speedchan
committed
51c1611
Fixed descriptions display

Wong Kin Ting
authored and
Wong Kin Ting
committed
e1bd7cb
MERGED WITH 21FEB 1151AM
speedchan
committed
46193d1
updated README.md
emjys
committed
a8f76b3
replaced dummy text in home.js
emjys
committed
7a474d1
Updated Trip Controller and Map API
keed
committed
7248941
making home.js the landing page
limjiechao
committed
0770041
Merge branch '21feb' of https://github.com/chongct/project-4 into 21feb
limjiechao
committed
afafeb9
Merge branch 'master' of https://github.com/chongct/project-4
limjiechao
committed
d56f7bc
Removed Unused files and console logs
keed
committed
dfdf713
scroll on event table
chongct
committed
9be8d82
Merge branch '21feb' of https://github.com/chongct/project-4 into 21feb
chongct
committed
e3dc9ca
home.js is the landing page
limjiechao
committed
aa1cf50
css for app and locations
speedchan
committed
0c9b5b4
Merge branch '21feb' into spd
speedchan
committed
edabe07
Cleaned up unnecessary code

Wong Kin Ting
authored and
Wong Kin Ting
committed
0d922b0
more css, plus scroll to top
speedchan
committed
353efd9
Cleaned up the code a tad more

Wong Kin Ting
authored and
Wong Kin Ting
committed
8e7f830
Merge branch '21feb' of https://github.com/chongct/project-4 into 21feb

Wong Kin Ting
authored and
Wong Kin Ting
committed
b0b012e
merged with kt
speedchan
committed
b9f771a
Minor changes

Wong Kin Ting
authored and
Wong Kin Ting
committed
6aeff68
Merge branch '21feb' of https://github.com/chongct/project-4 into 21feb

Wong Kin Ting
authored and
Wong Kin Ting
committed
96ccd0d
react routing completed
limjiechao
committed
b95da28
As requested by Boss

Wong Kin Ting
authored and
Wong Kin Ting
committed
f1734f3
controller

Edmund Teo
authored and
Edmund Teo
committed
048a821
Merge branch 'trip' into 21feb

Edmund Teo
authored and
Edmund Teo
committed
0614e48
changed logo n conflict between pages
speedchan
committed
5296d20
spd merge with mupdated master
speedchan
committed
cea66b3
Updated React Routes
keed
committed
5a664d0
changes
speedchan
committed
33e29b0
Merge branch 'master' into spd
speedchan
committed
35b2cf0
small change to app.js
speedchan
committed
978bcb0
rename CSS class .logo to .brand in Home.css
limjiechao
committed
78963cb
Merge branch 'master' into spd
speedchan
committed
6b41746
Update backend routes
keed
committed
02f9776
Merge branch 'master' of https://github.com/chongct/project-4
keed
committed
f0b1c74
integrate trip id
chongct
committed
9197fad
Merge branch 'master' of https://github.com/chongct/project-4
chongct
committed
2882b25
change on controller

Edmund Teo
authored and
Edmund Teo
committed
4d74b01
Updated Backend Routes
keed
committed
ed155ef
updated erd
emjys
committed
3715add
Updated Trip Controller
keed
committed
6f29eab
wanna revert back

Edmund Teo
authored and
Edmund Teo
committed
04e4f1f
trip id for locations
chongct
committed
d92d4f9
Merge branch 'master' of https://github.com/chongct/project-4
chongct
committed
49eea84
removed text field
limjiechao
committed
16f304b
Merge branch '21feb'

Edmund Teo
authored and
Edmund Teo
committed
0c10deb
Merge branch 'masTemp'

Edmund Teo
authored and
Edmund Teo
committed
3b61fd8
edit of controller tripID

Edmund Teo
authored and
Edmund Teo
committed
c8f6022
trip id for locations del fn
chongct
committed
43372a0
Merge branch 'master' of https://github.com/chongct/project-4
chongct
committed
e30edfe
Update Trip Controller and Trip Routes
keed
committed
37b1457
working on event trip id

Edmund Teo
authored and
Edmund Teo
committed
0220386
Merge branch 'master' of https://github.com/chongct/project-4

Edmund Teo
authored and
Edmund Teo
committed
d5ac993
fixes to css
speedchan
committed
cc7886a
Merge branch 'master' of https://github.com/chongct/project-4
speedchan
committed
b9350b4
URL now shows in share URL text field
limjiechao
committed
3bca970
event routes

Edmund Teo
authored and
Edmund Teo
committed
a9d154c
Merge branch 'master' of https://github.com/chongct/project-4

Edmund Teo
authored and
Edmund Teo
committed
8c98350
updated ERD
emjys
committed
6438836
Updated Trip Controller
keed
committed
45682c1
app

Edmund Teo
authored and
Edmund Teo
committed
a7bac57
Merge branch 'master' of https://github.com/chongct/project-4

Edmund Teo
authored and
Edmund Teo
committed
56e4350
widened url copy bar
speedchan
committed
dab2269
Merge branch 'master' of https://github.com/chongct/project-4
speedchan
committed
41a0798
updated ERD
emjys
committed
7be2c1e
error with date

Edmund Teo
authored and
Edmund Teo
committed
0682803
Merge branch 'master' of https://github.com/chongct/project-4
emjys
committed
de91dae
copy URL to clipboard with popover to notify user
limjiechao
committed
9a40ec4
Merge branch 'master' of https://github.com/chongct/project-4
speedchan
committed
e8006ce
Merge branch 'master' of https://github.com/chongct/project-4
emjys
committed
81cca8f
Merge branch 'master' of https://github.com/chongct/project-4
speedchan
committed
ab8c5b3
heroku

Edmund Teo
authored and
Edmund Teo
committed
0c196c6
updated flowchart
emjys
committed
ba3ba7e