Skip to content
Snippets Groups Projects
Commit b41fa0d4 authored by Sofiane Lasri's avatar Sofiane Lasri
Browse files

Merge branch 'enolha' into sofiane

parents 0652ab32 419d6ab9
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
js/voice.js
+ 1
− 1
View file @ b41fa0d4
......@@ -49,7 +49,7 @@ function listenForCristo(){
heardSpan.innerText += " A entendu = " + speechResult;
heardSpan.style.display = "";
if(speechResult.toLowerCase().includes("cristaux")){
console.log('Heard Cristo ! (or Cristo)');
console.log('Heard Cristo ! (or Cristaux)');
} else {
console.log('Heard nothing');
}
......
pages/accueil.php
+ 38
− 0
View file @ b41fa0d4
<!DOCTYPE html>
<html lang="fr">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
......@@ -11,7 +12,44 @@
<header>
<?php include "navbar.php"; ?>
</header>
<<<<<<< HEAD
<head>
<meta charset="utf-8">
<title> Cristo </title>
</head>
<body>
<div class="menubackground">
<div class="v1_158">
<h1>Crist'o </h1> <h1> Trouvez les recettes parfaites
pour vous, sans lever le petit doigt ! </h1>
<div class="v1_163">
<div class="v1_164"><span class="v1_165" input type="text" placeholder="Search.."> </span></div>
<button type="submit"><i class="fa fa-search"></i></button>
<div class="v1_166">
<div class="v1_167">
<div class="v1_168"></div>
</div>
</div>
</div><span class="v1_169">OU</span>
<div class="v1_170">
<div class="v1_171">
<div class="v1_172"></div>
</div>
<i class="fa-solid fa-microphone"></i>
<span class="v1_173">Demandez à Crist'o</span>
</div>
</div>
</div>
<div class="votrerecette">
<p> Vous souhaitez ajouter votre recette ? Cliquez ici</p>
</div>
</body>
<?php include "footer.php"; ?>
</body>
</html>
\ No newline at end of file
pages/header.php
+ 1
− 4
View file @ b41fa0d4
......@@ -19,6 +19,3 @@
</footer>
</body>
</html>
\ No newline at end of file
<?php
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment