rails_admin_image_manager 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b4ff73b9cf6a919fa9f32ed9cff0ddb797b1674
-  data.tar.gz: 6a0401d13546ae486b919de4ce176ea73e7053bc
+  metadata.gz: ee9129acf1a19b6210466f93a1ce96ee1900ef41
+  data.tar.gz: 74e5bb07383cbbf41c2fae75df13e703c71535cd
 SHA512:
-  metadata.gz: 94ba5dcd1c5dccd3f9255f7ba48163a9e5ddc6bc101e63cfa95112a5a8cdf06a39139a8496dda16d5b218e3a1b7cef22ff9a276747b93271cc7d8143a7a7e29b
-  data.tar.gz: ed621c7946fbe0fc3609b1383ad3f668c647261ceace74fcb75ec596886a446229f77b2eb89d97bb08f378e38f03ae7238738193cc30ff7c76ffd954c5c78851
+  metadata.gz: 4a82ac7d16520a43e1633e2e57cbb5e17888eded35a27af6e44ee9f6e4fb482f3e7962ab9aa9a5f3e5b28726c0902eff08d8994ad5ebae59840bf6d1d88e6182
+  data.tar.gz: aafc2847d725f1d3f3ef8232da360dac0df055fc77f12b219077a3699008bea14e8e23ed407722a416d6089b01a99816129f9e66930fbfdd9b328bbf7b6ab51c

data/app/assets/javascripts/rails_admin_image_manager/app-compiled.js.erb

@@ -16107,7 +16107,7 @@
 
 
 	// module
-	exports.push([module.id, "\n.search-autocomplete__selected-tag {\n  display: -webkit-inline-box;\n  display: -ms-inline-flexbox;\n  display: inline-flex;\n  margin: 3px;\n  position: relative;\n  cursor: pointer;\n}\n.search-autocomplete__selected-tag:first-of-type {\n    margin-left: 0;\n}\n.search-autocomplete__input {\n  position: relative;\n}\n.search-autocomplete {\n  width: 100%;\n  position: relative;\n}\n.search-autocomplete__tags-list {\n  position: absolute;\n  top: 100%;\n  width: 100%;\n  z-index: 100;\n  background-color: white;\n  box-shadow: 0 5px 8px rgba(0, 0, 0, 0.1);\n}\n.search-autocomplete__tag {\n  display: block;\n  padding: 5px;\n  transition: all 200ms linear;\n  cursor: pointer;\n}\n.search-autocomplete__tag:hover {\n    background-color: #ededed;\n}\n.search-autocomplete__tag.active {\n    background-color: #5c90d2;\n    color: white;\n}\n", ""]);
+	exports.push([module.id, "\n.search-autocomplete__selected-tag {\n  display: -webkit-inline-box;\n  display: -ms-inline-flexbox;\n  display: inline-flex;\n  margin: 3px;\n  position: relative;\n  cursor: pointer;\n  font-size: 14px;\n  padding-right: 14px;\n}\n.search-autocomplete__selected-tag:first-of-type {\n    margin-left: 0;\n}\n.search-autocomplete__selected-tag i {\n    font-size: 10px;\n    position: absolute;\n    top: 1px;\n    right: 2px;\n}\n.search-autocomplete__input {\n  position: relative;\n}\n.search-autocomplete {\n  width: 100%;\n  position: relative;\n}\n.search-autocomplete__tags-list {\n  position: absolute;\n  top: 100%;\n  width: 100%;\n  z-index: 100;\n  background-color: white;\n  box-shadow: 0 5px 8px rgba(0, 0, 0, 0.1);\n}\n.search-autocomplete__tag {\n  display: block;\n  padding: 5px;\n  transition: all 200ms linear;\n  cursor: pointer;\n}\n.search-autocomplete__tag:hover {\n    background-color: #ededed;\n}\n.search-autocomplete__tag.active {\n    background-color: #5c90d2;\n    color: white;\n}\n.search-autocomplete__tag small {\n    color: #c9c9c9;\n    font-size: 11px;\n}\n.search-autocomplete__searched-term {\n  display: block;\n  margin-top: 10px;\n  font-size: 12px;\n}\n.search-autocomplete__searched-term strong {\n    font-size: 14px;\n    position: relative;\n    font-weight: bold;\n    padding-left: 10px;\n    padding-right: 14px;\n    display: inline-block;\n}\n.search-autocomplete__clear-search {\n  color: #5c90d2;\n  display: block;\n  cursor: pointer;\n  outline: none;\n  background: transparent;\n  border: none;\n  padding: 0;\n}\n", ""]);
 
 	// exports
 
@@ -16135,6 +16135,12 @@
 	//
 	//
 	//
+	//
+	//
+	//
+	//
+	//
+	//
 
 	var _vuex = __webpack_require__(44);
 
@@ -16149,7 +16155,8 @@
 	    return {
 	      query: '',
 	      fuseSearch: null,
-	      selectedTagIndex: -1
+	      selectedTagIndex: -1,
+	      searchedTerm: ''
 	    };
 	  },
 
@@ -16174,18 +16181,20 @@
 	      } else if (e.key == 'Enter' && this.selectedTagIndex >= 0) {
 	        this.selectTag();
 	      } else if (e.key == 'Enter') {
-	        this.$store.dispatch('mediasStore/setSearchQuery', this.query);
+	        this.searchedTerm = this.query;
+	        this.$store.dispatch('mediasStore/setSearchQuery', this.searchedTerm);
 	        this.$store.dispatch('mediasStore/clearImgListing');
 	        this.$store.dispatch('mediasStore/setSearchPage', 1);
 	        this.$store.dispatch('mediasStore/fetchImage');
-	        console.log('search');
 	        this.query = "";
-	      } else if ((e.key == 'Backspace' || e.key == 'Meta') && this.query == '' && this.activeFilters.search != '') {
+	      } else if ((e.key == 'Backspace' || e.key == 'Meta') && this.searchedTerm == '' && this.activeFilters.search != '') {
 	        this.clearSearch();
 	      }
 	    },
 	    clearSearch: function clearSearch() {
+	      this.searchedTerm = '';
 	      this.$store.dispatch('mediasStore/setSearchQuery', '');
+	      this.$store.dispatch('mediasStore/setSearchPage', 1);
 	      this.$store.dispatch('mediasStore/clearImgListing');
 	      this.$store.dispatch('mediasStore/fetchImage');
 	    },
@@ -16201,7 +16210,6 @@
 	      var queryArray = query.split(' ').reverse();
 	      queryArray[0] = this.filteredTags[this.selectedTagIndex].name;
 	      var newQuery = queryArray.reverse().join(' ');
-	      this.$store.dispatch('mediasStore/setSearchQuery', '');
 	      this.$store.dispatch('mediasStore/setSearchPage', 1);
 	      this.$store.dispatch('mediasStore/clearImgListing');
 	      this.$store.dispatch('mediasStore/addToTagFilter', this.filteredTags[this.selectedTagIndex].id);
@@ -16211,6 +16219,7 @@
 	    },
 	    deselectTag: function deselectTag(id) {
 	      this.$store.dispatch('mediasStore/clearImgListing');
+	      this.$store.dispatch('mediasStore/setSearchPage', 1);
 	      this.$store.dispatch('mediasStore/removeFromTagFilter', id);
 	      this.$store.dispatch('mediasStore/fetchImage');
 	    },
@@ -16614,7 +16623,7 @@
 	          _vm.selectTag()
 	        }
 	      }
-	    }, [_vm._v(_vm._s(tag.name))])
+	    }, [_c('small', [_vm._v("étiquette: ")]), _vm._v(_vm._s(tag.name) + "\n      ")])
 	  }))]), _vm._v(" "), _vm._l((_vm.activeFilters.tags), function(activeTag) {
 	    return _c('span', {
 	      staticClass: "label label-primary search-autocomplete__selected-tag",
@@ -16623,8 +16632,20 @@
 	          _vm.deselectTag(activeTag)
 	        }
 	      }
-	    }, [_vm._v(_vm._s(_vm.getTagFromId(activeTag)))])
-	  })], 2)
+	    }, [_vm._v(_vm._s(_vm.getTagFromId(activeTag))), _c('i', {
+	      staticClass: "fa fa-times"
+	    })])
+	  }), _vm._v(" "), (_vm.searchedTerm) ? _c('div', {
+	    staticClass: "search-autocomplete__searched-term"
+	  }, [_c('span', [_vm._v("Recherche pour: "), _c('strong', [_vm._v(_vm._s(_vm.searchedTerm))])]), _c('br'), _vm._v(" "), _c('button', {
+	    staticClass: "search-autocomplete__clear-search font-s12 primary",
+	    attrs: {
+	      "type": "button"
+	    },
+	    on: {
+	      "click": _vm.clearSearch
+	    }
+	  }, [_vm._v("supprimer")])]) : _vm._e()], 2)
 	},staticRenderFns: []}
 	module.exports.render._withStripped = true
 	if (false) {
@@ -34893,4 +34914,4 @@
 	});
 
 /***/ })
-/******/ ]);
+/******/ ]);

data/app/assets/javascripts/rails_admin_image_manager/components/searchAutocomplete.vue

@@ -3,10 +3,16 @@
     <div class="search-autocomplete__input">
       <input @keyup.prevent="fuzzySearch" class="form-control" v-model="query" type="text"  placeholder="Rechercher par titre ou étiquette ...">
       <div class="search-autocomplete__tags-list">
-        <span @click="selectedTagIndex = index; selectTag()" :class="[{'active': isActive(index)}, 'search-autocomplete__tag']" v-for="(tag,index) in filteredTags">{{tag.name}}</span>
+        <span @click="selectedTagIndex = index; selectTag()" :class="[{'active': isActive(index)}, 'search-autocomplete__tag']" v-for="(tag,index) in filteredTags">
+          <small>étiquette: </small>{{tag.name}}
+        </span>
       </div>
     </div>
-    <span @click="deselectTag(activeTag)" class="label label-primary search-autocomplete__selected-tag" v-for="activeTag in activeFilters.tags">{{getTagFromId(activeTag)}}</span>
+    <span @click="deselectTag(activeTag)" class="label label-primary search-autocomplete__selected-tag" v-for="activeTag in activeFilters.tags">{{getTagFromId(activeTag)}}<i class="fa fa-times"></i></span>
+    <div class="search-autocomplete__searched-term" v-if="searchedTerm">
+      <span>Recherche pour: <strong>{{ searchedTerm }}</strong></span><br>
+      <button type="button" @click="clearSearch" class="search-autocomplete__clear-search font-s12 primary">supprimer</button>
+    </div>
   </div>
 
 </template>
@@ -19,7 +25,8 @@ export default {
     return {
       query: '',
       fuseSearch: null,
-      selectedTagIndex: -1
+      selectedTagIndex: -1,
+      searchedTerm: ''
     }
   },
   computed: {
@@ -45,18 +52,20 @@ export default {
       } else if (e.key == 'Enter' && this.selectedTagIndex >= 0) {
         this.selectTag()
       } else if (e.key == 'Enter') {
-        this.$store.dispatch('mediasStore/setSearchQuery', this.query)
+        this.searchedTerm = this.query
+        this.$store.dispatch('mediasStore/setSearchQuery', this.searchedTerm)
         this.$store.dispatch('mediasStore/clearImgListing')
         this.$store.dispatch('mediasStore/setSearchPage', 1)
         this.$store.dispatch('mediasStore/fetchImage')
-        console.log('search');
         this.query = ""
-      } else if((e.key == 'Backspace' || e.key == 'Meta') && this.query == '' && this.activeFilters.search != '') {
+      } else if((e.key == 'Backspace' || e.key == 'Meta') && this.searchedTerm  == '' && this.activeFilters.search != '') {
         this.clearSearch()
       }
     },
     clearSearch() {
+      this.searchedTerm = ''
       this.$store.dispatch('mediasStore/setSearchQuery', '')
+      this.$store.dispatch('mediasStore/setSearchPage', 1)
       this.$store.dispatch('mediasStore/clearImgListing')
       this.$store.dispatch('mediasStore/fetchImage')
     },
@@ -72,7 +81,6 @@ export default {
       let queryArray = query.split(' ').reverse()
       queryArray[0] = this.filteredTags[this.selectedTagIndex].name
       let newQuery = queryArray.reverse().join(' ')
-      this.$store.dispatch('mediasStore/setSearchQuery', '')
       this.$store.dispatch('mediasStore/setSearchPage', 1)
       this.$store.dispatch('mediasStore/clearImgListing')
       this.$store.dispatch('mediasStore/addToTagFilter', this.filteredTags[this.selectedTagIndex].id)
@@ -82,6 +90,7 @@ export default {
     },
     deselectTag(id){
       this.$store.dispatch('mediasStore/clearImgListing')
+      this.$store.dispatch('mediasStore/setSearchPage', 1)
       this.$store.dispatch('mediasStore/removeFromTagFilter', id)
       this.$store.dispatch('mediasStore/fetchImage')
     },
@@ -108,9 +117,18 @@ export default {
     margin: 3px
     position: relative
     cursor: pointer
+    font-size: 14px
+    padding-right: 14px
+
     &:first-of-type
       margin-left: 0
 
+    i
+      font-size: 10px
+      position: absolute
+      top: 1px
+      right: 2px
+
   .search-autocomplete__input
     position: relative
 
@@ -137,4 +155,30 @@ export default {
     &.active
       background-color: #5c90d2
       color: white
+
+    small
+      color: #c9c9c9
+      font-size: 11px
+
+  .search-autocomplete__searched-term
+    display: block
+    margin-top: 10px
+    font-size: 12px
+    strong
+      font-size: 14px
+      position: relative
+      font-weight: bold
+      padding-left: 10px
+      padding-right: 14px
+      display: inline-block
+
+  .search-autocomplete__clear-search
+    color: #5c90d2
+    display: block
+    cursor: pointer
+    outline: none
+    background: transparent
+    border: none
+    padding: 0
+
 </style>

data/lib/rails_admin_image_manager/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminImageManager
-  VERSION = '0.1.30'
+  VERSION = '0.1.31'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_image_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.31
 platform: ruby
 authors:
 - iXmedia