Merge pull request #161 from thecodingmachine/landing-nip

Add google analytics tag

back/src/Controller/IoSocketController.ts

@@ -103,9 +103,9 @@ export class IoSocketController {
 
             // Let's log server load when a user joins
             let srvSockets = this.Io.sockets.sockets;
-            console.log('A user joined (', Object.keys(srvSockets).length, ' connected users)');
+            console.log(new Date().toISOString() + ' A user joined (', Object.keys(srvSockets).length, ' connected users)');
-            si.currentLoad().then(data => console.log('Current load: ', data.avgload));
+            si.currentLoad().then(data => console.log('  Current load: ', data.avgload));
-            si.currentLoad().then(data => console.log('CPU: ', data.currentload, '%'));
+            si.currentLoad().then(data => console.log('  CPU: ', data.currentload, '%'));
             // End log server load
 
             /*join-rom event permit to join one room.

front/dist/index.html

@@ -5,6 +5,35 @@
         <meta name="viewport"
               content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
         <meta http-equiv="X-UA-Compatible" content="ie=edge">
+
+        <!-- Global site tag (gtag.js) - Google Analytics -->
+        <script async src="https://www.googletagmanager.com/gtag/js?id=UA-10196481-11"></script>
+        <script>
+            window.dataLayer = window.dataLayer || [];
+            function gtag(){dataLayer.push(arguments);}
+            gtag('js', new Date());
+
+            gtag('config', 'UA-10196481-11');
+        </script>
+        <link rel="apple-touch-icon" sizes="57x57" href="static/images/favicons/apple-icon-57x57.png">
+        <link rel="apple-touch-icon" sizes="60x60" href="static/images/favicons/apple-icon-60x60.png">
+        <link rel="apple-touch-icon" sizes="72x72" href="static/images/favicons/apple-icon-72x72.png">
+        <link rel="apple-touch-icon" sizes="76x76" href="static/images/favicons/apple-icon-76x76.png">
+        <link rel="apple-touch-icon" sizes="114x114" href="static/images/favicons/apple-icon-114x114.png">
+        <link rel="apple-touch-icon" sizes="120x120" href="static/images/favicons/apple-icon-120x120.png">
+        <link rel="apple-touch-icon" sizes="144x144" href="static/images/favicons/apple-icon-144x144.png">
+        <link rel="apple-touch-icon" sizes="152x152" href="static/images/favicons/apple-icon-152x152.png">
+        <link rel="apple-touch-icon" sizes="180x180" href="static/images/favicons/apple-icon-180x180.png">
+        <link rel="icon" type="image/png" sizes="192x192"  href="static/images/favicons/android-icon-192x192.png">
+        <link rel="icon" type="image/png" sizes="32x32" href="static/images/favicons/favicon-32x32.png">
+        <link rel="icon" type="image/png" sizes="96x96" href="static/images/favicons/favicon-96x96.png">
+        <link rel="icon" type="image/png" sizes="16x16" href="static/images/favicons/favicon-16x16.png">
+        <link rel="manifest" href="static/images/favicons/manifest.json">
+        <meta name="msapplication-TileColor" content="#000000">
+        <meta name="msapplication-TileImage" content="static/images/favicons/ms-icon-144x144.png">
+        <meta name="theme-color" content="#000000">
+
+
         <base href="/">
         <link rel="stylesheet" href="/resources/style/style.css">
         <title>WorkAdventure</title>

front/dist/static/images/favicons/browserconfig.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>

front/dist/static/images/favicons/manifest.json

@@ -0,0 +1,41 @@
+{
+ "name": "App",
+ "icons": [
+  {
+   "src": "\/android-icon-36x36.png",
+   "sizes": "36x36",
+   "type": "image\/png",
+   "density": "0.75"
+  },
+  {
+   "src": "\/android-icon-48x48.png",
+   "sizes": "48x48",
+   "type": "image\/png",
+   "density": "1.0"
+  },
+  {
+   "src": "\/android-icon-72x72.png",
+   "sizes": "72x72",
+   "type": "image\/png",
+   "density": "1.5"
+  },
+  {
+   "src": "\/android-icon-96x96.png",
+   "sizes": "96x96",
+   "type": "image\/png",
+   "density": "2.0"
+  },
+  {
+   "src": "\/android-icon-144x144.png",
+   "sizes": "144x144",
+   "type": "image\/png",
+   "density": "3.0"
+  },
+  {
+   "src": "\/android-icon-192x192.png",
+   "sizes": "192x192",
+   "type": "image\/png",
+   "density": "4.0"
+  }
+ ]
+}

website/dist/choose-map.html

@@ -2,6 +2,32 @@
 <html class="no-js" lang="">
 
 <head>
+	<!-- Global site tag (gtag.js) - Google Analytics -->
+	<script async src="https://www.googletagmanager.com/gtag/js?id=UA-10196481-11"></script>
+	<script>
+	  window.dataLayer = window.dataLayer || [];
+	  function gtag(){dataLayer.push(arguments);}
+	  gtag('js', new Date());
+
+	  gtag('config', 'UA-10196481-11');
+	</script>
+    <link rel="apple-touch-icon" sizes="57x57" href="static/images/favicons/apple-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="static/images/favicons/apple-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="static/images/favicons/apple-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="static/images/favicons/apple-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="static/images/favicons/apple-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="static/images/favicons/apple-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="static/images/favicons/apple-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="static/images/favicons/apple-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="static/images/favicons/apple-icon-180x180.png">
+    <link rel="icon" type="image/png" sizes="192x192"  href="static/images/favicons/android-icon-192x192.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="static/images/favicons/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="static/images/favicons/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="static/images/favicons/favicon-16x16.png">
+    <link rel="manifest" href="static/images/favicons/manifest.json">
+    <meta name="msapplication-TileColor" content="#000000">
+    <meta name="msapplication-TileImage" content="static/images/favicons/ms-icon-144x144.png">
+    <meta name="theme-color" content="#000000">
     <meta charset="utf-8">
     <title>Choose map - WorkAdventu.re</title>
 

website/dist/index.html

@@ -2,6 +2,32 @@
 <html class="no-js" lang="">
 
 <head>
+	<!-- Global site tag (gtag.js) - Google Analytics -->
+	<script async src="https://www.googletagmanager.com/gtag/js?id=UA-10196481-11"></script>
+	<script>
+	  window.dataLayer = window.dataLayer || [];
+	  function gtag(){dataLayer.push(arguments);}
+	  gtag('js', new Date());
+
+	  gtag('config', 'UA-10196481-11');
+	</script>
+    <link rel="apple-touch-icon" sizes="57x57" href="static/images/favicons/apple-icon-57x57.png">
+    <link rel="apple-touch-icon" sizes="60x60" href="static/images/favicons/apple-icon-60x60.png">
+    <link rel="apple-touch-icon" sizes="72x72" href="static/images/favicons/apple-icon-72x72.png">
+    <link rel="apple-touch-icon" sizes="76x76" href="static/images/favicons/apple-icon-76x76.png">
+    <link rel="apple-touch-icon" sizes="114x114" href="static/images/favicons/apple-icon-114x114.png">
+    <link rel="apple-touch-icon" sizes="120x120" href="static/images/favicons/apple-icon-120x120.png">
+    <link rel="apple-touch-icon" sizes="144x144" href="static/images/favicons/apple-icon-144x144.png">
+    <link rel="apple-touch-icon" sizes="152x152" href="static/images/favicons/apple-icon-152x152.png">
+    <link rel="apple-touch-icon" sizes="180x180" href="static/images/favicons/apple-icon-180x180.png">
+    <link rel="icon" type="image/png" sizes="192x192"  href="static/images/favicons/android-icon-192x192.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="static/images/favicons/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="96x96" href="static/images/favicons/favicon-96x96.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="static/images/favicons/favicon-16x16.png">
+    <link rel="manifest" href="static/images/favicons/manifest.json">
+    <meta name="msapplication-TileColor" content="#000000">
+    <meta name="msapplication-TileImage" content="static/images/favicons/ms-icon-144x144.png">
+    <meta name="theme-color" content="#000000">
     <title>WorkAdventu.re</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0" />
@@ -37,14 +63,14 @@
         <div class="container-lg section">
             <div class="over-image">
                 <div class="row">
-                    <div class="col-6 col-md-6 my-3 my-md-0">
+                    <div class="col-10 col-md-6">
                         <div class="logo">
                             <img src="static/images/logo.png">
                         </div>
                     </div>
-                    <div class="col-6 col-md-6 my-3 my-md-0">
+                    <div class="col-2 col-md-6">
                         <div class="social-links">
-                            Share your experience
+                            <span class="share-title">Share your experience</span>
                             <a href="https://www.facebook.com/sharer/sharer.php?u=https://workadventu.re/" target="_BLANK">
                                 <img class="social-image" src="static/images/facebook.png" />
                             </a>
@@ -61,7 +87,7 @@
                     <h1>Your workplace<br/>but better</h1>
                     <h3>You are impatient to discover this new world? Click on "Play online" and meet new people or share this adventure with your colleagues and friends by clicking on "Private mode"</h3>
                 </div>
-                <div class="row justify-content-md-center pt-5" style="margin-top: 65px;">
+                <div class="row justify-content-md-center pt-5">
                     <div class="col col-lg-3">
                         <a class="custom-link play" target="_BLANK" onclick="startGame()" title="PLAY ONLINE">
                             PLAY ONLINE
@@ -83,6 +109,11 @@
         </div>
     </header>
     <div class="section bg-white how-to">
+        <div class="desktop-only text-center d-block d-md-none d-lg-none d-xl-none">
+            <img src="static/images/desktop.png" width="64" /><br />
+            Well, it's not mobile friendly yet. Try with your desktop computer.
+        </div>
+
         <div class="container-fluid container-lg">
             <div class="row justify-content-md-center">
                 <div class="col-12 col-md-12 text-center">
@@ -171,10 +202,10 @@
     <div class="bg-white footer">
         <div class="container-fluid container-lg">
             <div class="row">
-                <div class="col-6 col-md-6 my-3 my-md-0">
+                <div class="col-12 col-md-6  my-3 my-md-0">
                     <a href="https://www.thecodingmachine.com/" target="_blank"><img src="static/images/Logo TCM.png"></a>
                 </div>
-                <div class="col-6 col-md-6 my-3 my-md-0 floppy">
+                <div class="col-12 col-md-6 my-3 my-md-0 floppy">
                     <img src="static/images/floppy.png" />
                     <div>Soon available on floppy !<br/><span>otherwise, available on <a href="https://github.com/thecodingmachine/workadventure" target="_BLANK">GitHub</a></span></div>
                 </div>

website/dist/static/images/favicons/browserconfig.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>

website/dist/static/images/favicons/manifest.json

@@ -0,0 +1,41 @@
+{
+ "name": "App",
+ "icons": [
+  {
+   "src": "\/android-icon-36x36.png",
+   "sizes": "36x36",
+   "type": "image\/png",
+   "density": "0.75"
+  },
+  {
+   "src": "\/android-icon-48x48.png",
+   "sizes": "48x48",
+   "type": "image\/png",
+   "density": "1.0"
+  },
+  {
+   "src": "\/android-icon-72x72.png",
+   "sizes": "72x72",
+   "type": "image\/png",
+   "density": "1.5"
+  },
+  {
+   "src": "\/android-icon-96x96.png",
+   "sizes": "96x96",
+   "type": "image\/png",
+   "density": "2.0"
+  },
+  {
+   "src": "\/android-icon-144x144.png",
+   "sizes": "144x144",
+   "type": "image\/png",
+   "density": "3.0"
+  },
+  {
+   "src": "\/android-icon-192x192.png",
+   "sizes": "192x192",
+   "type": "image\/png",
+   "density": "4.0"
+  }
+ ]
+}

website/src/sass/styles.scss

@@ -38,23 +38,52 @@ header {
         left: 0;
         right: 0;
         height: 33rem;
+        width: calc(100% - 15px);
         .logo{
             margin: 1rem 0;
+            @include media-breakpoint-down(sm) {
+                padding-left: 1rem;
+            }
         }
         .social-links {
             text-align: right;
-            padding-top: 36px;
+            padding-top: 2.25rem;
             a {
-                margin-left: 20px;
+                margin-left: 1.25rem;
+            }
+        }
+        @include media-breakpoint-down(sm) {
+            .social-links {
+                padding-top: 0.5rem;
+                padding-right: 0.5rem;
+                .share-title {
+                    display: none;
+                }
+                a {
+                    display: block;
+                    margin-left: 0rem;
+                    margin-top: 1rem;
+                }
             }
         }
         .title {
+            z-index: 3;
+            position: relative;
             padding: 5rem 0;
             color: black;
             h1 {
                 font-family: 'Karmatic Arcade';
-                font-size: 44px;
+                font-size: 2.75rem;
-                margin-bottom: 20px;
+                margin-bottom: 1.25rem;
+            }
+            h3 {
+                min-height: 200px;
+                padding: 1rem;
+            }
+            @include media-breakpoint-down(xs) {
+                h3 {
+                    font-size: 1rem;
+                }
             }
         }
     }
@@ -97,7 +126,7 @@ header {
 }
 .custom-link{
     font-family: "VCR OSD Mono";
-    font-size: 18px;
+    font-size: 1.125rem;
     letter-spacing: 5px;
     color: white;
     display: block;
@@ -110,12 +139,15 @@ header {
     position: absolute;
     left: 0;
     right: 0;
-    bottom: -24px;
+    bottom: 7px;
-    padding: 20px;
+    padding: 1.125rem;
     text-align: center;
     z-index: 2;
     transition: all .1s cubic-bezier(0.000, -0.600, 1.000, 1.650); /* custom */
     //transition-timing-function: cubic-bezier(0.000, -0.600, 1.000, 1.650); /* custom */
+    @include media-breakpoint-down(sm) {
+        display: none;
+    }
     &:hover {
         color: white;
         transform: translateY(-6px);
@@ -179,20 +211,21 @@ img{
 .section{
     padding-top: 2rem;
     padding-bottom: 5rem;
-
     &.used-by{
         img{
             padding: 0 1rem;
         }
     }
-
     &.how-to{
-        padding: 100px 0;
+        padding: 6.25rem 0;
         background: url('../images/bg-briques.jpg') repeat-x bottom;
+        .desktop-only {
+            padding: 0 1.25rem 4rem;
+        }
         .image-item{
             height: 100%;
             margin: 0 auto;
-            padding: 20px;
+            padding: 1.25rem;
             /*transition: all .25s cubic-bezier(0.000, -0.600, 1.000, 1.650);
             &:hover {
                 transform: scale(1.1);
@@ -228,10 +261,15 @@ img{
                 min-height: 6rem;
                 font-family: 'Karmatic Arcade';
                 font-size: 22px;
-                margin-bottom: 20px;
+                margin-bottom: 1.25rem;
             }
         }
     }
+    @include media-breakpoint-down(sm) {
+        &.how-to{
+            padding: 2rem 0;
+        }
+    }
 
     &.used-by{
         img{
@@ -242,8 +280,8 @@ img{
     &.quotes{
         h2{
             font-family: 'Karmatic Arcade';
-            font-size: 34px;
+            font-size: 1.75rem;
-            margin: 40px 0;
+            margin: 2.5rem 0;
         }
 
         .quote-item{
@@ -267,17 +305,25 @@ img{
         text-align: right;
         img {
             float: right;
-            margin-left: 20px;
+            margin-left: 1.25rem;
         }
         div {
             float: right;
-            margin-left: 15px;
+            margin-left: 1rem;
-            font-size: 16px;
+            font-size: 1rem;
-            line-height: 16px;
+            line-height: 1rem;
-            padding-top: 10px;
+            padding-top: 0.625rem;
             span {
                 color: grey;
-                font-size: 13px;
+                font-size: 0.8125rem;
+            }
+        }
+    }
+    @include media-breakpoint-down(xs) {
+        .floppy {
+            text-align: center;
+            img, div {
+                float: none;
             }
         }
     }