Skip to content

Commit

Permalink
Merge pull request #17 from IvonneBenitesRodriguez/adding-new-functio…
Browse files Browse the repository at this point in the history
…nality

Adding new functionality
  • Loading branch information
IvonneBenitesRodriguez authored May 17, 2024
2 parents 27bb8c1 + 957704c commit 243c680
Show file tree
Hide file tree
Showing 11 changed files with 138 additions and 25 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- [☕️ My coffee elections WebApp ☕️](#️-my-coffee-elections-webapp--️)
- [📗 Table of Contents](#-table-of-contents)
- [☕️ My coffee elections WebApp ](#️-my-coffee-elections-webapp-)
- [📍 Deployed project(under construction): https://my-coffee-elections-udmy.vercel.app/recipes](#-deployed-projectunder-construction--httpsmy-coffee-elections-udmyvercelapprecipes)
- [📍 Deployed project(under construction): https://my-coffee-elections-4rc4.vercel.app/events](#-deployed-projectunder-construction--httpsmy-coffee-elections-4rc4vercelappevents)
- [🛠 Built With ](#-built-with-)
- [Tech Stack ](#tech-stack-)
- [📕 Key Features ](#-key-features-)
Expand All @@ -24,8 +24,7 @@
*My coffee elections webapp* repository is built using programming language named JavaScript but specifically in this case I used a framework named **React**.
I choose this framework since I want to put in practice a main principle named **separation of concerns**, therefore I created a folder named **components** where I placed each one of my components which are going to be used in my main file named App.js.<br/>


#### 📍 Deployed project(under construction):<br/> <a name="built-with"> https://my-coffee-elections-udmy.vercel.app/recipes</a>
#### 📍 Deployed project(under construction):<br/> <a name="built-with"> https://my-coffee-elections-4rc4.vercel.app/events</a>

## 🛠 Built With <a name="built-with"></a>

Expand Down
39 changes: 19 additions & 20 deletions src/pages/About.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,26 +9,25 @@ function About() {
className="aboutTop"
style={{ backgroundImage: `url(${Shop})` }}
></div>
<div className="aboutBottom">
<h1 className="aboutTitle">About us</h1>
<p className="paragraphTitle">
{" "}
This virtual coffee shop was founded in 1997. It began with 3 friends
who met each other in Spain. and their own mixtures of coffee. Now, 33
years after Bella Coffee sells pure coffee to 123 countries. Its
unique mixtures and aromas made of this coffee a perfect choice. This
virtual coffee shop was founded in 1997. It began with 3 friends who
met each other in Spain. They loved how to cook, and invent their own
food preparations, and their own mixtures of coffee. Now, 33 years
after Bella Coffee sells pure coffee to 123 countries. Its unique
mixtures and aromas made of this coffee a perfect choice. This virtual
coffee shop was founded in 1997. It began with 3 friends who met each
other in Spain. They loved how to cook, and invent their own food
preparations, and their own mixtures of coffee. Now, 33 years after
Bella Coffee sells pure coffee to 123 countries. Its unique mixtures
and aromas made of this coffee a perfect choice.
</p>
</div>

<h1 className="aboutTitle">About us</h1>
<p className="paragraphTitle">
{" "}
This virtual coffee shop was founded in 1997. It began with 3 friends
who met each other in Spain. and their own mixtures of coffee. Now, 33
years after Bella Coffee sells pure coffee to 123 countries. Its unique
mixtures and aromas made of this coffee a perfect choice. This virtual
coffee shop was founded in 1997. It began with 3 friends who met each
other in Spain. They loved how to cook, and invent their own food
preparations, and their own mixtures of coffee. Now, 33 years after
Bella Coffee sells pure coffee to 123 countries. Its unique mixtures and
aromas made of this coffee a perfect choice. This virtual coffee shop
was founded in 1997. It began with 3 friends who met each other in
Spain. They loved how to cook, and invent their own food preparations,
and their own mixtures of coffee. Now, 33 years after Bella Coffee sells
pure coffee to 123 countries. Its unique mixtures and aromas made of
this coffee a perfect choice.
</p>
</div>
);
}
Expand Down
3 changes: 2 additions & 1 deletion src/pages/Recipes.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ function Recipes() {
{randomRecipe && (
<div className="randomRecipe">
<h2 className="randomRecipeTitle">{randomRecipe.title}</h2>
<p className="randomRecipeCategory">{randomRecipe.cuisine}</p>
<p className="randomRecipeCategory">Origin:{randomRecipe.cuisine}</p>
<span className="randomingredient">
Main Ingredient:
{randomRecipe.mainIngredient}
</span>
<img
Expand Down
25 changes: 25 additions & 0 deletions src/styles/About.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
* {
box-sizing: border-box;
margin: 0;
padding: 0;
}
.about {
width: 100%;
height: 90vh;
Expand Down Expand Up @@ -43,4 +48,24 @@ font-family: cursive;
}
.paragraphTitle {
margin-top: 24px;
}
@media screen and (min-width: 375px) {
p.paragraphTitle {
text-align: justify;
margin-left: 5%;
margin-right: 5%;
margin-bottom: 20px;
font-size: 17px;
}
h1.aboutTitle {
margin-top: 10px;
font-size: 60px;
text-align: center;
}
.about {
width: 100%;
height: 125vh;
display: flex;
flex-direction: column;
}
}
31 changes: 31 additions & 0 deletions src/styles/Contact.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
* {
box-sizing: border-box;
margin: 0;
padding: 0;
}
.contact {
width: 100%;
height: 90vh;
Expand Down Expand Up @@ -78,4 +83,30 @@
color: whitesmoke;
font-size: 15px;
cursor: pointer;
}
@media screen and (min-width: 375px) {

div.navbar div.rightSide {
height: 56%;
padding-right: 0px;
}
div.leftSide {
background-image: none;
display: none;
}
div.contact.rightSide h1 {
font-size: 30px;
margin-top: 30px;
}
form input {
height: 32px;
}
form textarea {
height: 19px;
}
div.contact {
height: 73vh;
margin-bottom: 40px;
margin-top: 30px;
}
}
7 changes: 7 additions & 0 deletions src/styles/Events.css
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,11 @@ margin-bottom: 60px;
.imageEvent img {
border-radius: 30px;
width: 300px;
}
@media screen and (min-width: 375px) {
h1.eventsTitle {
text-align: center;
font-size: 45px;
margin-top: 25px;
}
}
7 changes: 7 additions & 0 deletions src/styles/Footer.css
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,11 @@
}
.footer p {
color: white;
}

@media screen and (min-width: 375px) {
.socialMedia svg {
margin: 15px;
font-size: 27px;
}
}
10 changes: 10 additions & 0 deletions src/styles/Home.css
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@
transition: 0.3s ease-in;
}

@media screen and (min-width: 375px) {
div.headerContainer h1.titleHome {
font-size: 29px;
margin-top: 40px;
margin-bottom: 27px;
height: 33px;
}
}


@media only screen and (max-width: 650px) {
.home {
justify-content: center;
Expand Down
13 changes: 13 additions & 0 deletions src/styles/Menu.css
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,19 @@
font-size: 15px;
}

@media screen and (min-width: 375px) {
h1.menuTitle {
text-align: center;
}
div.menuItem {
margin-top: 20px;
margin-bottom: 20px;
}
.menuList {
width: 90vw;
}
}

@media only screen and (max-width: 1300px) {
.menuList {
grid-template-columns: 1fr 1fr;
Expand Down
6 changes: 5 additions & 1 deletion src/styles/Navbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,11 @@ body{
display: inherit;
}
}

@media screen and (min-width: 375px) {
button {
margin-top: 40px;
}
}
@media only screen and (min-width: 600px) {
.navbar .rightSide button {
display: none;
Expand Down
17 changes: 17 additions & 0 deletions src/styles/Recipes.css
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,21 @@ text-align: center;
span.randomingredient {
display: flex;
justify-content: center;
}
@media screen and (min-width: 375px) {
h1.recipeTitle {
text-align: center;
}
p {
text-align: center;
margin-left: 3%;
margin-right: 3%;
}
.randomRecipeImage {
margin-left: 5%;
}
.randomRecipeTitle {
font-size: 17px;
margin-left: 15px;
}
}

0 comments on commit 243c680

Please sign in to comment.