Merge pull request #493 from openclassify/muhammet

removelang
This commit is contained in:
Fatih Alp 2020-04-17 13:10:52 +03:00 committed by GitHub
commit a1ed5e04ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 354 additions and 83 deletions

View File

@ -0,0 +1,74 @@
.left-categories-section .categories-list,
.left-categories-section .categories-list li ul {
list-style: none;
margin: 8px 2px 13px 0;
}
.left-categories-section .categories-list .categories-list-li {
padding: 6px 0 0 35px;
margin-top: 7px;
border-bottom: 1px solid #e6e6e6;
position: relative;
}
.left-categories-section .categories-list .categories-list-li img {
margin-left: -35px;
}
.left-categories-section .categories-list .categories-list-li .main-category {
font-weight: bold;
line-height: 20px;
}
.left-categories-section .categories-list .categories-list-li ul li {
margin-bottom: 5px;
line-height: 17px;
}
.left-categories-section .categories-list .categories-list-li .main-category,
.left-categories-section .categories-list .categories-list-li ul li a {
font: 13px "Lucida Grande", "LucidaGrande", Arial, sans-serif;
color: #039;
line-height: 17px;
text-decoration: none;
outline: 0;
margin: 0;
padding: 0;
background: no-repeat 0 0;
}
.left-categories-section .categories-list .categories-list-li ul .show-all {
margin-bottom: 14px;
}
.left-categories-section .categories-list .categories-list-li ul .show-all a {
cursor: pointer;
}
.left-categories-section .categories-list .categories-list-li .main-category:hover,
.left-categories-section .categories-list .categories-list-li ul li a:hover {
text-decoration: underline;
}
.left-categories-section .categories-list .categories-list-li ul li a i {
color: #5d6f86;
}
#footer .store_icon .playstore {
background: url("{{ img('visiosoft.theme.base::images/store_icon.png').url }}") top left no-repeat;
width: 96px;
height: 30px;
}
#footer .store_icon .appstore {
background: url("{{ img('visiosoft.theme.base::images/store_icon.png').url }}") top right no-repeat;
width: 96px;
height: 30px;
}
@media (min-width: 577px) {
.left-categories-section .categories-list .categories-list-li img {
width: 26px;
margin-right: 5px;
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 403 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 75 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 981 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 345 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@ -2,10 +2,41 @@
return [
'post_ad' => [
'name' => 'Post Ad',
'name' => 'Post Free Ad*',
'footer' => 'Post Ad',
],
'login' => 'Login',
'register' => 'Register',
'continue' => 'Continue',
'reset_password' => 'Reset Password',
'register' => [
'name' => 'Sign Up',
],
'login' => [
'name' => 'Sign In',
],
'my_ads' => [
'name' => 'My Ads',
],
'my_account' => [
'name' => 'My Account',
],
'logout' => [
'name' => 'Logout',
],
'show_all' => 'Show All',
'close' => 'Close',
'hidden' => [
'name' => 'Hide',
],
'search' => [
'name' => 'Search',
],
'showcase' => [
'name' => 'Showcase',
],
'categories' => [
'name' => 'Categories',
],
'save_category' => 'Save Category',
'edit' => 'Edit',
'update_profile' => 'Update Profile',
];

View File

@ -38,5 +38,11 @@ return [
'create_new_password' => 'Create New Password',
// Login page
'or' => 'or'
'or' => 'or',
// Side menu links
'company_directory' => 'Company directory',
'popular_ads' => 'Popular Ads',
'last_48_hours' => 'Last 48 Hours',
'secure_e-commerce_ads' => 'Secure e-Commerce Ads',
];

View File

@ -2,10 +2,42 @@
return [
'post_ad' => [
'name' => 'Ücretsiz İlan Ver',
'name' => 'İlan ver*',
'footer' => 'İlan ver',
],
'login' => 'Giriş Yap',
'register' => 'Üye Ol',
'continue' => 'Devam',
'reset_password' => 'Şifremi Güncelle',
'register' => [
'name' => 'Üye kayıt',
],
'login' => [
'name' => 'Üye Girişi',
],
'my_ads' => [
'name' => 'İlanlarım',
],
'my_account' => [
'name' => 'Hesabım',
],
'logout' => [
'name' => ıkış',
],
'show_all' => 'Hepsini göster',
'close' => 'Kapat',
'hidden' => [
'name' => 'Gizle',
],
'search' => [
'name' => 'Arama',
],
'showcase' => [
'name' => 'Vitrin',
],
'categories' => [
'name' => 'Kategoriler',
],
'save_category' => 'Kategoriyi Uygula',
'edit' => 'Düzenle',
'update_profile' => 'Bilgilerimi Güncelle',
];

View File

@ -38,5 +38,10 @@ return [
'create_new_password' => 'Yeni Şifre Oluştur',
// Login page
'or' => 'veya'
'or' => 'veya',
'company_directory' => 'Şirket yöneticisi',
'popular_ads' => 'Popüler İlanlar',
'last_48_hours' => 'Son 48 Saat',
'secure_e-commerce_ads' => 'Güvenli e-Ticaret İlanları',
];

View File

@ -1,65 +1,78 @@
<div class="home-container">
{{ addBlock('index_top')|raw }}
<div class="album bg-light">
<div class="row p-2">
{% if setting_value('visiosoft.theme.base::latest_and_view_all_btn') %}
<div class="col-md-6">
<h4 class="p-2">{{ trans('theme::field.latest_ads') }}</h4>
</div>
<div class="col-md-6 text-right">
<a class="btn btn-outline-secondary"
href="{{ url_route('visiosoft.module.advs::list') }}">{{ trans('theme::field.show_all') }}</a>
</div>
{% endif %}
</div>
<div class="container">
<div class="row">
{% for latestAd in latestAds() %}
<div class="col-sm-6 col-md-4 col-lg-3 d-flex align-items-stretch">
<div class="card mb-4 box-shadow">
<div class="row p-2" style="min-height: 150px;">
<a href="{{ latestAd.detail_url }}">
<div class="col-md-12 justify-content-center align-self-center">
<img class="card-img-top img-fluid img-thumbnail" src="{{ latestAd.cover_photo }}"
style="height: 150px">
</div>
</a>
<div class="row">
<div class="col-md-4">{% include "visiosoft.theme.base::partials/categories" %}</div>
<div class="col-md-8"><div class="album bg-light">
<div class="row p-2">
{% if setting_value('visiosoft.theme.base::latest_and_view_all_btn') %}
<div class="col-md-6">
<h4 class="p-2">{{ trans('theme::field.latest_ads') }}</h4>
</div>
<div class="card-body">
{% if setting_value('visiosoft.theme.base::price_fields') %}
<div class="d-flex justify-content-between align-items-center">
<b>{{ latestAd.price }} {{ latestAd.currency }}</b>
</div>
{% endif %}
<div class="d-flex justify-content-between align-items-center text-truncate">
<a href="{{ latestAd.detail_url }}">
<p class="card-title d-inline-block">{{ latestAd.name }}</p>
</a>
</div>
{% if setting_value('visiosoft.module.location::home_page_location') %}
<div class="d-flex justify-content-between align-items-center">
<small>
<i class="fas fa-location-arrow text-primary"></i>
{{ latestAd.city_name }}, {{ latestAd.country_name }}
</small>
</div>
{% endif %}
{% if setting_value('visiosoft.theme.base::date_fields') %}
<div class="d-flex justify-content-between align-items-center">
<small>
<i class="far fa-clock text-dark"></i>
{{ latestAd.created_at|date('d/m/Y') }}
</small>
</div>
{% endif %}
<div class="col-md-6 text-right">
<a class="btn btn-outline-secondary"
href="{{ url_route('visiosoft.module.advs::list') }}">{{ trans('theme::field.show_all') }}</a>
</div>
</div>
{% endif %}
</div>
{% endfor %}
</div>
<div class="row list-classified-home">
{% for latestAd in latestAds() %}
<div class="col-sm-6 col-md-4 col-lg-3 d-flex align-items-stretch">
<div class="card mb-4 box-shadow">
<div class="row p-2" style="min-height: 150px;">
<a href="{{ latestAd.detail_url }}">
<div class="col-md-12 justify-content-center align-self-center">
<img class="card-img-top img-fluid img-thumbnail" src="{{ latestAd.cover_photo }}"
style="height: 150px">
</div>
</a>
</div>
<div class="card-body">
{% if setting_value('visiosoft.theme.base::price_fields') %}
<div class="d-flex justify-content-between align-items-center">
<b>{{ latestAd.price }} {{ latestAd.currency }}</b>
</div>
{% endif %}
<div class="d-flex justify-content-between align-items-center text-truncate">
<a href="{{ latestAd.detail_url }}">
<p class="card-title d-inline-block">{{ latestAd.name }}</p>
</a>
</div>
{% if setting_value('visiosoft.module.location::home_page_location') %}
<div class="d-flex justify-content-between align-items-center">
<small>
<i class="fas fa-location-arrow text-primary"></i>
{{ latestAd.city_name }}, {{ latestAd.country_name }}
</small>
</div>
{% endif %}
{% if setting_value('visiosoft.theme.base::date_fields') %}
<div class="d-flex justify-content-between align-items-center">
<small>
<i class="far fa-clock text-dark"></i>
{{ latestAd.created_at|date('d/m/Y') }}
</small>
</div>
{% endif %}
</div>
</div>
</div>
{% endfor %}
</div>
</div></div>
</div>
</div>
{{ addBlock('index')|raw }}
</div>

View File

@ -0,0 +1,23 @@
{% set sub_categories_limit = setting_value('visiosoft.theme.base::home_page_sub_categories_limit') %}
<ul class="categories-list px-0 mr-2 d-block d-sm-none">
<li class="categories-list-li category-icon text-truncate category-{{ main_category.slug }}">
<a href="{{ url_route('visiosoft.module.advs::list') }}?cat={{ main_category.id }}"
class="main-category">
{% if main_category.icon.path != "" %}
<img src="{{ url('files/' ~ main_category.icon.path) }}" alt="{{ main_category.name }}"
class="img-responsive">
{% else %}
<img src="{{ img('visiosoft.theme.base::images/default-categories-icon.png').url }}" alt="{{ main_category.name }}"
class="img-responsive">
{% endif %}
<font>{{ main_category.name }}</font>
<p class="p-0 sub-categories">
{% set sub_categories = entries('cats','category').where('parent_category_id', main_category.id).where('deleted_at', null).orderBy('sort_order').get() %}
{% for sub_category in sub_categories|slice(0,sub_categories_limit) %}
{{ sub_category.name }},
{% endfor %}
</p>
</a>
</li>
</ul>

View File

@ -0,0 +1,40 @@
{% set sub_categories_limit = setting_value('visiosoft.theme.base::home_page_sub_categories_limit') %}
<ul class="categories-list p-0 d-none d-sm-block">
<li class="categories-list-li category-icon category-{{ main_category.slug }}">
{% if main_category.icon.path != "" %}
<img src="{{ url('files/' ~ main_category.icon.path) }}" alt="{{ main_category.name }}"
class="img-responsive">
{% else %}
<img src="{{ img('visiosoft.theme.base::images/default-categories-icon.png').url }}"
alt="{{ main_category.name }}"
class="img-responsive">
{% endif %}
<a href="{{ url_route('visiosoft.module.advs::list') }}?cat={{ main_category.id }}"
class="main-category">
<b>{{ main_category.name }}</b>
</a>
<ul class="p-0" style="">
{% set sub_categories = entries('cats','category').where('parent_category_id', main_category.id).where('deleted_at', null).orderBy('sort_order').get() %}
{% for sub_category in sub_categories|slice(0,sub_categories_limit) %}
<li>
<a href="{{ url_route('visiosoft.module.advs::list') }}?cat={{ sub_category.id }}"
class="">{{ sub_category.name }}</a>
</li>
{% endfor %}
{% for sub_category in sub_categories|slice(sub_categories_limit,count(sub_categories)) %}
<li class="hidden hidden-category">
<a href="{{ url_route('visiosoft.module.advs::list') }}?cat={{ sub_category.id }}"
class="">{{ sub_category.name }}</a>
</li>
{% endfor %}
{% if count(sub_categories) > sub_categories_limit %}
<li class="show-all">
<a>
{{ trans('visiosoft.theme.base::button.show_all') }}
<i class="fas fa-arrow-circle-down"></i>
</a>
</li>
{% endif %}
</ul>
</li>
</ul>

View File

@ -0,0 +1,50 @@
<div class="col left-categories-section mx-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>s
</li>
<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">
<a href="{{ url_route('visiosoft.module.advs::list') }}?sort_by=popular" class="main-category">
<span class="text-dark">
{{ trans('visiosoft.theme.base::field.popular_ads') }}
</span>
</a>
</li>
<li class="categories-list-li category-icon border-bottom-0 mt-0">
<img src="{{ img('visiosoft.theme.base::images/last-48-hours.png').url }}" class="img-responsive">
<a href="{{ url_route('visiosoft.module.advs::list') }}?date=two_days" class="main-category">
<span class="text-dark">
{{ trans('visiosoft.theme.base::field.last_48_hours') }}
</span>
</a>
</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>
</ul>
{{ addBlock('base/categoriesRow')|raw }}
<div class="col-12 p-0 m-0">
{% set main_categories = entries('cats','category').where('parent_category_id', null).where('deleted_at', null).orderBy('sort_order').get() %}
{% for main_category in main_categories %}
{% include "visiosoft.theme.base::partials/categories-web" %}
{% include "visiosoft.theme.base::partials/categories-mobile" %}
{% endfor %}
</div>
<div class="col-12 p-0 m-0 d-none d-sm-block">
{{ setting_value('visiosoft.theme.base::home_bottom_left_categories')|raw }}
</div>
</div>

View File

@ -13,6 +13,7 @@
{#{{ favicons("theme::img/favicon.png") }}#}
{# Base Theme Components #}
{{ asset_add("theme.css", "visiosoft.theme.base::css/base.css") }}
{{ asset_add("theme.css", "visiosoft.theme.base::css/bootstrap.min.css") }}
{{ asset_add("theme.css", "visiosoft.theme.base::css/theme.css") }}
{{ asset_add("theme.css", "visiosoft.theme.base::css/select2.css") }}

View File

@ -26,19 +26,15 @@
{% if setting_value('visiosoft.theme.base::navigation_action') %}
<ul class="nav navbar-nav navbar-right d-block d-sm-none">
{{ addBlock('navigationLinks')|raw }}
<li class="nav-item">
{% if auth_check() %}
<a class="nav-link"
href="{{ url_route('anomaly.module.users::logout') }}">{{ trans('visiosoft.theme.base::field.logout.name') }}</a>
<a class="nav-link" href="{{ url_route('anomaly.module.users::logout') }}">{{ trans('visiosoft.theme.users::field.logout.name') }}</a>
{% else %}
<a class="nav-link"
href="{{ url_route('anomaly.module.users::login') }}">{{ trans('visiosoft.theme.base::field.login.name') }}</a>
<a class="nav-link" href="{{ url_route('anomaly.module.users::login') }}">{{ trans('visiosoft.theme.users::field.login.name') }}</a>
{% endif %}
</li>
<li class="nav-item">
<a class="nav-link"
href="{{ url_route('profile::profile') }}">{{ trans('visiosoft.theme.base::field.profile') }}</a>
<a class="nav-link" href="{{ url_route('profile::profile') }}">{{ trans('visiosoft.theme.base::field.profile') }}</a>
</li>
<li class="nav-item">
<a href="/advs/create_adv" class="btn btn-primary">{{ trans("theme::button.post_ad.name") }}</a>
@ -49,19 +45,15 @@
<div class="d-none d-sm-block">
{% if setting_value('visiosoft.theme.base::navigation_action') %}
<ul class="nav navbar-nav navbar-right">
{{ addBlock('navigationLinks')|raw }}
<li class="nav-item">
{% if auth_check() %}
<a class="nav-link"
href="{{ url_route('anomaly.module.users::logout') }}">{{ trans('visiosoft.theme.base::field.logout.name') }}</a>
<a class="nav-link" href="{{ url_route('anomaly.module.users::logout') }}">{{ trans('visiosoft.theme.base::field.logout.name') }}</a>
{% else %}
<a class="nav-link"
href="{{ url_route('anomaly.module.users::login') }}">{{ trans('visiosoft.theme.base::field.login.name') }}</a>
<a class="nav-link" href="{{ url_route('anomaly.module.users::login') }}">{{ trans('visiosoft.theme.base::field.login.name') }}</a>
{% endif %}
</li>
<li class="nav-item">
<a class="nav-link"
href="{{ url_route('profile::profile') }}">{{ trans('visiosoft.theme.base::field.profile') }}</a>
<a class="nav-link" href="{{ url_route('profile::profile') }}">{{ trans('visiosoft.theme.base::field.profile') }}</a>
</li>
<li class="nav-item">
<a href="/advs/create_adv" class="btn btn-primary">{{ trans("theme::button.post_ad.name") }}</a>

View File

@ -119,6 +119,10 @@ class BaseThemeServiceProvider extends AddonServiceProvider
protected $overrides = [
//'streams::errors/404' => 'module::errors/404',
//'streams::errors/500' => 'module::errors/500',
'anomaly.module.users::login' => 'visiosoft.theme.base::addons/anomaly/users-module/login',
'anomaly.module.users::register' => 'visiosoft.theme.base::addons/anomaly/users-module/register',
'anomaly.module.users::password/forgot' => 'visiosoft.theme.base::addons/anomaly/users-module/password/forgot',
'anomaly.module.users::password/reset' => 'visiosoft.theme.base::addons/anomaly/users-module/password/reset',
];
/**