Commit 4c69a5a1 authored by Moises Sacal's avatar Moises Sacal

arranging login interface, removing some logging

parent e57edcd0
......@@ -23,6 +23,53 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
cache-loader@1.2.5
MIT
Copyright JS Foundation and other contributors
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
'Software'), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@angular-devkit/build-optimizer@0.3.2
MIT
The MIT License
Copyright (c) 2017 Google, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
lodash@4.17.11
MIT
Copyright JS Foundation and other contributors <https://js.foundation/>
......
This diff is collapsed.
......@@ -67,7 +67,7 @@ export class LabarchivesListField extends FieldBase<any> {
});
this.checkLinks();
} else {
this.workspaces = [];
this.workspaces = null;
}
}
......
......@@ -85,7 +85,7 @@ export class LabarchivesLoginField extends FieldBase<any> {
selector: 'ws-labarchiveslogin',
template: `
<div class="row">
<div *ngIf="!field.loggedIn" class="col-md-6 col-md-offset-2">
<div *ngIf="!field.loggedIn" class="col-md-6">
<form #form="ngForm">
<div class="form-group">
<label>{{ field.usernameLabel }}</label>
......@@ -116,16 +116,16 @@ export class LabarchivesLoginField extends FieldBase<any> {
<p></p>
</div>
</form>
<div *ngIf="!field.loggedIn" class="col-md-12">
</div>
<div *ngIf="!field.loggedIn" class="col-md-6">
<div class="form-row">
<p>{{ field.helpLoginLabel }}</p>
<ul>
<li *ngFor="let help of field.helpLoginLabelList">{{ help }}</li>
</ul>
<div class="form-row col-md-6">
<p>{{ field.helpLoginLabel }}</p>
<ul>
<li *ngFor="let help of field.helpLoginLabelList">{{ help }}</li>
</ul>
<div class="form-row col-md-6">
<img alt="{{ field.loginHelpImageAlt }}" [src]="field.loginHelpImage"
style="padding: 4px; border: dotted 1px #ccc;"/>
</div>
<img alt="{{ field.loginHelpImageAlt }}" [src]="field.loginHelpImage"
style="padding: 4px; border: dotted 1px #ccc;"/>
</div>
</div>
</div>
......
......@@ -35,7 +35,6 @@ var Controllers;
return WorkspaceService.workspaceAppFromUserId(userId, this.config.appName);
}
else {
console.log(response);
const message = 'username and password invalid';
throw new Error(message);
}
......@@ -134,8 +133,6 @@ var Controllers;
return rxjs_1.Observable.fromPromise(insertNode);
})
.flatMap(response => {
sails.log.debug('insertNode');
sails.log.debug(response);
if (response && response['tree-tools']) {
const tree = response['tree-tools'];
const node = tree['node'];
......@@ -173,7 +170,6 @@ var Controllers;
});
}
checkLink(req, res) {
sails.log.debug('checkLink');
const userId = req.user.id;
const username = req.user.username;
const rdmp = req.param('rdmp');
......
......@@ -35,7 +35,7 @@ module.exports = {
name: 'Login',
loginLabel: 'Login',
usernameLabel: 'UTS email address',
passwordLabel: 'LabArchives Password Token for External applications',
passwordLabel: 'LabArchives password token for external applications',
helpLoginLabel: 'To get your Lab Archives password token:',
helpLoginLabelList: [
'Log in to LabArchives',
......@@ -44,7 +44,7 @@ module.exports = {
'Copy the token from Use this password',
'Come back to this screen',
'Enter your UTS email address',
'Paste the password token you copied above into LabArchives Password Token for External applications.'
'Paste the password token you copied above into LabArchives password token for external applications.'
],
loginHelpImageAlt: 'labarchives help login',
loginHelpImage: '/angular/labarchives/assets/images/labarchives-help-login.png',
......
......@@ -52,7 +52,6 @@ export module Controllers {
sails.log.debug(info);
return WorkspaceService.workspaceAppFromUserId(userId, this.config.appName);
} else {
console.log(response);
//Doing this because if the password is incorrect labarchives returns a 404!
const message = 'username and password invalid';
throw new Error(message);
......@@ -159,8 +158,6 @@ export module Controllers {
})
.flatMap(response => {
sails.log.debug('insertNode');
sails.log.debug(response);
if (response && response['tree-tools']) {
const tree = response['tree-tools'];
const node = tree['node'];
......@@ -199,7 +196,6 @@ export module Controllers {
}
checkLink(req, res) {
sails.log.debug('checkLink');
const userId = req.user.id;
const username = req.user.username;
const rdmp = req.param('rdmp');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment