app: renamed ProfilePhotoUploadController to ProfilePhotoController

Author: joshi1983

app/app/Http/Controllers/ProfileController.php

@@ -5,7 +5,7 @@
 use App\Country;
 use App\AnswerRepository;
 use App\Region;
-use App\Http\Controllers\ProfilePhotoUploadController;
+use App\Http\Controllers\ProfilePhotoController;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Support\Facades\Input;
@@ -41,7 +41,7 @@ public static function getProfileView($validator = null)
             'address_default' => BaseUser::getDefaultAddress(),
             'countries' => $countries,
             'required_questions' => $required_questions,
-            'has_profile_photo' => ProfilePhotoUploadController::hasProfilePhoto(),
+            'has_profile_photo' => ProfilePhotoController::hasProfilePhoto(),
             'num_reviews' => count(AnswerRepository::getReviewedLocations()['location_ids']),
             'num_locations_added_by_me' => $num_locations_added_by_me,
             'is_internal_user' => BaseUser::isInternal(),

…rollers/ProfilePhotoUploadController.php …p/Controllers/ProfilePhotoController.phpapp/app/Http/Controllers/ProfilePhotoUploadController.php renamed to app/app/Http/Controllers/ProfilePhotoController.php app/app/Http/Controllers/ProfilePhotoUploadController.php renamed to app/app/Http/Controllers/ProfilePhotoController.php

@@ -6,7 +6,7 @@
 use Illuminate\Support\Facades\Input;
 use Illuminate\Support\Facades\Redirect;
 
-class ProfilePhotoUploadController extends Controller
+class ProfilePhotoController extends Controller
 {
 
     public function index(Request $request)
@@ -26,12 +26,12 @@ private static function getUploadDirectory()
     private static function getProfilePhotoPath()
     {
         $user = BaseUser::getDbUser();
-        return ProfilePhotoUploadController::getUploadDirectory() . 'user_' . $user->id . '.jpg';
+        return ProfilePhotoController::getUploadDirectory() . 'user_' . $user->id . '.jpg';
     }
 
     public static function hasProfilePhoto()
     {
-        return file_exists(ProfilePhotoUploadController::getProfilePhotoPath());
+        return file_exists(ProfilePhotoController::getProfilePhotoPath());
     }
 
     /**
@@ -60,7 +60,7 @@ private static function getFileNameFromOriginalName(string $user_id, string $ori
     public function photo()
     {
         if (BaseUser::isSignedIn()) {
-            $file_path = ProfilePhotoUploadController::getProfilePhotoPath();
+            $file_path = ProfilePhotoController::getProfilePhotoPath();
             return response()->file($file_path);
         } else {
             return redirect()->intended('signin');
@@ -88,15 +88,15 @@ private static function getPhotoDimensionsFromUploadDimensions($width, $height)
 
     public static function save($image)
     {
-        $destinationPath = ProfilePhotoUploadController::getUploadDirectory();
+        $destinationPath = ProfilePhotoController::getUploadDirectory();
 
         $user = BaseUser::getDbUser();
 
         $full_path = $destinationPath . 'user_' . $user->id . '.jpg';
 
         $width = imagesx($image);
         $height = imagesy($image);
-        $newDimensions = ProfilePhotoUploadController::getPhotoDimensionsFromUploadDimensions($width, $height);
+        $newDimensions = ProfilePhotoController::getPhotoDimensionsFromUploadDimensions($width, $height);
 
         // png images can be transparent and the transparent areas are defaulted to black.
         // We want the background to default to white.
@@ -129,15 +129,15 @@ public function post(Request $request)
             $content = file_get_contents($temp_filename);
             $new_image = imagecreatefromstring($content);
 
-            return ProfilePhotoUploadController::save($new_image);
+            return ProfilePhotoController::save($new_image);
         } else {
             return redirect()->intended('signin');
         }
     }
 
     public function delete()
     {
-        $file = ProfilePhotoUploadController::getProfilePhotoPath();
+        $file = ProfilePhotoController::getProfilePhotoPath();
         if (!unlink($file)) {
             echo ("Error deleting $file");
         } else {
@@ -148,12 +148,12 @@ public function delete()
     // Rotate Profile Photo
     public function rotate()
     {
-        $current_photo = ProfilePhotoUploadController::getProfilePhotoPath();
+        $current_photo = ProfilePhotoController::getProfilePhotoPath();
 
         $content = file_get_contents($current_photo);
         $image = imagecreatefromstring($content);
 
         $new_image = imagerotate($image, -90, 0);
-        return ProfilePhotoUploadController::save($new_image);
+        return ProfilePhotoController::save($new_image);
     }
 }

app/routes/profile.php

@@ -5,10 +5,10 @@
     Route::post('/', 'ProfileController@save');
 });
 Route::group(['prefix' => 'profile-photo-upload'], function () {
-    Route::get('/', 'ProfilePhotoUploadController@index');
-    Route::post('/', 'ProfilePhotoUploadController@post');
+    Route::get('/', 'ProfilePhotoController@index');
+    Route::post('/', 'ProfilePhotoController@post');
 });
 
-Route::get('profile-photo', 'ProfilePhotoUploadController@photo');
-Route::post('profile-photo-rotate', 'ProfilePhotoUploadController@rotate');
-Route::get('profile-photo-delete', 'ProfilePhotoUploadController@delete');
+Route::get('profile-photo', 'ProfilePhotoController@photo');
+Route::post('profile-photo-rotate', 'ProfilePhotoController@rotate');
+Route::get('profile-photo-delete', 'ProfilePhotoController@delete');