added html5Mode enabled to remove hash from url and change links to match

nearbycoder · nearbycoder · commit 94a83e6ace40 · 2015-06-28T14:22:27.000-05:00
diff --git a/client/app/index.html b/client/app/index.html
@@ -2,6 +2,7 @@
 <html class="no-js">
   <head>
     <meta charset="utf-8">
+    <base href="/">
     <title></title>
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width">
diff --git a/client/app/scripts/app.js b/client/app/scripts/app.js
@@ -15,7 +15,8 @@ angular
     'ngSanitize',
     'ngTouch'
   ])
-  .config(function ($stateProvider, $urlRouterProvider) {
+  .config(function ($stateProvider, $urlRouterProvider, $locationProvider) {
+    $locationProvider.html5Mode(true);
     $urlRouterProvider.otherwise('/');
 
     $stateProvider
diff --git a/client/app/scripts/controllers/main.js b/client/app/scripts/controllers/main.js
@@ -25,7 +25,7 @@ angular.module('materialPollApp')
             $http.post(myConfig.backend,{answers: $scope.options, name: $scope.title, multiple: $scope.multiple, votes: votes})
             .success(function(data){
                 $scope.linkto = data[1].poll.id;
-                $scope.location = window.location.protocol + window.location.host + '/#/' + $scope.linkto;
+                $scope.location = window.location.protocol + window.location.host + '/' + $scope.linkto;
             });
         }
     };
diff --git a/client/app/views/main.html b/client/app/views/main.html
@@ -18,7 +18,7 @@
           <label for="test5" class='red-text text-lighten-5'>Allow multiple poll choices?</label>
         </p>
         <a ng-click="submit()" ng-if="!linkto" class="submitButton waves-effect waves-light btn red lighten-2 red-text text-lighten-5">Create Poll</a>
-        <a ng-href="#/{{linkto}}" ng-if="linkto" class="waves-effect waves-light btn red lighten-2 red-text text-lighten-5">View Poll</a>
+        <a ng-href="{{linkto}}" ng-if="linkto" class="waves-effect waves-light btn red lighten-2 red-text text-lighten-5">View Poll</a>
         <p ng-if="linkto" style="display:inline" class="red-text text-lighten-5">Url: {{location}}</p>
       </div>
     </div>

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ angular.module('materialPollApp')`
`25`	`25`	`$http.post(myConfig.backend,{answers: $scope.options, name: $scope.title, multiple: $scope.multiple, votes: votes})`
`26`	`26`	`.success(function(data){`
`27`	`27`	`$scope.linkto = data[1].poll.id;`
`28`		`- $scope.location = window.location.protocol + window.location.host + '/#/' + $scope.linkto;`
	`28`	`+ $scope.location = window.location.protocol + window.location.host + '/' + $scope.linkto;`
`29`	`29`	`});`
`30`	`30`	`}`
`31`	`31`	`};`