diff --git a/endpoints/api.py b/endpoints/api.py index 47390de28..debe76ab6 100644 --- a/endpoints/api.py +++ b/endpoints/api.py @@ -383,41 +383,43 @@ def subscribe(): else: # Change the plan cus = stripe.Customer.retrieve(user.stripe_id) - cus.plan = plan - # User may have been a previous customer who is resubscribing - if 'token' in request_data: - cus.card = request_data['token'] + if plan == 'free': + cus.cancel_subscription() + cus.save() - cus.save() - return jsonify(subscription_view(cus.subscription, private_repos)) + response_json = { + 'plan': 'free', + 'usedPrivateRepos': private_repos, + } + + else: + cus.plan = plan + + # User may have been a previous customer who is resubscribing + if 'token' in request_data: + cus.card = request_data['token'] + + cus.save() + + response_json = subscription_view(cus.subscription, private_repos) + + return jsonify(response_json) @app.route('/api/user/plan', methods=['GET']) @api_login_required def get_subscription(): user = current_user.db_user + private_repos = model.get_private_repo_count(user.username) if user.stripe_id: - private_repos = model.get_private_repo_count(user.username) cus = stripe.Customer.retrieve(user.stripe_id) if cus.subscription: return jsonify(subscription_view(cus.subscription, private_repos)) - abort(404) - - - -@app.route('/api/user/plan', methods=['DELETE']) -@api_login_required -def cancel_subscription(): - user = current_user.db_user - - if user.stripe_id: - private_repos = model.get_private_repo_count(user.username) - cus = stripe.Customer.retrieve(user.stripe_id) - cus.cancel_subscription() - return make_response('Deleted', 204) - - abort(404) + return jsonify({ + 'plan': 'free', + 'usedPrivateRepos': private_repos, + }); diff --git a/static/css/quay.css b/static/css/quay.css index 576892c38..089b42800 100644 --- a/static/css/quay.css +++ b/static/css/quay.css @@ -5,13 +5,23 @@ margin-bottom: 30px; } +.plans .all-plans { + font-size: 16px; + text-align: center; + margin-bottom: 25px; +} + +.plans .all-plans .feature { + color: #428bca; +} + .plans-list { text-align: center; + margin-bottom: 25px; } .plans-list .plan { width: 245px; - height: 260px; vertical-align: top; display: inline-block; @@ -67,16 +77,26 @@ margin-bottom: 30px; } -.plans-list .plan.focus { +.plans-list .plan .features { + font-size: 16px; + text-align: left; + margin-bottom: 10px; +} + +.plans-list .plan .features i { + margin-right: 5px; +} + + +.plans-list .plan.small { border: 1px solid #ddd; border-top: 4px solid #428bca; margin-top: 0px; font-size: 1.6em; - height: 270px; } -.plans-list .plan button { - +.plans .plan-faq dd{ + margin-bottom: 20px; } .loading { @@ -608,6 +628,10 @@ p.editable:hover i { text-align: center; } +.user-admin .panel-plan .button-hidden { + visibility: hidden; +} + .user-admin .plan-description { font-size: 1.2em; margin-bottom: 10px; diff --git a/static/js/app.js b/static/js/app.js index 58f8ccbe4..ac9e5bae3 100644 --- a/static/js/app.js +++ b/static/js/app.js @@ -34,7 +34,58 @@ quayApp = angular.module('quay', ['restangular', 'angularMoment', 'angulartics', userService.load(); return userService; - }]) + }]); + + $provide.factory('PlanService', [function() { + var plans = [ + { + title: 'Open Source', + price: 0, + privateRepos: 0, + stripeId: 'free', + audience: 'Share with the world', + }, + { + title: 'Micro', + price: 700, + privateRepos: 5, + stripeId: 'micro', + audience: 'For smaller teams', + }, + { + title: 'Basic', + price: 1200, + privateRepos: 10, + stripeId: 'small', + audience: 'For your basic team', + }, + { + title: 'Medium', + price: 2200, + privateRepos: 20, + stripeId: 'medium', + audience: 'For medium-sized teams', + }, + ]; + + var planDict = {}; + var i; + for(i = 0; i < plans.length; i++) { + planDict[plans[i].stripeId] = plans[i]; + } + + var planService = {} + + planService.planList = function() { + return plans; + } + + planService.getPlan = function(planId) { + return planDict[planId]; + } + + return planService; + }]); }). directive('match', function($parse) { return { diff --git a/static/js/controllers.js b/static/js/controllers.js index 080f6fd39..4b4533fda 100644 --- a/static/js/controllers.js +++ b/static/js/controllers.js @@ -77,7 +77,9 @@ function HeaderCtrl($scope, UserService) { }); } -function PlansCtrl($scope, UserService) { +function PlansCtrl($scope, UserService, PlanService) { + $scope.plans = PlanService.planList(); + $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) { $scope.user = currentUser; }, true); @@ -440,38 +442,18 @@ function RepoAdminCtrl($scope, Restangular, $routeParams, $rootScope) { }); } -function UserAdminCtrl($scope, Restangular) { - $scope.plans = [ - { - title: 'Micro', - price: 700, - privateRepos: 5, - stripeId: 'micro', - }, - { - title: 'Basic', - price: 1200, - privateRepos: 10, - stripeId: 'small', - }, - { - title: 'Medium', - price: 2200, - privateRepos: 20, - stripeId: 'medium', - }, - ]; - - var planDict = {}; - var i; - for(i = 0; i < $scope.plans.length; i++) { - planDict[$scope.plans[i].stripeId] = $scope.plans[i]; - } +function UserAdminCtrl($scope, Restangular, PlanService, $routeParams) { + $scope.plans = PlanService.planList(); var subscribedToPlan = function(sub) { $scope.subscription = sub; - $scope.subscribedPlan = planDict[sub.plan]; + $scope.subscribedPlan = PlanService.getPlan(sub.plan); $scope.planUsagePercent = sub.usedPrivateRepos * 100 / $scope.subscribedPlan.privateRepos; + + if (sub.usedPrivateRepos > $scope.subscribedPlan.privateRepos) { + $scope.errorMessage = 'You are using more private repositories than your plan allows, please upgrate your subscription to avoid disruptions in your service.'; + } + $scope.planLoading = false; $scope.planChanging = false; } @@ -505,8 +487,7 @@ function UserAdminCtrl($scope, Restangular) { }); }; - console.log('Got request for plan: ' + planId); - var planDetails = planDict[planId] + var planDetails = PlanService.getPlan(planId) StripeCheckout.open({ key: 'pk_test_uEDHANKm9CHCvVa2DLcipGRh', address: false, // TODO change to true @@ -536,34 +517,14 @@ function UserAdminCtrl($scope, Restangular) { }; $scope.cancelSubscription = function() { - $scope.planChanging = true; - $scope.errorMessage = undefined; - var unsubscribeRequest = Restangular.one('user/plan'); - unsubscribeRequest.customDELETE().then(function() { - $scope.subscription = undefined; - $scope.subscribedPlan = undefined; - $scope.planUsagePercent = 0; - $scope.planChanging = false; - }, function() { - // Failure - $scope.errorMessage = 'Unable to unsubscribe.'; - $scope.planChanging = false; - }); + $scope.changeSubscription('free'); }; // Show the subscribe dialog if a plan was requested. - if (location.hash.indexOf('?') >= 0) { - var query = location.hash.substr(1).split('?')[1]; - var data = query.split("&"); - for (var i = 0; i < data.length; i++) { - var item = data[i].split("="); - if (item[0] == 'plan') { - var planId = item[1]; - if (planDict[planId]) { - $scope.subscribe(planId); - } - break; - } - } + var requested = $routeParams['plan'] + if (requested !== undefined && requested !== 'free') { + if (PlanService.getPlan(requested) !== undefined) { + $scope.subscribe(requested); + } } } \ No newline at end of file diff --git a/static/partials/landing.html b/static/partials/landing.html index 2ff7c1e05..3b7460575 100644 --- a/static/partials/landing.html +++ b/static/partials/landing.html @@ -5,7 +5,7 @@

Secure hosting for private docker containers

Use the docker images your team needs with the safety of private storage

-
Starting at $7/mo
+
Private repository plans starting at $7/mo
@@ -41,7 +41,10 @@ - +
+ +

No credit card required.

+
@@ -67,15 +70,15 @@
- - Cloud Hosted - Accessible from anywhere, anytime + + Shareable + Have to share a container? No problem! Share with anyone you choose
- - Shareable - Have to share a container? No problem! Share with anyone you choose + + Cloud Hosted + Accessible from anywhere, anytime
diff --git a/static/partials/plans.html b/static/partials/plans.html index f39fed726..b1c8c0236 100644 --- a/static/partials/plans.html +++ b/static/partials/plans.html @@ -1,52 +1,59 @@
- Plans and Pricing + Plans & Pricing +
+ +
+ All plans include unlimited public repositories and unlimited sharing. All paid plans have a 14-day free trial.
-
-
Micro
-
$7
-
5 private repositories
-
For smaller teams
+
+
{{ plan.title }}
+
${{ plan.price/100 }}
+
{{ plan.privateRepos }} private repositories
+
{{ plan.audience }}
- + +
+
+ +
+
+
+
Can I use Quay for free?
+
Yes! We offer unlimited storage and serving of public repositories. We strongly believe in the open source community and will do what we can to help!
+
What types of payment do you accept?
+
Quay uses Stripe as our payment processor, so we can accept any of the payment options they offer, which are currently: Visa, MasterCard, American Express, JCB, Discover and Diners Club.
+ +
+
+
+
+
Can I change my plan?
+
Yes, you can change your plan at any time and your account will be pro-rated for the difference.
+
Do you offer special plans for business or academic institutions?
+
Please contact us at our support email address to discuss the details of your organization and inteded usage.
+
-
-
Basic
-
$12
-
10 private repositories
-
For your basic team
- - -
- -
-
Medium
-
$22
-
20 private repositories
-
For medium-sized teams
- - -
- - + + diff --git a/static/partials/user-admin.html b/static/partials/user-admin.html index 5b6d399bf..17c98a070 100644 --- a/static/partials/user-admin.html +++ b/static/partials/user-admin.html @@ -8,7 +8,7 @@
-
+
{{ plan.title }} @@ -20,9 +20,16 @@
${{ plan.price / 100 }}
{{ plan.privateRepos }} Private Repositories
- - - +
+
+ +
+
+ + + +
+