cloudrider 0.3.21 → 0.3.22

data/generica/app/controllers/apiv1/products/destroy_controller.rb

@@ -1,4 +1,4 @@
-class Apiv1::Products::DestroyController < Admin::BaseController
+class Apiv1::Products::DestroyController < Apiv1::UsersController
   before_filter :_ensure_product_ownership
   def destroy
     render json: { product: _product.destroy }

data/generica/app/models/admin/user.rb

@@ -35,6 +35,20 @@ class Admin::User < ActiveRecord::Base
     class_name: 'Apiv1::Product',
     through: :product_relationships
 
+  has_many :raw_contacts,
+    class_name: 'Apiv1::UserContact',
+    foreign_key: 'user_id'
+    
+  has_many :contacts,
+    -> { order_by_primality },
+    class_name: 'Apiv1::UserContact',
+    foreign_key: 'user_id'
+
+  has_one :primary_contact,
+    -> { is_primary.order_by_primality },
+    class_name: 'Apiv1::UserContact',
+    foreign_key: 'user_id'
+
   has_many :offers,
     -> { order "#{Apiv1::OfferMessage.table_name}.created_at desc" },
     through: :products,
@@ -49,7 +63,7 @@ class Admin::User < ActiveRecord::Base
       phone_number: phone_number,
       address: address,
       about_me: about_me
-    }
+    }.merge _primary_contact_hash
   end
 
   def admin?
@@ -63,4 +77,9 @@ class Admin::User < ActiveRecord::Base
   def owns?(product)
     product_relationships.exists?(product_id: product.id)
   end
+
+  private
+  def _primary_contact_hash
+    primary_contact.try(:to_user_hash) || {}
+  end
 end

data/generica/app/models/apiv1/user_contact.rb

@@ -0,0 +1,51 @@
+# == Schema Information
+#
+# Table name: apiv1_user_contacts
+#
+#  id         :integer          not null, primary key
+#  user_id    :integer
+#  name       :string(255)
+#  phone      :string(255)
+#  email      :string(255)
+#  address    :string(255)
+#  status     :string(255)
+#  deleted_at :datetime
+#  created_at :datetime
+#  updated_at :datetime
+#
+
+class Apiv1::UserContact < ActiveRecord::Base
+  KnownStatuses = ['primary']
+  acts_as_paranoid
+  belongs_to :user,
+    class_name: 'Admin::User'
+
+  scope :is_primary,
+    -> { where "#{self.table_name}.status" => 'primary' }
+
+  validates :user,
+    presence: true
+
+  def make_primary!
+    return if user.primary_contact == self
+    user.primary_contact.try :demote_to_secondary!
+    update status: 'primary'
+  end
+
+  def demote_to_secondary!
+    update status: nil
+  end
+
+  def to_user_hash
+    {
+      email: email,
+      company_name: name,
+      phone_number: phone,
+      address: address
+    }
+  end
+
+  def to_ember_hash
+    attributes
+  end
+end

data/generica/app/varissets/javascripts/templates/components/product-display.emblem.erb

@@ -3,7 +3,7 @@
 if product
   .media-object
     link-to "products.product.show" product.id
-      img.product-image src=product.pictures.firstObject.picUrl
+      .product-image style=productImageStyle
   .media-texts
     link-to "products.product.show" product.id class="product-title"
       tr-span en=product.material
@@ -27,48 +27,41 @@ else
 
 <% when :media_one %>
 if product
-  .media-object
-    link-to "products.product.show" product.id
-      img.product-image src=product.pictures.firstObject.picUrl
-  .media-texts
-    h2.product-title
-      link-to "products.product.show" product.id
+  link-to "products.product.show" product.id class="flex-start"
+    .media-object
+      .product-image style=productImageStyle
+    .media-texts
+      .product-title
+        i.fa.fa-star
         tr-span en=product.material
         if product.sku
           span.predash= product.sku
-    if product.taxons
-      .taxon-tags
-        each taxon in product.taxons
-          span.tag= taxon.taxonName
-    if product.others
-      p.product-summary
-        tr-span en=product.others
-    if product.attachments
-      p.related-files
-        each attachment in product.attachments
-          a href=attachment.fileUrl
-            span.spacebar= attachment.fileName
-    dl.product-specs
-      if product.amount
-        dt.upcase 
-          tr-span en="quantity"
-        dd
-          span.spacebar= product.amount
-      if product.price
-        dt.upcase 
-          tr-span en="price"
-        dd
-          span= product.price
-      if product.place
-        dt.upcase 
-          tr-span en="location"
-        dd
-          span= product.place
-      if product.quality
-        dt.upcase 
-          tr-span en="quality"
-        dd
-          span= product.quality
+      
+      .product-specs
+        if product.amount
+          .line
+            span.upcase.colon
+              tr-span en="quantity"
+            span.spec.spacebar= product.amount
+        if product.price
+          .line
+            span.upcase.colon
+              tr-span en="price"
+            span.spec.spacebar= product.price
+        if product.place
+          .line
+            span.upcase.colon
+              tr-span en="origin"
+            span.spec.spacebar= product.place
+        if product.quality
+          .line
+            span.upcase.colon
+              tr-span en="quality"
+            span.spec.spacebar= product.quality
+        .line
+          span.upcase.colon
+            tr-span en="creation date"
+          span.spec.spacebar= product.createdAt
 else
   .media-object.align-right
     i.fa.fa-circle-o.fa-4x
@@ -77,5 +70,6 @@ else
       tr-span en="no results"
     p.product-summary
       tr-span en="or perhaps there are no products to load yet"
+
 <% when :square_tiles %>
 <% end %>

data/generica/app/varissets/javascripts/templates/components/product-listing.emblem.erb

@@ -3,29 +3,36 @@
 if product
   link-to "products.product.show" product.id class="product-header"
     .media-object
-      img.product-image.th src=product.pictures.firstObject.thumbUrl
+      .product-image.th style=productImageStyle
     .media-texts
       .big-title
         tr-span en=product.material
-        if product.quality
-          span.predash
-            tr-span en=product.quality
-        span.right
-          if product.hasShowOrder
-            span #
-            span.spacebar= product.showcaseOrder
-
-      .smaller-details
+        if product.sku
+          span.predash= product.sku
+      .dateline= product.createdAt
+      p.smaller-details
         if product.price
           span= product.price
         if product.place
-          span @
+          span.decent-prespace @
           tr-span en=product.place
-  
-      if product.taxons
-        .taxon-tags
-          each taxon in product.taxons
-            span.tag= taxon.taxonName
+        if product.amount
+          span.upcase.colon.decent-prespace
+            tr-span en="quantity"
+          span.spec.spacebar= product.amount
+        if product.price
+          span.upcase.colon.decent-prespace
+            tr-span en="price"
+          span.spec.spacebar= product.price
+        if product.place
+          span.upcase.colon.decent-prespace
+            tr-span en="origin"
+          span.spec.spacebar= product.place
+        if product.quality
+          span.upcase.colon.decent-prespace
+            tr-span en="quality"
+          span.spec.spacebar= product.quality
+      
 else
   .product-header
     .media-object
@@ -35,4 +42,5 @@ else
         tr-span en="no results"
       .product-summary
         tr-span en="or perhaps there are no products to load yet"
+
 <% end %>

data/generica/app/varissets/javascripts/templates/components/site-nav.emblem.erb

@@ -5,8 +5,18 @@
     .space-between
       link-to "index" class="button-like"
         span <%= my_company_name %>
-      a.pointer.button-like click="displayModal 'login'"
-        tr-span en="my account"
+      if adminLoggedIn
+        link-to "admin.index"
+          tr-span en="admin"
+
+      if userLoggedIn
+        link-to "users.index" class="button-like"
+          tr-span en="my account"
+      
+      if notLoggedIn
+        a.pointer.button-like click="displayModal 'login'"
+          tr-span en="login or register"
+
 <% when :left %>
 .nav-button
   link-to "index" (query-params anchor="") class="side-nav"

data/generica/app/varissets/stylesheets/apiv1/components/_product-display.css.scss.erb

@@ -70,57 +70,94 @@ $material-orange: #FF9800;
 }
 <% when :media_one %>
 .product-display {
-  .media-object {
-    padding-left: 15px;
+  background: {
+    color: #eeeeee;
+  }
+  &:nth-child(even) {
+    background: {
+      color: #e5e5e5;
+    } 
+  }
+  &:hover {
+    background: {
+      color: #f1f1f1;
+    }
+  }
+  .flex-start {
+    @include display-flex;
     @media #{$small-only} {
-      width: 100%;
+      @include flex-direction(column);
+      @include justify-content(flex-start);
+      @include align-items(center);
     }
     @media #{$medium-up} {
-      width: 33%;
+      @include flex-direction(row);
+      @include justify-content(flex-start);
     }
   }
   .media-texts {
-    padding-left: 15px;
     @media #{$small-only} {
       width: 100%;
+      @include order(-1);
     }
-    @media #{$medium-up} {
-      width: 66%;
+    @media #{$medium-only} {
+      width: 100%;
     }
   }
-  img.product-image {
-    min-height: 275px;
+  .product-image {
+    @media #{$small-only} {
+      width: 175px;
+      height: 175px;
+    }
+    @media #{$medium-only} {
+      width: 75px;
+      height: 75px;
+    }
+    @media #{$large-up} {
+      width: 125px;
+      height: 125px; 
+    }
+    background: {
+      size: cover;
+      position: center center;
+    }
   }
   .product-title {
-    font-size: 1.25rem;
-    text-transform: capitalize;
+    font-size: 1.15rem;
+    font-weight: bold;
+  }
+  .product-summary {
+    font-size: 0.85rem;
+    margin-bottom: 0.5rem;
+    color: #333;
+  }
+  .media-texts {
+    margin-left: 1rem;
+    padding-bottom: 1rem;
+    padding-top: 1rem;
+  }
+  .spec {
+    margin-right: 1rem;
   }
-  dl.product-specs {
-    font-size: 0.75rem;
+  .product-specs {
+    font-size: 0.8rem;
+    color: #333;
   }
   .taxon-tags {
-    padding-bottom: 15px;
+    margin-top: 5px;
+    padding-top: 5px;
+    padding-bottom: 5px;
   }
   .tag {
-    @include transition-property(background-color);
-    @include transition-duration(300ms);
-    @include transition-timing-function(ease-out);
-    background: {
-      color: darken(red, 25%);
-    }
-    &:hover {
-      background-color: darken(red, 15%);
-    }
-    &:before {
+    margin-left: 5px;
+    margin-right: 10px;
+    &::before {
       content: "+";
     }
-    font-size: 1rem;
-    color: #ddd;
-    padding-left: 5px;
-    padding-right: 10px;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    margin-right: 10px;
+    color: #666;
+    font-weight: bold;
   }
 }
+
+
 <% end %>

data/generica/app/varissets/stylesheets/apiv1/components/_product-listing.css.scss.erb

@@ -5,37 +5,72 @@
   @include transition-duration(300ms);
   @include transition-timing-function(ease-out);
   background: {
-    color: #ccc;
+    color: #eeeeee;
   }
   &:hover {
     background: {
-      color: #ddd;
+      color: #f1f1f1;
     }
   }
+  
   .product-image {
-    width: 100px;
-    max-height: 200px;
+    @media #{$small-only} {
+      width: 175px;
+      height: 175px;
+    }
+    @media #{$medium-up} {
+      width: 100px;
+      height: 100px;
+    }
+    @media #{$large-up} {
+      width: 125px;
+      height: 125px; 
+    }
+    background: {
+      size: cover;
+      position: center center;
+    }
   }
   .media-texts {
     font-size: 1.45rem;
     width: 100%;
+    @media #{$small-only} {
+      @include order(-1);
+    }
+  }
+  .big-title {
+    padding-top: 10px;
+    padding-bottom: 10px;
+  }
+  .dateline {
+    font-size: 0.9rem;
+    font-weight: bold;
+    margin-bottom: 10px;
+    color: #777;
   }
   .smaller-details {
     font-size: 0.8rem;
+    color: #444;
   }
   .media-object {
     margin-right: 15px;
   }
   .product-header {
     @include display-flex;
-    @include flex-direction(row);
-    @include justify-content(flex-start);
     @include align-items(center);
+    @media #{$small-only} {
+      @include flex-direction(column);
+      @include justify-content(flex-start);
+    }
+    @media #{$medium-up} {
+      @include flex-direction(row);
+      @include justify-content(flex-start);
+    }
     border-bottom: 1px solid #bbb;
   }
   .taxon-tags {
-    margin-top: 5px;
-    margin-bottom: 5px;
+    margin-top: 2.5px;
+    margin-bottom: 2.5px;
   }
   .tag {
     @include transition-property(background-color);
@@ -50,13 +85,16 @@
     &:before {
       content: "+";
     }
-    font-size: 1.15rem;
+    font-size: 0.8rem;
     color: #ddd;
-    padding-left: 5px;
-    padding-right: 10px;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    margin-right: 10px;
+    padding-left: 2.5px;
+    padding-right: 5px;
+    padding-top: 2.5px;
+    padding-bottom: 2.5px;
+    margin-right: 5px;
+  }
+  .decent-prespace {
+    padding-left: 1.2rem;
   }
 <% end %>
 }