Skip to content

Commit 5cecbcb

Browse files
jissereitsmajissereitsma
committed
Pending changes
2 parents 81e4864 + 2345b34 commit 5cecbcb

12 files changed

Lines changed: 27 additions & 64 deletions

File tree

‎ViewModel/FormKeyValue.php‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎composer.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"ext-pcre": "*",
88
"magento/framework": "^103.0",
99
"magento/module-csp": "^100.0",
10-
"magento/module-store": "^101.1"
10+
"magento/module-store": "^101.1",
11+
"loki/magento2-base": "^1.0"
1112
},
1213
"license": [
1314
"OSL-3.0"

‎etc/module.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<sequence>
55
<module name="Magento_Store"/>
66
<module name="Magento_Csp"/>
7+
<module name="Loki_Base"/>
78
</sequence>
89
</module>
910
</config>

‎view/frontend/layout/loki_theme_default.xml‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,9 @@
11
<?xml version="1.0"?>
22
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:View/Layout:etc/page_configuration.xsd">
3-
<body>
4-
<referenceContainer name="before.body.end">
5-
<block name="loki.alpinejs" template="Loki_Theme::script/alpine-csp.phtml"/>
6-
7-
<block name="loki.script.variables" template="Loki_Theme::script/variables.phtml">
8-
<arguments>
9-
<argument name="form_key_value" xsi:type="object">Loki\Theme\ViewModel\FormKeyValue</argument>
10-
</arguments>
11-
</block>
12-
13-
<block name="loki.script.cookies" template="Loki_Theme::script/cookies.phtml">
14-
<arguments>
15-
<argument name="cookie_config" xsi:type="object">Loki\Theme\ViewModel\CookieConfig</argument>
16-
</arguments>
17-
</block>
18-
19-
<block name="loki.script.store.local-storage" template="Loki_Theme::script/store/local-storage.phtml"/>
3+
<update handle="loki_base"/>
204

5+
<body>
6+
<referenceContainer name="loki.components">
217
<block name="loki.script.components.main-menu" template="Loki_Theme::script/components/main-menu.phtml"/>
228
<block name="loki.script.components.newsletter" template="Loki_Theme::script/components/newsletter.phtml"/>
239
<block name="loki.script.components.messages" template="Loki_Theme::script/components/messages.phtml"/>

‎view/frontend/templates/script/components/category/add-to-cart.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ use Magento\Framework\View\Element\Template;
3535
},
3636
body: data
3737
}).finally(function () {
38-
Alpine.store('LumaLocalStorage').refresh('cart,messages');
38+
Alpine.store('LokiLocalStorage').refresh('cart,messages');
3939
button.disabled = false;
4040
});
4141
});

‎view/frontend/templates/script/components/category/add-to-wishlist.phtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ use Magento\Framework\View\Element\Template;
1717
element.addEventListener('click', (e) => {
1818
e.preventDefault();
1919

20-
const customerSection = Alpine.store('LumaLocalStorage').get('customer');
20+
const customerSection = Alpine.store('LokiLocalStorage').get('customer');
2121
if (!customerSection.fullname) {
22-
Alpine.store('LumaMessageStore').addNoticeMessage('<?= __('You need to login to use the wishlist') ?>');
22+
Alpine.store('LokiMessageStore').addNoticeMessage('<?= __('You need to login to use the wishlist') ?>');
2323
return;
2424
}
2525

‎view/frontend/templates/script/components/messages.phtml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ if (false === is_numeric($timeout)) {
1919
return;
2020
}
2121

22-
const store = Alpine.store('LumaLocalStorage');
22+
return;
23+
24+
const store = Alpine.store('LokiLocalStorage');
2325

2426
function displayMessages(messages) {
25-
if (!messages.length > 0) {
27+
if (!messages || !messages.length > 0) {
2628
return;
2729
}
2830

@@ -50,16 +52,16 @@ if (false === is_numeric($timeout)) {
5052
});
5153
}
5254

55+
displayMessages(Alpine.store('LokiMessageStore').getMessages());
56+
5357
Alpine.effect(() => {
5458
if (!store.data || !store.data.messages || !store.data.messages.messages) {
5559
return;
5660
}
5761

58-
const messages = Alpine.store('LumaLocalStorage').data.messages.messages;
62+
const messages = Alpine.store('LokiMessageStore').getMessages();
5963
displayMessages(messages);
60-
store.remove('messages');
64+
Alpine.store('LokiMessageStore').reset();
6165
})
62-
63-
displayMessages(LokiCookies.get('mage-messages'));
6466
});
6567
</script>

‎view/frontend/templates/script/components/minicart.phtml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use Magento\Framework\View\Element\Template;
2121
}
2222

2323
Alpine.effect(() => {
24-
this.cart = Alpine.store('LumaLocalStorage').get('cart');
24+
this.cart = Alpine.store('LokiLocalStorage').get('cart');
2525

2626
const qty = this.$el.querySelector('span.counter.qty');
2727
if (qty) {
@@ -85,10 +85,10 @@ use Magento\Framework\View\Element\Template;
8585
.then(response => response.json())
8686
.then(data => {
8787
if (data.success) {
88-
Alpine.store('LumaLocalStorage').refresh('cart');
88+
Alpine.store('LokiLocalStorage').refresh('cart');
8989
}
9090

91-
Alpine.store('LumaMessageStore').addNoticeMessage('<?= $escaper->escapeHtml(__('Updated quantity')) ?>');
91+
Alpine.store('LokiMessageStore').addNoticeMessage('<?= $escaper->escapeHtml(__('Updated quantity')) ?>');
9292
});
9393
},
9494
hasCartItems() {
@@ -121,10 +121,10 @@ use Magento\Framework\View\Element\Template;
121121
.then(response => response.json())
122122
.then(data => {
123123
if (data.success) {
124-
Alpine.store('LumaLocalStorage').refresh('cart');
124+
Alpine.store('LokiLocalStorage').refresh('cart');
125125
}
126126

127-
Alpine.store('LumaMessageStore').addNoticeMessage('<?= $escaper->escapeHtml(__('Removed item')) ?>');
127+
Alpine.store('LokiMessageStore').addNoticeMessage('<?= $escaper->escapeHtml(__('Removed item')) ?>');
128128
});
129129
}
130130
}));

‎view/frontend/templates/script/components/newsletter.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use Magento\Framework\View\Element\Template;
2222
}
2323

2424
// @todo Validate email
25-
Alpine.store('LumaLocalStorage').remove('messages');
25+
Alpine.store('LokiLocalStorage').remove('messages');
2626

2727
var formKeyInput = document.createElement('input');
2828
formKeyInput.name = 'form_key';

‎view/frontend/templates/script/components/product/addtocart.phtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ use Magento\Framework\View\Element\Template;
3838
},
3939
body: data
4040
}).finally(function () {
41-
Alpine.store('LumaLocalStorage').refresh('cart');
42-
Alpine.store('LumaLocalStorage').refresh('messages');
41+
Alpine.store('LokiLocalStorage').refresh('cart');
42+
Alpine.store('LokiLocalStorage').refresh('messages');
4343
button.disabled = false;
4444
});
4545
});

0 commit comments

Comments
 (0)