Merge pull request #646 from hhaccessibility/profile-route-changes

joshi1983 · web-flow · commit 5351e1bf020b · 2018-07-21T09:10:15.000-04:00
Profile route changes
diff --git a/app/app/Http/Controllers/LocationSearchController.php b/app/app/Http/Controllers/LocationSearchController.php
@@ -195,7 +195,7 @@ public function __construct($params)
 
     private static function getURLFromParameters($params)
     {
-        $url = '/location-search?';
+        $url = '/location/search?';
         $needs_ampersand = false;
         foreach ($params as $param_name => $param_value) {
             if ($needs_ampersand) {
diff --git a/app/public/js/home.js b/app/public/js/home.js
@@ -181,7 +181,7 @@ function updateCategoryLinksOffKeywords()
 		var $this = $(this);
 		var oldUrl = $this.attr('href');
 		var location_category_id = getLocationCategoryIdFromURL(oldUrl);
-		var newUrl = '/location-search?location_tag_id=' + location_category_id;
+		var newUrl = '/location/search?location_tag_id=' + location_category_id;
 		if ( keywords )
 		{
 			newUrl = newUrl + '&keywords=' + keywords;
diff --git a/app/public/js/profile.js b/app/public/js/profile.js
@@ -153,7 +153,7 @@ function rotateImage()
 		'data': {
 			'_token': token
 		},
-		'url': '/profile-photo-rotate',
+		'url': '/profile-photo/rotate',
 		'success': function() {
 			randomizePhotoURL().then(showRotateFeature);
 		}
diff --git a/app/resources/views/pages/home.blade.php b/app/resources/views/pages/home.blade.php
@@ -66,7 +66,7 @@
 				</div>
 				<div class="search">
 					{{ csrf_field() }}
-					<form role="search" action="/location-search">
+					<form role="search" action="/location/search">
 						<div class="address-row">
 							<datalist id="location_search_options">
 								@foreach ($location_search_options as $option)
@@ -104,7 +104,7 @@ class="form-control"
 					@foreach ( $location_tags as $key => $value )
 
 						<div class="location-tag col-sm-4 col-xs-6">
-							<a href="/location-search?location_tag_id={{ $value->id }}" title="{{ $value->description }}">
+							<a href="/location/search?location_tag_id={{ $value->id }}" title="{{ $value->description }}">
 							{{ $value->name }}
 							</a>
 						</div>
diff --git a/app/resources/views/pages/location_report/collapsed.blade.php b/app/resources/views/pages/location_report/collapsed.blade.php
@@ -35,7 +35,7 @@
 				</a>
 			@endif
 			@foreach ( $location->tags()->orderBy('name')->get() as $location_tag )
-				<a class="location-tag" title="{{ $location_tag->name }}" href="/location-search?location_tag_id={{ $location_tag->id }}">
+				<a class="location-tag" title="{{ $location_tag->name }}" href="/location/search?location_tag_id={{ $location_tag->id }}">
 					<span class="name">{{ $location_tag->name }}</span>
 					<span class="icon {{ $location_tag->icon_selector }}"></span>
 				</a>
diff --git a/app/resources/views/pages/location_report/map.blade.php b/app/resources/views/pages/location_report/map.blade.php
@@ -51,7 +51,7 @@ function centreLocation() {
 		<div class="col-xs-7 text-right">
 			<div class="location-tags">
 			@foreach ( $location->tags()->orderBy('name')->get() as $location_tag )
-				<a class="location-tag" title="{{ $location_tag->name }}" href="/location-search?location_tag_id={{ $location_tag->id }}">
+				<a class="location-tag" title="{{ $location_tag->name }}" href="/location/search?location_tag_id={{ $location_tag->id }}">
 					<span class="name">{{ $location_tag->name }}</span>
 					<span class="icon {{ $location_tag->icon_selector }}"></span>
 				</a>
diff --git a/app/resources/views/pages/location_report/ratings_only.blade.php b/app/resources/views/pages/location_report/ratings_only.blade.php
@@ -17,7 +17,7 @@
 		<div class="col-xs-7 text-right">
 			<div class="location-tags">
 			@foreach ( $location->tags()->orderBy('name')->get() as $location_tag )
-				<a class="location-tag" title="{{ $location_tag->name }}" href="/location-search?location_tag_id={{ $location_tag->id }}">
+				<a class="location-tag" title="{{ $location_tag->name }}" href="/location/search?location_tag_id={{ $location_tag->id }}">
 					<span class="name">{{ $location_tag->name }}</span>
 					<span class="icon {{ $location_tag->icon_selector }}"></span>
 				</a>
diff --git a/app/resources/views/pages/profile/profile.blade.php b/app/resources/views/pages/profile/profile.blade.php
@@ -14,7 +14,7 @@
 	<div class="col-md-3 col-sm-4 col-xs-12">
 		@if ($has_profile_photo)
 			<div class="photo-display">
-			    <p class="remove-photo"><a href="/profile-photo-delete">Remove Photo</a></p>
+			    <p class="remove-photo"><a href="/profile-photo/delete">Remove Photo</a></p>
 				<div id="profile-photo-rotate" onclick="rotateImage()"><i class="fa fa-repeat fa-4x"></i></div>
 				<div class="photo-changer" onclick="selectImageFile()">
 					<div class="uploaded-photo">
diff --git a/app/routes/location.php b/app/routes/location.php
@@ -1,6 +1,6 @@
 <?php
 
-Route::get('location-search', 'LocationSearchController@search');
+Route::get('location/search', 'LocationSearchController@search');
 Route::get('get-nearby-locations/{longitude}/{latitude}', 'LocationManagementController@getLocationsNear');
 Route::get('delete-my-location/{location_id}', 'LocationManagementController@deleteMyLocation');
 Route::get('location-modify/{location_id}', 'LocationManagementController@show');
diff --git a/app/routes/profile.php b/app/routes/profile.php
@@ -10,5 +10,5 @@
 });
 
 Route::get('profile-photo', 'ProfilePhotoController@photo');
-Route::post('profile-photo-rotate', 'ProfilePhotoController@rotate');
-Route::get('profile-photo-delete', 'ProfilePhotoController@delete');
+Route::post('profile-photo/rotate', 'ProfilePhotoController@rotate');
+Route::get('profile-photo/delete', 'ProfilePhotoController@delete');
diff --git a/app/tests/LocationSearchRadiusTest.php b/app/tests/LocationSearchRadiusTest.php
@@ -13,7 +13,7 @@ public static function useDistance($testCase, $testDistance)
         $testCase->assertTrue(isset($response_data->message));
 
         // Check that the radius was set.
-        $response = $testCase->get('/location-search?location_tag_id=1');
+        $response = $testCase->get('/location/search?location_tag_id=1');
         $testCase->assertEquals(200, $response->getStatusCode());
         $search_content = $response->getContent();
         $pos = strpos($search_content, 'placeholder="distance" value="'.$testDistance.'"');
diff --git a/app/tests/LocationSearchTest.php b/app/tests/LocationSearchTest.php
@@ -12,7 +12,7 @@ private function checkLocationSearchTableContent($content)
     
     public function testSortByName()
     {
-        $response = $this->get('/location-search?location_tag_id=1&keywords=&order_by=name');
+        $response = $this->get('/location/search?location_tag_id=1&keywords=&order_by=name');
         $this->assertEquals(200, $response->getStatusCode());
         $content = $response->getContent();
         $this->assertTrue(strpos($content, 'spreadsheet sort-by-name') !== false);
@@ -21,7 +21,7 @@ public function testSortByName()
 
     public function testSortByDistance()
     {
-        $response = $this->get('/location-search?location_tag_id=1&keywords=&order_by=distance');
+        $response = $this->get('/location/search?location_tag_id=1&keywords=&order_by=distance');
         $this->assertEquals(200, $response->getStatusCode());
         $content = $response->getContent();
         $this->assertTrue(strpos($content, 'spreadsheet sort-by-distance') !== false);
@@ -30,7 +30,7 @@ public function testSortByDistance()
 
     public function testSortByRating()
     {
-        $response = $this->get('/location-search?location_tag_id=1&keywords=&order_by=rating');
+        $response = $this->get('/location/search?location_tag_id=1&keywords=&order_by=rating');
         $this->assertEquals(200, $response->getStatusCode());
         $content = $response->getContent();
         $this->assertTrue(strpos($content, 'spreadsheet sort-by-rating') !== false);
@@ -39,7 +39,7 @@ public function testSortByRating()
 
     public function testMapView()
     {
-        $response = $this->get('/location-search?keywords=&order_by=rating&location_tag_id=1&view=map');
+        $response = $this->get('/location/search?keywords=&order_by=rating&location_tag_id=1&view=map');
         $this->assertEquals(200, $response->getStatusCode());
         $content = $response->getContent();
         $this->assertTrue(strpos($content, 'Location Search Results') !== false);

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ public function __construct($params)`
`195`	`195`
`196`	`196`	`private static function getURLFromParameters($params)`
`197`	`197`	`{`
`198`		`- $url = '/location-search?';`
	`198`	`+ $url = '/location/search?';`
`199`	`199`	`$needs_ampersand = false;`
`200`	`200`	`foreach ($params as $param_name => $param_value) {`
`201`	`201`	`if ($needs_ampersand) {`
Original file line number	Diff line number	Diff line change
`@@ -181,7 +181,7 @@ function updateCategoryLinksOffKeywords()`
`181`	`181`	`var $this = $(this);`
`182`	`182`	`var oldUrl = $this.attr('href');`
`183`	`183`	`var location_category_id = getLocationCategoryIdFromURL(oldUrl);`
`184`		`- var newUrl = '/location-search?location_tag_id=' + location_category_id;`
	`184`	`+ var newUrl = '/location/search?location_tag_id=' + location_category_id;`
`185`	`185`	`if ( keywords )`
`186`	`186`	`{`
`187`	`187`	`newUrl = newUrl + '&keywords=' + keywords;`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ function rotateImage()`
`153`	`153`	`'data': {`
`154`	`154`	`'_token': token`
`155`	`155`	`},`
`156`		`- 'url': '/profile-photo-rotate',`
	`156`	`+ 'url': '/profile-photo/rotate',`
`157`	`157`	`'success': function() {`
`158`	`158`	`randomizePhotoURL().then(showRotateFeature);`
`159`	`159`	`}`