Merge branch 'dev' of https://github.com/microweber/microweber into dev

microweber · Apr 28, 2022 · fb8781f · fb8781f
2 parents ba96337 + 303a582
commit fb8781f
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 20 deletions.
diff --git a/.github/workflows/build-and-upload.yml b/.github/workflows/build-and-upload.yml
@@ -39,20 +39,23 @@ jobs:
         rm -rf .github
         find . \( -name ".git" -o -name ".gitignore" -o -name ".gitmodules" -o -name ".gitattributes" \) -exec rm -rf -- {} +
         zip -r microweber-${{ env.GITHUB_REF_SLUG }}.zip `ls -A`
-        curl -T microweber-${{ env.GITHUB_REF_SLUG }}.zip ftp://${{ secrets.FTP_USERNAME }}:${{ secrets.FTP_PASSWORD }}@${{ secrets.FTP_HOST }}
+    - name: Upload zip
+      run: |
+        echo insecure >> ~/.curlrc
+        curl -T microweber-${{ env.GITHUB_REF_SLUG }}.zip ftp://${{ secrets.FTP_USERNAME }}:${{ secrets.FTP_PASSWORD }}@${{ secrets.FTP_HOST }} --no-epsv
         cp microweber-${{ env.GITHUB_REF_SLUG }}.zip microweber.zip
-        curl -T microweber.zip ftp://${{ secrets.FTP_USERNAME }}:${{ secrets.FTP_PASSWORD }}@${{ secrets.FTP_HOST }}/builds/${{ env.GITHUB_REF_SLUG }}/ --ftp-create-dirs
+        curl -T microweber.zip ftp://${{ secrets.FTP_USERNAME }}:${{ secrets.FTP_PASSWORD }}@${{ secrets.FTP_HOST }}/builds/${{ env.GITHUB_REF_SLUG }}/ --ftp-create-dirs --no-epsv
     - name: Upload composer.json
       run: |
         cp -r composer.json microweber-${{ env.GITHUB_REF_SLUG }}.composer.json
         curl -T microweber-${{ env.GITHUB_REF_SLUG }}.composer.json ftp://${{ secrets.FTP_USERNAME }}:${{ secrets.FTP_PASSWORD }}@${{ secrets.FTP_HOST }}
-        curl -T composer.json ftp://${{ secrets.FTP_USERNAME }}:${{ secrets.FTP_PASSWORD }}@${{ secrets.FTP_HOST }}/builds/${{ env.GITHUB_REF_SLUG }}/ --ftp-create-dirs
-        curl -T composer.lock ftp://${{ secrets.FTP_USERNAME }}:${{ secrets.FTP_PASSWORD }}@${{ secrets.FTP_HOST }}/builds/${{ env.GITHUB_REF_SLUG }}/ --ftp-create-dirs
+        curl -T composer.json ftp://${{ secrets.FTP_USERNAME }}:${{ secrets.FTP_PASSWORD }}@${{ secrets.FTP_HOST }}/builds/${{ env.GITHUB_REF_SLUG }}/ --ftp-create-dirs --no-epsv
+        curl -T composer.lock ftp://${{ secrets.FTP_USERNAME }}:${{ secrets.FTP_PASSWORD }}@${{ secrets.FTP_HOST }}/builds/${{ env.GITHUB_REF_SLUG }}/ --ftp-create-dirs --no-epsv
     - name: Upload version.txt
       run: |
         cp -r version.txt microweber-${{ env.GITHUB_REF_SLUG }}.version.txt
-        curl -T microweber-${{ env.GITHUB_REF_SLUG }}.version.txt ftp://${{ secrets.FTP_USERNAME }}:${{ secrets.FTP_PASSWORD }}@${{ secrets.FTP_HOST }}
-        curl -T version.txt ftp://${{ secrets.FTP_USERNAME }}:${{ secrets.FTP_PASSWORD }}@${{ secrets.FTP_HOST }}/builds/${{ env.GITHUB_REF_SLUG }}/ --ftp-create-dirs
-        curl -T CHANGELOG.md ftp://${{ secrets.FTP_USERNAME }}:${{ secrets.FTP_PASSWORD }}@${{ secrets.FTP_HOST }}/builds/${{ env.GITHUB_REF_SLUG }}/ --ftp-create-dirs
-        curl -T README.md ftp://${{ secrets.FTP_USERNAME }}:${{ secrets.FTP_PASSWORD }}@${{ secrets.FTP_HOST }}/builds/${{ env.GITHUB_REF_SLUG }}/ --ftp-create-dirs
+        curl -T microweber-${{ env.GITHUB_REF_SLUG }}.version.txt ftp://${{ secrets.FTP_USERNAME }}:${{ secrets.FTP_PASSWORD }}@${{ secrets.FTP_HOST }} --no-epsv
+        curl -T version.txt ftp://${{ secrets.FTP_USERNAME }}:${{ secrets.FTP_PASSWORD }}@${{ secrets.FTP_HOST }}/builds/${{ env.GITHUB_REF_SLUG }}/ --ftp-create-dirs --no-epsv
+        curl -T CHANGELOG.md ftp://${{ secrets.FTP_USERNAME }}:${{ secrets.FTP_PASSWORD }}@${{ secrets.FTP_HOST }}/builds/${{ env.GITHUB_REF_SLUG }}/ --ftp-create-dirs --no-epsv
+        curl -T README.md ftp://${{ secrets.FTP_USERNAME }}:${{ secrets.FTP_PASSWORD }}@${{ secrets.FTP_HOST }}/builds/${{ env.GITHUB_REF_SLUG }}/ --ftp-create-dirs --no-epsv
 
diff --git a/src/MicroweberPackages/App/Http/Controllers/FrontendController.php b/src/MicroweberPackages/App/Http/Controllers/FrontendController.php
@@ -153,6 +153,16 @@ public function frontend($request_params = [])
         }
 
 
+        $animations = get_option( 'animations-global', 'template');
+        if($animations) {
+             if($animations) {
+                mw()->template->head('<script id="template-animations-data">mw.__pageAnimations = ' . $animations . '</script>');
+            }
+        }
+
+
+
+
         $page = false;
 
         if ($page == false and !empty($this->page)) {

diff --git a/tests/Browser/AdminAddCategoryTest.php b/tests/Browser/AdminAddCategoryTest.php
@@ -71,7 +71,12 @@ public function testAddCategory()
                 $browser->addImage(userfiles_path() . '/templates/default/img/patterns/img3.jpg');
             });
 
-            $browser->scrollTo('@category-save');
+            $browser->scrollTo('#content-title-field');
+            $browser->pause(1000);
+
+            $browser->scrollTo('[dusk="category-save"]');
+            $browser->pause(1000);
+
             $browser->click('@category-save');
             $browser->pause(2000);
 

diff --git a/userfiles/modules/microweber/api/api.js b/userfiles/modules/microweber/api/api.js
@@ -1081,19 +1081,9 @@ if(isset($inline_scripts) and is_array($inline_scripts)){
 
 
 
-    mw.__pageAnimations = [ ];
+    mw.__pageAnimations = mw.__pageAnimations || [];
 
-    <?php
-        $animations = get_option( 'animations-global', 'page-animations');
-        // var_dump($animations);
-        if($animations) {
-            // $animations = @json_decode($animations, true);
-            if($animations) {
 
-                print('mw.__pageAnimations = ' . $animations . ';');
-            }
-        }
-    ?>
 
     var prefix = 'animate__';
     var suffix = 'animated';