Merge pull request #649 from hhaccessibility/location-report-rename

joshi1983 · web-flow · commit 930db1b5d420 · 2018-07-22T14:42:22.000-04:00
Location report rename
diff --git a/app/app/Http/Controllers/LocationRatingController.php b/app/app/Http/Controllers/LocationRatingController.php
@@ -113,7 +113,7 @@ public function show(string $location_id, int $question_category_id = null)
     {
         if (!BaseUser::isSignedIn()) {
             $message = "You+must+sign+in+to+rate+a+location";
-            $afterSignInRedirect = "/location-rating/$location_id";
+            $afterSignInRedirect = "/location/rating/$location_id";
             return redirect()->intended("/signin?message=$message&after_signin_redirect=$afterSignInRedirect");
         }
         $uses_screen_reader = BaseUser::getDbUser()->uses_screen_reader;
diff --git a/app/public/js/add_location.js b/app/public/js/add_location.js
@@ -114,7 +114,7 @@ function updateNearbyLocationMarkers() {
 }
 
 function addLocationsNear(longitude, latitude) {
-	var url = '/get-nearby-locations/' + longitude + '/' + latitude;
+	var url = '/location/management/nearby/' + longitude + '/' + latitude;
 	$.ajax({
 		'method': 'GET',
 		'url': url,
diff --git a/app/public/js/location_rating.js b/app/public/js/location_rating.js
@@ -37,7 +37,7 @@ function setComment(comment)
 	}
 	comment_saving_promise = $.ajax({
 		'method': 'PUT',
-		'url': '/location-rating/comment',
+		'url': '/location/rating/comment',
 		'data': {
 			'location_id': location_id,
 			'question_category_id': question_category_id,
@@ -59,7 +59,7 @@ function removeAnswer(question_id)
 {
 	processPromise($.ajax({
 		'method': 'DELETE',
-		'url': '/location-rating/answer',
+		'url': '/location/rating/answer',
 		'data': {
 			'location_id': location_id,
 			'question_id': question_id,
@@ -79,7 +79,7 @@ function saveAnswerChange(question_id, answer_text)
 	}
 	processPromise($.ajax({
 		'method': 'PUT',
-		'url': '/location-rating/answer',
+		'url': '/location/rating/answer',
 		'data': {
 			'location_id': location_id,
 			'question_id': question_id,
diff --git a/app/public/js/location_search_map.js b/app/public/js/location_search_map.js
@@ -78,7 +78,7 @@ function initMap() {
 		});
 
 		google.maps.event.addListener(locationMarker, 'click', function() {
-			window.location.href = '/location-report/' + location.id;
+			window.location.href = '/location/report/' + location.id;
 		});
 	});
 
diff --git a/app/resources/views/includes/rate_report_toggle.blade.php b/app/resources/views/includes/rate_report_toggle.blade.php
@@ -1,6 +1,6 @@
 			<div class="rate-report-toggle">
 				<div class="rate-report">
-					<a class="{{ !$is_reporting ? 'selected' : '' }}" href="/location-rating/{{ $location_id }}/{{ $question_category_id }}">Rate</a>
+					<a class="{{ !$is_reporting ? 'selected' : '' }}" href="/location/rating/{{ $location_id }}/{{ $question_category_id }}">Rate</a>
 					<a class="{{ $is_reporting ? 'selected' : '' }}" href="/location-reporting/{{ $location_id }}/{{ $question_category_id }}">View</a>
 				</div>
 				<div class="collapse-toggle-button">
diff --git a/app/resources/views/pages/internal_features/duplicate_finder.blade.php b/app/resources/views/pages/internal_features/duplicate_finder.blade.php
@@ -22,7 +22,7 @@
 		@foreach ( $search_results as $search_result )
 		<div class="row">
 			<div class="col-xs-6">
-				<a href="/location-report/{{ $search_result->id }}">{{ $search_result->name }}</a>
+				<a href="/location/report/{{ $search_result->id }}">{{ $search_result->name }}</a>
 			</div>
 			<div class="col-xs-4">{{ $search_result->address }}</div>
 			<div class="col-xs-2">{{ round($search_result->distance * 1000) }}</div>
diff --git a/app/resources/views/pages/location_management/location_created.blade.php b/app/resources/views/pages/location_management/location_created.blade.php
@@ -9,7 +9,7 @@
 		<nav>
 			<ul>
 				<li>
-					<a href="/location-rating/{{ $location->id }}">Rate the new location</a>
+					<a href="/location/rating/{{ $location->id }}">Rate the new location</a>
 				</li>
 				<li>
 					<a href="/add-location">Add Another Location</a>
diff --git a/app/resources/views/pages/location_management/locations_added_by_me.blade.php b/app/resources/views/pages/location_management/locations_added_by_me.blade.php
@@ -24,10 +24,10 @@
 		@foreach ($locations as $location)
 			<div class="row">
 				<div class="col-xs-4">
-					<a href="/location-rating/{{ $location->id }}">{{ $location->name }}</a>
+					<a href="/location/rating/{{ $location->id }}">{{ $location->name }}</a>
 				</div>
 				<div class="col-md-6 col-xs-4">
-					<a href="/location-rating/{{ $location->id }}">{{ $location->address }}</a>
+					<a href="/location/rating/{{ $location->id }}">{{ $location->address }}</a>
 				</div>
 				<div class="col-md-2 col-xs-4">
 					@if ( $location->is_safe_to_delete )
diff --git a/app/resources/views/pages/location_management/modify.blade.php b/app/resources/views/pages/location_management/modify.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.default')
 @section('content')
 <div class="location-management">
-	<h1>Modify Location - <a href="/location-report/{{ $location->id }}">{{ $location->name }}</a></h1>
+	<h1>Modify Location - <a href="/location/report/{{ $location->id }}">{{ $location->name }}</a></h1>
 
 	<form method="post" action="/location-modify">
 		<input type="hidden" name="location_id" value="{{ $location->id }}">
diff --git a/app/resources/views/pages/location_rating/questions.blade.php b/app/resources/views/pages/location_rating/questions.blade.php
@@ -63,7 +63,7 @@
 	>{{ $answer_repository->getComment() }}</textarea>
 	<div class="pull-right">
 		@if ( $next_question_category_id )
-		<a class="clean" href="/location-rating/{{ $location->id }}/{{ $next_question_category_id }}">Next</a>
+		<a class="clean" href="/location/rating/{{ $location->id }}/{{ $next_question_category_id }}">Next</a>
 		@else
 		@include('pages.location_rating.submit',
 					array(
diff --git a/app/resources/views/pages/location_rating/rate.blade.php b/app/resources/views/pages/location_rating/rate.blade.php
@@ -27,7 +27,7 @@
 				array(
 					'location_id' => $location->id,
 					'question_categories' => $question_categories,
-					'base_url' => '/location-rating/'
+					'base_url' => '/location/rating/'
 				))
 			<div class="submit">
 				@include('pages.location_rating.submit',
@@ -37,13 +37,13 @@
 			</div>
 		</div>
 		<div class="rate">
-			<h1><a href="/location-report/{{ $location->id }}">{{ $location->name }}</a></h1>
+			<h1><a href="/location/report/{{ $location->id }}">{{ $location->name }}</a></h1>
 				@include('includes.rate_report_toggle',
 					array(
 						'location_id' => $location->id,
 						'question_categories' => $question_categories,
 						'question_category_id' => $question_category->id,
-						'base_url' => '/location-rating/',
+						'base_url' => '/location/rating/',
 						'is_reporting' => false
 					))
 			@if ( $question_category === null )
diff --git a/app/resources/views/pages/location_rating/reviewed_locations.blade.php b/app/resources/views/pages/location_rating/reviewed_locations.blade.php
@@ -22,10 +22,10 @@
 		@foreach ($locations as $location)
 			<div class="row">
 				<div class="col-xs-4">
-					<a href="/location-rating/{{ $location->id }}">{{ $location->name }}</a>
+					<a href="/location/rating/{{ $location->id }}">{{ $location->name }}</a>
 				</div>
 				<div class="col-xs-4">
-					<a href="/location-rating/{{ $location->id }}">{{ $location->address }}</a>
+					<a href="/location/rating/{{ $location->id }}">{{ $location->address }}</a>
 				</div>
 				<div class="col-xs-4">
 					<div class="pull-right">
diff --git a/app/resources/views/pages/location_report/collapsed.blade.php b/app/resources/views/pages/location_report/collapsed.blade.php
@@ -63,7 +63,7 @@
 					<div class="question-category">
 						<h4 class="text-center">Not Rated Yet</h4>
 						
-						<p><a href="/location-rating/{{ $location->id }}/6">Be the first to rate this location.</a></p>
+						<p><a href="/location/rating/{{ $location->id }}/6">Be the first to rate this location.</a></p>
 					</div>
 				</div>
 			@else
diff --git a/app/resources/views/pages/location_report/comments.blade.php b/app/resources/views/pages/location_report/comments.blade.php
@@ -2,7 +2,7 @@
 
 @section('content')
 	<div class="location-comments">
-		<h1><a href="/location-report/{{ $location->id }}">{{ $location->name }}</a></h1>
+		<h1><a href="/location/report/{{ $location->id }}">{{ $location->name }}</a></h1>
 			<div class="comments">
 				<h2>Comments</h2>
 				@if ( count($comments) === 0 )
diff --git a/app/resources/views/pages/location_report/personal_not_available.blade.php b/app/resources/views/pages/location_report/personal_not_available.blade.php
@@ -1,4 +1,4 @@
 				<div class="text-center">
 					<p>The personal accessibility ratings are available only after you
-						have <a href="/signin?message=Sign+in+to+see+personal+ratings&amp;after_signin_redirect=%2Flocation-report%2F{{ $location_id }}%2Fpersonal">signed in</a> and have specified your accessibility needs.</p>
+						have <a href="/signin?message=Sign+in+to+see+personal+ratings&amp;after_signin_redirect=%2Flocation%2Freport%2F{{ $location_id }}%2Fpersonal">signed in</a> and have specified your accessibility needs.</p>
 				</div>
diff --git a/app/resources/views/pages/location_report/top.blade.php b/app/resources/views/pages/location_report/top.blade.php
@@ -4,20 +4,20 @@
 				<a href="{{ $location_search_path }}" title="Back to last location search results" class="fa fa-search"></a>
 			@endif
 			@if (isset($question_category_id))
-				<h1><a href="/location-report/{{ $location->id }}/{{ $rating_system }}">{{ $location->name }}</a></h1>
+				<h1><a href="/location/report/{{ $location->id }}/{{ $rating_system }}">{{ $location->name }}</a></h1>
 			@else
 				<h1>{{ $location->name }}</h1>
 			@endif
 		</div>
 		<div class="universal-personal">
 			<a class="{{ $rating_system === 'universal' ? 'selected' : '' }}"
-				href="/location-report/{{ $location->id }}/universal{{
+				href="/location/report/{{ $location->id }}/universal{{
 					isset($question_category_id) 
 					? '/'.$question_category_id
 					: ''
 				}}">Universal</a>
 			<a class="{{ $rating_system === 'personal' ? 'selected' : '' }}"
-			href="/location-report/{{ $location->id }}/personal{{
+			href="/location/report/{{ $location->id }}/personal{{
 					isset($question_category_id) 
 					? '/'.$question_category_id
 					: ''
diff --git a/app/resources/views/pages/location_search/spreadsheet.blade.php b/app/resources/views/pages/location_search/spreadsheet.blade.php
@@ -41,7 +41,7 @@ class="form-control" id="distance"
 		<div class="data">
 		@foreach ( $locations as $key => $value )
 			<div class="location">
-				<a href="/location-report/{{ $value->id }}">
+				<a href="/location/report/{{ $value->id }}">
 					<div class="row">
 						<div class="col-xs-6">
 							{{ $value->name }}
diff --git a/app/routes/location.php b/app/routes/location.php
@@ -1,7 +1,7 @@
 <?php
 
 Route::get('location/search', 'LocationSearchController@search');
-Route::get('get-nearby-locations/{longitude}/{latitude}', 'LocationManagementController@getLocationsNear');
+Route::get('location/management/nearby/{longitude}/{latitude}', 'LocationManagementController@getLocationsNear');
 Route::get('delete-my-location/{location_id}', 'LocationManagementController@deleteMyLocation');
 Route::get('location-modify/{location_id}', 'LocationManagementController@show');
 Route::get('add-location', 'LocationManagementController@addNewLocation');
@@ -11,8 +11,8 @@
     'location-suggestions-for-name/{location_name}',
     'LocationManagementController@getLocationSuggestionsForLocationName'
 );
-Route::get('location-report/{location_id}', 'LocationReportController@show');
-Route::get('location-report/{location_id}/{rating_system}', 'LocationReportController@show');
+Route::get('location/report/{location_id}', 'LocationReportController@show');
+Route::get('location/report/{location_id}/{rating_system}', 'LocationReportController@show');
 Route::get('location-comments/{location_id}', 'LocationReportController@showComments');
 Route::get('location-map/{location_id}', 'LocationReportController@showMap');
 Route::get('location-map/{location_id}/{rating_system}', 'LocationReportController@showMap');
diff --git a/app/routes/ratings.php b/app/routes/ratings.php
@@ -1,6 +1,6 @@
 <?php
 
-Route::group(['prefix' => 'location-rating'], function () {
+Route::group(['prefix' => 'location/rating'], function () {
     Route::get('/{location_id}', 'LocationRatingController@show');
     Route::get('/{location_id}/{question_category_id}', 'LocationRatingController@show');
     Route::put('/answer', 'LocationRatingController@setAnswer');
diff --git a/app/tests/LocationReportTest.php b/app/tests/LocationReportTest.php
@@ -4,7 +4,7 @@ class LocationReportTest extends TestCase
 {
     public function testGet()
     {
-        $response = $this->get('/location-report/00000000-0000-0000-0000-000000000001');
+        $response = $this->get('/location/report/00000000-0000-0000-0000-000000000001');
         $this->assertEquals(200, $response->getStatusCode());
         $content = $response->getContent();
         $this->assertTrue(strpos($content, 'Tim Hortons') !== false);
diff --git a/app/tests/SuggestionTest.php b/app/tests/SuggestionTest.php
@@ -13,7 +13,7 @@ private function signIn()
     public function testAddSuggestionAvailableOnLocationReport()
     {
         $this->signIn();
-        $response = $this->get('/location-report/00000000-0000-0000-0000-000000000001');
+        $response = $this->get('/location/report/00000000-0000-0000-0000-000000000001');
         $this->assertEquals(200, $response->getStatusCode());
         $content = $response->getContent();
         $this->assertTrue(strpos($content, 'suggestion-form') !== false);

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public function show(string $location_id, int $question_category_id = null)`
`113`	`113`	`{`
`114`	`114`	`if (!BaseUser::isSignedIn()) {`
`115`	`115`	`$message = "You+must+sign+in+to+rate+a+location";`
`116`		`- $afterSignInRedirect = "/location-rating/$location_id";`
	`116`	`+ $afterSignInRedirect = "/location/rating/$location_id";`
`117`	`117`	`return redirect()->intended("/signin?message=$message&after_signin_redirect=$afterSignInRedirect");`
`118`	`118`	`}`
`119`	`119`	`$uses_screen_reader = BaseUser::getDbUser()->uses_screen_reader;`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ function updateNearbyLocationMarkers() {`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`function addLocationsNear(longitude, latitude) {`
`117`		`- var url = '/get-nearby-locations/' + longitude + '/' + latitude;`
	`117`	`+ var url = '/location/management/nearby/' + longitude + '/' + latitude;`
`118`	`118`	`$.ajax({`
`119`	`119`	`'method': 'GET',`
`120`	`120`	`'url': url,`