Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
0fca801
Added search function
JacobGonzalez0 Dec 14, 2020
0571811
Added real-time search and filtering
JacobGonzalez0 Dec 14, 2020
9720c48
Merge pull request #1 from Benzion-Jacob/jacob
JacobGonzalez0 Dec 14, 2020
76d06e5
add coffee functionality
Daniel-Benzion Dec 14, 2020
4d7d2f1
Merge pull request #2 from Benzion-Jacob/Daniel
JacobGonzalez0 Dec 14, 2020
18b8716
Added styling and refactored coffee generating list
JacobGonzalez0 Dec 14, 2020
3b0d055
Merge pull request #3 from Benzion-Jacob/jacob
JacobGonzalez0 Dec 14, 2020
017ac25
added automatic layout change for screen resize
Daniel-Benzion Dec 14, 2020
3fc3456
Merge pull request #4 from Benzion-Jacob/Daniel
Daniel-Benzion Dec 14, 2020
1304815
Added parallax background with canvas
JacobGonzalez0 Dec 14, 2020
5363c25
Merge pull request #5 from Benzion-Jacob/jacob
JacobGonzalez0 Dec 14, 2020
7a40cc2
button and font styling
Daniel-Benzion Dec 14, 2020
c801821
removed submit button, changed placeholder text
Daniel-Benzion Dec 14, 2020
0cf5f65
Merge pull request #6 from Benzion-Jacob/Daniel
Daniel-Benzion Dec 14, 2020
c342a72
updated button and placeholder text, added capitalization to drop-dow…
Daniel-Benzion Dec 14, 2020
45791fb
Merge pull request #7 from Benzion-Jacob/Daniel
Daniel-Benzion Dec 14, 2020
a6b22eb
added basic konami function for dark mode toggle
Daniel-Benzion Dec 14, 2020
43653be
Merge pull request #8 from Benzion-Jacob/Daniel
Daniel-Benzion Dec 14, 2020
a825b40
Impemented darkmode
JacobGonzalez0 Dec 14, 2020
0b3ef8c
Merge pull request #9 from Benzion-Jacob/jacob
JacobGonzalez0 Dec 14, 2020
268b436
added site title
Daniel-Benzion Dec 14, 2020
68d911d
Merge pull request #10 from Benzion-Jacob/Daniel
Daniel-Benzion Dec 14, 2020
121b4f2
Added phonetic search using double-metaphone.js
JacobGonzalez0 Dec 14, 2020
305353a
Merge pull request #11 from Benzion-Jacob/jacob
JacobGonzalez0 Dec 14, 2020
5c3cff4
added overflow functionality for when users add custom coffees
Daniel-Benzion Dec 14, 2020
2dda5cb
Merge pull request #12 from Benzion-Jacob/Daniel
Daniel-Benzion Dec 14, 2020
3e0dde2
changed background
JacobGonzalez0 Dec 15, 2020
15012d9
Merge pull request #13 from Benzion-Jacob/jacob
JacobGonzalez0 Dec 15, 2020
6088e34
Fixed parallax on background
JacobGonzalez0 Dec 15, 2020
fc4b44a
Merge pull request #14 from Benzion-Jacob/jacob
JacobGonzalez0 Dec 15, 2020
74d8f31
added dark mode toggler based on time of day and modified darkmode fu…
Daniel-Benzion Dec 15, 2020
a83f191
Merge pull request #15 from Benzion-Jacob/Daniel
Daniel-Benzion Dec 15, 2020
0a1e975
added ability to toggle between lightmode and darkmode using konami c…
Daniel-Benzion Dec 15, 2020
154594a
Merge pull request #16 from Benzion-Jacob/Daniel
Daniel-Benzion Dec 15, 2020
e3c65f6
modified hours in which darkmode will auto-toggle
Daniel-Benzion Dec 15, 2020
2dfd26b
Merge pull request #17 from Benzion-Jacob/Daniel
Daniel-Benzion Dec 15, 2020
f6925fa
modified dropdown and search fields to change color on dark-/light-mode
Daniel-Benzion Dec 15, 2020
41fc60f
Merge pull request #18 from Benzion-Jacob/Daniel
Daniel-Benzion Dec 15, 2020
f61b14a
Added options menu
JacobGonzalez0 Dec 15, 2020
1308b67
Merge pull request #19 from Benzion-Jacob/jacob
JacobGonzalez0 Dec 15, 2020
5f6da66
added options menu toggles
Daniel-Benzion Dec 15, 2020
00c7b51
Merge pull request #20 from Benzion-Jacob/Daniel
Daniel-Benzion Dec 15, 2020
9241880
added styling/js functionality to options menu
Daniel-Benzion Dec 15, 2020
4cd11ab
Merge pull request #21 from Benzion-Jacob/Daniel
Daniel-Benzion Dec 15, 2020
14b046f
added button to close options menu
Daniel-Benzion Dec 15, 2020
b2caae2
Merge pull request #22 from Benzion-Jacob/Daniel
Daniel-Benzion Dec 15, 2020
c5261ed
repositioned options menu
Daniel-Benzion Dec 15, 2020
db0c671
re-repositioned options menu
Daniel-Benzion Dec 15, 2020
edfae68
Merge pull request #23 from Benzion-Jacob/Daniel
Daniel-Benzion Dec 15, 2020
a73056a
changed site title and company name
Daniel-Benzion Dec 16, 2020
3a473b1
Merge pull request #24 from Benzion-Jacob/Daniel
Daniel-Benzion Dec 16, 2020
4233d96
fixed alignment of front hill graphic
JacobGonzalez0 Dec 16, 2020
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
1,009 changes: 1,009 additions & 0 deletions double-metaphone.js

Large diffs are not rendered by default.

Binary file added img/backhill.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/cloud0.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/cloud1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/cloud2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/cloud3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/cloud4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/fronthill.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/landscape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
59 changes: 59 additions & 0 deletions img/moon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/mountainback.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/mountainfront.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
118 changes: 94 additions & 24 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,103 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title></title>
<link rel="stylesheet" href="style.css">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Average Joe's Coffee!</title>
<link rel="stylesheet" href="style.css"><link rel='stylesheet' href='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.5.3/css/bootstrap.min.css'/>
</head>

<body>
<h1>Coffee!</h1>

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

<table>
<thead>
<tr>
<th>ID</th>
<th>NAME</th>
<th>ROAST</th>
</tr>
</thead>
<tbody id="coffees"></tbody>
</table>
<canvas id="myCanvas" ></canvas>
<div id="content" class="container text-light my-md-3 mt-lg-5 p-4 rounded-lg">

<div id="optionsButton" class="text-right">ⓘ</div>

<h1 class="text-center">Average Joe's Coffee Company</h1>

<hr>

<div class="row">

<div class="col-12 col-lg order-1">

<div id="coffees" class="row">


</div>

</div>

<div class="col order-2 order-lg-1">

<form >
<div class="form-group">

<label class="px-0 col font-weight-bold" for="roast-selection">Roast</label>
<select id="roast-selection" class="my-1 form-control mode-menu">
<option>All</option>
<option>Light</option>
<option>Medium</option>
<option>Dark</option>
</select>

<label for="search" class="px-0 col font-weight-bold my-1"> Coffee Name</label>
<input class="col form-control my-1 mode-menu" type="text" id="search" placeholder="Just start typing!">

</div>
</form>






<form>
<div class="form-group">

<h2 class="col text-center" >Add a Coffee</h2>

<label for="add-roast" class="px-0 col font-weight-bold my-1"> Roast</label>
<select id="add-roast" class="col form-control my-1 mode-menu">
<option>Light</option>
<option>Medium</option>
<option>Dark</option>
</select>

<label for="add-coffee" class="px-0 col font-weight-bold my-1"> Name</label>
<input type="text" id="add-coffee" class="col form-control my-1 mode-menu" placeholder="What's the name of your new coffee?">

<button class="col btn-blue my-2 p-2 font-weight-bold " id="submit-new-coffee" type="submit">Add your coffee</button>
</div>
</form>

</div>

</div>






</div>

<div id="options" class="rounded container">
<div id="close-options" class="text-right mt-2">X</div>

<div class="container-fluid">
<div class="d-flex flex-column align-items-center justify-items-center">
<h2 class="text-center mt-4 mb-5" id="options-text">Options</h2>
<hr>
<button class="col btn-blue my-2 p-2 font-weight-bold " id="mode-button" type="submit">Turn on Dark Mode</button>
<button class="col btn-blue my-2 p-2 font-weight-bold " id="custom-delete" type="submit">Delete All Custom Coffees</button>
</div>
</div>

</div>

<script src='https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js'></script>
<script src='https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.5.3/js/bootstrap.bundle.min.js'></script>
<script src="double-metaphone.js"></script>
<script src="main.js"></script>
</body>
</html>
Loading