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

Merge remote-tracking branch 'origin/fatihalp' into fatihalp

Browse Source
This commit is contained in:
Fatih Alp 2021-03-27 22:36:00 +03:00
commit 42b336738c
4 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,11 +320,8 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
'mime_type' => $image->mime, 'mime_type' => $image->mime,
'extension' => $image->extension, 'extension' => $image->extension,
]); ]);
$coverPhoto = 'files/images/' . $fileName;
} else {
$coverPhoto = $thumbnail->make()->path();
} }
$coverPhoto = 'files/images/' . $fileName;
} else { } else {
$coverPhoto = null; $coverPhoto = null;
} }

16
addons/default/visiosoft/base-theme/resources/views/partials/categories.twig
View File

@ -3,14 +3,6 @@
<div class="col left-categories-section mx-0"> <div class="col left-categories-section mx-0">
<ul class="categories-list p-0 d-none d-sm-block mb-0"> <ul class="categories-list p-0 d-none d-sm-block mb-0">
<li class="categories-list-li category-icon border-bottom-0 mt-0">
<img src="{{ img('visiosoft.theme.base::images/store-search.png').url }}" class="img-responsive">
<a href="{{ url_route('store::list') }}" class="main-category">
<span class="text-dark" class="text-dark">
{{ trans('visiosoft.theme.base::field.company_directory') }}
</span>
</a>
</li>
<li class="categories-list-li category-icon border-bottom-0 mt-0"> <li class="categories-list-li category-icon border-bottom-0 mt-0">
<img src="{{ img('visiosoft.theme.base::images/popular-ads.png').url }}" class="img-responsive"> <img src="{{ img('visiosoft.theme.base::images/popular-ads.png').url }}" class="img-responsive">
<a href="{{ url_route('visiosoft.module.advs::list') }}?sort_by=popular" class="main-category"> <a href="{{ url_route('visiosoft.module.advs::list') }}?sort_by=popular" class="main-category">
@ -27,14 +19,6 @@
</span> </span>
</a> </a>
</li> </li>
<li class="categories-list-li category-icon mt-0 pb-3">
<img src="{{ img('visiosoft.theme.base::images/get-ads.png').url }}" class="img-responsive">
<a href="{{ url_route('visiosoft.module.advs::list') }}?get_ads=true" class="main-category">
<span class="text-dark">
{{ trans('visiosoft.theme.base::field.secure_e-commerce_ads') }}
</span>
</a>
</li>
{{ addBlock('base/leftSidebar')|raw }} {{ addBlock('base/leftSidebar')|raw }}
</ul> </ul>
{{ addBlock('base/categoriesRow')|raw }} {{ addBlock('base/categoriesRow')|raw }}

12
addons/default/visiosoft/profile-module/migrations/2020_10_15_122457_visiosoft.module.profile__create_birthday_field.php
View File

@ -4,7 +4,6 @@ use Anomaly\Streams\Platform\Database\Migration\Migration;
class VisiosoftModuleProfileCreateBirthdayField extends Migration class VisiosoftModuleProfileCreateBirthdayField extends Migration
{ {
/** /**
* Run the migrations. * Run the migrations.
* *
@ -20,8 +19,8 @@ class VisiosoftModuleProfileCreateBirthdayField extends Migration
->first(); ->first();
if (!$field) { if (!$field) {
$field = $this->fields()->create([ $field = $this->fields()->newQuery()->create([
'name' => trans('visiosoft.module.profile::field.birthday.name'), 'name' => 'visiosoft.module.profile::field.birthday.name',
'namespace' => 'users', 'namespace' => 'users',
'slug' => 'birthday', 'slug' => 'birthday',
'type' => 'anomaly.field_type.datetime', 'type' => 'anomaly.field_type.datetime',
@ -32,7 +31,7 @@ class VisiosoftModuleProfileCreateBirthdayField extends Migration
] ]
]); ]);
$this->assignments()->create([ $this->assignments()->newQuery()->create([
'stream_id' => $stream->id, 'stream_id' => $stream->id,
'field_id' => $field->id 'field_id' => $field->id
]); ]);
@ -47,10 +46,5 @@ class VisiosoftModuleProfileCreateBirthdayField extends Migration
*/ */
public function down() public function down()
{ {
/*
* I never go back on my word!
* That's my nindo: my ninja way!
* NARUTO
*/
} }
} }

2
database/seeds/DatabaseSeeder.php
View File

@ -112,7 +112,7 @@ class DatabaseSeeder extends Seeder
] ]
); );
$repository = "https://raw.githubusercontent.com/openclassify/Openclassify-Demo-Data/master/"; $repository = "https://raw.githubusercontent.com/openclassify/Openclassify-Demo-Data/upgrade3.8/";
file_put_contents(storage_path('advs.sql'), fopen($repository . "advs.sql", 'r')); file_put_contents(storage_path('advs.sql'), fopen($repository . "advs.sql", 'r'));
file_put_contents(storage_path('settings.sql'), fopen($repository . "settings.sql", 'r')); file_put_contents(storage_path('settings.sql'), fopen($repository . "settings.sql", 'r'));
file_put_contents(storage_path('categories.sql'), fopen($repository . "categories.sql", 'r')); file_put_contents(storage_path('categories.sql'), fopen($repository . "categories.sql", 'r'));