Add a status page to /v1/ so that people don't get confused by the message that docker emits
This commit is contained in:
parent
4f0dced8e7
commit
e382fa1e58
4 changed files with 39 additions and 2 deletions
|
@ -71,6 +71,10 @@ def signin():
|
||||||
def repository():
|
def repository():
|
||||||
return index('')
|
return index('')
|
||||||
|
|
||||||
|
@app.route('/v1')
|
||||||
|
@app.route('/v1/')
|
||||||
|
def v1():
|
||||||
|
return index('')
|
||||||
|
|
||||||
@app.route('/status', methods=['GET'])
|
@app.route('/status', methods=['GET'])
|
||||||
def status():
|
def status():
|
||||||
|
|
|
@ -151,9 +151,12 @@ quayApp = angular.module('quay', ['restangular', 'angularMoment', 'angulartics',
|
||||||
when('/repository/:namespace/:name/admin', {templateUrl: '/static/partials/repo-admin.html', controller:RepoAdminCtrl}).
|
when('/repository/:namespace/:name/admin', {templateUrl: '/static/partials/repo-admin.html', controller:RepoAdminCtrl}).
|
||||||
when('/repository/', {title: 'Repositories', templateUrl: '/static/partials/repo-list.html', controller: RepoListCtrl}).
|
when('/repository/', {title: 'Repositories', templateUrl: '/static/partials/repo-list.html', controller: RepoListCtrl}).
|
||||||
when('/user/', {title: 'User Admin', templateUrl: '/static/partials/user-admin.html', controller: UserAdminCtrl}).
|
when('/user/', {title: 'User Admin', templateUrl: '/static/partials/user-admin.html', controller: UserAdminCtrl}).
|
||||||
when('/guide/', {title: 'Getting Started Guide', templateUrl: '/static/partials/guide.html', controller: GuideCtrl}).
|
when('/guide/', {title: 'User Guide', templateUrl: '/static/partials/guide.html', controller: GuideCtrl}).
|
||||||
when('/plans/', {title: 'Plans and Pricing', templateUrl: '/static/partials/plans.html', controller: PlansCtrl}).
|
when('/plans/', {title: 'Plans and Pricing', templateUrl: '/static/partials/plans.html', controller: PlansCtrl}).
|
||||||
when('/signin/', {title: 'Signin', templateUrl: '/static/partials/signin.html', controller: SigninCtrl}).
|
when('/signin/', {title: 'Signin', templateUrl: '/static/partials/signin.html', controller: SigninCtrl}).
|
||||||
|
|
||||||
|
when('/v1/', {title: 'Activation information', templateUrl: '/static/partials/v1-page.html', controller: V1Ctrl}).
|
||||||
|
|
||||||
when('/', {title: 'Hosted Private Docker Registry', templateUrl: '/static/partials/landing.html', controller: LandingCtrl}).
|
when('/', {title: 'Hosted Private Docker Registry', templateUrl: '/static/partials/landing.html', controller: LandingCtrl}).
|
||||||
otherwise({redirectTo: '/'});
|
otherwise({redirectTo: '/'});
|
||||||
}]).
|
}]).
|
||||||
|
|
|
@ -50,7 +50,7 @@ function getMarkedDown(string) {
|
||||||
}
|
}
|
||||||
|
|
||||||
function HeaderCtrl($scope, $location, UserService, Restangular) {
|
function HeaderCtrl($scope, $location, UserService, Restangular) {
|
||||||
$scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
|
$scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
|
||||||
$scope.user = currentUser;
|
$scope.user = currentUser;
|
||||||
}, true);
|
}, true);
|
||||||
|
|
||||||
|
@ -755,4 +755,14 @@ function UserAdminCtrl($scope, $timeout, Restangular, PlanService, UserService,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
function V1Ctrl($scope, UserService) {
|
||||||
|
$scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
|
||||||
|
$scope.user = currentUser;
|
||||||
|
}, true);
|
||||||
|
|
||||||
|
$scope.browseRepos = function() {
|
||||||
|
document.location = '/repository/';
|
||||||
|
};
|
||||||
}
|
}
|
20
static/partials/v1-page.html
Normal file
20
static/partials/v1-page.html
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
<div class="container">
|
||||||
|
<div ng-show="!user.anonymous && user.verified">
|
||||||
|
<h3>Welcome <b>{{ user.username }}</b>. Your account is fully activated!</h3>
|
||||||
|
|
||||||
|
<div style="margin-top: 20px;">
|
||||||
|
<button class="btn btn-lg btn-primary" ng-click="browseRepos()">Browse all repositories</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div ng-show="!user.anonymous && !user.verified">
|
||||||
|
<h3>Welcome <b>{{ user.username }}</b>. Your account is pending email confirmation.</h3>
|
||||||
|
<p>Please check your inbox (and potentially your spam folder) for an email from <a href="mailto:support@quay.io">support@quay.io</a></p>
|
||||||
|
</div>
|
||||||
|
<div ng-show="user.anonymous">
|
||||||
|
<h3>Docker sent me here. What do I need to do?</h3>
|
||||||
|
<p>
|
||||||
|
<a href="/signin">Sign In</a> to check the activation status of your account. If you have already activated
|
||||||
|
your account previously, then you do not need to do anything further.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
Reference in a new issue