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

add production mods

Browse Source
This commit is contained in:
Root
2016-11-21 13:45:28 +01:00
parent 5a3ce73e40
commit ed40ad02da
9 changed files with 53 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/Jotunheimr/AdminBundle/Resources/views/System/elfinder-summernote.html.twig
View File

@@ -5,27 +5,27 @@
<link rel="stylesheet" type="text/css"
href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.min.css">
{% if includeAssets %}
{% stylesheets filter='cssrewrite'
'@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/elfinder/build/css/elfinder.full.css'
'@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/elfinder/build/css/theme.css' %}
<link rel="stylesheet" media="screen" href="{{ asset_url }}" type="text/css"/>
{% endstylesheets %}
{% endif %}
{#{% if includeAssets %}#}
{#{% stylesheets filter='cssrewrite'#}
{#'@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/elfinder/'#}
{#'@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/elfinder/build/css/theme.css' %}#}
{#<link rel="stylesheet" media="screen" href="{{ asset_url }}" type="text/css"/>#}
{#{% endstylesheets %}#}
{#{% endif %}#}
</head>
<body>
{% if includeAssets %}
<!-- jQuery and jQuery UI (REQUIRED) -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>
{#{% if includeAssets %}#}
{#<!-- jQuery and jQuery UI (REQUIRED) -->#}
{#<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>#}
{#<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"></script>#}
{% javascripts
'@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/elfinder/build/js/elfinder.min.js'
'@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/elfinder/build/js/i18n/elfinder.hu.js'%}
<script type="text/javascript" src="{{ asset_url }}"></script>
{% endjavascripts %}
{% endif %}
{#{% javascripts#}
{#'@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/elfinder/build/js/elfinder.min.js'#}
{#'@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/elfinder/build/js/i18n/elfinder.hu.js'%}#}
{#<script type="text/javascript" src="{{ asset_url }}"></script>#}
{#{% endjavascripts %}#}
{#{% endif %}#}
<script type="text/javascript" charset="utf-8">
$(document).ready(function () {
var elf = $('.elfinder').elfinder({

13
src/Mine/SeekerBundle/Resources/public/js/mine-seeker/app.js
View File

@@ -10,6 +10,7 @@ class MineSeeker extends React.Component {
var channel = "mineseeker/channel/" + gameAssoc;
this.state = {
env: props.env,
gameInherited: props.gameId !== '',
gameAssoc: gameAssoc,
channel: channel,
@@ -51,8 +52,8 @@ class MineSeeker extends React.Component {
/** THE END */
makeGameEndIfItEnds(bluePoints, redPoints, resign = false) {
var redWins = redPoints > 2,
blueWins = bluePoints > 2;
var redWins = redPoints > 25,
blueWins = bluePoints > 25;
if (redWins || blueWins || resign) {
this.refs.gridControl.state.sound.won.play();
@@ -121,7 +122,11 @@ class MineSeeker extends React.Component {
/** after rendering */
componentDidMount() {
/** Create Websocket w/ Bahnhof.js */
var websocket = WS.connect("ws://mine.dev:6450");
var websocket = WS.connect(
this.state.env === 'dev'
? "ws://mine.dev:6450"
: "ws://www.mineseeker.ninja:6450"
);
/**
* Connect
@@ -250,7 +255,7 @@ class MineSeeker extends React.Component {
this.refs.gridControl.setState({
overlay: true,
overlayTitle: "The connection has been lost...",
overlayTitle: "The connection has been lost w/ your friend...",
overlaySubTitle: "Please, restart the game!"
});
}

12
src/Mine/SeekerBundle/Resources/views/Game/play.html.twig
View File

@@ -10,7 +10,7 @@
{% endblock %}
{% block stylesheets %}
{% stylesheets filter='cssrewrite'
{% stylesheets filter='?uglifycss'
'@MineSeekerBundle/Resources/public/css/style.mineseeker.css' %}
<link rel="stylesheet" media="screen" href="{{ asset_url }}" type="text/css"/>
{% endstylesheets %}
@@ -20,8 +20,10 @@
{{ parent() }}
{{ ws_client() }}
<script type="text/javascript" src="{{ asset('node/howler/dist/howler.min.js') }}"></script>
<script type="text/javascript" src="{{ asset('node/clipboard/dist/clipboard.min.js') }}"></script>
<script type="text/javascript" src="{{ asset('node/js-base64/base64.min.js') }}"></script>
<script type="text/javascript" src="{{ asset('js/index.js') }}"></script>
{% javascripts filter='?uglifyjs2'
'@MineSeekerBundle/Resources/public/js/node/howler/dist/howler.min.js'
'@MineSeekerBundle/Resources/public/js/node/js-base64/base64.min.js'
'@MineSeekerBundle/Resources/public/js/index.js'%}
<script type="text/javascript" src="{{ asset_url }}"></script>
{% endjavascripts %}
{% endblock %}