Merge branch 'master' into editor

This commit is contained in:
Braeden Sowinski authored and GitHub committed 2020-12-04 10:11:49 -08:00
commit 23a2117eb4
7 files changed
+13 -2

No files matched your search

+2 -1
View File
@@ -34,7 +34,7 @@
<div>
<div id="myProgress">
<div id="myBar"></div>
<img id='pro-pic' src='data:image/<%= user.image.contentType %>;base64,
<img id='pro-pic' src='data:image/<%=user.image.contentType%>;base64,
<%=user.image.data.toString('base64')%>'>
</div>
<p stlye='text-align: right;' id='percent'></p>
@@ -53,6 +53,7 @@
<!-- Action Buttons -->
<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 -->
<script>
function passData() {