Skip to content

Commit

Permalink
Merge pull request #3 from Edoardo-B-Leiva/development
Browse files Browse the repository at this point in the history
Final merge from "Development" to "main"
  • Loading branch information
Edoardo-B-Leiva authored Feb 16, 2024
2 parents 409ffbe + 598d2f5 commit 66e617c
Show file tree
Hide file tree
Showing 23 changed files with 1,652 additions and 12 deletions.
18 changes: 16 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,20 @@ Pagina web creada para el proyecto de grupo de Ingles y Aplicaciones Web de TSMR
El desarrollo de este repositorio se hara en el branch "development", el branch main esta configurado para que no se puedan hacer cambios directos.

Los colaboradores de este proyecto son:
- Edoardo Borgia Leaiva
- Edoardo Borgia Leiva
- Sergi Molina Barberá
- Samuel Rodriguez García
- Samuel Rodriguez García

---

- Always use #id when possible over .classes
- IDs
- Navbar / Footer & content
- Content Body Container
- One-use containers
- Classes
- Img
- Text
- Buttons
- All styling that is used in more than 1 page must be in /style.css and single-page styling can go either in /style.css or /<page-filename>.css.

1 change: 1 addition & 0 deletions TSMR2_INGBAW_coll_page
Submodule TSMR2_INGBAW_coll_page added at 367ced
Binary file added assets/Edificios.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 assets/buildings.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 assets/canteen.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 assets/favicon.ico
Binary file not shown.
Binary file added assets/flecha abajo roja.webp
Binary file not shown.
Binary file added assets/librería.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 assets/pavellon.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
137 changes: 137 additions & 0 deletions facilities.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title></title>
<meta charset="UTF-8" />
<meta name="viewport" content="initial-scale=1" />
<link href="styles/style.css" rel="stylesheet" />
<link rel="stylesheet" href="styles/facilities.css">
<link rel="icon" href="assets/favicon.ico" />
</head>

<body>
<nav>
<div class="nv-cnt">
<div id="nv-img-cnt">
<div>
<a href="index.html">
<img
src="https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Finstitutoeu.com%2Fwp-content%2Fuploads%2F2021%2F03%2Fflorida.png&f=1&nofb=1&ipt=7e3de774063e5e886252bdddd8440446a25d7939a84bfd36468b212450b82429&ipo=images"
alt="Logo.png"
/>
</a>
</div>
<img
id="fade"
src="https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Fwww.triodos.de%2Fproject-image%3Fid%3Dd61d26be-1570-4e17-9679-ba4d7b04514e&f=1&nofb=1&ipt=61640f594893f3311a1f7159b0eb6f3c3ef3ef87305c69e9c4ec2649ac9da0af&ipo=images"
alt="FADEIMG"
/>
</div>
</div>
<div id="nv-btn-cnt">
<a class="nv-btn" href="subjects.html">Subjects</a>
<a class="nv-btn" href="facilities.html">Facilities</a>
<a class="nv-btn" href="offers.html">Education offers</a>
</div>
<a href="forms.html" target="_blank"
><marquee direction="right" behavior="alternate">JOIN OUR NEWSLETTER <u>NOW!</u></marquee></a>
</nav>
<div id="content-body">
<a name="principio"><article></a>
<h1 id="tit-fac">Our Facilities in Florida Universitaria</h1>
<section>
<div id="div-content-body-uno">
<p>In this page you can see the facilities that we have at the Florida Universitaria, such as:</p>
<ul>
<li><a href="#library">The library</a></li>
<li><a href="#canteen">The cafeteria</a></li>
<li><a href="#buildings">Buildings</a></li>
<li><a href="#pavilion">Pavilion</a></li>
</ul>
</div>
</section>
<section>
<a name="library">
<div id="cont-lib">
<h1 id="tit-lib">Library</h1>
<div id="div-liv">In our library, you can read lots of books which range a large variety of interesting topics. Apart from this, you can study efficiently thanks to the provided isolated rooms.</div>
<img id="img-lib" src="assets/librería.jpeg" alt="Our library">
</div>
</a>
</section>
<section>
<a name="canteen">
<div id="cont-can">
<h1 id="tit-can">Cafeteria</h1>
<div id="div-can">In this facility we can take a quick snack or drink, we have a big variety of products to choose from, we have vending machines and here you can find all types of products you could be searching for, all for a very convenient price.</div>
<img id="img-can" src="assets/canteen.jpg" alt="Our cafeteria">
</div>
</a>
</section>
<section>
<a name="buildings">
<div id="cont-bui">
<h1 id="tit-bui">Buildings</h1>
<div id="div-can">Here at Florida Universitaria, there are a variety of buildings, ordered by letters. In each building, something different is taught. For instance, in our building, which is letter B, things related to IT courses and grades.</div>
<img id="img-bui" src="assets/buildings.png" alt="Our buildings">
</div>
</a>
</section>
<section>
<a name="pavilion">
<div id="cont-pav">
<h1 id="tit-pav">Pavilion</h1>
<div id="div-pav">The pavilion is a great place to exercise and train our bodies. It's important to know that our pavilion was created to handle not only soccer matches, but also basketball matches. It's also used to do activities related to the sports and physical education courses.</div>
<img id="img-pav" src="assets/pavellon.jpg" alt="Our pavilion">
</div>
</a>
</section>

<div id="cont-but">
<a href="#principio">
<button>
GO BACK
</button>
</a>
</div>

</article>
</div>
<div id="footer">
<div id="footer-cnt">
<div>
<h1>Authors</h1>
<ul>
<li>
<a href="https://github.com/Edoardo-B-Leiva"
>Edoardo Borgia Leiva</a
>
</li>
<li>
<a href="https://github.com/sergi1307">Sergi Molina Barberà</a>
</li>
<li>
<a href="https://github.com/SamuelRPG">Samuel Rodriguez Garcìa</a>
</li>
</ul>
</div>
<div>
<h1>Useful Links</h1>
<ul>
<li>
<a href="https://floridauniversitaria.es/"
>Florida Universitaria</a
>
</li>
<li>
<a
href="https://github.com/Edoardo-B-Leiva/TSMR2_INGBAW_coll_page"
>Github repository</a
>
</li>
</ul>
</div>
</div>
</div>
</body>
</html>
31 changes: 31 additions & 0 deletions forms.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="styles/forms.css">
<title>Forms</title>
</head>
<body>
<form class="form">
<p class="title">Join newsseller </p>
<div class="flex">
<label>
<input class="input" type="text" placeholder="" required="">
<span>Firstname</span>
</label>

<label>
<input class="input" type="text" placeholder="" required="">
<span>Lastname</span>
</label>
</div>

<label>
<input class="input" type="email" placeholder="" required="">
<span>Email</span>
</label>
<button class="submit">Submit</button>
</form>
</body>
</html>
128 changes: 118 additions & 10 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,120 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title></title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link href="css/style.css" rel="stylesheet">
</head>
<body>

</body>
</html>

<head>
<title>Index</title>
<meta charset="UTF-8" />

<meta name="viewport" content="width=device-width, initial-scale=1" />

<link href="styles/style.css" rel="stylesheet" />
<link rel="stylesheet" href="styles/index.css">

<link rel="icon" href="assets/favicon.ico" />
</head>

<body>
<nav>
<div class="nv-cnt">
<div id="nv-img-cnt">
<div>
<a href="#">
<img
src="https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Finstitutoeu.com%2Fwp-content%2Fuploads%2F2021%2F03%2Fflorida.png&f=1&nofb=1&ipt=7e3de774063e5e886252bdddd8440446a25d7939a84bfd36468b212450b82429&ipo=images"
alt="Logo.png" />
</a>
</div>
<img id="fade"
src="https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Fwww.triodos.de%2Fproject-image%3Fid%3Dd61d26be-1570-4e17-9679-ba4d7b04514e&f=1&nofb=1&ipt=61640f594893f3311a1f7159b0eb6f3c3ef3ef87305c69e9c4ec2649ac9da0af&ipo=images"
alt="FADEIMG" />
</div>
</div>
<div id="nv-btn-cnt">
<a class="nv-btn" href="subjects.html">Subjects</a>
<a class="nv-btn" href="facilities.html">Facilities</a>
<a class="nv-btn" href="offers.html">Education offers</a>
</div>
<a href="forms.html" target="_blank">
<marquee direction="right" behavior="alternate">JOIN OUR NEWSLETTER <u>NOW!</u></marquee>
</a>
</nav>
<div class="content-body">
<article>
<h1 id="titulo-sobre-nosotros">Who are we?</h1>
<section id="sobre-nosotros">
<p><b>Florida is an educational centre that,
in the past years has been adscrited to the University of Valencia.
Florida also offers a variety of study paths and studies all the way from Vocational Educations to University Degrees, such as tourism, sports and physical education
and 3D animation which vary between grant maintained and private.</b></p>
<br>
<br>
<p><b>
Apart from this, Florida is involved in a part of "Florida Centre de Formació" and "Sociedad Cooperativa
Valenciana",
a project with more than 40 years of
experience in the education sector that has been growing in recent years and is currently
part of the Florida Group.
</b></p>
</section>
<div class="container-foto">
<img src="assets/Edificios.jpg" id="florida-foto">
</div>
<div id="container-sobre-nosotros">
<div id="sobre-nosotros-amarillo">
<h2 class="titulo-cuadrados">Subjects</h2>
<p class="parrafos-cuadrados">In this section, we can see the subjects that're taught in
TSMR. To learn more, click the button below:</p>
<a href="subjects.html"><button>SUBJECTS</button></a>
</div>
<div id="sobre-nosotros-rojo">
<h2 class="titulo-cuadrados">Facilities</h2>
<p class="parrafos-cuadrados">In this other section we talk more about Florida Universitaria's facilities. To learn more, click the button below:</p>
<a href="facilities.html"><button>FACILITIES</button></a>
</div>
<div id="education_offers">
<h2 class="titulo-cuadrados">Education Offers</h2>
<p class="parrafos-cuadrados">Do you want study with us? If your answer is "YES!" click in the button button to see
a courses that may be in your interest!</p>
<a href="offers.html"><button>COURSES</button></a>
</div>
</article>
</div>
</div>
<div id="footer">
<div id="footer-cnt">
<div>
<h1>Authors</h1>
<ul>
<li>
<a href="https://github.com/Edoardo-B-Leiva">Edoardo Borgia Leiva</a>
</li>
<li>
<a href="https://github.com/sergi1307">Sergi Molina Barberà</a>
</li>
<li>
<a href="https://github.com/SamuelRPG">Samuel Rodriguez Garcìa</a>
</li>
</ul>
</div>
<div>
<h1>Useful Links</h1>
<ul>
<li>
<a href="https://floridauniversitaria.es/">Florida Universitaria</a>
</li>
<li>
<a href="https://github.com/Edoardo-B-Leiva/TSMR2_INGBAW_coll_page">Github repository</a>
</li>
</ul>
</div>
</div>
<div>
<hr />
<a href="https://creativecommons.org/licenses/by-nc-nd/4.0/"><img
src="https://licensebuttons.net/l/by-nc-nd/3.0/nl/88x31.png" alt="" /></a>

</div>
</div>
</body>

</html>
Loading

0 comments on commit 66e617c

Please sign in to comment.