From 1e2a231c6cbe033fd18af21f5f30bccd682ebc84 Mon Sep 17 00:00:00 2001
From: Lang <langlasz@gmail.com>
Date: Sun, 18 Dec 2016 19:51:41 +0100
Subject: [PATCH] centralize jquery && bugfix mysql auto-termination problem w/
 user auth

---
 app/Resources/views/base.html.twig            |  7 +++
 app/config/config_dev.yml                     |  1 +
 app/config/config_prod.yml                    |  1 +
 .../Resources/public/css/layout.css           |  1 +
 .../Resources/views/Social/facebook.html.twig | 20 ++-------
 .../Resources/views/layout.html.twig          | 27 +++++++++---
 .../SeekerBundle/Periodic/MinePeriodic.php    | 44 +++++++++++++++++++
 .../SeekerBundle/Resources/config/config.yml  |  4 +-
 .../Resources/config/services.yml             |  6 ++-
 .../Resources/public/js/mine-seeker/app.js    |  3 +-
 .../Resources/views/Game/index.html.twig      |  4 +-
 .../Resources/views/Game/play.html.twig       |  4 --
 .../Resources/views/layout.html.twig          | 11 -----
 13 files changed, 90 insertions(+), 43 deletions(-)
 create mode 100644 src/Mine/SeekerBundle/Periodic/MinePeriodic.php

diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
index 638d615..58b7652 100644
--- a/app/Resources/views/base.html.twig
+++ b/app/Resources/views/base.html.twig
@@ -36,6 +36,13 @@
 </footer>
 
 {% block javascripts %}
+    {% javascripts filter='?uglifyjs2'
+    '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/jQuery/jquery-3.0.0.min.js'
+    '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/jQuery/jquery-migrate-3.0.0.min.js'
+    '@JotunheimrAdminBundle/Resources/public/js/vendor/bootstrap/js/bootstrap.min.js' %}
+    <script type="text/javascript" src="{{ asset_url }}"></script>
+    {% endjavascripts %}
+
     {% include '@MineSeeker/Recent/facebook.html.twig' %}
 {% endblock %}
 </body>
diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
index 75632c8..2eed480 100644
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@@ -35,6 +35,7 @@ monolog:
 parameters:
     facebook.api: 320599508311862
     facebook.version: 'v2.8'
+    mineseeker.websocket: 6450
 
 # Facebook OAuth
 hwi_oauth:
diff --git a/app/config/config_prod.yml b/app/config/config_prod.yml
index 41ef8cf..9be8bae 100644
--- a/app/config/config_prod.yml
+++ b/app/config/config_prod.yml
@@ -26,6 +26,7 @@ monolog:
 parameters:
     facebook.api: 320597498312063
     facebook.version: 'v2.8'
+    mineseeker.websocket: 8080
 
 # Facebook OAuth
 hwi_oauth:
diff --git a/src/Jotunheimr/UserBundle/Resources/public/css/layout.css b/src/Jotunheimr/UserBundle/Resources/public/css/layout.css
index 03b5e65..e02c4c1 100644
--- a/src/Jotunheimr/UserBundle/Resources/public/css/layout.css
+++ b/src/Jotunheimr/UserBundle/Resources/public/css/layout.css
@@ -167,6 +167,7 @@ header section div.buttons > a.slack-login {
     margin-bottom: 10px;
 
     overflow: hidden;
+    cursor: pointer;
 
     -webkit-border-radius: 3px;
     border-radius: 3px;
diff --git a/src/Jotunheimr/UserBundle/Resources/views/Social/facebook.html.twig b/src/Jotunheimr/UserBundle/Resources/views/Social/facebook.html.twig
index 9171f3b..13ce100 100644
--- a/src/Jotunheimr/UserBundle/Resources/views/Social/facebook.html.twig
+++ b/src/Jotunheimr/UserBundle/Resources/views/Social/facebook.html.twig
@@ -1,17 +1,3 @@
-<script>
-    function fbLogin() {
-        FB.getLoginStatus(function (response) {
-            if (response.status === 'connected') {
-                document.location = "{{ url("hwi_oauth_service_redirect", {service: "facebook"}) }}";
-            } else {
-                FB.login(function (response) {
-                    if (response.authResponse) {
-                        document.location = "{{ url("hwi_oauth_service_redirect", {service: "facebook"}) }}";
-                    }
-                }, {scope: 'email'});
-            }
-        });
-    }
-</script>
-
-<a class="fb-login" href="#" onclick="fbLogin();"><i class="fa fa-facebook"></i><span>w/ Facebook</span></a>
+<a id="fbLogin" class="fb-login">
+    <i class="fa fa-facebook"></i><span>w/ Facebook</span>
+</a>
diff --git a/src/Jotunheimr/UserBundle/Resources/views/layout.html.twig b/src/Jotunheimr/UserBundle/Resources/views/layout.html.twig
index 4bf8159..2ea945d 100644
--- a/src/Jotunheimr/UserBundle/Resources/views/layout.html.twig
+++ b/src/Jotunheimr/UserBundle/Resources/views/layout.html.twig
@@ -33,18 +33,31 @@
 {% block javascripts %}
     {{ parent() }}
 
-    {% javascripts filter='?uglifyjs2'
-    '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/jQuery/jquery-3.0.0.min.js'
-    '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/jQuery/jquery-migrate-3.0.0.min.js'
-    '@JotunheimrAdminBundle/Resources/public/js/vendor/bootstrap/js/bootstrap.min.js' %}
-    <script type="text/javascript" src="{{ asset_url }}"></script>
-    {% endjavascripts %}
-
     <script src="https://cdnjs.cloudflare.com/ajax/libs/JQuery-Snowfall/1.7.4/snowfall.jquery.min.js"
             type="text/javascript"></script>
     <script type="text/javascript">
         $(function () {
             $(document).snowfall({deviceorientation: true, round: true, minSize: 5, maxSize: 8});
+
+            $('#fbLogin').length && $('#fbLogin').on('click', function () {
+                FB.login(function (response) {
+                    if (response.authResponse) {
+                        document.location = "{{ url("hwi_oauth_service_redirect", {service: "facebook"}) }}";
+                    }
+                }, {scope: 'email'});
+
+                {#FB.getLoginStatus(function (response) {#}
+                    {#if (response.status === 'connected') {#}
+                        {#document.location = "{{ url("hwi_oauth_service_redirect", {service: "facebook"}) }}";#}
+                    {#} else {#}
+                        {#FB.login(function (response) {#}
+                            {#if (response.authResponse) {#}
+                                {#document.location = "{{ url("hwi_oauth_service_redirect", {service: "facebook"}) }}";#}
+                            {#}#}
+                        {#}, {scope: 'email'});#}
+                    {#}#}
+                {#});#}
+            });
         });
     </script>
 {% endblock %}
diff --git a/src/Mine/SeekerBundle/Periodic/MinePeriodic.php b/src/Mine/SeekerBundle/Periodic/MinePeriodic.php
new file mode 100644
index 0000000..1f63b04
--- /dev/null
+++ b/src/Mine/SeekerBundle/Periodic/MinePeriodic.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace Mine\SeekerBundle\Periodic;
+
+use Doctrine\DBAL\Driver\PDOException;
+use Doctrine\ORM\EntityManager;
+use Gos\Bundle\WebSocketBundle\Periodic\PeriodicInterface;
+
+class MinePeriodic implements PeriodicInterface
+{
+    private $em;
+
+    public function __construct(EntityManager $entityManager)
+    {
+        $this->em = $entityManager;
+    }
+
+    /**
+     * This function is executed every 5 seconds.
+     *
+     * For more advanced functionality, try injecting a Topic Service to perform actions on your connections every x seconds.
+     */
+    public function tick()
+    {
+        try {
+            $connection = $this->em->getConnection();
+
+            if (false === $connection->ping()) {
+                $connection->close();
+                $connection->connect();
+            }
+        } catch(PDOException $ex) {
+            throw PDOException::class;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTimeout()
+    {
+        return 777;
+    }
+}
diff --git a/src/Mine/SeekerBundle/Resources/config/config.yml b/src/Mine/SeekerBundle/Resources/config/config.yml
index 8b16a89..e53132a 100644
--- a/src/Mine/SeekerBundle/Resources/config/config.yml
+++ b/src/Mine/SeekerBundle/Resources/config/config.yml
@@ -32,7 +32,7 @@ snc_redis:
 gos_web_socket:
     server:
         host: 0.0.0.0
-        port: 6450
+        port: "%mineseeker.websocket%"
         router:
             resources:
                 - "@MineSeekerBundle/Resources/config/pubsub/routing.yml"
@@ -42,3 +42,5 @@ gos_web_socket:
         storage:
             driver: "@gos_web_socket.client_storage.driver.predis"
             decorator: "@gos_web_socket.client_storage.doctrine.decorator"
+    periodic:
+        - "@mineseeker.periodic"
diff --git a/src/Mine/SeekerBundle/Resources/config/services.yml b/src/Mine/SeekerBundle/Resources/config/services.yml
index f1aaeb2..25057b7 100644
--- a/src/Mine/SeekerBundle/Resources/config/services.yml
+++ b/src/Mine/SeekerBundle/Resources/config/services.yml
@@ -1,5 +1,4 @@
 services:
-
     pdo:
         class: PDO
         arguments:
@@ -26,6 +25,11 @@ services:
         arguments:
             - "@doctrine_cache.providers.doctrine.orm.default_result_cache"
 
+    mineseeker.periodic:
+        class: Mine\SeekerBundle\Periodic\MinePeriodic
+        arguments:
+            doctrine: '@doctrine.orm.entity_manager'
+
     mineseeker.topic_sample_service:
         class: Mine\SeekerBundle\Topic\MineseekerTopic
         tags:
diff --git a/src/Mine/SeekerBundle/Resources/public/js/mine-seeker/app.js b/src/Mine/SeekerBundle/Resources/public/js/mine-seeker/app.js
index 8327cad..fefeb88 100644
--- a/src/Mine/SeekerBundle/Resources/public/js/mine-seeker/app.js
+++ b/src/Mine/SeekerBundle/Resources/public/js/mine-seeker/app.js
@@ -333,7 +333,8 @@ class MineSeeker extends React.Component {
         let websocket = WS.connect(
             this.state.env === 'dev'
                 ? "ws://mine.dev:6450"
-                : (this.state.ssl === 'true' ? "wss" : "ws") + "://" + window.location.hostname + ":6450/"
+                // : (this.state.ssl === 'true' ? "wss" : "ws") + "://" + window.location.hostname + ":6450/"
+                : (this.state.ssl === 'true' ? "wss" : "ws") + "://www.mineseeker.ninja:6450/"
         );
 
         /**
diff --git a/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig b/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig
index 2659956..a0738b5 100644
--- a/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig
+++ b/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig
@@ -8,7 +8,9 @@
         </div>
         <div>
             {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
-                <h2>Hello, {{ app.user.realName is not null ? app.user.realName : app.user.username }}!</h2>
+                <h2 id="fb-welcome">
+                    Hello, {{ app.user.realName is not null ? app.user.realName : app.user.username }}!
+                </h2>
                 <h1>Let's play!! :D</h1>
             {% else %}
                 <h2>A minesweeper game rethought...</h2>
diff --git a/src/Mine/SeekerBundle/Resources/views/Game/play.html.twig b/src/Mine/SeekerBundle/Resources/views/Game/play.html.twig
index 09d02a8..79e2ec6 100644
--- a/src/Mine/SeekerBundle/Resources/views/Game/play.html.twig
+++ b/src/Mine/SeekerBundle/Resources/views/Game/play.html.twig
@@ -42,8 +42,6 @@
 
     {% if env == 'dev' %}
         {% javascripts filter='?uglifyjs2'
-        '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/jQuery/jquery-3.0.0.min.js'
-        '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/jQuery/jquery-migrate-3.0.0.min.js'
         '@GosWebSocketBundle/Resources/public/js/vendor/autobahn.min.js'
         '@GosWebSocketBundle/Resources/public/js/gos_web_socket_client.js'
         '@MineSeekerBundle/Resources/public/js/node/howler/dist/howler.min.js'
@@ -53,8 +51,6 @@
         {% endjavascripts %}
     {% else %}
         {% javascripts filter='?uglifyjs2'
-        '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/jQuery/jquery-3.0.0.min.js'
-        '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/jQuery/jquery-migrate-3.0.0.min.js'
         '@GosWebSocketBundle/Resources/public/js/vendor/autobahn.min.js'
         '@GosWebSocketBundle/Resources/public/js/gos_web_socket_client.js'
         '@MineSeekerBundle/Resources/public/js/node/howler/dist/howler.min.js'
diff --git a/src/Mine/SeekerBundle/Resources/views/layout.html.twig b/src/Mine/SeekerBundle/Resources/views/layout.html.twig
index 2080de2..ad95847 100644
--- a/src/Mine/SeekerBundle/Resources/views/layout.html.twig
+++ b/src/Mine/SeekerBundle/Resources/views/layout.html.twig
@@ -1,12 +1 @@
 {% extends '::base.html.twig' %}
-
-{% block javascripts %}
-    {{ parent() }}
-
-    {% javascripts filter='?uglifyjs2'
-    '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/jQuery/jquery-3.0.0.min.js'
-    '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/jQuery/jquery-migrate-3.0.0.min.js'
-    '@JotunheimrAdminBundle/Resources/public/js/vendor/bootstrap/js/bootstrap.min.js' %}
-    <script type="text/javascript" src="{{ asset_url }}"></script>
-    {% endjavascripts %}
-{% endblock %}