vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Have all error pages be rendered by Angular

Browse source 
Fixes #2198

Fixes https://www.pivotaltracker.com/story/show/135724483
This commit is contained in:
Joseph Schorr 2016-12-07 17:13:17 -05:00
parent 0aa6e6cd58
commit c06bba38de
13 changed files with 78 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

5
static/css/pages/error-view.css
View file

@ -23,3 +23,8 @@
width: 225px;
height: 205px;
}
.error-view-element h2 .fa-exclamation-triangle {
margin-right: 16px;
color: #D64456;
}

3
static/js/app.js
View file

@ -214,7 +214,8 @@ quayApp.config(['$routeProvider', '$locationProvider', 'pages', function($routeP
// 404/403
.route('/:catchall', 'error-view')
.route('/:catch/:all', 'error-view');
.route('/:catch/:all', 'error-view')
.route('/:catch/:all/:things', 'error-view');
}]);
// Configure compile provider to add additional URL prefixes to the sanitization list. We use

4
static/js/pages/error-view.js
View file

@ -4,13 +4,13 @@
*/
angular.module('quayPages').config(['pages', function(pages) {
pages.create('error-view', 'error-view.html', ErrorViewCtrl, {
'title': '{{code}}',
'title': '{{info.error_message || "Error"}}',
'description': 'Error',
'newLayout': false
});
}]);
function ErrorViewCtrl($scope, ApiService, $routeParams, UserService) {
function ErrorViewCtrl($scope, ApiService, $routeParams, $rootScope, UserService) {
$scope.info = window.__error_info;
$scope.code = window.__error_code || 404;
}

41
static/partials/error-view.html
View file

@ -1,6 +1,28 @@
<div class="error-view-element">
<!-- 404 -->
<div class="err404" ng-if="code == 404">
<div ng-switch on="info.reason">
<!-- Confirmation error -->
<div ng-switch-when="confirmerror">
<h2><i class="fa fa-exclamation-triangle"></i> Confirmation Error</h2>
<h3>{{ info.error_message || 'There was an error confirming your e-mail address' }}</h3>
<div>
If you've received this error after trying to recover your account, please perform the recovery process again.
</div>
</div>
<!-- OAuth login error -->
<div ng-switch-when="ologinerror">
<h2><i class="fa fa-exclamation-triangle"></i>{{ info.service_name }} login error</h2>
<h3 ng-if="info.error_message">{{ info.error_message }}</h3>
<div ng-if="info.user_creation && info.register_redirect">
To continue, please register using the <a href="/signin">registration form</a>.
You will be able to reassociate this {{ info.service_name }} account to your new Quay account in the user settings panel.
</div>
</div>
<!-- Otherwise -->
<div ng-switch-default>
<!-- 404 -->
<div class="err404" ng-if="code == 404">
<h2>404: Not Found</h2>
<h3 ng-if="!info.for_repo && !info.namespace_exists">The resource you're looking for doesn't exist</h3>
<h3 ng-if="info && !info.namespace_exists">Namespace <strong>{{ info.namespace }}</strong> doesn't exist</h3>
@ -9,18 +31,18 @@
<img src="/static/img/40x/quay-logo-404.svg">
<h4 ng-if="!info.for_repo && !info.namespace_exists">
Return to the <a href="/">main page</a>
Return to the <a href="/">main page</a>
</h4>
<h4 ng-if="info && !info.namespace_exists && info.namespace">
<a href="/organizations/new?namespace={{ info.namespace }}">Create this namespace</a> or return to the <a href="/">main page</a>
<a href="/organizations/new?namespace={{ info.namespace }}">Create this namespace</a> or return to the <a href="/">main page</a>
</h4>
<h4 ng-if="info && info.for_repo && info.namespace_exists && info.namespace">
<a href="/new?namespace={{ info.namespace }}&name={{ info.repo_name }}">Create this repository</a> or return to the <a href="/">main page</a>
<a href="/new?namespace={{ info.namespace }}&name={{ info.repo_name }}">Create this repository</a> or return to the <a href="/">main page</a>
</h4>
</div>
</div>
<!-- 403 -->
<div class="err403" ng-if="code == 403">
<!-- 403 -->
<div class="err403" ng-if="code == 403">
<h2>403: Unauthorized</h2>
<h3 ng-if="!info.for_repo">You are not authorized to view this resource</h3>
<h3 ng-if="info.for_repo">You are not authorized to view this repository</h3>
@ -29,5 +51,8 @@
<h4 ng-if="info.for_repo">Contact the admin of the <strong>{{ info.namespace }}</strong> namespace for access to the repository or you can return to the <a href="/">main page</a></h4>
<h4 ng-if="!info.for_repo">Return to the <a href="/">main page</a></h4>
</div>
</div>
</div>
</div>