Condense pages, rename html files, and update navbar
This commit is contained in:
Preston Doman
parent
41a4ab6c8b
commit
1b2dab0632
5 changed files with 21 additions and 80 deletions
|
|
@ -12,14 +12,13 @@
|
|||
</head>
|
||||
<body>
|
||||
<nav class="navbar navbar-expand-sm navbar-dark bg-primary">
|
||||
<a class="navbar-brand" href="#">Reimbursinator</a>
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsing-dashboard-navbar">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<div class="collapse navbar-collapse" id="collapsing-dashboard-navbar">
|
||||
<ul class="navbar-nav">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="dashboard.html">Dashboard</a>
|
||||
<a class="nav-link" href="home.html">Home</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="new_report.html">New Report</a>
|
||||
|
|
@ -27,9 +26,6 @@
|
|||
<li class="nav-item">
|
||||
<a class="nav-link active" href="edit_report.html">Edit Report</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="view_history.html">View History</a>
|
||||
</li>
|
||||
</ul>
|
||||
<ul class="navbar-nav ml-auto">
|
||||
<li class="nav-item">
|
||||
|
|
@ -38,10 +34,20 @@
|
|||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
<div class="container">
|
||||
<p>Edit an existing report</p>
|
||||
<div class="container pt-5">
|
||||
<div class="row">
|
||||
<div class="col-sm-8 mx-auto">
|
||||
<div class="card bg-light text-dark">
|
||||
<div class="card-header text-center">
|
||||
<h3>Your Report History</h3>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script src="js/logout.js"></script>
|
||||
<script src="js/viewHistory.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
|
|
|||
|
|
@ -12,14 +12,13 @@
|
|||
</head>
|
||||
<body>
|
||||
<nav class="navbar navbar-expand-sm navbar-dark bg-primary">
|
||||
<a class="navbar-brand" href="#">Reimbursinator</a>
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsing-dashboard-navbar">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<div class="collapse navbar-collapse" id="collapsing-dashboard-navbar">
|
||||
<ul class="navbar-nav">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link active" href="dashboard.html">Dashboard</a>
|
||||
<a class="nav-link active" href="home.html">Home</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="new_report.html">New Report</a>
|
||||
|
|
@ -27,9 +26,6 @@
|
|||
<li class="nav-item">
|
||||
<a class="nav-link" href="edit_report.html">Edit Report</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="view_history.html">View History</a>
|
||||
</li>
|
||||
</ul>
|
||||
<ul class="navbar-nav ml-auto">
|
||||
<li class="nav-item">
|
||||
|
|
@ -39,7 +35,7 @@
|
|||
</div>
|
||||
</nav>
|
||||
<div class="container">
|
||||
<p>Welcome, you are logged in</p>
|
||||
<p>Welcome to Reimbursinator</p>
|
||||
</div>
|
||||
<script src="js/logout.js"></script>
|
||||
</body>
|
||||
|
|
@ -24,11 +24,11 @@ function postToLoginEndpoint(event) {
|
|||
console.log(`Server response:\n${this.response}`);
|
||||
token = JSON.parse(this.response).token;
|
||||
localStorage.setItem("token", token);
|
||||
window.location.replace("dashboard.html");
|
||||
window.location.replace("home.html");
|
||||
} else {
|
||||
console.log("LOGIN FAILURE!");
|
||||
console.log(`Server status: ${this.status}`);
|
||||
console.log(`Server response:\n${this.response}`);
|
||||
console.error("LOGIN FAILURE!");
|
||||
console.error(`Server status: ${this.status}`);
|
||||
console.error(`Server response:\n${this.response}`);
|
||||
displayErrorMessage(this.response);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,14 +12,13 @@
|
|||
</head>
|
||||
<body>
|
||||
<nav class="navbar navbar-expand-sm navbar-dark bg-primary">
|
||||
<a class="navbar-brand" href="#">Reimbursinator</a>
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsing-dashboard-navbar">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<div class="collapse navbar-collapse" id="collapsing-dashboard-navbar">
|
||||
<ul class="navbar-nav">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="dashboard.html">Dashboard</a>
|
||||
<a class="nav-link" href="home.html">Home</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link active" href="new_report.html">New Report</a>
|
||||
|
|
@ -27,9 +26,6 @@
|
|||
<li class="nav-item">
|
||||
<a class="nav-link" href="edit_report.html">Edit Report</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="view_history.html">View History</a>
|
||||
</li>
|
||||
</ul>
|
||||
<ul class="navbar-nav ml-auto">
|
||||
<li class="nav-item">
|
||||
|
|
|
|||
|
|
@ -1,57 +0,0 @@
|
|||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/" crossorigin="anonymous">
|
||||
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
|
||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
|
||||
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
|
||||
<link rel="shortcut icon" href="img/favicon.ico">
|
||||
<title>Reimbursinator</title>
|
||||
</head>
|
||||
<body>
|
||||
<nav class="navbar navbar-expand-sm navbar-dark bg-primary">
|
||||
<a class="navbar-brand" href="#">Reimbursinator</a>
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsing-dashboard-navbar">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
<div class="collapse navbar-collapse" id="collapsing-dashboard-navbar">
|
||||
<ul class="navbar-nav">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="dashboard.html">Dashboard</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="new_report.html">New Report</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="edit_report.html">Edit Report</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link active" href="view_history.html">View History</a>
|
||||
</li>
|
||||
</ul>
|
||||
<ul class="navbar-nav ml-auto">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link log-out-link" href="#"><i class="fas fa-sign-out-alt"></i> Log Out </a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
<div class="container pt-5">
|
||||
<div class="row">
|
||||
<div class="col-sm-8 mx-auto">
|
||||
<div class="card bg-light text-dark">
|
||||
<div class="card-header text-center">
|
||||
<h3>Your Report History</h3>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script src="js/logout.js"></script>
|
||||
<script src="js/viewHistory.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in a new issue