Merge pull request #1457 from OpenBazaar/discoverEnhancements

Discover enhancements

Author: jjeffryes

css/obBase.css

@@ -477,6 +477,32 @@ form {
   flex-grow: 1;
 }
 
+.listingType {
+  background-color: #252525;
+  color: #ffffff;
+  position: absolute;
+  padding: 6px;
+  top: 40px;
+  right: 40px;
+  font-size: 11px;
+  font-weight: 500;
+  transition: top .3s cubic-bezier(0, 0, 0.2, 1);
+}
+
+.listingDoesNotShipToYou {
+  background-color: rgba(37, 37, 37, 0.65); 
+  /*border-radius: 20px;*/
+  height: 20px; 
+  left: 32px;
+  line-height: 20px; 
+  padding: 8px 4px; 
+  position: absolute; 
+  text-align: center; 
+  top: calc(50% - 32px); 
+  width: 242px; 
+  transition: top .3s cubic-bezier(0, 0, 0.2, 1);
+}
+
 .noPointerEvents {
   pointer-events: none;
 }
@@ -533,6 +559,17 @@ form {
   padding-top: 20px;
 }
 
+.userPage-subViews .gridItem:hover > .listingType,
+.homeView .gridItem:hover > .listingType {
+  opacity: 1;
+  top: 26px;
+}
+
+.userPage-subViews .gridItem:hover > .listingDoesNotShipToYou,
+.homeView .gridItem:hover > .listingDoesNotShipToYou {
+  top: calc(50% - 46px);
+}
+
 .userPage-subViews .gridItem:hover .gridItemControls,
 .homeView .gridItem:hover .gridItemControls{
   opacity: 1;
@@ -4045,6 +4082,14 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
   top: 100%;
 }
 
+.tooltip.tooltip-box2:hover:after {
+  height: auto;
+  width: 200px;
+  white-space: normal;
+  bottom: auto;
+  top: 100%;
+}
+
 .tooltip.tooltip-box.tooltip-boxUp:hover:after {
   bottom: 120%;
 }
@@ -4261,7 +4306,53 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
 
 }
 
-/* protect customize controls from custom page styles */
+.violatorTR {
+  /* sets triangle to be in the top right corner */
+  /* must be given equal height and width properties */
+  /* text or icons inside the violator should have positionTopRight and a right and top margin or padding based on the violator size */
+  position: absolute;
+  top: 0;
+  right: 0;
+  -webkit-clip-path: polygon(50% 0, 100% 0, 100% 50%);
+  z-index: 1; /* this shouldn't need to be higher. Make it the last element in its container */
+  text-align: center;
+}
+
+.violator1 {
+  width: 50px;
+  height: 50px;
+  background: #215175; /* this should be overridden with a color class */
+  color: #fff;
+}
+
+.violatorTxt{
+  /* use on content of a violator to rotate it to match the violator */
+  display: block;
+  transform: rotate(45deg);
+}
+
+.listingTypeDigital:before {
+  color: #EFEF4C;
+  content: "\f137";
+  font-family: Ionicons;
+  font-size: 12px;
+}
+
+.listingTypePhysical:before {
+  color: #805C17;
+  content: "\f318";
+  font-family: Ionicons;
+  font-size: 12px;
+}
+
+.listingTypeService:before {
+  color: #DEDEDE;
+  content: "\f2ad";
+  font-family: Ionicons;
+  font-size: 12px;
+}
+
+  /* protect customize controls from custom page styles */
 #ov1 #customizeControls .labelWrap {
   height: 40px;
   border-radius: 0;
@@ -4517,11 +4608,13 @@ input[type="checkbox"].fieldItem:checked + label .togLabelOff {
 #ov1 .positionBottom {
   position: absolute;
   bottom: 0;
+  right: 0;
 }
 
 #ov1 .positionTop {
   position: absolute;
   top: 0;
+  right: 0;
 }
 
 #ov1 .positionTopRight {

js/languages/en-US.json

@@ -333,6 +333,7 @@
   "Avatar": "Avatar",
   "AdditionalPaymentData": "Additional payment data",
   "AdditionalPaymentDataInfo": "Include name of purchase and order number in payment QR code?",
+  "ShippableHelp": "This product can be shipped to one of your currently saved addresses. Add more addresses in the Settings/Addresses section to be able to purchase more listings.",
   "firewall": {
     "Open": "Open",
     "Restricted": "Restricted",

js/templates/itemShort.html

@@ -1,19 +1,31 @@
+<%
+var shipsToYou = false;
+if(_.intersection(ob.userCountries, ob.ships_to).length > 0 || ob.ships_to == "ALL" || ob.ships_to.length == 0){
+  shipsToYou = true;
+}
+%>
+
+
 <div class="gridItem clearfix custCol-border">
-  <div class="itemImg row10 color-secondary custCol-secondary overflowHidden js-item" data-id="<%= ob.contract_hash %>">
+
+  <div class="itemImg row10 color-secondary custCol-secondary overflowHidden js-item <% if(!shipsToYou){ %>textOpacity25<% } %>" data-id="<%= ob.contract_hash %>">
     <div class="itemImg <% if(ob.cloak){ %> nsfw <% } %>" style="background-image: url(<%= ob.imageURL %>), url(imgs/defaultItem.png);"></div>
   </div>
-  <div class="table">
+  <div class="table <% if(!shipsToYou){ %>textOpacity25<% } %>">
     <div>
       <% if(ob.showAvatar) { %>
       <div class="thumbnail-small js-avatar tooltip" data-tooltip="<% if(ob.handle) { %><%= ob.handle %><% }else{ %><%= ob.guid %><% } %>" data-handle="<%= ob.handle %>"
         style="background-image: <% if(ob.avatar_hash && ob.avatarURL) { %> url(<%= ob.avatarURL %>), <% } %>url(imgs/defaultUser.png);"></div>
       <% } %>
-      <div class="js-item pad8Left <% if(ob.title.length >= 30) { %>tooltip<% } %>" <% if(ob.title.length >= 30) { %>data-tooltip="<%= ob.title.substring(0, 40) %>"<% } %> data-id="<%= ob.contract_hash %>">
-        <div class="textSize14px noOverflow textOpacity1 js-searchTitle"><%= ob.title %></div>
+      <div class="js-item pad8Left <% if(ob.title.length >= 30) { %>tooltip<% } %>"
+      <% if(ob.title.length >= 30) { %>data-tooltip="<%= ob.title.substring(0, 40) %>"<% } %> data-id="<%= ob.contract_hash %>">
+        <div class="textSize14px noOverflow textOpacity1 js-searchTitle">
+          <%= ob.title %>
+        </div>
         <div class="textSize13px txt-fade textWeightNormal">
           <%= ob.intlNumFormat(ob.vendorBTCPrice, 4) %> BTC
           <% if(ob.userCurrencyCode != 'BTC'){ %>
-          (<%= ob.displayPrice %>)
+           (<%= ob.displayPrice %>)
           <% } %>
         </div>
       </div>
@@ -69,7 +81,22 @@
       </div>
     </div>
   </div>
+
+  <% if(ob.type){ %><!-- type is not yet implemented -->
+    <div class="listingType borderRadius3 js-item <% if(shipsToYou){ %>textOpacity90<% }else{ %>textOpacity25<% } %>">
+          <span class="<% print('listingType'+ob.type) %>"></span>
+    </div>
+  <% } %>
+
+  <% if(!shipsToYou && ob.ships_to.length != 0){ %>
+    <div class="listingDoesNotShipToYou">
+      <span class="ion-alert-circled fontSize11" style="color: #EFEF4C"></span>
+      Does not ship to you
+    </div>
+  <% } %>
+
 </div>
+
 <% if(ob.cloak){ %>
 <div class="fullCentered btn btn-large custCol-secondary div-fade">
   NSFW

js/views/homeVw.js

@@ -188,7 +188,11 @@ module.exports = baseVw.extend({
 
   renderItem: function(item){
     var self = this,
-        blocked;
+        blocked,
+        addressCountries = this.userModel.get('shipping_addresses').map(function(address){ return address.country }),
+        userCountry = this.userModel.get('country');
+
+    addressCountries.push(userCountry);
 
     //don't show if NSFW and filter is set to false
     if(item.listing.nsfw && !this.showNSFW) return;
@@ -201,6 +205,7 @@ module.exports = baseVw.extend({
     item.userID = item.guid;
     item.discover = true;
     item.ownGuid = this.userModel.get('guid');
+    item.userCountries = addressCountries;
 
 
     item.ownFollowing = this.ownFollowing.indexOf(item.guid) != -1;

js/views/userPageVw.js

@@ -722,9 +722,13 @@ module.exports = baseVw.extend({
   renderItems: function (model, skipNSFWmodal) {
     "use strict";
 
-    var self = this;
-    var select = this.$el.find('.js-categories');
-    var selectOptions = [];
+    var self = this,
+        select = this.$el.find('.js-categories'),
+        selectOptions = [],
+        addressCountries = this.userModel.get('shipping_addresses').map(function(address){ return address.country }),
+        userCountry = this.userModel.get('country');
+
+    addressCountries.push(userCountry);
     skipNSFWmodal = skipNSFWmodal || this.skipNSFWmodal;
     model = model || [];
     __.each(model, function (arrayItem) {
@@ -742,6 +746,7 @@ module.exports = baseVw.extend({
       arrayItem.userID = self.pageID;
       arrayItem.ownPage = self.options.ownPage;
       arrayItem.onUserPage = true;
+      arrayItem.userCountries = addressCountries;
       arrayItem.skipNSFWmodal = skipNSFWmodal;
       if (arrayItem.category != "" && self.$el.find('.js-categories option[value="' + arrayItem.category + '"]').length == 0){
         selectOptions[arrayItem.category] = true;