Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master #561

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/coffee-project.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

74 changes: 52 additions & 22 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,34 +1,64 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta charset="utf-8"/>
<meta http-equiv="x-ua-compatible" content="ie=edge"/>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">

<title></title>
<link rel="stylesheet" href="style.css">
</head>
<body>
<h1>Coffee!</h1>
<div class="container-fluid" style="width: 90%">
<h1 class="d-flex justify-content-center">Coffee!</h1>
<hr class="color-lightgrey">
</div>
<div class="container-fluid d-flex flex-row-reverse" style="width: 90%">
<div class="container">
<!-- <form>-->
<!-- <h5 id="roast-heading" class="m-0">Roast</h5>-->
<!-- <label for="roast-selection"></label>-->
<!-- <select class="w-100 mb-4 border rounded border-3" style="height: 35px" id="roast-selection">-->
<!-- <option>all</option>-->
<!-- <option>light</option>-->
<!-- <option>medium</option>-->
<!-- <option>dark</option>-->

<form>
<label for="roast-selection"></label>
<select id="roast-selection">
<option>light</option>
<option>medium</option>
<option>dark</option>
</select>
<input id="submit" type="submit" />
</form>
<!-- </select>-->
<!-- <h5>Coffee Name</h5>-->
<!-- <input class="w-100 mb-4 border rounded border-3 " id="search-text" type="text">-->
<!-- <input class="d-block p-2 text-white w-100 rounded border border-none" style="background: cornflowerblue" id="submit" type="submit"/>-->
<!-- </form>-->
<hr class="color-lightgrey">
<h1 class="d-flex justify-content-center">Add A Coffee</h1>
<form>
<h5 id="roast" id="roast-heading" class="m-0">Roast</h5>
<label for="roast-selection"></label>
<select class="w-100 mb-4 border rounded border-3" style="height: 35px" id="roast-selection" >
<h5 class="m-0">Roast</h5>
<label for="roast-selection"></label>
<option>light</option>
<option>medium</option>
<option>dark</option>
</select>
<h5>Name</h5>

<table>
<thead>
<tr>
<th>ID</th>
<th>NAME</th>
<th>ROAST</th>
</tr>
</thead>
<tbody id="coffees"></tbody>
</table>
<input class="w-100 mb-4 border rounded border-3 " type="text">
<input class="d-block p-2 text-white w-100 rounded border border-none" style="background: cornflowerblue" id="submit" type="submit"/>
</form>
</div>
<div class="container">
<h3>NAME</h3>
<h3>ROAST</h3>
<h4 id="coffees"></h4>
</div>
</div>
<script src="main.js"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js"
integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p"
crossorigin="anonymous"></script>

<script src="main.js"></script>
</body>
</html>
20 changes: 20 additions & 0 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,28 @@ function updateCoffees(e) {
coffees.forEach( coffee => {
if (coffee.roast === selectedRoast) {
filteredCoffees.push(coffee);
}else if(selectedRoast === 'all'){
filteredCoffees.push(coffee);
}
});
tbody.innerHTML = renderCoffees(filteredCoffees);
}

function updateSearchCoffees(e) {
e.preventDefault(); // don't submit the form, we just want to update the data
var updateSearchCoffee = document.getElementById('search-text').value.toLowerCase()
var updateSearchCoffees = [];
coffees.forEach(function(searchInput) {
if (searchInput.name.toLowerCase().includes(updateSearchCoffee)) {
updateSearchCoffees.push(searchInput);
}
});
tbody.innerHTML = renderCoffees(updateSearchCoffees);
}




// from http://www.ncausa.org/About-Coffee/Coffee-Roasts-Guide
const coffees = [
{id: 1, name: 'Light City', roast: 'light'},
Expand All @@ -54,4 +71,7 @@ const roastSelection = document.querySelector('#roast-selection');

tbody.innerHTML = renderCoffees(coffees);


submitButton.addEventListener('click', updateCoffees);
searchText.addEventListener('keyup', updateSearchCoffees)
document.getElementById("roast-selection").addEventListener('click', updateCoffees)
4 changes: 4 additions & 0 deletions style.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ td, th {
border: 1px solid black;
padding: 5px 10px;
}
#roast-heading {
position: relative;
top: 10px;
}
45 changes: 45 additions & 0 deletions up-down-arrows.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Title</title>
</head>
<body>
use strict;

$(document).ready(function () {
window.displayBoxIndex = -1;
$('#cityresults').on('click', 'a', function () {
$('#city').val($(this).text());
$('#cityresults').hide('');
$('#citygeonameid').val($(this).parent().attr('data-id'));
return false;
});
var Navigate = function (diff) {
displayBoxIndex += diff;
var oBoxCollection = $("#cityresults ul li a");
if (displayBoxIndex >= oBoxCollection.length) {
displayBoxIndex = 0;
}
if (displayBoxIndex < 0) {
displayBoxIndex = oBoxCollection.length - 1;
}
var cssClass = "display_box_hover";
oBoxCollection.removeClass(cssClass).eq(displayBoxIndex).addClass(cssClass);
}
$(document).on('keypress keyup', function (e) {
if (e.keyCode == 13 || e.keyCode == 32) {
$('.display_box_hover').trigger('click');
return false;
}
if (e.keyCode == 40) {
//down arrow
Navigate(1);
}
if (e.keyCode == 38) {
//up arrow
Navigate(-1);
}
});
</body>
</html>