From d1c7a27ac9d52aaedf6383135624d060376bacee Mon Sep 17 00:00:00 2001 From: chris ward Date: Fri, 24 Mar 2017 20:54:52 -0700 Subject: [PATCH] update dinner.js and css --- _config.yml | 1 - assets/css/style.css | 34 ++++++++++++ assets/js/dessert.js | 41 -------------- assets/js/dinner.js | 119 +++++++++++++++++----------------------- assets/js/dmd.js | 11 +++- assets/js/movie.js | 38 +------------ googleMapResturant.html | 92 +++++++++++++++++++++++++++++++ index.html | 32 ++++++----- movieSearch.html | 103 ---------------------------------- weather.html | 55 +++++++++++++++++++ wx.html | 36 ++++++++++++ 11 files changed, 296 insertions(+), 266 deletions(-) delete mode 100644 _config.yml delete mode 100644 assets/js/dessert.js create mode 100644 googleMapResturant.html delete mode 100644 movieSearch.html create mode 100644 weather.html create mode 100644 wx.html diff --git a/_config.yml b/_config.yml deleted file mode 100644 index fc24e7a..0000000 --- a/_config.yml +++ /dev/null @@ -1 +0,0 @@ -theme: jekyll-theme-hacker \ No newline at end of file diff --git a/assets/css/style.css b/assets/css/style.css index f9ff1a7..17f216c 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -8,4 +8,38 @@ body { } .secondaryColor{ color: #FF0000; +} + +.movie { + background-color: skyblue; + text-align: center; + font-family: Bangers; + padding: 20px; + font-size: 20px; + border-radius: 12px; +} + +.movieButton { + background-color: skyblue; + border-radius: 25px; + border-color: #f00000; + border-width: 5px; + color: #f00000; +} + +.titleButton { + background-color: #f0f0f0; + border-radius: 25px; + border-color: goldenrod; + font-family: Aldrich; + font-weight: 800; + border-width: 5px; + color: #f00000; + font-size: 20px; + padding: 20px; + margin: 20px; +} + +#map { + height: 100%; } \ No newline at end of file diff --git a/assets/js/dessert.js b/assets/js/dessert.js deleted file mode 100644 index f692287..0000000 --- a/assets/js/dessert.js +++ /dev/null @@ -1,41 +0,0 @@ -// https://developers.google.com/places/javascript/ -// google places API key -// AIzaSyBOvLvUWU-_rQ1MpLYVQCcZ1byL-Prp1po - -function initialize() { - var pyrmont = new google.maps.LatLng(-33.8665, 151.1956); - - var map = new google.maps.Map(document.getElementById('map'), { - center: pyrmont, - zoom: 15, - scrollwheel: false - }); - - // Specify location, radius and place types for your Places API search. - var request = { - location: pyrmont, - radius: '500', - types: ['store'] - }; - - // Create the PlaceService and send the request. - // Handle the callback with an anonymous function. - var service = new google.maps.places.PlacesService(map); - service.nearbySearch(request, function(results, status) { - if (status == google.maps.places.PlacesServiceStatus.OK) { - for (var i = 0; i < results.length; i++) { - var place = results[i]; - // If the request succeeds, draw the place location on - // the map as a marker, and register an event to handle a - // click on the marker. - var marker = new google.maps.Marker({ - map: map, - position: place.geometry.location - }); - } - } - }); -} - -// Run the initialize function when the window has finished loading. -google.maps.event.addDomListener(window, 'load', initialize); \ No newline at end of file diff --git a/assets/js/dinner.js b/assets/js/dinner.js index c094b88..a4778b5 100644 --- a/assets/js/dinner.js +++ b/assets/js/dinner.js @@ -1,72 +1,53 @@ - - - - Dinner Search - - - - - -
- - -
-
- - - - \ No newline at end of file + } + + function createMarker(place) { + var placeLoc = place.geometry.location; + var marker = new google.maps.Marker({ + map: map, + position: place.geometry.location, + }); + + google.maps.event.addListener(marker, 'click', function() { + infoWindow.setContent(place.name); + infoWindow.open(map, this); + }); + diff --git a/assets/js/dmd.js b/assets/js/dmd.js index 6761ac5..2317ac5 100644 --- a/assets/js/dmd.js +++ b/assets/js/dmd.js @@ -1,6 +1,6 @@ - -$("#userName"); -$("#zipCode"); +// Store input in Firebase +// $("#userName"); +// $("#zipCode"); // Initialize Firebase var config = { @@ -11,3 +11,8 @@ $("#zipCode"); messagingSenderId: "303213824340" }; firebase.initializeApp(config); + + $("#submitModal").on("click", function() { + $("#movieGen").html("
"); + initMap(); + }) diff --git a/assets/js/movie.js b/assets/js/movie.js index 4dd738e..2b7692c 100644 --- a/assets/js/movie.js +++ b/assets/js/movie.js @@ -1,35 +1,9 @@ - - - - - - Favorite Movies - - - - - -
-

Movie Search

- - - -
- - - -
- - - \ No newline at end of file + diff --git a/googleMapResturant.html b/googleMapResturant.html new file mode 100644 index 0000000..92dd912 --- /dev/null +++ b/googleMapResturant.html @@ -0,0 +1,92 @@ + + + + Geocoding service + + + + + + +
+ + +
+
+ + + + + \ No newline at end of file diff --git a/index.html b/index.html index 7915797..3f9f7c8 100644 --- a/index.html +++ b/index.html @@ -11,7 +11,7 @@ - DinnerMovieDessert + DinnerMovie @@ -20,9 +20,9 @@
- + -Click Me to get started-
-

Spin the wheel and chill...

+
-
- Dinner +
+
-
- Movie +
+
+

Movie Search

+ +
+ +
-

What to wear?

-

Weather

+

Weather API

+ + + + diff --git a/movieSearch.html b/movieSearch.html deleted file mode 100644 index 4dd738e..0000000 --- a/movieSearch.html +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - Favorite Movies - - - - - -
-

Movie Search

- - - -
- - - -
- - - \ No newline at end of file diff --git a/weather.html b/weather.html new file mode 100644 index 0000000..1c18044 --- /dev/null +++ b/weather.html @@ -0,0 +1,55 @@ + + + + + + + + + + +
+
+
+
+ + + + + \ No newline at end of file diff --git a/wx.html b/wx.html new file mode 100644 index 0000000..b7e4fd7 --- /dev/null +++ b/wx.html @@ -0,0 +1,36 @@ + + + + + + + + + + + +
London
+
+
+
+ title +
+
+
7°C
+
+
+
+
Clouds: 90%
+
Humidity: 81%
+
Wind: 4.6 m/s
+
Pressure: 1012hpa
+
+
+ More.. +
+ + + \ No newline at end of file