Browse Source

Upgrade to Laravel 6.0

pull/5/head
Milad Shahi 6 years ago
parent
commit
060bd1fbca
  1. 2
      composer.json
  2. 1228
      composer.lock
  3. 3
      database/factories/UserFactory.php
  4. 6
      resources/views/outlets/show.blade.php

2
composer.json

@ -7,7 +7,7 @@
"require": { "require": {
"php": "^7.1.3", "php": "^7.1.3",
"fideloper/proxy": "^4.0", "fideloper/proxy": "^4.0",
"laravel/framework": "5.8.*",
"laravel/framework": "^6.0",
"laravel/tinker": "^1.0" "laravel/tinker": "^1.0"
}, },
"require-dev": { "require-dev": {

1228
composer.lock
File diff suppressed because it is too large
View File

3
database/factories/UserFactory.php

@ -1,6 +1,7 @@
<?php <?php
use Faker\Generator as Faker; use Faker\Generator as Faker;
use Illuminate\Support\Str;
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -19,6 +20,6 @@ $factory->define(App\User::class, function (Faker $faker) {
'email' => $faker->unique()->safeEmail, 'email' => $faker->unique()->safeEmail,
'email_verified_at' => now(), 'email_verified_at' => now(),
'password' => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm', // secret 'password' => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm', // secret
'remember_token' => str_random(10),
'remember_token' => Str::random(10),
]; ];
}); });

6
resources/views/outlets/show.blade.php

@ -21,7 +21,11 @@
@can('update', $outlet) @can('update', $outlet)
<a href="{{ route('outlets.edit', $outlet) }}" id="edit-outlet-{{ $outlet->id }}" class="btn btn-warning">{{ __('outlet.edit') }}</a> <a href="{{ route('outlets.edit', $outlet) }}" id="edit-outlet-{{ $outlet->id }}" class="btn btn-warning">{{ __('outlet.edit') }}</a>
@endcan @endcan
<a href="{{ route('outlets.index') }}" class="btn btn-link">{{ __('outlet.back_to_index') }}</a>
@if(\Illuminate\Support\Facades\Auth::check())
<a href="{{ route('outlets.index') }}" class="btn btn-link">{{ __('outlet.back_to_index') }}</a>
@else
<a href="{{ route('outlet_map.index') }}" class="btn btn-link">{{ __('outlet.back_to_index') }}</a>
@endif
</div> </div>
</div> </div>
</div> </div>

Loading…
Cancel
Save