comable_backend 0.3.2 → 0.3.3

data/app/views/comable/admin/store/edit.slim

@@ -1,13 +1,12 @@
-#comable-store
-  ol.breadcrumb
-    li
-      = link_to Comable.t('admin.nav.dashboard'), comable.admin_root_path
-    li.active
-      = Comable.t('admin.nav.store')
+.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.store')
+      h1.page-header
+        = Comable.t('admin.nav.store')
 
-  .row
-    section.col-sm-8
-      = render 'form'
+  .comable-page-body
+    = render 'form'

data/app/views/comable/admin/user_sessions/new.slim

@@ -0,0 +1,25 @@
+- content_for :head do
+  link href="//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700" rel="stylesheet"
+
+.comable-signin
+  .comable-signin-heading
+    h1.page-header
+      | Comable
+      small
+        | provides a simple way to add e-commerce features.
+
+  .comable-signin-body
+    = form_for resource, as: resource_name, url: session_path(resource_name) do |f|
+      .form-group
+        = f.email_field :email, placeholder: f.object.class.human_attribute_name(:email)
+
+      .form-group
+        = f.password_field :password, placeholder: f.object.class.human_attribute_name(:password)
+
+      .form-group
+        .checkbox
+          = f.label :remember_me do
+            = f.check_box :remember_me
+            = f.object.class.human_attribute_name(:remember_me)
+
+      = f.submit Comable.t('admin.sign_in'), class: 'btn btn-primary btn-block btn-lg'

data/app/views/layouts/comable/admin/application.slim

@@ -1,110 +1,28 @@
 doctype html
 html
   head
+    meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport"
     title
       | Comable
+    = yield :head
     = stylesheet_link_tag 'comable/admin/application', media: 'all'
     = javascript_include_tag 'comable/admin/application'
     = csrf_meta_tags
-  body
-    header.header.navbar.navbar-default.navbar-fixed-top
-      .container-fluid
-        .navbar-header
-          = link_to comable.admin_root_path, class: 'navbar-brand' do
-            span.navbar-logo
-            | Comable
 
-          button.navbar-toggle type="button" data-click="sidebar-toggled"
-            span.icon-bar
-            span.icon-bar
-            span.icon-bar
+  body id="#{"comable-#{controller_name.singularize}"}"
+    = render 'comable/admin/shared/notifier'
 
-        ul.nav.navbar-nav.navbar-right
-          li
-            = link_to comable.root_path do
-              = Comable.t('admin.back_to_store')
-          li.dropdown.navbar-user
-            a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"
-              span.hidden-xs
-                = current_customer.email
-              span.caret<
-            ul.dropdown-menu.animated.fadeInLeft
-              li.arrow
-              li
-                = link_to comable.edit_admin_customer_path(current_customer) do
-                  span.fa.fa-edit>
-                  = Comable.t('admin.edit_profile')
-              li.divider
-              li
-                = link_to comable.destroy_customer_session_path, method: :delete do
-                  span.fa.fa-sign-in
-                  = Comable.t('sign_out')
+    - if current_customer.signed_in?
+      = render 'comable/admin/shared/header'
 
-    #wrapper
-      .sidebar
-        .vnavigation
-          ul
-            li class="#{'active' if controller_name == 'dashboard'}"
-              = link_to comable.admin_root_path do
-                i.fa.fa-dashboard
-                = Comable.t('admin.nav.dashboard')
-            li class="#{'active' if controller_name == 'orders'}"
-              = link_to comable.admin_orders_path do
-                i.fa.fa-shopping-cart
-                = Comable.t('admin.nav.order')
-            li class="#{'active' if controller_name == 'products' || controller_name == 'stocks'}"
-              = link_to comable.admin_products_path do
-                i.fa.fa-cubes
-                = Comable.t('admin.nav.product')
-            li class="#{'active' if controller_name == 'categories'}"
-              = link_to comable.admin_categories_path do
-                i.fa.fa-tags
-                = Comable.t('admin.nav.category')
-            /
-              li
-                = link_to '#' do
-                  i.fa.fa-bar-chart
-                  = Comable.t('admin.nav.analytics')
-              li
-                = link_to '#' do
-                  i.fa.fa-bullhorn
-                  = Comable.t('admin.nav.promotion')
-                ul
-                  li
-                    = Comable.t('admin.nav.static_page')
-                  li
-                    = Comable.t('admin.nav.static_content')
-            li class="#{'active' if controller_name == 'customers'}"
-              = link_to comable.admin_customers_path do
-                i.fa.fa-user
-                = Comable.t('admin.nav.customer')
-            li class="#{'active' if controller_name.in? %w( store shipment_methods payment_methods )}"
-              = link_to '#' do
-                i.fa.fa-cog
-                = Comable.t('admin.nav.general_settings')
-              ul
-                li class="#{'active' if controller_name == 'store'}"
-                  = link_to Comable.t('admin.nav.store'), comable.admin_store_path
-                li class="#{'active' if controller_name == 'shipment_methods'}"
-                  = link_to Comable.t('admin.nav.shipment_method'), comable.admin_shipment_methods_path
-                li class="#{'active' if controller_name == 'payment_methods'}"
-                  = link_to Comable.t('admin.nav.payment_method'), comable.admin_payment_methods_path
+      #wrapper
+        = render 'comable/admin/shared/sidebar'
 
-      main.container-fluid
-        - if flash[:alert] || flash[:notice]
-          #comable-notifier
-            - if flash[:alert]
-              .comable-alert = flash[:alert]
-            - if flash[:notice]
-              .comable-notice = flash[:notice]
+        main.container-fluid
+          = yield
 
+        = render 'comable/admin/shared/footer'
+    - else
+      main
         = yield
-
-      footer
-        ul.list-inline
-          li
-            | Comable v#{Comable::VERSION::STRING}
-          li
-            = link_to 'GitHub', 'https://github.com/hyoshida/comable'
-          li
-            = link_to 'License', 'https://github.com/hyoshida/comable/blob/master/MIT-LICENSE'
+      = render 'comable/admin/shared/footer'

data/config/routes.rb

@@ -7,6 +7,7 @@ Comable::Core::Engine.routes.draw do
     resources :products do
       resources :stocks
     end
+    resources :stocks
 
     resources :categories
     resources :orders
@@ -15,6 +16,8 @@ Comable::Core::Engine.routes.draw do
     resources :payment_methods
     resource :store, controller: :store, only: [:show, :edit, :update]
 
-    devise_for :customer, path: :user, class_name: Comable::Customer.name, module: :devise
+    devise_for :customer, path: :user, class_name: Comable::Customer.name, module: :devise, controllers: {
+      sessions: 'comable/admin/user_sessions'
+    }
   end
 end

data/lib/comable/backend/engine.rb

@@ -7,14 +7,15 @@ require 'compass-rails'
 require 'bootstrap-sass'
 require 'font-awesome-rails'
 require 'kaminari'
+require 'dynamic_form'
 require 'ransack'
 
 require 'jquery-rails'
 require 'jquery-ui-rails'
-require 'jstree-rails'
 require 'raphael-rails'
 require 'morrisjs-rails'
 require 'pace/rails'
+require 'gritter'
 
 module Comable
   module Backend

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comable_backend
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - YOSHIDA Hiroki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: comable_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -33,7 +33,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,21 +43,21 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: slim-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -78,146 +78,152 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: compass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.4
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.3.3
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.3.0.0
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.16.2
 - !ruby/object:Gem::Dependency
-  name: ransack
+  name: dynamic_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.4
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.2
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 1.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.2
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 1.6.3
 - !ruby/object:Gem::Dependency
-  name: jquery-ui-rails
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: 3.1.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: 3.1.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: jstree-rails
+  name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 5.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 5.0.3
 - !ruby/object:Gem::Dependency
   name: raphael-rails
   requirement: !ruby/object:Gem::Requirement
@@ -260,6 +266,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.1
+- !ruby/object:Gem::Dependency
+  name: gritter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: Provide backend functions for Comable.
 email:
 - hyoshida@appirits.com
@@ -271,8 +291,20 @@ files:
 - Rakefile
 - app/assets/javascripts/comable/admin/application.coffee
 - app/assets/javascripts/comable/admin/products.js
+- app/assets/stylesheets/comable/admin/_common.scss
+- app/assets/stylesheets/comable/admin/_dashboard.scss
+- app/assets/stylesheets/comable/admin/_errors.scss
+- app/assets/stylesheets/comable/admin/_mixins.scss
+- app/assets/stylesheets/comable/admin/_orders.scss
+- app/assets/stylesheets/comable/admin/_overrides.scss
+- app/assets/stylesheets/comable/admin/_products.scss
+- app/assets/stylesheets/comable/admin/_user_sessions.scss
+- app/assets/stylesheets/comable/admin/_variables.scss
 - app/assets/stylesheets/comable/admin/application.scss
-- app/assets/stylesheets/comable/admin/products.css
+- app/assets/stylesheets/comable/admin/overrides/bootstrap.scss
+- app/assets/stylesheets/comable/admin/overrides/jstree.scss
+- app/assets/stylesheets/comable/admin/overrides/pace.scss
+- app/assets/stylesheets/comable/admin/overrides/tagit.scss
 - app/controllers/comable/admin/application_controller.rb
 - app/controllers/comable/admin/categories_controller.rb
 - app/controllers/comable/admin/customers_controller.rb
@@ -283,6 +315,7 @@ files:
 - app/controllers/comable/admin/shipment_methods_controller.rb
 - app/controllers/comable/admin/stocks_controller.rb
 - app/controllers/comable/admin/store_controller.rb
+- app/controllers/comable/admin/user_sessions_controller.rb
 - app/helpers/comable/admin/application_helper.rb
 - app/helpers/comable/admin/products_helper.rb
 - app/helpers/comable/admin/shipment_methods_helper.rb
@@ -293,6 +326,7 @@ files:
 - app/views/comable/admin/customers/show.slim
 - app/views/comable/admin/dashboard/_widget.slim
 - app/views/comable/admin/dashboard/show.slim
+- app/views/comable/admin/orders/_google_map.slim
 - app/views/comable/admin/orders/index.slim
 - app/views/comable/admin/orders/show.slim
 - app/views/comable/admin/payment_methods/_form.slim
@@ -300,9 +334,14 @@ files:
 - app/views/comable/admin/payment_methods/index.slim
 - app/views/comable/admin/payment_methods/new.slim
 - app/views/comable/admin/products/_form.slim
+- app/views/comable/admin/products/_image_fields.slim
 - app/views/comable/admin/products/edit.slim
 - app/views/comable/admin/products/index.slim
 - app/views/comable/admin/products/new.slim
+- app/views/comable/admin/shared/_footer.slim
+- app/views/comable/admin/shared/_header.slim
+- app/views/comable/admin/shared/_notifier.slim
+- app/views/comable/admin/shared/_sidebar.slim
 - app/views/comable/admin/shipment_methods/_form.slim
 - app/views/comable/admin/shipment_methods/edit.slim
 - app/views/comable/admin/shipment_methods/index.slim
@@ -313,6 +352,7 @@ files:
 - app/views/comable/admin/stocks/new.slim
 - app/views/comable/admin/store/_form.slim
 - app/views/comable/admin/store/edit.slim
+- app/views/comable/admin/user_sessions/new.slim
 - app/views/kaminari/comable_backend/_first_page.html.slim
 - app/views/kaminari/comable_backend/_gap.html.slim
 - app/views/kaminari/comable_backend/_last_page.html.slim

data/app/assets/stylesheets/comable/admin/products.css

@@ -1,4 +0,0 @@
-/*
-  Place all the styles related to the matching controller here.
-  They will automatically be included in application.css.
-*/