Revize 609126cb

Uprava sjednoceni templatu pro "Artefacts"

Uprava a sjednoceni vsech stranek (vyjma charts) na stejny design zobrazeni artefaktu podle 'books.blade'. Mezi upravene stranky patri: artefact, category, categories, favartefacts.

app/Http/Controllers/ArtefactController.php

@@ -4 +4 @@
 
 use App\Artefact;
 use App\ArtefactCategory;
+use App\Category;
 use App\User;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\RedirectResponse;
@@ -20 +21 @@
     }
 
     /**
-     * Returns view of all artefacts.
+     * Prepare all necessary data for shown Artefact.
+     * These are current count of likes, if it set to
+     * a favorites by a logged user and all metadata
+     * connected to the artefact.
      *
-     * @return Factory|View
+     * @param       $artefacts  all artefacts
+     * @return      mixed       modified artefacts
      */
-    public function default()
+    public function prepData($artefacts)
     {
-        $artefacts = Artefact::simplePaginate(1);
         foreach($artefacts as $artefact)
         {
             $artefact['likes'] = Artefact::find($artefact->id)->users()->count();
@@ -41 +45 @@
             $artefact['metadata'] = $metadata;
         }
 
+        return $artefacts;
+    }
+
+    /**
+     * Returns view of all artefacts.
+     *
+     * @return Factory|View
+     */
+    public function default()
+    {
+        $artefacts = Artefact::simplePaginate(1);
+        $artefacts = $this->prepData($artefacts);
         return view('artefact.default', ['artefacts' => $artefacts]);
     }
 
@@ -52 +68 @@
      */
     public function showCategory($id)
     {
-        $categoryArtefacts = ArtefactCategory::where('category_id', $id)->get();
-        if(count($categoryArtefacts) > 0)
-        {
-            $artefacts = array();
-            foreach($categoryArtefacts as $ar)
-            {
-                array_push($artefacts, Artefact::where('id', $ar->artefact_id)->get());
-            }
-            return view('artefact.category', ['artefacts' => $artefacts]);
-        }
-        else
-        {
-            return view('artefact.category', ['artefacts' => array()]);
-        }
+        $artefacts = Category::find($id)->artefacts()->simplePaginate(1);
+        $artefacts = $this->prepData($artefacts);
+        return view('artefact.default', ['artefacts' => $artefacts]);
     }
 
     /**
-     * Returns view of artefacts related to the chosen category
+     * Returns view of artefacts related to the chosen categories
      *
      * @param $id string with categories ids
      * @return Factory|View
      */
     public function showCategories($id)
     {
+        //Parsing text for individual ids of categories
         $textWithIds  = $id;
         $pieces = explode(",", $textWithIds);
-        $artefacts = array();
+        $arrStrToInt = array();
         for($i = 0;$i < count($pieces); $i++)
         {
             if($pieces[$i] == null || !strcmp($pieces[$i], ""))
@@ -86 +92 @@
                 continue;
             }
 
-            $categoryArtefacts = ArtefactCategory::where('category_id', $pieces[$i])->get();
-            if(count($categoryArtefacts) > 0)
-            {
-                foreach($categoryArtefacts as $ar)
-                {
-                    array_push($artefacts, Artefact::where('id', $ar->artefact_id)->get());
-                }
-            }
+            array_push($arrStrToInt, (int)$pieces[$i]);
         }
 
-        if(count($artefacts) > 0)
+        //Creating array of all artefacts ids
+        $arrArtIds = array();
+        foreach($arrStrToInt as $cat)
         {
-            return view('artefact.category', ['artefacts' => $artefacts]);
-        }
-        else
-        {
-            return view('artefact.category', ['artefacts' => array()]);
+            $tmpArtefacts = Category::find($cat)->artefacts()->get();
+            foreach($tmpArtefacts as $art)
+            {
+                array_push($arrArtIds, $art->id);
+            }
         }
+
+        $artefacts = Artefact::whereIn('id', $arrArtIds)->simplePaginate(1);
+        $artefacts = $this->prepData($artefacts);
+        return view('artefact.default', ['artefacts' => $artefacts]);
     }
 
     /**
@@ -114 +119 @@
      */
     public function view($id)
     {
-        $artefact = Artefact::find($id);
-        $artefact['likes'] = Artefact::find($id)->users()->count();
-        $artefact['favourite'] = is_null(User::find(Auth::id())->likesArtefacts()->find($id)) ? false : true;
-
-        return view('artefact.view', ['artefact' => $artefact]);
+        $artefact = Artefact::find($id)->simplePaginate(1);
+        $artefact = $this->prepData($artefact);
+        //return view('artefact.view', ['artefact' => $artefact]);
+        return view('artefact.default', ['artefacts' => $artefact]);
     }
 
     /**

app/Http/Controllers/Auth/RegisterController.php

@@ -6 +6 @@
 use App\Mail\RegisterMail;
 use App\Providers\RouteServiceProvider;
 use App\User;
+use Illuminate\Routing\UrlGenerator;
 use Illuminate\Foundation\Auth\RegistersUsers;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Mail;
@@ -70 +71 @@
         $vowels = array("/", "\\");
         $stringHModified = str_replace($vowels, "", $stringH);
 
-        Mail::to($data['email'])->send(new RegisterMail("http://localhost/verify/". $stringHModified));
+        //Mail::to($data['email'])->send(new RegisterMail("http://localhost/verify/". $stringHModified));
+        Mail::to($data['email'])->send(new RegisterMail(url("/verify/") . "/" . $stringHModified));//http://localhost/register/verify/..
 
         return User::create([
             'name' => $data['name'],

app/Http/Controllers/FavoriteArtefactsController.php

@@ -12 +12 @@
 
 class FavoriteArtefactsController extends Controller
 {
+    const ORDER_COLUMN = 'page';
+
     public function __construct()
     {
         $this->middleware('auth');
     }
 
+    /**
+     * Prepare all necessary data for shown Artefact.
+     * These are current count of likes, if it set to
+     * a favorites by a logged user and all metadata
+     * connected to the artefact.
+     *
+     * @param       $artefacts  all artefacts
+     * @return      mixed       modified artefacts
+     */
+    public function prepData($artefacts)
+    {
+        foreach($artefacts as $artefact)
+        {
+            $artefact['likes'] = Artefact::find($artefact->id)->users()->count();
+            $artefact['favourite'] = is_null(User::find(Auth::id())->likesArtefacts()->find($artefact->id)) ? false : true;
+            $metadata = Artefact::find($artefact->id)->metadata()->orderBy(self::ORDER_COLUMN)->get();
+            foreach ($metadata as $item)
+            {
+                $item['favourite'] = is_null(User::find(Auth::id())->likesMetadata()->find($item->id)) ? false : true;
+            }
+            $artefact['metadata'] = $metadata;
+        }
+        return $artefacts;
+    }
+
     /**
      * Display a listing of the resource.
      *
@@ -27 +54 @@
         if(Auth::check())
         {
             $id = Auth::id();
-            $artefacts = User::find($id)->likesArtefacts()->get();
-            foreach($artefacts as $item)
-            {
-                $item['likes'] = Artefact::find($item->id)->users()->count();
-            }
-
-            $data = array(
-                'title' => 'Favorite artefacts',
-                'user' => $id,
-                'artefacts' => $artefacts
-            );
-            return view('favartefacts.index') -> with($data);
+            $artefacts = User::find($id)->likesArtefacts()->simplePaginate(1);
+            $artefacts = $this->prepData($artefacts);
+            return view('artefact.default', ['artefacts' => $artefacts]);
         }
         else
         {
-            $data = array(
-                'title' => 'Welcome to the MERLOT page',
-            );
-            //return view('index', compact('title'));
-            return view('pages.index') -> with($data);
+            return view('pages.index');
         }
     }
 
@@ -58 +72 @@
      */
     public function show($id)
     {
-        $artefacts = User::find($id)->likesArtefacts()->get();
-        foreach($artefacts as $item)
-        {
-            $item['likes'] = Artefact::find($item->id)->users()->count();
-        }
-
-        $data = array(
-            'title' => 'Favorite artefacts',
-            'id' => $id,
-            'user' => User::find($id),
-            'userId' => Auth::id(),
-            'artefacts' => $artefacts
-        );
-        return view('favartefacts.index') -> with($data);
+        $artefacts = User::find($id)->likesArtefacts()->simplePaginate(1);
+        $artefacts = $this->prepData($artefacts);
+        return view('artefact.default', ['artefacts' => $artefacts]);
     }
 
 }

resources/sass/_custom.scss

@@ -800 +800 @@
     //VERIFY - main text
     .ver-text{
 
-        margin-top: 20pt    ;
+        margin-top: 50pt;
 
         h2{
             text-align: center;