From 338dcc649a8764e8dec40c75162773d02f96e06b Mon Sep 17 00:00:00 2001 From: Vaillant Samuel Date: Thu, 7 Jun 2018 12:43:33 +0200 Subject: [PATCH 1/9] fix(Angular): don't generate an empty div without facets --- templates/Angular InstantSearch/src/app/app.component.html.hbs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/Angular InstantSearch/src/app/app.component.html.hbs b/templates/Angular InstantSearch/src/app/app.component.html.hbs index 5bd0f03f6..73b8d67eb 100644 --- a/templates/Angular InstantSearch/src/app/app.component.html.hbs +++ b/templates/Angular InstantSearch/src/app/app.component.html.hbs @@ -13,12 +13,14 @@
+ {{#if attributesForFaceting.length}}
{{#each attributesForFaceting}} {{/each}}
+ {{/if}}
From 3e1b160231247562e92d5dbecdc71d8586e5cef2 Mon Sep 17 00:00:00 2001 From: Vaillant Samuel Date: Thu, 7 Jun 2018 12:43:45 +0200 Subject: [PATCH 2/9] fix(React): don't generate an empty div without facets --- templates/React InstantSearch/src/App.js.hbs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/React InstantSearch/src/App.js.hbs b/templates/React InstantSearch/src/App.js.hbs index a5826a0f4..fd9ce3072 100644 --- a/templates/React InstantSearch/src/App.js.hbs +++ b/templates/React InstantSearch/src/App.js.hbs @@ -37,12 +37,14 @@ class App extends Component { indexName="{{indexName}}" >
+ {{#if attributesForFaceting.length}}
{{#each attributesForFaceting}} {{/each}}
+ {{/if}}
From 02f21603b16897db611e1d6c8d13a8310f4dfbd7 Mon Sep 17 00:00:00 2001 From: Vaillant Samuel Date: Thu, 7 Jun 2018 12:43:54 +0200 Subject: [PATCH 3/9] fix(Vue): don't generate an empty div without facets --- templates/Vue InstantSearch/src/App.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/Vue InstantSearch/src/App.vue b/templates/Vue InstantSearch/src/App.vue index bc8a9efb1..304ad46bd 100644 --- a/templates/Vue InstantSearch/src/App.vue +++ b/templates/Vue InstantSearch/src/App.vue @@ -19,12 +19,14 @@ index-name="{{indexName}}" >
+ {{#if attributesForFaceting.length}}
{{#each attributesForFaceting}} {{/each}}
+ {{/if}}
Date: Thu, 7 Jun 2018 12:44:33 +0200 Subject: [PATCH 4/9] chore: ignore vscode workspace configuration --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index dc69cdf75..80e73896a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ node_modules # misc .DS_Store +.vscode .env.local .env.development.local .env.test.local From 359d25a6aac8d22471672e06494ee62ce193a383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Chalifour?= Date: Thu, 7 Jun 2018 15:11:23 +0200 Subject: [PATCH 5/9] fix(vanilla): don't generate an empty div without facets --- templates/InstantSearch.js/index.html.hbs | 10 ++++++---- templates/InstantSearch.js/src/app.css | 16 +++++++++++----- templates/InstantSearch.js/src/app.js.hbs | 2 +- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/templates/InstantSearch.js/index.html.hbs b/templates/InstantSearch.js/index.html.hbs index cb42d6ef3..b30dc5b58 100644 --- a/templates/InstantSearch.js/index.html.hbs +++ b/templates/InstantSearch.js/index.html.hbs @@ -31,15 +31,17 @@
-
-
+
+ {{#if attributesForFaceting}} +
{{#each attributesForFaceting}}
{{/each}}
-
- + {{/if}} +
+
diff --git a/templates/InstantSearch.js/src/app.css b/templates/InstantSearch.js/src/app.css index ad0b9b980..acb1a0120 100644 --- a/templates/InstantSearch.js/src/app.css +++ b/templates/InstantSearch.js/src/app.css @@ -38,10 +38,16 @@ em { padding: 1rem; } -.container-app { - display: grid; - grid-template-columns: 20% 75%; - grid-gap: 5%; +.search-panel { + display: flex; +} + +.search-panel__filters { + flex: 1; +} + +.search-panel__results { + flex: 3; } .ais-hits { @@ -59,7 +65,7 @@ em { box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.16); } -#searchBox { +#searchbox { margin-bottom: 2rem; } diff --git a/templates/InstantSearch.js/src/app.js.hbs b/templates/InstantSearch.js/src/app.js.hbs index 87a5df1a3..52a3702f4 100644 --- a/templates/InstantSearch.js/src/app.js.hbs +++ b/templates/InstantSearch.js/src/app.js.hbs @@ -8,7 +8,7 @@ const search = instantsearch({ search.addWidget( instantsearch.widgets.searchBox({ - container: '#searchBox', + container: '#searchbox', {{#if searchPlaceholder}} placeholder: '{{searchPlaceholder}}', {{/if}} From 6a9325b78b452b76fdebeee644624f212b1db395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Chalifour?= Date: Thu, 7 Jun 2018 15:22:06 +0200 Subject: [PATCH 6/9] feat(angular): Use flexbox display --- .../src/app/app.component.css | 16 +++++++++++----- .../src/app/app.component.html.hbs | 10 +++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/templates/Angular InstantSearch/src/app/app.component.css b/templates/Angular InstantSearch/src/app/app.component.css index d51c6bd58..4e70ecc50 100644 --- a/templates/Angular InstantSearch/src/app/app.component.css +++ b/templates/Angular InstantSearch/src/app/app.component.css @@ -33,13 +33,19 @@ padding: 1rem; } -.container-app { - display: grid; - grid-template-columns: 20% 75%; - grid-gap: 5%; +.search-panel { + display: flex; +} + +.search-panel__filters { + flex: 1; +} + +.search-panel__results { + flex: 3; } -.searchBox { +.searchbox { margin-bottom: 2rem; } diff --git a/templates/Angular InstantSearch/src/app/app.component.html.hbs b/templates/Angular InstantSearch/src/app/app.component.html.hbs index 73b8d67eb..c7218e917 100644 --- a/templates/Angular InstantSearch/src/app/app.component.html.hbs +++ b/templates/Angular InstantSearch/src/app/app.component.html.hbs @@ -12,17 +12,17 @@
-
- {{#if attributesForFaceting.length}} -
+
+ {{#if attributesForFaceting}} +
{{#each attributesForFaceting}} {{/each}}
{{/if}} -
-
+
+
From ef69decb429c861a80da3a6cb8235648331ff308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Chalifour?= Date: Thu, 7 Jun 2018 15:25:53 +0200 Subject: [PATCH 7/9] feat(react): Use flexbox display --- templates/React InstantSearch/src/App.css | 16 +++++++++++----- templates/React InstantSearch/src/App.js.hbs | 10 +++++----- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/templates/React InstantSearch/src/App.css b/templates/React InstantSearch/src/App.css index 644d1d68c..925ccd85c 100644 --- a/templates/React InstantSearch/src/App.css +++ b/templates/React InstantSearch/src/App.css @@ -38,13 +38,19 @@ em { padding: 1rem; } -.container-app { - display: grid; - grid-template-columns: 20% 75%; - grid-gap: 5%; +.search-panel { + display: flex; +} + +.search-panel__filters { + flex: 1; +} + +.search-panel__results { + flex: 3; } -.searchBox { +.searchbox { margin-bottom: 2rem; } diff --git a/templates/React InstantSearch/src/App.js.hbs b/templates/React InstantSearch/src/App.js.hbs index fd9ce3072..b95abd912 100644 --- a/templates/React InstantSearch/src/App.js.hbs +++ b/templates/React InstantSearch/src/App.js.hbs @@ -36,17 +36,17 @@ class App extends Component { apiKey="{{apiKey}}" indexName="{{indexName}}" > -
- {{#if attributesForFaceting.length}} -
+
+ {{#if attributesForFaceting}} +
{{#each attributesForFaceting}} {{/each}}
{{/if}} -
- +
+
From a83c4bf78a1dbcec1a509de51d16852b7257af9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Chalifour?= Date: Thu, 7 Jun 2018 15:29:00 +0200 Subject: [PATCH 8/9] feat(vue): Use flexbox display --- templates/Vue InstantSearch/src/App.vue | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/templates/Vue InstantSearch/src/App.vue b/templates/Vue InstantSearch/src/App.vue index 304ad46bd..496270950 100644 --- a/templates/Vue InstantSearch/src/App.vue +++ b/templates/Vue InstantSearch/src/App.vue @@ -18,16 +18,16 @@ api-key="{{apiKey}}" index-name="{{indexName}}" > -
+
{{#if attributesForFaceting.length}} -
+
{{#each attributesForFaceting}} {{/each}}
{{/if}} -
+
Date: Thu, 7 Jun 2018 15:29:56 +0200 Subject: [PATCH 9/9] test(e2e): Update snapshots --- .../__snapshots__/e2e-templates.test.js.snap | 96 ++++++++++++------- 1 file changed, 60 insertions(+), 36 deletions(-) diff --git a/scripts/__snapshots__/e2e-templates.test.js.snap b/scripts/__snapshots__/e2e-templates.test.js.snap index 681623d37..bb5d8bd76 100644 --- a/scripts/__snapshots__/e2e-templates.test.js.snap +++ b/scripts/__snapshots__/e2e-templates.test.js.snap @@ -328,13 +328,19 @@ exports[`Templates Angular InstantSearch File content: src/app/app.component.css padding: 1rem; } -.container-app { - display: grid; - grid-template-columns: 20% 75%; - grid-gap: 5%; +.search-panel { + display: flex; +} + +.search-panel__filters { + flex: 1; +} + +.search-panel__results { + flex: 3; } -.searchBox { +.searchbox { margin-bottom: 2rem; } @@ -359,14 +365,14 @@ exports[`Templates Angular InstantSearch File content: src/app/app.component.htm
-
-
+
+
-
-
+
+
@@ -1020,14 +1026,14 @@ exports[`Templates InstantSearch.js File content: index.html 1`] = `
-
-
+
+
-
-
+
+
@@ -1116,10 +1122,16 @@ exports[`Templates InstantSearch.js File content: src/app.css 1`] = ` padding: 1rem; } -.container-app { - display: grid; - grid-template-columns: 20% 75%; - grid-gap: 5%; +.search-panel { + display: flex; +} + +.search-panel__filters { + flex: 1; +} + +.search-panel__results { + flex: 3; } .ais-hits { @@ -1137,7 +1149,7 @@ exports[`Templates InstantSearch.js File content: src/app.css 1`] = ` box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.16); } -#searchBox { +#searchbox { margin-bottom: 2rem; } @@ -1158,7 +1170,7 @@ const search = instantsearch({ search.addWidget( instantsearch.widgets.searchBox({ - container: '#searchBox', + container: '#searchbox', placeholder: 'Search placeholder', }) ); @@ -1385,13 +1397,19 @@ exports[`Templates React InstantSearch File content: src/App.css 1`] = ` padding: 1rem; } -.container-app { - display: grid; - grid-template-columns: 20% 75%; - grid-gap: 5%; +.search-panel { + display: flex; +} + +.search-panel__filters { + flex: 1; +} + +.search-panel__results { + flex: 3; } -.searchBox { +.searchbox { margin-bottom: 2rem; } @@ -1436,14 +1454,14 @@ class App extends Component { apiKey=\\"apiKey\\" indexName=\\"indexName\\" > -
-
+
+
-
- +
+
@@ -1651,13 +1669,13 @@ exports[`Templates Vue InstantSearch File content: src/App.vue 1`] = ` api-key=\\"apiKey\\" index-name=\\"indexName\\" > -
-
+
+
-
+