Skip to content

Commit

Permalink
25/09
Browse files Browse the repository at this point in the history
  • Loading branch information
@adriendelagneau
adriendelagneau committed Aug 25, 2021
1 parent 1a37fa6 commit 62fd90e
Show file tree
Hide file tree
Showing 17 changed files with 33 additions and 25 deletions.
2 changes: 1 addition & 1 deletion 404.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<h1>Erreur 404</h1>
<p><img src="app/Public/front/img/crash21.jpg" alt="crash vaisseau de livraison de pizzas"></p>
<p>Oupss, une erreur est survenue, impossible de trouver votre page</p>
<p><a href="index.php">retour à la page d'acceuil</a></p>
<p><a href="index.php" aria-label="retour page d'accueil">retour à la page d'acceuil</a></p>
</body>

</html>
6 changes: 5 additions & 1 deletion app/Controllers/front/FrontController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,9 @@ public function inscription($userName, $userFirstname, $userAdress, $userPhone,
}

if (!empty($userName) && (!empty($userFirstname) && (!empty($userAdress) && (!empty($userPhone) && (!empty($userMail) && (!empty($userPWD))))))) {
if (empty($errorInscription)) {
if (empty($errorInscription))

{
$inscription = $inscriptionUser->newUser($userName, $userFirstname, $userAdress, $userPhone, $userMail, $userPWD);
$slides = new \Project\Models\ImagesManager();
$allSlides = $slides->getSlides();
Expand All @@ -194,6 +196,8 @@ public function inscription($userName, $userFirstname, $userAdress, $userPhone,

echo '<script>alert("Bravo, vous etes maintenant inscrit");</script>';
}


} else {
$this->inscriptionUser($errorInscription);
}
Expand Down
Binary file added app/Public/front/css/arial-black.ttf
View file
Binary file not shown.
4 changes: 1 addition & 3 deletions app/Public/front/css/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@ footer {
}

#socials-links {
padding: 30px 0;
padding: 25px 0;
}

#socials-links div {
Expand Down Expand Up @@ -720,5 +720,3 @@ footer {
}

}


Binary file added app/Public/front/img/man-user.jpg
View file
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 app/Public/front/img/man-user.png
View file
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 app/Public/front/img/menu.jpg
View file
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 app/Public/front/img/p2.jpeg
View file
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 app/Public/front/img/toto.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 5 additions & 3 deletions app/Views/back/aLaUne.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@
<form action="indexAdmin.php?action=creatALaUne" method="post" enctype="multipart/form-data" class="formImg">


<label for="title">Titre SEO de votre image</label>
<label for="title">Titre SEO de votre image :</label>
<input type="text" id="title" name="title">

<input type="file" name="fileToUpload" class="filesImg">
<label for="img_a_la_une_upload">Charger votre fichier :</label>
<input type="file" name="fileToUpload" id="img_a_la_une_upload">

<input type="submit" value="ENVOYER" id="upload" class="submit">

<input type="submit" value="ENVOYER" id="Btn_envoyer_1" class="submit">


</form>
Expand Down
5 changes: 3 additions & 2 deletions app/Views/back/listSlides.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@

<form action="indexAdmin.php?action=creatSlide" method="post" enctype="multipart/form-data" class="formImg">
<div>
<label for="title">Titre SEO de votre image</label>
<label for="title">Titre SEO de votre image :</label>
<input type="text" id="title" name="title">
</div>
<div>
<input type="file" name="fileToUpload" class="filesImg">
<label for="img_slide_upload">charger votre fichier :</label>
<input type="file" name="fileToUpload" id="img_slide_upload">
</div>
<div>
<input type="submit" value="ENVOYER" id="upload" class="submit">
Expand Down
5 changes: 3 additions & 2 deletions app/Views/back/templates/template.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="vente de pizzas & autres en livraison sur vannes">
<title>Pizza Express</title>
<script src="https://kit.fontawesome.com/f964f4d052.js" crossorigin="anonymous"></script>
<link rel="preconnect" href="https://fonts.gstatic.com">
Expand All @@ -23,8 +24,8 @@
<header>
<nav>
<div id="icons">
<a href="indexAdmin.php?action=deconnexion"><i class="fas fa-times"></i></a>
<a href="indexAdmin.php?action=tableauDeBord"><i class="fas fa-arrow-left"></i></a>
<a href="indexAdmin.php?action=deconnexion" aria-label="deconnexion"><i class="fas fa-times"></i></a>
<a href="indexAdmin.php?action=tableauDeBord" aria-label="tableau de bord"><i class="fas fa-arrow-left"></i></a>
</div>
</nav>
</header>
Expand Down
5 changes: 3 additions & 2 deletions app/Views/back/templates/templateUser.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="vente de pizzas & autres en livraison sur vannes">
<title>Pizza Express</title>
<script src="https://kit.fontawesome.com/f964f4d052.js" crossorigin="anonymous"></script>
<link rel="preconnect" href="https://fonts.gstatic.com">
Expand All @@ -23,8 +24,8 @@
<header>
<nav>
<div id="icons">
<a href="indexAdmin.php?action=deconnexion"><i class="fas fa-times"></i></a>
<a href="indexAdmin.php?action=tableauDeBordUser"><i class="fas fa-arrow-left"></i></a>
<a href="indexAdmin.php?action=deconnexion" aria-label="deconnexion"><i class="fas fa-times"></i></a>
<a href="indexAdmin.php?action=tableauDeBordUser" aria-label="tableau de bord"><i class="fas fa-arrow-left"></i></a>
</div>
</nav>
</header>
Expand Down
6 changes: 3 additions & 3 deletions app/Views/front/accueil.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
<?php } ?>

</ul>
<h3>Bienvenue</h3>
<h2>Bienvenue</h2>

<p>Toutes nos pizzas et burger sont fait avec les meilleurs ingrédients, vente à emporter et livraison toute la
semaine de 11h à 14h et de 19h à 23h.</p>
<p>Commander au 02 97 27 12 **<p>

<h2> Offres spéciale</h2>
<h3> Offres spéciale</h3>
<section id="reductions">

<?php foreach($allReducs as $reducs){ ?>
Expand All @@ -36,7 +36,7 @@
</main>

<aside>
<h2>A la une</h2>
<h2>A la une</h3>

<?php foreach($allALaUne as $aLaUne){ ?>
<article class="article_show_on">
Expand Down
2 changes: 1 addition & 1 deletion app/Views/front/contact.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d10749.333714569675!2d-2.7725067327741333!3d47.65851869238424!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x48101e997277959f%3A0xaf89c0c724c958d3!2s2%20Place%20de%20la%20Lib%C3%A9ration%2C%2056000%20Vannes!5e0!3m2!1sfr!2sfr!4v1617021675983!5m2!1sfr!2sfr"
width="800" height="600" style="border:0;" allowfullscreen loading="lazy"></iframe>

<h3>nous laisser un message</h3>
<h2>nous laisser un message</h2>
<div class="form_contact">

<form action="index.php?action=contactMail" method="post" id="inscription">
Expand Down
12 changes: 6 additions & 6 deletions app/Views/front/templates/template.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<head>
<meta charset="utf-8">
<meta name="description" content="vente de pizzas & autres en livraison sur vannes">
<meta name="viewport" content="width=device-width, initia-scale=1.0">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title> Pizzas Express</title>
<script src="https://kit.fontawesome.com/f964f4d052.js" crossorigin="anonymous"></script>
<link rel="preconnect" href="https://fonts.gstatic.com">
Expand Down Expand Up @@ -51,12 +51,12 @@

<footer>
<div id="socials-links">
<h3>reseaux sociaux</h3>
<h2>reseaux sociaux</h2>
<div>
<a href="#"><i class="fab fa-discord"></i></a>
<a href="#"><i class="fab fa-twitter"></i></a>
<a href="#"><i class="fas fa-at"></i></a>
<a href="#"><i class="fab fa-github"></i></a>
<a href="#" aria-label="discord"><i class="fab fa-discord"></i></a>
<a href="#" aria-label="twitter"><i class="fab fa-twitter"></i></a>
<a href="#" aria-label="email"><i class="fas fa-at"></i></a>
<a href="#" aria-label="github"><i class="fab fa-github"></i></a>
</div>
</div>

Expand Down
3 changes: 2 additions & 1 deletion serviceWorker.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ var urlsToCache = [
'/',
'/manifest.json',
'/index.php',
'/indexAdmin.php',
'/app/Public/front/css/style.css',
'/app/Public/back/img/aLaUne/bacon-burger.jpg',
'/app/Public/back/img/aLaUne/pizza-mediteraneenne.jpg',
Expand All @@ -18,7 +19,7 @@ var urlsToCache = [
'/app/Views/front/burger.php',
'/app/Controllers/front/FrontController.php'


];

self.addEventListener('install', function(event) {
Expand Down

0 comments on commit 62fd90e

Please sign in to comment.