Skip to content

Commit 5f0dfb8

Browse files
damcoudamcou
authored
MAGE-926: JS folders reorg (#1563)
* MAGE-926: port changes from PR #1506 * MAGE-926: port changes from PR #1506 * MAGE-926: fix logo path * MAGE-926: move css file into appropriate folder * MAGE-926: move js templates from internals
1 parent ffd0f02 commit 5f0dfb8

31 files changed

+23
-23
lines changed

‎Block/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ public function getConfiguration()
292292
'popularQueries' => $suggestionHelper->getPopularQueries($this->getStoreId()),
293293
'useAdaptiveImage' => $config->useAdaptiveImage(),
294294
'urls' => [
295-
'logo' => $this->getViewFileUrl('Algolia_AlgoliaSearch::images/algolia-logo-blue.svg'),
295+
'logo' => $this->getViewFileUrl('Algolia_AlgoliaSearch::js/images/algolia-logo-blue.svg'),
296296
],
297297
'cookieConfiguration' => [
298298
'customerTokenCookie' => InsightsHelper::ALGOLIA_CUSTOMER_USER_TOKEN_COOKIE_NAME,

‎view/frontend/layout/algolia_search_handle.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0"?>
22
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
33
<head>
4-
<css src="Algolia_AlgoliaSearch::internals/autocomplete.css" />
5-
<css src="Algolia_AlgoliaSearch::internals/grid.css" />
6-
<css src="Algolia_AlgoliaSearch::internals/algolia-reset.css" />
7-
<css src="Algolia_AlgoliaSearch::internals/instantsearch.v3.css" />
8-
<css src="Algolia_AlgoliaSearch::internals/recommend.css" />
4+
<css src="Algolia_AlgoliaSearch::css/autocomplete.css" />
5+
<css src="Algolia_AlgoliaSearch::css/grid.css" />
6+
<css src="Algolia_AlgoliaSearch::css/algolia-reset.css" />
7+
<css src="Algolia_AlgoliaSearch::css/instantsearch.v3.css" />
8+
<css src="Algolia_AlgoliaSearch::css/recommend.css" />
99
</head>
1010
<body>
1111
<referenceBlock name="head.additional">

‎view/frontend/requirejs-config.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,29 @@ var config = {
22
map : {
33
'*': {
44
// Magento FE libs
5-
'algoliaCommon' : 'Algolia_AlgoliaSearch/internals/common',
6-
'algoliaAutocomplete' : 'Algolia_AlgoliaSearch/autocomplete',
7-
'algoliaInstantSearch': 'Algolia_AlgoliaSearch/instantsearch',
8-
'algoliaInsights' : 'Algolia_AlgoliaSearch/insights',
9-
'algoliaHooks' : 'Algolia_AlgoliaSearch/hooks',
5+
'algoliaCommon' : 'Algolia_AlgoliaSearch/js/internals/common',
6+
'algoliaAutocomplete' : 'Algolia_AlgoliaSearch/js/autocomplete',
7+
'algoliaInstantSearch': 'Algolia_AlgoliaSearch/js/instantsearch',
8+
'algoliaInsights' : 'Algolia_AlgoliaSearch/js/insights',
9+
'algoliaHooks' : 'Algolia_AlgoliaSearch/js/hooks',
1010

1111
// Autocomplete templates
12-
'productsHtml' : 'Algolia_AlgoliaSearch/internals/template/autocomplete/products',
13-
'pagesHtml' : 'Algolia_AlgoliaSearch/internals/template/autocomplete/pages',
14-
'categoriesHtml' : 'Algolia_AlgoliaSearch/internals/template/autocomplete/categories',
15-
'suggestionsHtml': 'Algolia_AlgoliaSearch/internals/template/autocomplete/suggestions',
16-
'additionalHtml' : 'Algolia_AlgoliaSearch/internals/template/autocomplete/additional-section',
12+
'productsHtml' : 'Algolia_AlgoliaSearch/js/template/autocomplete/products',
13+
'pagesHtml' : 'Algolia_AlgoliaSearch/js/template/autocomplete/pages',
14+
'categoriesHtml' : 'Algolia_AlgoliaSearch/js/template/autocomplete/categories',
15+
'suggestionsHtml': 'Algolia_AlgoliaSearch/js/template/autocomplete/suggestions',
16+
'additionalHtml' : 'Algolia_AlgoliaSearch/js/template/autocomplete/additional-section',
1717

1818
// Recommend templates
19-
'recommendProductsHtml': 'Algolia_AlgoliaSearch/internals/template/recommend/products'
19+
'recommendProductsHtml': 'Algolia_AlgoliaSearch/js/template/recommend/products'
2020
}
2121
},
2222
paths : {
23-
'algoliaBundle' : 'Algolia_AlgoliaSearch/internals/algoliaBundle.min',
24-
'algoliaAnalytics': 'Algolia_AlgoliaSearch/internals/search-insights',
25-
'recommend' : 'Algolia_AlgoliaSearch/internals/recommend.min',
26-
'recommendJs' : 'Algolia_AlgoliaSearch/internals/recommend-js.min',
27-
'rangeSlider' : 'Algolia_AlgoliaSearch/navigation/range-slider-widget',
23+
'algoliaBundle' : 'Algolia_AlgoliaSearch/js/internals/algoliaBundle.min',
24+
'algoliaAnalytics': 'Algolia_AlgoliaSearch/js/internals/search-insights',
25+
'recommend' : 'Algolia_AlgoliaSearch/js/internals/recommend.min',
26+
'recommendJs' : 'Algolia_AlgoliaSearch/js/internals/recommend-js.min',
27+
'rangeSlider' : 'Algolia_AlgoliaSearch/js/navigation/range-slider-widget',
2828
},
2929
deps : [
3030
'algoliaInstantSearch',
@@ -33,7 +33,7 @@ var config = {
3333
config: {
3434
mixins: {
3535
'Magento_Catalog/js/catalog-add-to-cart': {
36-
'Algolia_AlgoliaSearch/insights/add-to-cart-mixin': true
36+
'Algolia_AlgoliaSearch/js/insights/add-to-cart-mixin': true
3737
}
3838
}
3939
}

‎view/frontend/web/internals/algolia-reset.css renamed to ‎view/frontend/web/css/algolia-reset.css

File renamed without changes.

‎view/frontend/web/internals/autocomplete.css renamed to ‎view/frontend/web/css/autocomplete.css

File renamed without changes.

‎view/frontend/web/internals/grid.css renamed to ‎view/frontend/web/css/grid.css

File renamed without changes.

‎view/frontend/web/internals/instantsearch.v3.css renamed to ‎view/frontend/web/css/instantsearch.v3.css

File renamed without changes.

‎view/frontend/web/internals/recommend.css renamed to ‎view/frontend/web/css/recommend.css

File renamed without changes.

‎view/frontend/web/autocomplete.js renamed to ‎view/frontend/web/js/autocomplete.js

File renamed without changes.

‎view/frontend/web/hooks.js renamed to ‎view/frontend/web/js/hooks.js

File renamed without changes.

0 commit comments

Comments
 (0)