Skip to content

Commit

Permalink
Merge pull request #331 from nasirkhan/update
Browse files Browse the repository at this point in the history
Update
  • Loading branch information
nasirkhan committed May 15, 2022
2 parents 80e9521 + 324f1c7 commit bb00795
Show file tree
Hide file tree
Showing 15 changed files with 419 additions and 782 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
</div>
</section>

<section class="bg-white text-gray-600 py-20 px-20">
<div class="grid grid-cols-3 gap-6">
<section class="bg-white text-gray-600 p-6 sm:p-20">
<div class="grid grid-cols-2 sm:grid-cols-3 gap-6">
@foreach ($$module_name as $$module_name_singular)
@php
$details_url = route("frontend.$module_name.show",[encode_id($$module_name_singular->id), $$module_name_singular->slug]);
Expand Down
12 changes: 6 additions & 6 deletions Modules/Article/Resources/views/frontend/posts/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
</div>
</section>

<section class="bg-white text-gray-600 py-20 px-20">
<div class="grid grid-cols-3 gap-6">
<section class="bg-white text-gray-600 p-6 sm:p-20">
<div class="grid grid-cols-2 sm:grid-cols-3 gap-6">
@foreach ($$module_name as $$module_name_singular)
@php
$details_url = route("frontend.$module_name.show",[encode_id($$module_name_singular->id), $$module_name_singular->slug]);
Expand All @@ -34,17 +34,17 @@
<a href="{{$details_url}}" class="overflow-hidden">
<img src="{{$$module_name_singular->featured_image}}" alt="" class="rounded-t-lg transform hover:scale-110 duration-200">
</a>
<div class="p-5">
<div class="p-3 sm:p-5">
<a href="{{$details_url}}">
<h2 class="mb-2 text-2xl tracking-tight text-gray-900 dark:text-white">
<h2 class="mb-2 text-md sm:text-2xl tracking-tight text-gray-900 dark:text-white">
{{$$module_name_singular->name}}
</h2>
</a>
<div class="flex flex-row content-center my-4">
<img class="w-8 h-8 rounded-full" src="{{asset('img/avatars/'.rand(1, 8).'.jpg')}}" alt="">
<img class="w-5 h-5 sm:w-8 sm:h-8 rounded-full" src="{{asset('img/avatars/'.rand(1, 8).'.jpg')}}" alt="">

{!!isset($$module_name_singular->created_by_alias)? $$module_name_singular->created_by_alias : '<a href="'.route('frontend.users.profile', $$module_name_singular->created_by).'">
<h6 class="text-muted small ml-2 mb-0">'.$$module_name_singular->created_by_name.'</h6>
<h6 class="text-muted text-sm small ml-2 mb-0">'.$$module_name_singular->created_by_name.'</h6>
</a>'!!}
</div>
<p class="flex-1 h-full mb-3 font-normal text-gray-700 dark:text-gray-400">
Expand Down
407 changes: 0 additions & 407 deletions Modules/Article/Resources/views/frontend/posts/show-copy.blade.php

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
</div>
</section>

<section class="bg-white text-gray-600 py-20 px-20">
<div class="grid grid-cols-3 gap-6">
<section class="bg-white text-gray-600 p-6 sm:p-20">
<div class="grid grid-cols-2 sm:grid-cols-3 gap-6">
@foreach ($$module_name as $$module_name_singular)
@php
$details_url = route("frontend.$module_name.show",[encode_id($$module_name_singular->id), $$module_name_singular->slug]);
Expand Down
5 changes: 2 additions & 3 deletions Modules/Tag/Database/Factories/TagFactory.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<?php

namespace Modules\Tag\Database\Factories;
namespace Modules\Tag\Database\factories;

use Carbon\Carbon;
use Illuminate\Database\Eloquent\Factories\Factory;
use Modules\Tag\Entities\Tag;

class TagFactory extends Factory
{
Expand All @@ -13,7 +12,7 @@ class TagFactory extends Factory
*
* @var string
*/
protected $model = Tag::class;
protected $model = \Modules\Tag\Entities\Tag::class;

/**
* Define the model's default state.
Expand Down
4 changes: 2 additions & 2 deletions Modules/Tag/Resources/views/frontend/tags/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
</div>
</section>

<section class="bg-white text-gray-600 py-20 px-20">
<div class="grid grid-cols-3 gap-6">
<section class="bg-white text-gray-600 p-6 sm:p-20">
<div class="grid grid-cols-2 sm:grid-cols-3 gap-6">
@foreach ($$module_name as $$module_name_singular)
@php
$details_url = route("frontend.$module_name.show",[encode_id($$module_name_singular->id), $$module_name_singular->slug]);
Expand Down
103 changes: 59 additions & 44 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/css/app.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions public/css/backend-theme.css

Large diffs are not rendered by default.

Loading

0 comments on commit bb00795

Please sign in to comment.