Revize 09795926

Issue #7846 @3h
[+] Vytvoření stránky oblíbených metadat
[+] Refraktoring kódu, oprava objektů databáze
[-] Odstranění nepotřebných objektů ArtefactCategory.php a ArtefactUser.php

app/ArtefactCategory.php

@@ -1 @@
-<?php
-
-namespace App;
-
-use Illuminate\Database\Eloquent\Model;
-
-class ArtefactCategory extends Model
-{
-    // Table Name
-    protected $table = 'artefact_category';//unnecessery?
-    // Primary Key
-    public $primaryKey = 'artefact_id';//unnecessery?
-
-    /**
-     * Indicates if the model should be timestamped.
-     *
-     * @var bool
-     */
-    public $timestamps = false;
-
-
-
-
-}

app/ArtefactUser.php

@@ -1 @@
-<?php
-
-namespace App;
-
-use Illuminate\Database\Eloquent\Model;
-
-class ArtefactUser extends Model
-{
-    // Table Name
-    protected $table = 'artefact_user';//unnecessery?
-    // Primary Key
-    public $primaryKey = 'artefact_id';//unnecessery?
-
-    /**
-     * Indicates if the model should be timestamped.
-     *
-     * @var bool
-     */
-    public $timestamps = false;
-
-
-
-
-}

app/Http/Controllers/CategoriesController.php

@@ -58 +58 @@
             $categories = array();
             for($i = 1; $i <= $countCategory;$i++)
             {
-                array_push($categories, ArtefactCategory::where('category_id', $i)->get());
+                array_push($categories, Category::where('category_id', $i)->get());
             }
             $clusters = $this->calculateClusters($categories);
 

app/Http/Controllers/DetailsController.php

@@ -39 +39 @@
         $data = array(
             'id' => $id,
             'arrArtefact' => Artefact::find($id),
-            'likes' => ArtefactUser::where('artefact_id', $id)->count(),
+            'likes' => Artefact::find($id)->users()->count(),
             'metadata' => Metadata::where('artefact_id', $id)->get()
         );
         return view('detail.index') -> with($data);

app/Http/Controllers/FavoriteArtefactsController.php

@@ -21 +21 @@
      */
     public function index()
     {
-        if(isset(Auth::user()->id))
+        if(Auth::check())
         {
-            $userId = Auth::user()->id;
-            $list = ArtefactUser::where('user_id', $userId)->get();
-            $finalData = array();
-            foreach($list as $item)
-            {
-                array_push($finalData, Artefact::where('id', $item->artefact_id)->get());
-            }
+            $artefacts = User::find(Auth::id())->likesArtefacts()->get();
 
             $data = array(
                 'title' => 'Favorite artefacts',
-                'user' => User::find($userId),
-                'artefacts' => $finalData
+                'user' => Auth::user(),
+                'artefacts' => $artefacts
             );
             return view('favartefacts.index') -> with($data);
         }
@@ -56 +50 @@
      */
     public function show($id)
     {
-        $list = ArtefactUser::where('user_id', $id)->get();
-        $finalData = array();
-        foreach($list as $item)
+        $artefacts = [];
+        if (!is_null(User::find($id)))
         {
-            array_push($finalData, Artefact::where('id', $item->artefact_id)->get());
+            $artefacts = User::find($id)->likesArtefacts()->get();
         }
 
         $data = array(
             'title' => 'Favorite artefacts',
             'id' => $id,
-            'user' => User::find($id),
-            'userId' => Auth::user()->id,
-            'artefacts' => $finalData
+            'user' => Auth::user(),
+            'userId' => Auth::id(),
+            'artefacts' => $artefacts
         );
         return view('favartefacts.index') -> with($data);
     }

app/Http/Controllers/FavoriteMetadataController.php

@@ +1 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Metadata;
+use App\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class FavoriteMetadataController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    public function index()
+    {
+        $metadata = User::find(Auth::id())->likesMetadata()->get();
+
+        return view('favmetadata.index', ['metadata' => $metadata]);
+    }
+
+}

app/User.php

@@ -47 +47 @@
      */
     public function likesArtefacts()
     {
-        return $this->hasMany('App\Artefact');
+        return $this->belongsToMany('App\Artefact');
     }
 
     /**
@@ -55 +55 @@
      */
     public function likesMetadata()
     {
-        return $this->hasMany('App\Metadata');
+        return $this->belongsToMany('App\Metadata');
     }
 }

public/js/app.js

@@ -37119 +37119 @@
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-__webpack_require__(/*! D:\WorkSpaceASWI\task02\resources\js\app.js */"./resources/js/app.js");
-module.exports = __webpack_require__(/*! D:\WorkSpaceASWI\task02\resources\sass\app.scss */"./resources/sass/app.scss");
+__webpack_require__(/*! C:\Users\Adam\Documents\Dev\ASWI\aswi2020merlot\resources\js\app.js */"./resources/js/app.js");
+module.exports = __webpack_require__(/*! C:\Users\Adam\Documents\Dev\ASWI\aswi2020merlot\resources\sass\app.scss */"./resources/sass/app.scss");
 
 
 /***/ })

resources/views/favartefacts/index.blade.php

@@ -29 +29 @@
                     <div class="card">
                         <svg class="bd-placeholder-img card-img-top" width="100%" height="180" xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid slice" focusable="false" role="img" aria-label="Placeholder: Image cap"><title>Placeholder</title><rect width="100%" height="100%" fill="#868e96"></rect><text x="45%" y="50%" fill="#dee2e6" dy=".3em">Artefact image</text></svg>
                         <div class="card-body">
-                            <h5 class="card-title"><a href="{{ url('/artefact/' . $artefact[0]->id) }}">{{$artefact[0]->name}}</a> - {{$artefact[0]->author}}</h5>
-                            <h6 class="card-subtitle mb-2 text-muted">{{$artefact[0]->year}}, {{$artefact[0]->pages}} pages</h6>
+                            <h5 class="card-title"><a href="{{ url('/artefact/' . $artefact->id) }}">{{$artefact->name}}</a> - {{$artefact->author}}</h5>
+                            <h6 class="card-subtitle mb-2 text-muted">{{$artefact->year}}, {{$artefact->pages}} pages</h6>
                             <p class="card-text">
                                 Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
                                 Mauris dolor felis, sagittis at, luctus sed, aliquam non, tellus.

resources/views/favmetadata/index.blade.php

@@ +1 @@
+@extends('layouts.app')
+
+@section('title', 'Favorite metadata')
+
+@section('breadcrumb')
+    <li class="breadcrumb-item"><a href="{{ url('/') }}">Home</a></li>
+    <li class="breadcrumb-item active" aria-current="page">Favorite metadata</li>
+@endsection
+
+@section('content')
+    <div class="jumbotron">
+        <div class="text-center">
+            <h1>Favorite metadata</h1>
+            <p>
+                Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
+                Mauris dolor felis, sagittis at, luctus sed, aliquam non, tellus.
+                Fusce tellus odio, dapibus id fermentum quis, suscipit id erat.
+                Morbi scelerisque luctus velit. Vivamus porttitor turpis ac leo.
+                Morbi scelerisque luctus velit.
+                Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+            </p>
+        </div>
+    </div>
+
+    <div class="metadata-area">
+        @if(count($metadata) > 0)
+            <ul class="list-group">
+                @foreach($metadata as $meta)
+                    <div class="note-area mb-3">
+                        <li class="list-group-item">
+                            On {{$meta->page}} page:<br>
+                            {{$meta->noteCZ}}<br>
+                            {{$meta->noteEN}}<br>
+                        </li>
+                    </div>
+                @endforeach
+            </ul>
+        @else
+            <ul class="list-group">
+                <li class="list-group-item">
+                    <h3>No notes for this BOOK were found!</h3>
+                </li>
+            </ul>
+        @endif
+    </div>
+@endsection

resources/views/inc/navbar.blade.php

@@ -34 +34 @@
                         <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
                             <a class="dropdown-item" href="{{ url('/favartefacts') }}">Favorite artefacts</a>
 
+                            <a class="dropdown-item" href="{{ url('/favmetadata') }}">Favorite metadata</a>
+
                             <a class="dropdown-item" href="{{ route('logout') }}"
                                onclick="event.preventDefault();
                                                      document.getElementById('logout-form').submit();">

routes/web.php

@@ -20 +20 @@
 Route::resource('/detail', 'DetailsController', array('only' => array('index', 'show')));
 Route::resource('/categories', 'CategoriesController', array('only' => array('index')));
 Route::resource('/favartefacts', 'FavoriteArtefactsController', array('only' => array('index', 'show')));
+Route::get('/favmetadata', 'FavoriteMetadataController@index');
 
 Auth::routes();