fix: fix config for apache and nginx

Author: alexandrdrvn

plugin.php

@@ -162,28 +162,28 @@ function VFA_vuefront_admin_action_turn_on() {
 # VueFront pages
 
 # VueFront home page
-RewriteCond %{REQUEST_URI} !.*(images|index.php|.html|admin|.js|.css|.png|.jpeg|.ico|wp-json|wp-admin|checkout)
+RewriteCond %{REQUEST_URI} !.*(image|.php|admin|catalog|\/img\/.*\/|wp-json|wp-admin|wp-content|checkout|rest|static|order|themes\/|modules\/|js\/|\/vuefront\/)
 RewriteCond %{QUERY_STRING} !.*(rest_route)
 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)
+RewriteCond %{REQUEST_URI} !.*(image|.php|admin|catalog|\/img\/.*\/|wp-json|wp-admin|wp-content|checkout|rest|static|order|themes\/|modules\/|js\/|\/vuefront\/)
 RewriteCond %{QUERY_STRING} !.*(rest_route)
 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)
+RewriteCond %{REQUEST_URI} !.*(image|.php|admin|catalog|\/img\/.*\/|wp-json|wp-admin|wp-content|checkout|rest|static|order|themes\/|modules\/|js\/|\/vuefront\/)
 RewriteCond %{QUERY_STRING} !.*(rest_route)
 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)
+RewriteCond %{REQUEST_URI} !.*(image|.php|admin|catalog|\/img\/.*\/|wp-json|wp-admin|wp-content|checkout|rest|static|order|themes\/|modules\/|js\/|\/vuefront\/)
 RewriteCond %{QUERY_STRING} !.*(rest_route)
 RewriteCond %{DOCUMENT_ROOT}".$document_path."vuefront/$1.html !-f
 RewriteRule ^([^?]*) vuefront/200.html [L,QSA]";

view/javascript/d_pax/components/development.vue

@@ -49,25 +49,46 @@
       <pre>
 # VueFront scripts, styles and images
 RewriteCond %{REQUEST_URI} .*(_nuxt)
-RewriteCond %{REQUEST_URI} !.*vuefront/_nuxt
+RewriteCond %{REQUEST_URI} !.*/vuefront/_nuxt
 RewriteRule ^([^?]*) vuefront/$1
 
+# VueFront sw.js
+RewriteCond %{REQUEST_URI} .*(sw.js)
+RewriteCond %{REQUEST_URI} !.*/vuefront/sw.js
+RewriteRule ^([^?]*) vuefront/$1
+
+# VueFront favicon.ico
+RewriteCond %{REQUEST_URI} .*(favicon.ico)
+RewriteCond %{REQUEST_URI} !.*/vuefront/favicon.ico
+RewriteRule ^([^?]*) vuefront/$1
+
+
 # VueFront pages
 
 # VueFront home page
+RewriteCond %{REQUEST_URI} !.*(image|.php|admin|catalog|\/img\/.*\/|wp-json|wp-admin|wp-content|checkout|rest|static|order|themes\/|modules\/|js\/|\/vuefront\/)
+RewriteCond %{QUERY_STRING} !.*(rest_route)
+RewriteCond %{DOCUMENT_ROOT}/vuefront/index.html -f
 RewriteRule ^$ vuefront/index.html [L]
 
+RewriteCond %{REQUEST_URI} !.*(image|.php|admin|catalog|\/img\/.*\/|wp-json|wp-admin|wp-content|checkout|rest|static|order|themes\/|modules\/|js\/|\/vuefront\/)
+RewriteCond %{QUERY_STRING} !.*(rest_route)
+RewriteCond %{DOCUMENT_ROOT}/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)
+RewriteCond %{REQUEST_URI} !.*(image|.php|admin|catalog|\/img\/.*\/|wp-json|wp-admin|wp-content|checkout|rest|static|order|themes\/|modules\/|js\/|\/vuefront\/)
+RewriteCond %{QUERY_STRING} !.*(rest_route)
 RewriteCond %{DOCUMENT_ROOT}/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)
+RewriteCond %{REQUEST_URI} !.*(image|.php|admin|catalog|\/img\/.*\/|wp-json|wp-admin|wp-content|checkout|rest|static|order|themes\/|modules\/|js\/|\/vuefront\/)
+RewriteCond %{QUERY_STRING} !.*(rest_route)
 RewriteCond %{DOCUMENT_ROOT}/vuefront/$1.html !-f
 RewriteRule ^([^?]*) vuefront/200.html [L,QSA]</pre>
     </div>
@@ -88,81 +109,8 @@ RewriteRule ^([^?]*) vuefront/200.html [L,QSA]</pre>
         v-html="$t('descriptionConfigureNginx')"
       />
       <pre>
-server {
-        listen 443 ssl http2;
-        listen [::]:443 ssl http2;
-        server_name YOUR_DOMAIN;    # setup your domain here
-
-        # supply SSL certificates here
-
-        root /OPENCART_ROOT_FOLDER_PATH/vuefront; #setup your opencart root folder path here following with /vuefront on the end. This will return the VueFront Web App by default.
-        index index.html index.php;
-
-        location / {
-                try_files $uri $uri/ $uri.html /200.html;
-
-# required to return OpenCart index.php
-	location /index.php {
-		root /OPENCART_ROOT_FOLDER_PATH/; #setup your opencart root folder path
-		index index.php;
-
-		location ~ \.php$ {
-			include snippets/fastcgi-php.conf;
-			fastcgi_pass unix:/var/run/php/php7.2-fpm-opencart.vuefront.com.sock;
-		}
-	}
-
-# required to return OpenCart catalog folder
-	location /catalog {
-		root /OPENCART_ROOT_FOLDER_PATH/; #setup your opencart root folder path
-		index index.php;
-
-		location ~* \.(jpg|jpeg|gif|png|ico|pdf|ppt|bmp|rtf|svg|otf|woff|woff2|ttf)$ {
-			expires max;
-			add_header Pragma public;
-			add_header Cache-Control "public, must-revalidate, proxy-revalidate";
-		}
-
-		location ~* \.(js|css|txt)$ {
-			expires 3d;
-			add_header Pragma public;
-			add_header Cache-Control "public, must-revalidate, proxy-revalidate";
-		}
-	}
-
-# required to return the OpenCart admin folder
-	location /admin {
-		root /OPENCART_ROOT_FOLDER_PATH/; #setup your opencart root folder path
-		index index.php;
-
-		location ~ \.php$ {
-			include snippets/fastcgi-php.conf;
-					fastcgi_pass unix:/var/run/php/php7.2-fpm-opencart.vuefront.com.sock;
-		}
-	}
-# required to return images
-	location /image {
-		root /OPENCART_ROOT_FOLDER_PATH/; #setup your opencart root folder path
-		index index.php;
-
-		location ~* \.(jpg|jpeg|gif|png|ico|pdf|ppt|bmp|rtf|svg|otf|woff|woff2|ttf)$ {
-			expires max;
-			add_header Pragma public;
-			add_header Cache-Control "public, must-revalidate, proxy-revalidate";
-		}
-
-		location ~* \.(js|css|txt)$ {
-			expires 3d;
-			add_header Pragma public;
-			add_header Cache-Control "public, must-revalidate, proxy-revalidate";
-		}
-	}
-
-#You should have it already since you are running OpenCart on Nginx. But just in case, we supplied this rule below.
-        location ~ \.php$ {
-                include snippets/fastcgi-php.conf;
-                fastcgi_pass unix:/var/run/php/YOUR_PHP_FPM_SOKET.sock; #setup your php-fpm socket
-        }
+location ~ ^((?!image|.php|admin|catalog|\/img\/.*\/|wp-json|wp-admin|wp-content|checkout|rest|static|order|themes\/|modules\/|js\/|\/vuefront\/).)*$ {
+    try_files /vuefront/$uri /vuefront/$uri "/vuefront${uri}index.html" /vuefront$uri.html /vuefront/200.html;
 }</pre>
     </div>
   </div>