}
.blerg-main h2 {
- margin: 8pt 0;
+ margin: 40px 0 10px 0;
+}
+
+.blerg-main h2:first-child {
+ margin: 0 0 10px 0;
}
.blerg-post {
margin: 0;
}
-.blerg-dialog .onyx-groupbox {
+.blerg-dialog .onyx-groupbox,
+.blerg-form .onyx-groupbox {
margin: 8px 0;
}
font-weight: bold;
}
+.onyx-input-decorator.recovery {
+ min-height: 22px;
+ vertical-align: top;
+ margin-right: 1em;
+}
+
+.onyx-button.recovery {
+ background-color: orange;
+ font-size: 16px;
+ font-weight: bold;
+ min-height: 40px;
+}
+
+p.recovery {
+ background-color: orange;
+ font-size: 20px;
+ padding: 6px;
+}
+
table.help td {
padding: 2pt 8pt;
}
--- /dev/null
+enyo.kind({
+ name: "blerg.AccountCenter",
+ components: [
+ {tag: 'h2', content: "Change Password"},
+ {kind: "blerg.PasswdForm"},
+ {tag: 'h2', content: "Generate recovery link"},
+ {content: "A recovery link is a URL that will allow you to reset the password on your account. Whoever has this link will be able to gain control of your account. This link should be kept in a safe place like an encrypted password manager or a physical piece of paper locked in a safe. The link will expire after one year or the next password change (either via a recovery link or by changing it manually above). To indicate that you understand this, please copy <code>blërg</code> into the textbox below.", tag: 'p', allowHtml: true},
+ {tag: 'p', components: [
+ {kind: 'onyx.InputDecorator', classes: "recovery", components: [
+ {kind: 'onyx.Input', name: "recoveryVerifier"}
+ ]},
+ {kind: 'onyx.Button', content: "Generate", classes: "recovery", onclick: "generateRecoveryLink"}
+ ]},
+ {tag: 'p', name: 'recoveryLinkOutput', classes: 'recovery'}
+ ],
+ statics: {
+ locationDetect: function(l) {
+ var m = l.hash.match(/^#\/account$/);
+ if (m) {
+ return {
+ kind: 'blerg.AccountCenter'
+ };
+ }
+ }
+ },
+ create: function() {
+ this.inherited(arguments);
+ this.bubble('onSetTitle', {section: 'Account Center'});
+ },
+ generateRecoveryLink: function(inSender, inEvent) {
+ if (this.$.recoveryVerifier.getValue() != 'blërg') {
+ this.$.recoveryLinkOutput.setContent('Please read the text above');
+ return;
+ }
+
+ var req = new enyo.Ajax({
+ url: '/aux/recovery/new',
+ handleAs: 'text'
+ });
+
+ req.response(this, function(inSender, inResponse) {
+ this.$.recoveryLinkOutput.setContent(inResponse);
+ });
+
+ req.error(this, function(inSender, inResponse) {
+ this.$.recoveryLinkOutput.setContent('Failed: ' + req.xhrResponse.status);
+ });
+
+ req.go();
+ }
+});
name: "blerg.Blerg",
kind: "Control",
lastHash: null,
- pathHandlers: [ blerg.User, blerg.Tag, blerg.Feed, blerg.ExternalURLPost, blerg.Welcome ],
+ pathHandlers: [ blerg.User, blerg.Tag, blerg.Feed, blerg.ExternalURLPost, blerg.Welcome, blerg.AccountCenter, blerg.Recovery ],
handlers: {
onStartSignup: "showSignupDialog",
onTryLogin: "tryLogin",
{kind: "blerg.Link", content: "Logout", onNavigate: "logoutClicked"},
{tag: null, content: "."},
{tag: "br"},
- {kind: "blerg.Link", content: "Change Password", onNavigate: "changePasswordClicked"},
+ {kind: "blerg.Link", content: "Account Center", href: '/#/account'},
{tag: null, content: "."}
]},
{classes: "blerg-controls-toolbar", components: [
enyo.kind({
- name: "blerg.PasswdDialog",
- kind: "onyx.Popup",
- classes: "blerg-dialog",
- autoDismiss: true,
- centered: true,
- floating: true,
- modal: true,
+ name: "blerg.PasswdForm",
+ classes: "blerg-form",
components: [
- {tag: "h2", content: "Change Password"},
- {name: "spinner", kind: "OldSchoolSpinner", showing: false, style: "position: absolute; top: 8px; right: 8px;"},
{kind: "onyx.Groupbox", components: [
{kind: "onyx.InputDecorator", components: [
{name: "oldpassword", kind: "onyx.Input", placeholder: "Old Password", type: "password"}
{name: "changePasswordError", tag: "p", showing: false, classes: "blerg-error", content: "I couldn't change your password. Are you sure you have the right old password?"},
{name: "passwordMatchError", tag: "p", showing: false, classes: "blerg-error", content: "Your new passwords don't match."},
{name: "changeButton", kind: "onyx.Button", content: "Change", onclick: "changeClick", classes: "onyx.affirmative"},
- {kind: "onyx.Button", content: "Cancel", onclick: "cancelClick", classes: "onyx-negative"},
+ {name: "spinner", kind: "OldSchoolSpinner", showing: false},
{name: "api", kind: "blerg.API",
onPasswordChangeSuccessful: "passwordChangeSuccessful",
onPasswordChangeFailed: "passwordChangeFailed"}
this.$.spinner.start();
this.$.api.changePassword(this.$.oldpassword.getValue(), this.$.password1.getValue());
},
- cancelClick: function() {
- this.hide();
- },
passwordChangeSuccessful: function(inSender, inEvent) {
this.$.oldpassword.setValue('');
this.$.password1.setValue('');
this.$.changeButton.setDisabled(false);
this.$.spinner.hide();
this.$.spinner.stop();
- this.cancelClick();
alert("Password Changed Successfully");
},
passwordChangeFailed: function(inSender, inEvent) {
--- /dev/null
+enyo.kind({
+ name: "blerg.Recovery",
+ components: [
+ {tag: 'h2', content: "Reset Your Password"},
+ {tag: 'p', components: [
+ {kind: 'onyx.InputDecorator', classes: "recovery", components: [
+ {kind: 'onyx.Input', name: "newPassword"}
+ ]},
+ {kind: 'onyx.Button', content: "Set", onclick: "submitRecovery", classes: "recovery"}
+ ]}
+ ],
+ statics: {
+ locationDetect: function(l) {
+ var m = l.hash.match(/^#\/recovery\//);
+ if (m) {
+ return {
+ kind: 'blerg.Recovery'
+ };
+ }
+ }
+ },
+ create: function() {
+ this.inherited(arguments);
+ this.bubble('onSetTitle', {section: 'Reset Password'});
+ },
+ submitRecovery: function(inSender, inEvent) {
+ var m = location.hash.match(new RegExp('^#/recovery/(.*)$'));
+ if (!m) {
+ alert('Validation failed');
+ return;
+ }
+
+ var req = new enyo.Ajax({
+ url: '/aux/recovery/validate',
+ method: 'POST',
+ postBody: {
+ data: m[1],
+ password: this.$.newPassword.getValue()
+ }
+ });
+
+ req.response(this, function(inSender, inResponse) {
+ if (inResponse.status == 'success') {
+ alert('Password changed successfully');
+ location = '/';
+ } else {
+ alert('Password change failed');
+ }
+ });
+
+ req.error(this, function(inSender, inResponse) {
+ alert('Password change failed');
+ });
+
+ req.go();
+ }
+});
onSetTitle: "setTitle"
},
components: [
- {kind: "Image", classes: "logo", src: "images/blerglogo.png", attributes: {width: 125, height: 122}},
+ {kind: "Image", classes: "logo", src: "/images/blerglogo.png", attributes: {width: 125, height: 122}},
{tag: "h1", components: [
{kind: "blerg.Link", href: "/#/", content: "Blërg!"}
]},
],
create: function() {
this.inherited(arguments);
+ this.sectionChanged();
},
sectionChanged: function() {
this.$.section.setContent(this.section);
'Help.js',
'Main.js',
'SignupDialog.js',
- 'PasswdDialog.js',
+ 'PasswdForm.js',
'Welcome.js',
'Pager.js',
'User.js',
'Tag.js',
'Feed.js',
+ 'AccountCenter.js',
+ 'Recovery.js',
'ExternalURLPost.js',
'Blerg.js'
);
projects / blerg.git / commitdiff