fix: fix styles and bug with DOCUMENT_ROOT

Author: alexandrdrvn

controllers/admin/AdminVuefrontAjaxController.php

@@ -43,6 +43,11 @@ public function ajaxProcessVfTurnOn() {
 
         $catalog_path = $catalog_url_info['path'];
 
+        $document_path = $catalog_path;
+        if(!empty($_SERVER['DOCUMENT_ROOT'])) {
+          $document_path = str_replace(realpath($_SERVER['DOCUMENT_ROOT']), '', realpath(_PS_ROOT_DIR_)) . '/';
+        }
+
         if (strpos($_SERVER["SERVER_SOFTWARE"], "Apache") !== false) {
 
             if(!file_exists(_PS_ROOT_DIR_ . '/.htaccess')) {
@@ -93,28 +98,28 @@ public function ajaxProcessVfTurnOn() {
 # VueFront home page
 RewriteCond %{REQUEST_URI} !.*(images|index.php|.html|admin|.js|.css|.png|.jpeg|.ico|wp-json|wp-admin|checkout|jpg)
 RewriteCond %{QUERY_STRING} !.*(rest_route)
-RewriteCond %{DOCUMENT_ROOT}".$catalog_path."vuefront/index.html -f
+RewriteCond %{DOCUMENT_ROOT}".$document_path."vuefront/index.html -f
 RewriteRule ^$ vuefront/index.html [L]
 
 RewriteCond %{REQUEST_URI} !.*(images|index.php|.html|admin|.js|.css|.png|.jpeg|.ico|wp-json|wp-admin|checkout|jpg)
 RewriteCond %{QUERY_STRING} !.*(rest_route)
-RewriteCond %{DOCUMENT_ROOT}".$catalog_path."vuefront/index.html !-f
+RewriteCond %{DOCUMENT_ROOT}".$document_path."vuefront/index.html !-f
 RewriteRule ^$ vuefront/200.html [L]
 
 # VueFront page if exists html file
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteCond %{REQUEST_URI} !.*(images|index.php|.html|admin|.js|.css|.png|.jpeg|.ico|wp-json|wp-admin|checkout|jpg)
 RewriteCond %{QUERY_STRING} !.*(rest_route)
-RewriteCond %{DOCUMENT_ROOT}".$catalog_path."vuefront/$1.html -f
+RewriteCond %{DOCUMENT_ROOT}".$document_path."vuefront/$1.html -f
 RewriteRule ^([^?]*) vuefront/$1.html [L,QSA]
 
 # VueFront page if not exists html file
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
 RewriteCond %{REQUEST_URI} !.*(images|index.php|.html|admin|.js|.css|.png|.jpeg|.ico|wp-json|wp-admin|checkout|jpg)
 RewriteCond %{QUERY_STRING} !.*(rest_route)
-RewriteCond %{DOCUMENT_ROOT}".$catalog_path."vuefront/$1.html !-f
+RewriteCond %{DOCUMENT_ROOT}".$document_path."vuefront/$1.html !-f
 RewriteRule ^([^?]*) vuefront/200.html [L,QSA]";
 
                 $content = file_get_contents(_PS_ROOT_DIR_ . '/.htaccess');

views/js/d_pax/components/header/Account.vue

@@ -1,5 +1,8 @@
 <template>
-  <div class="header-account">
+  <div
+    id="vf-header-account"
+    class="header-account"
+  >
     <b-nav-item-dropdown
       toggle-class="text-decoration-none text-1 m-0 font-weight-semibold"
       no-caret
@@ -84,7 +87,7 @@ export default {
 }
 </script>
 <style lang="scss">
-  .header-account {
+  #vf-header-account.header-account {
     display: flex;
     align-items: center;
     height: 52px;
@@ -93,7 +96,7 @@ export default {
     background-color: $white;
     padding: 13px 17px;
 
-    &__separator {
+    .header-account__separator {
       border-top: 1px solid $white-eight;
       margin-top: 0;
       margin: 15px 0;
@@ -159,12 +162,12 @@ export default {
       box-shadow: none;
     }
 
-    &__icon {
+    .header-account__icon {
       font-size: 24px;
       color: #1a1a1a;
     }
 
-    &__full_name {
+    .header-account__full_name {
       margin-right: 5px;
       font-size: 18px;
       font-weight: 600;
@@ -177,7 +180,7 @@ export default {
       }
     }
 
-    &__image {
+    .header-account__image {
       border-radius: 50%;
       margin-right: 10px;
       width: 24px;

views/js/d_pax/webpack.config.js

@@ -140,7 +140,9 @@ module.exports = (env, argv) => {
                   let newBuffer = new Buffer.from(body)
 
                   const gzipRes =  isZipped ? zlib.gzipSync(newBuffer) : newBuffer
-                  res.setHeader('content-length', gzipRes.length);
+                  if(isZipped) {
+                    res.setHeader('content-length', gzipRes.length);
+                  }
                   _write.call(res, gzipRes)
                 } catch (e) {
                   _write.call(res, buffer)