diff --git a/public/css/accueil.css b/public/css/accueil.css
index d98f44b31e42802e0119c2928b78d3c503ecf253..8e9f2576e867dce3bc58587741931997e8f0fad8 100644
--- a/public/css/accueil.css
+++ b/public/css/accueil.css
@@ -87,8 +87,9 @@ a{
.section-Parcours .trait-fushia1{
position: absolute;
- top: 10%;
- left: 15%;
+ bottom: 90%;
+ left: 10%;
+ width:12%;
rotate: 180deg;
}
@@ -96,49 +97,66 @@ a{
position: absolute;
top: 5%;
left: 55%;
+ width:12%;
+
}
.section-Parcours .trait-orange1{
position: absolute;
top: 55%;
- left: 15%;
+ left: 10%;
+ width:12%;
rotate: -120deg;
}
.section-Parcours .trait-fushia2{
position: absolute;
- top: 10%;
+ top: 50%;
left: 75%;
+ width:12%;
rotate: 80deg;
}
.section-Parcours .trait-jaune2{
position: absolute;
- top: 45%;
- left: 30%;
+ top: 35%;
+ left: 25%;
+ width:12%;
+
}
.section-Parcours .trait-orange2{
position: absolute;
top: 70%;
- left: 60%;
+ left: 75%;
+ width:12%;
+
}
/* Fin section-parcours */
+.hidden {
+ opacity: 0;
+ transition: opacity 0.5s ease-out;
+}
+.visible {
+ opacity: 1;
+}
+
+
/* section presentation */
.section-Presentation{
min-height:100vh;
- /* padding:50px 50px 50px 50px; */
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
position: relative;
+ position: relative;
}
.presentation{
@@ -153,19 +171,28 @@ a{
margin-left:-20px;
}
+.section-Presentation img[alt="tache-degrade"]{
+ position: absolute;
+ width:90%;
+ right:55%;
+ bottom: 53%;
+}
+
.section-Presentation .trait-fushia {
position: absolute;
- top: 23%;
- left: 20%;
+ top: 10%;
+ left: 23%;
rotate: 180deg;
+ width:12%;
}
.section-Presentation .trait-jaune {
position: absolute;
- top: 64%;
- right: 55%;
+ top: 43%;
+ right: 20%;
rotate: 158deg;
+ width:12%;
}
.en-savoir-plus{
@@ -176,6 +203,9 @@ a{
margin-right: 40px;
font-size:1.3rem;
}
+.en-savoir-plus:hover{
+ color:#F944FF;
+}
/* FIN section presentation */
/* section oeuvres */
@@ -184,9 +214,9 @@ a{
.section-Oeuvres{
min-height:100vh;
position: relative;
- /* padding:50px 50px 50px 50px; */
-}
+ padding-right:0!important;
+}
.section-Oeuvres h1:nth-child(2){
margin-left:50px;
@@ -195,7 +225,6 @@ a{
display: flex;
justify-content: center;
align-items: center;
- margin: 50px 0px 50px 0px;
}
@@ -224,10 +253,12 @@ a{
-webkit-border-radius: 30px;
}
- .carousel__button {
+
+.carousel__button {
cursor: pointer;
font-size: 2rem;
z-index: 1;
+ color: #FFD700;
}
.carousel__button.previous {
@@ -244,7 +275,7 @@ a{
align-items: center;
position: absolute;
right: 10%;
- bottom:10%;
+ bottom:5%;
font-size:1.3rem;
}
.voir-oeuvres:hover{
@@ -253,18 +284,28 @@ a{
.section-Oeuvres .trait-fushia {
position: absolute;
- top: 23%;
- left: 30%;
+ top: 30%;
+ left: 17%;
rotate: 180deg;
-
+ width:12%;
}
.section-Oeuvres .trait-orange {
position: absolute;
- top: 85%;
- left: 65%;
+ top: 82%;
+ left: 80%;
+ width:12%;
}
+
+ .section-Oeuvres img[alt="tache-degrade"]{
+ position:absolute;
+ bottom:80%;
+ left:32%;
+ width:70%;
+
+ }
+
/* FIN section oeuvres */
@@ -310,11 +351,81 @@ a{
width:250px;
}
+ .section-Parcours .trait-fushia1,.trait-jaune1,.trait-orange1,.trait-fushia2,.trait-jaune2,.trait-orange2{
+ width:initial;
+ }
+
+
.en-savoir-plus:hover{
color:#F944FF;
}
+
+ .section-Presentation img[alt="tache-degrade"]{
+ position: absolute;
+ width:70%;
+ right:70%;
+ bottom: 30%;
+ }
+ .section-Presentation .trait-fushia {
+ position: absolute;
+ top: 10%;
+ left: 23%;
+ rotate: 180deg;
+ width:10%;
+
+ }
+
+ .section-Presentation .trait-jaune {
+ position: absolute;
+ top: 48%;
+ right: 25%;
+ rotate: 158deg;
+ width:10%;
+ }
+ .section-Oeuvres img[alt="tache-degrade"]{
+ position:absolute;
+ bottom:60%;
+ left:55%;
+ width:50%;
+
+ }
+
+ .carousel {
+ align-items: center;
+ display: flex;
+ overflow: hidden;
+ position: relative;
+ width: 300px;
+ }
+
+ .carousel__images img {
+ width: 300px;
+ object-fit: cover;
+ }
+
+ .carousel__button {
+ cursor: pointer;
+ font-size: 5rem;
+ z-index: 1;
+ }
+
+
+ .section-Oeuvres .trait-fushia {
+ position: absolute;
+ top: 28%;
+ left: 30%;
+ rotate: 180deg;
+ width:8%;
+ }
+ .section-Oeuvres .trait-orange {
+ position: absolute;
+ top: 80%;
+ left: 68%;
+ width:8%;
+
+ }
}
@@ -326,26 +437,6 @@ a{
.section-Parcours h2{
font-size: 3.5rem;
}
- .presentation{
- display: flex;
- flex-direction: row;
- justify-content: center;
- gap:2rem;
- align-items: flex-start;
- }
-
- img[alt="img-presentation"]{
- width:200px;
- }
-
- .title-prez{
- align-self: flex-start;
- margin-left:0;
- }
-
- .text-presentation{
- width:400px;
- }
.decouvrez{
top:18%;
@@ -385,9 +476,128 @@ a{
right:-60%;
top:87%;
}
-.en-savoir-plus:hover{
- color:#F944FF;
-}
+ .section-Parcours .trait-fushia1{
+ position: absolute;
+ top: 10%;
+ left: 15%;
+ rotate: 180deg;
+ width:initial;
+
+ }
+
+ .section-Parcours .trait-jaune1{
+ position: absolute;
+ top: 5%;
+ left: 55%;
+ width:initial;
+ }
+
+ .section-Parcours .trait-orange1{
+ position: absolute;
+ top: 55%;
+ left: 15%;
+ rotate: -120deg;
+ width:initial;
+ }
+
+ .section-Parcours .trait-fushia2{
+ position: absolute;
+ top: 10%;
+ left: 75%;
+ rotate: 80deg;
+ width:initial;
+
+ }
+
+ .section-Parcours .trait-jaune2{
+ position: absolute;
+ top: 45%;
+ left: 30%;
+ width:initial;
+
+ }
+
+ .section-Parcours .trait-orange2{
+ position: absolute;
+ top: 70%;
+ left: 60%;
+ width:initial;
+
+ }
+
+ .presentation{
+ display: flex;
+ flex-direction: row;
+ justify-content: center;
+ gap:2rem;
+ align-items: flex-start;
+ }
+
+ img[alt="img-presentation"]{
+ width:200px;
+ }
+
+ .title-prez{
+ align-self: flex-start;
+ margin-left:0;
+ }
+ .section-Presentation img[alt="tache-degrade"]{
+ position: absolute;
+ width:70%;
+ right:70%;
+ bottom: 10%;
+ }
+
+ .text-presentation{
+ width:400px;
+ }
+
+ .en-savoir-plus:hover{
+ color:#F944FF;
+ }
+
+ .section-Presentation .trait-fushia {
+ position: absolute;
+ top: 23%;
+ left: 15%;
+ rotate: 180deg;
+ width:initial;
+
+ }
+
+ .section-Presentation .trait-jaune {
+ position: absolute;
+ top: 64%;
+ right: 55%;
+ rotate: 158deg;
+ width:initial;
+
+ }
+
+ .section-Oeuvres img[alt="tache-degrade"]{
+ position:absolute;
+ bottom: 60%;
+ left:55%;
+ width:45%;
+
+ }
+
+ .section-Oeuvres .trait-fushia {
+ position: absolute;
+ top: 23%;
+ left: 30%;
+ rotate: 180deg;
+ width:initial;
+
+ }
+ .section-Oeuvres .trait-orange {
+ position: absolute;
+ top: 85%;
+ left: 65%;
+ width:initial;
+
+
+ }
}
diff --git a/public/css/base.css b/public/css/base.css
index 18de327db712bbfce3dbea5ac90616bfbec55b80..fcf876b83fd0184f36b615f33be500a52bac31ab 100644
--- a/public/css/base.css
+++ b/public/css/base.css
@@ -1,3 +1,17 @@
+html{
+ height:-webkit-fill-available;
+}
+body{
+ padding:0;
+ margin:0;
+ min-height: 100vh;
+}
+
+@supports (-webkit-touch-callout:none){
+ body{
+ min-height:webkit-fill-available;
+ }
+}
/**** MOBILE FIRST *****/
@font-face {
@@ -260,8 +274,9 @@ img[alt="rond-blanc"]{
justify-content: center;
align-items: center;
min-height:100vh;
- background-image: url(../image/taches.png);
+ /* background-image: url(../image/taches.png); */
background-size: cover;
+ position: relative;
}
.logo img{
@@ -274,6 +289,71 @@ img[alt="rond-blanc"]{
text-align: center;
}
+.section-BigTitle img[alt="tache-degrade"]{
+ position:absolute;
+ width:60%;
+ left:40%;
+ bottom:50%;
+ z-index: -1;
+ }
+
+ .section-BigTitle img[alt="tache-violet"]{
+ position:absolute;
+ width:30%;
+ left:70%;
+ top:55%;
+ z-index: -1;
+
+ }
+
+ .section-BigTitle img[alt="tache-jaune"]{
+ position:absolute;
+ width:70%;
+ right:45%;
+ bottom:55%;
+ z-index: -1;
+
+ }
+
+ .section-BigTitle img[alt="tache-orange"]{
+ position:absolute;
+ width:40%;
+ left:20%;
+ bottom:30%;
+ z-index: -1;
+
+
+ }
+ .section-BigTitle img[alt="tache-violet2"]{
+ position:absolute;
+ width:65%;
+ right:70%;
+ bottom:20%;
+ z-index: -1;
+
+
+ }
+
+ .section-BigTitle img[alt="tache-jaune2"]{
+ position:absolute;
+ width:75%;
+ right:5%;
+ top:60%;
+ z-index: -1;
+
+ }
+
+
+.hidden {
+ opacity: 0;
+ transition: opacity 0.5s ease-out;
+ }
+ .visible {
+ opacity: 1;
+ }
+
+
+
/* FOOTER */
@@ -324,6 +404,16 @@ footer a {
.nav__list li{
font-size: 3.5rem;
}
+
+ .section-BigTitle img[alt="tache-jaune2"]{
+ position:absolute;
+ width:75%;
+ right:5%;
+ top:40%;
+ z-index: -1;
+
+ }
+
footer{
gap:3rem;
@@ -348,3 +438,62 @@ footer a {
}
+
+@media screen and (min-width:1024px){
+
+
+.section-BigTitle img[alt="tache-degrade"]{
+ position:absolute;
+ width:40%;
+ left:50%;
+ bottom:40%;
+ z-index: -1;
+ }
+
+ .section-BigTitle img[alt="tache-violet"]{
+ position:absolute;
+ width:20%;
+ left:80%;
+ top:40%;
+ z-index: -1;
+
+ }
+
+ .section-BigTitle img[alt="tache-jaune"]{
+ position:absolute;
+ width:50%;
+ right:45%;
+ bottom:45%;
+ z-index: -1;
+
+ }
+
+ .section-BigTitle img[alt="tache-orange"]{
+ position:absolute;
+ width:30%;
+ left:20%;
+ bottom:15%;
+ z-index: -1;
+
+
+ }
+ .section-BigTitle img[alt="tache-violet2"]{
+ position:absolute;
+ width:45%;
+ right:75%;
+ bottom:2%;
+ z-index: -1;
+
+
+ }
+
+ .section-BigTitle img[alt="tache-jaune2"]{
+ position:absolute;
+ width:45%;
+ right:10%;
+ top:55%;
+ z-index: -1;
+
+ }
+
+}
\ No newline at end of file
diff --git a/public/css/oeuvre.css b/public/css/oeuvre.css
index 2321010aa895b46213c402f05829a9dbc7bf5a70..d4288b7fa582c2e8aa6c2d997e3eec9601d0fd5b 100644
--- a/public/css/oeuvre.css
+++ b/public/css/oeuvre.css
@@ -1,13 +1,12 @@
/* Taille section */
.oeuvre_spe {
- height: 100vh;
- margin-bottom: 20rem;
+ /* height: 100vh; */
+ margin-bottom: 10rem;
}
/* Titre oeuvre */
.oeuvre_spe h2 {
font-size: 2.813rem;
-
text-align: center;
}
@@ -15,19 +14,18 @@
.oeuvre_spe h3 {
font-size: 2.188rem;
margin-top: -1rem;
-
text-align: center;
}
/* Section image */
.graf {
margin: auto;
-
- width: 80%;
+ width: 100%;
+ text-align: center;
}
.graf img {
- width: 100%;
+ width: 300px;
}
/* Description de l'oeuvre */
@@ -110,8 +108,7 @@
@media screen and (min-width: 1024px) {
.oeuvre_spe {
height: 100vh;
- width: 100%;
- margin-bottom: 25rem;
+ margin-bottom: 20rem;
}
.oeuvre_parc {
display: flex;
@@ -131,6 +128,6 @@
}
.graf {
- width: 40%;
+ width: 100%;
}
}
\ No newline at end of file
diff --git a/public/css/qui.css b/public/css/qui.css
index e47f3c48f03bb7336e368caf65d6c43f4bfa47af..530e2be39431e40c362120ca700fcb3ff8cec0f6 100644
--- a/public/css/qui.css
+++ b/public/css/qui.css
@@ -1,3 +1,7 @@
+.sect{
+ position: relative;
+}
+
.test {
width: 50%;
margin: auto;
@@ -17,29 +21,64 @@
.ok {
position: absolute;
- top: 32rem;
+ top: 37rem;
left: 3rem;
+ rotate: 180deg;
}
.ok2 {
position: absolute;
- top: 54rem;
+ top: 60rem;
right: 3rem;
- rotate: 178deg;
+ /* rotate: 178deg; */
+ rotate: 352deg;
}
-@media screen and (min-width: 1024px) {
+@media screen and (min-width: 720px) {
.ok {
position: absolute;
- left: 45rem;
- top: 24rem;
+ left: 12rem;
+ top: 27rem;
rotate: 180deg;
}
.ok2 {
position: absolute;
top: 49rem;
- right: 45rem;
+ right: 11rem;
+ rotate: 352deg;
+ }
+}
+
+
+@media screen and (min-width: 1024px) {
+ .ok {
+ position: absolute;
+ left: 20rem;
+ top: 23rem;
+ rotate: 180deg;
+ }
+
+ .ok2 {
+ position: absolute;
+ top: 47rem;
+ right: 20rem;
+ rotate: 352deg;
+ }
+}
+
+@media screen and (min-width: 1366px) {
+ .ok {
+ position: absolute;
+ left: 35rem;
+ top: 20rem;
+ rotate: 180deg;
+ }
+
+ .ok2 {
+ position: absolute;
+ top: 45rem;
+ right: 35rem;
rotate: 352deg;
}
}
\ No newline at end of file
diff --git a/public/image/tache_degrade.png b/public/image/tache_degrade.png
new file mode 100644
index 0000000000000000000000000000000000000000..fcc4a145121be1479eda37c9d4d743559542f478
Binary files /dev/null and b/public/image/tache_degrade.png differ
diff --git a/public/image/tache_degrade1.png b/public/image/tache_degrade1.png
new file mode 100644
index 0000000000000000000000000000000000000000..254b5e78c64b05fdb15a337e1e905aabb419fe06
Binary files /dev/null and b/public/image/tache_degrade1.png differ
diff --git a/public/image/tache_jaune.png b/public/image/tache_jaune.png
new file mode 100644
index 0000000000000000000000000000000000000000..cefe6549f9d51ddaa7ebbe14b6988583c9aeed1a
Binary files /dev/null and b/public/image/tache_jaune.png differ
diff --git a/public/image/tache_orange.png b/public/image/tache_orange.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b3e27269276db80d94f03289bfb52666c2f3a97
Binary files /dev/null and b/public/image/tache_orange.png differ
diff --git a/public/image/tache_violet.png b/public/image/tache_violet.png
new file mode 100644
index 0000000000000000000000000000000000000000..92b64515de1c109e835967e91d4df74cd791f70f
Binary files /dev/null and b/public/image/tache_violet.png differ
diff --git a/public/image/taches.png b/public/image/taches.png
new file mode 100644
index 0000000000000000000000000000000000000000..339ae5b8bb53551ad024d48da933d2b420ccdc44
Binary files /dev/null and b/public/image/taches.png differ
diff --git a/public/js/accueil.js b/public/js/accueil.js
index 5f1f0188d5d0759d11663c7a576a01650b8bd5f0..9326dc3a3bc86115d4b14037d3ea3909ad5953ee 100644
--- a/public/js/accueil.js
+++ b/public/js/accueil.js
@@ -1,3 +1,27 @@
+window.addEventListener("scroll", function() {
+ var image1 = document.querySelector(".tache-presentation");
+ var section1 = document.querySelector(".section-Presentation");
+ if (image1 && section1) {
+ var position1 = section1.getBoundingClientRect().top;
+ var windowHeight = window.innerHeight;
+ if (position1 < windowHeight * 0.5) {
+ image1.classList.add("visible");
+ }
+ }
+ var image2 = document.querySelector(".tache-oeuvres");
+ var section2 = document.querySelector(".section-Oeuvres");
+ if (image2 && section2) {
+ var position2 = section2.getBoundingClientRect().top;
+ var windowHeight = window.innerHeight;
+ if (position2 < windowHeight * 0.5) {
+ image2.classList.add("visible");
+ }
+ }
+});
+
+
+
+
const carouselImages = document.querySelector('.carousel__images');
const carouselButtons = document.querySelectorAll('.carousel__button');
console.log(carouselButtons);
diff --git a/public/js/base.js b/public/js/base.js
index dede546333fcfccf295ea36cafc3f1bd0bd3e0c0..bc5d8c777443e7c975cb698dc020cd4043f4da7f 100644
--- a/public/js/base.js
+++ b/public/js/base.js
@@ -1,3 +1,15 @@
+window.onload = function() {
+ var images = document.querySelectorAll("#tache");
+ for (var i = 0; i < images.length; i++) {
+ (function(index) {
+ setTimeout(function() {
+ // images[index].classList.remove("hidden");
+ images[index].classList.add("visible");
+ }, 400 * index);
+ })(i);
+ }
+ };
+
let menuBtn = document.querySelector('.menu-btn');
let menu = document.querySelector('.nav');
let menuItem = document.querySelectorAll('.nav__link');
@@ -9,3 +21,5 @@ menuBtn.addEventListener('click', function(){
+
+
diff --git a/src/Controller/ParcoursController.php b/src/Controller/ParcoursController.php
index e83067cf14f8942d3764c1741c64a8f910c47699..48f8d7f930fe25d461cc703891267b93207213f0 100644
--- a/src/Controller/ParcoursController.php
+++ b/src/Controller/ParcoursController.php
@@ -70,10 +70,12 @@ class ParcoursController extends AbstractController
{
$oeuvres = $parcour->getRelaOeuvre();
$comment = $parcour->getComment();
+ $averageNote = $parcour->getAverageNote();
return $this->render('parcours/show.html.twig', [
'parcour' => $parcour,
'comments' => $comment,
'oeuvres' => $oeuvres,
+ 'moyenne' => $averageNote,
]);
}
diff --git a/src/Entity/Parcours.php b/src/Entity/Parcours.php
index 4ceddabe21ed9447ba515d39c0efef1e9346e3fa..3cb551f2699fe1f4dd35893367b6e10c55e389eb 100644
--- a/src/Entity/Parcours.php
+++ b/src/Entity/Parcours.php
@@ -96,6 +96,24 @@ class Parcours
return $this;
}
+ public function getAverageNote(): float
+ {
+ $commentNotes = $this->getComment()->map(function($comment) {
+ return $comment->getNote();
+ });
+
+ if ($commentNotes->count() === 0) {
+ return 0;
+ }
+
+ $averageNote = $commentNotes->reduce(function($accumulator, $note) {
+ return $accumulator + $note;
+ }) / $commentNotes->count();
+
+ return round($averageNote, 1);
+ }
+
+
/**
* @return Collection<int, oeuvre>
*/
diff --git a/templates/base.html.twig b/templates/base.html.twig
index 24fcfd4335322230430b42e008799db6f691b9d1..33fdc46a7cd0343848a75f1ba51438eb068398ce 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -4,8 +4,7 @@
<head>
<meta charset="UTF-8">
<title>{% block title %}Welcome!{% endblock %}</title>
- <link rel="icon"
- href="data:image/svg+xml,<svg xmlns=%22http://www.w3.org/2000/svg%22 viewBox=%220 0 128 128%22><text y=%221.2em%22 font-size=%2296%22>âš«ï¸</text></svg>">
+ <link rel="icon" href="{{ asset('image/tache_degrade.png') }}">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.10.3/font/bootstrap-icons.css">
<link rel="stylesheet" href="{{ asset('css/base.css') }}">
@@ -18,7 +17,6 @@
{{ encore_entry_script_tags('app') }}
{% endblock %}
-
</head>
<header>
<div class="se-connecter">
@@ -86,9 +84,15 @@
{% endblock %}
</div>
- <aside id="circle-menu">
- <div class="circle-menu"></div>
- </aside>
+ <img class="hidden" id="tache" src="{{ asset('image/tache_degrade1.png') }}" alt="tache-degrade"/>
+ <img class="hidden" id="tache" src="{{ asset('image/tache_jaune.png') }}" alt="tache-jaune"/>
+ <img class="hidden" id="tache" src="{{ asset('image/tache_violet.png') }}" alt="tache-violet"/>
+ <img class="hidden" id="tache" src="{{ asset('image/tache_orange.png') }}" alt="tache-orange"/>
+ <img class="hidden" id="tache" src="{{ asset('image/tache_violet.png') }}" alt="tache-violet2"/>
+ <img class="hidden" id="tache" src="{{ asset('image/tache_jaune.png') }}" alt="tache-jaune2"/>
+
+
+
</section>
<div class="zigzag"></div>
<main>
diff --git a/templates/home.html.twig b/templates/home.html.twig
index 495c16d2e85bea09c01ad746c41213ad3ed80af0..e39b107c236445573b4bdecb773daf4cd776072d 100644
--- a/templates/home.html.twig
+++ b/templates/home.html.twig
@@ -63,7 +63,7 @@
<div>
<h1 class="title-prez">QUI SOMMES-NOUS ?</h1>
-
+ <img class="tache-presentation hidden" src="{{ asset('image/tache_degrade1.png') }}" alt="tache-degrade"/>
<div class="text-presentation">
<p>Nous sommes quelques étudiants fans de Street Art.
Nous sommes basés sur Strasbourg, notre ville de coeur. Cette passion, nous vous la partageons Ã
@@ -114,6 +114,7 @@
<img class="trait-fushia" src="{{ asset('image/traits/trait_fuschia.png')}}" alt="">
<img class="trait-orange" src="{{ asset('image/traits/trait_orange.png')}}" alt="">
+ <img class="tache-oeuvres hidden" src="{{ asset('image/tache_degrade1.png') }}" alt="tache-degrade"/>
</section>
diff --git a/templates/oeuvre/show.html.twig b/templates/oeuvre/show.html.twig
index b61b27b839c88912e5ca80328f015dc53752096a..c4f90bd473fdb2aadbb0ea7da8ac23b1d3adfde7 100644
--- a/templates/oeuvre/show.html.twig
+++ b/templates/oeuvre/show.html.twig
@@ -1,6 +1,6 @@
{% extends 'base.html.twig' %}
-{% block title %}Oeuvre{% endblock %}
+{% block title %}{{oeuvre.nom}}{% endblock %}
{% block titre %}
<h1>{{oeuvre.nom}}</h1>
{% endblock %}
@@ -15,7 +15,7 @@
<h2>{{ oeuvre.nom }}</h2>
<h3>{{ oeuvre.artiste }}</h3>
<figure class="graf">
- <img src="{{ oeuvre.photo }}" alt="">
+ <img src="{{ oeuvre.photo }}" alt="{{oeuvre.altImg}}">
<figcaption>© {{ oeuvre.credit }}</figcaption>
</figure>
diff --git a/templates/parcours/index.html.twig b/templates/parcours/index.html.twig
index 0c6e59f86f0940395ce0f00d7aca76c5553ed804..bfdbc7d6872ae94bee67d50274680a59cbbc88ea 100644
--- a/templates/parcours/index.html.twig
+++ b/templates/parcours/index.html.twig
@@ -40,14 +40,14 @@
<section>
<div class="container-card">
{% for parcour in parcours %}
-
+ {% set moyenne = parcour.getAverageNote() %}
<div class="baqueron">
<a href="{{ path('app_parcours_show', {'id': parcour.id}) }}">
<div class="card">
<div class="card-cont">
<h4>{{parcour.nom}}</h4>
<div class="card-avis">
- <p>2,5/5</p>
+ <p>{{moyenne}}/5</p>
<i class="bi bi-star-fill"></i>
</div>
</div>
@@ -55,8 +55,6 @@
</div>
</a>
</div>
-
-
{% endfor %}
</div>
</section>
diff --git a/templates/parcours/show.html.twig b/templates/parcours/show.html.twig
index 0f49a8b4674603dc298ec0958502e55121424c77..ac3f8901a68f86e4048ed709f1920a0c6d71b931 100644
--- a/templates/parcours/show.html.twig
+++ b/templates/parcours/show.html.twig
@@ -33,7 +33,7 @@
</table> #}
<section class="parcours_intro">
- <p class="note_parc">Note des visiteurs : 2,5/5 <i class="bi bi-star-fill"></i></p>
+ <p class="note_parc">Note des visiteurs : {{moyenne}}/5 <i class="bi bi-star-fill"></i></p>
<p>{{parcour.description}}</p>
<h4>N'attendez plus, suivez nos pas !</h4>
</section>
diff --git a/templates/prez.html.twig b/templates/prez.html.twig
index f100dac9f5ea5ba810aba2c4c168d021cbf2f995..22dded3643133cd5fa7d227ce7d960a8f600c285 100644
--- a/templates/prez.html.twig
+++ b/templates/prez.html.twig
@@ -11,7 +11,7 @@
{% block main %}
-<section>
+<section class="sect">
<div class="test">
<div class="text_prez">
<h2>Nous sommes ...</h2>
@@ -21,7 +21,6 @@
<img class="image" src="{{ asset('image/parcours1.png') }}" alt="">
<img class="ok" src="{{ asset('image/traits/trait_fuschia.png')}}" alt="">
<img class="ok2" src="{{ asset('image/traits/trait_orange.png')}}" alt="">
- <p>Jorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc vulputate libero et velit interdum, ac aliquet odio mattis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur tempus urna at turpis condimentum lobortis. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc vulputate libero et velit interdum, ac aliquet odio mattis. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Curabitur tempus urna at turpis condimentum lobortis.</p>
</div>
</div>
</section>
diff --git a/templates/registration/register.html.twig b/templates/registration/register.html.twig
index c8936ee8acbfa20aee6fa6bab7ff0d5f55314ed6..7abd93b0f89e4027444ab7a809b12d30f00882a2 100644
--- a/templates/registration/register.html.twig
+++ b/templates/registration/register.html.twig
@@ -1,9 +1,17 @@
{% extends 'base.html.twig' %}
-{% block title %}Register{% endblock %}
+{% block stylesheets %}
+<link rel="stylesheet" href="{{ asset('css/inscription.css') }}">
+{% endblock %}
+
+{% block title %}Inscription{% endblock %}
+
+{% block titre %}
+<h1>Inscription</h1>
+{% endblock %}
{% block main %}
- <h1>Register</h1>
+ <h1>Inscription</h1>
{{ form_start(registrationForm) }}
{{ form_row(registrationForm.pseudo, {
diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig
index 7397ab9690a68c2ea1e4cba90f7087d83d0eab11..98e76705cb6e20f5f6f00311686dee3345e81d53 100644
--- a/templates/security/login.html.twig
+++ b/templates/security/login.html.twig
@@ -6,6 +6,10 @@
{% block title %}Log in!{% endblock %}
+{% block titre %}
+<h1>Connexion</h1>
+{% endblock %}
+
{% block main %}
{# {% if error %}
<div class="alert alert-danger">{{ error.messageKey|trans(error.messageData, 'security') }}</div>