hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-01-11 18:01:10 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
vedatakd 2022-02-04 10:41:23 +03:00
commit ec80aad3e7
9 changed files with 81 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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.

3
addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
View File

@ -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'])));

3
addons/default/visiosoft/base-theme/resources/lang/en/field.php
View File

@ -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,',

2
addons/default/visiosoft/base-theme/resources/lang/tr/field.php
View File

@ -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',

2
addons/default/visiosoft/base-theme/resources/views/addons/anomaly/posts-module/posts/articles.twig
View File

@ -14,7 +14,7 @@
class="fs-14 product rounded position-relative bg-white link-dark text-decoration-none border">
<div class="product-img">
<a href="{{ post.route('view') }}">
{{ 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 }}
</a>
</div>
<div class="product-text-area p-3">

8
addons/default/visiosoft/base-theme/resources/views/addons/anomaly/posts-module/posts/index.twig
View File

@ -12,7 +12,7 @@
{% for post in posts %}
<a href="{{ post.route('view') }}" class="col-xl-4 col-lg-6 col-md-12 col-12 text-decoration-none my-3">
<div class="bannerImage_2 position-relative">
{{ 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 }}
<span class="p-1 fs-12 bgSpecial_6 position-absolute left-zero bottom-zero text-white">
{{ post.category.name }}
@ -42,7 +42,7 @@
<div class="col-md-8 col-12">
<div class="position-relative w-fit shadow-sm">
<a href="{{ posts.first.route('view') }}">
{{ 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 }}
<div class="bgForLight"></div>
<div class="d-flex flex-column position-absolute p-4 bottom-zero left-zero z-index">
@ -61,7 +61,7 @@
{% if loop.first %}
<div class="position-relative w-fit shadow-sm">
<a href="{{ post.route('view') }}">
{{ 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 }}
<div class="bgForLight"></div>
<div class="d-flex flex-column position-absolute p-4 bottom-zero left-zero z-index">
<div class="text-white fs-17px">{{ post.title }}</div>
@ -74,7 +74,7 @@
{% else %}
<div class="d-flex my-3">
<a href="{{ post.route('view') }}" class="d-flex text-dark">
{{ 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 }}
<div class="d-flex flex-column">
<div class="text-capitalize fw-500 fs-13">{{ post.title }}</div>

6
addons/default/visiosoft/base-theme/resources/views/addons/anomaly/posts-module/posts/view.twig
View File

@ -9,9 +9,9 @@
<div class="row p-0 m-0">
<div class="col-12 position-relative my-3">
<div class="productImage">
{{ img(post.cover_photo.make.url).class('w-100')|raw }}
{{ img(post.cover_image.make.url).class('w-100')|raw }}
</div>
<div class="px-md-4 px-0 p-md-3 p-0 {{ post.cover_photo ? 'positionSpecial' }} w-100">
<div class="px-md-4 px-0 p-md-3 p-0 {{ post.cover_image ? 'positionSpecial' }} w-100">
<div class="bg-white p-3 px-4">
<h1>{{ post.title }}</h1>
<div class="mt-4 d-flex flex-md-row flex-column">
@ -50,7 +50,7 @@
<a href="{{ post.route('view') }}"
class="fs-14 product p-0 mr-3 rounded position-relative bg-white link-dark text-decoration-none">
<div class="related-image-wrapper w-225">
{{ 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 }}
</div>
<div class="product-text-area p-3">
<div class="fw-500 text-dark single-line">

4
addons/default/visiosoft/base-theme/src/BaseThemeSeeder.php
View File

@ -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);
}
}

63
addons/default/visiosoft/base-theme/src/Seed/PostFieldsSeeder.php Normal file
View File

@ -0,0 +1,63 @@
<?php namespace Visiosoft\BaseTheme\Seed;
use Anomaly\BlocksModule\Area\Contract\AreaRepositoryInterface;
use Anomaly\BlocksModule\Type\Contract\TypeRepositoryInterface;
use Anomaly\Streams\Platform\Assignment\Contract\AssignmentRepositoryInterface;
use Anomaly\Streams\Platform\Field\Contract\FieldRepositoryInterface;
use Anomaly\Streams\Platform\Stream\Contract\StreamRepositoryInterface;
use Illuminate\Database\Seeder;
use Anomaly\BlocksModule\Block\Contract\BlockRepositoryInterface;
use Visiosoft\AdvsModule\Adv\AdvModel;
class PostFieldsSeeder extends Seeder
{
private $fieldRepository;
private $assignmentRepository;
private $streamRepository;
public function __construct(
FieldRepositoryInterface $fieldRepository,
AssignmentRepositoryInterface $assignmentRepository,
StreamRepositoryInterface $streamRepository
) {
$this->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'],
]);
}
}
}
}