From 513288eba03447dc82493ba0f77aac747dec31fc Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Thu, 19 Sep 2024 11:49:12 -0400 Subject: [PATCH 1/3] introduce a icon letting you know querqy rule matched a query Signed-off-by: Eric Pugh --- .../javascripts/controllers/searchResults.js | 9 +++++++++ app/assets/stylesheets/animation.css | 4 ++-- app/assets/stylesheets/froggy.css | 11 +++++++++++ app/assets/templates/views/searchResults.html | 6 +++++- public/images/querqy-icon.png | Bin 0 -> 3529 bytes 5 files changed, 27 insertions(+), 3 deletions(-) create mode 100644 public/images/querqy-icon.png diff --git a/app/assets/javascripts/controllers/searchResults.js b/app/assets/javascripts/controllers/searchResults.js index 8652ab0d4..33a2547da 100644 --- a/app/assets/javascripts/controllers/searchResults.js +++ b/app/assets/javascripts/controllers/searchResults.js @@ -137,5 +137,14 @@ angular.module('QuepidApp') return $scope.query.rating; } }; + + $scope.querqyRuleTriggered = function() { + var triggered = false; + + if ($scope.query.searcher.parsedQueryDetails.querqy?.rewrite !== undefined){ + triggered = true; + } + return triggered; + } } ]); diff --git a/app/assets/stylesheets/animation.css b/app/assets/stylesheets/animation.css index 0b699a32a..c25e68968 100644 --- a/app/assets/stylesheets/animation.css +++ b/app/assets/stylesheets/animation.css @@ -3,10 +3,10 @@ using ngAnimate and css from the https://animate.style project */ /* when hiding the picture */ -.froggy.ng-hide-add { animation:2s flipOutX ease; } +.froggy-animation.ng-hide-add { animation:2s flipOutX ease; } /* when showing the picture */ -.froggy.ng-hide-remove { animation:2s flipInX ease; } +.froggy-animation.ng-hide-remove { animation:2s flipInX ease; } /* ANIMATIONS (FROM ANIMATE.CSS) ======================== */ diff --git a/app/assets/stylesheets/froggy.css b/app/assets/stylesheets/froggy.css index 035633546..303ab49f1 100644 --- a/app/assets/stylesheets/froggy.css +++ b/app/assets/stylesheets/froggy.css @@ -42,3 +42,14 @@ width: 100%; height: 100%; } + + +.querqy-icon { + display: inline-block; + width: 24px; /* Adjust to match your image width */ + height: 24px; /* Adjust to match your image height */ + background-image: image-url('querqy-icon.png'); + background-size: contain; + background-repeat: no-repeat; + background-position: center; +} diff --git a/app/assets/templates/views/searchResults.html b/app/assets/templates/views/searchResults.html index a22b9e66c..612e19957 100644 --- a/app/assets/templates/views/searchResults.html +++ b/app/assets/templates/views/searchResults.html @@ -35,10 +35,14 @@

- + + + + + diff --git a/public/images/querqy-icon.png b/public/images/querqy-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4e62a643fe8dc80ccb4de0e9e657237c0c8dea4d GIT binary patch literal 3529 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 Date: Thu, 19 Sep 2024 12:33:56 -0400 Subject: [PATCH 2/3] lint --- app/assets/javascripts/controllers/searchResults.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/controllers/searchResults.js b/app/assets/javascripts/controllers/searchResults.js index 33a2547da..f39b22ba7 100644 --- a/app/assets/javascripts/controllers/searchResults.js +++ b/app/assets/javascripts/controllers/searchResults.js @@ -1,5 +1,4 @@ 'use strict'; - angular.module('QuepidApp') .controller('SearchResultsCtrl', [ '$rootScope', @@ -138,13 +137,13 @@ angular.module('QuepidApp') } }; - $scope.querqyRuleTriggered = function() { + $scope.querqyRuleTriggered = function () { var triggered = false; - - if ($scope.query.searcher.parsedQueryDetails.querqy?.rewrite !== undefined){ - triggered = true; + + if ($scope.query.searcher.parsedQueryDetails.querqy?.rewrite !== undefined) { // jshint ignore:line + triggered = true; } return triggered; - } + }; } ]); From d14ee1759db49d70b4d0eb82afd29491104c1fe9 Mon Sep 17 00:00:00 2001 From: Eric Pugh Date: Thu, 19 Sep 2024 12:36:06 -0400 Subject: [PATCH 3/3] lint --- app/assets/javascripts/controllers/searchResults.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/controllers/searchResults.js b/app/assets/javascripts/controllers/searchResults.js index f39b22ba7..3c7968b1b 100644 --- a/app/assets/javascripts/controllers/searchResults.js +++ b/app/assets/javascripts/controllers/searchResults.js @@ -138,7 +138,7 @@ angular.module('QuepidApp') }; $scope.querqyRuleTriggered = function () { - var triggered = false; + let triggered = false; if ($scope.query.searcher.parsedQueryDetails.querqy?.rewrite !== undefined) { // jshint ignore:line triggered = true;