Merge branch 'enolha' into sofiane

36da7cbc · Sofiane Lasri · 5f51ac94 · 45857241 · 36da7cbc · 36da7cbc
Commit 36da7cbc authored 2 years ago by Sofiane Lasri
--- a/index.php
+++ b/index.php
-<!DOCTYPE html>
-<html lang="fr">
-    <head>
-        <meta charset="utf-8">
-        <title> Cristo </title>
-    </head>
-    <body> 
-    <header>
-        <nav>
-        
-        </nav>
-    </header>
-    <main>
-      
-    </main>
-    <footer>
-    © Cristo 2023 
-    </footer>
-</body>
-</html>
-
-
 <?php
 require_once('core/_inc.php');


--- a/pages/accueil.php
+++ b/pages/accueil.php
+
 <!DOCTYPE html>
 <html lang="fr">
    <head>
        <meta charset="utf-8">
        <title> Cristo </title>
+        <link rel="stylesheet" href="styles/font-awesome/css/font-awesome.min.css">
    </head>
    <body> 
    <header>
        <nav>
-        
+            <?php
+       ?>
        </nav>
    </header>
    <main>
      
    </main>
-    <footer>
-    © Cristo 2023 
-    </footer>
+    <?php
+    ?>
 </body>
 </html>


--- a/pages/footer.php
+++ b/pages/footer.php
 <script type="text/javascript" src="js/app.js"></script>
 <script type="text/javascript" src="js/voice.js"></script>
 <script src="https://kit.fontawesome.com/731cc9a451.js" crossorigin="anonymous"></script>
+<footer>
+    © Cristo 2023 
+    </footer>
\ No newline at end of file
--- a/pages/index.php
+++ b/pages/index.php
+<?php
+require_once('core/_inc.php');
+
+//Not currently used
+/* require_once('config/bddConnect.php'); */
+
+require_once('pages/header.php');
+require_once('pages/navbar.php');
+require_once('pages/voice.php');
+
+if(!empty($_GET['page'])){
+    switch ($_GET["page"]) {
+        case 'accueil':
+            require_once('pages/accueil.php');
+            break;
+        case 'rechercher':
+            require_once('pages/rechercher.php');
+            break;
+        case 'recette':
+            require_once('pages/recette.php');
+            break;
+        default:
+            require_once('pages/404.php');
+            break;
+    }
+} else {
+    require_once('pages/accueil.php');
+}
+
+require_once('pages/footer.php');
+
+
+?>
--- a/pages/navbar.php
+++ b/pages/navbar.php
-<!DOCTYPE html>
-<html lang="fr">
-    <head>
-        <meta charset="utf-8">
-        <title> Cristo </title>
-    </head>
-    <body> 
-    <header>
+
    <nav class="topnav">
         <div>
             <a class="active" href="#Acceuil">Acceuil</a>
@@ -16,7 +9,7 @@
        <!-- barre de recherche -->
        <div class="search-container">
            <form action="/action_page.php">
-                <input type="text" placeholder="Rechercher.." name="search">
+                <input type="text" placeholder="Chercher quelque chose" name="search">
                <button type="submit"><i class="fa fa-search"></i></button>
            </form>
        </div>
@@ -25,6 +18,3 @@
            <a href="#inscription">Inscription</a>
        </div>
    </nav>
\ No newline at end of file
-</body>
-</html>
-
--- a/styles/font-awesome/HELP-US-OUT.txt
+++ b/styles/font-awesome/HELP-US-OUT.txt
+I hope you love Font Awesome. If you've found it useful, please do me a favor and check out my latest project,
+Fort Awesome (https://fortawesome.com). It makes it easy to put the perfect icons on your website. Choose from our awesome,
+comprehensive icon sets or copy and paste your own.
+
+Please. Check it out.
+
+-Dave Gandy
--- a/styles/font-awesome/css/font-awesome.css
+++ b/styles/font-awesome/css/font-awesome.css
--- a/styles/font-awesome/css/font-awesome.min.css
+++ b/styles/font-awesome/css/font-awesome.min.css
--- a/styles/font-awesome/fonts/FontAwesome.otf
+++ b/styles/font-awesome/fonts/FontAwesome.otf
--- a/styles/font-awesome/fonts/fontawesome-webfont.eot
+++ b/styles/font-awesome/fonts/fontawesome-webfont.eot
--- a/styles/font-awesome/fonts/fontawesome-webfont.svg
+++ b/styles/font-awesome/fonts/fontawesome-webfont.svg
--- a/styles/font-awesome/fonts/fontawesome-webfont.ttf
+++ b/styles/font-awesome/fonts/fontawesome-webfont.ttf
--- a/styles/font-awesome/fonts/fontawesome-webfont.woff
+++ b/styles/font-awesome/fonts/fontawesome-webfont.woff
--- a/styles/font-awesome/fonts/fontawesome-webfont.woff2
+++ b/styles/font-awesome/fonts/fontawesome-webfont.woff2
--- a/styles/font-awesome/less/animated.less
+++ b/styles/font-awesome/less/animated.less
+// Animated Icons
+// --------------------------
+
+.@{fa-css-prefix}-spin {
+  -webkit-animation: fa-spin 2s infinite linear;
+          animation: fa-spin 2s infinite linear;
+}
+
+.@{fa-css-prefix}-pulse {
+  -webkit-animation: fa-spin 1s infinite steps(8);
+          animation: fa-spin 1s infinite steps(8);
+}
+
+@-webkit-keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+            transform: rotate(359deg);
+  }
+}
+
+@keyframes fa-spin {
+  0% {
+    -webkit-transform: rotate(0deg);
+            transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(359deg);
+            transform: rotate(359deg);
+  }
+}
--- a/styles/font-awesome/less/bordered-pulled.less
+++ b/styles/font-awesome/less/bordered-pulled.less
+// Bordered & Pulled
+// -------------------------
+
+.@{fa-css-prefix}-border {
+  padding: .2em .25em .15em;
+  border: solid .08em @fa-border-color;
+  border-radius: .1em;
+}
+
+.@{fa-css-prefix}-pull-left { float: left; }
+.@{fa-css-prefix}-pull-right { float: right; }
+
+.@{fa-css-prefix} {
+  &.@{fa-css-prefix}-pull-left { margin-right: .3em; }
+  &.@{fa-css-prefix}-pull-right { margin-left: .3em; }
+}
+
+/* Deprecated as of 4.4.0 */
+.pull-right { float: right; }
+.pull-left { float: left; }
+
+.@{fa-css-prefix} {
+  &.pull-left { margin-right: .3em; }
+  &.pull-right { margin-left: .3em; }
+}
--- a/styles/font-awesome/less/core.less
+++ b/styles/font-awesome/less/core.less
+// Base Class Definition
+// -------------------------
+
+.@{fa-css-prefix} {
+  display: inline-block;
+  font: normal normal normal @fa-font-size-base/@fa-line-height-base FontAwesome; // shortening font declaration
+  font-size: inherit; // can't have font-size inherit on line above, so need to override
+  text-rendering: auto; // optimizelegibility throws things off #1094
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+
+}
--- a/styles/font-awesome/less/fixed-width.less
+++ b/styles/font-awesome/less/fixed-width.less
+// Fixed Width Icons
+// -------------------------
+.@{fa-css-prefix}-fw {
+  width: (18em / 14);
+  text-align: center;
+}
--- a/styles/font-awesome/less/font-awesome.less
+++ b/styles/font-awesome/less/font-awesome.less
+/*!
+ *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ */
+
+@import "variables.less";
+@import "mixins.less";
+@import "path.less";
+@import "core.less";
+@import "larger.less";
+@import "fixed-width.less";
+@import "list.less";
+@import "bordered-pulled.less";
+@import "animated.less";
+@import "rotated-flipped.less";
+@import "stacked.less";
+@import "icons.less";
+@import "screen-reader.less";
--- a/styles/font-awesome/less/icons.less
+++ b/styles/font-awesome/less/icons.less