Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v3.1.8 #853

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
5a491d5
Update configuration for Astroid Pro
sonvnn Oct 31, 2024
4caa7b7
Recorrect code for Animation
sonvnn Oct 31, 2024
aa4a7a3
Add Astroid Get Pro field
sonvnn Oct 31, 2024
6f99ee7
Fix issue Astroid menu module position resets after updating Astroid …
sonvnn Nov 1, 2024
47f9697
Update script.php
sonvnn Nov 1, 2024
773bfbf
Update script.php
sonvnn Nov 1, 2024
62d4ddb
Update script.php
sonvnn Nov 1, 2024
5bbf82a
Fix for Widget Articles not sorting title alphabetically ascending or…
Nov 2, 2024
25f50bb
Add option to show or hide slideshow controls and indicators
Nov 2, 2024
d28e568
Fix issue Google map API is missing.
sonvnn Nov 5, 2024
b41402a
Correct quote information
sonvnn Nov 5, 2024
0dade23
Fix issue new Smooth Scroll does not work in 3.1.7 #860
sonvnn Nov 7, 2024
4bdb72c
Delete _lenis.scss
sonvnn Nov 7, 2024
83f9975
Add Easing Function for Smooth Scrolling
sonvnn Nov 7, 2024
c9e64a1
Optimize saveElement code
sonvnn Nov 8, 2024
38b57be
Fix issue of Lenis on Off Canvas block
sonvnn Nov 11, 2024
1e9a10c
Update MegaMenu z-index
sonvnn Nov 11, 2024
7c45505
Add Smooth Scroll Prevent option
sonvnn Nov 12, 2024
8520cd1
Fix issue if $logo value is not null
sonvnn Nov 12, 2024
61a300f
Add Raw HTML widget.
sonvnn Nov 14, 2024
792f421
Merge branch 'v3' of https://github.com/templaza/astroid-framework in…
Nov 14, 2024
aaebbdb
Add controls for Slideshow Indicators and Controls
Nov 14, 2024
ce5c112
Merge branch 'v3' of https://github.com/felixkat/astroid-framework
Nov 14, 2024
d9006d4
Fix bug with formbuilder success \ failed message
Nov 14, 2024
e62bfce
Fix bug where Checkboxe & Radio ignore "required" option.
Nov 14, 2024
0a0433a
Fix issue Form does not work at #868
sonvnn Nov 15, 2024
1560ff1
Merge pull request #869 from felixkat/v3
sonvnn Nov 18, 2024
331f07d
Fixed some minor bugs
sonvnn Nov 18, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/vendor/astroid/scss/_menu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
--as-menu-gutter-x: #{$megamenu-gutter-width};
display: none;
position: absolute;
z-index: 999;
z-index: 1003;

&.nav-submenu-container {
padding: 0;
Expand Down
18 changes: 0 additions & 18 deletions assets/vendor/astroid/scss/utilities/_lenis.scss

This file was deleted.

1 change: 0 additions & 1 deletion assets/vendor/astroid/scss/utilities/_utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@
@import "animations";
@import "modal";
@import "carousel";
@import "lenis";
@import "cursor";
2 changes: 1 addition & 1 deletion assets/vendor/manager/dist/index.html

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions assets/vendor/manager/dist/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/vendor/manager/index.html

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions assets/vendor/manager/index_.html

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion assets/vendor/manager/src/components/Main.vue
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ function selectPreset(event, group) {
});
}
}
const pro_badge = '<span class="badge text-bg-danger ms-2">PRO</span>';
</script>
<template>
<main class="as-main order-1">
Expand All @@ -156,7 +157,7 @@ function selectPreset(event, group) {
<div :class="(idx !== 0 && field.input.type !== 'astroidhidden' && field.input.type !== 'hidden' ? 'mt-3 pt-3 border-top': '')" v-for="(field, idx) in group.fields" :key="field.id" v-show="checkShow(field)">
<div class="row">
<div v-if="(field.label || field.description) && field.input.type !== `astroidheading`" class="col-sm-6 col-md-5">
<div v-if="(field.input.type === `astroidradio` && field.input.role !== 'switch') || (['astroidpreloaders', 'astroidmedia', 'astroidcolor', 'astroidicon', 'astroidcalendar', 'astroidgradient', 'astroidspacing', 'astroidicons'].includes(field.input.type))" class="form-label" v-html="field.label"></div>
<div v-if="(field.input.type === `astroidradio` && field.input.role !== 'switch') || (['astroidpreloaders', 'astroidmedia', 'astroidcolor', 'astroidicon', 'astroidcalendar', 'astroidgradient', 'astroidspacing', 'astroidicons', 'astroidgetpro'].includes(field.input.type))" class="form-label" v-html="(field.label + (field.input.type === `astroidgetpro` ? pro_badge : ``))"></div>
<label v-else :for="(typeof field.type !== 'undefined' && field.type === `json` ? field.input.id : 'params_'+field.name)" class="form-label" v-html="field.label"></label>
<p v-if="field.description !== ''" v-html="field.description" class="form-text"></p>
</div>
Expand Down
4 changes: 4 additions & 0 deletions assets/vendor/manager/src/components/helpers/Fields.vue
Original file line number Diff line number Diff line change
Expand Up @@ -197,4 +197,8 @@ function updateSubLayouts() {
<div v-else-if="props.field.input.type === `articlelayouts`" class="astroid-article-layouts">
<SubLayouts v-model="props.scope[props.field.name]" :field="props.field" type="article_layouts" />
</div>
<div v-else-if="props.field.input.type === `astroidgetpro`" class="astroid-get-pro card card-body">
<h6 class="card-title">{{ props.field.input.title }}</h6>
<div class="card-text form-text" v-html="props.field.input.desc"></div>
</div>
</template>
41 changes: 15 additions & 26 deletions assets/vendor/manager/src/components/helpers/Layout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -130,37 +130,26 @@ function editElement(el) {
_showModal.value = true;
}
function saveElement(param) {
layout.value.sections.every(section => {
if (element.value.type === section.type && element.value.id === section.id) {
section.params = param;
const updateParams = (el) => {
if (element.value.type === el.type && element.value.id === el.id) {
el.params = param;
element.value = {};
return false;
return true;
}
section.rows.every(row => {
if (element.value.type === row.type && element.value.id === row.id) {
row.params = param;
element.value = {};
return false;
}
row.cols.every(column => {
if (element.value.type === column.type && element.value.id === column.id) {
column.params = param;
element.value = {};
return false;
}
column.elements.every(el => {
if (element.value.type === el.type && element.value.id === el.id) {
el.params = param;
element.value = {};
return false;
}
return true;
return false;
};

layout.value.sections.forEach(section => {
if (updateParams(section)) return;
section.rows.forEach(row => {
if (updateParams(row)) return;
row.cols.forEach(column => {
if (updateParams(column)) return;
column.elements.forEach(el => {
if (updateParams(el)) return;
});
return true;
});
return true;
});
return true;
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ function selectLayout(element) {
<a href="#" @click.prevent="selectElement(element)" class="bg-light text-dark border px-2 py-1 rounded-pill"><i class="fas fa-plus"></i><span class="add-element-text ms-1">Add Element</span></a>
</div>
</div>
<div v-else-if="props.group === `cols`" class="astroid-element card card-default card-body" :class="{'element-disabled' : !element.state}">
<div v-else-if="props.group === `cols` && typeof props.form[element.type] !== `undefined`" class="astroid-element card card-default card-body" :class="{'element-disabled' : !element.state}">
<div class="d-flex justify-content-between">
<div class="element-name">
<div><i class="text-body-tertiary me-2" :class="props.form[element.type].info.icon"></i>{{ element.params.find((param) => param.name === 'title').value }}<i v-if="element.type === `sublayout`" class="fa-regular fa-circle-question text-body-tertiary ms-1" :title="element.params.find((param) => param.name === 'desc').value"></i></div>
Expand All @@ -368,10 +368,6 @@ function selectLayout(element) {
</div>
</div>
</div>
<div v-else>
{{ element.id }}
<LayoutBuilder :list="element" :group="map[props.group]" :system="props.system" :form="props.form" :device="props.device" @edit:Element="_editElement" @select:Element="selectElement" @update:System="updateSystem" />
</div>
</template>
</draggable>
</template>
3 changes: 2 additions & 1 deletion assets/vendor/manager/src/components/helpers/Modal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ function updateSubForm(value) {
function sidebarClick(id) {
document.getElementById(id).scrollIntoView();
}
const pro_badge = '<span class="badge text-bg-danger ms-2">PRO</span>';
</script>
<template>
<div class="astroid-modal modal d-block" :id="props.element.type+`-`+props.element.id" tabindex="-1" aria-hidden="true">
Expand All @@ -95,7 +96,7 @@ function sidebarClick(id) {
<p v-if="group.description" class="form-text">{{ group.description }}</p>
</div>
<div v-for="field in group.fields" :key="field.id" class="mb-4" v-show="checkShow(field)">
<div v-if="(field.input.type === `astroidradio` && field.input.role !== 'switch') || (['astroidpreloaders', 'astroidmedia', 'astroidcolor', 'astroidicon', 'astroidcalendar', 'astroidgradient', 'astroidspacing'].includes(field.input.type))" class="form-label fw-bold" v-html="field.label"></div>
<div v-if="(field.input.type === `astroidradio` && field.input.role !== 'switch') || (['astroidpreloaders', 'astroidmedia', 'astroidcolor', 'astroidicon', 'astroidcalendar', 'astroidgradient', 'astroidspacing', 'astroidgetpro'].includes(field.input.type))" class="form-label fw-bold" v-html="(field.label + (field.input.type === `astroidgetpro` ? pro_badge : ``))"></div>
<label v-else-if="field.input.type !== `astroidheading` && field.label" :for="field.input.id" class="form-label fw-bold" v-html="field.label"></label>
<div v-if="typeof field.type !== 'undefined' && field.type === `json`">
<Fields
Expand Down
19 changes: 19 additions & 0 deletions css/lenis.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
html.lenis, html.lenis body {
height: auto;
}

.lenis.lenis-smooth {
scroll-behavior: auto !important;
}

.lenis.lenis-smooth [data-lenis-prevent] {
overscroll-behavior: contain;
}

.lenis.lenis-stopped {
overflow: clip;
}

.lenis.lenis-smooth iframe {
pointer-events: none;
}
1 change: 1 addition & 0 deletions css/lenis.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion framework/elements/accordion/accordion.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @license https://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or Later
* DO NOT MODIFY THIS FILE DIRECTLY AS IT WILL BE OVERWRITTEN IN THE NEXT UPDATE
* You can easily override all files under /astroid/ folder.
* Just copy the file to JROOT/templates/YOUR_ASTROID_TEMPLATE/astroid/elements/module_position/module_position.php folder to create and override
* Just copy the file to JROOT/media/templates/site/{YOUR_TEMPLATE_NAME}/astroid/elements/module_position/module_position.php folder to create and override
*/

// No direct access.
Expand Down
2 changes: 1 addition & 1 deletion framework/elements/articles/articles.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @license https://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or Later
* DO NOT MODIFY THIS FILE DIRECTLY AS IT WILL BE OVERWRITTEN IN THE NEXT UPDATE
* You can easily override all files under /astroid/ folder.
* Just copy the file to JROOT/templates/YOUR_ASTROID_TEMPLATE/astroid/elements/module_position/module_position.php folder to create and override
* Just copy the file to JROOT/media/templates/site/{YOUR_TEMPLATE_NAME}/astroid/elements/module_position/module_position.php folder to create and override
*/

// No direct access.
Expand Down
4 changes: 2 additions & 2 deletions framework/elements/articles/articles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<option value="oldest">ASTROID_WIDGET_ORDERING_OLDEST</option>
<option value="popular">ASTROID_WIDGET_ORDERING_POPULAR</option>
<option value="featured">ASTROID_WIDGET_ORDERING_FEATURED</option>
<option value="ascending">ASTROID_WIDGET_ORDERING_ALPHABET_ASCENDING</option>
<option value="descending">ASTROID_WIDGET_ORDERING_ALPHABET_DESCENDING</option>
<option value="alphabet_asc">ASTROID_WIDGET_ORDERING_ALPHABET_ASCENDING</option>
<option value="alphabet_desc">ASTROID_WIDGET_ORDERING_ALPHABET_DESCENDING</option>
<option value="random">ASTROID_WIDGET_ORDERING_RANDOM</option>
</field>
<field astroidgroup="grid_options" name="column_responsive" type="astroidradio" width="full" default="lg">
Expand Down
2 changes: 1 addition & 1 deletion framework/elements/banner/banner.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @license https://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or Later
* DO NOT MODIFY THIS FILE DIRECTLY AS IT WILL BE OVERWRITTEN IN THE NEXT UPDATE
* You can easily override all files under /astroid/ folder.
* Just copy the file to JROOT/templates/YOUR_ASTROID_TEMPLATE/astroid/elements/banner/banner.php folder to create and override
* Just copy the file to JROOT/media/templates/site/{YOUR_TEMPLATE_NAME}/astroid/elements/banner/banner.php folder to create and override
* See https://docs.joomdev.com/article/override-core-layouts/ for documentation
*/
use Joomla\CMS\Factory;
Expand Down
2 changes: 1 addition & 1 deletion framework/elements/button/button.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @license https://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or Later
* DO NOT MODIFY THIS FILE DIRECTLY AS IT WILL BE OVERWRITTEN IN THE NEXT UPDATE
* You can easily override all files under /astroid/ folder.
* Just copy the file to JROOT/templates/YOUR_ASTROID_TEMPLATE/astroid/elements/module_position/module_position.php folder to create and override
* Just copy the file to JROOT/media/templates/site/{YOUR_TEMPLATE_NAME}/astroid/elements/module_position/module_position.php folder to create and override
*/

// No direct access.
Expand Down
2 changes: 1 addition & 1 deletion framework/elements/component/component.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* @license https://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or Later
* DO NOT MODIFY THIS FILE DIRECTLY AS IT WILL BE OVERWRITTEN IN THE NEXT UPDATE
* You can easily override all files under /astroid/ folder.
* Just copy the file to JROOT/templates/YOUR_ASTROID_TEMPLATE/astroid/elements/component/component.php folder to create and override
* Just copy the file to JROOT/media/templates/site/{YOUR_TEMPLATE_NAME}/astroid/elements/component/component.php folder to create and override
* See https://docs.joomdev.com/article/override-core-layouts/ for documentation
*/
use Joomla\CMS\Factory;
Expand Down
3 changes: 3 additions & 0 deletions framework/elements/default.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
<field astroidgroup="animation_settings" name="animation" type="astroidanimations" label="ASTROID_ANIMATION"/>
<field astroidgroup="animation_settings" ngShow="[animation]!=''" name="animation_delay" class="form-control" type="astroidtext" hint="500" default="500" label="ASTROID_ANIMATION_DELAY" description="ASTROID_ANIMATION_DELAY_DESC"/>
<field astroidgroup="animation_settings" ngShow="[animation]!=''" name="animation_duration" class="form-control" type="astroidtext" hint="500" default="500" label="ASTROID_ANIMATION_DURATION" description="ASTROID_ANIMATION_DURATION_DESC"/>
<field astroidgroup="animation_settings" ngShow="[animation]!=''" name="animation_loop" type="astroidgetpro" label="ASTROID_ANIMATION_LOOP" description="ASTROID_ANIMATION_LOOP_DESC"/>
<field astroidgroup="animation_settings" ngShow="[animation]!=''" type="astroidgetpro" name="animation_stagger" label="ASTROID_ANIMATION_STAGGER_TIME" description="ASTROID_ANIMATION_STAGGER_TIME_DESC" />
<field astroidgroup="animation_settings" ngShow="[animation]!=''" name="animation_element" type="astroidgetpro" label="ASTROID_ANIMATION_ELEMENT" description="ASTROID_ANIMATION_ELEMENT_DESC"/>

<field astroidgroup="general" name="max_width" type="astroidlist" label="ASTROID_WIDGET_MAX_WIDTH_LABEL" description="ASTROID_WIDGET_MAX_WIDTH_DESC" default="">
<option value="">JGLOBAL_INHERIT</option>
Expand Down
2 changes: 1 addition & 1 deletion framework/elements/divider/divider.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @license https://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 or Later
* DO NOT MODIFY THIS FILE DIRECTLY AS IT WILL BE OVERWRITTEN IN THE NEXT UPDATE
* You can easily override all files under /astroid/ folder.
* Just copy the file to JROOT/templates/YOUR_ASTROID_TEMPLATE/astroid/elements/module_position/module_position.php folder to create and override
* Just copy the file to JROOT/media/templates/site/{YOUR_TEMPLATE_NAME}/astroid/elements/module_position/module_position.php folder to create and override
*/

// No direct access.
Expand Down
Loading