+
 }})
diff --git a/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig b/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig
index d7a929a..06743e5 100644
--- a/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig
+++ b/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig
@@ -37,8 +37,12 @@
+
diff --git a/src/Mine/SeekerBundle/Resources/public/css/style.homepage.css b/src/Mine/SeekerBundle/Resources/public/css/style.homepage.css
index f5690e6..cfbddae 100644
--- a/src/Mine/SeekerBundle/Resources/public/css/style.homepage.css
+++ b/src/Mine/SeekerBundle/Resources/public/css/style.homepage.css
@@ -81,8 +81,8 @@ header section div > a {
text-decoration: none;
border: 1px solid #658fb8;
color: #FFFFFF;
- padding: 25px 100px;
- margin-top: 20px;
+ padding: 25px 150px;
+ margin-bottom: 20px;
-webkit-box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3);
box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3);
diff --git a/src/Mine/SeekerBundle/Resources/public/images/bg-mineseeker-outbg.jpg-bak b/src/Mine/SeekerBundle/Resources/public/images/bg-mineseeker-0-outbg.jpg
similarity index 100%
rename from src/Mine/SeekerBundle/Resources/public/images/bg-mineseeker-outbg.jpg-bak
rename to src/Mine/SeekerBundle/Resources/public/images/bg-mineseeker-0-outbg.jpg
diff --git a/src/Mine/SeekerBundle/Resources/public/images/bg-mineseeker-outbg.jpg b/src/Mine/SeekerBundle/Resources/public/images/bg-mineseeker-1-outbg.jpg
similarity index 100%
rename from src/Mine/SeekerBundle/Resources/public/images/bg-mineseeker-outbg.jpg
rename to src/Mine/SeekerBundle/Resources/public/images/bg-mineseeker-1-outbg.jpg
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 7bc98a4..fae6d9a 100644
--- a/src/Mine/SeekerBundle/Resources/public/js/mine-seeker/app.js
+++ b/src/Mine/SeekerBundle/Resources/public/js/mine-seeker/app.js
@@ -181,13 +181,13 @@ class MineSeeker extends React.Component {
});
}
- wInit(session, data, gridClient) {
+ wInit(session, gridServer, gridClient) {
this.setState({session: session});
/** save session to GridControl */
- /** render grid fields - #12 */
+ /** render grid fields - @see #12 */
this.refs.gridControl.setState({
- grid: this.state.gameInherited ? JSON.parse(Base64.decode(data))['grid'] : gridClient,
+ grid: this.state.gameInherited ? gridServer : gridClient,
channel: this.state.channel,
desc: {
buddy:
@@ -317,10 +317,8 @@ class MineSeeker extends React.Component {
/** Create Websocket w/ Bahnhof.js */
let websocket = WS.connect(
this.state.env === 'dev'
- // ? "ws://mine.dev:6450"
- // : "ws://www.mineseeker.ninja:6450"
? "ws://mine.dev:6450"
- : (this.state.ssl === 'true' ? "wss" : "ws") + "://system7.ddns.net:443/"
+ : (this.state.ssl === 'true' ? "wss" : "ws") + "://www.mineseeker.party:6450/"
);
/**
@@ -346,8 +344,23 @@ class MineSeeker extends React.Component {
(data) => {
this.state.env === 'dev' && console.info('RPC has been called');
- this.wInit(session, data, gridClient);
- this.subscribe(this.state.gameInherited && JSON.parse(Base64.decode(data))['users']);
+ let serverData = data[0] !== true
+ ? JSON.parse(Base64.decode(data))
+ : data;
+
+ /** Check the grid if the user is inherited @see #30 */
+ if ((this.state.gameInherited && null !== serverData.grid) || !this.state.gameInherited) {
+ this.wInit(session, serverData.grid, gridClient);
+ this.subscribe(this.state.gameInherited && serverData.users);
+ } else {
+ this.refs.gridControl.setState({
+ overlay: true,
+ overlayTitle: "This channel does not exists!",
+ overlaySubTitle:
Restart game!
+ });
+
+ console.error("This channel does not exists!");
+ }
},
(error, desc) => this.state.env === 'dev' && console.error(["RPC Error", error, desc])
);
diff --git a/src/Mine/SeekerBundle/Resources/views/Game/play.html.twig b/src/Mine/SeekerBundle/Resources/views/Game/play.html.twig
index 1598723..9836d0a 100644
--- a/src/Mine/SeekerBundle/Resources/views/Game/play.html.twig
+++ b/src/Mine/SeekerBundle/Resources/views/Game/play.html.twig
@@ -23,6 +23,12 @@
'@MineSeekerBundle/Resources/public/css/style.mineseeker.css' %}
{% endstylesheets %}
+
+
{% endblock %}
{% block javascripts %}
diff --git a/src/Mine/SeekerBundle/Rpc/MineseekerRpc.php b/src/Mine/SeekerBundle/Rpc/MineseekerRpc.php
index 9a3a50b..92df0a2 100644
--- a/src/Mine/SeekerBundle/Rpc/MineseekerRpc.php
+++ b/src/Mine/SeekerBundle/Rpc/MineseekerRpc.php
@@ -56,10 +56,13 @@ class MineseekerRpc implements RpcInterface
*/
public function connectGame(ConnectionInterface $connection, WampRequest $request, array $params)
{
+ $grid = $this->getGrid($params);
+ $users = null !== $grid ? $this->getUsers($params) : null;
+
return base64_encode(json_encode(
array(
- 'grid' => $this->getGrid($params),
- 'users' => $this->getUsers($params)
+ 'grid' => $grid,
+ 'users' => $users
)
));
}
@@ -77,14 +80,17 @@ class MineseekerRpc implements RpcInterface
$grid = $this->em
->getRepository('MineSeekerBundle:PlayedGame')
- ->findOneByGameAssoc($gameAssoc)
- ->getGrid();
+ ->findOneByGameAssoc($gameAssoc);
- foreach ($grid->getGridRow()->toArray() as $row) {
- $getsee[] = $row->getGridCol();
+ if (null !== $grid) {
+ foreach ($grid->getGrid()->getGridRow()->toArray() as $row) {
+ $getsee[] = $row->getGridCol();
+ }
+
+ return $getsee;
}
- return $getsee;
+ return null;
}
/**