SplendidBear-Websites/MineSeeker
Private
Public Access
1
0
Fork 0
Code Pull Requests 1 Releases Activity

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

Browse Source
This commit is contained in:
Root
2016-12-18 19:51:41 +01:00
parent bcc9671895
commit 1e2a231c6c
13 changed files with 90 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mine/SeekerBundle/Resources/views/Game/index.html.twig
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>

4
src/Mine/SeekerBundle/Resources/views/Game/play.html.twig
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'