Home Explore Help
Sign In
bachir
/
HeHe-Centiped
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'server' of https://g-u-i.me/gogs/bachir/hehe-rover into server

Bachir Soussi Chiadmi 7 years ago
parent
b4bffbcd11 3c721780a6
commit
0d7ce66053
6 changed files with 24 additions and 8 deletions
Split View Show Diff Stats
  1. 0 0
      www/public_html/css/dist/styles.min.css
  2. 5 1
      www/public_html/css/styles.css
  3. 2 2
      www/public_html/index.php
  4. 0 0
      www/public_html/js/dist/script.min.js
  5. 14 4
      www/public_html/js/script.js
  6. 3 1
      www/public_html/scss/styles.scss

File diff suppressed because it is too large
+ 0 - 0
www/public_html/css/dist/styles.min.css


+ 5 - 1
www/public_html/css/styles.css
View File 

@@ -85,6 +85,7 @@ html, body {
 
     background-color: #2781cc; }
 
 
 #teaser {
 
+  display: none;
 
   position: absolute;
 
   z-index: 50;
 
   top: 0;
 
@@ -115,5 +116,8 @@ html, body {
 
       text-align: center;
 
       font-family: monospace; }
 
 
-body.teasing #timelaps, body.teasing #mapin, body.teasing #mapout {
 
+body.teasing #teaser {
 
+  display: block; }
 
+
 
+body.teasing #timelaps, body.teasing #timeline, body.teasing #mapin, body.teasing #mapout {
 
   display: none; }

+ 2 - 2
www/public_html/index.php
View File 

@@ -14,7 +14,7 @@ header("Pragma: no-cache");
 
     <link href="bower_components/leaflet/dist/leaflet.css" rel="stylesheet" type="text/css" />
 
     <link rel="stylesheet" href="css/styles.css" media="screen" charset="utf-8">
 
   </head>
 
-  <body class="teasing">
 
+  <body>
 
     <div id="root">
 
       <header id="header">
 
         <h1>hehe, Exo Planete</h1>
 
@@ -50,7 +50,7 @@ header("Pragma: no-cache");
 
       <section id="teaser">
 
         <div class="layer"></div>
 
         <div class="popup">
 
-          <h1>Centiped</h1>
 
+          <h1>Centipede</h1>
 
         </div>
 
       </section>

File diff suppressed because it is too large
+ 0 - 0
www/public_html/js/dist/script.min.js


+ 14 - 4
www/public_html/js/script.js
View File 

@@ -22,14 +22,24 @@ $(document).ready(function() {
 
 
   function init(){
 
     console.log("Init");
 
-    tease();
 
-    // loadData();
 
-  };
 
 
-  function tease(){
 
+    // teasing
 
+    var now = Date.now();
 
+    var opening = new Date("2016-07-02T18:30");
 
+    // console.log(now);
 
+    // console.log(limit.getTime());
 
+    if( window.location.hostname == "centipede.hehe.org" && now < opening.getTime()){
 
+      $('body').addClass('teasing');
 
+      setTimeout(function(){
 
+        window.location.reload();
 
+      },1000*60);
 
+    }else{
 
+      loadData();
 
+    }
 
 
   };
 
 
+
 
   function loadData(){
 
     console.log('loadData');
 
     // $.getJSON('metadata/frame.json',function(data){

+ 3 - 1
www/public_html/scss/styles.scss
View File 

@@ -84,6 +84,7 @@ html, body{
 
 }
 
 
 #teaser{
 
+  display:none;
 
   position:absolute; z-index: 50;
 
   top:0; left:0; width:100%; height:100%;
 
   background-color: #000;
 
@@ -110,5 +111,6 @@ html, body{
 
 }
 
 
 body.teasing{
 
-  #timelaps, #mapin, #mapout{display: none;}
 
+  #teaser{display:block;}
 
+  #timelaps, #timeline, #mapin, #mapout{display: none;}
 
 }

Some files were not shown because too many files changed in this diff