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

Profile route changes

Author: joshi1983

app/app/Country.php

@@ -11,7 +11,6 @@
 class Country extends Model
 {
     protected $table = 'country';
-    protected $fillable = ["name"
-    ];
+    protected $fillable = ["name"];
     public $timestamps = false;
 }

app/app/DataSource.php

@@ -2,9 +2,9 @@
 
 namespace App;
 
-use Eloquent;
+use Illuminate\Database\Eloquent\Model;
 
-class DataSource extends Eloquent
+class DataSource extends Model
 {
     protected $fillable = [
         'name', 'description',
@@ -18,6 +18,6 @@ class DataSource extends Eloquent
      */
     public function locations()
     {
-        return $this->belongsToMany('App\Location');
+        return $this->hasMany(Location::class, 'data_source_id');
     }
 }

app/app/Http/Controllers/HomeController.php

@@ -2,6 +2,7 @@
 
 use App\LocationTag;
 use App\BaseUser;
+use App\LocationSearchOption;
 use DB;
 use Illuminate\Routing\Controller;
 use Illuminate\Http\Request;
@@ -21,7 +22,7 @@ public function index(Request $request)
         if (trim($address_value) === trim(BaseUser::getDefaultAddress())) {
             $address_value = '';
         }
-        $location_search_options = DB::table('location_search_option')->get();
+        $location_search_options = LocationSearchOption::query()->get();
         if (Input::has('keywords')) {
             $keywords = trim(Input::get('keywords'));
             BaseUser::setKeywords($keywords);

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/app/Image.php

@@ -2,10 +2,10 @@
 
 namespace App;
 
-use Eloquent;
+use Illuminate\Database\Eloquent\Model;
 use Webpatser\Uuid\Uuid;
 
-class Image extends Eloquent
+class Image extends Model
 {
     protected $fillable = [
         'id', 'location_id', 'raw_data',

app/app/Location.php

@@ -2,21 +2,23 @@
 
 namespace App;
 
-use Eloquent;
+use Illuminate\Database\Eloquent\Model;
 use DB;
 use Webpatser\Uuid\Uuid;
 
-class Location extends Eloquent
+class Location extends Model
 {
     protected $fillable = [
         'name', 'phone_number', 'longitude', 'latitude', 'owner_user_id',
         'data_source_id', 'universal_rating', 'creator_user_id', 'ratings_cache'
     ];
+
     public $timestamps = false;
 
     protected $casts = [
         'ratings_cache' => 'array'
     ];
+
     protected $table = 'location';
     /**
      * Indicates if the IDs are auto-incrementing.
@@ -57,7 +59,7 @@ public function personalizedRatings()
 
     public function comments()
     {
-        return $this->hasMany('App\ReviewComment');
+        return $this->hasMany(ReviewComment::class);
     }
 
     public function locationGroup()

app/app/LocationGroup.php

@@ -2,9 +2,9 @@
 
 namespace App;
 
-use Eloquent;
+use Illuminate\Database\Eloquent\Model;
 
-class LocationGroup extends Eloquent
+class LocationGroup extends Model
 {
     protected $fillable = [
         'name',

app/app/LocationLocationTag.php

@@ -2,10 +2,10 @@
 
 namespace App;
 
-use Eloquent;
+use Illuminate\Database\Eloquent\Model;
 use Webpatser\Uuid\Uuid;
 
-class LocationLocationTag extends Eloquent
+class LocationLocationTag extends Model
 {
     protected $fillable = [
         'location_id', 'location_tag_id',

app/app/LocationSearchOption.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class LocationSearchOption extends Model
+{
+    protected $fillable = [
+        'content'
+    ];
+
+    protected $table = 'location_search_option';
+}