Conservancy/reimbursinator
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #47 from danieldupriest/condense-pages

Browse source 
Condense pages
This commit is contained in:
hui2018 2019-01-30 17:02:48 -08:00 committed by GitHub
commit bd9ba06bba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 29 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
front/static/edit_report.html
View file

@ -12,14 +12,14 @@
</head> </head>
<body> <body>
<nav class="navbar navbar-expand-sm navbar-dark bg-primary"> <nav class="navbar navbar-expand-sm navbar-dark bg-primary">
<a class="navbar-brand" href="#">Reimbursinator</a> <div class="navbar-brand">Reimbursinator</div>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsing-dashboard-navbar"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsing-dashboard-navbar">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="collapsing-dashboard-navbar"> <div class="collapse navbar-collapse" id="collapsing-dashboard-navbar">
<ul class="navbar-nav"> <ul class="navbar-nav">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="dashboard.html">Dashboard</a> <a class="nav-link" href="home.html">Home</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="new_report.html">New Report</a> <a class="nav-link" href="new_report.html">New Report</a>
@ -27,9 +27,6 @@
<li class="nav-item"> <li class="nav-item">
<a class="nav-link active" href="edit_report.html">Edit Report</a> <a class="nav-link active" href="edit_report.html">Edit Report</a>
</li> </li>
<li class="nav-item">
<a class="nav-link" href="view_history.html">View History</a>
</li>
</ul> </ul>
<ul class="navbar-nav ml-auto"> <ul class="navbar-nav ml-auto">
<li class="nav-item"> <li class="nav-item">
@ -38,10 +35,20 @@
</ul> </ul>
</div> </div>
</nav> </nav>
<div class="container"> <div class="container pt-5">
<p>Edit an existing report</p> <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> </div>
<script src="js/logout.js"></script> <script src="js/logout.js"></script>
<script src="js/viewHistory.js"></script>
</body> </body>
</html> </html>

9
front/static/dashboard.html → front/static/home.html
View file

@ -12,14 +12,14 @@
</head> </head>
<body> <body>
<nav class="navbar navbar-expand-sm navbar-dark bg-primary"> <nav class="navbar navbar-expand-sm navbar-dark bg-primary">
<a class="navbar-brand" href="#">Reimbursinator</a> <div class="navbar-brand">Reimbursinator</div>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsing-dashboard-navbar"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsing-dashboard-navbar">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="collapsing-dashboard-navbar"> <div class="collapse navbar-collapse" id="collapsing-dashboard-navbar">
<ul class="navbar-nav"> <ul class="navbar-nav">
<li class="nav-item"> <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>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="new_report.html">New Report</a> <a class="nav-link" href="new_report.html">New Report</a>
@ -27,9 +27,6 @@
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="edit_report.html">Edit Report</a> <a class="nav-link" href="edit_report.html">Edit Report</a>
</li> </li>
<li class="nav-item">
<a class="nav-link" href="view_history.html">View History</a>
</li>
</ul> </ul>
<ul class="navbar-nav ml-auto"> <ul class="navbar-nav ml-auto">
<li class="nav-item"> <li class="nav-item">
@ -39,7 +36,7 @@
</div> </div>
</nav> </nav>
<div class="container"> <div class="container">
<p>Welcome, you are logged in</p> <p>Welcome to Reimbursinator</p>
</div> </div>
<script src="js/logout.js"></script> <script src="js/logout.js"></script>
</body> </body>

2
front/static/index.html
View file

@ -12,7 +12,7 @@
</head> </head>
<body> <body>
<nav class="navbar navbar-expand-sm navbar-dark bg-primary"> <nav class="navbar navbar-expand-sm navbar-dark bg-primary">
<a class="navbar-brand" href="#">Reimbursinator</a> <div class="navbar-brand">Reimbursinator</div>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsing-index-navbar"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsing-index-navbar">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>

8
front/static/js/login.js
View file

@ -24,11 +24,11 @@ function postToLoginEndpoint(event) {
console.log(`Server response:\n${this.response}`); console.log(`Server response:\n${this.response}`);
token = JSON.parse(this.response).token; token = JSON.parse(this.response).token;
localStorage.setItem("token", token); localStorage.setItem("token", token);
window.location.replace("dashboard.html"); window.location.replace("home.html");
} else { } else {
console.log("LOGIN FAILURE!"); console.error("LOGIN FAILURE!");
console.log(`Server status: ${this.status}`); console.error(`Server status: ${this.status}`);
console.log(`Server response:\n${this.response}`); console.error(`Server response:\n${this.response}`);
displayErrorMessage(this.response); displayErrorMessage(this.response);
} }
} }

4
front/static/login.html
View file

@ -8,11 +8,11 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script> <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> <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"> <link rel="shortcut icon" href="img/favicon.ico">
<title>Log in</title> <title>Log In</title>
</head> </head>
<body> <body>
<nav class="navbar navbar-expand-sm navbar-dark bg-primary"> <nav class="navbar navbar-expand-sm navbar-dark bg-primary">
<a class="navbar-brand" href="index.html">Reimbursinator</a> <div class="navbar-brand">Reimbursinator</div>
</nav> </nav>
<div class="container pt-5"> <div class="container pt-5">
<div class="row"> <div class="row">

7
front/static/new_report.html
View file

@ -12,14 +12,14 @@
</head> </head>
<body> <body>
<nav class="navbar navbar-expand-sm navbar-dark bg-primary"> <nav class="navbar navbar-expand-sm navbar-dark bg-primary">
<a class="navbar-brand" href="#">Reimbursinator</a> <div class="navbar-brand">Reimbursinator</div>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsing-dashboard-navbar"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#collapsing-dashboard-navbar">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
<div class="collapse navbar-collapse" id="collapsing-dashboard-navbar"> <div class="collapse navbar-collapse" id="collapsing-dashboard-navbar">
<ul class="navbar-nav"> <ul class="navbar-nav">
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="dashboard.html">Dashboard</a> <a class="nav-link" href="home.html">Home</a>
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link active" href="new_report.html">New Report</a> <a class="nav-link active" href="new_report.html">New Report</a>
@ -27,9 +27,6 @@
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="edit_report.html">Edit Report</a> <a class="nav-link" href="edit_report.html">Edit Report</a>
</li> </li>
<li class="nav-item">
<a class="nav-link" href="view_history.html">View History</a>
</li>
</ul> </ul>
<ul class="navbar-nav ml-auto"> <ul class="navbar-nav ml-auto">
<li class="nav-item"> <li class="nav-item">

4
front/static/signup.html
View file

@ -8,11 +8,11 @@
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script> <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> <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"> <link rel="shortcut icon" href="img/favicon.ico">
<title>Sign up</title> <title>Sign Up</title>
</head> </head>
<body> <body>
<nav class="navbar navbar-expand-sm navbar-dark bg-primary"> <nav class="navbar navbar-expand-sm navbar-dark bg-primary">
<a class="navbar-brand" href="index.html">Reimbursinator</a> <div class="navbar-brand">Reimbursinator</div>
</nav> </nav>
<div class="container pt-5"> <div class="container pt-5">
<div class="row"> <div class="row">

57
front/static/view_history.html
View file

@ -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>