Dev

app/Exceptions/Handler.php

@@ -2,8 +2,8 @@
 
 namespace App\Exceptions;
 
-use Exception;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
+use Throwable;
 
 class Handler extends ExceptionHandler
 {
@@ -29,10 +29,10 @@ class Handler extends ExceptionHandler
     /**
      * Report or log an exception.
      *
-     * @param  \Exception  $exception
+     * @param  \Throwable  $exception
      * @return void
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         parent::report($exception);
     }
@@ -41,10 +41,10 @@ public function report(Exception $exception)
      * Render an exception into an HTTP response.
      *
      * @param  \Illuminate\Http\Request  $request
-     * @param  \Exception  $exception
+     * @param  \Throwable  $exception
      * @return \Illuminate\Http\Response
      */
-    public function render($request, Exception $exception)
+    public function render($request, Throwable $exception)
     {
         // Redirect to '/' if the session expired
         if ($exception instanceof AuthenticationException) {

app/Http/Controllers/AdminController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Request;
 
 class AdminController extends Controller

app/Http/Controllers/Auth/LoginController.php

@@ -5,7 +5,7 @@
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Laravel\Socialite\Facades\Socialite;
-use App\User;
+use App\Models\User;
 
 class LoginController extends Controller
 {

app/Http/Controllers/Auth/RegisterController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\User;
+use App\Models\User;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
@@ -59,7 +59,7 @@ protected function validator(array $data)
      * Create a new user instance after a valid registration.
      *
      * @param  array  $data
-     * @return \App\User
+     * @return \App\Models\User
      */
     protected function create(array $data)
     {

app/Http/Controllers/HomeController.php

@@ -3,13 +3,13 @@
 namespace App\Http\Controllers;
 
 use App\Mail\ContactMail;
-use App\Ontology;
-use App\User;
+use App\Models\Ontology;
+use App\Models\User;
 use DOMDocument;
 use function foo\func;
 use Illuminate\Http\Request;
-use App\OntologyRelation;
-use App\OntologyClass;
+use App\Models\OntologyRelation;
+use App\Models\OntologyClass;
 use Illuminate\Http\Response;
 use Illuminate\Routing\Route;
 use Illuminate\Support\Facades\Auth;

app/Http/Controllers/OntologyClassController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-use App\OntologyClass;
+use App\Models\OntologyClass;
 use App\Http\Requests\OntologyClassStoreRequest;
 
 class OntologyClassController extends Controller

app/Http/Controllers/OntologyController.php

@@ -2,9 +2,9 @@
 
 namespace App\Http\Controllers;
 
-use App\User;
+use App\Models\User;
 use Illuminate\Http\Request;
-use App\Ontology;
+use App\Models\Ontology;
 use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Auth;
 use App\Http\Requests\OntologyStoreRequest;
@@ -121,11 +121,11 @@ public function update(OntologyStoreRequest $request, $locale, $id)
         $ontology = Ontology::where('id', $id)->first();
         if ($ontology->userCanEdit()) {
             $ontology->update($request->all());
-            foreach($request->collaborators as $user){
-                if($user != $ontology->user_id){
-                    if($this->verifyUser($user, $ontology) == false){
+            foreach ($request->collaborators as $user) {
+                if ($user != $ontology->user_id) {
+                    if ($this->verifyUser($user, $ontology) == false) {
                         $user = User::find($user);
-                        $notification = ['title'=> __('New Ontology shared with you'), 'message'=> __('The user ') . $ontology->user->name . __(' shared with you the ontology ') . $ontology->name, 'from'=>$ontology->user->name, 'type'=> 'New Ontology Shared'];
+                        $notification = ['title' => __('New Ontology shared with you'), 'message' => __('The user ') . $ontology->user->name . __(' shared with you the ontology ') . $ontology->name, 'from' => $ontology->user->name, 'type' => 'New Ontology Shared'];
                         Mail::send(new \App\Mail\SharedOntologyMail($user, $ontology));
                         $user->notify(new UserNotification($notification));
                     }
@@ -193,6 +193,23 @@ public function saveAsFavourite(Request $request)
         return redirect()->route('ontologies.index', app()->getLocale())->with('Sucess', 'Your ontology has been added to favorites');
     }
 
+    /**
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function favouriteOntologyIndex(Request $request)
+    {
+        $ontology = Ontology::find($request->id);
+        if($ontology->favourite)
+            $ontology->favourite = 0;
+        else 
+            $ontology->favourite = 1;
+        $ontology->save();
+        return response()->json([ 
+            "favourite" => $ontology->favourite
+        ]);
+    }
+
     /**
      * Unmark the favourite column from a ontology
      * @param Request $request
@@ -246,7 +263,7 @@ public function downloadOWL(Request $request)
     public function updateOrCreate(Request $request)
     {
         $ontology = Ontology::where('id', $request->id)->exists();
-        if ($ontology) { 
+        if ($ontology) {
             $ontology = Ontology::find($request->id);
             if ($ontology->userCanEdit()) {
                 $ontology->update([
@@ -311,11 +328,11 @@ public function updateOrCreate(Request $request)
             ]
         );*/
 
-        foreach($request->collaborators as $user){
-            if($user != $ontology->user_id){
-                if($this->verifyUser($user, $ontology) == false){
+        foreach ($request->collaborators as $user) {
+            if ($user != $ontology->user_id) {
+                if ($this->verifyUser($user, $ontology) == false) {
                     $user = User::find($user);
-                    $notification = ['title'=> __('New Ontology shared with you'), 'message'=> __('The user ') . $ontology->user->name . __(' shared with you the ontology ') . $ontology->name, 'from'=>$ontology->user->name, 'type'=> 'New Ontology Shared'];
+                    $notification = ['title' => __('New Ontology shared with you'), 'message' => __('The user ') . $ontology->user->name . __(' shared with you the ontology ') . $ontology->name, 'from' => $ontology->user->name, 'type' => 'New Ontology Shared'];
                     Mail::send(new \App\Mail\SharedOntologyMail($user, $ontology));
                     $user->notify(new UserNotification($notification));
                 }
@@ -329,14 +346,16 @@ public function updateOrCreate(Request $request)
             "message-pt" => 'Todas as alterações foram salvas',
             "message-en" => 'All changes saved',
             "id" => $ontology->id,
+            'updated_at' => date("d-m-Y | H:i", strtotime($ontology['updated_at']))
         ]);
     }
 
     //helper function to verify if the collaborator is already a user on the ontology
     //returns if the collaborator already is a user of the ontology
-    public function verifyUser($collaborator, $ontology){
-        foreach($ontology->users as $user){
-            if($collaborator == $user->id){
+    public function verifyUser($collaborator, $ontology)
+    {
+        foreach ($ontology->users as $user) {
+            if ($collaborator == $user->id) {
                 return true;
             }
         }
@@ -365,6 +384,7 @@ public function openOntologyInTheEditor(Request $request)
     {
         $ontology = Ontology::where('id', $request->id)->first();
         $ownerName = $ontology->user->name;
+        $lastUpdate = date("d-m-Y | H:i", strtotime($ontology->updated_at));
         if (Auth::user()->id == $ontology['user_id'] || $ontology->users->contains($request->user()->id)) {
             $response = array(
                 'status' => 'success',
@@ -385,8 +405,10 @@ public function openOntologyInTheEditor(Request $request)
                 'degree_of_formality' => $ontology['degree_of_formality'],
                 'scope' => $ontology['scope'],
                 'competence_questions' => $ontology['competence_questions'],
+                'namespace' =>  $ontology['namespace'],
                 'collaborators' => $ontology->users->modelKeys(),
-                'owner_name' => $ownerName
+                'owner_name' => $ownerName,
+                'last_update' => $lastUpdate,
             );
             return response()->json($response);
             //return $ontology;

app/Http/Controllers/OntologyRelationController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-use App\OntologyRelation;
+use App\Models\OntologyRelation;
 use App\Http\Requests\OntologyRelationStoreRequest;
 
 

app/Http/Controllers/ThesauruController.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Controllers;
 
-use App\Thesauru;
+use App\Models\Thesauru;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Response;

app/Http/Controllers/UserController.php

@@ -3,9 +3,9 @@
 namespace App\Http\Controllers;
 
 use App\Http\Requests\UserUpdateRequest;
-use App\Ontology;
+use App\Models\Ontology;
 use Illuminate\Http\Request;
-use App\User;
+use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;

app/Http/Controllers/UserNotificationsController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
-use App\User;
+use App\Models\User;
 use App\Notifications\UserNotification;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;

app/Mail/SharedOntologyMail.php

@@ -2,8 +2,8 @@
 
 namespace App\Mail;
 
-use App\User;
-use App\Ontology;
+use App\Models\User;
+use App\Models\Ontology;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Mail\Mailable;

app/Ontology.php → app/Models/Ontology.php

@@ -1,13 +1,16 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
 
 
 class Ontology extends Model
 {
+
+    use HasFactory;
     /**
      * @var array
      */
@@ -127,6 +130,6 @@ public function user()
      */
     public function users()
     {
-        return $this->belongsToMany('App\User');
+        return $this->belongsToMany(User::class);
     }
 }

app/OntologyClass.php → app/Models/OntologyClass.php

@@ -1,11 +1,14 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class OntologyClass extends Model
 {
+    use HasFactory;
+
     protected $fillable = [
         'name',
         'subclass',

app/OntologyRelation.php → app/Models/OntologyRelation.php

@@ -1,11 +1,14 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class OntologyRelation extends Model
 {
+    use HasFactory;
+
     protected $fillable = [
        'name',
         'domain',

app/SocialFacebookAccount.php → app/Models/SocialFacebookAccount.php

@@ -1,11 +1,14 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class SocialFacebookAccount extends Model
 {
+    use HasFactory;
+
     protected $fillable = ['user_id', 'provider_user_id', 'provider'];
 
     /**

app/Thesauru.php → app/Models/Thesauru.php

@@ -1,11 +1,15 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class Thesauru extends Model
 {
+
+    use HasFactory;
+
     /**
      * @var array
      */

app/User.php → app/Models/User.php

@@ -1,17 +1,19 @@
 <?php
 
-namespace App;
+namespace App\Models;
 
 use App\Notifications\ResetPassword;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Auth\Reminders\RemindableInterface;
 use Illuminate\Auth\Reminders\RemindableTrait;
 use Illuminate\Contracts\Auth\CanResetPassword;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 class User extends Authenticatable
 {
     use Notifiable;
+    use HasFactory;
 
     public function sendPasswordResetNotification($token)
     {
@@ -67,7 +69,7 @@ public function ontologies()
      */
     public function ontologies()
     {
-        return $this->belongsToMany('App\Ontology');
+        return $this->belongsToMany(Ontology::class);
     }
 
     /**

app/Notifications/UserNotification.php

@@ -2,8 +2,8 @@
 
 namespace App\Notifications;
 
-use App\User;
-use App\Ontology;
+use App\Models\User;
+use App\Models\Ontology;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;