From cad7d634091d0a555c3ba32c21fc10bb7b82ca50 Mon Sep 17 00:00:00 2001 From: amirghasempoor Date: Wed, 28 Aug 2024 10:54:00 +0330 Subject: [PATCH 1/2] return the full path of avatar --- app/Http/Controllers/V3/ProfileController.php | 2 +- app/Models/User.php | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) 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 From 880afdcdef8f28511e7a192a8e2dabc134623d59 Mon Sep 17 00:00:00 2001 From: Witel Group Date: Tue, 17 Sep 2024 10:41:39 +0000 Subject: [PATCH 2/2] create essential seeders to begin --- database/seeders/CitySeeder.php | 19 +++ database/seeders/DatabaseSeeder.php | 9 +- database/seeders/EdarateShahriSeeder.php | 19 +++ database/seeders/InfoItemSeeder.php | 19 +++ database/seeders/LogListSeeder.php | 19 +++ database/seeders/PermissionSeeder.php | 19 +++ database/seeders/ProvinceSeeder.php | 19 +++ storage/sql-files/cities.sql | 162 +++++++++++------------ storage/sql-files/edarate_shahri.sql | 96 +++++++------- storage/sql-files/info_items.sql | 28 ++-- storage/sql-files/log_lists.sql | 28 ++-- storage/sql-files/permissions.sql | 22 +-- storage/sql-files/provinces.sql | 8 +- 13 files changed, 294 insertions(+), 173 deletions(-) create mode 100644 database/seeders/CitySeeder.php create mode 100644 database/seeders/EdarateShahriSeeder.php create mode 100644 database/seeders/InfoItemSeeder.php create mode 100644 database/seeders/LogListSeeder.php create mode 100644 database/seeders/PermissionSeeder.php create mode 100644 database/seeders/ProvinceSeeder.php 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 @@ +