shopqi-app 0.2.7 → 0.2.9

data/app/models/shop.rb

@@ -1,5 +1,5 @@
 class Shop < ActiveRecord::Base
-  attr_accessible :shop_id, :name, :shopqi_domain, :access_token
+  attr_accessible :shop_id, :name, :shopqi_domain
 
   def self.find_for_shopqi_oauth(data)
     shop_data = data.extra.raw_info.shop
@@ -11,4 +11,12 @@ class Shop < ActiveRecord::Base
   def use_shopkit
     Shopkit.setup url: self.shopqi_domain, access_token: self.access_token
   end
+
+  def admin_url # 后台
+    "#{SecretSetting.shopqi_domain.protocol}#{self.shopqi_domain}/admin"
+  end
+
+  def front_url # 前台
+    "http://#{self.shopqi_domain}"
+  end
 end

data/lib/generators/shopqi_app/templates/app/assets/javascripts/application.js.coffee

@@ -2,12 +2,12 @@
 #= require jquery_ujs
 #= require_tree .
 
-#= require twitter/bootstrap/dropdown.js
+#= require bootstrap-dropdown
 # accordion 依赖
-#= require twitter/bootstrap/transition.js
-#= require twitter/bootstrap/collapse.js
+#= require bootstrap-transition
+#= require bootstrap-collapse
 ###
-#= require twitter/bootstrap/tooltip.js
+#= require bootstrap-tooltip
 ###
 
 $(document).ready ->

data/lib/generators/shopqi_app/templates/app/assets/stylesheets/application.css.scss.erb

@@ -0,0 +1,71 @@
+/*
+ *= require_tree . 
+ */
+
+// CSS Reset
+@import "bootstrap/reset";
+
+// Core variables and mixins
+@import "bootstrap/variables"; // Modify this for custom colors, font-sizes, etc
+@import "bootstrap/mixins";
+
+// Grid system and page structure
+@import "bootstrap/scaffolding";
+@import "bootstrap/grid";
+@import "bootstrap/layouts";
+
+// Base CSS
+@import "bootstrap/type";
+//@import "bootstrap/code";
+@import "bootstrap/forms";
+@import "bootstrap/tables";
+
+// Components: common
+@import "bootstrap/sprites";
+@import "bootstrap/dropdowns";
+@import "bootstrap/wells";
+@import "bootstrap/component-animations";
+//@import "bootstrap/close";
+
+// Components: Buttons & Alerts
+@import "bootstrap/buttons";
+//@import "bootstrap/button-groups";
+@import "bootstrap/alerts"; // Note: alerts share common CSS with buttons and thus have styles in buttons
+
+// Components: Nav
+@import "bootstrap/navs";
+@import "bootstrap/navbar";
+//@import "bootstrap/breadcrumbs";
+//@import "bootstrap/pagination";
+//@import "bootstrap/pager";
+
+// Components: Popovers
+//@import "bootstrap/modals";
+@import "bootstrap/tooltip";
+//@import "bootstrap/popovers";
+
+// Components: Misc
+//@import "bootstrap/thumbnails";
+@import "bootstrap/labels-badges";
+//@import "bootstrap/progress-bars";
+@import "bootstrap/accordion";
+//@import "bootstrap/carousel";
+@import "bootstrap/hero-unit";
+
+// Utility classes
+@import "bootstrap/utilities"; // Has to be last to override when necessary
+
+body {
+  margin-top: 50px;
+  margin-bottom: 100px; }
+
+.accordion-body {
+  background: #F9F9F9;
+  .accordion-inner {
+    padding: 20px; }}
+
+.footer {
+  color: #333;
+  text-align: center;
+  margin-top: 45px;
+  padding: 35px 0 36px; }

data/lib/generators/shopqi_app/templates/app/models/shop.rb

@@ -1,4 +1,4 @@
-require "#{ShopQiApp::Engine.models_dir}/shop"
+require "#{ShopQiApp::Engine.models_dir}/shop" # methods: use_shopkit admin_url front_url
 class Shop
-  attr_accessible :shop_id, :name, :shopqi_domain, :access_token
+  attr_accessible :shop_id, :name, :shopqi_domain
 end

data/lib/generators/shopqi_app/templates/config/app_secret_config.yml.erb

@@ -1,5 +1,7 @@
 defaults: &defaults
   app_name: ShopQi App Example
+  author:
+    email: mahb45@gmail.com
   oauth:
     client_id: <%= client_id %>
     secret: <%= client_secret %>

data/lib/shopqi-app.rb

@@ -1,6 +1,6 @@
 require "shopqi_app/engine"
 require 'haml' # fixed haml: Missing template
-require 'less-rails-bootstrap'
+require 'bootstrap-sass'
 require 'omniauth'
 require 'settingslogic'
 require 'omniauth-shopqi'

data/lib/shopqi_app/version.rb

@@ -1,3 +1,3 @@
 module ShopQiApp
-  VERSION = "0.2.7"
+  VERSION = "0.2.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopqi-app
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -76,13 +76,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.1.6
 - !ruby/object:Gem::Dependency
-  name: less-rails-bootstrap
+  name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.0.4.0
 - !ruby/object:Gem::Dependency
   name: settingslogic
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +175,7 @@ files:
 - lib/generators/shopqi_app/templates/app/controllers/home_controller.rb
 - lib/generators/shopqi_app/templates/app/models/shop.rb
 - lib/generators/shopqi_app/templates/app/assets/javascripts/application.js.coffee
-- lib/generators/shopqi_app/templates/app/assets/stylesheets/application.css.less.erb
+- lib/generators/shopqi_app/templates/app/assets/stylesheets/application.css.scss.erb
 - lib/generators/shopqi_app/templates/app/views/layouts/application.html.haml
 - lib/generators/shopqi_app/templates/app/views/home/index.html.haml
 - lib/generators/shopqi_app/templates/config/app_secret_config.yml.erb
@@ -205,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -277092943
+      hash: -964293635
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -277092943
+      hash: -964293635
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/generators/shopqi_app/templates/app/assets/stylesheets/application.css.less.erb

@@ -1,71 +0,0 @@
-/*
- *= require_tree . 
- */
-
-// CSS Reset
-@import "twitter/bootstrap/reset.less";
-
-// Core variables and mixins
-@import "twitter/bootstrap/variables.less"; // Modify this for custom colors, font-sizes, etc
-@import "twitter/bootstrap/mixins.less";
-
-// Grid system and page structure
-@import "twitter/bootstrap/scaffolding.less";
-@import "twitter/bootstrap/grid.less";
-@import "twitter/bootstrap/layouts.less";
-
-// Base CSS
-@import "twitter/bootstrap/type.less";
-//@import "twitter/bootstrap/code.less";
-@import "twitter/bootstrap/forms.less";
-@import "twitter/bootstrap/tables.less";
-
-// Components: common
-@import "twitter/bootstrap/sprites.less";
-@import "twitter/bootstrap/dropdowns.less";
-@import "twitter/bootstrap/wells.less";
-@import "twitter/bootstrap/component-animations.less";
-//@import "twitter/bootstrap/close.less";
-
-// Components: Buttons & Alerts
-@import "twitter/bootstrap/buttons.less";
-//@import "twitter/bootstrap/button-groups.less";
-@import "twitter/bootstrap/alerts.less"; // Note: alerts share common CSS with buttons and thus have styles in buttons.less
-
-// Components: Nav
-@import "twitter/bootstrap/navs.less";
-@import "twitter/bootstrap/navbar.less";
-//@import "twitter/bootstrap/breadcrumbs.less";
-//@import "twitter/bootstrap/pagination.less";
-//@import "twitter/bootstrap/pager.less";
-
-// Components: Popovers
-//@import "twitter/bootstrap/modals.less";
-@import "twitter/bootstrap/tooltip.less";
-//@import "twitter/bootstrap/popovers.less";
-
-// Components: Misc
-//@import "twitter/bootstrap/thumbnails.less";
-@import "twitter/bootstrap/labels-badges.less";
-//@import "twitter/bootstrap/progress-bars.less";
-@import "twitter/bootstrap/accordion.less";
-//@import "twitter/bootstrap/carousel.less";
-@import "twitter/bootstrap/hero-unit.less";
-
-// Utility classes
-@import "twitter/bootstrap/utilities.less"; // Has to be last to override when necessary
-
-body {
-  margin-top: 50px;
-  margin-bottom: 100px; }
-
-.accordion-body {
-  background: #F9F9F9;
-  .accordion-inner {
-    padding: 20px; }}
-
-.footer {
-  color: #333;
-  text-align: center;
-  margin-top: 45px;
-  padding: 35px 0 36px; }