Skip to content

Commit 6eccd4c

Browse files
committed
feat: add first screen popup and error message
1 parent 36a7d0f commit 6eccd4c

File tree

57 files changed

+1051
-202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+1051
-202
lines changed

controllers/admin/AdminVuefrontAjaxController.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ public function ajaxProcessVfTurnOff()
1717
{
1818
if (strpos($_SERVER["SERVER_SOFTWARE"], "Apache") !== false) {
1919
if (file_exists(_PS_ROOT_DIR_ . '/modules/vuefront/.htaccess.txt')) {
20+
if(!is_writable(_PS_ROOT_DIR_ . '/.htaccess') || !is_writable(_PS_ROOT_DIR_ . '/modules/vuefront/.htaccess.txt')) {
21+
22+
http_response_code(500);
23+
24+
die(Tools::jsonEncode(
25+
array(
26+
'error' => 'not_writable_htaccess'
27+
)
28+
));
29+
}
2030
$content = file_get_contents(_PS_ROOT_DIR_ . '/modules/vuefront/.htaccess.txt');
2131
file_put_contents(_PS_ROOT_DIR_ . '/.htaccess', $content);
2232
unlink(_PS_ROOT_DIR_ . '/modules/vuefront/.htaccess.txt');
@@ -52,6 +62,15 @@ public function ajaxProcessVfTurnOn() {
5262
RewriteRule ^([^?]*) index.php?_route_=$1 [L,QSA]");
5363
}
5464

65+
if(!is_writable(_PS_ROOT_DIR_ . '/.htaccess')) {
66+
http_response_code(500);
67+
die(Tools::jsonEncode(
68+
array(
69+
'error' => 'not_writable_htaccess'
70+
)
71+
));
72+
}
73+
5574
if (file_exists(_PS_ROOT_DIR_ . '/.htaccess')) {
5675
$inserting = "# VueFront scripts, styles and images
5776
RewriteCond %{REQUEST_URI} .*(_nuxt)

views/js/d_pax/assets/img/Bottom_image.svg

100644100755
File mode changed.

views/js/d_pax/assets/img/Top_image.svg

100644100755
File mode changed.

views/js/d_pax/assets/img/firstBuild.svg

Lines changed: 272 additions & 0 deletions
Loading

views/js/d_pax/assets/img/footer-modal.svg

100644100755
File mode changed.

views/js/d_pax/assets/img/rocket.png

100644100755
File mode changed.

views/js/d_pax/assets/img/rocket.svg

100644100755
File mode changed.

views/js/d_pax/assets/scss/_modal.scss

100644100755
File mode changed.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/* Error: Can't find stylesheet to import.
2+
* ,
3+
* 3 | @import 'node_modules/bootstrap/scss/functions';
4+
* | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5+
* '
6+
* main.scss 3:11 root stylesheet */
7+
8+
body::before {
9+
font-family: "Source Code Pro", "SF Mono", Monaco, Inconsolata, "Fira Mono",
10+
"Droid Sans Mono", monospace, monospace;
11+
white-space: pre;
12+
display: block;
13+
padding: 1em;
14+
margin-bottom: 1em;
15+
border-bottom: 2px solid black;
16+
content: "Error: Can't find stylesheet to import.\a \2577 \a 3 \2502 @import 'node_modules/bootstrap/scss/functions';\a \2502 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\a \2575 \a main.scss 3:11 root stylesheet";
17+
}

views/js/d_pax/components/activity.vue

100644100755
File mode changed.

0 commit comments

Comments
 (0)