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

Develop #243

Merged
merged 73 commits into from
Aug 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
5194b3d
add bouton to edit page on listing (product / category and CMS)
PrestaSafe Jan 26, 2024
69ea18b
php-cs-fixer
PrestaSafe Jan 26, 2024
fc471e9
add updates
PrestaSafe Feb 19, 2024
faf406f
Keep url in main url for an easy reloading.
PrestaSafe Feb 22, 2024
5c7cafb
VueQuill OK !
PrestaSafe Feb 23, 2024
87a6f0f
Save date OK need to update format
PrestaSafe Feb 24, 2024
24c5c8e
update packages
PrestaSafe Feb 24, 2024
27b1a8f
php-cs-fixer
PrestaSafe Feb 24, 2024
9446e8a
update vite config + make minor fixes
PrestaSafe Mar 6, 2024
e4fd5ca
move prettyblocks.js, fix multizone names add dynamic zone on products
PrestaSafe Mar 10, 2024
b6f623f
Merge 2 config from hookbeforeRendering
PrestaSafe Mar 11, 2024
b46c22e
create defautl blocks
PrestaSafe Mar 11, 2024
dae05b3
Merge pull request #218 from PrestaSafe/merge-config-on-hookbeforeRen…
PrestaSafe Mar 11, 2024
a1c10e1
Block tiny Slider OK
PrestaSafe Mar 20, 2024
3ff29a4
php-cs-fixer + autoindex
PrestaSafe Mar 20, 2024
db9fc6c
check point
PrestaSafe Mar 25, 2024
b89f019
Add features
PrestaSafe Mar 27, 2024
68fb1b6
cs-fixer + autoindex
PrestaSafe Mar 27, 2024
9041ecf
custom header
PrestaSafe Mar 27, 2024
636c94a
add private settings
PrestaSafe Mar 28, 2024
6eabc44
remove dupplicate on subitem
PrestaSafe Mar 28, 2024
8ed4e90
fix upgrade 2.2.X to 3.0.0
PrestaSafe Mar 29, 2024
ea88806
add cache on blocks
PrestaSafe Apr 4, 2024
6ed4a99
fix
PrestaSafe Apr 9, 2024
726d07d
fix custom image add FAQ
PrestaSafe Apr 26, 2024
8524609
Custom text block
PrestaSafe Apr 26, 2024
09d40ec
load styles if blocks are loaded
PrestaSafe Apr 26, 2024
34448f0
add all default blocks and remane it add licences
PrestaSafe Apr 29, 2024
4d4b386
ignore all node_modules
PrestaSafe Apr 29, 2024
587b6c8
fix + autoindex
PrestaSafe Apr 29, 2024
0c7f65e
add margins and paddings
PrestaSafe Jun 22, 2024
c5e91a5
cs-fixer + autoindex
PrestaSafe Jun 22, 2024
ebd9236
add margins / paddings and generated classes
PrestaSafe Jun 24, 2024
70bb81e
add translations for paddings and margins
PrestaSafe Jun 25, 2024
59f5d84
secure field type date
PrestaSafe Jun 25, 2024
d5d5c63
Merge pull request #233 from PrestaSafe/add-btn-list
PrestaSafe Jun 25, 2024
b6c6853
add Vue component, create php method.
PrestaSafe Jun 25, 2024
1c2c812
Merge pull request #234 from PrestaSafe/feature/add-input-slider
PrestaSafe Jun 25, 2024
79e3c22
add force_full_witdh
PrestaSafe Jun 26, 2024
612f4ad
Merge pull request #235 from PrestaSafe/feature/add-force-full-witdh
PrestaSafe Jun 26, 2024
a9210d4
fix zoneHasBlock in multilang / multishop
PrestaSafe Jul 1, 2024
54ee520
change format vue date picker
PrestaSafe Jul 11, 2024
836c858
empty state on loading
PrestaSafe Jul 11, 2024
aeba959
fix format of type date
PrestaSafe Jul 11, 2024
6ddd4ff
fix left / right = 0 on default
PrestaSafe Jul 11, 2024
66b213b
add classes and styles on title
PrestaSafe Jul 11, 2024
7e244a3
rebuild iframe management
PrestaSafe Jul 29, 2024
af3bf31
reload ajax for FAQ Block
PrestaSafe Jul 29, 2024
f7d00b1
add download
PrestaSafe Jul 30, 2024
13142d0
update badge position
PrestaSafe Jul 30, 2024
69a4db9
update bade position
PrestaSafe Jul 30, 2024
1afba15
reformat some const in computed
PrestaSafe Aug 13, 2024
7ae5a46
open backoffice in _blank, open current url instead of shop.
PrestaSafe Aug 13, 2024
14d16cc
remove iframe class and allow="geolocation; microphone; camera; midi;…
PrestaSafe Aug 13, 2024
8d8b2f0
update modal of languages
PrestaSafe Aug 13, 2024
e03821d
update EventHandler and updateTitleComponent in export function
PrestaSafe Aug 13, 2024
486d2bc
isolate updateTitleComponent in an exportable function
PrestaSafe Aug 13, 2024
794f80c
delete iframe.js
PrestaSafe Aug 13, 2024
a13e3a1
clean code
PrestaSafe Aug 13, 2024
e57e1a1
update stores and add errormessage
PrestaSafe Aug 13, 2024
549661c
add translations
PrestaSafe Aug 13, 2024
e4fc7ad
update readme and build
PrestaSafe Aug 13, 2024
a34c705
Add legend #241
PrestaSafe Aug 13, 2024
145216f
Change way to get settings and fix $context variable overriden.
PrestaSafe Aug 15, 2024
4fa043b
update dotenv in prettyblocks.php, add auto_feed_zone params. update …
PrestaSafe Aug 16, 2024
52f72bb
hide renderBlocks for now
PrestaSafe Aug 16, 2024
f8b326d
update php version for fixer php-cs-fixer
PrestaSafe Aug 16, 2024
d53f757
disable php-cs-fixer github action
PrestaSafe Aug 16, 2024
2385776
Merge pull request #237 from PrestaSafe/rebuild-iframe
PrestaSafe Aug 16, 2024
ef5d24f
update name
PrestaSafe Aug 16, 2024
2f6bede
add pro blocks links.
PrestaSafe Aug 16, 2024
996306a
Change shop url (when multishop).
PrestaSafe Aug 19, 2024
a649004
php-cs-fixer + autoindex
PrestaSafe Aug 19, 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
11 changes: 11 additions & 0 deletions .env.exemple
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
## VITE JS
# PRETTYBLOCKS_VITE_DEV=false
# PRETTYBLOCKS_CUSTOM_HEADERS=null,*,'null'
# PRETTYBLOCKS_VITE_HOST='http://localhost:3002/'
# PRETTYBLOCKS_IFRAME_SANDBOX='allow-same-origin allow-scripts allow-forms allow-popups allow-presentation allow-top-navigation allow-pointer-lock allow-popups-to-escape-sandbox allow-modals allow-top-navigation-by-user-activation'

## Auto feeed zones
# DISABLE_AUTO_FEED_ZONE_PRODUCT_DESCRIPTION=true
# DISABLE_AUTO_FEED_ZONE_PRODUCT_DESCRIPTION_SHORT=true
# DISABLE_AUTO_FEED_ZONE_CATEGORY_DESCRIPTION=true
# DISABLE_AUTO_FEED_ZONE_CMS_CONTENT=true
46 changes: 23 additions & 23 deletions .github/workflows/php.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
name: PHP tests
on: [push, pull_request]
# name: PHP tests
# on: [push, pull_request]

jobs:
# Check the PHP code follow the coding standards
php-cs-fixer:
name: PHP-CS-Fixer
runs-on: ubuntu-latest
steps:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.1'
- name: Checkout
uses: actions/checkout@v3
- name: Cache dependencies
uses: actions/cache@v3
with:
path: vendor
key: php-${{ hashFiles('composer.lock') }}
- name: Install dependencies
run: composer install
- name: Run PHP-CS-Fixer
run: ./vendor/bin/php-cs-fixer fix --dry-run --diff --using-cache=no
# jobs:
# # Check the PHP code follow the coding standards
# php-cs-fixer:
# name: PHP-CS-Fixer
# runs-on: ubuntu-latest
# steps:
# - name: Setup PHP
# uses: shivammathur/setup-php@v2
# with:
# php-version: '8.2'
# - name: Checkout
# uses: actions/checkout@v3
# - name: Cache dependencies
# uses: actions/cache@v3
# with:
# path: vendor
# key: php-${{ hashFiles('composer.lock') }}
# - name: Install dependencies
# run: composer install
# - name: Run PHP-CS-Fixer
# run: ./vendor/bin/php-cs-fixer fix --dry-run --diff --using-cache=no
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@ build/
vendor/
node_modules/
**/node_modules
**node_modules**
.vscode/
views/images/*
!views/images/favicon.ico
**.DS_Store**
test.php
.php-cs-fixer.cache
_dev/yarn.lock
_dev/yarn.lock
.env
!views/js/build
14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
</p>

# PrettyBlocks
<br>

![Téléchargements](https://img.shields.io/github/downloads/PrestaSafe/prettyblocks/total)

Le premier page builder open conçu pour PrestaShop !

La documentation technique est disponible ici : [https://prettyblocks.io/](https://prettyblocks.io/):
Expand Down Expand Up @@ -67,12 +71,10 @@ You can also add our module ClassicBlocks for having 4 blocks to use [Download C
Discover our [PrestaShop SEO / Performance and Mobile Optimized Theme: CartZilla](https://www.prestasafe.com/product/theme-prestashop-cartzilla) compatible PrettyBlocks !

## Top contributors
Thanks to [Micka FDZ](https://github.com/micka-fdz) and [JF Viguier](https://github.com/jf-viguier) from the team [Creabilis](https://www.creabilis.com/)
![logo_creabilis](https://github.com/PrestaSafe/prettyblocks/assets/4788787/bbde201e-f70f-4f78-8794-8bcaba661f57)

## Sponsors
Thanks to our sponsor(s):
![devle__or_3](https://github.com/PrestaSafe/prettyblocks/assets/4788787/c2ee2b6e-b963-4969-bfd4-133fcdc7f3c2)
<p>Thanks to</p>
<a href="https://github.com/PrestaSafe/prettyblocks/graphs/contributors">
<img src="https://contrib.rocks/image?repo=PrestaSafe/prettyblocks" />
</a>


## License
Expand Down
Loading
Loading