Skip to content

Commit

Permalink
Fix style issues, naming conventions and code format with Prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielDavis05 committed Oct 24, 2023
1 parent 62e758a commit c70667b
Show file tree
Hide file tree
Showing 32 changed files with 2,012 additions and 1,769 deletions.
10 changes: 10 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"printWidth": 100,
"trailingComma": "all",
"tabWidth": 2,
"useTabs": false,
"htmlWhitespaceSensitivity": "strict",
"jsxBracketSameLine": false,
"semi": true,
"singleQuote": true
}
30 changes: 16 additions & 14 deletions 401.html
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<title>401 | Conestoga Computer Science Club</title>
<meta name="description" content="The page you are looking for could not be found">
<meta name="theme-color" content="#eaaded">
<meta name="description" content="The page you are looking for could not be found" />
<meta name="theme-color" content="#eaaded" />

<!--CSS re-used across stogacs.club -->
<link rel="stylesheet" href="/style/theme.css">
<link rel="stylesheet" href="/style/navbar.css">
<link rel="stylesheet" href="/style/theme.css" />
<link rel="stylesheet" href="/style/navbar.css" />
</head>
<body>
<section id="stack" class="screen" style="min-height: 40em;">
<h1 class="center-text" style="color: var(--darkred)">401</h1>
<p class="center-text" style="color: var(--white);">You may need to <a href="/leaderboard/login.html">Login</a> to view this page.</p>
<section id="stack" class="screen" style="min-height: 40em">
<h1 class="center-text" style="color: var(--darkred)">401</h1>
<p class="center-text" style="color: var(--white)"
>You may need to <a href="/leaderboard/login.html">Login</a> to view this page.</p
>
</section>


<p style="text-align: center;">

<p style="text-align: center">
<a href="/">Home?</a>
</p>
</body>
</body></html
>
25 changes: 13 additions & 12 deletions 404.html
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<title>404 | Conestoga Computer Science Club</title>
<meta name="description" content="The page you are looking for could not be found">
<meta name="theme-color" content="#eaaded">
<meta name="description" content="The page you are looking for could not be found" />
<meta name="theme-color" content="#eaaded" />

<!--CSS re-used across stogacs.club -->
<link rel="stylesheet" href="/style/theme.css">
<link rel="stylesheet" href="/style/navbar.css">
<link rel="stylesheet" href="/style/theme.css" />
<link rel="stylesheet" href="/style/navbar.css" />
</head>
<body>
<section id="splash" class="screen" style="min-height: 40em;">
<h1>404</h1>
<section id="splash" class="screen" style="min-height: 40em">
<h1>404</h1>
</section>
<p style="text-align: center;">
<a href="/">Back?</a>
<p style="text-align: center">
<a href="/">Back?</a>
</p>
</body>
</body></html
>
320 changes: 220 additions & 100 deletions index.html

Large diffs are not rendered by default.

113 changes: 67 additions & 46 deletions leaderboard/index.html
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
<!DOCTYPE html>
<html lang="en">

<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="ie=edge" />
<title>Sharick Shekels | Conestoga Computer Science Club</title>
<meta name="description" content="View the Shekel leaderboard for the club.">
<meta name="theme-color" content="#eaaded">
<meta name="description" content="View the Shekel leaderboard for the club." />
<meta name="theme-color" content="#eaaded" />

<!--CSS re-used across stogacs.club -->
<link rel="stylesheet" href="/style/theme.css">
<link rel="stylesheet" href="/style/navbar.css">
<link rel="stylesheet" href="/style/main.css">
<link rel="stylesheet" href="/style/theme.css" />
<link rel="stylesheet" href="/style/navbar.css" />
<link rel="stylesheet" href="/style/main.css" />

<!-- Load in page specific CSS -->
<link rel="stylesheet" href="/style/leaderboard/leaderboard.css">
<link rel="stylesheet" href="/style/tooltips.css">
<link rel="stylesheet" href="/style/leaderboard/leaderboard.css" />
<link rel="stylesheet" href="/style/tooltips.css" />

<!-- Load in page specific scripts -->
<script src="/scripts/utils.js"></script>
Expand All @@ -25,44 +24,66 @@

<!-- Load in external CSS Libraries -->
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/build/pure-min.css" />
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/build/grids-responsive-min.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css" />
</head>
<link
rel="stylesheet"
href="https://cdn.jsdelivr.net/npm/[email protected]/build/grids-responsive-min.css"
/>
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css"
/>
</head>

<body>
<body>
<header>
<p class="navbar-title">Conestoga Computer Science Club</p>
<input type="checkbox" id="navbar-click">
<label for="navbar-click" class="navbar-toggle"><i class="fas fa-bars"></i></label>
<ul id="navbar-links">
<li><a href="/">Home</a></li>
</ul>
<p class="navbar-title">Conestoga Computer Science Club</p>
<input type="checkbox" id="navbar-click" />
<label for="navbar-click" class="navbar-toggle"><i class="fas fa-bars"></i></label>
<ul id="navbar-links">
<li><a href="/">Home</a></li>
</ul>
</header>

<section id="leaderboard-section" class="screen pure-g">
<div class="pure-u-1-12"><!-- formatting div PRE--></div>
<div class="pure-u-5-6 pure-g">
<h1 class="pure-u-1 center-text">Sharick Shekels<span class="badge">Beta</span></h1>
<h2 class="center-text error-text" id="error-display" style="display:none"></h2>
<ul id="leaderboard-list">
<noscript>
<p class="center-text">Please enable JavaScript to enable leaderboard functionality</p>
</noscript>
</ul>
<div class="pure-g">
<button id="save-button" type="button" class="pure-button pure-button-primary pure-u-1 pure-u-md-1-12"
style=" float: left;display: none;
justify-content: center;" onclick="updateLeaderboard()">Save</button>
<p class="center-text pure-u-1 pure-u-md-5-6" id="footer-text">You can earn shekels by showing up to
meetings or as a prize for helping the club.<br>Signing in is required to set a preferred name or to
use the shop.</p>
<button id="new-row-button" type="button"
class="pure-button pure-button-primary pure-u-1 pure-u-md-1-12" style="float: right; display: none;
justify-content: center;" onclick="newRow()">User +</button>
</div>

<!-- formatting div POST-->
<div class="pure-u-1-12"><!-- formatting div PRE--></div>
<div class="pure-u-5-6 pure-g">
<h1 class="pure-u-1 center-text"> Sharick Shekels </h1>
<h2 class="center-text error-text" id="error-display" style="display: none"></h2>
<ul id="leaderboard-list">
<noscript>
<p class="center-text">
Please enable JavaScript to enable leaderboard functionality
</p>
</noscript>
</ul>
<div class="pure-g">
<button
id="save-button"
type="button"
class="pure-button pure-button-primary pure-u-1 pure-u-md-1-12"
style="float: left; display: none; justify-content: center"
onclick="updateLeaderboard()"
>
Save
</button>
<p class="center-text pure-u-1 pure-u-md-5-6" id="footer-text">
You can earn shekels by showing up to meetings or as a prize for helping the club.<br />Signing
in is required to set a preferred name or to use the shop.
</p>
<button
id="new-row-button"
type="button"
class="pure-button pure-button-primary pure-u-1 pure-u-md-1-12"
style="float: right; display: none; justify-content: center"
onclick="newRow()"
>
User +
</button>
</div>
<div class="pure-u-1-12"><!-- formatting div POST--></div>

<!-- formatting div POST-->
</div>
<div class="pure-u-1-12"><!-- formatting div POST--></div>
</section>
</body>
</body>
</html>
2 changes: 1 addition & 1 deletion leaderboard/login.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ <h1 class="center-text">Log in</h1>
<div>
<b class="center-text">Log in Options</b>
</div>
<img class="" style="padding:50px;" src="/media/misc/logo-hires.png">
<img class="" style="padding:50px;" src="/media/misc/logo-hires.png"></img>
<div class="button-container">
<a href="https://shekels.mrsharick.com/login">
<button type="button" id="discord-button" class="pure-button button-secondary">
Expand Down
Loading

0 comments on commit c70667b

Please sign in to comment.