Skip to content

Commit

Permalink
Merge pull request #252 from gauravsinghaec/master
Browse files Browse the repository at this point in the history
Minor changes on front end & back end
  • Loading branch information
gauravsinghaec authored May 24, 2018
2 parents edccf0a + d18485a commit 92dce3e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions controllers/userController.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ var deleteUser = function(userObj, callback) {
var createOAuthUser = function(usrObj, callback) {
var newUser = new UserAcct({
user_name: usrObj.username,
'indiv.name': usrObj.username,
email: usrObj.email,
picture: usrObj.picture,
active_flag: usrObj.active_flag,
Expand Down
2 changes: 1 addition & 1 deletion views/app.hjs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

{{>header}}
{{#successMessage}}
<div class="alert alert-success text-center mx-auto">{{successMessage}}</div>
<div class="alert alert-success text-center mx-auto mt-4">{{successMessage}}</div>
{{/successMessage}}
<main class="options-wrapper d-flex flex-wrap justify-content-center mt-4 mb-5">
<div class="option mx-4 zi-1">
Expand Down
2 changes: 1 addition & 1 deletion views/profile/users.hjs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<!-- End main-content -->
</section>
<!-- Modal -->
<div class="modal fade" id="deleteAccountModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal fade confirmation-modal" id="deleteAccountModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-dialog-centered content-wrapper" role="document">
<div class="modal-content">
<div class="modal-header">
Expand Down

0 comments on commit 92dce3e

Please sign in to comment.