Skip to content

Commit

Permalink
Merge branch 'release/v6.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@artistro08
artistro08 committed Feb 9, 2023
2 parents 2430d44 + fd92424 commit 9df71b2
Show file tree
Hide file tree
Showing 14 changed files with 432 additions and 77 deletions.
39 changes: 33 additions & 6 deletions partials/builder/columns/events.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@
{% set month_day_year_and_time = "M d, Y - g:i A" %}
{% set sort_order = column.reverse_order ? 'desc' : 'asc' %}

{% if column.show_specific_items %}
{% set events = collect() %}
{% for event in column.specific_items %}
{% if event.item is not empty %}
{% do events.push(event.item) %}
{% endif %}
{% endfor %}
{% endif %}

{% if column.show == 'upcoming' %}
{% set events = events.whereDate('date', '>=', today) %}
{% endif %}
Expand All @@ -24,21 +33,39 @@
{% endif %}

{% if column.sort_by == 'title' %}
{% set events = events.orderBy('title', sort_order) %}
{% set older_events = older_events.orderBy('title', sort_order) %}
{% if column.show_specific_items %}
{% if sort_order == 'asc' %}
{% set events = events.sortBy('title') %}
{% else %}
{% set events = events.sortBy('title')|reverse %}
{% endif %}
{% else %}
{% set events = events.orderBy('title', sort_order) %}
{% set older_events = older_events.orderBy('title', sort_order) %}
{% endif %}
{% endif %}

{% if column.sort_by == 'date' %}
{% set events = events.orderBy('date', sort_order) %}
{% set older_events = older_events.orderBy('title', sort_order) %}
{% if column.show_specific_items %}
{% if sort_order == 'asc' %}
{% set events = events.sortBy('date') %}
{% else %}
{% set events = events.sortBy('date')|reverse %}
{% endif %}
{% else %}
{% set events = events.orderBy('date', sort_order) %}
{% set older_events = older_events.orderBy('date', sort_order) %}
{% endif %}
{% endif %}

{% if column.enable_pagination %}
{% set events = events.paginateCustom(column.per_page, 'events_column') %}
{% set older_events = older_events.paginateCustom(column.per_page, 'older_events_column') %}
{% else %}
{% set events = events.limit(column.limit).get() %}
{% set older_events = older_events.limit(column.limit).get() %}
{% if not column.show_specific_items %}
{% set events = events.limit(column.limit).get() %}
{% set older_events = older_events.limit(column.limit).get() %}
{% endif %}
{% endif %}

{% if (column.show_older_events and column.show == 'upcoming') %}
Expand Down
42 changes: 35 additions & 7 deletions partials/builder/columns/posts.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,62 @@
==
{% set sort_order = column.reverse_order ? 'desc' : 'asc' %}

{% if column.show_specific_items %}
{% set posts = collect() %}
{% for post in column.specific_items %}
{% if post.item is not empty %}
{% do posts.push(post.item) %}
{% endif %}
{% endfor %}
{% endif %}

{% if column.filter_by_category %}
{% set posts = posts.whereRelation('categories', 'id', column.post_category_filter.id) %}
{% endif %}

{% if column.sort_by == 'title' %}
{% set posts = posts.orderBy('title', sort_order) %}
{% if column.show_specific_items %}
{% if sort_order == 'asc' %}
{% set posts = posts.sortBy('title') %}
{% else %}
{% set posts = posts.sortBy('title')|reverse %}
{% endif %}
{% else %}
{% set posts = posts.orderBy('title', sort_order) %}
{% endif %}
{% endif %}

{% if column.sort_by == 'date' %}
{% set posts = posts.orderBy('published_at_date', sort_order) %}
{% if column.show_specific_items %}
{% if sort_order == 'asc' %}
{% set posts = posts.sortBy('published_at_date') %}
{% else %}
{% set posts = posts.sortBy('published_at_date')|reverse %}
{% endif %}
{% else %}
{% set posts = posts.orderBy('published_at_date', sort_order) %}
{% endif %}
{% endif %}

{% if column.enable_pagination %}
{% set posts = posts.paginateCustom(column.per_page, "posts_column") %}
{% set posts = posts.paginateCustom(column.limit, "posts") %}
{% else %}
{% set posts = posts.limit(column.limit).get() %}
{% if not column.show_specific_items %}
{% set posts = posts.limit(column.limit).get() %}
{% endif %}
{% endif %}

{% partial 'builder/globals/shop_alerts' %}
<div class="row row-cols-lg-{{ column.enable_pagination ? column.per_page : column.limit }}">
<div class="row row-cols-lg-{{ column.enable_pagination ? column.limit }}">
{% for post in posts %}
<div class="col{{ column.per_page > 4 ? "-12 col-lg-3" }}{{ column.limit > 4 ? "-12 col-lg-3" }} mb-4">
<div class="col{{ column.show_specific_items ? '-12 col-lg-' ~ column.specific_items_columns : (column.limit > 4 ? "-12 col-lg-3") }} mb-4">
<div class="card h-100">
<a href="{{ 'post'|page({ slug: post.slug }) }}" class="card-img-top">
{% if post.image|length %}
<img
src="{{ post.image|media|resize(700, 400, {mode: 'crop'}) }}"
alt="{{ post.title }}" class="card-img-top"
>
{% endif %}
</a>
<div class="card-body d-flex flex-column h-100 align-items-start">
<h3 class="text-decoration-none text-dark fs-5">
Expand Down
47 changes: 38 additions & 9 deletions partials/builder/columns/products.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,34 +3,63 @@
==
{% set sort_order = column.reverse_order ? 'desc' : 'asc' %}

{% if column.show_specific_items %}
{% set products = collect() %}
{% for product in column.specific_items %}
{% if product.item is not empty %}
{% do products.push(product.item) %}
{% endif %}
{% endfor %}
{% endif %}

{% if column.filter_by_category %}
{% set products = products.whereRelation('categories', 'id', column.product_category_filter.id) %}
{% endif %}

{% if column.sort_by == 'title' %}
{% set products = products.orderBy('title', sort_order) %}
{% if column.show_specific_items %}
{% if sort_order == 'asc' %}
{% set products = products.sortBy('title') %}
{% else %}
{% set products = products.sortBy('title')|reverse %}
{% endif %}
{% else %}
{% set products = products.orderBy('title', sort_order) %}
{% endif %}
{% endif %}

{% if column.sort_by == 'date' %}
{% set products = products.orderBy('published_at_date', sort_order) %}
{% if column.show_specific_items %}
{% if sort_order == 'asc' %}
{% set products = products.sortBy('published_at_date') %}
{% else %}
{% set products = products.sortBy('published_at_date')|reverse %}
{% endif %}
{% else %}
{% set products = products.orderBy('published_at_date', sort_order) %}
{% endif %}
{% endif %}

{% if column.enable_pagination %}
{% set products = products.paginateCustom(column.per_page, "products_column") %}
{% else %}
{% set products = products.limit(column.limit).get() %}
{% if not column.show_specific_items %}
{% set products = products.limit(column.limit).get() %}
{% endif %}
{% endif %}

{% partial 'builder/globals/shop_alerts' %}
<div class="row row-cols-lg-{{ column.enable_pagination ? column.per_page : column.limit }}">
<div class="row row-cols-lg-{{ column.enable_pagination ? column.limit }}">
{% for product in products %}
<div class="col{{ column.per_page > 4 ? "-12 col-lg-3" }}{{ column.limit > 4 ? "-12 col-lg-3" }} mb-4">
<div class="col{{ column.show_specific_items ? '-12 col-lg-' ~ column.specific_items_columns : (column.limit > 4 ? "-12 col-lg-3") }} mb-4">
<a href="{{ 'product'|page({ fullslug: product.slug }) }}" class="d-block text-decoration-none">
<div class="card">
<img
src="{% for image in product.images|slice(0,1) %}{{ image.path|resize(400, 400, {mode: 'crop'}) }}{% endfor %}"
alt="{{ product.title }}" class="card-img-top"
>
{% if product.images|length %}
<img
src="{% for image in product.images|slice(0,1) %}{{ image.path|resize(400, 400, {mode: 'crop'}) }}{% endfor %}"
alt="{{ product.title }}" class="card-img-top"
>
{% endif %}
<div class="card-body d-flex justify-content-between">
<h3 class="text-decoration-none text-dark fs-5">{{ product.title }}</h3>
<span class="text-decoration-none text-dark fw-bold">{{ settings.currency_symbol_placement == 'before' ? settings.currency_symbol }}{{ product.price }}{{ settings.currency_symbol_placement == 'after' ? settings.currency_symbol }}</span>
Expand Down
43 changes: 35 additions & 8 deletions partials/builder/sections/events.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@
{% set month_day_and_time = "M d - g:i A" %}
{% set month_day_year_and_time = "M d, Y - g:i A" %}
{% set sort_order = section.reverse_order ? 'desc' : 'asc' %}

{% if section.show_specific_items %}
{% set events = collect() %}
{% for event in section.specific_items %}
{% if event.item is not empty %}
{% do events.push(event.item) %}
{% endif %}
{% endfor %}
{% endif %}

{% if section.show == 'upcoming' %}
{% set events = events.whereDate('date', '>=', today) %}
Expand All @@ -28,21 +37,39 @@
{% endif %}

{% if section.sort_by == 'title' %}
{% set events = events.orderBy('title', sort_order) %}
{% set older_events = older_events.orderBy('title', sort_order) %}
{% if section.show_specific_items %}
{% if sort_order == 'asc' %}
{% set events = events.sortBy('title') %}
{% else %}
{% set events = events.sortBy('title')|reverse %}
{% endif %}
{% else %}
{% set events = events.orderBy('title', sort_order) %}
{% set older_events = older_events.orderBy('title', sort_order) %}
{% endif %}
{% endif %}

{% if section.sort_by == 'date' %}
{% set events = events.orderBy('date', sort_order) %}
{% set older_events = older_events.orderBy('date', sort_order) %}
{% if section.show_specific_items %}
{% if sort_order == 'asc' %}
{% set events = events.sortBy('date') %}
{% else %}
{% set events = events.sortBy('date')|reverse %}
{% endif %}
{% else %}
{% set events = events.orderBy('date', sort_order) %}
{% set older_events = older_events.orderBy('date', sort_order) %}
{% endif %}
{% endif %}

{% if section.enable_pagination %}
{% set events = events.paginateCustom(section.per_page, 'events') %}
{% set older_events = older_events.paginateCustom(section.per_page, 'older_events') %}
{% set events = events.paginateCustom(section.limit, 'events') %}
{% set older_events = older_events.paginateCustom(section.limit, 'older_events') %}
{% else %}
{% set events = events.limit(section.limit).get() %}
{% set older_events = older_events.limit(section.limit).get() %}
{% if not section.show_specific_items %}
{% set events = events.limit(section.limit).get() %}
{% set older_events = older_events.limit(section.limit).get() %}
{% endif %}
{% endif %}
<section
{{ section.html_anchor|length ? 'id="' ~ section.html_anchor ~ '"' }}
Expand Down
27 changes: 24 additions & 3 deletions partials/builder/sections/hero.htm
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,28 @@
[global settings]
handle = "Content\Settings"
==
{% set heroImage = '' %}
{% set heroImageAlt = '' %}

{% if section.image_type == "media_library" %}
{% set heroImage = section.image %}
{% set heroImageAlt = section.image_description %}
{% endif %}

{% if section.image_type == "product_category_image" %}
{% if section.product_category.image|length %}
{% set heroImage = section.product_category.image %}
{% endif %}
{% set heroImageAlt = section.product_category.title %}
{% endif %}

{% if section.image_type == "blog_category_image" %}
{% if section.blog_category.image|length %}
{% set heroImage = section.blog_category.image %}
{% endif %}
{% set heroImageAlt = section.blog_category.title %}
{% endif %}

<header {{ section.html_anchor|length ? 'id=' ~ section.html_anchor ~ '' }}
class="hero
{{ section.size == 'small' ? 'small-hero' }}
Expand All @@ -27,10 +49,9 @@
</div>
</div>
</div>
{% if section.image|length %}
{% set heroImage = section.image|split('.')|last %}
{% if heroImage|length %}
<div class="hero-media position-absolute bg-dark position-absolute top-0 start-0 bottom-0 end-0 w-100" style="z-index: 0">
<img class="w-100 h-100 opacity-25" style="object-fit: cover; object-position: center" src="{{ section.image|media|resize(1920) }}" alt="{{ section.image_description }}">
<img class="w-100 h-100 opacity-25" style="object-fit: cover; object-position: center" src="{{ heroImage|media|resize(1920) }}" alt="{{ heroImageAlt }}">
</div>
{% endif %}
</header>
53 changes: 41 additions & 12 deletions partials/builder/sections/posts.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,49 @@

{% set sort_order = section.reverse_order ? 'desc' : 'asc' %}

{% if section.show_specific_items %}
{% set posts = collect() %}
{% for post in section.specific_items %}
{% if post.item is not empty %}
{% do posts.push(post.item) %}
{% endif %}
{% endfor %}
{% endif %}

{% if section.filter_by_category %}
{% set posts = posts.whereRelation('categories', 'id', section.post_category_filter.id) %}
{% endif %}

{% if section.sort_by == 'title' %}
{% set posts = posts.orderBy('title', sort_order) %}
{% if section.show_specific_items %}
{% if sort_order == 'asc' %}
{% set posts = posts.sortBy('title') %}
{% else %}
{% set posts = posts.sortBy('title')|reverse %}
{% endif %}
{% else %}
{% set posts = posts.orderBy('title', sort_order) %}
{% endif %}
{% endif %}

{% if section.sort_by == 'date' %}
{% set posts = posts.orderBy('published_at_date', sort_order) %}
{% if section.show_specific_items %}
{% if sort_order == 'asc' %}
{% set posts = posts.sortBy('published_at_date') %}
{% else %}
{% set posts = posts.sortBy('published_at_date')|reverse %}
{% endif %}
{% else %}
{% set posts = posts.orderBy('published_at_date', sort_order) %}
{% endif %}
{% endif %}

{% if section.enable_pagination %}
{% set posts = posts.paginateCustom(section.per_page, "posts") %}
{% set posts = posts.paginateCustom(section.limit, "posts") %}
{% else %}
{% set posts = posts.limit(section.limit).get() %}
{% if not section.show_specific_items %}
{% set posts = posts.limit(section.limit).get() %}
{% endif %}
{% endif %}

<section
Expand All @@ -39,16 +66,18 @@
{{ section.disable_bottom_spacing == true ? 'pb-0' : "pb-4" }}"
>
<div class="{{ section.container_style }}">
<div class="row row-cols-lg-{{ section.enable_pagination ? section.per_page : section.limit }}">
<div class="row row-cols-lg-{{ section.enable_pagination ? section.limit }}">
{% for post in posts %}
<div class="col{{ section.per_page > 4 ? "-12 col-lg-3" }}{{ section.limit > 4 ? "-12 col-lg-3" }} mb-4">
<div class="col{{ section.show_specific_items ? '-12 col-lg-' ~ section.specific_items_columns : (section.limit > 4 ? "-12 col-lg-3") }} mb-4">
<div class="card h-100">
<a href="{{ 'post'|page({ slug: post.slug }) }}" class="card-img-top">
<img
src="{{ post.image|media|resize(700, 400, {mode: 'crop'}) }}"
alt="{{ post.title }}" class="card-img-top"
>
</a>
{% if post.image|length %}
<a href="{{ 'post'|page({ slug: post.slug }) }}" class="card-img-top">
<img
src="{{ post.image|media|resize(700, 400, {mode: 'crop'}) }}"
alt="{{ post.title }}" class="card-img-top"
>
</a>
{% endif %}
<div class="card-body d-flex flex-column h-100 align-items-start">
<h3 class="text-decoration-none text-dark fs-5">
<a href="{{ 'post'|page({ slug: post.slug }) }}" class="text-decoration-none text-reset">{{ post.title }}</a>
Expand Down
Loading

0 comments on commit 9df71b2

Please sign in to comment.