diff --git a/app/Http/Controllers/V3/ProfileController.php b/app/Http/Controllers/V3/ProfileController.php index ad7a04ce..12268c40 100644 --- a/app/Http/Controllers/V3/ProfileController.php +++ b/app/Http/Controllers/V3/ProfileController.php @@ -29,7 +29,7 @@ class ProfileController extends Controller 'major' => $user->major, 'degree' => $user->degree, 'mobile' => $user->mobile, - 'avatar' => $user->avatar, + 'avatar' => $user->avatarUrl() ]); } diff --git a/app/Models/User.php b/app/Models/User.php index f4144322..12b8149a 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -7,6 +7,7 @@ use Illuminate\Http\Request; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Storage; use Spatie\Permission\Traits\HasRoles; use Spatie\Permission\Traits\HasPermissions; use Illuminate\Database\Eloquent\Factories\HasFactory; @@ -24,7 +25,7 @@ class User extends Authenticatable * @var array */ protected $fillable = [ - 'name', 'email', 'password', 'username', 'first_name', 'last_name', 'position', 'mobile', 'province_id', 'city_id', 'confirmed', 'enabled', 'avatar', 'city_fa', 'province_fa', 'degree' + 'name', 'email', 'major', 'password', 'username', 'first_name', 'last_name', 'position', 'mobile', 'province_id', 'city_id', 'confirmed', 'enabled', 'avatar', 'city_fa', 'province_fa', 'degree' ]; /** @@ -228,4 +229,10 @@ class User extends Authenticatable { return $this->hasMany('App\Models\RoadConstructionRural'); } + + public function avatarUrl(): ?string + { + $avatar = $this->attributes['avatar']; + return $avatar == null ? null : Storage::disk('public')->url($avatar); + } } \ No newline at end of file diff --git a/database/seeders/CitySeeder.php b/database/seeders/CitySeeder.php new file mode 100644 index 00000000..837afcb9 --- /dev/null +++ b/database/seeders/CitySeeder.php @@ -0,0 +1,19 @@ +call([ + ProvinceSeeder::class; + CitySeeder::class; + EdarateShahriSeeder::class; + InfoItemSeeder::class; + LogListSeeder::class; + PermissionSeeder::class; + ]); } } diff --git a/database/seeders/EdarateShahriSeeder.php b/database/seeders/EdarateShahriSeeder.php new file mode 100644 index 00000000..fa82b20c --- /dev/null +++ b/database/seeders/EdarateShahriSeeder.php @@ -0,0 +1,19 @@ +