comable_backend 0.3.2 → 0.3.3

data/app/assets/stylesheets/comable/admin/overrides/jstree.scss

@@ -0,0 +1,71 @@
+.jstree {
+  @include border-radius($input-border-radius);
+  @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.075));
+  padding: 5px 0;
+  border: 1px solid $input-border;
+
+  .jstree-wholerow {
+    @include transition(none);
+  }
+
+  .jstree-wholerow-hovered {
+    color: $dropdown-link-color;
+    background-color: $dropdown-link-hover-bg;
+  }
+
+  .jstree-wholerow-clicked {
+    color: $dropdown-link-active-color;
+    background-color: $dropdown-link-active-bg;
+  }
+
+  .jstree-anchor.jstree-clicked {
+    color: $dropdown-link-active-color;
+
+    &:link, &:visited, &:hover, &:active {
+      color: $dropdown-link-active-color;
+    }
+
+    & > input {
+      @include border-radius($input-border-radius);
+      @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, 0.075));
+      color: $dropdown-link-color;
+      padding-left: 5px !important;
+      padding-right: 5px !important;
+    }
+  }
+}
+
+ul.vakata-context.jstree-contextmenu {
+  @include border-radius($border-radius-base);
+  @include box-shadow(0 6px 12px rgba(0, 0, 0, 0.175));
+
+  padding: 5px 0;
+  background-color: $dropdown-bg;
+  border-color: $dropdown-border;
+
+  & > li {
+    @include border-radius(0);
+
+    & > a {
+      padding-top: 0;
+      padding-bottom: 0;
+      line-height: $line-height-computed;
+      color: $dropdown-link-color;
+      background-color: $dropdown-bg;
+
+      & > i,
+      & > .vakata-contextmenu-sep {
+        display: none;
+      }
+    }
+
+    &.vakata-context-hover > a {
+      @include box-shadow(none);
+      background-color: $dropdown-bg;
+
+      &:hover {
+        background-color: $dropdown-link-hover-bg;
+      }
+    }
+  }
+}

data/app/assets/stylesheets/comable/admin/overrides/pace.scss

@@ -0,0 +1,4 @@
+.pace .pace-progress {
+  @include transition-property(none);
+  background-color: $comable-pace !important;
+}

data/app/assets/stylesheets/comable/admin/overrides/tagit.scss

@@ -0,0 +1,22 @@
+ul.tagit > li > input[type="text"] {
+  height: auto;
+}
+
+ul.tagit-autocomplete.ui-menu {
+  @include border-radius($border-radius-base);
+  @include box-shadow(0 6px 12px rgba(0, 0, 0, 0.175));
+  padding: 5px 0;
+  border-color: $dropdown-border;
+
+  li.ui-menu-item {
+    padding: $padding-base-vertical $padding-base-horizontal;
+    color: $dropdown-link-color;
+    background-color: $dropdown-bg;
+    border: none;
+
+    &.ui-state-focus {
+      color: $dropdown-link-active-color;
+      background-color: $dropdown-link-active-bg;
+    }
+  }
+}

data/app/controllers/comable/admin/application_controller.rb

@@ -3,6 +3,9 @@ module Comable
     class ApplicationController < ActionController::Base
       include Comable::ApplicationHelper
 
+      # Include `asset_path` method for gritter
+      helper Sprockets::Helpers::RailsHelper if Rails::VERSION::MAJOR == 3
+
       layout 'comable/admin/application'
 
       def current_ability

data/app/controllers/comable/admin/categories_controller.rb

@@ -5,6 +5,9 @@ module Comable
     class CategoriesController < Comable::Admin::ApplicationController
       load_and_authorize_resource class: Comable::Category.name
 
+      def index
+      end
+
       def create
         Comable::Category.from_jstree!(params[:jstree_json])
         redirect_to comable.admin_categories_path

data/app/controllers/comable/admin/customers_controller.rb

@@ -12,6 +12,12 @@ module Comable
         @customers = @q.result.page(params[:page]).accessible_by(current_ability)
       end
 
+      def show
+      end
+
+      def edit
+      end
+
       def update
         if @customer.update_attributes(customer_params)
           redirect_to comable.admin_customer_path(@customer), notice: Comable.t('successful')

data/app/controllers/comable/admin/orders_controller.rb

@@ -9,6 +9,9 @@ module Comable
         @q = Comable::Order.complete.ransack(params[:q])
         @orders = @q.result.page(params[:page]).per(15).order('completed_at DESC').accessible_by(current_ability)
       end
+
+      def show
+      end
     end
   end
 end

data/app/controllers/comable/admin/payment_methods_controller.rb

@@ -13,8 +13,11 @@ module Comable
         render :edit
       end
 
+      def new
+      end
+
       def create
-        if @payment_method.update_attributes(payment_method_params)
+        if @payment_method.save
           redirect_to comable.admin_payment_method_path(@payment_method), notice: Comable.t('successful')
         else
           flash.now[:alert] = Comable.t('failure')
@@ -22,6 +25,9 @@ module Comable
         end
       end
 
+      def edit
+      end
+
       def update
         if @payment_method.update_attributes(payment_method_params)
           redirect_to comable.admin_payment_method_path(@payment_method), notice: Comable.t('successful')

data/app/controllers/comable/admin/products_controller.rb

@@ -5,17 +5,20 @@ module Comable
     class ProductsController < Comable::Admin::ApplicationController
       load_and_authorize_resource class: Comable::Product.name, except: :index
 
+      def index
+        @q = Comable::Product.ransack(params[:q])
+        @products = @q.result.includes(:stocks, :images).page(params[:page]).accessible_by(current_ability)
+      end
+
       def show
         render :edit
       end
 
-      def index
-        @q = Comable::Product.ransack(params[:q])
-        @products = @q.result.includes(:stocks).page(params[:page]).accessible_by(current_ability)
+      def new
       end
 
       def create
-        if @product.update_attributes(product_params)
+        if @product.save
           redirect_to comable.admin_product_path(@product), notice: Comable.t('successful')
         else
           flash.now[:alert] = Comable.t('failure')
@@ -23,6 +26,9 @@ module Comable
         end
       end
 
+      def edit
+      end
+
       def update
         if @product.update_attributes(product_params)
           redirect_to comable.admin_product_path(@product), notice: Comable.t('successful')

data/app/controllers/comable/admin/shipment_methods_controller.rb

@@ -13,8 +13,11 @@ module Comable
         render :edit
       end
 
+      def new
+      end
+
       def create
-        if @shipment_method.update_attributes(shipment_method_params)
+        if @shipment_method.save
           redirect_to comable.admin_shipment_method_path(@shipment_method), notice: Comable.t('successful')
         else
           flash.now[:alert] = Comable.t('failure')
@@ -22,6 +25,9 @@ module Comable
         end
       end
 
+      def edit
+      end
+
       def update
         if @shipment_method.update_attributes(shipment_method_params)
           redirect_to comable.admin_shipment_method_path(@shipment_method), notice: Comable.t('successful')

data/app/controllers/comable/admin/stocks_controller.rb

@@ -3,32 +3,38 @@ require_dependency 'comable/admin/application_controller'
 module Comable
   module Admin
     class StocksController < Comable::Admin::ApplicationController
-      load_and_authorize_resource :product, class: Comable::Product.name
-      load_and_authorize_resource :stock, class: Comable::Stock.name, through: :product
+      load_and_authorize_resource :stock, class: Comable::Stock.name, except: [:new, :create]
 
-      before_filter :redirect_to_show_when_nonsku_product, only: :index
+      load_and_authorize_resource :product, class: Comable::Product.name, only: [:new, :create]
+      load_and_authorize_resource :stock, class: Comable::Stock.name, through: :product, only: [:new, :create]
+
+      def index
+        @q = @stocks.ransack(params[:q])
+        @stocks = @q.result.includes(:product).page(params[:page]).accessible_by(current_ability)
+      end
 
       def show
         render :edit
       end
 
-      def index
-        @q = @product.stocks.ransack(params[:q])
-        @stocks = @q.result.includes(:product).page(params[:page]).accessible_by(current_ability)
+      def new
       end
 
       def create
-        if @stock.update_attributes(stock_params)
-          redirect_to comable.admin_product_stock_path(@product, @stock), notice: Comable.t('successful')
+        if @stock.save
+          redirect_to comable.admin_stock_path(@stock), notice: Comable.t('successful')
         else
           flash.now[:alert] = Comable.t('failure')
           render :new
         end
       end
 
+      def edit
+      end
+
       def update
         if @stock.update_attributes(stock_params)
-          redirect_to comable.admin_product_stock_path(@product, @stock), notice: Comable.t('successful')
+          redirect_to comable.admin_stock_path(@stock), notice: Comable.t('successful')
         else
           flash.now[:alert] = Comable.t('failure')
           render :edit
@@ -37,7 +43,7 @@ module Comable
 
       def destroy
         if @stock.destroy
-          redirect_to comable.admin_product_stocks_path(@product), notice: Comable.t('successful')
+          redirect_to comable.admin_stocks_path, notice: Comable.t('successful')
         else
           flash.now[:alert] = Comable.t('failure')
           render :edit
@@ -54,16 +60,6 @@ module Comable
           :sku_v_choice_name
         )
       end
-
-      def redirect_to_show_when_nonsku_product
-        return if @product.sku?
-
-        if @product.stocks.first
-          redirect_to comable.admin_product_stock_path(@product, @product.stocks.first)
-        else
-          redirect_to comable.new_admin_product_stock_path(@product)
-        end
-      end
     end
   end
 end

data/app/controllers/comable/admin/store_controller.rb

@@ -11,6 +11,9 @@ module Comable
         render :edit
       end
 
+      def edit
+      end
+
       def update
         if @store.update_attributes(store_params)
           redirect_to comable.admin_store_url, notice: Comable.t('successful')

data/app/controllers/comable/admin/user_sessions_controller.rb

@@ -0,0 +1,7 @@
+module Comable
+  module Admin
+    class UserSessionsController < Devise::SessionsController
+      layout 'comable/admin/application'
+    end
+  end
+end

data/app/helpers/comable/admin/application_helper.rb

@@ -1,6 +1,22 @@
 module Comable
   module Admin
     module ApplicationHelper
+      def link_to_save
+        link_to Comable.t('admin.actions.save'), 'javascript:$("form").submit()', class: 'btn btn-primary'
+      end
+
+      def gravatar_tag(email, options = {})
+        hash = Digest::MD5.hexdigest(email)
+        image_tag "//www.gravatar.com/avatar/#{hash}?default=mm", options
+      end
+
+      def link_to_add_fields(name, f, association, options = {})
+        new_object = f.object.class.reflect_on_association(association).klass.new
+        fields = f.fields_for(association, new_object, child_index: "new_#{association}") do |builder|
+          render("#{association.to_s.singularize}_fields", ff: builder)
+        end
+        link_to(name, 'javascript:void(0)', options.merge(onclick: "add_fields(this, '#{association}', '#{escape_javascript(fields)}')"))
+      end
     end
   end
 end

data/app/views/comable/admin/categories/index.slim

@@ -1,94 +1,91 @@
-#comable-category
-  ol.breadcrumb
-    li
-      = link_to Comable.t('admin.nav.dashboard'), comable.admin_root_path
-    li.active
-      = Comable.t('admin.nav.category')
+/ TODO: Use downloaded files
+= javascript_include_tag 'http://rawgit.com/vakata/jstree/3.0.9/dist/jstree.min.js'
+= content_for :head do
+  = stylesheet_link_tag 'http://rawgit.com/vakata/jstree/3.0.9/dist/themes/default/style.min.css', media: 'all'
 
-  h1.page-header
-    = Comable.t('admin.nav.category')
+/ TODO: Move to a file.
+javascript:
+  comable_jstree_json = #{raw @categories.to_jstree(state: { opened: true }, icon: 'fa fa-bars')};
+  comable_new_node_label = '#{Comable.t('admin.categories.new_node')}';
+  comable_action_new = '#{Comable.t('admin.actions.new')}';
+  comable_action_edit = '#{Comable.t('admin.actions.edit')}';
+  comable_action_destroy = '#{Comable.t('admin.actions.destroy')}';
+  comable_destroied_nodes = [];
 
-  javascript:
-    comable_jstree_json = #{raw @categories.to_jstree(state: { opened: true }, icon: 'fa fa-bars')};
-    comable_new_node_label = '#{Comable.t('admin.categories.new_node')}';
-    comable_action_new = '#{Comable.t('admin.actions.new')}';
-    comable_action_edit = '#{Comable.t('admin.actions.edit')}';
-    comable_action_destroy = '#{Comable.t('admin.actions.destroy')}';
-    comable_destroied_nodes = [];
-
-  coffee:
-    jQuery(->
-      $comable_jstree = $('#comable-jstree')
-      $comable_jstree.jstree({
-        core: {
-          check_callback: true,
-          data: comable_jstree_json,
-          strings : { new_node: comable_new_node_label, icon: 'fa fa-bars' }
-        },
-        contextmenu: {
-          items: ($node) ->
-            _this = $comable_jstree.jstree(true)
-            {
-              create: {
-                label: comable_action_new,
-                action: -> create_new_node($node)
-              }
-              edit: {
-                label: comable_action_edit,
-                action: -> _this.edit($node)
-              }
-              destory: {
-                label: comable_action_destroy,
-                action: ->
-                  comable_destroied_nodes.push { _destroy: $node.id }
-                  _this.delete_node($node)
-              }
+coffee:
+  jQuery(->
+    $comable_jstree = $('#comable-jstree')
+    $comable_jstree.jstree({
+      core: {
+        check_callback: true,
+        data: comable_jstree_json,
+        strings : { new_node: comable_new_node_label, icon: 'fa fa-bars' }
+      },
+      contextmenu: {
+        items: ($node) ->
+          _this = $comable_jstree.jstree(true)
+          {
+            create: {
+              label: comable_action_new,
+              action: -> create_new_node($node)
+            }
+            edit: {
+              label: comable_action_edit,
+              action: -> _this.edit($node)
+            }
+            destory: {
+              label: comable_action_destroy,
+              action: ->
+                comable_destroied_nodes.push { _destroy: $node.id }
+                _this.delete_node($node)
             }
-        },
-        plugins: ['dnd', 'wholerow', 'contextmenu']
-      })
+          }
+      },
+      plugins: ['dnd', 'wholerow', 'contextmenu']
+    })
 
-      window.create_new_node = ($node = '#') ->
-        jstree = $comable_jstree.jstree(true)
-        new_node = jstree.create_node($node)
-        jstree.open_node($node) unless jstree.is_open($node)
-        jstree.rename_node(new_node, comable_new_node_label)
-        jstree.set_icon(new_node, 'fa fa-bars')
+    window.create_new_node = ($node = '#') ->
+      jstree = $comable_jstree.jstree(true)
+      new_node = jstree.create_node($node)
+      jstree.open_node($node) unless jstree.is_open($node)
+      jstree.rename_node(new_node, comable_new_node_label)
+      jstree.set_icon(new_node, 'fa fa-bars')
 
-      $('form').submit(->
-        json = $comable_jstree.jstree(true).get_json().concat(comable_destroied_nodes)
-        json_string = JSON.stringify(json)
-        $(this).find('#jstree_json').val(json_string)
-      )
+    $('form').submit(->
+      json = $comable_jstree.jstree(true).get_json().concat(comable_destroied_nodes)
+      json_string = JSON.stringify(json)
+      $(this).find('#jstree_json').val(json_string)
     )
+  )
+
+.comable-page
+  .comable-main-fixed-top
+    .comable-page-heading
+      ul.pull-right.list-inline
+        li
+          = link_to_save
+
+      h1.page-header
+        = Comable.t('admin.nav.category')
 
-  .row
-    section.col-sm-8
-      .panel.panel-inverse
-        .panel-heading
-          .panel-title
-            = Comable.t('admin.actions.edit')
-        - if @categories.empty?
-          .panel-body
-            = Comable.t('admin.not_found')
-        - else
-          .panel-body
-            .well.well-sm
-              p
-                strong
-                  = Comable.t('admin.note')
-              ul
-                li
-                  = Comable.t('admin.you_can_drag_and_drop')
-                li
-                  = Comable.t('admin.you_can_right_click')
-                li
-                  = Comable.t('admin.link_to_add_new_node')
-                  = link_to Comable.t('admin.actions.new'), '#', onclick: 'create_new_node()'
-            #comable-jstree
-          .panel-footer
-            = form_tag comable.admin_categories_path do
-              = hidden_field_tag :jstree_json
-              = submit_tag Comable.t('admin.actions.update')
+  .comable-page-body
+    fieldset
+      .col-sm-3
+        legend
+          = Comable.t('admin.note')
+        .help-block
+          ul
+            li
+              = Comable.t('admin.you_can_drag_and_drop')
+            li
+              = Comable.t('admin.you_can_right_click')
+            li
+              = Comable.t('admin.link_to_add_new_node')
+              = link_to Comable.t('admin.actions.new'), 'javascript:create_new_node()'
 
-    nav.col-sm-4
+      .col-sm-9
+        #comable-jstree
+        = form_tag comable.admin_categories_path do
+          .hidden
+            = submit_tag
+          = hidden_field_tag :jstree_json