Skip to content

Commit

Permalink
Apply Prettier formatting to all source files (#29)
Browse files Browse the repository at this point in the history
  • Loading branch information
@hmellor
hmellor committed Apr 24, 2023
1 parent b1d78d3 commit b1215f6
Show file tree
Hide file tree
Showing 8 changed files with 784 additions and 574 deletions.
242 changes: 145 additions & 97 deletions admin.html
View file
Original file line number Diff line number Diff line change
@@ -1,108 +1,156 @@
<!doctype html>
<!DOCTYPE html>
<html class="no-js" lang="en">
<head>
<meta charset="utf-8" />
<meta name="robots" content="NOINDEX, NOFOLLOW" />
<!--add no follow tag to keep out of front facing index and search engines-->
<meta name="description" content="An auction website" />
<meta
property="og:image"
content="https://www.mellor.io/auction-website/img/banner.png"
/>
<meta name="keywords" content="Online Auctions" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Markatplace</title>
<link rel="icon" type="image/png" href="./img/favicon.ico" />

<head>
<meta charset="utf-8" />
<meta name="robots" content="NOINDEX, NOFOLLOW">
<!--add no follow tag to keep out of front facing index and search engines-->
<meta name="description" content="An auction website">
<meta property="og:image" content="https://www.mellor.io/auction-website/img/banner.png">
<meta name="keywords" content="Online Auctions">
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Markatplace</title>
<link rel="icon" type="image/png" href="./img/favicon.ico">
<!-- Bootstrap -->
<link
href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/css/bootstrap.min.css"
rel="stylesheet"
integrity="sha384-KK94CHFLLe+nY2dmCWGMq91rCGa5gtU4mk92HdvYe+M/SXH301p5ILy+dN9+nJOZ"
crossorigin="anonymous"
/>
<script
src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/js/bootstrap.bundle.min.js"
integrity="sha384-ENjdO4Dr2bkBIFxQpeoTz1HIcje39Wm4jDKdf19U8gI4ddQ3GYNS7NTKfAdVQSZe"
crossorigin="anonymous"
></script>

<!-- Bootstrap -->
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-KK94CHFLLe+nY2dmCWGMq91rCGa5gtU4mk92HdvYe+M/SXH301p5ILy+dN9+nJOZ" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0-alpha3/dist/js/bootstrap.bundle.min.js"
integrity="sha384-ENjdO4Dr2bkBIFxQpeoTz1HIcje39Wm4jDKdf19U8gI4ddQ3GYNS7NTKfAdVQSZe"
crossorigin="anonymous"></script>
<!-- Custom CSS -->
<link rel="stylesheet" href="./css/auction-website.css" />
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
href="https://fonts.googleapis.com/css2?family=Roboto&display=swap"
rel="stylesheet"
/>
</head>

<!-- Custom CSS -->
<link rel="stylesheet" href="./css/auction-website.css">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Roboto&display=swap" rel="stylesheet">
</head>

<body>
<!-- Navbar -->
<nav class="navbar navbar-dark bg-primary">
<div class="container-fluid">
<a class="navbar-brand mb-0 h1 me-auto">
<img src="./img/logo.png" alt="" width="30" height="24" class="d-inline-block align-text-top">
The Markatplace
</a>
<div class="row row-cols-auto">
<a class="navbar-brand" id="username-display"></a>
<a id="admin-button" class="btn btn-secondary me-2" href="index.html" role="button">Main</a>
<button id="auth-button" class="btn btn-secondary me-2">Sign up</button>
<body>
<!-- Navbar -->
<nav class="navbar navbar-dark bg-primary">
<div class="container-fluid">
<a class="navbar-brand mb-0 h1 me-auto">
<img
src="./img/logo.png"
alt=""
width="30"
height="24"
class="d-inline-block align-text-top"
/>
The Markatplace
</a>
<div class="row row-cols-auto">
<a class="navbar-brand" id="username-display"></a>
<a
id="admin-button"
class="btn btn-secondary me-2"
href="index.html"
role="button"
>Main</a
>
<button id="auth-button" class="btn btn-secondary me-2">
Sign up
</button>
</div>
</div>
</div>
</nav>
<!-- Grid of auction items -->
<div id="table-container" class="container">
<table class="table">
<thead>
<tr>
<th scope="col">#</th>
<th scope="col">Title</th>
<th scope="col">Price</th>
<th scope="col">Bids</th>
<th scope="col">Winning</th>
<th scope="col">Time left</th>
</tr>
</thead>
<tbody></tbody>
</table>
</nav>
<!-- Grid of auction items -->
<div id="table-container" class="container">
<table class="table">
<thead>
<tr>
<th scope="col">#</th>
<th scope="col">Title</th>
<th scope="col">Price</th>
<th scope="col">Bids</th>
<th scope="col">Winning</th>
<th scope="col">Time left</th>
</tr>
</thead>
<tbody></tbody>
</table>

<footer class="d-flex flex-wrap justify-content-between align-items-center py-3 my-4 border-top">
<div class="col-md-4 d-flex align-items-center">
<span class="text-muted">© 2022 Harry Mellor</span>
</div>
<footer
class="d-flex flex-wrap justify-content-between align-items-center py-3 my-4 border-top"
>
<div class="col-md-4 d-flex align-items-center">
<span class="text-muted">© 2022 Harry Mellor</span>
</div>

<ul class="nav col-md-4 justify-content-end list-unstyled d-flex">
<li class="ms-3"><a class="bi bi-github text-muted" href="https://github.com/HMellor/" width="24"
height="24"></a></li>
</ul>
</footer>
</div>
<ul class="nav col-md-4 justify-content-end list-unstyled d-flex">
<li class="ms-3">
<a
class="bi bi-github text-muted"
href="https://github.com/HMellor/"
width="24"
height="24"
></a>
</li>
</ul>
</footer>
</div>

<!-- Login popup -->
<div id="login-modal" class="modal" tabindex="-1">
<div class="modal-dialog modal-dialog-centered modal-dialog-scrollable">
<div class="modal-content">
<div class="modal-header">
<h5 id="login-modal-title" class="modal-title">Sign up for Markatplace Auction</h5>
</div>
<div class="modal-body">
<p>We use anonymous authentication provided by Google. Your account is attached to your device signature.</p>
<p>The username just lets us know who's bidding!</p>
<form onsubmit="return false;">
<div class="form-floating mb-3">
<input type="username" class="form-control" id="username-input" placeholder="username">
<label for="username-input">Username</label>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal"
aria-label="Cancel">Cancel</button>
<button type="submit" class="btn btn-primary">Sign up</button>
</div>
</form>
<!-- Login popup -->
<div id="login-modal" class="modal" tabindex="-1">
<div class="modal-dialog modal-dialog-centered modal-dialog-scrollable">
<div class="modal-content">
<div class="modal-header">
<h5 id="login-modal-title" class="modal-title">
Sign up for Markatplace Auction
</h5>
</div>
<div class="modal-body">
<p>
We use anonymous authentication provided by Google. Your account
is attached to your device signature.
</p>
<p>The username just lets us know who's bidding!</p>
<form onsubmit="return false;">
<div class="form-floating mb-3">
<input
type="username"
class="form-control"
id="username-input"
placeholder="username"
/>
<label for="username-input">Username</label>
</div>
<div class="modal-footer">
<button
type="button"
class="btn btn-secondary"
data-bs-dismiss="modal"
aria-label="Cancel"
>
Cancel
</button>
<button type="submit" class="btn btn-primary">Sign up</button>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
<!-- jQuery -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<!-- Create anonymous account -->
<script type="module">
import { autoSignIn } from "./js/popups.js";
import { setupTable } from "./js/admin.js";
autoSignIn();
setupTable();
</script>
</body>

</html>
<!-- jQuery -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<!-- Create anonymous account -->
<script type="module">
import { autoSignIn } from "./js/popups.js";
import { setupTable } from "./js/admin.js";
autoSignIn();
setupTable();
</script>
</body>
</html>
4 changes: 2 additions & 2 deletions css/auction-website.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
html * {
font-family: 'Roboto', sans-serif;
font-family: "Roboto", sans-serif;
}

/* Bootstrap tweaks */
Expand All @@ -19,4 +19,4 @@ html * {

.card > .table {
margin-bottom: 0;
}
}
Loading

0 comments on commit b1215f6

Please sign in to comment.