Fixed forgotten "Groceries" name and added footer

master
Eirik Th S 2021-06-15 11:22:33 +02:00
parent 8b1e62be80
commit 04900313cb
6 changed files with 105 additions and 60 deletions

View File

@ -4,6 +4,7 @@
--wsTop: env(safe-area-inset-top);
--wsBottom: constant(safe-area-inset-bottom);
--wsBottom: env(safe-area-inset-bottom);
--footerHeight: 51px;
}
html {
@ -172,4 +173,26 @@ body.dollars span.price::after {
border-radius: 30px;
font-weight: bold;
}
/*}*/
/*}*/
#page-container { /** body ? **/
position: relative;
min-height: 100vh;
}
#page-wrapper {
padding-bottom: var(--footerHeight);
}
footer {
position: absolute;
bottom: 0;
width: 100%;
height: var(--footerHeight);
max-height: var(--footerHeight);
overflow: hidden;
text-align: center;
background: #fffd;
padding: 15px 10px calc(var(--wsBottom) + 15px);
}

View File

@ -5,35 +5,40 @@
<title>PaperBag - Plan & Execute Your Shopping</title>
</head>
<body id="home">
<?php include 'webdata/navbar.php'; ?>
<h1 class="headline text-center">PaperBag</h1>
<div class="container-sm" style="padding-top: 5px;">
<div id="page-container">
<div id="page-wrapper">
<div class="card-group" style="text-align: center;">
<?php include 'webdata/navbar.php'; ?>
<div class="card h-100" style="">
<a href='./plan'>
<!-- <img src="#" class="card-img-top" alt="Plan">-->
<div class="card-body">
<h5 class="card-title">Plan shopping</h5>
<p class="card-text"></p>
<h1 class="headline text-center">PaperBag</h1>
<div class="container-sm" style="padding-top: 5px;">
<div class="card-group" style="text-align: center;">
<div class="card h-100" style="">
<a href='./plan'>
<!-- <img src="#" class="card-img-top" alt="Plan">-->
<div class="card-body">
<h5 class="card-title">Plan shopping</h5>
<p class="card-text"></p>
</div>
</a>
</div>
<div class="card h-100" style="">
<!-- <img src="#" class="card-img-top" alt="Review">-->
<div class="card-body">
<h5 class="card-title">Review</h5>
<p class="card-text">Coming soon</p>
</div>
</div>
</a>
</div>
<div class="card h-100" style="">
<!-- <img src="#" class="card-img-top" alt="Review">-->
<div class="card-body">
<h5 class="card-title">Review</h5>
<p class="card-text">Coming soon</p>
</div>
</div>
</div>
<?php include 'webdata/footer.html'; ?>
</div>
</body>
</html>

View File

@ -54,6 +54,8 @@ if(isset($_POST) && !empty($_POST)){
<title>Login - PaperBag</title>
</head>
<body id='plan'>
<div id="page-container">
<div id="page-wrapper">
<?php include 'webdata/navbar.php'; ?>
<div class='container-sm' style="max-width: 540px;">
@ -74,30 +76,30 @@ if(isset($_POST) && !empty($_POST)){
<form action="login.php" method="POST">
<input type="hidden" name="referrerPage" value="<?=$returnToPage;?>">
<div class="form-group row">
<label for="inputEmail3" class="col-sm-2 col-form-label">Email</label>
<div class="form-group row mb-1">
<label for="loginEmail" class="col-sm-2 col-form-label">Email</label>
<div class="col-sm-10">
<input type="email" class="form-control" name="loginEmail" id="inputEmail3">
<input type="email" class="form-control" name="loginEmail" id="loginEmail">
</div>
</div>
<div class="form-group row">
<label for="inputPassword3" class="col-sm-2 col-form-label">Password</label>
<label for="loginPwd" class="col-sm-2 col-form-label">Password</label>
<div class="col-sm-10">
<input type="password" class="form-control" name="loginPwd" id="inputPassword3">
<input type="password" class="form-control" name="loginPwd" id="loginPwd">
</div>
</div>
<div class="form-check">
<div class="form-check" style="margin: 3px 0;">
<input class="form-check-input" type="checkbox" id="gridCheck">
<label class="form-check-label" for="gridCheck">
I agree to save a temporary cookie in my browser for the logged in functions to work.
</label>
</div>
<div class="form-group row">
<button type="submit" class="btn btn-primary mb-3">Login</button>
</div>
<button type="submit" class="btn btn-primary mb-3 w-100">Login</button>
</form>
<p>Do you not have an account? <a href="register.php">Register</a> </p>
</div>
</div>
<?php include 'webdata/footer.html'; ?>
</div>
</body>
</html>

View File

@ -5,33 +5,37 @@
<title>Plan - PaperBag - Plan Your Shopping</title>
</head>
<body id='plan'>
<?php include $rPath.'webdata/navbar.php'; ?>
<h1 class="headline text-center">Grocery Assist</h1>
<div class="container" style="padding-top: 5px; text-align: center;">
<div id="page-container">
<div id="page-wrapper">
<?php include $rPath.'webdata/navbar.php'; ?>
<h1 class="headline text-center">PaperBag</h1>
<div class="container" style="padding-top: 5px; padding-bottom: 15px; text-align: center;">
<div id="spaceSelectWrapper" style="max-width: 900px; margin: auto;">
<div class="input-group" style="width: 200px;">
<label class="input-group-text" for="spaceSelect">Space:</label>
<select class="form-select" id='spaceSelect' aria-label="Select space">
<option>...</option>
</select>
</div>
</div>
<div class="card-columns" id="stores" style="text-align: center;">
<hr>
<h5>Please enable javascript for this page to work</h5>
<hr>
</div>
<div id='totalPriceWrapper'>Space subtotal: <span id="totalPrice" class="priceWrapper price">239.00</span></div>
<br>
<button id="addStore">Add store</button><br><br>
<button id="refreshAll">Refresh all</button>
<div id="spaceSelectWrapper" style="max-width: 900px; margin: auto;">
<div class="input-group" style="width: 200px;">
<label class="input-group-text" for="spaceSelect">Space:</label>
<select class="form-select" id='spaceSelect' aria-label="Select space">
<option>...</option>
</select>
</div>
<script src='plan.js'></script>
</div>
<div class="card-columns" id="stores" style="text-align: center;">
<hr>
<h5>Please enable javascript for this page to work</h5>
<hr>
</div>
<div id='totalPriceWrapper'>Space subtotal: <span id="totalPrice" class="priceWrapper price">239.00</span></div>
<br>
<button id="addStore">Add store</button><br><br>
<button id="refreshAll">Refresh all</button>
<?php include $rPath.'webdata/footer.html'; ?>
</div>
<script src='plan.js'></script>
</body>
</html>

View File

@ -68,6 +68,8 @@ if(isset($_POST) && !empty($_POST)) {
<title>Register - PaperBag</title>
</head>
<body id='plan'>
<div id="page-container">
<div id="page-wrapper">
<?php include 'webdata/navbar.php'; ?>
<div class='container-md' style="max-width: 720px;">
@ -97,7 +99,7 @@ if(isset($_POST) && !empty($_POST)) {
<label for="newName" class="form-label">Full name</label>
<input type="text" class="form-control" id="newName" name="newName" maxlength="200" value="<?= $data['newName'] ?? '';?>">
</div>
<div class="col-12">
<div class="col-12" style="margin: 3px 0;">
<div class="form-check">
<input class="form-check-input" type="checkbox" id="gridCheck" required>
<label class="form-check-label" for="gridCheck">
@ -105,12 +107,14 @@ if(isset($_POST) && !empty($_POST)) {
</label>
</div>
</div>
<div class="col-12">
<button type="submit" class="btn btn-primary">Sign up</button>
<div class="col-12 mb-3">
<button type="submit" class="btn btn-primary w-100">Sign up</button>
</div>
</form>
<p>Already have an account? <a href="login.php">Login</a></p>
</div>
</div>
<?php include 'webdata/footer.html'; ?>
</div>
</body>
</html>

7
www/webdata/footer.html Normal file
View File

@ -0,0 +1,7 @@
<footer>
<strong>PaperBag</strong> is a <a href="//svagard.no/projects/paperbag" target="_blank" rel="nofollow">Svagård</a> project<br>
<!--<a href="https://useg.it/eirik/GroceryAssist" target="_blank" rel="nofollow">View source</a> |
<a href="/cookies" rel="nofollow">Cookies</a> |
<a href="/tos" rel="nofollow">Terms of Use</a> |
<a href="/privacy" rel="nofollow">Privacy Policy</a>-->
</footer>