Domů Procházet Nápověda
Přihlásit se
DricomDragon
/
StaticWebsiteJovian
1
0
Rozštěpit 0
Soubory Úkoly 1 Pull Requesty 0 Wiki
Procházet zdrojové kódy

Merge branch 'dev' for releasing v0.2.7

DricomDragon před 5 roky
rodič
c2da489df7 e87cfd59dd
revize
88f1577e10
12 změnil soubory, kde provedl 58 přidání a 83 odebrání
Rozdělené zobrazení Ukázat statistiku rozdílových dat
  1. 3 3
      web/public/contact.php
  2. 4 4
      web/public/credit.php
  3. 18 43
      web/public/cv.php
  4. 0 0
      web/error404.php
  5. 1 1
      web/include/footer.php
  6. 10 10
      web/include/navbar.php
  7. 5 5
      web/public/index.php
  8. 5 5
      web/public/projets.php
  9. 3 3
      web/public/projets/pro_ascii_space.php
  10. 3 3
      web/public/projets/pro_pulsar.php
  11. 3 3
      web/public/projets/pro_quoridor.php
  12. 3 3
      web/public/projets/pro_static_site.php

+ 3 - 3
web/public/contact.php
Zobrazit soubor 

@@ -3,13 +3,13 @@
 
 
 <?php
 
     $title = "Contact";
 
-    include("../include/head.php");
 
+    include("include/head.php");
 
 ?>
 
 
 <body>
 
     <!-- Navbar -->
 
     <?php
 
-        include("../include/navbar.php")
 
+        include("include/navbar.php")
 
     ?>
 
 
     <!-- Content -->
 
@@ -34,7 +34,7 @@
 
 
     <!-- Footer -->
 
     <?php
 
-        include("../include/footer.php")
 
+        include("include/footer.php")
 
     ?>
 
 
     <!-- Scripts -->

+ 4 - 4
web/public/credit.php
Zobrazit soubor 

@@ -3,13 +3,13 @@
 
 
 <?php
 
     $title = "Credit";
 
-    include("../include/head.php");
 
+    include("include/head.php");
 
 ?>
 
 
 <body>
 
     <!-- Navbar -->
 
     <?php
 
-        include("../include/navbar.php")
 
+        include("include/navbar.php")
 
     ?>
 
 
     <!-- Content -->
 
@@ -52,13 +52,13 @@
 
 
     <!-- Footer -->
 
     <?php
 
-        include("../include/footer.php");
 
+        include("include/footer.php");
 
     ?>
 
 
     <!-- Scripts -->
 
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
 
             integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
 
             crossorigin="anonymous"></script>
 
-    <script src="../include/js/bootstrap.js"></script>
 
+    <script src="include/js/bootstrap.js"></script>
 
 </body>
 
 </html>

+ 18 - 43
web/public/cv.php
Zobrazit soubor 

@@ -3,13 +3,13 @@
 
 
 <?php
 
     $title = "CV";
 
-    include("../include/head.php");
 
+    include("include/head.php");
 
 ?>
 
 
 <body>
 
     <!-- Navbar -->
 
     <?php
 
-        include("../include/navbar.php")
 
+        include("include/navbar.php")
 
     ?>
 
 
     <!-- Content -->
 
@@ -26,10 +26,10 @@
 
                 <div class="col-lg-12 col-xl-6 lead"><strong>Étudiant</strong> alternant ingénieur généraliste à l'École Centrale</div>
 
                 <div class="col-lg-12 col-xl-6 lead"><strong>Apprenti</strong> dans l'équipe STB Integration à Viaccess-Orca</div>
 
                 <div class="col-lg-12 col-xl-6">
 
-                    <img src="../include/images/logoCN.png" class="mx-auto" alt="Logo Centrale Nantes">
 
+                    <img src="include/images/logoCN.png" class="mx-auto" alt="Logo Centrale Nantes">
 
                 </div>
 
                 <div class="col-lg-12 col-xl-6">
 
-                    <img src="../include/images/logoVO.png" class="mx-auto" style="height:100%" alt="Logo Viaccess Orca">
 
+                    <img src="include/images/logoVO.png" class="mx-auto" style="height:100%" alt="Logo Viaccess Orca">
 
                 </div>
 
             </div>
 
         </div>
 
@@ -84,7 +84,7 @@
 
             <div class="col-lg-12 col-xl-6">
 
                 <h4>Monde de l'entreprise</h4>
 
 
-                <!-- Viaccess -->
 
+                <!-- Viaccess France -->
 
                 <div class="row">
 
                     <div class="col-3">
 
                         déc. 2017 - aujourd'hui
 
@@ -100,17 +100,17 @@
 
                     </div>
 
                 </div>
 
 
-                <!-- LTI -->
 
+                <!-- Viaccess Finland -->
 
                 <div class="row">
 
                     <div class="col-3">
 
-                        étés 2016-17
 
+                        mai - août 2019
 
                     </div>
 
                     <div class="col-9">
 
-                        <b>LTI</b> : <span class="middle-info">La Technique Industrielle</span> – <span class="city">Bain de Bretagne</span>
 
+                        <b>Viaccess Orca Finland</b> – <span class="city">Tampere</span> – <em>Finlande</em>
 
                         <br/>
 
-                        job d'été en intérimaire
 
-                        <br/>
 
-                        assistant métallier
 
+						Développements expérimentaux sur une application Android
 
+						<br/>
 
+						Mise en place d'un serveur Jenkins d'intégration continue
 
                     </div>
 
                 </div>
 
 
@@ -124,39 +124,12 @@
 
                         <br/>
 
                         stage d'observation
 
                         <br/>
 
-                        start-up spécialisée en
 
-                        réalité augmentée sur supports
 
-                        mobiles (développement sur Unity)
 
-                    </div>
 
-                </div>
 
-
 
-                <!-- Le Cube -->
 
-                <div class="row">
 
-                    <div class="col-3">
 
-                        mai 2012
 
-                    </div>
 
-                    <div class="col-9">
 
-                        <b>Le Cube</b> – <span class="city">St Denis de Gastines</span>
 
-                        <br/>
 
-                        stage d'observation
 
-                        <br/>
 
-                        studio d'enregistrement de musique
 
+                        Start-up spécialisée en
 
+                        réalité augmentée sur
 
+                        smartphones et tablettes
 
                     </div>
 
                 </div>
 
 
-                <!-- AutoCast Industry -->
 
-                <div class="row">
 
-                    <div class="col-3">
 
-                        juin 2011
 
-                    </div>
 
-                    <div class="col-9">
 
-                        <b>AutoCast Industry</b> – <span class="city">Laval</span>
 
-                        <br/>
 
-                        stage d'observation
 
-                        <br/>
 
-                        fonderie de pièces automobiles
 
-                    </div>
 
-                </div>
 
             </div>
 
 
             <div class="col-lg-12 col-xl-6">
 
@@ -331,6 +304,8 @@
 
             <div class="col-md-12 col-lg-6 col-xl-4">
 
 
                 <h4>Voyages</h4>
 
+				Stage international : <em>Finlande</em>
 
+				<br/>
 
                 Touristiques : <em>Maroc, Angleterre, Italie, Espagne</em>
 
                 <br/>
 
                 Hébergé chez l'habitant : <em>Pays de Galles</em>
 
@@ -353,13 +328,13 @@
 
 
     <!-- Footer -->
 
     <?php
 
-        include("../include/footer.php")
 
+        include("include/footer.php")
 
     ?>
 
 
     <!-- Scripts -->
 
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
 
             integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
 
             crossorigin="anonymous"></script>
 
-    <script src="../include/js/bootstrap.js"></script>
 
+    <script src="include/js/bootstrap.js"></script>
 
 </body>
 
 </html>

web/public/error404.php → web/error404.php
Zobrazit soubor


+ 1 - 1
web/include/footer.php
Zobrazit soubor 

@@ -7,7 +7,7 @@
 
             Mise en ligne le
 
             <?php include("generated/date.txt"); ?>
 
             -
 
-            <a href="/public/credit.php">
 
+            <a href="/credit.php">
 
             Credits
 
             </a>
 
         </span>

+ 10 - 10
web/include/navbar.php
Zobrazit soubor 

@@ -1,6 +1,6 @@
 
 <!-- Navbar -->
 
 <nav class="navbar navbar-expand-md navbar-dark bg-success fixed-top">
 
-    <a class="navbar-brand" href="/public/index.php">Jovian Hersemeule</a>
 
+    <a class="navbar-brand" href="/index.php">Jovian Hersemeule</a>
 
     <img class="rounded-circle jovian-toggler" type="button" data-toggle="collapse" data-target="#joviaNav"
 
          aria-controls="joviaNav"
 
          aria-expanded="false" aria-label="Dérouler le menu" src="https://img.icons8.com/color/48/000000/menu-2.png"
 
@@ -8,49 +8,49 @@
 
     <div class="collapse navbar-collapse" id="joviaNav">
 
         <ul class="navbar-nav mr-auto">
 
             <li class="nav-item <?php if ($title == "Accueil") echo "active"; ?>">
 
-                <a class="nav-link" href="/public/index.php">
 
+                <a class="nav-link" href="/index.php">
 
                     <img src="https://img.icons8.com/color/48/000000/city.png" alt="|">
 
                     Accueil
 
                 </a>
 
             </li>
 
             <li class="nav-item <?php if ($title == "CV") echo "active"; ?>">
 
-                <a class="nav-link" href="/public/cv.php">
 
+                <a class="nav-link" href="/cv.php">
 
                     <img src="https://img.icons8.com/color/48/000000/parse-from-clipboard.png" alt="|">
 
                     CV
 
                 </a>
 
             </li>
 
             <li class="nav-item dropdown
 
             <?php if (substr($_SERVER["SCRIPT_NAME"], 1, 7) == "projets") echo "active"; ?>">
 
-                <a class="nav-link dropdown-toggle" href="/public/projets.php" id="dropdown01" data-toggle="dropdown"
 
+                <a class="nav-link dropdown-toggle" href="/projets.php" id="dropdown01" data-toggle="dropdown"
 
                    aria-haspopup="true" aria-expanded="false">
 
                     <img src="https://img.icons8.com/color/48/000000/code.png" alt="|">
 
                     Projets
 
                 </a>
 
                 <div class="dropdown-menu" aria-labelledby="dropdown01">
 
-                    <a class="dropdown-item <?php if ($title == "Projets") echo "active"; ?>" href="/public/projets.php">
 
+                    <a class="dropdown-item <?php if ($title == "Projets") echo "active"; ?>" href="/projets.php">
 
                         Liste des projets
 
                     </a>
 
                     <div class="dropdown-divider"></div>
 
                     <a class="dropdown-item <?php if ($title == "Site") echo "active"; ?>"
 
-                       href="/public/projets/pro_static_site.php">
 
+                       href="/projets/pro_static_site.php">
 
                         Jovian Website
 
                     </a>
 
                     <a class="dropdown-item <?php if ($title == "ASCII") echo "active"; ?>"
 
-                       href="/public/projets/pro_ascii_space.php">
 
+                       href="/projets/pro_ascii_space.php">
 
                         ASCII Space Destroyer
 
                     </a>
 
                     <a class="dropdown-item <?php if ($title == "Pulsar") echo "active"; ?>"
 
-                       href="/public/projets/pro_pulsar.php">
 
+                       href="/projets/pro_pulsar.php">
 
                         Pulsar
 
                     </a>
 
                     <a class="dropdown-item <?php if ($title == "Quoridor") echo "active"; ?>"
 
-                       href="/public/projets/pro_quoridor.php">
 
+                       href="/projets/pro_quoridor.php">
 
                         Quoridor
 
                     </a>
 
                 </div>
 
             </li>
 
             <li class="nav-item <?php if ($title == "Contact") echo "active"; ?>">
 
-                <a class="nav-link" href="/public/contact.php">
 
+                <a class="nav-link" href="/contact.php">
 
                     <img src="https://img.icons8.com/color/48/000000/secured-letter.png" alt="|">
 
                     Contact
 
                 </a>

+ 5 - 5
web/public/index.php
Zobrazit soubor 

@@ -3,13 +3,13 @@
 
 
 <?php
 
     $title = "Accueil";
 
-    include("../include/head.php");
 
+    include("include/head.php");
 
 ?>
 
 
 <body>
 
     <!-- Navbar -->
 
     <?php
 
-        include("../include/navbar.php")
 
+        include("include/navbar.php")
 
     ?>
 
 
     <!-- Content -->
 
@@ -22,7 +22,7 @@
 
             <p class="lead">Vous trouverez ici les principales informations me concernant : qui je suis, mon parcours, mon
 
                 expérience professionnelle et mes projets de programmation.<br>Bonne visite !</p>
 
         </div>
 
-        <img class="rounded img-fluid mx-auto d-block" src="../include/images/home_picture_v1.jpg" alt="Photo d'accueil"
 
+        <img class="rounded img-fluid mx-auto d-block" src="include/images/home_picture_v1.jpg" alt="Photo d'accueil"
 
              usemap="#homemap">
 
 
         <!-- Map image parts to site naviagtion -->
 
@@ -36,13 +36,13 @@
 
 
     <!-- Footer -->
 
     <?php
 
-        include("../include/footer.php")
 
+        include("include/footer.php")
 
     ?>
 
 
     <!-- Scripts -->
 
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
 
             integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
 
             crossorigin="anonymous"></script>
 
-    <script src="../include/js/bootstrap.js"></script>
 
+    <script src="include/js/bootstrap.js"></script>
 
 </body>
 
 </html>

+ 5 - 5
web/public/projets.php
Zobrazit soubor 

@@ -3,13 +3,13 @@
 
 
 <?php
 
     $title = "Projets";
 
-    include("../include/head.php");
 
+    include("include/head.php");
 
 ?>
 
 
 <body>
 
     <!-- Navbar -->
 
     <?php
 
-        include("../include/navbar.php")
 
+        include("include/navbar.php")
 
     ?>
 
 
     <!-- Main -->
 
@@ -104,7 +104,7 @@
 
         <!-- Projets présentables -->
 
         <div class="card-columns">
 
             <div class="card">
 
-                <img class="card-img-top" src="../include/images/project_icon_ASCII.png"
 
+                <img class="card-img-top" src="include/images/project_icon_ASCII.png"
 
                      alt="ASCII Space Destroyer image">
 
                 <div class="card-body">
 
                     <h4 class="card-title">
 
@@ -198,14 +198,14 @@
 
 
     <!-- Footer -->
 
     <?php
 
-        include("../include/footer.php")
 
+        include("include/footer.php")
 
     ?>
 
 
     <!-- Scripts -->
 
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
 
             integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
 
             crossorigin="anonymous"></script>
 
-    <script src="../include/js/bootstrap.js"></script>
 
+    <script src="include/js/bootstrap.js"></script>
 
 
 </body>
 
 </html>

+ 3 - 3
web/public/projets/pro_ascii_space.php
Zobrazit soubor 

@@ -3,13 +3,13 @@
 
 
 <?php
 
     $title = "ASCII";
 
-    include("../../include/head.php");
 
+    include("../include/head.php");
 
 ?>
 
 
 <body>
 
     <!-- Navbar -->
 
     <?php
 
-        include("../../include/navbar.php")
 
+        include("../include/navbar.php")
 
     ?>
 
 
     <!-- Main -->
 
@@ -492,7 +492,7 @@
 
 
     <!-- Footer -->
 
     <?php
 
-        include("../../include/footer.php")
 
+        include("../include/footer.php")
 
     ?>
 
 
     <!-- Scripts -->

+ 3 - 3
web/public/projets/pro_pulsar.php
Zobrazit soubor 

@@ -3,13 +3,13 @@
 
 
 <?php
 
     $title = "Pulsar";
 
-    include("../../include/head.php");
 
+    include("../include/head.php");
 
 ?>
 
 
 <body>
 
     <!-- Navbar -->
 
     <?php
 
-        include("../../include/navbar.php")
 
+        include("../include/navbar.php")
 
     ?>
 
 
     <!-- Main -->
 
@@ -64,7 +64,7 @@
 
 
     <!-- Footer -->
 
     <?php
 
-        include("../../include/footer.php")
 
+        include("../include/footer.php")
 
     ?>
 
 
     <!-- Scripts -->

+ 3 - 3
web/public/projets/pro_quoridor.php
Zobrazit soubor 

@@ -3,13 +3,13 @@
 
 
 <?php
 
     $title = "Quoridor";
 
-    include("../../include/head.php");
 
+    include("../include/head.php");
 
 ?>
 
 
 <body>
 
     <!-- Navbar -->
 
     <?php
 
-        include("../../include/navbar.php")
 
+        include("../include/navbar.php")
 
     ?>
 
 
     <!-- Main -->
 
@@ -65,7 +65,7 @@
 
 
     <!-- Footer -->
 
     <?php
 
-        include("../../include/footer.php")
 
+        include("../include/footer.php")
 
     ?>
 
 
     <!-- Scripts -->

+ 3 - 3
web/public/projets/pro_static_site.php
Zobrazit soubor 

@@ -3,13 +3,13 @@
 
 
 <?php
 
     $title = "Site";
 
-    include("../../include/head.php");
 
+    include("../include/head.php");
 
 ?>
 
 
 <body>
 
     <!-- Navbar -->
 
     <?php
 
-        include("../../include/navbar.php")
 
+        include("../include/navbar.php")
 
     ?>
 
 
     <!-- Main -->
 
@@ -245,7 +245,7 @@
 
 
     <!-- Footer -->
 
     <?php
 
-        include("../../include/footer.php")
 
+        include("../include/footer.php")
 
     ?>
 
 
     <!-- Scripts -->