Skip to content

Commit

Permalink
Update to laravel 8
Browse files Browse the repository at this point in the history
  • Loading branch information
rakieta2015 committed Sep 29, 2020
1 parent b7cef05 commit 979cf3f
Show file tree
Hide file tree
Showing 46 changed files with 2,140 additions and 1,145 deletions.
Binary file added coreui/public/public/1/20200929004519file.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added coreui/public/public/1/20200929005020file.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added coreui/public/public/1/20200929005039file.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added coreui/public/public/2/20200929002452file.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added coreui/public/public/2/20200929002505file.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added coreui/public/public/2/20200929002536file.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added coreui/public/public/2/20200929004438file.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added coreui/public/public/2/20200929004455file.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added coreui/public/public/2/20200929004519file.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion laravel/app/Http/Controllers/Auth/RegisterController.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace App\Http\Controllers\Auth;

use App\Http\Controllers\Controller;
use App\User;
use App\Models\User;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
Expand Down
2 changes: 1 addition & 1 deletion laravel/app/Http/Controllers/AuthController.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php

namespace App\Http\Controllers;
use App\User;
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Validator;
Expand Down
2 changes: 1 addition & 1 deletion laravel/app/Http/Controllers/UsersController.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

use Illuminate\Support\Facades\DB;
use Illuminate\Http\Request;
use App\User;
use App\Models\User;

class UsersController extends Controller
{
Expand Down
6 changes: 3 additions & 3 deletions laravel/app/Models/Folder.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
namespace App\Models;

use Illuminate\Database\Eloquent\Model;
use Spatie\MediaLibrary\HasMedia\HasMedia;
use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
use Spatie\MediaLibrary\HasMedia;
use Spatie\MediaLibrary\InteractsWithMedia;

class Folder extends Model implements HasMedia
{
use HasMediaTrait;
use InteractsWithMedia;

protected $table = 'folder';

Expand Down
8 changes: 6 additions & 2 deletions laravel/app/Models/Notes.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,28 @@
namespace App\Models;

use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;

class Notes extends Model
{

use HasFactory;

protected $table = 'notes';

/**
* Get the User that owns the Notes.
*/
public function user()
{
return $this->belongsTo('App\User', 'users_id')->withTrashed();
return $this->belongsTo('App\Models\User', 'users_id')->withTrashed();
}

/**
* Get the Status that owns the Notes.
*/
public function status()
{
return $this->belongsTo('App\Status', 'status_id');
return $this->belongsTo('App\Models\Status', 'status_id');
}
}
5 changes: 4 additions & 1 deletion laravel/app/Models/Status.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,19 @@
namespace App\Models;

use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;

class Status extends Model
{
use HasFactory;

protected $table = 'status';
public $timestamps = false;
/**
* Get the notes for the status.
*/
public function notes()
{
return $this->hasMany('App\Notes');
return $this->hasMany('App\Models\Notes');
}
}
6 changes: 4 additions & 2 deletions laravel/app/User.php → laravel/app/Models/User.php
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
<?php

namespace App;
namespace App\Models;

use Illuminate\Contracts\Auth\MustVerifyEmail;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
use Illuminate\Database\Eloquent\SoftDeletes;
use Tymon\JWTAuth\Contracts\JWTSubject;
use Spatie\Permission\Traits\HasRoles;
use Illuminate\Database\Eloquent\Factories\HasFactory;

class User extends Authenticatable implements JWTSubject
{
use Notifiable;
use SoftDeletes;
use HasRoles;

use HasFactory;

/**
* Get the identifier that will be stored in the subject claim of the JWT.
*
Expand Down
3 changes: 2 additions & 1 deletion laravel/app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace App\Providers;

use Illuminate\Support\ServiceProvider;
use Illuminate\Pagination\Paginator;

class AppServiceProvider extends ServiceProvider
{
Expand All @@ -23,6 +24,6 @@ public function register()
*/
public function boot()
{
//
Paginator::useBootstrap();
}
}
39 changes: 23 additions & 16 deletions laravel/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,23 @@
],
"license": "MIT",
"require": {
"php": "^7.2",
"fideloper/proxy": "^4.0",
"fruitcake/laravel-cors": "^2.0",
"laravel/framework": "^7.4",
"laravel/tinker": "^2.0",
"laravel/ui": "^2.0",
"spatie/laravel-medialibrary": "^7.19.0",
"spatie/laravel-permission": "^3.6",
"tymon/jwt-auth": "^1.0.0"
"php": "^7.2.5",
"fideloper/proxy": "^4.2",
"laravel/framework": "^8.0",
"fruitcake/laravel-cors": "^1.0",
"guzzlehttp/guzzle": "^7.0.1",
"laravel/tinker": "^2.3.0",
"spatie/laravel-medialibrary": "^8.7.2",
"spatie/laravel-permission": "^3.17",
"laravel/ui": "^3.0",
"tymon/jwt-auth": "^1.0.1"
},
"require-dev": {
"facade/ignition": "^2.0",
"fzaninotto/faker": "^1.4",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^4.1",
"phpunit/phpunit": "^8.5"
"facade/ignition": "^2.3.6",
"fzaninotto/faker": "^1.9.1",
"mockery/mockery": "^1.3.1",
"nunomaduro/collision": "^5.0",
"phpunit/phpunit": "^9.0"
},
"config": {
"optimize-autoloader": true,
Expand All @@ -37,11 +38,17 @@
},
"autoload": {
"psr-4": {
"App\\": "app/"
"App\\": "app/",
"Database\\Factories\\": "database/factories/",
"Database\\Seeders\\": "database/seeders/"
},
"classmap": [
"database/seeds",
"database",
"database/seeders",
"database/factories"
],
"files": [

]
},
"autoload-dev": {
Expand Down
Loading

0 comments on commit 979cf3f

Please sign in to comment.