rr/fix/gulp-and-location-layout (#12)

* rr/main-controller (pull request #2)

rr/main-controller

* fix gulp indexHTML task

* removing unecessary elements

* main-controller base

Approved-by: Roberto Robson Soares Nogueira <[email protected]>

* Merged in rr/navigation-bar (pull request #3)

rr/navigation-bar

* navigation-bar directive

* add navigation-bar app.js dependency. set tiny md override md-button-icon

Approved-by: Roberto Robson Soares Nogueira <[email protected]>

* rr/side-menu (pull request #4)

rr/side-menu

Approved-by: Roberto Robson Soares Nogueira <[email protected]>

* rr/ng-route (pull request #5)

rr/ng-route

* rr/fix/ng-view (pull request #6)

rr/fix/ng-view

Approved-by: Roberto Robson Soares Nogueira <[email protected]>

* rr/view/home (pull request #7)

rr/view/home

Approved-by: Roberto Robson Soares Nogueira <[email protected]>

* rr/fix/issues/#1-#2 (pull request #8)

rr/fix/issues/#1-#2

* view home, set navigation bar title

* main-controller set view attribute when current path get changed

Approved-by: Roberto Robson Soares Nogueira <[email protected]>

* Merged in rr/view/location (pull request #9)

rr/view/location

* view location init

* google maps, services maps, freegeoip location, display locations on the map

Approved-by: Roberto Robson Soares Nogueira <[email protected]>

* Merged in rr/fix/gulp-and-location-layout (pull request #12)

rr/fix/gulp-and-location-layout

* gulp server task

* set map-form css

* sass location.scss fix [view=location]

Approved-by: Roberto Robson Soares Nogueira <[email protected]>

Author: betorobson

gulp-tasks/webserver.js

@@ -35,7 +35,7 @@ module.exports = function(gulp, modules){
 			'Serving files on ' + url.url
 		);
 
-		return server.start({
+		server.start({
 			port: url.port,
 			directory: './' + (modules.config.dev ? 'debug' : 'build')
 		});

src/views/location/location.html

@@ -9,14 +9,18 @@
 	<div
 		flex-xs
 		flex-sm
-		flex-gt-sm="75"
+		flex-gt-sm="70"
 		layout="column"
 	>
-		<h2 class="md-title">
-			Find a website location
-		</h2>
+		<div
+			flex="none"
+			layout="column"
+			class="map-form"
+		>
 
-		<div>
+			<h2 class="md-title">
+				Find a website location
+			</h2>
 
 			<form layout="row" name="websiteForm">
 				<md-input-container class="md-block" flex>
@@ -33,9 +37,9 @@ <h2 class="md-title">
 					</div>
 				</md-input-container>
 
-	      <md-button
-	      	type="submit"
-	      	ng-disabled="websiteForm.$invalid"
+				<md-button
+					type="submit"
+					ng-disabled="websiteForm.$invalid"
 					class="md-accent md-raised"
 					ng-click="getWebsiteLocation()"
 				>
@@ -67,6 +71,7 @@ <h2 class="md-title">
 				flex
 				layout="row"
 				layout-align="center center"
+				layout-padding
 				class="md-title error"
 			>
 				<span>Sorry, website location is not available.</span>
@@ -79,18 +84,43 @@ <h2 class="md-title">
 	</div>
 
 	<div
-		flex
+		flex-xs
+		flex-sm
+		flex-gt-sm="30"
 		layout="column"
 	>
-		<h2 class="md-title">
-			See your current location on the map
-		</h2>
-		<md-button
-			class="md-accent md-raised"
-			ng-click="getLocation()"
+
+		<div
+			flex="none"
+			layout="column"
+			class="map-form"
 		>
-			My Location
-		</md-button>
+
+			<h2 class="md-title">
+				See your location
+			</h2>
+
+			<div
+				flex="none"
+				layout="row"
+			>
+				<md-button
+					flex
+					class="md-accent md-raised"
+					ng-click="getLocation()"
+				>
+					My Location
+				</md-button>
+				<md-button
+					flex
+					class="md-raised"
+					ng-click="resetLocation()"
+				>
+					Reset
+				</md-button>
+			</div>
+
+		</div>
 
 		<div
 			layout="row"
@@ -114,6 +144,7 @@ <h2 class="md-title">
 				flex
 				layout="row"
 				layout-align="center center"
+				layout-padding
 				class="md-title error"
 			>
 				<span>Sorry, your location is not available.</span>

src/views/location/location.js

@@ -56,6 +56,17 @@
 
 			};
 
+			$scope.resetLocation = function(){
+				mapsService.setStatus(
+					$scope.userMap,
+					{
+						ready: false,
+						loading: false,
+						error: false
+					}
+				);
+			};
+
 			$scope.getWebsiteLocation = function(){
 
 				mapsService.setStatus(

src/views/location/location.scss

@@ -0,0 +1,28 @@
+
+main-controller[view=location] {
+
+	&[device=desktop] {
+		.map-wrapper {
+			height: 600px;
+		}
+	}
+
+	&[device=mobile] {
+		.map-wrapper {
+			height: 300px;
+		}
+	}
+
+	.map-form {
+		height: 110px;
+	}
+
+	.map-wrapper {
+
+		.error {
+			background-color: #ccc;
+		}
+
+	}
+
+}