diff --git a/README.md b/README.md index f8a2e9b9a..3ff524c6f 100644 --- a/README.md +++ b/README.md @@ -142,4 +142,4 @@ Dia @diashalabi ## Thanks to -Ryan and it's stream platform and pyrocms it makes OpenClassify more powerfull. +Ryan and his stream platform PyroCMS which makes OpenClassify more powerful. diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index 63ddc4d2f..b9cb86190 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -74,9 +74,6 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface $query = $query->where('city', $city->id); } elseif (isset($param['city']) and !empty(array_filter($param['city']))) { $query = $query->whereIn('city', explode(',', array_first($param['city']))); - } elseif ($selectedCity = request()->cookie('selectedCity')) { - $selectedCity = json_decode($selectedCity); - $query = $query->where('city', $selectedCity->id); } if (isset($param['district']) and !empty(array_filter($param['district']))) { $query = $query->whereIn('district', explode(',', array_first($param['district']))); diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/field.php b/addons/default/visiosoft/base-theme/resources/lang/en/field.php index 09b673026..bde7414f0 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/en/field.php +++ b/addons/default/visiosoft/base-theme/resources/lang/en/field.php @@ -64,6 +64,9 @@ return [ 'instruction_description' => 'Instruction Description', 'instruction_list' => 'Instruction List', + // Posts seeder + 'cover_image' => 'Cover Image', + // Offline 'connection_problem' => 'Connection problem', 'your_internet_connection_is_broken' => 'Your internet connection is broken,', diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php index aebc5c2d2..3a69925a0 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php +++ b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php @@ -62,6 +62,8 @@ return [ 'list' => 'Liste', 'instruction_description' => 'Talimat Açıklama', 'instruction_list' => 'Talimat Listesi', + // Posts seeder + 'cover_image' => 'Kapak Fotoğrafı', // Offline 'connection_problem' => 'Connection problem', diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/posts-module/posts/articles.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/posts-module/posts/articles.twig index d3bd99fc2..d95b18c24 100644 --- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/posts-module/posts/articles.twig +++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/posts-module/posts/articles.twig @@ -14,7 +14,7 @@ class="fs-14 product rounded position-relative bg-white link-dark text-decoration-none border">
- {{ img( post.image.make.url ?? 'visiosoft.theme.base::images/no-image.png').class('w-100')|raw }} + {{ img( post.cover_image.make.url ?? 'visiosoft.theme.base::images/no-image.png').class('w-100')|raw }}
diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/posts-module/posts/index.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/posts-module/posts/index.twig index 9df3bd1c2..10aa61cd4 100644 --- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/posts-module/posts/index.twig +++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/posts-module/posts/index.twig @@ -12,7 +12,7 @@ {% for post in posts %}
- {{ img( post.cover_photo.make.url ?? 'visiosoft.theme.base::images/no-image.png') + {{ img( post.cover_image.make.url ?? 'visiosoft.theme.base::images/no-image.png') .class('w-100')|raw }} {{ post.category.name }} @@ -42,7 +42,7 @@
- {{ img( posts.first.image.make.url ?? 'visiosoft.theme.base::images/no-image.png') + {{ img( posts.first.cover_image.make.url ?? 'visiosoft.theme.base::images/no-image.png') .class('w-100')|raw }}
@@ -61,7 +61,7 @@ {% if loop.first %}
- {{ img( post.image.make.url ?? 'visiosoft.theme.base::images/no-image.png').class('w-100')|raw }} + {{ img( post.cover_image.make.url ?? 'visiosoft.theme.base::images/no-image.png').class('w-100')|raw }}
{{ post.title }}
@@ -74,7 +74,7 @@ {% else %}
- {{ img( post.image.make.url ?? 'visiosoft.theme.base::images/no-image.png') + {{ img( post.cover_image.make.url ?? 'visiosoft.theme.base::images/no-image.png') .class('ImageWidth mr-3 w-100')|raw }}
{{ post.title }}
diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/posts-module/posts/view.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/posts-module/posts/view.twig index 7590af4fb..02f1939c9 100644 --- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/posts-module/posts/view.twig +++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/posts-module/posts/view.twig @@ -9,9 +9,9 @@
- {{ img(post.cover_photo.make.url).class('w-100')|raw }} + {{ img(post.cover_image.make.url).class('w-100')|raw }}
-
+

{{ post.title }}

@@ -50,7 +50,7 @@
- {{ img( post.cover_photo.make.url ?? 'visiosoft.theme.base::images/no-image.png').class('related-image')|raw }} + {{ img( post.cover_image.make.url ?? 'visiosoft.theme.base::images/no-image.png').class('related-image')|raw }}
diff --git a/addons/default/visiosoft/base-theme/src/BaseThemeSeeder.php b/addons/default/visiosoft/base-theme/src/BaseThemeSeeder.php index 68458ac53..62f52d103 100644 --- a/addons/default/visiosoft/base-theme/src/BaseThemeSeeder.php +++ b/addons/default/visiosoft/base-theme/src/BaseThemeSeeder.php @@ -2,6 +2,7 @@ use Anomaly\Streams\Platform\Database\Seeder\Seeder; use Visiosoft\BaseTheme\Seed\RegisterInstructionSeeder; +use Visiosoft\BaseTheme\Seed\PostFieldsSeeder; class BaseThemeSeeder extends Seeder { @@ -13,5 +14,8 @@ class BaseThemeSeeder extends Seeder { // Register Instruction Seeder $this->call(RegisterInstructionSeeder::class); + + // Post Fields Seeder + $this->call(PostFieldsSeeder::class); } } \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/src/Seed/PostFieldsSeeder.php b/addons/default/visiosoft/base-theme/src/Seed/PostFieldsSeeder.php new file mode 100644 index 000000000..6623f3b0c --- /dev/null +++ b/addons/default/visiosoft/base-theme/src/Seed/PostFieldsSeeder.php @@ -0,0 +1,63 @@ +fieldRepository = $fieldRepository; + $this->assignmentRepository = $assignmentRepository; + $this->streamRepository = $streamRepository; + } + + public function run() + { + if ($stream = $this->streamRepository->findBySlugAndNamespace('default_posts', 'posts')) { + // Create cover image field + $coverImageField = [ + 'name' => trans('visiosoft.theme.base::field.cover_image'), + 'namespace' => 'posts', + 'slug' => 'cover_image', + 'type' => 'anomaly.field_type.file', + 'config' => [ + 'folders' => ['images'], + ], + ]; + + if (!$field = $this->fieldRepository->findBySlugAndNamespace($coverImageField['slug'], $coverImageField['namespace'])) { + $field = $this->fieldRepository->create([ + 'name' => $coverImageField['name'], + 'namespace' => $coverImageField['namespace'], + 'slug' => $coverImageField['slug'], + 'type' => $coverImageField['type'], + 'config' => $coverImageField['config'], + 'locked' => 0 + ]); + } + + if (!$this->assignmentRepository->findByStreamAndField($stream, $field)) { + $this->assignmentRepository->create([ + 'stream_id' => $stream->getId(), + 'field_id' => $field->id, + 'label' => $coverImageField['name'], + ]); + } + } + } +}