Removed Accidental Editor branch from master
This commit is contained in:
SowinskiBraeden committed
1 parent
f1b5607f9f
commit
e90b1b2654
3 files changed
-132
No files matched your search
@@ -30,59 +30,6 @@ router.get('/login', forwardAuthenticated, (req, res) => res.render('login'));
|
|||||||
// Register Page
|
// Register Page
|
||||||
router.get('/register', forwardAuthenticated, (req, res) => res.render('register'));
|
router.get('/register', forwardAuthenticated, (req, res) => res.render('register'));
|
||||||
|
|
||||||
// Edit page
|
|
||||||
router.get('/edit', (req, res) => res.render('edit'));
|
|
||||||
|
|
||||||
// Edit
|
|
||||||
router.post('/edit', upload.single('image'), (req, res, next) => {
|
|
||||||
// Gets inputs
|
|
||||||
const { _id, name, currPassword, newPassword, newPassword2 } = req.body;
|
|
||||||
let errors = [];
|
|
||||||
|
|
||||||
// Get specified user from db
|
|
||||||
let currUser = User.findOne({ _id });
|
|
||||||
|
|
||||||
// Checks if blank
|
|
||||||
// if (!name || !email || !currPassword || !newPassword || !newPassword2) {
|
|
||||||
// errors.push({ msg: 'Please enter all fields' });
|
|
||||||
// }
|
|
||||||
|
|
||||||
// Checks if new password & new password confirm match
|
|
||||||
if (newPassword != newPassword2) {
|
|
||||||
errors.push({ msg: 'New Passwords do not match' });
|
|
||||||
}
|
|
||||||
|
|
||||||
// Validates new password is required lenght
|
|
||||||
if (newPassword.length < 6) {
|
|
||||||
errors.push({ msg: 'Password must be at least 6 characters' });
|
|
||||||
}
|
|
||||||
|
|
||||||
// Error Handling
|
|
||||||
if (errors.length > 0) {
|
|
||||||
// Redirects to edit page with errors
|
|
||||||
res.render('edit', {
|
|
||||||
errors,
|
|
||||||
name,
|
|
||||||
currPassword,
|
|
||||||
newPassword,
|
|
||||||
newPassword2
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
//creates updated user object
|
|
||||||
let obj = {
|
|
||||||
name: name,
|
|
||||||
image: {
|
|
||||||
data: fs.readFileSync(path.join(__dirname + '/uploads/' + req.file.filename)),
|
|
||||||
contentType: 'image/png'
|
|
||||||
},
|
|
||||||
password: newPassword
|
|
||||||
}
|
|
||||||
//Updates user and redirects to dashboard
|
|
||||||
User.updateOne({ _id }, { $set: obj});
|
|
||||||
res.redirect('/dashboard');
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
// Register
|
// Register
|
||||||
router.post('/register', upload.single('image'), (req, res, next) => {
|
router.post('/register', upload.single('image'), (req, res, next) => {
|
||||||
// Collects input
|
// Collects input
|
||||||
|
|||||||
@@ -1,78 +0,0 @@
|
|||||||
<div class="row mt-5">
|
|
||||||
<div class="col-md-6 m-auto">
|
|
||||||
<div class="card card-body">
|
|
||||||
<h1 class="text-center mb-3">
|
|
||||||
<i class="fas fa-user-plus"></i> Edit Account
|
|
||||||
</h1>
|
|
||||||
<% include ./partials/messages %>
|
|
||||||
<form action="/users/edit" method="POST">
|
|
||||||
|
|
||||||
<!-- Catching _id -->
|
|
||||||
<script>
|
|
||||||
window.onload = function () {
|
|
||||||
var url = document.location.href,
|
|
||||||
params = url.split('?')[1].split('&'),
|
|
||||||
data = {}, tmp;
|
|
||||||
for (var i = 0, l = params.length; i < l; i++) {
|
|
||||||
tmp = params[i].split('=');
|
|
||||||
data[tmp[0]] = tmp[1];
|
|
||||||
}
|
|
||||||
document.getElementById('_id').value = data.name;
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
<input id='_id' type='text' name='_id' value='' style='display: none'></input>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="name">Name</label>
|
|
||||||
<input
|
|
||||||
type="name"
|
|
||||||
id="name"
|
|
||||||
name="name"
|
|
||||||
class="form-control"
|
|
||||||
placeholder="Enter Name"
|
|
||||||
value="<%= typeof name != 'undefined' ? name : '' %>"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class='form-group'>
|
|
||||||
<label for='image'>Upload Profile Picture</label>
|
|
||||||
<input class='form-control' type="file" id="image" name="image" value="" required>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="password">Current Password</label>
|
|
||||||
<input
|
|
||||||
type="password"
|
|
||||||
id="oldPassword"
|
|
||||||
name="oldPassword"
|
|
||||||
class="form-control"
|
|
||||||
placeholder="Current Password"
|
|
||||||
value="<%= typeof password != 'undefined' ? password : '' %>"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="password2">New Password</label>
|
|
||||||
<input
|
|
||||||
type="password"
|
|
||||||
id="newPassword"
|
|
||||||
name="newPassword"
|
|
||||||
class="form-control"
|
|
||||||
placeholder="New Password"
|
|
||||||
value="<%= typeof password2 != 'undefined' ? password2 : '' %>"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="password2">Confirm New Password</label>
|
|
||||||
<input
|
|
||||||
type="password"
|
|
||||||
id="newPassword2"
|
|
||||||
name="newPassword2"
|
|
||||||
class="form-control"
|
|
||||||
placeholder="Confirm New Password"
|
|
||||||
value="<%= typeof password2 != 'undefined' ? password2 : '' %>"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<button type="submit" class="btn btn-primary btn-block">
|
|
||||||
Save Changes
|
|
||||||
</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@@ -52,7 +52,6 @@
|
|||||||
|
|
||||||
<!-- Action Buttons -->
|
<!-- Action Buttons -->
|
||||||
<a href="/users/logout" class="btn btn-secondary">Logout</a>
|
<a href="/users/logout" class="btn btn-secondary">Logout</a>
|
||||||
<button onClick='passData()' class='btn btn-secondary'>Edit</button>
|
|
||||||
|
|
||||||
<!-- Passing user _id to edit page script -->
|
<!-- Passing user _id to edit page script -->
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
Reference in new issue
Block a user