Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
761ace5
added cards, fixed variables, added roast type submit
PabloSali Nov 9, 2022
3846503
Merge pull request #1 from mullins-salinas-Coffee-Project/pablo-salinas
PabloSali Nov 9, 2022
892905b
figured out the selector button
PabloSali Nov 9, 2022
f824d36
Merge pull request #2 from mullins-salinas-Coffee-Project/pablo-salinas
PabloSali Nov 9, 2022
3f65ee3
trying to add form that user can search
joshua-stephen-mullins Nov 10, 2022
4c865b4
Merge pull request #3 from mullins-salinas-Coffee-Project/joshua-mullins
joshua-stephen-mullins Nov 10, 2022
30ab454
fixed function to check search name against coffees
joshua-stephen-mullins Nov 10, 2022
fcccf16
Merge pull request #4 from mullins-salinas-Coffee-Project/joshua-mullins
joshua-stephen-mullins Nov 10, 2022
66cba36
Cleaned this bad boy up
PabloSali Nov 10, 2022
6733a10
Merge pull request #5 from mullins-salinas-Coffee-Project/pablo-salinas
PabloSali Nov 10, 2022
849da6b
completed functionality
PabloSali Nov 10, 2022
8c88f9d
Merge pull request #6 from mullins-salinas-Coffee-Project/pablo-salinas
PabloSali Nov 10, 2022
3b34f71
started formatting the search and add cards
PabloSali Nov 10, 2022
fbf9197
Merge pull request #7 from mullins-salinas-Coffee-Project/pablo-salinas
PabloSali Nov 10, 2022
e3be970
fixed functionality of add coffee function / removed erroneous functi…
joshua-stephen-mullins Nov 11, 2022
25da3f2
added keydown to search coffee features / now runs function on every …
joshua-stephen-mullins Nov 11, 2022
02441b8
created local storage functionality
joshua-stephen-mullins Nov 11, 2022
acfbeb4
Merge pull request #8 from mullins-salinas-Coffee-Project/joshua-mullins
joshua-stephen-mullins Nov 11, 2022
b0d340c
completed functionality w/ local storage
joshua-stephen-mullins Nov 14, 2022
3f90a39
Merge pull request #9 from mullins-salinas-Coffee-Project/joshua-mullins
joshua-stephen-mullins Nov 14, 2022
65d622c
formatted structure of page, needs pertifying
PabloSali Nov 14, 2022
2b37cad
Merge pull request #10 from mullins-salinas-Coffee-Project/pablo-salinas
PabloSali Nov 14, 2022
f84503a
adjusted formatting of cards and background colors
joshua-stephen-mullins Nov 14, 2022
3240747
Merge pull request #11 from mullins-salinas-Coffee-Project/joshua-mul…
joshua-stephen-mullins Nov 14, 2022
64e31bb
replaced cinnamon picture, button reformat
PabloSali Nov 14, 2022
df34f7f
did thangs
PabloSali Nov 14, 2022
7cbff1f
Merge pull request #12 from mullins-salinas-Coffee-Project/pablo-salinas
PabloSali Nov 14, 2022
171a7f2
worked with formatting and responsiveness
joshua-stephen-mullins Nov 14, 2022
a249bf3
Merge pull request #13 from mullins-salinas-Coffee-Project/joshua-mul…
joshua-stephen-mullins Nov 14, 2022
7a50946
added roast info formatting and coffee beans
PabloSali Nov 14, 2022
d8e69f0
Merge pull request #14 from mullins-salinas-Coffee-Project/pablo-salinas
PabloSali Nov 14, 2022
86d5d9f
finished up formatting
joshua-stephen-mullins Nov 14, 2022
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
126 changes: 126 additions & 0 deletions css/style.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
html, body {
font-family: 'Chivo', sans-serif;
color: #e7b17d;
}

body {
background-color: #551E19;
background-image: url("../images/fireplace.webp");
/*background-size: 100%;*/
background-repeat: no-repeat;
background-attachment: fixed;
background-size: cover;
}

.headerFont {
font-family: 'MuseoModerno', sans-serif;
}

.navbar-brand img {
width: 20%;
height: 20%;
margin: 0;
padding: 0;
}

.navbar {
background-color: #551e19;
}

#search-Coffee {
background-color: #99592b;
color: #551e19;
border-color: black;
margin-right: 10px;
}

.coffees-container {
margin-top: 6em;
}

#roast-selection {
background-color: #99592b;
border-color: black;
color: #e7b17d;
width: 50%;
height: 3em;
}

.new-roast-selection-label, #new-roast-selection, #new-coffee-name {
background-color: #99592b;
border-color: black;
color: #e7b17d;
}

.coffeeCard {
margin: 5px;
background-color: #551E19;
text-align: center;
}

.coffeeCard img {
width: 100%;
height: 70%;
border-radius: 2%;
}

.add-button {
position: fixed;
right: 0;
bottom: 0;
z-index: 1030;
}

.cigar-pairing-box {
position: fixed;
right: 10em;
/*bottom: 2em;*/
/*z-index: 1030;*/
}

.cigar-pairing-box, .roast-pairing-list li, .cigar-pairing-list li {
background-color: #551e19;
color: #e7b17d;
border-radius: 2%;
}

.offcanvas-body, .offcanvas-header {
background-color: #551e19;
border-color: black;
color: #e7b17d;
}

.pairing-card{
width: 36%;
height: 20%;
margin-top: 30em;
margin-right: -9em;
border-radius: 2%;
font-size: 15px;
}

.roast-info{
font-size: 15px;
width: 38%;
position: fixed;
right: 0em;
top: 3em;
z-index: 4;
margin-top: 7em;
padding-bottom: 0;
border-radius: 2%;
}

.roast-header{
background-color: #551e19;
border-color: black;
color: #e7b17d;
}

.add-card{
background-color: #99592b;
}

.coffee-bean-btn {
border: thick black;
}
Binary file added images/OldPaperBackground.webp
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 images/american.webp
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 images/breakfast.jpeg
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 images/cinnamon-beans.jpg
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 images/cinnamon.jpeg
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 images/city.jpeg
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 images/coffee-images-all.jpeg
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 images/coffeebean.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 images/continental.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 images/espresso-beans.jpg
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 images/espresso.jpeg
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 images/european.jpeg
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 images/fireplace.webp
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 images/french.jpeg
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 images/half-city.jpeg
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 images/hear-espresso-beans.jpg
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 images/high.jpeg
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 images/insert-coffee.webp
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 images/italian.webp
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 images/light-city.jpeg
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 images/new-orleans.jpeg
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 images/roasting-type.jpeg
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 images/vienesse.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
145 changes: 121 additions & 24 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,129 @@
<head>
<meta charset="UTF-8">
<title></title>
<link rel="stylesheet" href="style.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>
<!-- Bootstrap CSS only ------------------------------------------->
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Chivo:ital,wght@0,300;0,400;0,700;0,900;1,300;1,400;1,700;1,900&family=MuseoModerno:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap"
rel="stylesheet">
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.2/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-Zenh87qX5JnK2Jl0vWa8Ck2rdkQ2Bzep5IDxbcnCeuOxjzrPF/et3URy9Bv1WTRi" crossorigin="anonymous">
<link rel="stylesheet" href="css/style.css">
</head>
<body>
<div class="col-12 d-flex justify-content-center">
<h1>Distinguished Gentleman's Coffee</h1>
</div>
<nav class="navbar fixed-top p-0">
<div class="navbarColor container-fluid flex-nowrap">
<!--------------------------------- Nav Bar Title ------------------------------------>
<a class="navbar-brand" href="#"><img
src="images/destinguished-gentleman-high-resolution-logo-color-on-transparent-background.png"
alt="DGC Logo"></a>
<div class="d-flex" style="margin-top: 1em">
<div class="input-group mb-3" style="width: 15em; height: 3em;">
<input id="search-Coffee" type="text" class="form-control" placeholder="Find Your Demitasse"
aria-label="Recipient's username" aria-describedby="button-addon2">
</div>
<label for="roast-selection"></label>
<select id="roast-selection" class="form-select" aria-label="Default select example">
<option id="submit-all">All</option>
<option id="submit-light">Light</option>
<option id="submit-medium">Medium</option>
<option id="submit-dark">Dark</option>
</select>
</div>
<!------------------------------ Open Menu Title ------------------------------------->
<div class="offcanvas offcanvas-end text-bg-dark" tabindex="-1" id="offcanvasDarkNavbar"
aria-labelledby="offcanvasDarkNavbarLabel">
<div class="offcanvas-header">
<h2 class="offcanvas-title headerFont" id="offcanvasDarkNavbarLabel"> Welcome, how may we assist, good sir? </h2>
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="offcanvas"
aria-label="Close"></button>
</div>
<div class="offcanvas-body">
<ul class="navbar-nav justify-content-end flex-grow-1 pe-3">
<!---------------------- First Item in Open Menu ------------------------->
<li class="nav-item">
<a>
<div class="card add-card">
<div class="card-body">
<form name="searchForm">
<label class="new-roast-selection-label" for="new-roast-selection"> Be Distinguished. Add to
the Collection. </label>
<select id="new-roast-selection" class="form-select m-1"
aria-label="Default select example">
<option id="new-submit-light">light</option>
<option id="new-submit-medium">medium</option>
<option id="new-submit-dark">dark</option>
</select>
<!-- <input id="new-coffee-name" type="text"-->
<!-- name="search" placeholder="New Coffee Name...">-->
<div class="input-group mb-3">
<input id="new-coffee-name" type="text" class="form-control m-1"
placeholder="" aria-label="Recipient's username"
aria-describedby="button-addon2">
<button class="btn btn-outline-secondary m-1 rounded-circle border-dark border border-3" type="button"
id="add-coffee-button"><img src="images/coffeebean.png" alt="Coffee Bean">
</button>
</div>
</form>
</div>
</div>
</a>
</li>
</ul>
</div>
</div>
</div>
</nav>
<!------------------------------------ Nav Bar End ------------------------------------------->
<!--------------------------------- Container ------------------------------------------->
<div class="container-fluid row">

<script src="main.js"></script>
<div class="row col-8">
<!-------- Container for the function that renders coffee cards ------------->
<div class="d-flex flex-wrap coffees-container" id="coffees"></div>
</div>
<!-- Container that holds -->
<!------------------------------------ Cigar Pairing Card ------------------------------------------->
<div class="row justify-content-end col-4">
<div class="roast-info">
<div class="card-header roast-header justify-content-center d-flex headerFont">
Know Your Roasts
</div>
<ul class="list-group list-group-flush roast-pairing-list">
<li class="list-group-item"> Light Roast: Light brown in color, this roast is generally preferred for milder coffee varieties. There will be no oil on the surface of these beans because they are not roasted long enough for the oils to break through to the surface.</li>
<li class="list-group-item"> Medium Roast: This roast is medium brown in color with a stronger flavor and a non-oily surface. It’s often referred to as the American roast because it is generally preferred in the United States.</li>
<li class="list-group-item"> Dark Roast: This roast produces shiny black beans with an oily surface and a pronounced bitterness. The darker the roast, the less acidity will be found in the coffee beverage. Dark roast coffees run from slightly dark to charred, and the names are often used interchangeably — be sure to check your beans before you buy them!</li>
</ul>
</div>
<div class="card cigar-pairing-box d-flex align-items-center pairing-card">
<div class="card-header headerFont">
Know Your Pairing
</div>
<ul class="list-group list-group-flush cigar-pairing-list">
<li class="list-group-item"> Mild Cigar: Paired best with a Light Roast.</li>
<li class="list-group-item"> Medium to Full Body Cigar: Paired best with a Medium Roast</li>
<li class="list-group-item"> Rich Full Body Cigar: Paired best with a Dark Roast</li>
</ul>
</div>
</div>
</div>
<!----------------------------- Button for the add feature --------------------------------------->
<div>
<button class="navbar-toggler rounded-circle border-dark border border-3 btn-lg add-button coffee-bean-btn" type="button" data-bs-toggle="offcanvas"
data-bs-target="#offcanvasDarkNavbar" aria-controls="offcanvasDarkNavbar"
style="background-color: chocolate; margin: 2em;">
<span class="navbar-toggler-icon" style=" margin: 2.5em"><img src="images/coffeebean.png"></span>
</button>
</div>
<!-- Bootstrap JavaScript Bundle with Popper ----------------------->
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.2.2/dist/js/bootstrap.bundle.min.js"
integrity="sha384-OERcA2EqjJCMA+/3y+gxIOqMEjwtxJY7qPCqsdltbNJuaOe923+mo//f6V8Qbsw3"
crossorigin="anonymous"></script>
<script src="js/main.js"></script>
</body>
</html>
Loading