Private
Public Access
1
0

centralize jquery && bugfix mysql auto-termination problem w/ user auth

This commit is contained in:
2016-12-18 19:51:41 +01:00
parent bcc9671895
commit 1e2a231c6c
13 changed files with 90 additions and 43 deletions

View File

@@ -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"

View File

@@ -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:

View File

@@ -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/"
);
/**

View File

@@ -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>

View File

@@ -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'

View File

@@ -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 %}