Added more pages + usa vs urss event

2018-05-24 13:17:51 +02:00 · 2018-05-24 13:17:51 +02:00 · 7e5560d517
commit 7e5560d517
parent 6868e03faf
16 changed files with 216 additions and 33 deletions
--- a/assets/css/sidenav.css
+++ b/assets/css/sidenav.css
@ -8,13 +8,18 @@
    z-index: 1000;
    top: 0;
    left: 0;
-    overflow-x: hidden; /* Disable horizontal scroll */
-    padding-top: 80px;
+
    transition: 0.5s; /* 0.5 second transition effect to slide in the sidenav */
    text-align: left;
    background: linear-gradient(to right, #1c1c1c, transparent 90%);
 }

+
+#sidenav-scroll {
+    padding: 50px 0 50px 0;
+    width: 100%;
+}
+
 /* The navigation menu links */

 .sidenav a {
@ -28,7 +33,7 @@
    height: 30px;
 }

-.sidenav-icon {
+.sidenav-icon, .sidenav-image {
    left: 0;
    margin-right: 5px;
    -webkit-transform: translateY(5px);
@ -37,11 +42,20 @@
    width: 20px !important;
 }

+.sidenav-image {
+    margin: 0 5px 0 0;
+    padding: 0;
+}
+
 .sidenav a:hover {
    color: #1a5dad;
    margin-left: 20px;
 }

+.sidenav .separator {
+    height: 20px;
+}
+
 /* Style page content - use this if you want to push the page content to the right when you open the side navigation */

 #main {
--- a/assets/css/style.css
+++ b/assets/css/style.css
@ -186,8 +186,10 @@ Full-Width Styles
    pointer-events: none;
 }

-#header_top h4 {
-    color: white;
+#header_top a {
+    display: inline-flex;
+    pointer-events: auto;
+    height: 40px;
 }

 #header_wrap .inner {
@ -195,9 +197,9 @@ Full-Width Styles
 }

 #menu_title {
-    border-bottom: none;
+    color: white;
    line-height: 40px;
-    height: 40px;
+    border-bottom: none;
    margin: 5px;
 }

@ -264,7 +266,7 @@ Full-Width Styles
 }

 #main_content {
-    padding-top: 40px;
+    padding-top: 10px;
 }

 #footer_wrap {
@ -346,6 +348,42 @@ Full-Width Styles
    color: #a3a7b3;
 }

+#score_counter {
+    height: 100px;
+}
+
+#score_container {
+    width: 600px;
+    display: inline-flex;
+    vertical-align: middle;
+    align-items: center;
+    justify-content: center;
+    font-family: 'Russo One', sans-serif;
+    background-color: #1C1C1C;
+    border-radius: 10px;
+    box-shadow: 0 0 20px #1C1C1C;
+}
+
+#score_usa, #score_urss {
+    font-size: 50px;
+}
+
+#score_usa{
+    color: #1a5dad;
+}
+
+#score_urss{
+    color: #ee293d;
+}
+
+#score_separator{
+    font-size: 70px;
+}
+
+.score_logo {
+    width: 100px;
+}
+

 /*******************************************************************************
 Small Device Styles
@ -393,6 +431,17 @@ Small Device Styles
        width: 100%;
        overflow: scroll;
    }
+    #score_counter {
+         height: 50px;
+    }
+
+    #score_container {
+        width: 300px;
+    }
+
+    #score_usa, #score_urss {
+        font-size: 25px;
+    }
 }

@media screen and (max-width: 320px) {
--- a/assets/scripts/sidenavScript.js
+++ b/assets/scripts/sidenavScript.js
@ -10,6 +10,7 @@ var backButton = $("#back_button");

 function openNav() {
    sidenav.css("margin-left", "0");
+    sidenav.css("overflow", "auto");
    backButton.addClass("active_background");
    enableHamburger();
    menuOpen = true;
@ -22,6 +23,7 @@ function openNav() {
 */
 function closeNav() {
    sidenav.css("margin-left", "-270px");
+    sidenav.css("overflow", "hidden");
    backButton.removeClass("active_background");
    disableHamburger();
    menuOpen = false;
--- a/blouse.php
+++ b/blouse.php
@ -0,0 +1,10 @@
+<?php
+ob_start(); // Start reading html
+?>
+<h1>La Blouse</h1>
+<p>Blouse!</p>
+<p
+<?php
+$pageContent = ob_get_clean(); // Store html content in variable
+include("template.php"); // Display template with variable content
+?>
--- a/coms.php
+++ b/coms.php
@ -5,20 +5,20 @@ ob_start(); // Start reading html
 <p>Voici la liste de toutes les coms de la semaine d'accueil, avec les contacts des responsables.</p>
 <p>Tous les mails cités sur cette page se terminent par <strong>@etud.insa-toulouse.fr</strong></p>
 <?php
-$comTitle = "COM Anim";
+$comTitle = "COM Mise à Feu";
 $comDescription = "Ici pour mettre l'ambiance toute la semaine!";
 $comRespo = "Paul MERLE";
 $comRespoId = "p_merle";
 include("includes/coms/com_template.php");

-$comTitle = "COM Escape Game";
-$comDescription = "Une matinée sur le campus de jeux en exterieur et d'énigmes";
+$comTitle = "COM Ins'cape Game";
+$comDescription = "Des énigmes pour sortir du campus";
 $comRespo = "Manon TARRADE";
 $comRespoId = "mtarade";
 include("includes/coms/com_template.php");

-$comTitle = "COM Ville";
-$comDescription = "Une après midi en ville de jeux et énigmes";
+$comTitle = "COM ISS";
+$comDescription = "Pour découvrir la ville rose";
 $comRespo = "Baptiste LERAT";
 $comRespoId = "lerat";
 include("includes/coms/com_template.php");
@ -61,7 +61,7 @@ $comRespo = "Zoé PHILIPPON";
 $comRespoId = "philippo";
 include("includes/coms/com_template.php");

-$comTitle = "Spé Bar";
+$comTitle = "Space Bar";
 $comDescription = "La boisson !";
 $comRespo = "Louis GALZIN";
 $comRespoId = "galzin";
--- a/historique.json
+++ b/historique.json
@ -0,0 +1,26 @@
+{
+  "usa": [
+    {
+      "text": "whoa, des points!",
+      "points": 99,
+      "date": "19/07/2018"
+    },
+    {
+      "text": "whoa, encore des points!",
+      "points": 2,
+      "date": "19/07/2018"
+    }
+   ],
+  "urss":[
+    {
+      "text": "merde, mes points!",
+      "points": -99,
+      "date": "19/07/2018"
+    },
+    {
+      "text": "yes, des points!",
+      "points": 45,
+      "date": "19/07/2018"
+    }
+  ]
+}
--- a/includes/planning_events/fabcamp.html
+++ b/includes/planning_events/fabcamp.html
@ -1,2 +1,2 @@
 <h3>FabCamp</h3>
-<p>Text</p>
+<p>Grande nouveauté cette année ! Le Fabcamp qu’est-ce que c’est ? Ce sera ton premier TP de l’INSA, tu seras dans un groupe de 4 ou 5 PPAs, face à un problème. Concrètement, nous on avait fait un truc similaire après la semaine d’accueil, on s’est retrouvé avec deux cartons de 1m50 x 1m50, et deux jours plus tard, il fallait que ces cartons soient devenus un fauteuil. Je peux te dire qu’on a pondu des fauteuils dignes d’Ikea mais avec des noms bien moins compliqués que leur dernier modèle SÖDERHAMN. Autant te dire que la S.H.Aise elle a supporté une Baptista Bomb donc vraiment des produits robustes ! Faudra que vous fassiez au moins aussi bien cette année ! Si t’as jamais mis la main à la pâte, si t’as jamais bricolé, bah ce sera une première ! Et comme on dit, y’a un début à tout !</p>
--- a/includes/score_counter.php
+++ b/includes/score_counter.php
@ -0,0 +1,25 @@
+<?php
+
+function get_total_points($is_urss){
+    $json_source = file_get_contents('historique.json');
+    $json_data = json_decode($json_source, true);
+    $root = "usa";
+    if ($is_urss)
+        $root = "urss";
+    $points = 0;
+    foreach($json_data[$root] as $v){
+        $points += $v['points'];
+    }
+    return $points;
+}
+
+?>
+<div id="score_counter">
+    <div id="score_container">
+        <img class="score_logo" src="assets/images/usa.jpg">
+        <div id="score_usa"><?php echo get_total_points(false) ?></div>
+        <div id="score_separator">/</div>
+        <div id="score_urss"><?php echo get_total_points(true) ?></div>
+        <img class="score_logo" src="assets/images/urss.jpeg">
+    </div>
+</div>
--- a/includes/sidenav.html
+++ b/includes/sidenav.html
@ -1,10 +1,21 @@
 <div id="menuSidenav" class="sidenav">
-    <a href="index.php" id="index" class="page-link"><i class="fas fa-home sidenav-icon"></i> L'Accueil</a>
-    <a href="planning.php" id="planning" class="page-link"><i class="fas fa-calendar-alt sidenav-icon"></i> Le Planning</a>
-    <a href="prevs.php" id="prevs" class="page-link"><i class="fas fa-medkit sidenav-icon"></i> La Prévention</a>
-    <a href="parrainage.php" id="parrainage" class="page-link"><i class="fas fa-user-plus sidenav-icon"></i> Le Parrainage</a>
-    <a href="photos.php" id="photos" class="page-link"><i class="fas fa-camera sidenav-icon"></i> Les Photos</a>
-    <br>
-    <a href="coms.php" id="coms" class="page-link"><i class="fas fa-users sidenav-icon"></i> Les Coms</a>
-    <a href="infos.php" id="contact" class="page-link"><i class="fas fa-info sidenav-icon"></i> Les Infos</a>
+    <div id="sidenav-scroll">
+        <a href="index.php" id="index" class="page-link"><i class="fas fa-home sidenav-icon"></i> L'Accueil</a>
+        <a href="planning.php" id="planning" class="page-link"><i class="fas fa-calendar-alt sidenav-icon"></i> Le
+            Planning</a>
+        <a href="parrainage.php" id="parrainage" class="page-link"><i class="fas fa-user-plus sidenav-icon"></i> Le
+            Parrainage</a>
+        <a href="blouse.php" id="blouse" class="page-link"><i class="fas fa-tshirt sidenav-icon"></i> La Blouse</a>
+        <a href="photos.php" id="photos" class="page-link"><i class="fas fa-camera sidenav-icon"></i> Les Photos</a>
+        <div class="separator"></div>
+        <a href="usa.html" id="usa" class="page-link"><img src="assets/images/usa_logo.svg" class="sidenav-image"> La
+            Team USA</a>
+        <a href="urss.html" id="urss" class="page-link"><img src="assets/images/urss_logo.svg" class="sidenav-image"> La
+            Mère Patrie</a>
+        <a href="stats.php" id="stats" class="page-link"><i class="fas fa-list-ol sidenav-icon"></i> Les Stats</a>
+        <div class="separator"></div>
+        <a href="coms.php" id="coms" class="page-link"><i class="fas fa-users sidenav-icon"></i> Les Coms</a>
+        <a href="prevs.php" id="prevs" class="page-link"><i class="fas fa-medkit sidenav-icon"></i> La Prévention</a>
+        <a href="infos.php" id="contact" class="page-link"><i class="fas fa-info sidenav-icon"></i> Les Infos</a>
+    </div>
 </div>
--- a/includes/top_bar.html
+++ b/includes/top_bar.html
@ -5,6 +5,8 @@
        <div id="bar2-2"></div>
        <div id="bar3"></div>
    </div>
+    <a href="index.php">
    <img src="assets/images/logo-site-accueil.svg" id="menu_icon">
    <h5 id="menu_title">Toulouse 2018</h5>
+    </a>
 </div>
--- a/index.php
+++ b/index.php
@ -4,7 +4,7 @@
    <meta charset='utf-8'>
    <meta http-equiv="X-UA-Compatible" content="chrome=1">
    <meta name="viewport" content="width=device-width,maximum-scale=2">
-    <script defer src="https://use.fontawesome.com/releases/v5.0.7/js/all.js"></script>
+    <script defer src="https://use.fontawesome.com/releases/v5.0.13/js/all.js"></script>
    <link rel="stylesheet" type="text/css" media="screen" href="assets/css/style.css">
    <link rel="stylesheet" type="text/css" media="screen" href="assets/css/sidenav.css">
    <link rel="stylesheet" type="text/css" media="screen" href="assets/css/hamburger.css">
@ -12,6 +12,7 @@
    <script src="https://cdnjs.cloudflare.com/ajax/libs/hammer.js/2.0.8/hammer.js"></script>
    <link href="https://fonts.googleapis.com/css?family=Montserrat|Raleway" rel="stylesheet">
    <link rel="shortcut icon" href="favicon.ico">
+    <title>Semaine d'Accueil 2018</title>
 </head>
 <body id="main">
 <div id="back_button" onclick="closeNav()"></div>
@ -22,12 +23,6 @@ include("includes/sidenav.html");
 <div id="home_content_wrap" class="outer">
    <section id="home_content" class="inner">
        <h1>Semaine d'Accueil 2018</h1>
-        <p>Ce site regroupe les informations les plus importantes pour que ta semaine d'accueil se déroule dans les
-            meilleures conditions.</p>
-        <br>
-        <p>Le menu en haut à gauche te permet d'accéder aux différentes pages du site, comme le <a class="main_button" href="planning.php">Planning</a>,
-            les informations sur le <a class="main_button" href="parrainage.php">Parrainage</a>, ou encore les <a class="main_button" href="photos.php">Photos</a> de la semaine !</p>
-
    </section>
 </div>
 </body>
--- a/infos.php
+++ b/infos.php
@ -6,7 +6,7 @@ ob_start(); // Start reading html
 <p>Pour toute demande concernant ce site, merci de me contacter par <span class="fas fa-envelope"></span> Mail : vergnet
 </p>
 <p>Pour toute demande concernant la semaine d'accueil, merci de contacter le Prez par <span
-            class="fas fa-envelope"></span> Mail : aaaaa</p>
+            class="fas fa-envelope"></span> Mail : bquintan</p>
 <p>Pour toute demande concernant une activité/COM spécifique, allez sur la page des <a href="coms.php">COMs</a> pour
    contacter le responsable approprié.</p>

--- a/stats.php
+++ b/stats.php
@ -0,0 +1,25 @@
+<?php
+ob_start(); // Start reading html
+?>
+<h1>Stats</h1>
+<table id="stats_table">
+    <tr>
+        <th colspan="2">USA</th>
+        <th colspan="2">URSS</th>
+    </tr>
+    <tr>
+        <td>Log</td>
+        <td>Points</td>
+        <td>Log</td>
+        <td>Points</td>
+    </tr>
+    <tr>
+        <td class="horaires">9h30</td>
+    </tr>
+</table>
+
+
+<?php
+$pageContent = ob_get_clean(); // Store html content in variable
+include("template.php"); // Display template with variable content
+?>
--- a/template.php
+++ b/template.php
@ -4,13 +4,13 @@
    <meta charset='utf-8'>
    <meta http-equiv="X-UA-Compatible" content="chrome=1">
    <meta name="viewport" content="width=device-width,maximum-scale=2">
-    <script defer src="https://use.fontawesome.com/releases/v5.0.7/js/all.js"></script>
+    <script defer src="https://use.fontawesome.com/releases/v5.0.13/js/all.js"></script>
    <link rel="stylesheet" type="text/css" media="screen" href="assets/css/style.css">
    <link rel="stylesheet" type="text/css" media="screen" href="assets/css/sidenav.css">
    <link rel="stylesheet" type="text/css" media="screen" href="assets/css/hamburger.css">
    <script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/hammer.js/2.0.8/hammer.js"></script>
-    <link href="https://fonts.googleapis.com/css?family=Montserrat|Raleway" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Montserrat|Raleway|Russo+One" rel="stylesheet">
    <link rel="shortcut icon" href="favicon.ico">
    <?= $pageMeta // Additional metadata  ?>
 </head>
@ -28,6 +28,10 @@ include("includes/sidenav.html");
    </header>
 </div>

+<?php
+include("includes/score_counter.php");
+?>
+
 <div id="main_fading_top_edge"></div>
 <div id="main_content_wrap" class="outer">
    <section id="main_content" class="inner">
--- a/urss.html
+++ b/urss.html
@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body background="assets/images/Animated-Flag-USSR.gif">
+
+</body>
+</html>
--- a/usa.html
+++ b/usa.html
@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body background="assets/images/Animated-Flag-USA.gif">
+
+</body>
+</html>