RubyGems - shopify_app - Versions diffs - 2.0.0 → 2.1.0 - Mend

shopify_app 2.0.0 → 2.1.0

Files changed (34) hide show

data/lib/generators/shopify_app/templates/public/500.html ADDED

@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>500 Error: Something went horribly wrong</title>
+  <link rel="stylesheet" type="text/css" href="../assets/bootstrap.css" />
+  <link rel="stylesheet" type="text/css" href="../assets/responsive-bootstrap.css" />
+  <link rel="stylesheet" type="text/css" href="../assets/shopify_app.scss" />
+  <style>
+  .container { text-align:center;}
+  .navbar .brand { float:none;}
+  </style>
+</head>
+<body>
+  <div class="navbar navbar-fixed-top">
+    <div class="navbar-inner">
+      <div class="container">
+        <a href="/" class="brand">Shopify Demo App</a>
+      </div>
+    </div>
+  </div>
+  <div class="container">
+    <div class="content">
+      <div class="page-header">
+        <h1>AH! 500 Error!</h1>
+      </div>
+      <h3><i class="icon-warning-sign" style="margin-top:6px; opacity:.5;"></i> We're sorry, but something went wrong.</h3>
+      <p class="muted">The developer of this app has been notified.</p>
+      <p><button type="button" value ="back" onClick="window.history.back();" class='btn btn-primary'><i class="icon-chevron-left" style="opacity:.25"></i> Back to the app</button></p>
+    </div>
+    <footer>
+      <p>A Shopify app by (company name here)</p>
+    </footer>
+  </div> <!-- /container -->
+</body>
+</html>

data/lib/generators/shopify_app/templates/public/favicon.png ADDED

Binary file

data/lib/generators/shopify_app/templates/public/shopify-114.png ADDED

Binary file

data/lib/generators/shopify_app/templates/public/shopify-57.png ADDED

Binary file

data/lib/generators/shopify_app/templates/public/shopify-72.png ADDED

Binary file

data/lib/shopify_app/version.rb CHANGED

@@ -1,3 +1,3 @@
 module ShopifyApp
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/shopify_app.gemspec CHANGED

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = ShopifyApp::VERSION
   s.platform    = Gem::Platform::RUBY
   s.author      = "Shopify"
-  s.email       = ["edward@shopify.com", "jonathan@shopify.com", "willem@shopify.com"]
+  s.email       = ["edward@shopify.com", "willem@shopify.com"]
   s.homepage    = "http://www.shopify.com/developers"
   s.summary     = %q{This gem is used to get quickly started with the Shopify API}
   s.description = %q{Creates a basic login controller for authenticating with your Shop and also a product controller which lets your edit your products easily.}

metadata CHANGED

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: shopify_app
 version: !ruby/object:Gem::Version
-  hash: 15
   prerelease:
-  segments:
-  - 2
-  - 0
-  - 0
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Shopify
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-11-07 00:00:00 -05:00
-default_executable:
+date: 2012-02-22 00:00:00 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -26,10 +20,6 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        hash: 5
-        segments:
-        - 3
-        - 1
         version: "3.1"
   type: :runtime
   version_requirements: *id001
@@ -41,9 +31,6 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        hash: 3
-        segments:
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -55,16 +42,12 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        hash: 3
-        segments:
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
 description: Creates a basic login controller for authenticating with your Shop and also a product controller which lets your edit your products easily.
 email:
 - edward@shopify.com
-- jonathan@shopify.com
 - willem@shopify.com
 executables: []
@@ -82,7 +65,17 @@ files:
 - lib/generators/shopify_app/README
 - lib/generators/shopify_app/USAGE
 - lib/generators/shopify_app/shopify_app_generator.rb
-- lib/generators/shopify_app/templates/app/assets/stylesheets/shopify_app.css
+- lib/generators/shopify_app/templates/app/assets/images/favicon.png
+- lib/generators/shopify_app/templates/app/assets/images/grid-18px.png
+- lib/generators/shopify_app/templates/app/assets/images/shopify-114.png
+- lib/generators/shopify_app/templates/app/assets/images/shopify-57.png
+- lib/generators/shopify_app/templates/app/assets/images/shopify-72.png
+- lib/generators/shopify_app/templates/app/assets/images/shopify.png
+- lib/generators/shopify_app/templates/app/assets/javascripts/application.js
+- lib/generators/shopify_app/templates/app/assets/stylesheets/application.css
+- lib/generators/shopify_app/templates/app/assets/stylesheets/imports.css.less
+- lib/generators/shopify_app/templates/app/assets/stylesheets/shopify_app.scss
+- lib/generators/shopify_app/templates/app/assets/stylesheets/shopify_app_buttons.css.less
 - lib/generators/shopify_app/templates/app/controllers/home_controller.rb
 - lib/generators/shopify_app/templates/app/controllers/login_controller.rb
 - lib/generators/shopify_app/templates/app/helpers/home_helper.rb
@@ -93,17 +86,19 @@ files:
 - lib/generators/shopify_app/templates/app/views/home/welcome.html.erb
 - lib/generators/shopify_app/templates/app/views/layouts/application.html.erb
 - lib/generators/shopify_app/templates/app/views/login/index.html.erb
-- lib/generators/shopify_app/templates/public/images/box-bg2.gif
-- lib/generators/shopify_app/templates/public/images/info-bg.gif
-- lib/generators/shopify_app/templates/public/images/info.gif
-- lib/generators/shopify_app/templates/public/images/logo.png
+- lib/generators/shopify_app/templates/public/404.html
+- lib/generators/shopify_app/templates/public/422.html
+- lib/generators/shopify_app/templates/public/500.html
+- lib/generators/shopify_app/templates/public/favicon.png
+- lib/generators/shopify_app/templates/public/shopify-114.png
+- lib/generators/shopify_app/templates/public/shopify-57.png
+- lib/generators/shopify_app/templates/public/shopify-72.png
 - lib/shopify_app.rb
 - lib/shopify_app/configuration.rb
 - lib/shopify_app/login_protection.rb
 - lib/shopify_app/railtie.rb
 - lib/shopify_app/version.rb
 - shopify_app.gemspec
-has_rdoc: true
 homepage: http://www.shopify.com/developers
 licenses: []
@@ -117,23 +112,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      hash: 3
-      segments:
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      hash: 3
-      segments:
-      - 0
       version: "0"
 requirements: []
 rubyforge_project: shopify-api
-rubygems_version: 1.6.2
+rubygems_version: 1.8.16
 signing_key:
 specification_version: 3
 summary: This gem is used to get quickly started with the Shopify API

data/lib/generators/shopify_app/templates/app/assets/stylesheets/shopify_app.css DELETED

@@ -1,285 +0,0 @@
-body {
-  margin: 0;
-  font: 0.8em/1.3em "Lucida Grande", Arial, Arial, sans-serif;
-  background: #ededed;
-}
-h1 { font-weight: normal; font-size: 24px; }
-h1 a { color: #FFFAD5; text-decoration: none; }
-h2 { font-weight: normal; margin-top: 24px; }
-h3 { margin-top: 24px; }
-#header {
-  background: #2d3337 url('../images/logo.png') 20px 50% no-repeat;
-  padding: 25px 25px 25px 70px;
-  border-top: 5px solid #1f2326;
-  border-bottom: 1px solid #252a2e;
-}
-#header h1 { color: #fffad5; }
-#login-link {
-  float: right;
-  position: relative;
-  bottom: 43px;
-  right: 15px;
-  color: #ededed;
-}
-#login-link a { color: #ebff7c; }
-#login-link a:hover { text-decoration: underline; }
-#login-link a.shop_name { color: inherit; text-decoration: none; }
-#login-link a.shop_name:hover { text-decoration: underline; }
-#container {
-  width: 90%;
-  min-width: 800px;
-  margin: 40px auto;
-  background: #fff;
-  border-right: 1px solid #e5e5e5;
-  border-bottom: 1px solid #e5e5e5;
-}
-#container h1 { margin: 18px 0 27px 0; }
-#main { padding: 18px; }
-#tabs {
-  margin: 0;
-  padding: 0;
-  height: 20px;
-  position: absolute;
-  top: 123px;
-}
-#tabs li {
-  margin: 0;
-  padding: 0;
-  display: inline;
-  list-style-type: none;
-}
-#tabs a:link, #tabs a:visited {
-  float: left;
-  padding: 3px 8px  ;
-  margin: 0 10px 4px 0px;
-  text-decoration: none;
-  color: #888;
-  background: #ddd;
-}
-#tabs a:link#current, #tabs a:visited#current, #tabs a:hover { color: #000 !important; }
-#tabs a:link#current, #tabs a:visited#current { font-weight: bold; background: #fff; }
-a { color: #22658b; }
-a:hover { color: #359cd7; }
-dl { margin: 10px 15px; }
-dt { margin: 10px 0; }
-dd { margin: 5px 0 15px 0; }
-dl input { margin: 0 !important; }
-code { font-size: 140%; }
-/* UTILITY CLASSES */
-.clearfix:after {
-  content: ".";
-  display: block;
-  height: 0;
-  clear: both;
-  visibility: hidden;
-}
-.clearfix {display: inline-table;}
-/* Hides from IE-mac \*/
-* html .clearfix {height: 1%;}
-.clearfix {display: block;}
-/* End hide from IE-mac */
-.ta-left { text-align: left; }
-.ta-right { text-align: right; }
-.ta-center { text-align: center; }
-.pl { padding-left: 10px !important; }
-.note { color: #777; font-size: 85%; }
-.highlight { background: #ffc; }
-/*
- * LOGIN / WELCOME
- */
-#left, #right {
-  width: 40%;
-  float: left;
-  margin: 0 2% 30px 2%;
-}
-#left { min-width: 390px; }
-#logout { float: right; margin: 10px; }
-#logout a { color: #330; }
-/*
- * DASHBOARD
- */
-.order, .product { width: 55%; }
-.product { margin: 10px; }
-.product img {
-  margin: 0 10px 0 0;
-  float: left;
-}
-.product h4 {
-  margin: 0 0 12px 0;
-  font-size: 14px;
-}
-.price {
-  color: #666;
-  font-size: 15px;
-  font-family: Times, "Times New Roman";
-  font-style: italic;
-}
-#orders ul {
-  list-style-type: none;
-  padding: 0 0 0 7px;
-}
-#orders li { padding: 3px; }
-#sidebar {
-  float: right;
-  width: 280px;
-  background: #f5fbfe;
-  border-left: 1px solid #D7E4EA;
-  color: #003366;
-  padding: 0 20px 20px 20px;
-  margin-bottom: 18px;
-}
-#sidebar ul {
-  padding-left: 20px;
-  list-style-type: square;
-}
-#sidebar li { margin: 8px 0; }
-/* STYLE OVERVIEW */
-#style-table { margin: 20px 0; }
-#style-table td * { margin: 0; }
-#style-table td { padding: 10px; border-bottom: 1px dotted #e5e5e5; }
-#style-table td:first-child {
-  background:#Fefefe url('../images/box-bg2.gif') repeat-x scroll left bottom;
-}
-/* Flash */
-#flasherrors, #flashnotices {
-  background: #faf7ea;
-  border-bottom: 1px solid #e8e6d9;
-	padding: 10px;
-  font-weight: bold;
-  text-align:center;
-}
-#flasherrors { color: #6e290b; }
-#flashnotices { color: #549d19; }
-/* CLASSES */
-.description {
-	margin: 0px 0px 0px 4px;
-	font-weight: normal;
-}
-.box {
-  padding: 0;
-  background:#FAFAFA url('../images/box-bg2.gif') repeat-x scroll left top;
-  border:1px solid #CCCCCC;
-}
-.wrapper {
-  border:1px solid #FFFFFF;
-  padding: 10px;
-}
-.info {
-	padding: 0;
-	margin: 8px auto;
-	background: #009ad6 url('../images/info-bg.gif') top left repeat-x;
-  border: 1px solid #61abda;
-  font: 1.2em/1.7em "Comic Sans MS";
-  color: #fff;
-  height: 85px;
-}
-.info code {
-  font-size: 14px;
-  background: none;
-}
-.info a { color: #fff; }
-.info a:hover { color: #dcfaff; }
-.grey {
-  background: #eee;
-  border: 1px solid #ccc;
-}
-.green, .orange, .blue { padding: 10px; }
-h1.green, h2.green, h3.green, h1.orange, h2.orange, h3.orange, h1.blue, h2.blue, h3.blue { padding: 0; }
-.green {
-  background: #61b41e;
-  border: 1px solid #60b31d;
-  color: #ddecd0;
-}
-h1.green, h2.green, h3.green {
-  color: #6ece21;
-  background: none;
-  border: none;
-}
-.orange {
-  background: #ce6e21;
-  border: 1px solid #bc641e;
-  color: #fce0ca;
-  padding: 10px;
-}
-h1.orange, h2.orange, h3.orange {
-  color: #ce6e21;
-  background: none;
-  border: none;
-}
-.blue {
-  background: #218bce;
-  border: 1px solid #1e80be;
-  color: #d9ecf8;
-  padding: 10px;
-}
-h1.blue, h2.blue, h3.blue {
-  color: #218bce;
-  background: none;
-  border: none;
-}
-.light {
-  background: #faf7ea;
-  border: 1px solid #e8e6d9;
-  padding: 18px;
-}
-.dark {
-  background: #333;
-  border: 1px solid #000;
-  color: #fff;
-  padding: 10px;
-}