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

Merge branch 'master' into BootstrapSignupForm

Browse source
This commit is contained in:
Preston Doman 2019-01-22 14:51:54 -08:00
commit 9e9e85919c
5 changed files with 49 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
back/Pipfile
View file

@ -6,7 +6,7 @@ verify_ssl = true
[dev-packages]
[packages]
django = "==2.1.4"
django = "==2.1.5"
gunicorn = "==19.6.0"
[requires]

34
front/static/dashboard.html
View file

@ -7,7 +7,7 @@
<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="/favicon.ico">
<link rel="shortcut icon" href="img/favicon.ico">
<title>Reimbursinator</title>
</head>
<body>
@ -33,25 +33,23 @@
</div>
<nav class="navbar">
<ul class="nav nav-tabs mr-auto">
<li class="nav-item">
<a class="nav-link active" href="#">New</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Unfinished</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">History</a>
</li>
<li class="nav-item">
<a class="nav-link disabled" href="#">Others</a>
</li>
</ul>
<ul class="nav justify-content-end">
<li class="nav-item">
<a class="nav-link log-out-link" href="#">Log out</a>
</li>
<li class="nav-item"><a class="nav-link" data-toggle="tab" href="#New">New</a></li>
<li class="nav-item"><a class="nav-link" data-toggle="tab" href="#Unfinished">Unfinished</a></li>
<li class="nav-item"><a class="nav-link" data-toggle="tab" href="#History">History</a></li>
<li class="nav-item"><a class="nav-link disabled" href="#">Others</a></li>
</ul>
</nav>
<div class="tab-content">
<div id="New" class="tab-pane fade in active">
<h1>New report</h1>
</div>
<div id="Unfinished" class="tab-pane fade">
<h1>List of Unfinished report</h1>
</div>
<div id="History" class="tab-pane fade">
<h1>Report history</h1>
</div>
</div>
</div>
<script src="js/logout.js"></script>
</body>

2
front/static/index.html
View file

@ -7,7 +7,7 @@
<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="/favicon.ico">
<link rel="shortcut icon" href="img/favicon.ico">
<title>Reimbursinator</title>
</head>
<body>

5
front/static/js/logout.js
View file

@ -29,6 +29,5 @@ function postToLogoutEndpoint(event) {
xhr.send();
}
const logoutLinks = document.querySelectorAll(".log-out-link");
logoutLinks[0].addEventListener("click", postToLogoutEndpoint);
logoutLinks[1].addEventListener("click", postToLogoutEndpoint);
const logoutLink = document.querySelector(".log-out-link");
logoutLink.addEventListener("click", postToLogoutEndpoint);

35
front/static/login.html
View file

@ -7,20 +7,41 @@
<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="/favicon.ico">
<link rel="shortcut icon" href="img/favicon.ico">
<title>Log in</title>
</head>
<body>
<nav class="navbar navbar-expand-sm navbar-dark bg-primary">
<a class="navbar-brand" href="index.html">Reimbursinator</a>
</nav>
<h1>Log in</h1>
<form method="POST">
username: <input type="text" name="username" required><br>
password: <input type="password" name="password" required><br>
<input type="submit" name="submit" value="submit">
<div class="container pt-5">
<div class="row">
<div class="col-sm-6 mx-auto">
<div class="card bg-light text-dark">
<div class="card-header">
<h3>Please log in</h3>
</div>
<div class="card-body">
<form class="form" autocomplete="off">
<div class="form-group">
<label for="formGroupUsername">Username:</label>
<input class="form-control" id="formGroupUsername" type="text" name="username" required autofocus>
</div>
<div class="form-group">
<label for="formGroupPassword">Password:</label>
<input class="form-control" id="formGroupPassword" type="password" name="password" required>
</div>
<button type="submit" class="btn btn-primary pull-right">Submit</button>
</form>
</div>
<div class="card-footer">
Not registered? <a href="signup.html">Sign up</a>
</div>
</div>
</div>
</div>
</div>
<p id="errorReport"><p>
<script src="login.js"></script>
<script src="js/login.js"></script>
</body>
</html>