final commit

skhchiang · May 15, 2018 · dc831ae · dc831ae
1 parent 3d9b488
commit dc831ae
Show file tree

Hide file tree

Showing 69 changed files with 153 additions and 23,543 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
-
 /node_modules
 .env
 /database/node_modules
diff --git a/API/.gitignore b/API/.gitignore
diff --git a/API/hotelbeds_get.js b/API/hotelbeds_get.js
diff --git a/API/hotelbeds_post.js b/API/hotelbeds_post.js
diff --git a/API/package-lock.json b/API/package-lock.json
diff --git a/API/package.json b/API/package.json
diff --git a/API/results b/API/results
diff --git a/Kiwi booking api b/Kiwi booking api
diff --git a/Mock Site/css/main.css b/Mock Site/css/main.css
diff --git a/Mock Site/img/China.jpg b/Mock Site/img/China.jpg
diff --git a/Mock Site/img/Japan.jpg b/Mock Site/img/Japan.jpg
diff --git a/Mock Site/img/Korea.jpg b/Mock Site/img/Korea.jpg
diff --git a/Mock Site/img/Taiwan.jpg b/Mock Site/img/Taiwan.jpg
diff --git a/Mock Site/img/architecture.jpg b/Mock Site/img/architecture.jpg
diff --git a/Mock Site/img/art.jpg b/Mock Site/img/art.jpg
diff --git a/Mock Site/img/busan.jpg b/Mock Site/img/busan.jpg
diff --git a/Mock Site/img/changdeokgung_palace.jpg b/Mock Site/img/changdeokgung_palace.jpg
diff --git a/Mock Site/img/food_and_drinks.jpg b/Mock Site/img/food_and_drinks.jpg
diff --git a/Mock Site/img/great_wall.jpg b/Mock Site/img/great_wall.jpg
diff --git a/Mock Site/img/historic_and_political.jpg b/Mock Site/img/historic_and_political.jpg
diff --git a/Mock Site/img/local_traditions.jpg b/Mock Site/img/local_traditions.jpg
diff --git a/Mock Site/img/meiji_shrine.jpg b/Mock Site/img/meiji_shrine.jpg
diff --git a/Mock Site/img/museum.jpg b/Mock Site/img/museum.jpg
diff --git a/Mock Site/img/music_and_drama.jpg b/Mock Site/img/music_and_drama.jpg
diff --git a/Mock Site/img/shanghai.jpg b/Mock Site/img/shanghai.jpg
diff --git a/Mock Site/img/taipei.jpg b/Mock Site/img/taipei.jpg
diff --git a/Mock Site/img/taipei_101.jpg b/Mock Site/img/taipei_101.jpg
diff --git a/Mock Site/img/tokyo.jpg b/Mock Site/img/tokyo.jpg