comable_backend 0.4.2 → 0.5.0

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

@@ -0,0 +1,25 @@
+#awesome_admin_layout {
+  font-size: larger;
+}
+
+.awesome_admin_layout-main {
+  margin: 0;
+}
+
+.awesome_admin_layout-navigation-toggle {
+  position: absolute;
+  z-index: 300;
+  // = .comable-page-heading's `padding`
+  padding: 25px 30px;
+}
+
+@media screen and (max-width: $screen-sm-min) {
+  .comable-main-fixed-top {
+    padding-left: 0 !important;
+  }
+
+  .comable-page-heading {
+    // = .comable-page-heading's `padding` + toggle button size + margin
+    padding-left: 30px + 34px + 20px !important;
+  }
+}

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

@@ -1,15 +1,3 @@
-body {
-  margin-top: $navbar-height;
-}
-
-.navbar {
-  @include box-shadow(rgba(0, 0, 0, 0.3) 0 0 2px);
-}
-
-.navbar-default .navbar-nav > li > a:hover {
-  @include transition(color 250ms ease, background-color 250ms ease);
-}
-
 .panel.panel-inverse {
   border: none;
 
@@ -86,3 +74,8 @@ table > tbody > tr > td > ul {
 .btn-link {
   outline: none !important;
 }
+
+.form-group .radio-inline {
+  margin-top: 10px;
+  margin-right: 20px;
+}

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

@@ -89,8 +89,12 @@ module Comable
       def order_params
         params.require(:order).permit(
           :email,
+          :payment_fee,
+          :shipment_fee,
+          :total_price,
           bill_address_attributes: permitted_address_attributes,
-          ship_address_attributes: permitted_address_attributes
+          ship_address_attributes: permitted_address_attributes,
+          order_items_attributes: [:id, :name, :code, :price, :quantity]
         )
       end
     end

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

@@ -0,0 +1,72 @@
+require_dependency 'comable/admin/application_controller'
+
+module Comable
+  module Admin
+    class PagesController < Comable::Admin::ApplicationController
+      load_and_authorize_resource class: Comable::Page.name, except: :index, find_by: :slug
+
+      def index
+        @q = Comable::Page.ransack(params[:q])
+        @pages = @q.result.accessible_by(current_ability)
+      end
+
+      def show
+        edit
+        render :edit
+      end
+
+      def new
+      end
+
+      def edit
+        set_preview_session
+      end
+
+      def create
+        @page = Comable::Page.new(page_params)
+        @page.slug = @page.normalize_slug(page_params[:slug])
+
+        if @page.save
+          redirect_to comable.admin_page_path(@page), notice: Comable.t('successful')
+        else
+          render :new
+        end
+      end
+
+      def update
+        @page.attributes = page_params
+        @page.slug = @page.normalize_slug(page_params[:slug])
+
+        if @page.save
+          redirect_to comable.admin_page_path(@page), notice: Comable.t('successful')
+        else
+          render :edit
+        end
+      end
+
+      def destroy
+        @page.destroy
+        redirect_to comable.admin_pages_path, notice: Comable.t('successful')
+      end
+
+      private
+
+      def page_params
+        params.require(:page).permit(
+          :title,            # コンテンツのタイトル
+          :content,          # コンテンツ
+          :page_title,       # ページのタイトル
+          :meta_description, # ディスクリプション
+          :meta_keywords,    # キーワード
+          :slug,             # スラグ
+          :published_at      # 公開日時
+        )
+      end
+
+      def set_preview_session
+        session[Comable::Page::PREVIEW_SESSION_KEY] ||= {}
+        session[Comable::Page::PREVIEW_SESSION_KEY][@page.slug] = true
+      end
+    end
+  end
+end

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

@@ -0,0 +1,101 @@
+require_dependency 'comable/admin/application_controller'
+
+module Comable
+  module Admin
+    class ThemesController < Comable::Admin::ApplicationController
+      load_and_authorize_resource class: Comable::Theme.name, find_by: :name
+
+      def index
+      end
+
+      def show
+        render :edit
+      end
+
+      def new
+        @theme.attributes = {
+          version: @theme.default_version,
+          author: current_comable_user.bill_full_name || current_comable_user.email
+        }
+      end
+
+      def create
+        if @theme.save
+          redirect_to comable.admin_theme_path(@theme), notice: Comable.t('successful')
+        else
+          flash.now[:alert] = Comable.t('failure')
+          render :new
+        end
+      end
+
+      def edit
+      end
+
+      def update
+        if @theme.update_attributes(theme_params)
+          redirect_to comable.admin_theme_path(@theme), notice: Comable.t('successful')
+        else
+          flash.now[:alert] = Comable.t('failure')
+          render :edit
+        end
+      end
+
+      def destroy
+        @theme.destroy
+        FileUtils.rm_rf(theme_dir)
+        redirect_to comable.admin_themes_path, notice: Comable.t('successful')
+      end
+
+      def tree
+        render :show_file
+      end
+
+      def show_file
+        @code = File.read(filepath) if filepath && File.exist?(filepath)
+      end
+
+      def update_file
+        save_file
+        redirect_to comable.file_admin_theme_path(@theme, path: params[:path]), notice: Comable.t('successful')
+      rescue => e
+        @code = params[:code]
+        flash.now[:alert] = e.message
+        render :show_file
+      end
+
+      def use
+        current_store.update_attributes!(theme: @theme)
+        redirect_to :back, notice: Comable.t('successful')
+      end
+
+      private
+
+      def save_file
+        # Validate the Liquid syntax
+        Liquid::Template.parse(params[:code])
+
+        FileUtils.mkdir_p(File.dirname(filepath)) unless File.exist?(filepath)
+        File.write(filepath, params[:code])
+      end
+
+      def theme_dir
+        File.join('themes', @theme.name)
+      end
+
+      def filepath
+        return unless params[:path]
+        File.join(theme_dir, params[:path])
+      end
+
+      def theme_params
+        params.require(:theme).permit(
+          :name,
+          :version,
+          :display,
+          :homepage,
+          :author
+        )
+      end
+    end
+  end
+end

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

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

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

@@ -27,6 +27,11 @@ module Comable
         end
       end
 
+      def profile
+        @user = current_comable_user
+        render :edit
+      end
+
       private
 
       def user_params

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

@@ -18,10 +18,6 @@ module Comable
         link_to(name, 'javascript:void(0)', options.merge(onclick: "add_fields(this, '#{association}', '#{escape_javascript(fields)}')"))
       end
 
-      def setup_search_form
-        render('comable/admin/shared/setup_search_form')
-      end
-
       def button_to_remove_fields(name, options = {})
         content_tag(:button, name, options.merge(class: "ransack remove_fields #{options[:class]}"))
       end
@@ -48,6 +44,10 @@ module Comable
       rescue NoMethodError
         false
       end
+
+      def page_name
+        [controller_name, action_name].join(':')
+      end
     end
   end
 end

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

@@ -0,0 +1,6 @@
+module Comable
+  module Admin
+    module PagesHelper
+    end
+  end
+end

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

@@ -0,0 +1,69 @@
+module Comable
+  module Admin
+    module ThemesHelper
+      def editable?
+        params[:path].present?
+      end
+
+      def display_views_directory_tree
+        views_direcotry_tree = load_directory_tree(views_dir)
+        build_directory_tree(views_direcotry_tree)
+      end
+
+      def liquidable_models
+        Comable.constants.map do |constant|
+          klass = "Comable::#{constant}".constantize
+          klass.constants.include?(:LiquidDropClass) ? klass : nil
+        end.compact
+      end
+
+      private
+
+      def views_dir
+        spec = Gem::Specification.find_by_name('comable_frontend')
+        fail 'Please install "comable_frontend" gem!' unless spec
+        "#{spec.gem_dir}/app/views"
+      end
+
+      def load_directory_tree(path, parent = nil)
+        children = []
+        tree = { (parent || :root)  => children }
+
+        Dir.foreach(path) do |entry|
+          next if entry.start_with? '.'
+          fullpath = File.join(path, entry)
+          children << (File.directory?(fullpath) ? load_directory_tree(fullpath, entry.to_sym) : entry.sub(/\..+$/, '.liquid'))
+        end
+
+        tree
+      end
+
+      def build_directory_tree(tree, dirpath = nil)
+        content_tag(:dl, build_directory_tree_nodes(tree, dirpath))
+      end
+
+      def build_directory_tree_nodes(tree, dirpath)
+        entries = tree.values.first
+        entries.map do |entry|
+          if entry.is_a? Hash
+            build_directory_tree_children(entry, dirpath)
+          else
+            build_directory_tree_child(entry, dirpath)
+          end
+        end.join.html_safe
+      end
+
+      def build_directory_tree_children(entry, dirpath)
+        dirname = entry.keys.first.to_s
+        path = dirpath ? File.join(dirpath, dirname) : dirname
+        content_tag(:dt, dirname) + build_directory_tree(entry, path)
+      end
+
+      def build_directory_tree_child(filename, dirpath)
+        path = File.join(dirpath, filename)
+        link = link_to(filename, comable.file_admin_theme_path(@theme, path: path))
+        content_tag(:dd, link)
+      end
+    end
+  end
+end

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

@@ -1,8 +1,3 @@
-/ 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'
-
 / TODO: Move to a file.
 javascript:
   comable_jstree_json = #{raw @categories.to_jstree(state: { opened: true }, icon: 'fa fa-bars')};
@@ -12,52 +7,6 @@ javascript:
   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)
-            }
-          }
-      },
-      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')
-
-    $('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
@@ -81,7 +30,7 @@ coffee:
               = 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()'
+              = link_to Comable.t('admin.actions.new'), 'javascript:void(0)', onclick: 'add_comable_jstree_node()'
 
       .col-md-9
         #comable-jstree

data/app/views/comable/admin/dashboard/show.slim

@@ -38,26 +38,6 @@
           #comable-morris.morris style="height: 300px;"
 
       javascript:
-        morris_data = #{raw @this_month_orders.to_morris};
-        morris_keys = #{raw Comable::Order.morris_keys};
-        morris_labels = ['#{Comable.t('admin.order_count')}', '#{Comable.t('admin.sales')}'];
-
-      coffee:
-        new Morris.Line({
-          # ID of the element in which to draw the chart.
-          element: 'comable-morris',
-          # Chart data records -- each entry in this array corresponds to a point on
-          # the chart.
-          data: morris_data,
-          # The name of the data record attribute that contains x-values.
-          xkey: 'date',
-          # A list of names of data record attributes that contain y-values.
-          ykeys: morris_keys,
-          # Labels for the ykeys -- will be displayed when you hover over the
-          # chart.
-          labels: morris_labels,
-          xLabelAngle: 45,
-          xLabels: ['day'],
-          lineColors: ['#00acac', '#348fe2'],
-          hideHover: 'auto'
-        })
+        comable_morris_data = #{raw @this_month_orders.to_morris};
+        comable_morris_keys = #{raw Comable::Order.morris_keys};
+        comable_morris_labels = ['#{Comable.t('admin.order_count')}', '#{Comable.t('admin.sales')}'];