SowinskiBraeden/XP-System
1
0 Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into editor

Browse Source
This commit is contained in:
Braeden Sowinski authored and GitHub committed 2020-12-04 10:11:49 -08:00
2 parents 0ef4daa019 e90b1b2654
commit 23a2117eb4
7 files changed
+12 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.gitignore
+1
View File
@@ -0,0 +1 @@
/routes/uploads
routes/uploads/image-1606760324299
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 47 KiB

views/dashboard.ejs
+1
View File
@@ -1,3 +1,4 @@
<!-- Shows user specific Dashboard -->
<% if (user.role == "Teacher") { %> <% if (user.role == "Teacher") { %>
<% include teacherDashboard %> <% include teacherDashboard %>
<% } %> <% } %>
views/layout.ejs
+1 -1
View File
@@ -9,7 +9,7 @@
rel="stylesheet" rel="stylesheet"
href="https://bootswatch.com/4/journal/bootstrap.min.css" href="https://bootswatch.com/4/journal/bootstrap.min.css"
/> />
<title>XP-System Mock</title> <title>XP-System</title>
</head> </head>
<body> <body>
<div class="container"><%- body %></div> <div class="container"><%- body %></div>
views/register.ejs
+4
View File
@@ -17,6 +17,10 @@
value="<%= typeof name != 'undefined' ? name : '' %>" value="<%= typeof name != 'undefined' ? name : '' %>"
/> />
</div> </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"> <div class="form-group">
<label for='image'>Upload Profile Picture</label> <label for='image'>Upload Profile Picture</label>
<input class="form-control-file" type="file" id="image" name="image" value=""> <input class="form-control-file" type="file" id="image" name="image" value="">
views/studentDashboard.ejs
+1
View File
@@ -53,6 +53,7 @@
<!-- 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> <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>
function passData() { function passData() {
views/teacherDashboard.ejs
+4
View File
@@ -113,6 +113,7 @@
{"Master Digital Crafter": 800} // index 12 {"Master Digital Crafter": 800} // index 12
] ]
let indexes = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 12] let indexes = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 12]
// Students should't be on this page sooooo... // Students should't be on this page sooooo...
console.log("Students Shouldnt be here"); console.log("Students Shouldnt be here");
</script> </script>
@@ -127,6 +128,7 @@
<% if (member.role == "Student") { %> <% if (member.role == "Student") { %>
<!-- Creates User Button link --> <!-- Creates User Button link -->
<li><button class='btn btn-link mt-2' onclick='openProfile("<%= member.id %>")'><%= member.name %></button></li> <li><button class='btn btn-link mt-2' onclick='openProfile("<%= member.id %>")'><%= member.name %></button></li>
<!-- Creates hidden Div with user specific Data --> <!-- Creates hidden Div with user specific Data -->
<div style='display: none; position: relative;' data-role='page' id='<%= member._id %>'> <div style='display: none; position: relative;' data-role='page' id='<%= member._id %>'>
<img id='user-pro-pic' src='data:image/<%=member.image.contentType%>;base64,<%=member.image.data.toString('base64')%>'> <img id='user-pro-pic' src='data:image/<%=member.image.contentType%>;base64,<%=member.image.data.toString('base64')%>'>
@@ -139,6 +141,7 @@
<p><%= member.role %></p> <p><%= member.role %></p>
</div> </div>
<br> <br>
<!-- Calculates user specific Rank --> <!-- Calculates user specific Rank -->
<script> <script>
xp = <%= member.xp %>; xp = <%= member.xp %>;
@@ -163,6 +166,7 @@
} }
} }
} }
// Display Rank // Display Rank
document.getElementById('userRank-<%= member.id %>').innerHTML = currRank; document.getElementById('userRank-<%= member.id %>').innerHTML = currRank;
</script> </script>