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 branch 'master' of https://github.com/openclassify/openclassify

Browse Source
This commit is contained in:
vedatakd 2020-01-30 17:49:50 +03:00
commit 9651f66463
5 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/default/visiosoft/advs-module/resources/views/list/list.twig
View File

@ -11,7 +11,7 @@
{% include "visiosoft.module.advs::list/partials/user-section" %}
<div class="row my-5">
<div class="row my-3">
<div class="col-md-3">
{% include "visiosoft.module.advs::list/partials/list-filter" %}
</div>
@ -25,7 +25,6 @@
</div>
<div class="col-md-6 my-2">
{% include "visiosoft.module.advs::list/partials/display-mode" %}
</div>
</div>
{{ addBlock('ads-list/row',{'topfields':topfields})|raw }}
@ -36,6 +35,8 @@
</div>
{% include "visiosoft.module.advs::list/partials/pagination" %}
{{ addBlock('ads-list/row-bottom')|raw }}
{# <div class="category-tabs"></div>#}
</div>
</div>

45
addons/default/visiosoft/advs-module/resources/views/list/partials/user-section.twig
View File

@ -1,30 +1,29 @@
{% if app.request.get('user') != null or app.request.get('user') != "" %}
{% set store = entries('store','store').where('user_id', user.id).first() %}
{% if store is null %}
{% set user = entries('store','user').where('user_id', user.id).first() %}
{% set store = user.store %}
{% if store %}
{% if store.store_banner is null %}
{% set background_image = img('visiosoft.module.advs::images/user_section_back.png').url %}
{% else %}
{% set background_image = store.store_banner.url %}
{% endif %}
{% if store is not null %}
{% if store.store_banner is null %}
{% set background_image = img('visiosoft.module.advs::images/user_section_back.png').url %}
{% else %}
{% set background_image = store.store_banner.url %}
{% endif %}
<div class="col-md-12 upper-list-banner" style="background-image: url('{{ background_image }}');">
<div class="row">
<div class="col-md-3 col-xs-3">
<div class="card m-4">
{% if store.file is null %}
<img src="{{ img('visiosoft.theme.base::images/no-image.png').url }}" class="card-img-top">
{% else %}
<img src="{{ store.file.url }}" class="card-img-top">
{% endif %}
<div class="card-body">
<h5 class="card-title text-center mb-0">{{ store.name }}</h5>
</div>
<div class="upper-list-banner" style="background-image: url('{{ background_image }}');">
<div class="row">
<div class="col-md-3 col-xs-3">
<div class="card m-4">
{% if store.file is null %}
<img src="{{ img('visiosoft.theme.base::images/no-image.png').url }}" class="card-img-top">
{% else %}
<img src="{{ store.file.url }}" class="card-img-top">
{% endif %}
<div class="card-body">
<h5 class="card-title text-center mb-0">{{ store.name }}</h5>
</div>
</div>
</div>
</div>
</div>
{% if store.user_id == auth_user().id %}
<div class="p-2 bg-secondary rounded my-2">
<a href="{{ url_route('store::edit', [store.slug, store.id]) }}" class="btn btn-primary text-light">Edit</a>
<a href="{{ url_route('store::add-user', [store.slug]) }}" class="btn btn-success text-light">Add Users</a>
</div>
{% endif %}
{% endif %}

1
addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
View File

@ -51,7 +51,6 @@ use Anomaly\Streams\Platform\Model\Customfields\CustomfieldsCustomFieldAdvsEntry
use Illuminate\Contracts\Events\Dispatcher;
use Visiosoft\QrcontactModule\Qr\QrModel;
use Visiosoft\StoreModule\Ad\AdModel;
use Visiosoft\StoreModule\User\UserModel;
class AdvsController extends PublicController

3
addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig
View File

@ -19,6 +19,9 @@
<div class="input-wrapper">
{{ form.fields.first_name.input|raw }}
{{ form.fields.username.setValue(random()).setAttributes({
'class' :'hidden',
}).input|raw }}
</div>
</div>
</div>

5
addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormBuilder.php
View File

@ -38,6 +38,7 @@ class Register2FormBuilder extends FormBuilder
* @var array
*/
protected $fields = [
'username',
'first_name' => [
'instructions' => false,
'required' => true,
@ -49,10 +50,10 @@ class Register2FormBuilder extends FormBuilder
'email' => [
'type' => 'anomaly.field_type.text',
'instructions' => false,
'rules' => [
'rules' => [
'valid_register',
],
'validators' => [
'validators' => [
'valid_register' => [
'message' => false,
'handler' => ValidateRegister::class,