diff --git a/app/Http/Controllers/Forum/PostsController.php b/app/Http/Controllers/Forum/PostsController.php index 5c84aab..82b327e 100644 --- a/app/Http/Controllers/Forum/PostsController.php +++ b/app/Http/Controllers/Forum/PostsController.php @@ -3,9 +3,55 @@ namespace App\Http\Controllers\Forum; use App\Http\Controllers\Controller; +use App\Http\Requests\Forum\PostRequest; +use App\Models\Forum\Post; +use App\Models\Forum\Thread; +use App\Models\Forum\Topic; use Illuminate\Http\Request; class PostsController extends Controller { - // + public function create() + { + // full reply? + } + + public function store(PostRequest $request, string $categorySlug, string $threadSlug, string $topicSlug) + { + $thread = Thread::with('category')->where('slug', $threadSlug)->first(); + $topic = Topic::where('slug', $topicSlug)->first(); + + if ($topic->status == Topic::STATUS_CLOSED) { + abort(403); + } + + Post::create([ + 'content' => $request->get('content'), + 'user_id' => auth()->user()->id, + 'category_id' => $thread->category->id, + 'thread_id' => $thread->id, + 'topic_id' => $topic->id, + ]); + + $topic->replies_no = $topic->replies_no+1; + $topic->save(); + + // redirect back, keep in mind pagination + return redirect()->back()->with('success', 'Reply posted!'); + } + + public function edit(int $id) + { + + } + + public function update(PostRequest $request, int $id) + { + + } + + public function destroy(int $id) + { + + } } diff --git a/app/Http/Controllers/Forum/TopicsController.php b/app/Http/Controllers/Forum/TopicsController.php index 1eb3f4d..316a576 100644 --- a/app/Http/Controllers/Forum/TopicsController.php +++ b/app/Http/Controllers/Forum/TopicsController.php @@ -4,12 +4,76 @@ namespace App\Http\Controllers\Forum; use App\Http\Controllers\Controller; use App\Http\Requests\Forum\TopicRequest; +use App\Models\Forum\Category; +use App\Models\Forum\Post; +use App\Models\Forum\Thread; +use App\Models\Forum\Topic; use Illuminate\Http\Request; +use Illuminate\Support\Str; class TopicsController extends Controller { - public function create(TopicRequest $request) + public function show(string $categorySlug, string $threadSlug, string $topicSlug) { - return view('forum.topics.create'); + $thread = Thread::with('category')->where('slug', $threadSlug)->first(); + $topic = Topic::where('slug', $topicSlug)->first(); + + $topic->views_no = $topic->views_no+1; + $topic->save(); + + $posts = Post::with('author')->where('topic_id', $topic->id)->paginate(15); + + return view('forum.topics.show', compact('thread', 'topic', 'posts')); + } + + public function create(string $categorySlug, string $threadSlug) + { + // check policy + $forumCategories = Category::get(); + $forumThreads = Thread::get(); + + $currentThread = Thread::with('category')->where('slug', $threadSlug)->first(); + + return view('forum.topics.create', compact('forumCategories', 'forumThreads', 'currentThread')); + } + + public function store(TopicRequest $request, string $categorySlug, string $threadSlug) + { + // check policy + $thread = Thread::with('category')->where('slug', $threadSlug)->first(); + + $topic = Topic::create([ + 'name' => $request->get('name'), + 'slug' => Str::slug($request->get('name')), + 'status' => Topic::STATUS_OPEN, + 'category_id' => $thread->category->id, + 'thread_id' => $thread->id, + 'user_id' => auth()->user()->id, + ]); + + Post::create([ + 'content' => $request->get('content'), + 'user_id' => auth()->user()->id, + 'category_id' => $thread->category->id, + 'thread_id' => $thread->id, + 'topic_id' => $topic->id, + ]); + + return redirect()->route('forums.thread.topics.show', [$categorySlug, $threadSlug, $topic->slug]); + } + + public function edit(string $categorySlug, string $threadSlug, string $topicSlug) + { + // check policy + } + + public function update(TopicRequest $request) + { + // check policy + } + + public function destroy() + { + // check policy } } diff --git a/app/Http/Controllers/MovieController.php b/app/Http/Controllers/MovieController.php index 7efd8fb..3cab483 100644 --- a/app/Http/Controllers/MovieController.php +++ b/app/Http/Controllers/MovieController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Http\Requests\Movie\CommentRequest; use App\Models\Comment; use App\Models\Movie; use Illuminate\Http\Request; @@ -31,7 +32,21 @@ class MovieController extends Controller }) ->paginate(15); - return view('movie.show', compact('movie', 'comments')); } + + public function storeComment(CommentRequest $request, string $movieSlug) + { + $movie = Movie::where('slug', $movieSlug)->firstOrFail(); + + Comment::create([ + 'entity_id' => $movie->id, + 'entity_type' => Comment::TYPE_MOVIE, + 'user_id' => auth()->user()->id, + 'content' => $request->get('content'), + 'published_at' => new \DateTime(), + ]); + + return redirect()->back()->with('success', 'Comment posted!'); + } } diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index fce1458..95cb04f 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -2,6 +2,8 @@ namespace App\Http\Controllers; +use App\Models\MediaList; +use App\Models\MediaListItem; use App\Models\User; use Illuminate\Http\Request; @@ -11,6 +13,14 @@ class ProfileController extends Controller { $user = User::where('slug', $slug)->first(); - return view('profile.show', compact('user')); + $watchedList = MediaList::where('slug', MediaList::WATCHED)->first(); + + $lastWatchedListItem = MediaListItem::with('item')->where('media_list_id', $watchedList->id) + ->orderBy('id', 'desc') + ->first(); + + $lastWatched = $lastWatchedListItem->item; + + return view('profile.show', compact('user', 'lastWatched')); } } diff --git a/app/Http/Controllers/ShowController.php b/app/Http/Controllers/ShowController.php index ead0bc7..0d5be97 100644 --- a/app/Http/Controllers/ShowController.php +++ b/app/Http/Controllers/ShowController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Models\Season; use App\Models\Show; use Illuminate\Http\Request; @@ -20,6 +21,8 @@ class ShowController extends Controller $comments = []; - return view('show.show', compact('show', 'comments')); + $seasons = Season::where('show_id', $show->id)->orderBy('season_number', 'ASC')->get(); + + return view('show.show', compact('show', 'comments', 'seasons')); } } diff --git a/app/Http/Requests/Forum/PostRequest.php b/app/Http/Requests/Forum/PostRequest.php new file mode 100644 index 0000000..6fa2410 --- /dev/null +++ b/app/Http/Requests/Forum/PostRequest.php @@ -0,0 +1,28 @@ +|string> + */ + public function rules(): array + { + return [ + 'content' => 'required|min:2' + ]; + } +} diff --git a/app/Http/Requests/Forum/TopicRequest.php b/app/Http/Requests/Forum/TopicRequest.php index 936630c..9f57032 100644 --- a/app/Http/Requests/Forum/TopicRequest.php +++ b/app/Http/Requests/Forum/TopicRequest.php @@ -11,7 +11,7 @@ class TopicRequest extends FormRequest */ public function authorize(): bool { - return false; + return true; } /** @@ -22,7 +22,8 @@ class TopicRequest extends FormRequest public function rules(): array { return [ - // + 'name' => 'required|min:2|max:255', + 'content' => 'required|min:2', ]; } } diff --git a/app/Http/Requests/Movie/CommentRequest.php b/app/Http/Requests/Movie/CommentRequest.php new file mode 100644 index 0000000..5370c07 --- /dev/null +++ b/app/Http/Requests/Movie/CommentRequest.php @@ -0,0 +1,28 @@ +|string> + */ + public function rules(): array + { + return [ + 'content' => 'required|min:2' + ]; + } +} diff --git a/app/Livewire/MoviePage/Recommendations.php b/app/Livewire/MoviePage/Recommendations.php index 2ee035b..41ad06e 100644 --- a/app/Livewire/MoviePage/Recommendations.php +++ b/app/Livewire/MoviePage/Recommendations.php @@ -18,8 +18,6 @@ class Recommendations extends Component public function mount() { - $movie = Movie::find($this->movie->id); - $this->recommendations = Movie::whereIn('id', MovieRecommendation::where('movie_id', $this->movie->id)->pluck('recommended_movie_id'))->get(); } } diff --git a/app/Livewire/MoviePage/Similar.php b/app/Livewire/MoviePage/Similar.php index 331bd1b..cf53c6d 100644 --- a/app/Livewire/MoviePage/Similar.php +++ b/app/Livewire/MoviePage/Similar.php @@ -2,12 +2,25 @@ namespace App\Livewire\MoviePage; +use App\Models\Movie; +use App\Models\MovieSimilar; use Livewire\Component; class Similar extends Component { + public $movie; + public $similarMovies; + public function render() { return view('livewire.movie-page.similar'); } + + public function mount() + { + $this->similarMovies = Movie::whereIn( + 'id', + MovieSimilar::where('movie_id', $this->movie->id)->pluck('similar_movie_id') + )->get(); + } } diff --git a/app/Livewire/MoviePage/Tabs/Videos.php b/app/Livewire/MoviePage/Tabs/Videos.php new file mode 100644 index 0000000..1fce539 --- /dev/null +++ b/app/Livewire/MoviePage/Tabs/Videos.php @@ -0,0 +1,24 @@ +movie = Movie::with('videos')->where('id', $this->movie->id)->first(); + + $this->videos = $this->movie->videos; + } +} diff --git a/app/Models/Comment.php b/app/Models/Comment.php index 989b157..0fcbb22 100644 --- a/app/Models/Comment.php +++ b/app/Models/Comment.php @@ -21,4 +21,9 @@ class Comment extends Model 'tmdb_id', 'tmdb_url', ]; + + public function author() + { + return $this->hasOne(User::class, 'id', 'user_id'); + } } diff --git a/app/Models/Forum/Post.php b/app/Models/Forum/Post.php index d773e58..a3e40e8 100644 --- a/app/Models/Forum/Post.php +++ b/app/Models/Forum/Post.php @@ -2,9 +2,23 @@ namespace App\Models\Forum; +use App\Models\User; use Illuminate\Database\Eloquent\Model; class Post extends Model { - // + protected $table = 'forum_posts'; + + protected $fillable = [ + 'content', + 'user_id', + 'category_id', + 'thread_id', + 'topic_id', + ]; + + public function author() + { + return $this->hasOne(User::class, 'id', 'user_id'); + } } diff --git a/app/Models/Forum/Thread.php b/app/Models/Forum/Thread.php index c175386..8e95330 100644 --- a/app/Models/Forum/Thread.php +++ b/app/Models/Forum/Thread.php @@ -7,4 +7,9 @@ use Illuminate\Database\Eloquent\Model; class Thread extends Model { protected $table = 'forum_threads'; + + public function category() + { + return $this->hasOne(Category::class, 'id', 'category_id'); + } } diff --git a/app/Models/Forum/Topic.php b/app/Models/Forum/Topic.php index 1c0097d..e284b64 100644 --- a/app/Models/Forum/Topic.php +++ b/app/Models/Forum/Topic.php @@ -8,6 +8,9 @@ class Topic extends Model { protected $table = 'forum_topics'; + public const STATUS_OPEN = 'open'; + public const STATUS_CLOSED = 'closed'; + protected $fillable = [ 'name', 'slug', @@ -15,5 +18,7 @@ class Topic extends Model 'category_id', 'thread_id', 'user_id', + 'views_no', + 'replies_no', ]; } diff --git a/app/Models/Movie.php b/app/Models/Movie.php index 4c65afd..9081b4c 100644 --- a/app/Models/Movie.php +++ b/app/Models/Movie.php @@ -58,6 +58,17 @@ class Movie extends Model return $rating ? $rating->rate : null; } + public function trailer() + { + return $this->belongsToMany(Video::class, 'movie_videos', 'movie_id', 'video_id') + ->where('videos.type', 'Trailer'); + } + + public function externalIds() + { + return $this->hasOne(ExternalId::class, 'entity_id', 'id')->where('entity_type', ExternalId::TYPE_MOVIE); + } + public function director() { return $this->belongsToMany(Person::class, 'movie_cast', 'movie_id', 'person_id') diff --git a/app/Policies/Forum/CreatePostPolicy.php b/app/Policies/Forum/CreatePostPolicy.php new file mode 100644 index 0000000..9851047 --- /dev/null +++ b/app/Policies/Forum/CreatePostPolicy.php @@ -0,0 +1,16 @@ +=8.0" + }, + "require-dev": { + "codeclimate/php-test-reporter": "^0.3.2", + "doctrine/dbal": "^2.5", + "fzaninotto/faker": "~1.4", + "laravel/laravel": "5.*|^9.0|^10.0|^11.0", + "mockery/mockery": "1.0.x-dev", + "phpunit/phpunit": "5.*" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Multicaret\\Acquaintances\\AcquaintancesServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Multicaret\\Acquaintances\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mohamed Kawsara", + "email": "mkwsra@gmail.com" + } + ], + "description": "This light package, with no dependencies, gives Eloquent models the ability to manage friendships (with groups). And interactions such as: Likes, favorites, votes, subscribe, follow, ..etc. And it includes advanced rating system.", + "keywords": [ + "Followers", + "Rate", + "Rating", + "eloquent", + "followships", + "friend-system", + "friends", + "friendships", + "interactions", + "laravel", + "like", + "social-media", + "wish-list" + ], + "support": { + "issues": "https://github.com/multicaret/laravel-acquaintances/issues", + "source": "https://github.com/multicaret/laravel-acquaintances/tree/v3.6.1" + }, + "time": "2024-06-08T13:48:12+00:00" + }, { "name": "nesbot/carbon", "version": "3.8.4", diff --git a/config/acquaintances.php b/config/acquaintances.php new file mode 100644 index 0000000..2296c5a --- /dev/null +++ b/config/acquaintances.php @@ -0,0 +1,87 @@ + false, + + /* + * Models Related. + */ + 'model_namespace' => (int) app()->version() <= 7 ? 'App' : 'App\Models', + 'models' => [ + /* + * Model name of User model + */ + 'user' => 'User', + /* + * Model name of Interaction Relation model + */ + 'interaction_relation' => \Multicaret\Acquaintances\Models\InteractionRelation::class, + /* + * Model name of Interaction Relation model + */ + 'friendship' => \Multicaret\Acquaintances\Models\Friendship::class, + /* + * Model name of Interaction Relation model + */ + 'friendship_groups' => \Multicaret\Acquaintances\Models\FriendFriendshipGroups::class, + ], + + 'tables' => [ + /* + * Table name of interactions relations. + */ + 'interactions' => 'interactions', + /* + * user foreign key column name within interactions table. + */ + 'interactions_user_id_fk_column_name' => 'user_id', + /* + * user foreign key column type within interactions table. + */ + 'interactions_user_id_fk_column_type' => 'unsignedBigInteger', + /* + * Table name of friendships relations. + */ + 'friendships' => 'friendships', + /* + * Table name of friendship Groups relations. + */ + 'friendship_groups' => 'friendship_groups', + ], + + 'rating' => [ + 'defaults' => [ + 'amount' => 5, + /* + * Default type here is 'general', as longs as you have one criteria of rating a model + * you can ignore this setting. + * It will be the default type of rating of null is provided, if you wish to tweak this type name + * use the value below as you wish. + * + */ + 'type' => 'general', + ], + 'types' => [ + /* Add any other type that your website/application have here, + * the following added rating types are for demonstration purposes only. + * There is no effect on deleting them nor adding to them, however, its a good practice + * to not hard code your rating types, hence, please use this simple array + */ + 'delivery-time', + 'quality', + 'communication', + 'commitment', + ] + ], + + 'friendships_groups' => [ + 'acquaintances' => 0, + 'close_friends' => 1, + 'family' => 2 + ], + +]; diff --git a/config/blade-ui-kit.php b/config/blade-ui-kit.php new file mode 100644 index 0000000..3594c6f --- /dev/null +++ b/config/blade-ui-kit.php @@ -0,0 +1,131 @@ + [ + 'alert' => Components\Alerts\Alert::class, + 'avatar' => Components\Support\Avatar::class, + 'carbon' => Components\DateTime\Carbon::class, + 'checkbox' => Components\Forms\Inputs\Checkbox::class, + 'color-picker' => Components\Forms\Inputs\ColorPicker::class, + 'countdown' => Components\DateTime\Countdown::class, + 'cron' => Components\Support\Cron::class, + 'dropdown' => Components\Navigation\Dropdown::class, + 'easy-mde' => Components\Editors\EasyMDE::class, + 'email' => Components\Forms\Inputs\Email::class, + 'error' => Components\Forms\Error::class, + 'flat-pickr' => Components\Forms\Inputs\FlatPickr::class, + 'form' => Components\Forms\Form::class, + 'form-button' => Components\Buttons\FormButton::class, + 'html' => Components\Layouts\Html::class, + 'input' => Components\Forms\Inputs\Input::class, + 'label' => Components\Forms\Label::class, + 'logout' => Components\Buttons\Logout::class, + 'mapbox' => Components\Maps\Mapbox::class, + 'markdown' => Components\Markdown\Markdown::class, + 'password' => Components\Forms\Inputs\Password::class, + 'pikaday' => Components\Forms\Inputs\Pikaday::class, + 'social-meta' => Components\Layouts\SocialMeta::class, + 'textarea' => Components\Forms\Inputs\Textarea::class, + 'toc' => Components\Markdown\ToC::class, + 'trix' => Components\Editors\Trix::class, + 'unsplash' => Components\Support\Unsplash::class, + ], + + /* + |-------------------------------------------------------------------------- + | Livewire Components + |-------------------------------------------------------------------------- + | + | Below you reference all the Livewire components that should be loaded + | for your app. By default all components from Blade UI Kit are loaded in. + | + */ + + 'livewire' => [ + // + ], + + /* + |-------------------------------------------------------------------------- + | Components Prefix + |-------------------------------------------------------------------------- + | + | This value will set a prefix for all Blade UI Kit components. + | By default it's empty. This is useful if you want to avoid + | collision with components from other libraries. + | + | If set with "buk", for example, you can reference components like: + | + | + | + */ + + 'prefix' => '', + + /* + |-------------------------------------------------------------------------- + | Third Party Asset Libraries + |-------------------------------------------------------------------------- + | + | These settings hold reference to all third party libraries and their + | asset files served through a CDN. Individual components can require + | these asset files through their static `$assets` property. + | + */ + + 'assets' => [ + + 'alpine' => 'https://unpkg.com/alpinejs@3.x.x/dist/cdn.min.js', + + 'easy-mde' => [ + 'https://unpkg.com/easymde/dist/easymde.min.css', + 'https://unpkg.com/easymde/dist/easymde.min.js', + ], + + 'flat-pickr' => [ + 'https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css', + 'https://cdn.jsdelivr.net/npm/flatpickr@4.6.9/dist/flatpickr.min.js', + ], + + 'mapbox' => [ + 'https://api.mapbox.com/mapbox-gl-js/v1.8.1/mapbox-gl.css', + 'https://api.mapbox.com/mapbox-gl-js/v1.8.1/mapbox-gl.js', + ], + + 'moment' => [ + 'https://cdn.jsdelivr.net/npm/moment@2.26.0/moment.min.js', + 'https://cdn.jsdelivr.net/npm/moment-timezone@0.5.31/builds/moment-timezone-with-data.min.js', + ], + + 'pickr' => [ + 'https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/themes/classic.min.css', + 'https://cdn.jsdelivr.net/npm/@simonwep/pickr/dist/pickr.min.js', + ], + + 'pikaday' => [ + 'https://cdn.jsdelivr.net/npm/pikaday/css/pikaday.css', + 'https://cdn.jsdelivr.net/npm/pikaday/pikaday.js', + ], + + 'trix' => [ + 'https://unpkg.com/trix@1.2.3/dist/trix.css', + 'https://unpkg.com/trix@1.2.3/dist/trix.js', + ], + + ], + +]; diff --git a/database/migrations/2024_12_30_010251_create_comments_table.php b/database/migrations/2024_12_30_010251_create_comments_table.php index fa5c169..6a0fd58 100644 --- a/database/migrations/2024_12_30_010251_create_comments_table.php +++ b/database/migrations/2024_12_30_010251_create_comments_table.php @@ -15,14 +15,14 @@ return new class extends Migration $table->id(); $table->integer('entity_id'); $table->string('entity_type'); - $table->integer('user_id')->nullable(true); - $table->string('author_name'); + $table->integer('user_id')->nullable(); + $table->string('author_name')->nullable(); $table->string('author_avatar')->nullable(); $table->integer('author_rating')->nullable(); $table->text('content'); $table->datetime('published_at'); - $table->string('tmdb_id'); - $table->string('tmdb_url'); + $table->string('tmdb_id')->nullable(); + $table->string('tmdb_url')->nullable(); $table->timestamps(); }); } diff --git a/database/migrations/2025_01_27_191019_create_topics_table.php b/database/migrations/2025_01_27_191019_create_topics_table.php index 7b9be4e..8e2bef0 100644 --- a/database/migrations/2025_01_27_191019_create_topics_table.php +++ b/database/migrations/2025_01_27_191019_create_topics_table.php @@ -19,6 +19,10 @@ return new class extends Migration $table->unsignedBigInteger('category_id'); $table->unsignedBigInteger('thread_id'); $table->unsignedBigInteger('user_id'); + + $table->unsignedInteger('views_no'); + $table->unsignedInteger('replies_no'); + $table->timestamps(); }); } diff --git a/database/migrations/2025_01_27_191029_create_posts_table.php b/database/migrations/2025_01_27_191029_create_posts_table.php index a8c70bd..5d8a807 100644 --- a/database/migrations/2025_01_27_191029_create_posts_table.php +++ b/database/migrations/2025_01_27_191029_create_posts_table.php @@ -13,6 +13,9 @@ return new class extends Migration { Schema::create('forum_posts', function (Blueprint $table) { $table->id(); + $table->unsignedBigInteger('topic_id'); + $table->unsignedBigInteger('thread_id'); + $table->unsignedBigInteger('category_id'); $table->text('content'); $table->unsignedBigInteger('user_id'); $table->timestamps(); diff --git a/database/migrations/2025_02_15_123938_create_acquaintances_friendship_table.php b/database/migrations/2025_02_15_123938_create_acquaintances_friendship_table.php new file mode 100644 index 0000000..add712b --- /dev/null +++ b/database/migrations/2025_02_15_123938_create_acquaintances_friendship_table.php @@ -0,0 +1,27 @@ +id(); + $table->morphs('sender'); + $table->morphs('recipient'); + $table->string('status')->default('pending')->comment('pending/accepted/denied/blocked/'); + $table->timestamps(); + }); + + } + + public function down() + { + Schema::dropIfExists(config('acquaintances.tables.friendships')); + } + +} diff --git a/database/migrations/2025_02_15_123938_create_acquaintances_friendships_groups_table.php b/database/migrations/2025_02_15_123938_create_acquaintances_friendships_groups_table.php new file mode 100644 index 0000000..ce8a67f --- /dev/null +++ b/database/migrations/2025_02_15_123938_create_acquaintances_friendships_groups_table.php @@ -0,0 +1,38 @@ +id(); + + $table->unsignedBigInteger('friendship_id')->unsigned(); + $table->morphs('friend'); + $table->integer('group_id')->unsigned(); + + $table->foreign('friendship_id') + ->references('id') + ->on(config('acquaintances.tables.friendships')) + ->onDelete('cascade'); + + $table->unique(['friendship_id', 'friend_id', 'friend_type', 'group_id'], 'unique'); + + }); + + } + + public function down() + { + Schema::dropIfExists(config('acquaintances.tables.friendship_groups')); + } + +} diff --git a/database/migrations/2025_02_15_123938_create_acquaintances_interactions_table.php b/database/migrations/2025_02_15_123938_create_acquaintances_interactions_table.php new file mode 100644 index 0000000..92a879f --- /dev/null +++ b/database/migrations/2025_02_15_123938_create_acquaintances_interactions_table.php @@ -0,0 +1,50 @@ +id(); + + $userModel = Interaction::getUserModelName(); + $userModel = (new $userModel); + $userIdFkColumnName = config('acquaintances.tables.interactions_user_id_fk_column_name', 'user_id'); + + $userIdFkType = config('acquaintances.tables.interactions_user_id_fk_column_type'); + $table->{$userIdFkType}($userIdFkColumnName)->index(); + $table->morphs('subject'); + $table->string('relation')->default('follow')->comment('follow/like/subscribe/favorite/upvote/downvote'); + $table->double('relation_value')->nullable(); + $table->string('relation_type')->nullable(); + $table->timestamps(); + + + $table->foreign($userIdFkColumnName) + ->references($userModel->getKeyName()) + ->on($userModel->getTable()) + ->onUpdate('cascade') + ->onDelete('cascade'); + }); + } + + /** + * Reverse the migrations. + */ + public function down() + { + Schema::table(config('acquaintances.tables.interactions', 'interactions'), function ($table) { + $table->dropForeign(config('acquaintances.tables.interactions', 'interactions').'_user_id_foreign'); + }); + + Schema::drop(config('acquaintances.tables.interactions', 'interactions')); + } +} diff --git a/package-lock.json b/package-lock.json index afd2afb..88e8759 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,6 +6,7 @@ "": { "dependencies": { "bs5-lightbox": "^1.8.3", + "font-awesome": "^4.7.0", "jquery": "^3.7.1", "owl-carousel": "^1.0.0" }, @@ -1830,6 +1831,15 @@ } } }, + "node_modules/font-awesome": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz", + "integrity": "sha512-U6kGnykA/6bFmg1M/oT9EkFeIYv7JlX3bozwQJWiiLz6L0w3F5vBVPxHlwyX/vtNq1ckcpRKOB9f2Qal/VtFpg==", + "license": "(OFL-1.1 AND MIT)", + "engines": { + "node": ">=0.10.3" + } + }, "node_modules/foreground-child": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz", diff --git a/package.json b/package.json index 6ea92dc..6199788 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ }, "dependencies": { "bs5-lightbox": "^1.8.3", + "font-awesome": "^4.7.0", "jquery": "^3.7.1", "owl-carousel": "^1.0.0" } diff --git a/public/fonts/FontAwesome.otf b/public/fonts/FontAwesome.otf new file mode 100644 index 0000000..401ec0f Binary files /dev/null and b/public/fonts/FontAwesome.otf differ diff --git a/public/fonts/fontawesome-webfont.eot b/public/fonts/fontawesome-webfont.eot new file mode 100644 index 0000000..e9f60ca Binary files /dev/null and b/public/fonts/fontawesome-webfont.eot differ diff --git a/public/fonts/fontawesome-webfont.svg b/public/fonts/fontawesome-webfont.svg new file mode 100644 index 0000000..855c845 --- /dev/null +++ b/public/fonts/fontawesome-webfont.svg @@ -0,0 +1,2671 @@ + + + + +Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016 + By ,,, +Copyright Dave Gandy 2016. All rights reserved. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/fonts/fontawesome-webfont.ttf b/public/fonts/fontawesome-webfont.ttf new file mode 100644 index 0000000..35acda2 Binary files /dev/null and b/public/fonts/fontawesome-webfont.ttf differ diff --git a/public/fonts/fontawesome-webfont.woff b/public/fonts/fontawesome-webfont.woff new file mode 100644 index 0000000..400014a Binary files /dev/null and b/public/fonts/fontawesome-webfont.woff differ diff --git a/public/fonts/fontawesome-webfont.woff2 b/public/fonts/fontawesome-webfont.woff2 new file mode 100644 index 0000000..4d13fc6 Binary files /dev/null and b/public/fonts/fontawesome-webfont.woff2 differ diff --git a/public/img/flag/Thumbs.db b/public/img/flag/Thumbs.db new file mode 100755 index 0000000..e602710 Binary files /dev/null and b/public/img/flag/Thumbs.db differ diff --git a/public/img/flag/afghanistan.gif b/public/img/flag/afghanistan.gif new file mode 100755 index 0000000..d87883f Binary files /dev/null and b/public/img/flag/afghanistan.gif differ diff --git a/public/img/flag/albania.gif b/public/img/flag/albania.gif new file mode 100755 index 0000000..a83f73a Binary files /dev/null and b/public/img/flag/albania.gif differ diff --git a/public/img/flag/algeria.gif b/public/img/flag/algeria.gif new file mode 100755 index 0000000..47df399 Binary files /dev/null and b/public/img/flag/algeria.gif differ diff --git a/public/img/flag/andorra.gif b/public/img/flag/andorra.gif new file mode 100755 index 0000000..d0a126c Binary files /dev/null and b/public/img/flag/andorra.gif differ diff --git a/public/img/flag/angola.gif b/public/img/flag/angola.gif new file mode 100755 index 0000000..1da06af Binary files /dev/null and b/public/img/flag/angola.gif differ diff --git a/public/img/flag/antiguabarbuda.gif b/public/img/flag/antiguabarbuda.gif new file mode 100755 index 0000000..c5fc516 Binary files /dev/null and b/public/img/flag/antiguabarbuda.gif differ diff --git a/public/img/flag/argentina.gif b/public/img/flag/argentina.gif new file mode 100755 index 0000000..a0f7bf0 Binary files /dev/null and b/public/img/flag/argentina.gif differ diff --git a/public/img/flag/armenia.gif b/public/img/flag/armenia.gif new file mode 100755 index 0000000..c007dd5 Binary files /dev/null and b/public/img/flag/armenia.gif differ diff --git a/public/img/flag/australia.gif b/public/img/flag/australia.gif new file mode 100755 index 0000000..e8f098f Binary files /dev/null and b/public/img/flag/australia.gif differ diff --git a/public/img/flag/austria.gif b/public/img/flag/austria.gif new file mode 100755 index 0000000..879ed36 Binary files /dev/null and b/public/img/flag/austria.gif differ diff --git a/public/img/flag/azerbaijan.gif b/public/img/flag/azerbaijan.gif new file mode 100755 index 0000000..80b68f8 Binary files /dev/null and b/public/img/flag/azerbaijan.gif differ diff --git a/public/img/flag/bahamas.gif b/public/img/flag/bahamas.gif new file mode 100755 index 0000000..2e2ca3b Binary files /dev/null and b/public/img/flag/bahamas.gif differ diff --git a/public/img/flag/bahrain.gif b/public/img/flag/bahrain.gif new file mode 100755 index 0000000..4de7c76 Binary files /dev/null and b/public/img/flag/bahrain.gif differ diff --git a/public/img/flag/bangladesh.gif b/public/img/flag/bangladesh.gif new file mode 100755 index 0000000..d60de67 Binary files /dev/null and b/public/img/flag/bangladesh.gif differ diff --git a/public/img/flag/barbados.gif b/public/img/flag/barbados.gif new file mode 100755 index 0000000..0e7790d Binary files /dev/null and b/public/img/flag/barbados.gif differ diff --git a/public/img/flag/belarus.gif b/public/img/flag/belarus.gif new file mode 100755 index 0000000..d322be0 Binary files /dev/null and b/public/img/flag/belarus.gif differ diff --git a/public/img/flag/belgium.gif b/public/img/flag/belgium.gif new file mode 100755 index 0000000..4725a91 Binary files /dev/null and b/public/img/flag/belgium.gif differ diff --git a/public/img/flag/belize.gif b/public/img/flag/belize.gif new file mode 100755 index 0000000..9f71cdf Binary files /dev/null and b/public/img/flag/belize.gif differ diff --git a/public/img/flag/benin.gif b/public/img/flag/benin.gif new file mode 100755 index 0000000..abaf14b Binary files /dev/null and b/public/img/flag/benin.gif differ diff --git a/public/img/flag/bhutan.gif b/public/img/flag/bhutan.gif new file mode 100755 index 0000000..a5a3d37 Binary files /dev/null and b/public/img/flag/bhutan.gif differ diff --git a/public/img/flag/bolivia.gif b/public/img/flag/bolivia.gif new file mode 100755 index 0000000..6ffff80 Binary files /dev/null and b/public/img/flag/bolivia.gif differ diff --git a/public/img/flag/bosniaherzegovina.gif b/public/img/flag/bosniaherzegovina.gif new file mode 100755 index 0000000..7fa8eb8 Binary files /dev/null and b/public/img/flag/bosniaherzegovina.gif differ diff --git a/public/img/flag/botswana.gif b/public/img/flag/botswana.gif new file mode 100755 index 0000000..1f9d5c2 Binary files /dev/null and b/public/img/flag/botswana.gif differ diff --git a/public/img/flag/brazil.gif b/public/img/flag/brazil.gif new file mode 100755 index 0000000..64d1047 Binary files /dev/null and b/public/img/flag/brazil.gif differ diff --git a/public/img/flag/brunei.gif b/public/img/flag/brunei.gif new file mode 100755 index 0000000..66770b8 Binary files /dev/null and b/public/img/flag/brunei.gif differ diff --git a/public/img/flag/bulgaria.gif b/public/img/flag/bulgaria.gif new file mode 100755 index 0000000..335083e Binary files /dev/null and b/public/img/flag/bulgaria.gif differ diff --git a/public/img/flag/burkinafaso.gif b/public/img/flag/burkinafaso.gif new file mode 100755 index 0000000..4114b6b Binary files /dev/null and b/public/img/flag/burkinafaso.gif differ diff --git a/public/img/flag/burma.gif b/public/img/flag/burma.gif new file mode 100755 index 0000000..8c64bd0 Binary files /dev/null and b/public/img/flag/burma.gif differ diff --git a/public/img/flag/burund.gif b/public/img/flag/burund.gif new file mode 100755 index 0000000..da31dd2 Binary files /dev/null and b/public/img/flag/burund.gif differ diff --git a/public/img/flag/cambodia.gif b/public/img/flag/cambodia.gif new file mode 100755 index 0000000..fe89b74 Binary files /dev/null and b/public/img/flag/cambodia.gif differ diff --git a/public/img/flag/cameroon.gif b/public/img/flag/cameroon.gif new file mode 100755 index 0000000..102fcab Binary files /dev/null and b/public/img/flag/cameroon.gif differ diff --git a/public/img/flag/canada.gif b/public/img/flag/canada.gif new file mode 100755 index 0000000..9d0aa0a Binary files /dev/null and b/public/img/flag/canada.gif differ diff --git a/public/img/flag/centralafricanrep.gif b/public/img/flag/centralafricanrep.gif new file mode 100755 index 0000000..cef5b9c Binary files /dev/null and b/public/img/flag/centralafricanrep.gif differ diff --git a/public/img/flag/chad.gif b/public/img/flag/chad.gif new file mode 100755 index 0000000..949fab8 Binary files /dev/null and b/public/img/flag/chad.gif differ diff --git a/public/img/flag/chile.gif b/public/img/flag/chile.gif new file mode 100755 index 0000000..8c3a4c6 Binary files /dev/null and b/public/img/flag/chile.gif differ diff --git a/public/img/flag/china.gif b/public/img/flag/china.gif new file mode 100755 index 0000000..4eca9f0 Binary files /dev/null and b/public/img/flag/china.gif differ diff --git a/public/img/flag/colombia.gif b/public/img/flag/colombia.gif new file mode 100755 index 0000000..124d203 Binary files /dev/null and b/public/img/flag/colombia.gif differ diff --git a/public/img/flag/columbia.gif b/public/img/flag/columbia.gif new file mode 100755 index 0000000..124d203 Binary files /dev/null and b/public/img/flag/columbia.gif differ diff --git a/public/img/flag/comoros.gif b/public/img/flag/comoros.gif new file mode 100755 index 0000000..d0fa438 Binary files /dev/null and b/public/img/flag/comoros.gif differ diff --git a/public/img/flag/congo.gif b/public/img/flag/congo.gif new file mode 100755 index 0000000..2f18709 Binary files /dev/null and b/public/img/flag/congo.gif differ diff --git a/public/img/flag/costarica.gif b/public/img/flag/costarica.gif new file mode 100755 index 0000000..a949d10 Binary files /dev/null and b/public/img/flag/costarica.gif differ diff --git a/public/img/flag/croatia.gif b/public/img/flag/croatia.gif new file mode 100755 index 0000000..b05cdbd Binary files /dev/null and b/public/img/flag/croatia.gif differ diff --git a/public/img/flag/cuba.gif b/public/img/flag/cuba.gif new file mode 100755 index 0000000..7bc7f4a Binary files /dev/null and b/public/img/flag/cuba.gif differ diff --git a/public/img/flag/cyprus.gif b/public/img/flag/cyprus.gif new file mode 100755 index 0000000..feff9da Binary files /dev/null and b/public/img/flag/cyprus.gif differ diff --git a/public/img/flag/czechrep.gif b/public/img/flag/czechrep.gif new file mode 100755 index 0000000..61bd889 Binary files /dev/null and b/public/img/flag/czechrep.gif differ diff --git a/public/img/flag/demrepcongo.gif b/public/img/flag/demrepcongo.gif new file mode 100755 index 0000000..a0f6366 Binary files /dev/null and b/public/img/flag/demrepcongo.gif differ diff --git a/public/img/flag/denmark.gif b/public/img/flag/denmark.gif new file mode 100755 index 0000000..45b796e Binary files /dev/null and b/public/img/flag/denmark.gif differ diff --git a/public/img/flag/djiboutil.gif b/public/img/flag/djiboutil.gif new file mode 100755 index 0000000..af683f3 Binary files /dev/null and b/public/img/flag/djiboutil.gif differ diff --git a/public/img/flag/dominica.gif b/public/img/flag/dominica.gif new file mode 100755 index 0000000..a607e30 Binary files /dev/null and b/public/img/flag/dominica.gif differ diff --git a/public/img/flag/dominicanrep.gif b/public/img/flag/dominicanrep.gif new file mode 100755 index 0000000..b3af542 Binary files /dev/null and b/public/img/flag/dominicanrep.gif differ diff --git a/public/img/flag/ecuador.gif b/public/img/flag/ecuador.gif new file mode 100755 index 0000000..22db389 Binary files /dev/null and b/public/img/flag/ecuador.gif differ diff --git a/public/img/flag/egypt.gif b/public/img/flag/egypt.gif new file mode 100755 index 0000000..2dd475a Binary files /dev/null and b/public/img/flag/egypt.gif differ diff --git a/public/img/flag/elsalvado.gif b/public/img/flag/elsalvado.gif new file mode 100755 index 0000000..decf31e Binary files /dev/null and b/public/img/flag/elsalvado.gif differ diff --git a/public/img/flag/eq_guinea.gif b/public/img/flag/eq_guinea.gif new file mode 100755 index 0000000..aa2a7ee Binary files /dev/null and b/public/img/flag/eq_guinea.gif differ diff --git a/public/img/flag/eritrea.gif b/public/img/flag/eritrea.gif new file mode 100755 index 0000000..d8ab3e9 Binary files /dev/null and b/public/img/flag/eritrea.gif differ diff --git a/public/img/flag/estonia.gif b/public/img/flag/estonia.gif new file mode 100755 index 0000000..bc81319 Binary files /dev/null and b/public/img/flag/estonia.gif differ diff --git a/public/img/flag/ethiopia.gif b/public/img/flag/ethiopia.gif new file mode 100755 index 0000000..e53a1ee Binary files /dev/null and b/public/img/flag/ethiopia.gif differ diff --git a/public/img/flag/fiji.gif b/public/img/flag/fiji.gif new file mode 100755 index 0000000..3428f27 Binary files /dev/null and b/public/img/flag/fiji.gif differ diff --git a/public/img/flag/finland.gif b/public/img/flag/finland.gif new file mode 100755 index 0000000..a3d8e3e Binary files /dev/null and b/public/img/flag/finland.gif differ diff --git a/public/img/flag/france.gif b/public/img/flag/france.gif new file mode 100755 index 0000000..ae18711 Binary files /dev/null and b/public/img/flag/france.gif differ diff --git a/public/img/flag/gabon.gif b/public/img/flag/gabon.gif new file mode 100755 index 0000000..e1a519b Binary files /dev/null and b/public/img/flag/gabon.gif differ diff --git a/public/img/flag/gambia.gif b/public/img/flag/gambia.gif new file mode 100755 index 0000000..12e4138 Binary files /dev/null and b/public/img/flag/gambia.gif differ diff --git a/public/img/flag/georgia.gif b/public/img/flag/georgia.gif new file mode 100755 index 0000000..3c9defd Binary files /dev/null and b/public/img/flag/georgia.gif differ diff --git a/public/img/flag/germany.gif b/public/img/flag/germany.gif new file mode 100755 index 0000000..dfdc939 Binary files /dev/null and b/public/img/flag/germany.gif differ diff --git a/public/img/flag/ghana.gif b/public/img/flag/ghana.gif new file mode 100755 index 0000000..e98f237 Binary files /dev/null and b/public/img/flag/ghana.gif differ diff --git a/public/img/flag/greece.gif b/public/img/flag/greece.gif new file mode 100755 index 0000000..8e02abc Binary files /dev/null and b/public/img/flag/greece.gif differ diff --git a/public/img/flag/grenada.gif b/public/img/flag/grenada.gif new file mode 100755 index 0000000..1b88eff Binary files /dev/null and b/public/img/flag/grenada.gif differ diff --git a/public/img/flag/grenadines.gif b/public/img/flag/grenadines.gif new file mode 100755 index 0000000..f6077ff Binary files /dev/null and b/public/img/flag/grenadines.gif differ diff --git a/public/img/flag/guatemala.gif b/public/img/flag/guatemala.gif new file mode 100755 index 0000000..dd29d03 Binary files /dev/null and b/public/img/flag/guatemala.gif differ diff --git a/public/img/flag/guineabissau.gif b/public/img/flag/guineabissau.gif new file mode 100755 index 0000000..735cdb8 Binary files /dev/null and b/public/img/flag/guineabissau.gif differ diff --git a/public/img/flag/guineal.gif b/public/img/flag/guineal.gif new file mode 100755 index 0000000..37f97aa Binary files /dev/null and b/public/img/flag/guineal.gif differ diff --git a/public/img/flag/guyana.gif b/public/img/flag/guyana.gif new file mode 100755 index 0000000..8fdb782 Binary files /dev/null and b/public/img/flag/guyana.gif differ diff --git a/public/img/flag/haiti.gif b/public/img/flag/haiti.gif new file mode 100755 index 0000000..42d6afe Binary files /dev/null and b/public/img/flag/haiti.gif differ diff --git a/public/img/flag/honduras.gif b/public/img/flag/honduras.gif new file mode 100755 index 0000000..9f6be06 Binary files /dev/null and b/public/img/flag/honduras.gif differ diff --git a/public/img/flag/hong_kong.gif b/public/img/flag/hong_kong.gif new file mode 100755 index 0000000..7ca38a1 Binary files /dev/null and b/public/img/flag/hong_kong.gif differ diff --git a/public/img/flag/hongkong.gif b/public/img/flag/hongkong.gif new file mode 100755 index 0000000..7ca38a1 Binary files /dev/null and b/public/img/flag/hongkong.gif differ diff --git a/public/img/flag/hungary.gif b/public/img/flag/hungary.gif new file mode 100755 index 0000000..f110af7 Binary files /dev/null and b/public/img/flag/hungary.gif differ diff --git a/public/img/flag/iceland.gif b/public/img/flag/iceland.gif new file mode 100755 index 0000000..063f139 Binary files /dev/null and b/public/img/flag/iceland.gif differ diff --git a/public/img/flag/india.gif b/public/img/flag/india.gif new file mode 100755 index 0000000..bb2a318 Binary files /dev/null and b/public/img/flag/india.gif differ diff --git a/public/img/flag/indonesia.gif b/public/img/flag/indonesia.gif new file mode 100755 index 0000000..31b5f2b Binary files /dev/null and b/public/img/flag/indonesia.gif differ diff --git a/public/img/flag/iran.gif b/public/img/flag/iran.gif new file mode 100755 index 0000000..222d5be Binary files /dev/null and b/public/img/flag/iran.gif differ diff --git a/public/img/flag/iraq.gif b/public/img/flag/iraq.gif new file mode 100755 index 0000000..e6bc3d0 Binary files /dev/null and b/public/img/flag/iraq.gif differ diff --git a/public/img/flag/ireland.gif b/public/img/flag/ireland.gif new file mode 100755 index 0000000..9c49e0f Binary files /dev/null and b/public/img/flag/ireland.gif differ diff --git a/public/img/flag/israel.gif b/public/img/flag/israel.gif new file mode 100755 index 0000000..e6fcacb Binary files /dev/null and b/public/img/flag/israel.gif differ diff --git a/public/img/flag/italy.gif b/public/img/flag/italy.gif new file mode 100755 index 0000000..e336976 Binary files /dev/null and b/public/img/flag/italy.gif differ diff --git a/public/img/flag/ivorycoast.gif b/public/img/flag/ivorycoast.gif new file mode 100755 index 0000000..bc3a5ba Binary files /dev/null and b/public/img/flag/ivorycoast.gif differ diff --git a/public/img/flag/jamaica.gif b/public/img/flag/jamaica.gif new file mode 100755 index 0000000..ba14762 Binary files /dev/null and b/public/img/flag/jamaica.gif differ diff --git a/public/img/flag/japan.gif b/public/img/flag/japan.gif new file mode 100755 index 0000000..d3928a9 Binary files /dev/null and b/public/img/flag/japan.gif differ diff --git a/public/img/flag/jollyroger.gif b/public/img/flag/jollyroger.gif new file mode 100755 index 0000000..0033397 Binary files /dev/null and b/public/img/flag/jollyroger.gif differ diff --git a/public/img/flag/jordan.gif b/public/img/flag/jordan.gif new file mode 100755 index 0000000..cc1fcd6 Binary files /dev/null and b/public/img/flag/jordan.gif differ diff --git a/public/img/flag/kazakhstan.gif b/public/img/flag/kazakhstan.gif new file mode 100755 index 0000000..56930f3 Binary files /dev/null and b/public/img/flag/kazakhstan.gif differ diff --git a/public/img/flag/kenya.gif b/public/img/flag/kenya.gif new file mode 100755 index 0000000..fe77c7b Binary files /dev/null and b/public/img/flag/kenya.gif differ diff --git a/public/img/flag/kiribati.gif b/public/img/flag/kiribati.gif new file mode 100755 index 0000000..9aad066 Binary files /dev/null and b/public/img/flag/kiribati.gif differ diff --git a/public/img/flag/kuwait.gif b/public/img/flag/kuwait.gif new file mode 100755 index 0000000..3eef8bd Binary files /dev/null and b/public/img/flag/kuwait.gif differ diff --git a/public/img/flag/kyrgyzstan.gif b/public/img/flag/kyrgyzstan.gif new file mode 100755 index 0000000..b234f12 Binary files /dev/null and b/public/img/flag/kyrgyzstan.gif differ diff --git a/public/img/flag/laos.gif b/public/img/flag/laos.gif new file mode 100755 index 0000000..936bbcd Binary files /dev/null and b/public/img/flag/laos.gif differ diff --git a/public/img/flag/latvia.gif b/public/img/flag/latvia.gif new file mode 100755 index 0000000..cb0f6a5 Binary files /dev/null and b/public/img/flag/latvia.gif differ diff --git a/public/img/flag/lebanon.gif b/public/img/flag/lebanon.gif new file mode 100755 index 0000000..d35a338 Binary files /dev/null and b/public/img/flag/lebanon.gif differ diff --git a/public/img/flag/liberia.gif b/public/img/flag/liberia.gif new file mode 100755 index 0000000..0e5dd71 Binary files /dev/null and b/public/img/flag/liberia.gif differ diff --git a/public/img/flag/libya.gif b/public/img/flag/libya.gif new file mode 100755 index 0000000..6f556d2 Binary files /dev/null and b/public/img/flag/libya.gif differ diff --git a/public/img/flag/liechtenstein.gif b/public/img/flag/liechtenstein.gif new file mode 100755 index 0000000..a92acf8 Binary files /dev/null and b/public/img/flag/liechtenstein.gif differ diff --git a/public/img/flag/lithuania.gif b/public/img/flag/lithuania.gif new file mode 100755 index 0000000..cceeddb Binary files /dev/null and b/public/img/flag/lithuania.gif differ diff --git a/public/img/flag/luxembourg.gif b/public/img/flag/luxembourg.gif new file mode 100755 index 0000000..5823abc Binary files /dev/null and b/public/img/flag/luxembourg.gif differ diff --git a/public/img/flag/macadonia.gif b/public/img/flag/macadonia.gif new file mode 100755 index 0000000..a397652 Binary files /dev/null and b/public/img/flag/macadonia.gif differ diff --git a/public/img/flag/macau.gif b/public/img/flag/macau.gif new file mode 100755 index 0000000..cecd679 Binary files /dev/null and b/public/img/flag/macau.gif differ diff --git a/public/img/flag/madagascar.gif b/public/img/flag/madagascar.gif new file mode 100755 index 0000000..d7b3918 Binary files /dev/null and b/public/img/flag/madagascar.gif differ diff --git a/public/img/flag/malawi.gif b/public/img/flag/malawi.gif new file mode 100755 index 0000000..e3c0de3 Binary files /dev/null and b/public/img/flag/malawi.gif differ diff --git a/public/img/flag/malaysia.gif b/public/img/flag/malaysia.gif new file mode 100755 index 0000000..95e123e Binary files /dev/null and b/public/img/flag/malaysia.gif differ diff --git a/public/img/flag/maldives.gif b/public/img/flag/maldives.gif new file mode 100755 index 0000000..046cc89 Binary files /dev/null and b/public/img/flag/maldives.gif differ diff --git a/public/img/flag/mali.gif b/public/img/flag/mali.gif new file mode 100755 index 0000000..eee0eaa Binary files /dev/null and b/public/img/flag/mali.gif differ diff --git a/public/img/flag/malta.gif b/public/img/flag/malta.gif new file mode 100755 index 0000000..d3a8e27 Binary files /dev/null and b/public/img/flag/malta.gif differ diff --git a/public/img/flag/mauritania.gif b/public/img/flag/mauritania.gif new file mode 100755 index 0000000..53d058e Binary files /dev/null and b/public/img/flag/mauritania.gif differ diff --git a/public/img/flag/mauritius.gif b/public/img/flag/mauritius.gif new file mode 100755 index 0000000..c8ab0e4 Binary files /dev/null and b/public/img/flag/mauritius.gif differ diff --git a/public/img/flag/mexico.gif b/public/img/flag/mexico.gif new file mode 100755 index 0000000..c1c9190 Binary files /dev/null and b/public/img/flag/mexico.gif differ diff --git a/public/img/flag/micronesia.gif b/public/img/flag/micronesia.gif new file mode 100755 index 0000000..d641bd9 Binary files /dev/null and b/public/img/flag/micronesia.gif differ diff --git a/public/img/flag/moldova.gif b/public/img/flag/moldova.gif new file mode 100755 index 0000000..e73013e Binary files /dev/null and b/public/img/flag/moldova.gif differ diff --git a/public/img/flag/monaco.gif b/public/img/flag/monaco.gif new file mode 100755 index 0000000..31b5f2b Binary files /dev/null and b/public/img/flag/monaco.gif differ diff --git a/public/img/flag/mongolia.gif b/public/img/flag/mongolia.gif new file mode 100755 index 0000000..d3d2d02 Binary files /dev/null and b/public/img/flag/mongolia.gif differ diff --git a/public/img/flag/morocco.gif b/public/img/flag/morocco.gif new file mode 100755 index 0000000..c601e89 Binary files /dev/null and b/public/img/flag/morocco.gif differ diff --git a/public/img/flag/mozambique.gif b/public/img/flag/mozambique.gif new file mode 100755 index 0000000..5edc600 Binary files /dev/null and b/public/img/flag/mozambique.gif differ diff --git a/public/img/flag/namibia.gif b/public/img/flag/namibia.gif new file mode 100755 index 0000000..a551090 Binary files /dev/null and b/public/img/flag/namibia.gif differ diff --git a/public/img/flag/nauru.gif b/public/img/flag/nauru.gif new file mode 100755 index 0000000..d32292e Binary files /dev/null and b/public/img/flag/nauru.gif differ diff --git a/public/img/flag/nepal.gif b/public/img/flag/nepal.gif new file mode 100755 index 0000000..3031f5b Binary files /dev/null and b/public/img/flag/nepal.gif differ diff --git a/public/img/flag/nethantilles.gif b/public/img/flag/nethantilles.gif new file mode 100755 index 0000000..bc2bbe3 Binary files /dev/null and b/public/img/flag/nethantilles.gif differ diff --git a/public/img/flag/netherlands.gif b/public/img/flag/netherlands.gif new file mode 100755 index 0000000..4337dce Binary files /dev/null and b/public/img/flag/netherlands.gif differ diff --git a/public/img/flag/newzealand.gif b/public/img/flag/newzealand.gif new file mode 100755 index 0000000..58c5b06 Binary files /dev/null and b/public/img/flag/newzealand.gif differ diff --git a/public/img/flag/nicaragua.gif b/public/img/flag/nicaragua.gif new file mode 100755 index 0000000..c7468f5 Binary files /dev/null and b/public/img/flag/nicaragua.gif differ diff --git a/public/img/flag/niger.gif b/public/img/flag/niger.gif new file mode 100755 index 0000000..5e5ce0e Binary files /dev/null and b/public/img/flag/niger.gif differ diff --git a/public/img/flag/nigeria.gif b/public/img/flag/nigeria.gif new file mode 100755 index 0000000..bfc9220 Binary files /dev/null and b/public/img/flag/nigeria.gif differ diff --git a/public/img/flag/north_korea.gif b/public/img/flag/north_korea.gif new file mode 100755 index 0000000..ae5227b Binary files /dev/null and b/public/img/flag/north_korea.gif differ diff --git a/public/img/flag/northkorea.gif b/public/img/flag/northkorea.gif new file mode 100755 index 0000000..ae5227b Binary files /dev/null and b/public/img/flag/northkorea.gif differ diff --git a/public/img/flag/norway.gif b/public/img/flag/norway.gif new file mode 100755 index 0000000..39213cd Binary files /dev/null and b/public/img/flag/norway.gif differ diff --git a/public/img/flag/oman.gif b/public/img/flag/oman.gif new file mode 100755 index 0000000..2ed6d0a Binary files /dev/null and b/public/img/flag/oman.gif differ diff --git a/public/img/flag/pakistan.gif b/public/img/flag/pakistan.gif new file mode 100755 index 0000000..cf6fe82 Binary files /dev/null and b/public/img/flag/pakistan.gif differ diff --git a/public/img/flag/panama.gif b/public/img/flag/panama.gif new file mode 100755 index 0000000..b0609c3 Binary files /dev/null and b/public/img/flag/panama.gif differ diff --git a/public/img/flag/papuanewguinea.gif b/public/img/flag/papuanewguinea.gif new file mode 100755 index 0000000..f18bfde Binary files /dev/null and b/public/img/flag/papuanewguinea.gif differ diff --git a/public/img/flag/paraguay.gif b/public/img/flag/paraguay.gif new file mode 100755 index 0000000..e3b55d1 Binary files /dev/null and b/public/img/flag/paraguay.gif differ diff --git a/public/img/flag/peru.gif b/public/img/flag/peru.gif new file mode 100755 index 0000000..30ea6c9 Binary files /dev/null and b/public/img/flag/peru.gif differ diff --git a/public/img/flag/philippines.gif b/public/img/flag/philippines.gif new file mode 100755 index 0000000..8bebe61 Binary files /dev/null and b/public/img/flag/philippines.gif differ diff --git a/public/img/flag/poland.gif b/public/img/flag/poland.gif new file mode 100755 index 0000000..53df4bf Binary files /dev/null and b/public/img/flag/poland.gif differ diff --git a/public/img/flag/portugal.gif b/public/img/flag/portugal.gif new file mode 100755 index 0000000..bc36630 Binary files /dev/null and b/public/img/flag/portugal.gif differ diff --git a/public/img/flag/puertorico.gif b/public/img/flag/puertorico.gif new file mode 100755 index 0000000..e71150b Binary files /dev/null and b/public/img/flag/puertorico.gif differ diff --git a/public/img/flag/qatar.gif b/public/img/flag/qatar.gif new file mode 100755 index 0000000..584cfdf Binary files /dev/null and b/public/img/flag/qatar.gif differ diff --git a/public/img/flag/rawanda.gif b/public/img/flag/rawanda.gif new file mode 100755 index 0000000..c58ef21 Binary files /dev/null and b/public/img/flag/rawanda.gif differ diff --git a/public/img/flag/romania.gif b/public/img/flag/romania.gif new file mode 100755 index 0000000..48704a9 Binary files /dev/null and b/public/img/flag/romania.gif differ diff --git a/public/img/flag/russia.gif b/public/img/flag/russia.gif new file mode 100755 index 0000000..44c992b Binary files /dev/null and b/public/img/flag/russia.gif differ diff --git a/public/img/flag/sao_tome.gif b/public/img/flag/sao_tome.gif new file mode 100755 index 0000000..64ad6d8 Binary files /dev/null and b/public/img/flag/sao_tome.gif differ diff --git a/public/img/flag/saudiarabia.gif b/public/img/flag/saudiarabia.gif new file mode 100755 index 0000000..1ea838c Binary files /dev/null and b/public/img/flag/saudiarabia.gif differ diff --git a/public/img/flag/senegal.gif b/public/img/flag/senegal.gif new file mode 100755 index 0000000..77ba5a9 Binary files /dev/null and b/public/img/flag/senegal.gif differ diff --git a/public/img/flag/serbia.gif b/public/img/flag/serbia.gif new file mode 100755 index 0000000..49afe89 Binary files /dev/null and b/public/img/flag/serbia.gif differ diff --git a/public/img/flag/seychelles.gif b/public/img/flag/seychelles.gif new file mode 100755 index 0000000..5046f25 Binary files /dev/null and b/public/img/flag/seychelles.gif differ diff --git a/public/img/flag/sierraleone.gif b/public/img/flag/sierraleone.gif new file mode 100755 index 0000000..71048ad Binary files /dev/null and b/public/img/flag/sierraleone.gif differ diff --git a/public/img/flag/singapore.gif b/public/img/flag/singapore.gif new file mode 100755 index 0000000..cf520ff Binary files /dev/null and b/public/img/flag/singapore.gif differ diff --git a/public/img/flag/slovakia.gif b/public/img/flag/slovakia.gif new file mode 100755 index 0000000..d1298d0 Binary files /dev/null and b/public/img/flag/slovakia.gif differ diff --git a/public/img/flag/slovenia.gif b/public/img/flag/slovenia.gif new file mode 100755 index 0000000..064278c Binary files /dev/null and b/public/img/flag/slovenia.gif differ diff --git a/public/img/flag/solomon_islands.gif b/public/img/flag/solomon_islands.gif new file mode 100755 index 0000000..0ad17c8 Binary files /dev/null and b/public/img/flag/solomon_islands.gif differ diff --git a/public/img/flag/somalia.gif b/public/img/flag/somalia.gif new file mode 100755 index 0000000..27eda75 Binary files /dev/null and b/public/img/flag/somalia.gif differ diff --git a/public/img/flag/south_korea.gif b/public/img/flag/south_korea.gif new file mode 100755 index 0000000..38c833b Binary files /dev/null and b/public/img/flag/south_korea.gif differ diff --git a/public/img/flag/southafrica.gif b/public/img/flag/southafrica.gif new file mode 100755 index 0000000..398370b Binary files /dev/null and b/public/img/flag/southafrica.gif differ diff --git a/public/img/flag/southkorea.gif b/public/img/flag/southkorea.gif new file mode 100755 index 0000000..38c833b Binary files /dev/null and b/public/img/flag/southkorea.gif differ diff --git a/public/img/flag/spain.gif b/public/img/flag/spain.gif new file mode 100755 index 0000000..28a93fe Binary files /dev/null and b/public/img/flag/spain.gif differ diff --git a/public/img/flag/srilanka.gif b/public/img/flag/srilanka.gif new file mode 100755 index 0000000..047cdb9 Binary files /dev/null and b/public/img/flag/srilanka.gif differ diff --git a/public/img/flag/stkitts_nevis.gif b/public/img/flag/stkitts_nevis.gif new file mode 100755 index 0000000..1eec7f6 Binary files /dev/null and b/public/img/flag/stkitts_nevis.gif differ diff --git a/public/img/flag/stlucia.gif b/public/img/flag/stlucia.gif new file mode 100755 index 0000000..c04e4d2 Binary files /dev/null and b/public/img/flag/stlucia.gif differ diff --git a/public/img/flag/sudan.gif b/public/img/flag/sudan.gif new file mode 100755 index 0000000..c485d0f Binary files /dev/null and b/public/img/flag/sudan.gif differ diff --git a/public/img/flag/suriname.gif b/public/img/flag/suriname.gif new file mode 100755 index 0000000..38984c4 Binary files /dev/null and b/public/img/flag/suriname.gif differ diff --git a/public/img/flag/sweden.gif b/public/img/flag/sweden.gif new file mode 100755 index 0000000..a82090e Binary files /dev/null and b/public/img/flag/sweden.gif differ diff --git a/public/img/flag/switzerland.gif b/public/img/flag/switzerland.gif new file mode 100755 index 0000000..2e2144c Binary files /dev/null and b/public/img/flag/switzerland.gif differ diff --git a/public/img/flag/syria.gif b/public/img/flag/syria.gif new file mode 100755 index 0000000..a2667b0 Binary files /dev/null and b/public/img/flag/syria.gif differ diff --git a/public/img/flag/taiwan.gif b/public/img/flag/taiwan.gif new file mode 100755 index 0000000..ac07193 Binary files /dev/null and b/public/img/flag/taiwan.gif differ diff --git a/public/img/flag/tajikistan.gif b/public/img/flag/tajikistan.gif new file mode 100755 index 0000000..89ebfa4 Binary files /dev/null and b/public/img/flag/tajikistan.gif differ diff --git a/public/img/flag/tanzania.gif b/public/img/flag/tanzania.gif new file mode 100755 index 0000000..c6e3b1c Binary files /dev/null and b/public/img/flag/tanzania.gif differ diff --git a/public/img/flag/thailand.gif b/public/img/flag/thailand.gif new file mode 100755 index 0000000..a8aacb7 Binary files /dev/null and b/public/img/flag/thailand.gif differ diff --git a/public/img/flag/togo.gif b/public/img/flag/togo.gif new file mode 100755 index 0000000..f99f882 Binary files /dev/null and b/public/img/flag/togo.gif differ diff --git a/public/img/flag/tonga.gif b/public/img/flag/tonga.gif new file mode 100755 index 0000000..c10b2ca Binary files /dev/null and b/public/img/flag/tonga.gif differ diff --git a/public/img/flag/trinidadandtobago.gif b/public/img/flag/trinidadandtobago.gif new file mode 100755 index 0000000..50a6947 Binary files /dev/null and b/public/img/flag/trinidadandtobago.gif differ diff --git a/public/img/flag/tunisia.gif b/public/img/flag/tunisia.gif new file mode 100755 index 0000000..cedb96c Binary files /dev/null and b/public/img/flag/tunisia.gif differ diff --git a/public/img/flag/turkey.gif b/public/img/flag/turkey.gif new file mode 100755 index 0000000..e56d109 Binary files /dev/null and b/public/img/flag/turkey.gif differ diff --git a/public/img/flag/turkmenistan.gif b/public/img/flag/turkmenistan.gif new file mode 100755 index 0000000..d381bd9 Binary files /dev/null and b/public/img/flag/turkmenistan.gif differ diff --git a/public/img/flag/tuvala.gif b/public/img/flag/tuvala.gif new file mode 100755 index 0000000..6cbb5b4 Binary files /dev/null and b/public/img/flag/tuvala.gif differ diff --git a/public/img/flag/uae.gif b/public/img/flag/uae.gif new file mode 100755 index 0000000..961e911 Binary files /dev/null and b/public/img/flag/uae.gif differ diff --git a/public/img/flag/uganda.gif b/public/img/flag/uganda.gif new file mode 100755 index 0000000..8b903d9 Binary files /dev/null and b/public/img/flag/uganda.gif differ diff --git a/public/img/flag/uk.gif b/public/img/flag/uk.gif new file mode 100755 index 0000000..455263d Binary files /dev/null and b/public/img/flag/uk.gif differ diff --git a/public/img/flag/ukraine.gif b/public/img/flag/ukraine.gif new file mode 100755 index 0000000..0d0f931 Binary files /dev/null and b/public/img/flag/ukraine.gif differ diff --git a/public/img/flag/uruguay.gif b/public/img/flag/uruguay.gif new file mode 100755 index 0000000..14c4d69 Binary files /dev/null and b/public/img/flag/uruguay.gif differ diff --git a/public/img/flag/us.gif b/public/img/flag/us.gif new file mode 100755 index 0000000..00c4673 Binary files /dev/null and b/public/img/flag/us.gif differ diff --git a/public/img/flag/ussr.gif b/public/img/flag/ussr.gif new file mode 100755 index 0000000..0896476 Binary files /dev/null and b/public/img/flag/ussr.gif differ diff --git a/public/img/flag/uzbekistan.gif b/public/img/flag/uzbekistan.gif new file mode 100755 index 0000000..eb61342 Binary files /dev/null and b/public/img/flag/uzbekistan.gif differ diff --git a/public/img/flag/vanuatu.gif b/public/img/flag/vanuatu.gif new file mode 100755 index 0000000..8d4caea Binary files /dev/null and b/public/img/flag/vanuatu.gif differ diff --git a/public/img/flag/venezuela.gif b/public/img/flag/venezuela.gif new file mode 100755 index 0000000..00bb200 Binary files /dev/null and b/public/img/flag/venezuela.gif differ diff --git a/public/img/flag/vietnam.gif b/public/img/flag/vietnam.gif new file mode 100755 index 0000000..1c795a5 Binary files /dev/null and b/public/img/flag/vietnam.gif differ diff --git a/public/img/flag/westernsamoa.gif b/public/img/flag/westernsamoa.gif new file mode 100755 index 0000000..d7397a4 Binary files /dev/null and b/public/img/flag/westernsamoa.gif differ diff --git a/public/img/flag/yemen.gif b/public/img/flag/yemen.gif new file mode 100755 index 0000000..5313a19 Binary files /dev/null and b/public/img/flag/yemen.gif differ diff --git a/public/img/flag/yugoslavia.gif b/public/img/flag/yugoslavia.gif new file mode 100755 index 0000000..936aa6c Binary files /dev/null and b/public/img/flag/yugoslavia.gif differ diff --git a/public/img/flag/zaire.gif b/public/img/flag/zaire.gif new file mode 100755 index 0000000..63fdf47 Binary files /dev/null and b/public/img/flag/zaire.gif differ diff --git a/public/img/flag/zambia.gif b/public/img/flag/zambia.gif new file mode 100755 index 0000000..9526437 Binary files /dev/null and b/public/img/flag/zambia.gif differ diff --git a/public/img/flag/zimbabwe.gif b/public/img/flag/zimbabwe.gif new file mode 100755 index 0000000..c8d5825 Binary files /dev/null and b/public/img/flag/zimbabwe.gif differ diff --git a/resources/js/app.js b/resources/js/app.js index 1ffbb9c..b12c34b 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -20,35 +20,6 @@ $('.similar-show-slider').owlCarousel({ items: 7 }); - -// tns({ -// container: '.show-slider', -// items: 7, -// slideBy: 'page', -// controlsText: ["↼ ", "⇁"], -// nav: false -// }); - -// tns({ -// container: '.similar-show-slider', -// items: 6, -// slideBy: 'page', -// controlsText: ["↼ ", "⇁"], -// nav: false, -// nextButton: false, -// prevButton: false, -// }); -// -// tns({ -// container: '.recommended-show-slider', -// items: 6, -// slideBy: 'page', -// controlsText: ["↼ ", "⇁"], -// nav: false, -// nextButton: false, -// prevButton: false, -// }); - const options = { keyboard: true, size: 'fullscreen' diff --git a/resources/sass/app.scss b/resources/sass/app.scss index 620b1ec..d0c8d42 100644 --- a/resources/sass/app.scss +++ b/resources/sass/app.scss @@ -10,6 +10,10 @@ @import "../js/OwlCarousel2-2.3.4/dist/assets/owl.carousel.css"; @import "../js/OwlCarousel2-2.3.4/dist/assets/owl.theme.default.css"; +@import "font-awesome/scss/variables"; +$fa-font-path: "/fonts"; +@import "font-awesome/scss/font-awesome"; + .dark-mode{ } @@ -297,4 +301,8 @@ body.light-mode{ } } } + + .topic-row{ + border-bottom: 1px dashed #ccc; + } } diff --git a/resources/views/forum/thread.blade.php b/resources/views/forum/thread.blade.php index a494855..4574a3a 100644 --- a/resources/views/forum/thread.blade.php +++ b/resources/views/forum/thread.blade.php @@ -10,7 +10,7 @@

{{ $thread->name }}

- + New topic
@@ -23,7 +23,42 @@
@if($topics->count()) - topics +
+
+
+ +
+
+ Topic Name / Author +
+
+ Views +
+
+ Last post +
+
+
+ @foreach($topics as $topic) +
+
+
+ +
+
+ {{ $topic->name }}
+ Creator +
+
+ {{ $topic->views_no }} + {{ $topic->replies_no }} +
+
+ last +
+
+
+ @endforeach @else
There are no topics at the moment! Go ahead, post the first one! diff --git a/resources/views/forum/topics/create.blade.php b/resources/views/forum/topics/create.blade.php index 77ab4eb..8489152 100644 --- a/resources/views/forum/topics/create.blade.php +++ b/resources/views/forum/topics/create.blade.php @@ -4,11 +4,28 @@
-
+ @csrf -
- - +
+
New topic
+
+
+ Posting in thread {{ $currentThread->name }}, category {{ $currentThread->category->name }}. +
+
+ + +
+
+ + +
+
+
+
+ +
+
diff --git a/resources/views/forum/topics/show.blade.php b/resources/views/forum/topics/show.blade.php new file mode 100644 index 0000000..53b1d05 --- /dev/null +++ b/resources/views/forum/topics/show.blade.php @@ -0,0 +1,77 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+ {{ $topic->name }} +
+
+
+
+
+
+ @foreach($posts as $post) +
+
+
+ {{ $post->author->name }} | {{ $post->created_at->diffForHumans() }} +
+
+
+
+ avatar
name
rank & co +
+
+ {{ $post->content }} +
+
+
+
+
+ Reply + Like +
+
+
+
+ @endforeach +
+ {{ $posts->links() }} +
+
+ @csrf +
+ +
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+@endsection diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 2bf3442..397daed 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -16,12 +16,13 @@ - + @vite(['resources/sass/app.scss', 'resources/js/app.js']) @livewireStyles + @bukStyles
@@ -35,6 +36,6 @@
@livewireScripts - + @bukScripts diff --git a/resources/views/livewire/movie-page/recommendations.blade.php b/resources/views/livewire/movie-page/recommendations.blade.php index b53d3a8..7d30e7a 100644 --- a/resources/views/livewire/movie-page/recommendations.blade.php +++ b/resources/views/livewire/movie-page/recommendations.blade.php @@ -3,12 +3,21 @@ @foreach($recommendations as $recommendation)
- {{ $recommendation->title }} + @if($recommendation->poster_path) + {{ $recommendation->title }} + @else + + {{ $recommendation->title }} @if($recommendation->release_date) ({{ $recommendation->release_date->format('Y') }}) @endif + + @endif
@endforeach diff --git a/resources/views/livewire/movie-page/similar.blade.php b/resources/views/livewire/movie-page/similar.blade.php index 379e555..3e23c9c 100644 --- a/resources/views/livewire/movie-page/similar.blade.php +++ b/resources/views/livewire/movie-page/similar.blade.php @@ -1,3 +1,25 @@
- {{-- If you look to others for fulfillment, you will never truly be fulfilled. --}} +
+ @foreach($similarMovies as $similarMovie) +
+ + @if($similarMovie->poster_path) + {{ $similarMovie->title }} + @else + + {{ $similarMovie->title }} @if($similarMovie->release_date) ({{ $similarMovie->release_date->format('Y') }}) @endif + + @endif + +
+ @endforeach +
diff --git a/resources/views/livewire/movie-page/tabs/details.blade.php b/resources/views/livewire/movie-page/tabs/details.blade.php index 1ce0248..99a7378 100644 --- a/resources/views/livewire/movie-page/tabs/details.blade.php +++ b/resources/views/livewire/movie-page/tabs/details.blade.php @@ -38,7 +38,7 @@
    @foreach($alternativeTitles as $alternativeTitle)
  • - [{{ $alternativeTitle->iso }}] {{ $alternativeTitle->title }} + {{ $alternativeTitle->iso }} {{ $alternativeTitle->title }}
    • @endforeach
diff --git a/resources/views/livewire/movie-page/tabs/videos.blade.php b/resources/views/livewire/movie-page/tabs/videos.blade.php new file mode 100644 index 0000000..2b0c3b4 --- /dev/null +++ b/resources/views/livewire/movie-page/tabs/videos.blade.php @@ -0,0 +1,11 @@ +
+
+ @foreach($videos as $video) +
+ + + +
+ @endforeach +
+
diff --git a/resources/views/movie/show.blade.php b/resources/views/movie/show.blade.php index b1171ea..5ce8d28 100644 --- a/resources/views/movie/show.blade.php +++ b/resources/views/movie/show.blade.php @@ -23,9 +23,17 @@ {{ $watchProvider->provider_name }} @endforeach
- - view trailer / - external ids +
+ @if($movie->externalIds && $movie->externalIds->tmdb_id) + + @endif + @if($movie->externalIds && $movie->externalIds->imdb_id) + + @endif +
+ @if($movie->trailer->first()) + View trailer + @endif
@@ -43,6 +51,9 @@ + @@ -57,6 +68,9 @@
@livewire(App\Livewire\MoviePage\Tabs\Details::class, ['movie' => $movie])
+
+ @livewire(App\Livewire\MoviePage\Tabs\Videos::class, ['movie' => $movie]) +
@livewire(App\Livewire\MoviePage\Tabs\Cast::class, ['movie' => $movie])
@@ -74,7 +88,9 @@
Similar
-
+
+ @livewire(App\Livewire\MoviePage\Similar::class, ['movie' => $movie]) +
Recommended
@@ -84,15 +100,48 @@
Write review
-
+
+ @if(Auth::check()) +
+ @csrf +
+ + + @error('content') +
{{ $message }}
+ @enderror +
+
+
+
+ +
+
+
+ @else +
+ You must be authenticated to comment! Please login or register. +
+ @endif +
@foreach($comments as $comment)
@if($comment->author_avatar) + @else + // user avatar + @endif + @if($comment->author_name) + {{ $comment->author_name }} + @else + {{ $comment->author->name }} + @endif + + @if($comment->tmdb_id) + TMDB @endif - {{ $comment->author_name }} {{ $comment->author_rating }} diff --git a/resources/views/profile/lists/index.blade.php b/resources/views/profile/lists/index.blade.php index 659c1fe..b9e6e08 100644 --- a/resources/views/profile/lists/index.blade.php +++ b/resources/views/profile/lists/index.blade.php @@ -3,9 +3,33 @@ @section('page_content')
-
+
@if($lists->count()) - lists +
+
+
+
+ Create list +
+
+
+
+ @foreach($lists as $list) +
+
+
+
+ pics +
+
+

{{ $list->name }}

+ {{ $list->item_count }} items +

{{ $list->description }}

+
+
+
+
+ @endforeach @else
No lists yet. Start one? diff --git a/resources/views/profile/show.blade.php b/resources/views/profile/show.blade.php index cf22ec6..108df55 100644 --- a/resources/views/profile/show.blade.php +++ b/resources/views/profile/show.blade.php @@ -7,7 +7,17 @@
Last watched
-
+
+ @if($lastWatched) + + + r + @else +
+ Nothing to show here!
Go watch something! +
+ @endif +
diff --git a/resources/views/show/show.blade.php b/resources/views/show/show.blade.php index bd4c7fd..11ea42e 100644 --- a/resources/views/show/show.blade.php +++ b/resources/views/show/show.blade.php @@ -113,6 +113,29 @@ @endif
+
+
+ Seasons +
+
+ +
+
+
+
+
+ @foreach($seasons as $season) +
+ + + {{ $season->name }}
+ {{ $season->episode_count }} episodes + +
+ @endforeach +
+
+
Similar diff --git a/routes/web.php b/routes/web.php index c61dd78..7755a26 100644 --- a/routes/web.php +++ b/routes/web.php @@ -10,10 +10,11 @@ Auth::routes(); Route::get('/', [App\Http\Controllers\HomeController::class, 'index'])->name('home'); - Route::prefix('movies')->group(function () { Route::get('/', [\App\Http\Controllers\MovieController::class, 'index'])->name('movie.index'); Route::get('/{slug}', [\App\Http\Controllers\MovieController::class, 'show'])->name('movie.show'); + + Route::post('/{slug}/store-comment', [\App\Http\Controllers\MovieController::class, 'storeComment'])->name('movie.comment.store'); }); Route::prefix('shows')->group(function () { @@ -30,6 +31,17 @@ Route::prefix('forums')->group(function () { Route::get('/', [\App\Http\Controllers\Forum\CategoriesController::class, 'index'])->name('forums.index'); Route::get('/{categorySlug}/{threadSlug}', [\App\Http\Controllers\Forum\ThreadsController::class, 'show'])->name('forums.thread.index'); Route::get('/{categorySlug}/{threadSlug}/topic', [\App\Http\Controllers\Forum\TopicsController::class, 'create'])->name('forums.thread.topics.create'); + + Route::post('/{categorySlug}/{threadSlug}/topic', [\App\Http\Controllers\Forum\TopicsController::class, 'store'])->name('forums.thread.topics.store'); + + Route::get('/{categorySlug}/{threadSlug}/topic/{topicSlug}', [\App\Http\Controllers\Forum\TopicsController::class, 'show'])->name('forums.thread.topics.show'); + + Route::post('/{categorySlug}/{threadSlug}/topic/{topicSlug}/reply', [\App\Http\Controllers\Forum\PostsController::class, 'store'])->name('forums.thread.topics.post.store'); + + // topic reply + // topic delete + // topic edit + // topic update }); Route::prefix('lists')->group(function () {