Merge latest main

This commit is contained in:
SowinskiBraeden committed 2025-05-05 13:05:56 -07:00
commit 3fcf24c4c9
2 files changed
+56 -25

No files matched your search

+4
View File
@@ -14,9 +14,13 @@ IGNORED: List[str] = [
".history/", ".history/",
"package-lock.json", "package-lock.json",
"/@", "/@",
"yarn.lock",
".lock",
".yml",
"eslint-plugin", "eslint-plugin",
".yy", ".yy",
"Ladder2800.js", # BBY06 - Auto generated code detected. please dont rename this file at all. "Ladder2800.js", # BBY06 - Auto generated code detected. please dont rename this file at all.
".geojson", # Group has thousands of data points in a .geojson file
"...", # It is possible someone has so many sub folders and such a long file name it gets ignored "...", # It is possible someone has so many sub folders and such a long file name it gets ignored
] # git log --stat kinda sucks that it doesnt always show the full folder path ] # git log --stat kinda sucks that it doesnt always show the full folder path
+52 -25
View File
@@ -1,12 +1,41 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head>
<title>COMP 2800 - Slacker</title> <head>
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/index.css') }}"> <title>COMP 2800 - Slacker</title>
</head> <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles/index.css') }}">
<body> </head>
<section class="main">
<body>
<section class="main">
<div>
<h1 class="title">COMP 2800 Slacker</h1>
<h3>See Leaderboards</h3>
<p>
Disclaimer: This reads commits from git log and may not match
commits from Github insights.
</p>
<p>
Additionally, any commits made through the Github web interface are ignored. Its recommended you set your git
username and only use that one git username.
</p>
<p>
Files with matching patterns may be ignored in your commits. E.g. node_module files.
</p>
<ul>
<li><a class="link" href="/boards/TopContributorsAllTime">Top Contributor of All</a></li>
<li><a class="link" href="/boards/TopContributorPerCampus">Top Contributor per Campus</a></li>
<li><a class="link" href="/boards/TopContributorsPerTeam">Top Contributor per Team</a></li>
<li><a class="link" href="/boards/LargestProjectAllTeams">Largest Project of All</a></li>
<li><a class="link" href="/boards/LargestProjectsPerCampus">Largest Project per Campus</a></li>
</ul>
</div>
</section>
<footer class="footer flex-container-c">
<div class="flex-container-r">
<div> <div>
<<<<<<< HEAD
<h1 class="title">COMP 2800 Slacker</h1> <h1 class="title">COMP 2800 Slacker</h1>
<h3>See Leaderboards</h3> <h3>See Leaderboards</h3>
<p> <p>
@@ -26,31 +55,29 @@
<li><a class="link" href="/boards/LargestProjectAllTeams">Largest Project of All</a></li> <li><a class="link" href="/boards/LargestProjectAllTeams">Largest Project of All</a></li>
<li><a class="link" href="/boards/LargestProjectsPerCampus">Largest Project per Campus</a></li> <li><a class="link" href="/boards/LargestProjectsPerCampus">Largest Project per Campus</a></li>
</ul> </ul>
=======
<p><a href="https://sowinski.dev">sowinski.dev</a></p>
>>>>>>> 1d70bb505338d251dca61e83a97a39465c963d7b
</div> </div>
</section> <div class="social-icons">
<a class="icon" href="https://www.linkedin.com/in/SowinskiBraeden" target=_blank rel="noopener noreferrer me"
<footer class="footer flex-container-c"> title=LinkedIn>
<div class="flex-container-r"> <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-linkedin"
<div> viewBox="0 0 16 16">
<p><a href="https://sowinski.dev">sowinski.dev</a></p> <path
</div>
<div class="social-icons">
<a class="icon" href="https://www.linkedin.com/in/SowinskiBraeden" target=_blank rel="noopener noreferrer me"
title=LinkedIn>
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-linkedin"
viewBox="0 0 16 16">
<path
d="M0 1.146C0 .513.526 0 1.175 0h13.65C15.474 0 16 .513 16 1.146v13.708c0 .633-.526 1.146-1.175 1.146H1.175C.526 16 0 15.487 0 14.854zm4.943 12.248V6.169H2.542v7.225zm-1.2-8.212c.837 0 1.358-.554 1.358-1.248-.015-.709-.52-1.248-1.342-1.248S2.4 3.226 2.4 3.934c0 .694.521 1.248 1.327 1.248zm4.908 8.212V9.359c0-.216.016-.432.08-.586.173-.431.568-.878 1.232-.878.869 0 1.216.662 1.216 1.634v3.865h2.401V9.25c0-2.22-1.184-3.252-2.764-3.252-1.274 0-1.845.7-2.165 1.193v.025h-.016l.016-.025V6.169h-2.4c.03.678 0 7.225 0 7.225z" /> d="M0 1.146C0 .513.526 0 1.175 0h13.65C15.474 0 16 .513 16 1.146v13.708c0 .633-.526 1.146-1.175 1.146H1.175C.526 16 0 15.487 0 14.854zm4.943 12.248V6.169H2.542v7.225zm-1.2-8.212c.837 0 1.358-.554 1.358-1.248-.015-.709-.52-1.248-1.342-1.248S2.4 3.226 2.4 3.934c0 .694.521 1.248 1.327 1.248zm4.908 8.212V9.359c0-.216.016-.432.08-.586.173-.431.568-.878 1.232-.878.869 0 1.216.662 1.216 1.634v3.865h2.401V9.25c0-2.22-1.184-3.252-2.764-3.252-1.274 0-1.845.7-2.165 1.193v.025h-.016l.016-.025V6.169h-2.4c.03.678 0 7.225 0 7.225z" />
</svg> </svg>
</a> </a>
<a class="icon" href=https://github.com/SowinskiBraeden/slacker target=_blank rel="noopener noreferrer me" title=Github> <a class="icon" href=https://github.com/SowinskiBraeden/slacker target=_blank rel="noopener noreferrer me"
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentcolor" stroke-width="2" title=Github>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="currentcolor" stroke-width="2"
stroke-linecap="round" stroke-linejoin="round"> stroke-linecap="round" stroke-linejoin="round">
<path <path
d="M9 19c-5 1.5-5-2.5-7-3m14 6v-3.87a3.37 3.37.0 00-.94-2.61c3.14-.35 6.44-1.54 6.44-7A5.44 5.44.0 0020 4.77 5.07 5.07.0 0019.91 1S18.73.65 16 2.48a13.38 13.38.0 00-7 0C6.27.65 5.09 1 5.09 1A5.07 5.07.0 005 4.77 5.44 5.44.0 003.5 8.55c0 5.42 3.3 6.61 6.44 7A3.37 3.37.0 009 18.13V22" /> d="M9 19c-5 1.5-5-2.5-7-3m14 6v-3.87a3.37 3.37.0 00-.94-2.61c3.14-.35 6.44-1.54 6.44-7A5.44 5.44.0 0020 4.77 5.07 5.07.0 0019.91 1S18.73.65 16 2.48a13.38 13.38.0 00-7 0C6.27.65 5.09 1 5.09 1A5.07 5.07.0 005 4.77 5.44 5.44.0 003.5 8.55c0 5.42 3.3 6.61 6.44 7A3.37 3.37.0 009 18.13V22" />
</svg> </svg>
</a> </a>
</div> </div>
</div> </div>
</body> </body>
</html> </html>