Merge branch 'velocity-1' of https://github.com/shubhwebkul/bagisto into prateek-latest1
This commit is contained in:
prateek srivastava
commit
7cfd51173f
|
|
@ -116,7 +116,7 @@
|
|||
data: function() {
|
||||
return {
|
||||
attributes: @json($filterAttributes),
|
||||
|
||||
|
||||
appliedFilters: {}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,28 +1,29 @@
|
|||
{
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "npm run development",
|
||||
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
|
||||
"watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
|
||||
"watch-poll": "npm run watch -- --watch-poll",
|
||||
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
|
||||
"prod": "npm run production",
|
||||
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
|
||||
},
|
||||
"devDependencies": {
|
||||
"axios": "^0.18",
|
||||
"cross-env": "^5.1.4",
|
||||
"laravel-mix": "^2.1",
|
||||
"laravel-mix-merge-manifest": "^0.1.1",
|
||||
"jquery": "^3.2",
|
||||
"vue": "^2.1.10",
|
||||
"vue-carousel": "^0.18.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"bootstrap-sass": "^3.4.1",
|
||||
"font-awesome": "^4.7.0",
|
||||
"material-icons": "^0.3.1",
|
||||
"vee-validate": "2.0.0-rc.26",
|
||||
"vue-toast-notification": "0.0.2"
|
||||
}
|
||||
"private": true,
|
||||
"scripts": {
|
||||
"dev": "npm run development",
|
||||
"development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
|
||||
"watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
|
||||
"watch-poll": "npm run watch -- --watch-poll",
|
||||
"hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
|
||||
"prod": "npm run production",
|
||||
"production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
|
||||
},
|
||||
"devDependencies": {
|
||||
"axios": "^0.18",
|
||||
"cross-env": "^5.1.4",
|
||||
"jquery": "^3.2",
|
||||
"laravel-mix": "^2.1",
|
||||
"laravel-mix-merge-manifest": "^0.1.1",
|
||||
"vue": "^2.1.10",
|
||||
"vue-carousel": "^0.18.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"bootstrap-sass": "^3.4.1",
|
||||
"font-awesome": "^4.7.0",
|
||||
"material-icons": "^0.3.1",
|
||||
"vee-validate": "2.0.0-rc.26",
|
||||
"vue-slider-component": "^3.1.0",
|
||||
"vue-toast-notification": "0.0.2"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -981,7 +981,6 @@
|
|||
|
||||
#product-card-new {
|
||||
border: none;
|
||||
height: 95%;
|
||||
margin: 0 5px 10px 10px;
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
|
|
@ -1770,9 +1769,13 @@
|
|||
}
|
||||
|
||||
.method-sticker {
|
||||
background-color: grey;
|
||||
display: block;
|
||||
color: white;
|
||||
font-size: 13px;
|
||||
padding: 4px 8px;
|
||||
text-align: center;
|
||||
border-radius: 1px;
|
||||
display: inline-block;
|
||||
color: #cfcfd0;
|
||||
background-color: #141516;
|
||||
}
|
||||
|
||||
#sidebar .category-content {
|
||||
|
|
@ -1785,6 +1788,10 @@
|
|||
position: relative;
|
||||
}
|
||||
|
||||
#sidebar li:hover {
|
||||
color: #4D7EA8;
|
||||
}
|
||||
|
||||
.grouped-product-container .grouped-product-list {
|
||||
padding: 15px 0;
|
||||
border-top: solid 1px rgba(162, 162, 162, 0.2);
|
||||
|
|
@ -1991,6 +1998,10 @@
|
|||
margin-top: 3px;
|
||||
}
|
||||
|
||||
.category-container {
|
||||
padding: 40px 15px !important;
|
||||
}
|
||||
|
||||
.category-container .hero-image {
|
||||
height: 100%;
|
||||
max-width: 500px;
|
||||
|
|
@ -2003,6 +2014,81 @@
|
|||
height: 100%;
|
||||
}
|
||||
|
||||
.vue-slider .vue-slider-rail {
|
||||
background-color: #ccc;
|
||||
}
|
||||
|
||||
.vue-slider .vue-slider-dot-handle {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
border-radius: 50%;
|
||||
background-color: #FFFFFF;
|
||||
-webkit-box-shadow: 0.5px 0.5px 2px 1px rgba(0, 0, 0, 0.32);
|
||||
box-shadow: 0.5px 0.5px 2px 1px rgba(0, 0, 0, 0.32);
|
||||
}
|
||||
|
||||
.vue-slider .vue-slider-dot-tooltip-inner {
|
||||
border-color: #26A37C !important;
|
||||
background-color: #26A37C !important;
|
||||
}
|
||||
|
||||
.vue-slider .vue-slider-dot-tooltip-text {
|
||||
display: block;
|
||||
font-size: 14px;
|
||||
min-width: 20px;
|
||||
padding: 2px 5px;
|
||||
text-align: center;
|
||||
border-radius: 5px;
|
||||
white-space: nowrap;
|
||||
color: #FFFFFF;
|
||||
border-color: #26A37C !important;
|
||||
background-color: #26A37C !important;
|
||||
}
|
||||
|
||||
.vue-slider .vue-slider-dot-tooltip-text::before {
|
||||
content: "";
|
||||
position: absolute;
|
||||
bottom: -10px;
|
||||
left: 50%;
|
||||
width: 0;
|
||||
height: 0;
|
||||
border: 5px solid transparent;
|
||||
border: 6px solid transparent\0;
|
||||
border-top-color: inherit;
|
||||
-webkit-transform: translate(-50%);
|
||||
transform: translate(-50%);
|
||||
}
|
||||
|
||||
.vue-slider .vue-slider-process {
|
||||
background-color: #26A37C !important;
|
||||
}
|
||||
|
||||
.full-content-wrapper > .container-fluid {
|
||||
margin-bottom: 60px;
|
||||
padding: 0 !important;
|
||||
}
|
||||
|
||||
.full-content-wrapper > .container-fluid > .row {
|
||||
padding: 0 15px !important;
|
||||
}
|
||||
|
||||
.slides-container .VueCarousel-pagination {
|
||||
bottom: 10px;
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
.slides-container .VueCarousel-pagination button {
|
||||
width: 15px !important;
|
||||
height: 15px !important;
|
||||
}
|
||||
|
||||
.slides-container .VueCarousel-pagination button:focus,
|
||||
.slides-container .VueCarousel-pagination button:active {
|
||||
outline: none;
|
||||
-webkit-box-shadow: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
|
||||
/* @author Shubham Mehrotra */
|
||||
body {
|
||||
overflow-x: hidden;
|
||||
|
|
@ -2195,10 +2281,6 @@ header #search-form > *:focus {
|
|||
font-size: 14px;
|
||||
}
|
||||
|
||||
.container > .container-fluid {
|
||||
margin-bottom: 60px;
|
||||
}
|
||||
|
||||
/* advertisement-one */
|
||||
.advertisement-one .offers-lt-panel {
|
||||
height: 400px;
|
||||
|
|
@ -2605,6 +2687,12 @@ body::after {
|
|||
max-width: 1440px !important;
|
||||
}
|
||||
|
||||
.remove-padding-margin {
|
||||
width: 100% !important;
|
||||
margin: 0px !important;
|
||||
padding: 0px !important;
|
||||
}
|
||||
|
||||
.footer {
|
||||
width: 100%;
|
||||
background-color: #ffffff;
|
||||
|
|
@ -2877,6 +2965,10 @@ body::after {
|
|||
padding-top: 20px !important;
|
||||
}
|
||||
|
||||
.pt42 {
|
||||
padding-top: 42px !important;
|
||||
}
|
||||
|
||||
.pl0 {
|
||||
padding-left: 0px !important;
|
||||
}
|
||||
|
|
@ -2901,7 +2993,7 @@ body::after {
|
|||
padding-left: 40px !important;
|
||||
}
|
||||
|
||||
.pr0, .container > .container-fluid > .row {
|
||||
.pr0 {
|
||||
padding-right: 0px !important;
|
||||
}
|
||||
|
||||
|
|
@ -3080,7 +3172,6 @@ body::after {
|
|||
.theme-btn, .cart-details .continue-shopping-btn, .account-content .account-layout .bottom-toolbar .pagination .page-item {
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
border-radius: 2px;
|
||||
padding: 10px 20px;
|
||||
vertical-align: top;
|
||||
color: #FFFFFF !important;
|
||||
|
|
@ -3479,6 +3570,21 @@ button[disabled] {
|
|||
margin: 0 auto !important;
|
||||
}
|
||||
|
||||
.styled-select {
|
||||
appearance: none;
|
||||
-moz-appearance: none;
|
||||
/* Firefox */
|
||||
-webkit-appearance: none;
|
||||
/* Safari and Chrome */
|
||||
}
|
||||
|
||||
.select-icon {
|
||||
top: 1px;
|
||||
left: -7px;
|
||||
font-size: 16px;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.product-view {
|
||||
padding: 20px;
|
||||
}
|
||||
|
|
@ -11966,16 +12072,46 @@ header #search-form {
|
|||
background: #FFFFFF;
|
||||
}
|
||||
|
||||
header #search-form select {
|
||||
header #search-form .selectdiv {
|
||||
width: 30%;
|
||||
font-family: 'Webkul Rango' !important;
|
||||
speak: none;
|
||||
font-style: normal;
|
||||
font-weight: normal;
|
||||
font-variant: normal;
|
||||
text-transform: none;
|
||||
line-height: 1;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
}
|
||||
|
||||
header #search-form .selectdiv:before {
|
||||
top: 13px;
|
||||
left: 160px;
|
||||
z-index: 10;
|
||||
font-size: 16px;
|
||||
content: "\E906";
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
header #search-form select {
|
||||
border-radius: 0px;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
cursor: pointer;
|
||||
border: 1px solid #269c77;
|
||||
border-right: none;
|
||||
border-radius: 0px;
|
||||
border: 1px solid #26A37C;
|
||||
font-family: "Source Sans Pro", sans-serif;
|
||||
-webkit-appearance: none;
|
||||
-moz-appearance: none;
|
||||
appearance: none;
|
||||
}
|
||||
|
||||
header #search-form select::-ms-expand {
|
||||
display: none;
|
||||
}
|
||||
|
||||
header #search-form input {
|
||||
border-radius: 0px;
|
||||
width: 70%;
|
||||
height: 100%;
|
||||
font-size: 14px;
|
||||
|
|
@ -11984,8 +12120,7 @@ header #search-form input {
|
|||
border-left: none;
|
||||
line-height: 20px;
|
||||
letter-spacing: 0;
|
||||
border: 1px solid #269c77;
|
||||
border-radius: 0px;
|
||||
border: 1px solid #26A37C;
|
||||
}
|
||||
|
||||
header #search-form .btn, header #search-form .quantity button, .quantity header #search-form button,
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -29,7 +29,7 @@ return [
|
|||
]
|
||||
], [
|
||||
'name' => 'featured_product',
|
||||
'title' => 'velocity::app.admin.system.general.featured-product',
|
||||
'title' => 'shop::app.home.featured-products',
|
||||
'type' => 'text',
|
||||
]
|
||||
]
|
||||
|
|
|
|||
|
|
@ -15,13 +15,13 @@ class CreateVelocityMetaData extends Migration
|
|||
{
|
||||
Schema::create('velocity_meta_data', function (Blueprint $table) {
|
||||
$table->increments('id');
|
||||
|
||||
$table->text('home_page_content');
|
||||
$table->text('footer_left_content');
|
||||
$table->text('footer_middle_content');
|
||||
$table->boolean('slider')->default(0);
|
||||
$table->json('advertisement')->nullable();
|
||||
$table->integer('sidebar_category_count')->default(9);
|
||||
$table->text('subscription_bar_content')->nullable();
|
||||
|
||||
$table->timestamps();
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -104,8 +104,10 @@ class Helper extends Review
|
|||
|
||||
foreach ($totalData['categories'] as $categories) {
|
||||
foreach($categories['translations'] as $catName) {
|
||||
$brandData[$brand->admin_name][] = $catName['name'];
|
||||
$categoryName[] = $catName['name'];
|
||||
if (isset($brand->admin_name)) {
|
||||
$brandData[$brand->admin_name][] = $catName['name'];
|
||||
$categoryName[] = $catName['name'];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
namespace Webkul\Velocity\Http\Controllers\Admin;
|
||||
|
||||
use DB;
|
||||
use Illuminate\Support\Facades\Storage;
|
||||
use Webkul\Velocity\Repositories\MetadataRepository;
|
||||
use Webkul\Velocity\Repositories\VelocityMetadataRepository;
|
||||
|
||||
|
|
@ -48,6 +49,7 @@ class ConfigurationController extends Controller
|
|||
|
||||
public function storeMetaData($id)
|
||||
{
|
||||
// check if radio button value
|
||||
if (request()->get('slides') == "on") {
|
||||
$params = request()->all() + [
|
||||
'slider' => 1
|
||||
|
|
@ -58,12 +60,43 @@ class ConfigurationController extends Controller
|
|||
];
|
||||
}
|
||||
|
||||
$params['advertisement'] = [];
|
||||
|
||||
foreach ($params['images'] as $index => $advertisement) {
|
||||
if ($advertisement['image_1'] !== "") {
|
||||
$params['advertisement'][$index] = $this->uploadImages($advertisement, $index);
|
||||
}
|
||||
}
|
||||
|
||||
$params['advertisement'] = json_encode($params['advertisement']);
|
||||
|
||||
unset($params['images']);
|
||||
unset($params['slides']);
|
||||
|
||||
// update row
|
||||
$product = $this->velocityMetaDataRepository->update($params, $id);
|
||||
|
||||
session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Velocity Theme']));
|
||||
|
||||
return redirect()->route($this->_config['redirect']);
|
||||
}
|
||||
|
||||
public function uploadImages($data, $index)
|
||||
{
|
||||
$type = 'images';
|
||||
$request = request();
|
||||
|
||||
foreach ($data as $imageId => $image) {
|
||||
$file = $type . '.' . $index . '.' . $imageId;
|
||||
$dir = "velocity/$type";
|
||||
|
||||
if ($request->hasFile($file)) {
|
||||
Storage::delete($dir . $file);
|
||||
|
||||
$advertisement[$imageId] = $request->file($file)->store($dir);
|
||||
}
|
||||
}
|
||||
|
||||
return $advertisement;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<div class="row">
|
||||
<div class="main-category fs20 pt10 col-2 pl30 unselectable">
|
||||
<div class="row col-12 remove-padding-margin">
|
||||
<div class="main-category fs20 pt10 col-2 unselectable">
|
||||
<i
|
||||
:class="`rango-view-list ${isEnabled == '0' ? '' : 'cursor-pointer'} align-vertical-top`"
|
||||
@click="(isEnabled == '0') ? '' : toggleSidebar()">
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
<template>
|
||||
<!-- categories list -->
|
||||
<nav
|
||||
:class="`${addClass ? addClass : ''}`"
|
||||
id="sidebar"
|
||||
:class="`${addClass ? addClass : ''}`"
|
||||
v-if="slicedCategories && slicedCategories.length > 0">
|
||||
|
||||
<ul type="none" class="pl15">
|
||||
<ul type="none">
|
||||
<li
|
||||
:key="index"
|
||||
class="category-content"
|
||||
|
|
@ -42,13 +42,22 @@
|
|||
|
||||
<script type="text/javascript">
|
||||
export default {
|
||||
props: ['categories', 'url', 'addClass', 'mainSidebar'],
|
||||
props: [
|
||||
'url',
|
||||
'addClass',
|
||||
'categories',
|
||||
'mainSidebar',
|
||||
'categoryCount'
|
||||
],
|
||||
|
||||
data: function () {
|
||||
let slicedCategories = this.categories;
|
||||
let categoryCount = this.categoryCount ? this.categoryCount : 9;
|
||||
|
||||
if (slicedCategories && slicedCategories.length > 9) {
|
||||
slicedCategories = this.categories.slice(0, 9);
|
||||
if (slicedCategories
|
||||
&& slicedCategories.length > categoryCount
|
||||
) {
|
||||
slicedCategories = this.categories.slice(0, categoryCount);
|
||||
}
|
||||
|
||||
return {
|
||||
|
|
@ -57,7 +66,14 @@
|
|||
},
|
||||
|
||||
mounted: function () {
|
||||
let checkLocale = window.location.href.slice(0, `${this.url}/?locale=`.length);
|
||||
let checkCurrency = window.location.href.slice(0, `${this.url}/?currency=`.length);
|
||||
|
||||
if (
|
||||
checkLocale == `${this.url}/?locale=`
|
||||
|| checkCurrency == `${this.url}/?currency=`
|
||||
) {
|
||||
} else if (
|
||||
(window.location.href !== `${this.url}/` && this.mainSidebar)
|
||||
|| (this.categories && this.categories.length == 0)
|
||||
) {
|
||||
|
|
|
|||
|
|
@ -18,10 +18,11 @@ window.Vue = Vue;
|
|||
window.Carousel = VueCarousel;
|
||||
|
||||
// UI components
|
||||
Vue.component("vue-slider", require("vue-slider-component"));
|
||||
Vue.component('modal-component', require('./UI/components/modal'));
|
||||
Vue.component('carousel-component', require('./UI/components/carousel'));
|
||||
Vue.component('quantity-btn', require('./UI/components/quantity-btn'));
|
||||
Vue.component('sidebar-component', require('./UI/components/sidebar'));
|
||||
Vue.component('carousel-component', require('./UI/components/carousel'));
|
||||
Vue.component('child-sidebar', require('./UI/components/child-sidebar'));
|
||||
Vue.component('card-list-content', require('./UI/components/card-list'));
|
||||
Vue.component('card-list-header', require('./UI/components/card-header'));
|
||||
|
|
@ -96,7 +97,21 @@ $(document).ready(function () {
|
|||
modal.classList.add('hide');
|
||||
});
|
||||
|
||||
})
|
||||
});
|
||||
},
|
||||
|
||||
mounted: function () {
|
||||
let sliderContainer = $('.slides-container');
|
||||
if (sliderContainer && sliderContainer.length) {
|
||||
sliderContainer = sliderContainer[0];
|
||||
|
||||
console.log(sliderContainer);
|
||||
|
||||
// setInterval(() => {
|
||||
// debugger
|
||||
// sliderContainer.scrollTo(500, 0);
|
||||
// }, 1000);
|
||||
}
|
||||
},
|
||||
|
||||
methods: {
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@ $theme-color: #26A37C;
|
|||
$btn-text-color: #FFFFFF;
|
||||
$light-color: #FFFFFF;
|
||||
$dark-color: #000000;
|
||||
$light1-black: #141516;
|
||||
$light2-black: #cfcfd0;
|
||||
$link-color: #4D7EA8;
|
||||
$grey-clr: rgba(0,0,0,0.53);
|
||||
$light-grey-clr: rgb(158, 158, 158);
|
||||
|
|
|
|||
|
|
@ -304,16 +304,49 @@ header {
|
|||
margin: 5px 0px;
|
||||
background: $white-color;
|
||||
|
||||
select {
|
||||
.selectdiv {
|
||||
width: 30%;
|
||||
font-family: 'Webkul Rango' !important;
|
||||
speak: none;
|
||||
font-style: normal;
|
||||
font-weight: normal;
|
||||
font-variant: normal;
|
||||
text-transform: none;
|
||||
line-height: 1;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
}
|
||||
|
||||
.selectdiv:before {
|
||||
top: 13px;
|
||||
left: 160px;
|
||||
z-index: 10;
|
||||
font-size: 16px;
|
||||
content: "\E906";
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
select {
|
||||
@include border-radius(0px);
|
||||
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
cursor: pointer;
|
||||
border: 1px solid #269c77;
|
||||
border-right: none;
|
||||
@include border-radius(0px);
|
||||
border: 1px solid $theme-color;
|
||||
font-family:"Source Sans Pro", sans-serif;
|
||||
|
||||
-webkit-appearance: none;
|
||||
-moz-appearance: none;
|
||||
appearance: none;
|
||||
}
|
||||
|
||||
select::-ms-expand {
|
||||
display: none;
|
||||
}
|
||||
|
||||
input {
|
||||
@include border-radius(0px);
|
||||
|
||||
width: 70%;
|
||||
height: 100%;
|
||||
font-size: 14px;
|
||||
|
|
@ -322,8 +355,7 @@ header {
|
|||
border-left: none;
|
||||
line-height: 20px;
|
||||
letter-spacing: 0;
|
||||
border: 1px solid #269c77;
|
||||
@include border-radius(0px);
|
||||
border: 1px solid $theme-color;
|
||||
}
|
||||
.btn {
|
||||
height: 40px;
|
||||
|
|
|
|||
|
|
@ -205,7 +205,6 @@
|
|||
|
||||
#product-card-new {
|
||||
border: none;
|
||||
height: 95%;
|
||||
margin: 0 5px 10px 10px;
|
||||
padding-bottom: 10px;
|
||||
|
||||
|
|
@ -1070,12 +1069,12 @@
|
|||
|
||||
.method-sticker {
|
||||
font-size: 13px;
|
||||
color: #919192;
|
||||
padding: 4px 8px;
|
||||
text-align: center;
|
||||
border-radius: 1px;
|
||||
display: inline-block;
|
||||
background-color: $grey-clr;
|
||||
color: $light2-black;
|
||||
background-color: $light1-black;
|
||||
}
|
||||
|
||||
#sidebar {
|
||||
|
|
@ -1089,6 +1088,11 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
#sidebar {
|
||||
li:hover {
|
||||
color: $link-color;
|
||||
}
|
||||
}
|
||||
|
||||
.grouped-product-container {
|
||||
.grouped-product-list {
|
||||
|
|
@ -1383,4 +1387,33 @@
|
|||
.vue-slider-process {
|
||||
background-color: $theme-color !important;
|
||||
}
|
||||
}
|
||||
|
||||
.full-content-wrapper {
|
||||
> .container-fluid {
|
||||
margin-bottom: 60px;
|
||||
padding: 0 !important;
|
||||
|
||||
> .row {
|
||||
padding: 0 15px !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.slides-container {
|
||||
.VueCarousel-pagination {
|
||||
bottom: 10px;
|
||||
position: absolute;
|
||||
|
||||
button {
|
||||
width: 15px !important;
|
||||
height: 15px !important;
|
||||
}
|
||||
|
||||
button:focus,
|
||||
button:active, {
|
||||
outline: none;
|
||||
box-shadow: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -197,16 +197,6 @@ header #search-form > *:focus {
|
|||
font-size: 14px;
|
||||
}
|
||||
|
||||
.container {
|
||||
> .container-fluid {
|
||||
margin-bottom: 60px;
|
||||
|
||||
> .row {
|
||||
@extend .pr0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* advertisement-one */
|
||||
.advertisement-one {
|
||||
.offers-lt-panel {
|
||||
|
|
@ -682,3 +672,9 @@ body::after {
|
|||
max-width: 1440px !important;
|
||||
}
|
||||
|
||||
.remove-padding-margin {
|
||||
width: 100% !important;
|
||||
margin: 0px !important;
|
||||
padding: 0px !important;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -235,7 +235,6 @@
|
|||
.theme-btn {
|
||||
border: none;
|
||||
cursor: pointer;
|
||||
border-radius: 2px;
|
||||
padding: 10px 20px;
|
||||
vertical-align: top;
|
||||
color: $light-color !important;
|
||||
|
|
@ -654,3 +653,15 @@ button[disabled] {
|
|||
margin: 0 auto !important;
|
||||
}
|
||||
|
||||
.styled-select {
|
||||
appearance:none;
|
||||
-moz-appearance:none; /* Firefox */
|
||||
-webkit-appearance:none; /* Safari and Chrome */
|
||||
}
|
||||
|
||||
.select-icon {
|
||||
top: 1px;
|
||||
left: -7px;
|
||||
font-size: 16px;
|
||||
position: relative;
|
||||
}
|
||||
|
|
@ -97,6 +97,10 @@ return [
|
|||
'footer-left-raw-content' => 'We love to craft softwares and solve the real world problems with the binaries. We are highly committed to our goals. We invest our resources to create world class easy to use softwares and applications for the enterprise business with the top notch, on the edge technology expertise.',
|
||||
'footer-middle-content' => 'Footer Middle Content',
|
||||
'update-meta-data' => 'Update Meta Data',
|
||||
'advertisement-one' => 'Advertisement One',
|
||||
'advertisement-two' => 'Advertisement Two',
|
||||
'advertisement-three' => 'Advertisement Three',
|
||||
'footer' => 'Footer',
|
||||
],
|
||||
'category' => [
|
||||
'title' => 'Category Menu List',
|
||||
|
|
|
|||
|
|
@ -15,81 +15,123 @@
|
|||
<form
|
||||
method="POST"
|
||||
@submit.prevent="onSubmit"
|
||||
enctype="multipart/form-data"
|
||||
action="{{ route('velocity.admin.store.meta-data', ['id' => $metaData->id]) }}">
|
||||
|
||||
@csrf
|
||||
|
||||
<div class="control-group">
|
||||
<label for="footer_content">
|
||||
{{ __('velocity::app.admin.meta-data.activate-slider') }}
|
||||
</label>
|
||||
<accordian :title="'{{ __('admin::app.catalog.attributes.general') }}'" :active="false">
|
||||
<div slot="body">
|
||||
<div class="control-group">
|
||||
<label>{{ __('velocity::app.admin.meta-data.activate-slider') }}</label>
|
||||
|
||||
<label class="switch">
|
||||
<input
|
||||
type="checkbox"
|
||||
class="control"
|
||||
id="slides"
|
||||
name="slides"
|
||||
data-vv-as=""slides""
|
||||
{{ $metaData->slider ? 'checked' : ''}} />
|
||||
<label class="switch">
|
||||
<input
|
||||
type="checkbox"
|
||||
class="control"
|
||||
id="slides"
|
||||
name="slides"
|
||||
data-vv-as=""slides""
|
||||
{{ $metaData->slider ? 'checked' : ''}} />
|
||||
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
<span class="slider round"></span>
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<label for="footer_content">
|
||||
{{ __('velocity::app.admin.meta-data.subscription-content') }}
|
||||
</label>
|
||||
<div class="control-group">
|
||||
<label>{{ __('velocity::app.admin.meta-data.activate-slider') }}</label>
|
||||
|
||||
<textarea
|
||||
class="control"
|
||||
id="subscription_bar_content"
|
||||
name="subscription_bar_content">
|
||||
{{ $metaData->subscription_bar_content}}
|
||||
</textarea>
|
||||
</div>
|
||||
<input
|
||||
type="text"
|
||||
class="control"
|
||||
id="sidebar_category_count"
|
||||
name="sidebar_category_count"
|
||||
value="{{ $metaData->sidebar_category_count }}" />
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<label for="footer_content">
|
||||
{{ __('velocity::app.admin.meta-data.home-page-content') }}
|
||||
</label>
|
||||
<div class="control-group">
|
||||
<label>{{ __('velocity::app.admin.meta-data.home-page-content') }}</label>
|
||||
|
||||
<textarea
|
||||
class="control"
|
||||
id="home_page_content"
|
||||
name="home_page_content">
|
||||
{{ $metaData->home_page_content}}
|
||||
</textarea>
|
||||
</div>
|
||||
<textarea
|
||||
class="control"
|
||||
id="home_page_content"
|
||||
name="home_page_content">
|
||||
{{ $metaData->home_page_content}}
|
||||
</textarea>
|
||||
</div>
|
||||
</div>
|
||||
</accordian>
|
||||
|
||||
<div class="control-group">
|
||||
<label for="footer_content">
|
||||
{{ __('velocity::app.admin.meta-data.footer-left-content') }}
|
||||
</label>
|
||||
<accordian :title="'{{ __('admin::app.catalog.products.images') }}'" :active="false">
|
||||
<div slot="body">
|
||||
<div class="control-group">
|
||||
<label>{{ __('velocity::app.admin.meta-data.advertisement-one') }}</label>
|
||||
|
||||
<textarea
|
||||
class="control"
|
||||
id="footer_left_content"
|
||||
name="footer_left_content">
|
||||
{{ $metaData->footer_left_content}}
|
||||
</textarea>
|
||||
</div>
|
||||
<image-wrapper
|
||||
:button-label="'{{ __('admin::app.catalog.products.add-image-btn-title') }}'"
|
||||
input-name="images[1]">
|
||||
{{-- :images='@json($metaData->advertisement[1])'> --}}
|
||||
</image-wrapper>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<label for="footer_content">
|
||||
{{ __('velocity::app.admin.meta-data.footer-middle-content') }}
|
||||
</label>
|
||||
<div class="control-group">
|
||||
<label>{{ __('velocity::app.admin.meta-data.advertisement-two') }}</label>
|
||||
|
||||
<textarea
|
||||
class="control"
|
||||
id="footer_middle_content"
|
||||
name="footer_middle_content">
|
||||
{{ $metaData->footer_middle_content}}
|
||||
</textarea>
|
||||
</div>
|
||||
<image-wrapper
|
||||
:button-label="'{{ __('admin::app.catalog.products.add-image-btn-title') }}'"
|
||||
input-name="images[2]">
|
||||
</image-wrapper>
|
||||
</div>
|
||||
|
||||
<button class="btn btn-lg btn-primary">
|
||||
<div class="control-group">
|
||||
<label>{{ __('velocity::app.admin.meta-data.advertisement-three') }}</label>
|
||||
|
||||
<image-wrapper
|
||||
:button-label="'{{ __('admin::app.catalog.products.add-image-btn-title') }}'"
|
||||
input-name="images[3]">
|
||||
</image-wrapper>
|
||||
</div>
|
||||
</div>
|
||||
</accordian>
|
||||
|
||||
<accordian :title="'{{ __('velocity::app.admin.meta-data.footer') }}'" :active="false">
|
||||
<div slot="body">
|
||||
<div class="control-group">
|
||||
<label>{{ __('velocity::app.admin.meta-data.subscription-content') }}</label>
|
||||
|
||||
<textarea
|
||||
class="control"
|
||||
id="subscription_bar_content"
|
||||
name="subscription_bar_content">
|
||||
{{ $metaData->subscription_bar_content}}
|
||||
</textarea>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<label>{{ __('velocity::app.admin.meta-data.footer-left-content') }}</label>
|
||||
|
||||
<textarea
|
||||
class="control"
|
||||
id="footer_left_content"
|
||||
name="footer_left_content">
|
||||
{{ $metaData->footer_left_content}}
|
||||
</textarea>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<label>{{ __('velocity::app.admin.meta-data.footer-middle-content') }}</label>
|
||||
|
||||
<textarea
|
||||
class="control"
|
||||
id="footer_middle_content"
|
||||
name="footer_middle_content">
|
||||
{{ $metaData->footer_middle_content}}
|
||||
</textarea>
|
||||
</div>
|
||||
</div>
|
||||
</accordian>
|
||||
|
||||
<button class="btn btn-lg btn-primary" style="margin-top: 20px">
|
||||
{{ __('velocity::app.admin.meta-data.update-meta-data') }}
|
||||
</button>
|
||||
</form>
|
||||
|
|
@ -97,8 +139,7 @@
|
|||
@stop
|
||||
|
||||
@push('scripts')
|
||||
<script src="{{ asset('vendor/webkul/admin/assets/js/tinyMCE/tinymce.min.js') }}">
|
||||
</script>
|
||||
<script src="{{ asset('vendor/webkul/admin/assets/js/tinyMCE/tinymce.min.js') }}"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function () {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
@extends('shop::layouts.master')
|
||||
|
||||
@section('page_title')
|
||||
{{ $page->page_title }}
|
||||
@endsection
|
||||
|
||||
@section('head')
|
||||
@isset($page->meta_title)
|
||||
<meta name="title" content="{{ $page->meta_title }}" />
|
||||
@endisset
|
||||
|
||||
@isset($page->meta_description)
|
||||
<meta name="description" content="{{ $page->meta_description }}" />
|
||||
@endisset
|
||||
|
||||
@isset($page->meta_keywords)
|
||||
<meta name="keywords" content="{{ $page->meta_keywords }}" />
|
||||
@endisset
|
||||
@endsection
|
||||
|
||||
@section('content-wrapper')
|
||||
<div class="cms-page-container cart-details row offset-1">
|
||||
{!! DbView::make($page)->field('html_content')->render() !!}
|
||||
</div>
|
||||
@endsection
|
||||
|
|
@ -1,85 +1,73 @@
|
|||
@extends('shop::layouts.master')
|
||||
@extends('shop::customers.account.index')
|
||||
|
||||
@section('page_title')
|
||||
{{ __('shop::app.customer.account.address.edit.page-title') }}
|
||||
{{ __('shop::app.customer.account.review.index.page-title') }}
|
||||
@endsection
|
||||
|
||||
@section('content-wrapper')
|
||||
|
||||
<div class="account-content row">
|
||||
<div class="sidebar col-2">
|
||||
@include('shop::customers.account.partials.sidemenu')
|
||||
</div>
|
||||
|
||||
<div class="account-layout col-10">
|
||||
|
||||
<div class="account-head mb-15">
|
||||
<span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>
|
||||
<span class="account-heading">{{ __('shop::app.customer.account.address.edit.title') }}</span>
|
||||
<span></span>
|
||||
</div>
|
||||
|
||||
{!! view_render_event('bagisto.shop.customers.account.address.edit.before', ['address' => $address]) !!}
|
||||
|
||||
<form method="post" action="{{ route('customer.address.edit', $address->id) }}" @submit.prevent="onSubmit">
|
||||
|
||||
<div class="account-table-content">
|
||||
@method('PUT')
|
||||
@csrf
|
||||
|
||||
{!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.before', ['address' => $address]) !!}
|
||||
|
||||
|
||||
<?php $addresses = explode(PHP_EOL, $address->address1); ?>
|
||||
|
||||
<div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">
|
||||
<label for="address_0" class="required">{{ __('shop::app.customer.account.address.edit.street-address') }}</label>
|
||||
<input type="text" class="control" name="address1[]" id="address_0" v-validate="'required'" value="{{ isset($addresses[0]) ? $addresses[0] : '' }}" data-vv-as=""{{ __('shop::app.customer.account.address.create.street-address') }}"">
|
||||
<span class="control-error" v-if="errors.has('address1[]')">@{{ errors.first('address1[]') }}</span>
|
||||
</div>
|
||||
|
||||
@if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)
|
||||
<div class="control-group" style="margin-top: -25px;">
|
||||
@for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
|
||||
<input type="text" class="control" name="address1[{{ $i }}]" id="address_{{ $i }}" value="{{ isset($addresses[$i]) ? $addresses[$i] : '' }}">
|
||||
@endfor
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@include ('shop::customers.account.address.country-state', ['countryCode' => old('country') ?? $address->country, 'stateCode' => old('state') ?? $address->state])
|
||||
|
||||
<div class="control-group" :class="[errors.has('city') ? 'has-error' : '']">
|
||||
<label for="city" class="required">{{ __('shop::app.customer.account.address.create.city') }}</label>
|
||||
<input type="text" class="control" name="city" v-validate="'required|alpha_spaces'" value="{{ $address->city }}" data-vv-as=""{{ __('shop::app.customer.account.address.create.city') }}"">
|
||||
<span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
|
||||
</div>
|
||||
|
||||
<div class="control-group" :class="[errors.has('postcode') ? 'has-error' : '']">
|
||||
<label for="postcode" class="required">{{ __('shop::app.customer.account.address.create.postcode') }}</label>
|
||||
<input type="text" class="control" name="postcode" v-validate="'required'" value="{{ $address->postcode }}" data-vv-as=""{{ __('shop::app.customer.account.address.create.postcode') }}"">
|
||||
<span class="control-error" v-if="errors.has('postcode')">@{{ errors.first('postcode') }}</span>
|
||||
</div>
|
||||
|
||||
<div class="control-group" :class="[errors.has('phone') ? 'has-error' : '']">
|
||||
<label for="phone" class="required">{{ __('shop::app.customer.account.address.create.phone') }}</label>
|
||||
<input type="text" class="control" name="phone" v-validate="'required'" value="{{ $address->phone }}" data-vv-as=""{{ __('shop::app.customer.account.address.create.phone') }}"">
|
||||
<span class="control-error" v-if="errors.has('phone')">@{{ errors.first('phone') }}</span>
|
||||
</div>
|
||||
|
||||
{!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.after', ['address' => $address]) !!}
|
||||
|
||||
<div class="button-group">
|
||||
<button class="theme-btn" type="submit">
|
||||
{{ __('shop::app.customer.account.address.create.submit') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
|
||||
{!! view_render_event('bagisto.shop.customers.account.address.edit.after', ['address' => $address]) !!}
|
||||
|
||||
</div>
|
||||
@section('page-detail-wrapper')
|
||||
<div class="account-head mb-15">
|
||||
<span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>
|
||||
<span class="account-heading">{{ __('shop::app.customer.account.address.edit.title') }}</span>
|
||||
<span></span>
|
||||
</div>
|
||||
|
||||
{!! view_render_event('bagisto.shop.customers.account.address.edit.before', ['address' => $address]) !!}
|
||||
|
||||
<form method="post" action="{{ route('customer.address.edit', $address->id) }}" @submit.prevent="onSubmit">
|
||||
|
||||
<div class="account-table-content">
|
||||
@method('PUT')
|
||||
@csrf
|
||||
|
||||
{!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.before', ['address' => $address]) !!}
|
||||
|
||||
|
||||
<?php $addresses = explode(PHP_EOL, $address->address1); ?>
|
||||
|
||||
<div class="control-group" :class="[errors.has('address1[]') ? 'has-error' : '']">
|
||||
<label for="address_0" class="required">{{ __('shop::app.customer.account.address.edit.street-address') }}</label>
|
||||
<input type="text" class="control" name="address1[]" id="address_0" v-validate="'required'" value="{{ isset($addresses[0]) ? $addresses[0] : '' }}" data-vv-as=""{{ __('shop::app.customer.account.address.create.street-address') }}"">
|
||||
<span class="control-error" v-if="errors.has('address1[]')">@{{ errors.first('address1[]') }}</span>
|
||||
</div>
|
||||
|
||||
@if (core()->getConfigData('customer.settings.address.street_lines') && core()->getConfigData('customer.settings.address.street_lines') > 1)
|
||||
<div class="control-group" style="margin-top: -25px;">
|
||||
@for ($i = 1; $i < core()->getConfigData('customer.settings.address.street_lines'); $i++)
|
||||
<input type="text" class="control" name="address1[{{ $i }}]" id="address_{{ $i }}" value="{{ isset($addresses[$i]) ? $addresses[$i] : '' }}">
|
||||
@endfor
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@include ('shop::customers.account.address.country-state', ['countryCode' => old('country') ?? $address->country, 'stateCode' => old('state') ?? $address->state])
|
||||
|
||||
<div class="control-group" :class="[errors.has('city') ? 'has-error' : '']">
|
||||
<label for="city" class="required">{{ __('shop::app.customer.account.address.create.city') }}</label>
|
||||
<input type="text" class="control" name="city" v-validate="'required|alpha_spaces'" value="{{ $address->city }}" data-vv-as=""{{ __('shop::app.customer.account.address.create.city') }}"">
|
||||
<span class="control-error" v-if="errors.has('city')">@{{ errors.first('city') }}</span>
|
||||
</div>
|
||||
|
||||
<div class="control-group" :class="[errors.has('postcode') ? 'has-error' : '']">
|
||||
<label for="postcode" class="required">{{ __('shop::app.customer.account.address.create.postcode') }}</label>
|
||||
<input type="text" class="control" name="postcode" v-validate="'required'" value="{{ $address->postcode }}" data-vv-as=""{{ __('shop::app.customer.account.address.create.postcode') }}"">
|
||||
<span class="control-error" v-if="errors.has('postcode')">@{{ errors.first('postcode') }}</span>
|
||||
</div>
|
||||
|
||||
<div class="control-group" :class="[errors.has('phone') ? 'has-error' : '']">
|
||||
<label for="phone" class="required">{{ __('shop::app.customer.account.address.create.phone') }}</label>
|
||||
<input type="text" class="control" name="phone" v-validate="'required'" value="{{ $address->phone }}" data-vv-as=""{{ __('shop::app.customer.account.address.create.phone') }}"">
|
||||
<span class="control-error" v-if="errors.has('phone')">@{{ errors.first('phone') }}</span>
|
||||
</div>
|
||||
|
||||
{!! view_render_event('bagisto.shop.customers.account.address.edit_form_controls.after', ['address' => $address]) !!}
|
||||
|
||||
<div class="button-group">
|
||||
<button class="theme-btn" type="submit">
|
||||
{{ __('shop::app.customer.account.address.create.submit') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
|
||||
{!! view_render_event('bagisto.shop.customers.account.address.edit.after', ['address' => $address]) !!}
|
||||
@endsection
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
@extends('shop::layouts.master')
|
||||
|
||||
@section('content-wrapper')
|
||||
<div class="account-content row col-12">
|
||||
<div class="account-content row no-margin">
|
||||
<div class="sidebar col-2">
|
||||
@include('shop::customers.account.partials.sidemenu')
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<ul type="none" class="navigation">
|
||||
@foreach ($menuItem['children'] as $subMenuItem)
|
||||
<li class="{{ $menu->getActive($subMenuItem) }}">
|
||||
<a class="unset fw6" href="{{ $subMenuItem['url'] }}">
|
||||
<a class="unset fw6 full-width" href="{{ $subMenuItem['url'] }}">
|
||||
{{ trans($subMenuItem['name']) }}
|
||||
</a>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -1,20 +1,73 @@
|
|||
<div class="container-fluid advertisement-one no-padding">
|
||||
@php
|
||||
$isRendered = false;
|
||||
$advertisementOne = null;
|
||||
@endphp
|
||||
|
||||
<div class="row col-12">
|
||||
<div class="col offers-lt-panel bg-image"></div>
|
||||
@if ($velocityMetaData->advertisement)
|
||||
@php
|
||||
$advertisement = json_decode($velocityMetaData->advertisement, true);
|
||||
if (isset($advertisement[1])) {
|
||||
$advertisementOne = $advertisement[1];
|
||||
}
|
||||
@endphp
|
||||
|
||||
<div class="col offers-ct-panel">
|
||||
|
||||
<div class="row pb10">
|
||||
<div class="col-12 offers-ct-top"></div>
|
||||
</div>
|
||||
@if ($advertisementOne)
|
||||
@php
|
||||
$isRendered = true;
|
||||
@endphp
|
||||
|
||||
<div class="container-fluid advertisement-one">
|
||||
<div class="row">
|
||||
<div class="col-12 offers-ct-bottom"></div>
|
||||
<div
|
||||
class="col offers-lt-panel bg-image"
|
||||
style="background-image: url('{{ asset('/storage/' . $advertisementOne['image_1']) }}')">
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col offers-ct-panel">
|
||||
|
||||
<div class="col offers-rt-panel"></div>
|
||||
<div class="row pb10">
|
||||
<div
|
||||
class="col-12 offers-ct-top"
|
||||
style="background-image: url('{{ asset('/storage/' . $advertisementOne['image_2']) }}')">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div
|
||||
class="col-12 offers-ct-bottom"
|
||||
style="background-image: url('{{ asset('/storage/' . $advertisementOne['image_3']) }}')">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="col offers-rt-panel"
|
||||
style="background-image: url('{{ asset('/storage/' . $advertisementOne['image_4']) }}')">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
@if (! $isRendered)
|
||||
<div class="container-fluid advertisement-one">
|
||||
<div class="row">
|
||||
<div class="col offers-lt-panel bg-image"></div>
|
||||
|
||||
<div class="col offers-ct-panel">
|
||||
|
||||
<div class="row pb10">
|
||||
<div class="col-12 offers-ct-top"></div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-12 offers-ct-bottom"></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col offers-rt-panel"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
|
@ -1,10 +1,43 @@
|
|||
<div class="container-fluid advertisement-three-container">
|
||||
@php
|
||||
$isRendered = false;
|
||||
$advertisementThree = null;
|
||||
@endphp
|
||||
|
||||
<div class="row">
|
||||
<div class="col-8 ad-3-lt bg-image no-padding"></div>
|
||||
@if ($velocityMetaData->advertisement)
|
||||
@php
|
||||
$advertisement = json_decode($velocityMetaData->advertisement, true);
|
||||
if (isset($advertisement[3])) {
|
||||
$advertisementThree = $advertisement[3];
|
||||
}
|
||||
@endphp
|
||||
|
||||
<div class="col-4 pr0">
|
||||
<div class="ad-3-rt bg-image no-padding"></div>
|
||||
@if ($advertisementThree)
|
||||
@php
|
||||
$isRendered = true;
|
||||
@endphp
|
||||
|
||||
<div class="container-fluid advertisement-three-container">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-8 ad-3-lt bg-image no-padding"></div>
|
||||
|
||||
<div class="col-4 pr0">
|
||||
<div class="ad-3-rt bg-image no-padding"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
@if (! $isRendered)
|
||||
<div class="container-fluid advertisement-three-container">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-8 ad-3-lt bg-image no-padding"></div>
|
||||
|
||||
<div class="col-4 pr0">
|
||||
<div class="ad-3-rt bg-image no-padding"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
|
@ -1,18 +1,59 @@
|
|||
<div class="container-fluid advertisement-two-container">
|
||||
@php
|
||||
$isRendered = false;
|
||||
$advertisementTwo = null;
|
||||
@endphp
|
||||
|
||||
<div class="row max-width-100">
|
||||
<div class="col ad-2-lt"></div>
|
||||
@if ($velocityMetaData->advertisement)
|
||||
@php
|
||||
$advertisement = json_decode($velocityMetaData->advertisement, true);
|
||||
if (isset($advertisement[2])) {
|
||||
$advertisementTwo = $advertisement[2];
|
||||
}
|
||||
@endphp
|
||||
|
||||
<div class="col ad-2-rt">
|
||||
@if ($advertisementTwo)
|
||||
@php
|
||||
$isRendered = true;
|
||||
@endphp
|
||||
|
||||
<div class="row top-container">
|
||||
<div class="col"></div>
|
||||
<div class="container-fluid advertisement-two-container">
|
||||
|
||||
<div class="row">
|
||||
<div class="col ad-2-lt"></div>
|
||||
|
||||
<div class="col ad-2-rt">
|
||||
|
||||
<div class="row top-container">
|
||||
<div class="col"></div>
|
||||
</div>
|
||||
|
||||
<div class="row bottom-container">
|
||||
<div class="col"></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
@if (! $isRendered)
|
||||
<div class="container-fluid advertisement-two-container">
|
||||
|
||||
<div class="row">
|
||||
<div class="col ad-2-lt"></div>
|
||||
|
||||
<div class="col ad-2-rt">
|
||||
|
||||
<div class="row top-container">
|
||||
<div class="col"></div>
|
||||
</div>
|
||||
|
||||
<div class="row bottom-container">
|
||||
<div class="col"></div>
|
||||
</div>
|
||||
|
||||
<div class="row bottom-container">
|
||||
<div class="col"></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
|
||||
@if ($featuredProductsCount)
|
||||
|
||||
<div class="container-fluid popular-products no-padding">
|
||||
<div class="container-fluid popular-products">
|
||||
|
||||
<card-list-header
|
||||
heading="{{ __('shop::app.home.featured-products') }}"
|
||||
|
|
|
|||
|
|
@ -47,11 +47,13 @@
|
|||
|
||||
@section('full-content-wrapper')
|
||||
|
||||
{!! view_render_event('bagisto.shop.home.content.before') !!}
|
||||
<div class="full-content-wrapper">
|
||||
{!! view_render_event('bagisto.shop.home.content.before') !!}
|
||||
|
||||
{!! DbView::make($velocityMetaData)->field('home_page_content')->render() !!}
|
||||
{!! DbView::make($velocityMetaData)->field('home_page_content')->render() !!}
|
||||
|
||||
{{ view_render_event('bagisto.shop.home.content.after') }}
|
||||
{{ view_render_event('bagisto.shop.home.content.after') }}
|
||||
</div>
|
||||
|
||||
@endsection
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
@endphp
|
||||
|
||||
@if (! empty($newProducts))
|
||||
<div class="container-fluid popular-products no-padding">
|
||||
<div class="container-fluid popular-products">
|
||||
|
||||
<card-list-header
|
||||
heading="{{ __('shop::app.home.new-products') }}"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<div class="container-fluid popular-products no-padding">
|
||||
<div class="container-fluid popular-products">
|
||||
|
||||
<card-list-header :show-tabs="true"></card-list-header>
|
||||
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@
|
|||
$cardCount = 5;
|
||||
@endphp
|
||||
|
||||
<div class="container-fluid popular-products no-padding">
|
||||
<div class="container-fluid popular-products">
|
||||
|
||||
<card-list-header
|
||||
heading="Plants"
|
||||
|
|
|
|||
|
|
@ -2,8 +2,7 @@
|
|||
<carousel-component
|
||||
:slides-count="{{ ! empty($sliderData) ? sizeof($sliderData) : 1 }}"
|
||||
slides-per-page="1"
|
||||
navigation-enabled="hide"
|
||||
pagination-enabled="hide">
|
||||
navigation-enabled="hide">
|
||||
|
||||
@if (! empty($sliderData))
|
||||
@foreach ($sliderData as $index => $slider)
|
||||
|
|
|
|||
|
|
@ -24,20 +24,20 @@
|
|||
class="btn-toolbar full-width"
|
||||
role="toolbar">
|
||||
|
||||
<div
|
||||
class="btn-group mr-2 full-width row"
|
||||
role="group"
|
||||
aria-label="First group">
|
||||
<div class="btn-group mr-2 full-width row">
|
||||
|
||||
<select class="form-control col-4 fs13" name="category">
|
||||
<option value="">
|
||||
{{ __('velocity::app.header.all-categories') }}
|
||||
</option>
|
||||
<div class="selectdiv">
|
||||
<select class="form-control fs13" name="category">
|
||||
<option value="">
|
||||
{{ __('velocity::app.header.all-categories') }}
|
||||
</option>
|
||||
|
||||
@foreach ($categories as $category)
|
||||
<option value="{{ $category->id }}">{{ $category->name }}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
@foreach ($categories as $category)
|
||||
<option value="{{ $category->id }}">{{ $category->name }}</option>
|
||||
@endforeach
|
||||
<span class="select-icon rango-arrow-down"></span>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="input-group col-md-8 rows">
|
||||
<input
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
placeholder="{{ __('velocity::app.header.search-text') }}" />
|
||||
|
||||
<div class="input-group-append">
|
||||
<button class="btn btn-secondary" type="submit" id="header-search-icon">
|
||||
<button class="btn" type="submit" id="header-search-icon">
|
||||
<i class="fs14 rango-search"></i>
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -74,19 +74,20 @@
|
|||
@endphp
|
||||
|
||||
<content-header
|
||||
heading= "{{ __('velocity::app.menu-navbar.text-category') }}"
|
||||
:header-content="{{ json_encode($velocityContent) }}"
|
||||
is-enabled="{{ sizeof($categories) }}"
|
||||
:header-content="{{ json_encode($velocityContent) }}"
|
||||
heading= "{{ __('velocity::app.menu-navbar.text-category') }}"
|
||||
></content-header>
|
||||
|
||||
<div class="container no-padding">
|
||||
<div class="row pr0">
|
||||
<div class="row col-12 remove-padding-margin">
|
||||
<sidebar-component
|
||||
main-sidebar=true
|
||||
url="{{ url()->to('/') }}"
|
||||
add-class="col-2 category-list-container pt10 no-padding mt15"
|
||||
:categories="{{ json_encode($categories) }}"
|
||||
></sidebar-component>
|
||||
category-count="{{ $velocityMetaData->sidebar_category_count }}"
|
||||
add-class="col-2 category-list-container pt10 no-padding mt15">
|
||||
</sidebar-component>
|
||||
|
||||
<child-sidebar
|
||||
url="{{ url()->to('/') }}">
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
<div class="col-sm-6">
|
||||
@include('velocity::layouts.top-nav.locale-currency')
|
||||
</div>
|
||||
|
||||
<div class="col-sm-6">
|
||||
@include('velocity::layouts.top-nav.login-section')
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,12 @@
|
|||
|
||||
<div class="pull-left">
|
||||
<div class="dropdown">
|
||||
<select class="btn btn-link dropdown-toggle control locale-switcher" onchange="window.location.href = this.value" @if (count(core()->getCurrentChannel()->locales) == 1) disabled="disabled" @endif>
|
||||
<select
|
||||
class="btn btn-link dropdown-toggle control locale-switcher styled-select"
|
||||
onchange="window.location.href = this.value"
|
||||
@if (count(core()->getCurrentChannel()->locales) == 1)
|
||||
disabled="disabled"
|
||||
@endif>
|
||||
|
||||
@foreach (core()->getCurrentChannel()->locales as $locale)
|
||||
@if (isset($serachQuery))
|
||||
|
|
@ -11,8 +16,9 @@
|
|||
<option value="?locale={{ $locale->code }}" {{ $locale->code == app()->getLocale() ? 'selected' : '' }}>{{ $locale->name }}</option>
|
||||
@endif
|
||||
@endforeach
|
||||
|
||||
</select>
|
||||
|
||||
<span class="select-icon rango-arrow-down"></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -23,7 +29,9 @@
|
|||
@if (core()->getCurrentChannel()->currencies->count() > 1)
|
||||
<div class="pull-left">
|
||||
<div class="dropdown">
|
||||
<select class="btn btn-link dropdown-toggle control locale-switcher" onchange="window.location.href = this.value">
|
||||
<select
|
||||
class="btn btn-link dropdown-toggle control locale-switcher styled-select"
|
||||
onchange="window.location.href = this.value">
|
||||
@foreach (core()->getCurrentChannel()->currencies as $currency)
|
||||
@if (isset($serachQuery))
|
||||
<option value="?{{ $serachQuery }}¤cy={{ $currency->code }}" {{ $currency->code == core()->getCurrentCurrencyCode() ? 'selected' : '' }}>{{ $currency->code }}</option>
|
||||
|
|
@ -33,6 +41,7 @@
|
|||
@endforeach
|
||||
|
||||
</select>
|
||||
<span class="select-icon rango-arrow-down"></span>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
<a href="{{ route('customer.register.index') }}">
|
||||
<button
|
||||
type="button"
|
||||
class="theme-btn fs16">
|
||||
class="theme-btn fs15">
|
||||
{{ __('velocity::app.header.sign-up') }}
|
||||
</button>
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -11,28 +11,27 @@
|
|||
<meta name="keywords" content="{{ $category->meta_keywords }}" />
|
||||
@stop
|
||||
|
||||
@php
|
||||
$isDisplayMode = in_array(
|
||||
$category->display_mode, [
|
||||
null,
|
||||
'products_only',
|
||||
'products_and_description'
|
||||
]
|
||||
);
|
||||
|
||||
$products = $productRepository->getAll($category->id);
|
||||
@endphp
|
||||
|
||||
@section('content-wrapper')
|
||||
<section class="cart-details row offset-1">
|
||||
<section class="row col-12">
|
||||
{!! view_render_event('bagisto.shop.productOrCategory.index.before', ['category' => $category]) !!}
|
||||
|
||||
<div class="category-container col-12">
|
||||
|
||||
@if (in_array($category->display_mode, [null, 'products_only', 'products_and_description']))
|
||||
@include ('shop::products.list.layered-navigation')
|
||||
@endif
|
||||
|
||||
@php
|
||||
$isDisplayMode = in_array(
|
||||
$category->display_mode, [
|
||||
null,
|
||||
'products_only',
|
||||
'products_and_description'
|
||||
]
|
||||
);
|
||||
|
||||
$products = $productRepository->getAll($category->id);
|
||||
@endphp
|
||||
@if (in_array($category->display_mode, [null, 'products_only', 'products_and_description']))
|
||||
@include ('shop::products.list.layered-navigation')
|
||||
@endif
|
||||
|
||||
<div class="category-container col-10">
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<h1 class="fw6 mb10">{{ $category->name }}</h1>
|
||||
|
|
|
|||
Loading…
Reference in New Issue