jonathan/hostr
jonathan/hostr
1
0
Fork 0
Code Issues Pull requests 4 Projects Releases Packages 1 Wiki Activity Actions

Fix account deletion.

Browse source
This commit is contained in:
Jonathan Cremin 2019-07-21 19:37:20 +00:00
parent 5a7e695e53
commit 971d454e2c
9 changed files with 76 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
web/public/src/app/controllers.js
View file

@ -91,6 +91,16 @@ export class AccountController {
$scope.error = response.data.error.message;
});
};
$scope.delete = (form) => {
$scope.updated = false;
$scope.error = false;
SettingService.delete(form).then(() => {
delete $scope.user.current_password;
window.location = '/logout';
}, (response) => {
$scope.error = response.data.error.message;
});
};
}
}
AccountController.$inject = ['$scope', 'UserService', 'SettingService'];

3
web/public/src/app/services.js
View file

@ -84,6 +84,9 @@ export class SettingService {
service.update = (data) => {
return $http.post(window.settings.apiURL + '/user/settings', data);
};
service.delete = (data) => {
return $http.post(window.settings.apiURL + '/user/delete', data);
};
return service;
}

42
web/public/src/partials/account.html
View file

@ -39,16 +39,16 @@
<div class="alert alert-danger" ng-show="error">{{error}}</div>
<div class="alert alert-success" ng-show="updated">Updated your details successfully</div>
<div class="form-group">
<label for="fname">Email</label>
<input type="email" class="form-control" id="fname" value="{{user.email}}" ng-model="user.email">
<label for="email">Email</label>
<input type="email" class="form-control" id="email" value="{{user.email}}" ng-model="user.email">
<span>
<strong>Required.</strong> Password resets will be sent to this address.</span>
</div>
<div class="form-group">
<label for="fname">New Password</label>
<input type="password" class="form-control" id="fname" ng-model="user.new_password">
<label for="newPassword">New Password</label>
<input type="password" class="form-control" id="newPassword" autocomplete="new-password" ng-model="user.new_password">
<span>Leave this field blank unless you want to update your password.</span>
</div>
@ -56,17 +56,43 @@
<hr>
<div class="form-group">
<label for="fname">Current Password</label>
<input type="password" class="form-control" id="fname" ng-model="user.current_password">
<label for="password">Current Password</label>
<input type="password" class="form-control" id="password" ng-model="user.current_password">
<span><strong>Required.</strong> When updating your details we require your current password.</span>
</div>
<button type="submit" href="#" class="btn btn-signup">Save Changes</button>
<!-- <button type="button" href="#" class="btn">Cancel</button> -->
<!-- <button type="button" class="btn btn-danger">Delete Account</button> -->
</form>
<hr>
<div class="panel panel-default panel-danger">
<div class="panel-body">
<h3>Danger Zone</h3>
<form role="form" ng-submit="delete(userDelete)">
<div class="alert alert-danger" ng-show="error">{{error}}</div>
<div class="form-group">
<label for="deletePassword">Current Password</label>
<input type="password" class="form-control" id="deletePassword" autocomplete="new-password" ng-model="userDelete.current_password">
<span><strong>Required.</strong> When deleting your account we require your current password.</span>
</div>
<div class="form-group">
<label for="deleteConfirm">Please enter "DELETE" below</label>
<input type="input" class="form-control" id="deleteConfirm" ng-model="userDelete.delete_confirm">
</div>
<button type="submit" class="btn btn-danger" ng-disabled="userDelete.delete_confirm!=='DELETE'">Delete Account</button>
<button type="button" href="#" class="btn">Cancel</button>
</form>
</div>
</div>
</div>
</div>
</section>

7
web/public/styles/app.scss
View file

@ -917,8 +917,11 @@ a {
color: #FF524F;
}
.btn-danger {
float: right;
.panel-danger {
margin-top: 75px;
h3 {
color: #FF524F;
}
}
form {