Revize 75508baf

Merge origin/develop into master

README.md

@@ -38 +38 @@
 
 Migrace dat z Mockaroo je tímto okamžikem obsolete.
 
+### Výchozí uživatel
+
+Je nadefinován výchozí (testovací) uživatel.
+
+**Login** [e-mail] **heslo** admin
+
 ## Jak zprovoznit bootstrap a kompilaci SASS souborů
 
 1. Ujistěte se, že v sekci **Run/Edit Configurations** máte nastavený **Document root** na složku `public` v kořenovém adresáři (jinak aplikace **nenajde** vygenerované css soubory).
 2. Spusťte `composer install` (soubor pro composer už by měl být updatován) pro nainstalování balíčku `laravel/ui`.
 3. Spusťte v terminálu příkaz `npm install && npm run dev`, příkaz zkompiluje všechny dostupné sass (`resources/sass`) do css souboru typicky do složky `public/css`.
     1. Nastavením příkazu `npm run watch` se sass automaticky překompiluje při detekci změny.
+
+## Nastavení Mailtrap účtu pro odesílání registračních zpráv
+
+Pro správné nastavení posílání emailů je nutné poupravit soubor `.env`. Najděte v souboru sekci `MAIL_...` a nahraďte je níže uvedenými hodnotami:
+
+```shell script
+MAIL_MAILER=smtp
+MAIL_HOST=smtp.mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=d1eae987fe913e
+MAIL_PASSWORD=d109bc15f3dc66
+MAIL_ENCRYPTION=tls
+MAIL_FROM_ADDRESS=[e-mail]
+MAIL_FROM_NAME="${APP_NAME}"
+```
+
+Pro přístup k mail serveru je nutné se příhlásit na stránce https://mailtrap.io/ s níže přidanými přihlašovacími údaji:
+
+email:`[e-mail]`
+heslo:`merlot2020Betammajl`
+
+Následně je konkrétní mail server přístupný z Inboxu `Demo inbox`.
+

app/Http/Controllers/ArtefactController.php

@@ -5 +5 @@
 use App\Artefact;
 use App\ArtefactCategory;
 use App\Category;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
+use App\User;
+use Illuminate\Contracts\View\Factory;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\View\View;
 
 class ArtefactController 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;
+    }
+
     /**
      * Returns view of all artefacts.
      *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return Factory|View
      */
     public function default()
     {
-        $artefacts = Artefact::all();
-
+        $artefacts = Artefact::simplePaginate(1);
+        $artefacts = $this->prepData($artefacts);
         return view('artefact.default', ['artefacts' => $artefacts]);
     }
 
     /**
      * Returns view of artefacts related to the chosen category
      *
-     * @param $id       id of the category
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @param $id id of the category
+     * @return Factory|View
      */
     public function showCategory($id)
     {
-        $cateogryArtefacts = ArtefactCategory::where('category_id', $id)->get();
-        if(count($cateogryArtefacts) > 0)
+        $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 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);
+        $arrStrToInt = array();
+        for($i = 0;$i < count($pieces); $i++)
         {
-            $artefacts = array();
-            foreach($cateogryArtefacts as $ar)
+            if($pieces[$i] == null || !strcmp($pieces[$i], ""))
             {
-                array_push($artefacts, Artefact::where('id', $ar->artefact_id)->get());
+                continue;
             }
-            return view('artefact.category', ['artefacts' => $artefacts]);
+
+            array_push($arrStrToInt, (int)$pieces[$i]);
         }
-        else
+
+        //Creating array of all artefacts ids
+        $arrArtIds = array();
+        foreach($arrStrToInt as $cat)
         {
-            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]);
     }
 
     /**
      * Returns view of single artefact given by its id.
      *
      * @param $id int id of the artefact
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * @return Factory|View
      */
     public function view($id)
     {
+        $artefact = Artefact::where('id', $id)->simplePaginate(1);
+        $artefact = $this->prepData($artefact);
+        //return view('artefact.view', ['artefact' => $artefact]);
+        return view('artefact.default', ['artefacts' => $artefact]);
+    }
+
+    /**
+     * Likes artefact given by its id.
+     *
+     * @param $id int id of metadata
+     * @return RedirectResponse
+     */
+    public function like($id)
+    {
+        $user = User::find(Auth::id());
+        $artefact = Artefact::find($id);
+
+        $user->likesArtefacts()->attach($artefact);
+
+        return back()->withInput();
+    }
+
+    /**
+     * Unlikes artefact given by its id.
+     *
+     * @param $id int id of metadata
+     * @return RedirectResponse
+     */
+    public function unlike($id)
+    {
+        $user = User::find(Auth::id());
         $artefact = Artefact::find($id);
-        $artefact['likes'] = Artefact::find($id)->users()->count();
 
-        return view('artefact.view', ['artefact' => $artefact]);
+        $user->likesArtefacts()->detach($artefact);
+
+        return back()->withInput();
     }
+
+    /**
+     * Returns artefact given by its id.
+     *
+     * @param $id int id of artefact
+     * @return RedirectResponse
+     */
+    /*public function view($id)
+    {
+        //$user = User::find(Auth::id());
+        //$artefact = Artefact::find($id);
+
+        $artefacts = Artefact::withCount('users')->orderByDesc('users_count')->get()->take(10);
+
+
+            $currentPage = -1; // You can set this to any page you want to paginate to
+
+            for($i=0;$i<10;$i++){
+                if($artefacts[$i]->id==$id) $currentPage = $i+1;
+            }
+            // Make sure that you call the static method currentPageResolver()
+            // before querying users
+            \Illuminate\Pagination\Paginator::currentPageResolver(function () use ($currentPage) {
+                return $currentPage;
+            });
+
+
+
+        $artefacts = Artefact::withCount('users')->orderByDesc('users_count')->limit(10)->paginate(1);
+
+        $artefacts = ArtefactController::prepData($artefacts);
+        return view('artefact.default', ['artefacts' => $artefacts]);
+        /*foreach($artefacts as $item)
+        {
+            $id = $item->id;
+            $item['likes'] = Artefact::find($id)->users()->count();
+            $item['favourite'] = is_null(User::find(Auth::id())->likesArtefacts()->find($id)) ? false : true;
+        }*/
+
+
+        //return back()->withInput();
+    /*}*/
 }

app/Http/Controllers/Auth/RegisterController.php

@@ -3 +3 @@
 namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
+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;
 use Illuminate\Support\Facades\Validator;
 
 class RegisterController extends Controller
@@ -64 +67 @@
      */
     protected function create(array $data)
     {
-        //dd($data);
+        $stringH = Hash::make($data['email'] . $data['name']);
+        $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(url("/verify/") . "/" . $stringHModified));//http://localhost/register/verify/..
 
         return User::create([
             'name' => $data['name'],
             'email' => $data['email'],
             'password' => Hash::make($data['password']),
+            'register_hash' => $stringHModified,
         ]);
     }
 }

app/Http/Controllers/ChartsController.php

@@ +1 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\User;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Contracts\View\Factory;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Support\Facades\Auth;
+use App\Http\Controllers\Image;
+use Illuminate\View\View;
+use App\Artefact;
+
+class ChartsController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return Application|Factory|View
+     */
+    public function index()
+    {
+        if(Auth::check())
+        {
+            $artefacts = Artefact::withCount('users')->orderByDesc('users_count')->get()->take(10);
+            foreach($artefacts as $item)
+            {
+                $id = $item->id;
+                $item['likes'] = Artefact::find($id)->users()->count();
+                $item['favourite'] = is_null(User::find(Auth::id())->likesArtefacts()->find($id)) ? false : true;
+            }
+
+            $data = array(
+                'title' => 'Charts',
+                'artefacts' => $artefacts
+            );
+            return view('charts.index') -> with($data);
+        }
+        else
+        {
+            $data = array(
+                'title' => 'Welcome to the MERLOT page',
+            );
+            //return view('index', compact('title'));
+            return view('pages.index') -> with($data);
+        }
+    }
+
+
+}

app/Http/Controllers/DetailsController.php

@@ -3 +3 @@
 namespace App\Http\Controllers;
 
 use App\ArtefactUser;
+use App\User;
 use Illuminate\Http\Request;
 use App\Metadata;
 use App\Artefact;
+use Illuminate\Support\Facades\Auth;
 
 class DetailsController extends Controller
 {
+    const ORDER_COLUMN = 'page';
+
     public function __construct()
     {
         $this->middleware('auth');
@@ -32 +36 @@
      * Display the specified resource.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function show($id)
     {
-        $data = array(
-            'id' => $id,
-            'arrArtefact' => Artefact::find($id),
-            'likes' => Artefact::find($id)->users()->count(),
-            'metadata' => Metadata::where('artefact_id', $id)->get()
-        );
-        return view('detail.index') -> with($data);
+        if (is_null(Artefact::find($id)))
+        {
+            return view('detail.index', ['metadata' => []]);
+        }
+
+        $metadata = Artefact::find($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;
+        }
+
+        return view('detail.index', ['metadata' => $metadata]);
     }
 
+    /**
+     * Likes metadata given by its id.
+     *
+     * @param $id int id of metadata
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function like($id)
+    {
+        $user = User::find(Auth::id());
+        $metadata = Metadata::find($id);
+
+        $user->likesMetadata()->attach($metadata);
+
+        return back()->withInput();
+    }
+
+    /**
+     * Unlikes metadata given by its id.
+     *
+     * @param $id int id of metadata
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function unlike($id)
+    {
+        $user = User::find(Auth::id());
+        $metadata = Metadata::find($id);
+
+        $user->likesMetadata()->detach($metadata);
+
+        return back()->withInput();
+    }
 }

app/Http/Controllers/FavoriteArtefactsController.php

@@ -2 +2 @@
 
 namespace App\Http\Controllers;
 
-use App\ArtefactUser;
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Contracts\View\Factory;
 use Illuminate\Support\Facades\Auth;
 use App\User;
 use App\Artefact;
 use App\Http\Controllers\Image;
+use Illuminate\View\View;
 
 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.
      *
-     * @return \Illuminate\Http\Response
+     * @return Application|Factory|View
      */
     public function index()
     {
         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');
         }
     }
 
@@ -52 +68 @@
      * Display the specified resource.
      *
      * @param  int  $id
-     * @return \Illuminate\Http\Response
+     * @return Application|Factory|View
      */
     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]);
     }
 
 }

app/Http/Controllers/FavoriteMetadataController.php

@@ -16 +16 @@
         $this->middleware('auth');
     }
 
+    /**
+     * Show list of favourite metadata.
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
     public function index()
     {
         $metadata = User::find(Auth::id())->likesMetadata()->orderBy(self::ORDER_COLUMN)->get();
@@ -27 +32 @@
         return view('favmetadata.index', ['metadata' => $metadata]);
     }
 
+    /**
+     * Unlike metadata given by its id.
+     *
+     * @param $id int id of metadata
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function unlike($id)
+    {
+        $user = User::find(Auth::id());
+        $metadata = Metadata::find($id);
+
+        $user->likesMetadata()->detach($metadata);
+
+        return back()->withInput();
+    }
+
 }

app/Http/Controllers/VerifyRegisterController.php

@@ +1 @@
+<?php
+
+
+namespace App\Http\Controllers;
+
+
+use App\User;
+use Illuminate\Contracts\View\Factory;
+use Illuminate\View\View;
+
+class VerifyRegisterController extends Controller
+{
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    /**
+     * Verify registration link with time and user database,
+     * if the user exists. If everything checks out, the user's
+     * account will be activated.
+     *
+     * @param $id string hash of created user
+     * @return Factory|View
+     */
+    public function verifyUser($id)
+    {
+        $userV = User::where('register_hash', $id)->get();
+        $text = "";
+        if(!$userV->isEmpty())
+        {
+            $created = $userV[0]->created_at;
+            $now = date('Y-m-d h:i:s');
+            $interval = $created->diff($now);
+
+            if($interval->d >= 2)
+            {
+                $text = "Registration link expired!\n Need to create new account";
+                $userV[0]->delete();
+            }
+            else if(isset($userV[0]->email_verified_at))
+            {
+                $text = "Registration link already activated!";
+            }
+            else
+            {
+                $userV[0]->email_verified_at = date('Y-m-d h:i:s');
+                $userV[0]->save();
+                $text = "Registration of the user " . $userV[0]->name . " has been successful.";
+            }
+        }
+        else
+        {
+            $text = "The link is not valid!";
+        }
+        return view('verify.index', ['text' => $text]);
+    }
+}

app/Http/Kernel.php

@@ -17 +17 @@
         \App\Http\Middleware\TrustProxies::class,
         \Fruitcake\Cors\HandleCors::class,
         \App\Http\Middleware\CheckForMaintenanceMode::class,
+        //\Illuminate\Session\Middleware\StartSession::class,
+        //\Illuminate\View\Middleware\ShareErrorsFromSession::class,
         \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
         \App\Http\Middleware\TrimStrings::class,
         \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,

app/Mail/RegisterMail.php

@@ +1 @@
+<?php
+
+namespace App\Mail;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Mail\Mailable;
+use Illuminate\Queue\SerializesModels;
+
+class RegisterMail extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public $stringHash;
+
+    /**
+     * Create a new message instance.
+     *
+     * @return void
+     */
+    public function __construct($stringH)
+    {
+        $this->stringHash = $stringH;
+    }
+
+    /**
+     * Build the message.
+     *
+     * @return $this
+     */
+    public function build()
+    {
+        return $this->markdown('email.register');
+    }
+}

app/User.php

@@ -20 +20 @@
      * @var array
      */
     protected $fillable = [
-         'name', 'email', 'password'
+         'name', 'email', 'password', 'register_hash'
     ];
 
     /**

composer.json

@@ -14 +14 @@
         "guzzlehttp/guzzle": "^6.3",
         "laravel/framework": "^7.0",
         "laravel/tinker": "^2.0",
-        "laravel/ui": "^2.0"
+        "laravel/ui": "^2.0",
+        "spatie/laravel-cookie-consent": "^2.12"
     },
     "require-dev": {
         "facade/ignition": "^2.0",

composer.lock

@@ -4 +4 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "f0dcbdc80776ca79d6311b8f92c5a4b5",
+    "content-hash": "f58cabd0613b5fb1c84929018285ce2e",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -1966 +1966 @@
             ],
             "time": "2020-02-21T04:36:14+00:00"
         },
+        {
+            "name": "spatie/laravel-cookie-consent",
+            "version": "2.12.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/spatie/laravel-cookie-consent.git",
+                "reference": "e455e6b45c68464ab8aad585ed51d1a098f967e4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/spatie/laravel-cookie-consent/zipball/e455e6b45c68464ab8aad585ed51d1a098f967e4",
+                "reference": "e455e6b45c68464ab8aad585ed51d1a098f967e4",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/cookie": "~5.8.0|^6.0|^7.0",
+                "illuminate/support": "~5.8.0|^6.0|^7.0",
+                "illuminate/view": "~5.8.0|^6.0|^7.0",
+                "php": "^7.2"
+            },
+            "require-dev": {
+                "fzaninotto/faker": "~1.4",
+                "orchestra/testbench": "~3.8.0|^4.0|^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Spatie\\CookieConsent\\CookieConsentServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Spatie\\CookieConsent\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Freek Van der Herten",
+                    "email": "[e-mail]",
+                    "homepage": "https://spatie.be",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Willem Van Bockstal",
+                    "email": "[e-mail]",
+                    "homepage": "https://spatie.be",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Make your Laravel app comply with the crazy EU cookie law",
+            "homepage": "https://github.com/spatie/cookie-consent",
+            "keywords": [
+                "comply",
+                "cookie",
+                "cookie-consent",
+                "eu",
+                "law",
+                "spatie"
+            ],
+            "time": "2020-05-14T16:57:04+00:00"
+        },
         {
             "name": "swiftmailer/swiftmailer",
             "version": "v6.2.3",
@@ -5506 +5573 @@
     "platform": {
         "php": "^7.2.5"
     },
-    "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "platform-dev": []
 }

database/factories/ArtefactFactory.php

@@ -10 +10 @@
 
 $factory->define(Artefact::class, function ($faker) {
     return [
-        'name' => $faker->opera,
+        'name' => $faker->words($nb = 3, $asText = true),
         'author' => $faker->name,
         'made_in' => $faker->countryCode,
         'publisher' => $faker->company,

database/factories/UserFactory.php

@@ -27 +27 @@
         'remember_token' => Str::random(10),
         'created_at' => now(),
         'updated_at' => now(),
+        'register_hash' => Str::random(10),
     ];
 });

database/migrations/2020_04_06_000000_CreateUsersTable.php

@@ -23 +23 @@
             $table->string('password');
             $table->rememberToken();
             $table->timestamps();
+            $table->string('register_hash');
         });
     }
 

database/seeds/DatabaseSeeder.php

@@ -21 +21 @@
             'remember_token' => Str::random(10),
             'created_at' => now(),
             'updated_at' => now(),
+            'register_hash' => Str::random(10),
         ]);
 
         // Populate users

public/css/app.css

@@ -10885 +10885 @@
 body {
   background-color: #272727;
   font-family: Nunito;
-  /*.form-control:focus {
-      background-color: $theme-color-five;
-      margin-top: -1px;
-      border-top-color: $theme-color-five;
-      border-left-color: $theme-color-five;
-      border-right-color: $theme-color-five;
-      border-bottom-color: 0.5pt $theme-color-one;
-      color: $theme-color-one;
-      box-shadow: none;
-      font-size: 8pt;
-  }*/
-  /*footer {
-      background: $theme-color-four;
-      color: $theme-color-five;
-      display: block;
-      height: 50px;
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      width: 100%;
+  padding-top: 5.1rem;
+  /*.content {
+      position: relative;
+
+      //Circle style button
+      .btn-circle.rounded-circle {
+          padding: 6px 0px;
+          font-size: 16px;
+          text-align: center;
+      }
+      .btn-categories
+      {
+          position: absolute;
+          border-width: 5px;
+          background-color: $theme-color-five;
+          border-color: $theme-color-four;
+          color:$theme-color-four;
+          outline: none !important;
+          box-shadow: none !important;
+          font-weight: $font-weight-two;
+
+          &:active
+          {
+              background-color: $theme-color-three;
+              border-color: $theme-color-four;
+              outline: none !important;
+              box-shadow: none !important;
+              color:$theme-color-five;
+          }
+      }
   }*/
 }
 
@@ -10915 +10925 @@
   letter-spacing: 3px;
 }
 
+body .carousel {
+  margin-top: -5.1rem;
+}
+
 body .carousel .carousel-inner .museum-logo {
   display: flex;
   justify-content: center;
@@ -10924 +10938 @@
   z-index: 1;
 }
 
+body .carousel .carousel-inner .museum-logo img {
+  width: 7.5rem;
+}
+
 body .carousel .carousel-inner .social-logo {
   text-align: center;
-  justify-content: space-between;
+  justify-content: space-around;
   flex-wrap: nowrap;
   position: absolute;
   top: 25%;
@@ -10935 +10953 @@
   z-index: 1;
 }
 
+body .carousel .carousel-inner .social-logo img {
+  width: 2.0625rem;
+}
+
 body .carousel .carousel-inner .carousel-button {
   bottom: 10%;
   left: 50%;
@@ -10953 +10975 @@
 body .carousel .carousel-caption {
   top: 50%;
   bottom: auto;
+  padding-left: 1rem;
+  padding-right: 1rem;
   transform: translateY(-50%);
   background-color: rgba(239, 218, 179, 0.5);
 }
 
-body .carousel .carousel-caption p {
-  font-size: 8pt;
-  color: #272727;
-}
-
 body .text {
   font-weight: 400;
   font-size: 8pt;
@@ -10998 +11017 @@
   color: #ead4b0;
 }
 
+body .text-headline-desktop {
+  font-weight: 600;
+  font-size: 24pt;
+  color: #ead4b0;
+}
+
 body .text-page {
   font-weight: 600;
   font-size: 7pt;
@@ -11023 +11048 @@
 
 body .auth .col-form-label {
   text-align: left;
-  padding-top: 0px;
-  padding-bottom: 0px;
+  padding-top: 0;
+  padding-bottom: 0;
 }
 
 body .auth .form-control {
-  padding: 0px;
+  padding: 0;
   height: 17pt;
-  border-radius: 0%;
+  border-radius: 0;
+}
+
+body .auth .form-control:focus {
+  border-top-color: #272727;
+  border-left-color: #272727;
+  border-right-color: #272727;
+  border-bottom-color: 0.5pt #ffffff;
+  box-shadow: none;
+}
+
+body input:-webkit-autofill {
+  -webkit-box-shadow: 0 0 0 50px #272727 inset !important;
+  -webkit-text-fill-color: #ffffff;
+  background-color: #272727 !important;
+}
+
+body input:-webkit-autofill:active,
+body input:-webkit-autofill:focus,
+body input:-webkit-autofill:visited,
+body input:-webkit-autofill:hover {
+  -webkit-box-shadow: 0 0 0 50px #272727 inset !important;
+  -webkit-text-fill-color: #ffffff;
+  background-color: #272727 !important;
 }
 
 body .card-body {
@@ -11049 +11097 @@
   color: #ffffff;
   box-shadow: none;
   font-size: 8pt;
+  outline: none;
 }
 
 body .form-control:active,
 body .form-control:focus,
-body .form-control:visited {
+body .form-control:visited,
+body .form-control:hover {
+  outline: none;
   background-color: #272727;
   margin-top: -1px;
   border-top-color: #272727;
@@ -11083 +11134 @@
   color: #ffffff;
   border: 0.5pt solid #ffffff;
   border-radius: 0;
-  width: 6.5rem;
-  height: 2rem;
+  padding: 0.4675rem 2.475rem;
   font-weight: 400;
 }
 
 body .button-square:active,
 body .button-square:focus,
-body .button-square:visited {
+body .button-square:visited,
+body .button-square:hover {
   outline: none;
   box-shadow: none;
+  color: #ffffff;
+}
+
+body .button-square:hover {
+  color: #ead4b0;
 }
 
 body .pin-left:before {
@@ -11109 +11165 @@
 
 body .pin-left {
   border-left: 0.5pt solid #ead4b0;
-  display: inline-block;
-  margin: 10rem 50px 0px -5rem;
   position: fixed;
-  top: 0;
   bottom: 0;
   text-align: left;
-  width: 100%;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 70%;
 }
 
 body .pin-left .text {
   margin-left: 0.5rem;
+  margin-bottom: 0.2rem;
 }
 
 body .pin-left p {
-  margin-top: 0pt;
-  margin-bottom: 0pt;
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 body li {
@@ -11148 +11204 @@
   background-repeat: no-repeat;
 }
 
+body .fav-cat-mybooks {
+  color: #ddd1b9;
+  text-align: center;
+  font-size: 1.9rem;
+}
+
+body .fav-cat-nofav {
+  text-align: center;
+  color: #efdab3;
+  background-color: #272727;
+  border-color: #efdab3;
+}
+
 body .artefacts-area h5,
 body .artefact-area h5 {
   color: #ddd1b9;
-  font-weight: 600;
-  line-height: 20pt;
-  font-size: 21pt;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  white-space: nowrap;
+  line-height: 0.9rem;
+  font-size: 1.1rem;
 }
 
 body .artefacts-area h6,
 body .artefact-area h6 {
   color: #ddd1b9;
-  font-size: 14pt;
+  font-size: 0.9rem;
   font-weight: 400;
 }
 
@@ -11178 +11249 @@
 body .artefacts-area .left_panel_info,
 body .artefact-area .left_panel_info {
   margin-top: 15px;
-  margin-left: -10px;
-  max-width: 250px;
+  max-width: 70%;
 }
 
 body .artefacts-area .right_panel_info,
 body .artefact-area .right_panel_info {
   margin-top: 15px;
-  margin-right: -15px;
+}
+
+body .artefacts-area .likes_text,
+body .artefact-area .likes_text {
+  text-align: center;
 }
 
 body .artefacts-area .card-cus-bottom,
 body .artefact-area .card-cus-bottom {
   background-color: #272727;
+  padding-right: 0;
+  padding-left: 0;
 }
 
 body .artefacts-area .inter_info:before,
 body .artefact-area .inter_info:before {
-  background-image: url(/images/Button_Info_50.png?cf6e509b9294d4138459f1846c7effdf);
-  width: 60px;
-  height: 60px;
+  background-image: url(/images/Button_Info.svg?92f55a6c483b585543ec80f3fd3461de);
+  width: 8vw;
+  height: 8vw;
 }
 
 body .artefacts-area .inter_like,
@@ -11207 +11283 @@
 
 body .artefacts-area .inter_like:before,
 body .artefact-area .inter_like:before {
-  background-image: url(/images/Hearth_Empty_50.png?d969cd4d381634ef975e503608b3ab48);
-  width: 60px;
-  height: 60px;
+  background-image: url(/images/Heart_Empty.svg?974f069a126736e569df0f463d68c026);
+  width: 8vw;
+  height: 8vw;
 }
 
 body .artefacts-area .inter_like_filled:before,
 body .artefact-area .inter_like_filled:before {
-  background-image: url(/images/Hearth_Filled_50.png?77bb26c3aba063c00aba1a2f07059d71);
-  width: 60px;
-  height: 60px;
+  background-image: url(/images/Heart_Filled.svg?e5b962dc0fd67a2042277b9826016c9c);
+  width: 8vw;
+  height: 8vw;
+}
+
+body .artefacts-area .charts .inter_info,
+body .artefacts-area .charts .inter_like,
+body .artefacts-area .charts .inter_like_filled,
+body .artefact-area .charts .inter_info,
+body .artefact-area .charts .inter_like,
+body .artefact-area .charts .inter_like_filled {
+  display: inline;
+}
+
+body .artefacts-area .charts .inter_info:before,
+body .artefacts-area .charts .inter_like:before,
+body .artefacts-area .charts .inter_like_filled:before,
+body .artefact-area .charts .inter_info:before,
+body .artefact-area .charts .inter_like:before,
+body .artefact-area .charts .inter_like_filled:before {
+  width: 3rem;
+  height: 3rem;
 }
 
 body .artefacts-area .inter_info,
@@ -11278 +11373 @@
 }
 
 body .artefact-area .inter_like:before {
-  background-image: url(/images/Hearth_Empty_Small.png?252b4c7a69920aa18f2fc75a93aaa90a);
-  width: 25px;
-  height: 19px;
+  background-image: url(/images/Heart_Empty.svg?974f069a126736e569df0f463d68c026);
+  width: 1.563rem;
+  height: 1.25rem;
+}
+
+body .artefact-area .inter_like_filled:before {
+  background-image: url(/images/Heart_Filled.svg?e5b962dc0fd67a2042277b9826016c9c);
+  width: 1.563rem;
+  height: 1.25rem;
 }
 
 body .artefact-area .inter_info {
@@ -11288 +11389 @@
 }
 
 body .artefact-area .inter_info:before {
-  background-image: url(/images/Button_Info_Small.png?9bc35ac07e9ec5a6b75d9af964e80512);
-  width: 29px;
-  height: 29px;
+  background-image: url(/images/Button_Info.svg?92f55a6c483b585543ec80f3fd3461de);
+  width: 1.875rem;
+  height: 1.875rem;
 }
 
 body .artefact-area .artefact-likes {
@@ -11300 +11401 @@
 }
 
 body .metadata-area h2 {
+  color: #ddd1b9;
   font-weight: 600;
   font-size: 12pt;
 }
@@ -11320 +11422 @@
   color: #ddd1b9;
   border-bottom: 0.042rem solid #ddd1b9;
   display: inline-block;
-  margin: 3.35rem 3.125rem 0 0;
+  margin: 2.75rem 3.125rem 0 0;
 }
 
-body .metadata-area .pin-horizontal:before {
+body .metadata-area .pin-horizontal:after {
   content: "";
   background-color: #ddd1b9;
   position: relative;
   height: 0.5rem;
   width: 0.5rem;
   border-radius: 50%;
-  display: inline-block;
-  top: 1.5rem;
-  left: 50vw;
+  display: block;
+  margin-left: auto;
+  top: 0.25rem;
 }
 
 body .metadata-area .pin-horizontal .metadata {
@@ -11341 +11443 @@
   align-items: baseline;
 }
 
-body .metadata-area .pin-horizontal .metadata span {
+body .metadata-area .pin-horizontal .metadata a {
+  color: #ddd1b9;
+  text-decoration: none;
+}
+
+body .metadata-area .pin-horizontal .metadata a span {
   font-weight: 600;
 }
 
@@ -11362 +11469 @@
   border-bottom: 0.042rem solid #ffffff;
 }
 
-body .metadata-area .white-pin:before {
+body .metadata-area .white-pin:after {
   content: "";
   background-color: #ffffff;
 }
 
+body .metadata-area .white-pin .metadata a {
+  color: #ffffff;
+}
+
 body .metadata-area .white-pin .metadata .arrow-down {
   border-top: 0.25rem solid #ffffff;
 }
@@ -11394 +11505 @@
   font-size: 7pt;
 }
 
+body .metadata-area .metadata-text .artefact-info .inter_like:before {
+  background-image: url(/images/Heart_Empty.svg?974f069a126736e569df0f463d68c026);
+  width: 3.125rem;
+  height: 3.125rem;
+  margin-right: 0;
+}
+
+body .metadata-area .metadata-text .artefact-info .inter_like:hover,
+body .metadata-area .metadata-text .artefact-info .inter_like:focus,
+body .metadata-area .metadata-text .artefact-info .inter_like:active {
+  background-color: transparent !important;
+  border-color: transparent !important;
+  outline: none !important;
+  box-shadow: none !important;
+}
+
 body .metadata-area .metadata-text .artefact-info .inter_like_filled:before {
-  background-image: url(/images/Hearth_Filled_50.png?77bb26c3aba063c00aba1a2f07059d71);
-  width: 50px;
-  height: 50px;
+  background-image: url(/images/Heart_Filled.svg?e5b962dc0fd67a2042277b9826016c9c);
+  width: 3.125rem;
+  height: 3.125rem;
+  margin-right: 0;
 }
 
 body .metadata-area .metadata-text .artefact-info .inter_like_filled:hover,
@@ -11409 +11537 @@
   box-shadow: none !important;
 }
 
-body .content {
-  position: relative;
+body .modal {
+  font-weight: 400;
+  color: #ddd1b9;
+  font-size: 8pt;
 }
 
-body .content .btn-circle.rounded-circle {
-  padding: 6px 0px;
-  font-size: 16px;
-  text-align: center;
+body .modal .modal-header {
+  border-bottom: 1px solid #ddd1b9;
 }
 
-body .content .btn-categories {
-  position: absolute;
-  border-width: 5px;
+body .modal .modal-header .close {
+  color: #ddd1b9;
+  text-shadow: none;
+}
+
+body .modal .modal-content {
   background-color: #272727;
-  border-color: #ead4b0;
-  color: #ead4b0;
-  outline: none !important;
-  box-shadow: none !important;
-  font-weight: 600;
 }
 
-body .content .btn-categories:active {
-  background-color: #efdab3;
-  border-color: #ead4b0;
-  outline: none !important;
-  box-shadow: none !important;
+body .modal .modal-footer {
+  border-top: 1px solid #ddd1b9;
+}
+
+body .modal .modal-footer .btn {
+  background-color: #ddd1b9;
   color: #272727;
 }
 
-body .cat-col-md-2 {
-  margin: 2%;
+body .image-modal .close {
+  font-size: 24pt;
+  color: #ddd1b9;
+  text-shadow: none;
+  position: absolute;
+  top: 1rem;
+  right: 0.125rem;
+  opacity: 1;
+  cursor: pointer;
+  pointer-events: initial;
 }
 
 body .btn.btn-dark.cat-tile {
@@ -11452 +11587 @@
   text-align: center;
   outline: none !important;
   box-shadow: none !important;
-  font-size: 8mm;
-  word-wrap: break-word;
-  height: 40mm;
-  width: 100%;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  font-size: 22pt;
+  padding: 4rem 1rem;
 }
 
 body .btn.btn-dark.cat-tile:active,
@@ -11467 +11602 @@
   color: #272727;
 }
 
+body .btn-dark:not(:disabled):not(.disabled).active {
+  background-color: #ead4b0;
+  color: white;
+  border-color: #272727;
+}
+
 body .category-h2 {
   color: #ead4b0;
 }
 
-.arrow {
-  position: absolute;
-  width: 0;
-  height: 0;
-  margin: 2rem;
-  cursor: pointer;
-  border: 0.59055rem solid transparent;
+body .head-title.text-center.cat-main-topic h1 {
+  font-size: 1.9rem;
+}
+
+body .cat-main-menu {
+  font-size: 1.75rem;
+  text-align: center;
+  margin-bottom: 30pt;
+}
+
+body .cat-main-menu a,
+body .cat-main-menu a:visited {
+  color: #ddd1b9;
+  text-decoration: none;
+}
+
+body .cat-main-menu a:hover {
+  color: #ead4b0;