diff --git a/app/config/config.yml b/app/config/config.yml index 324b0ed..04f94c5 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -41,7 +41,7 @@ twig: debug: "%kernel.debug%" strict_variables: "%kernel.debug%" globals: - version: "0.34.18 (beta6)" + version: "0.36.18 (beta6)" facebook_api: "%facebook.api%" facebook_scope: "%facebook.scope%" facebook_api_version: "%facebook.version%" diff --git a/src/Jotunheimr/UserBundle/Resources/public/css/layout.css b/src/Jotunheimr/UserBundle/Resources/public/css/layout.css index f05249b..819feb6 100644 --- a/src/Jotunheimr/UserBundle/Resources/public/css/layout.css +++ b/src/Jotunheimr/UserBundle/Resources/public/css/layout.css @@ -153,9 +153,23 @@ header section h3.or { } header section #id_welcome { + display: flex; + flex-direction: row; margin-bottom: 115px; } +header section #id_welcome > div { + padding-right: 20px; +} + +header section #id_welcome img { + width: 100px; + border: 5px solid #414040; + + -webkit-border-radius: 50%; + border-radius: 50%; +} + header section .buttons, header section form { z-index: 2; @@ -307,6 +321,12 @@ footer nav ul li a:hover { } @media screen and (max-width: 1100px) { + header section #id_welcome { + align-items: center; + justify-content: center; + margin-top: 50px; + } + header section .form-input, header section .form-check { margin-left: auto; @@ -325,9 +345,17 @@ footer nav ul li a:hover { header section div.buttons > a.slack-login { margin: 0 auto; } + + main div.txt { + padding: 0 20px; + } } @media screen and (max-width: 550px) { + header section #id_welcome { + display: block; + } + header section { padding: 20px; } diff --git a/src/Mine/SeekerBundle/Entity/Gamer.php~ b/src/Mine/SeekerBundle/Entity/Gamer.php~ index 19b587a..720249e 100644 --- a/src/Mine/SeekerBundle/Entity/Gamer.php~ +++ b/src/Mine/SeekerBundle/Entity/Gamer.php~ @@ -187,4 +187,28 @@ class Gamer { return $this->userAgent; } + + /** + * Set connTimestamp + * + * @param \DateTime $connTimestamp + * + * @return Gamer + */ + public function setConnTimestamp($connTimestamp) + { + $this->connTimestamp = $connTimestamp; + + return $this; + } + + /** + * Get connTimestamp + * + * @return \DateTime + */ + public function getConnTimestamp() + { + return $this->connTimestamp; + } } diff --git a/src/Mine/SeekerBundle/Entity/PlayedGame.php b/src/Mine/SeekerBundle/Entity/PlayedGame.php index 97193f7..0aac095 100644 --- a/src/Mine/SeekerBundle/Entity/PlayedGame.php +++ b/src/Mine/SeekerBundle/Entity/PlayedGame.php @@ -105,6 +105,20 @@ class PlayedGame */ private $resign; + /** + * @var \DateTime + * + * @ORM\Column(name="created", type="datetime", nullable=true) + */ + private $created; + + /** + * @var \DateTime + * + * @ORM\Column(name="updated", type="datetime", nullable=true) + */ + private $updated; + /** * @var Step * @@ -429,4 +443,52 @@ class PlayedGame { return $this->resign; } + + /** + * Set created + * + * @param \DateTime $created + * + * @return PlayedGame + */ + public function setCreated($created) + { + $this->created = $created; + + return $this; + } + + /** + * Get created + * + * @return \DateTime + */ + public function getCreated() + { + return $this->created; + } + + /** + * Set updated + * + * @param \DateTime $updated + * + * @return PlayedGame + */ + public function setUpdated($updated) + { + $this->updated = $updated; + + return $this; + } + + /** + * Get updated + * + * @return \DateTime + */ + public function getUpdated() + { + return $this->updated; + } } diff --git a/src/Mine/SeekerBundle/Entity/PlayedGame.php~ b/src/Mine/SeekerBundle/Entity/PlayedGame.php~ index 97193f7..0b9af4d 100644 --- a/src/Mine/SeekerBundle/Entity/PlayedGame.php~ +++ b/src/Mine/SeekerBundle/Entity/PlayedGame.php~ @@ -105,6 +105,20 @@ class PlayedGame */ private $resign; + /** + * @var \DateTime + * + * @ORM\Column(name="created", type="datetime", nullable=true) + */ + private $created; + + /** + * @var \DateTime + * + * @ORM\Column(name="updated", type="datetime", nullable=true) + */ + private $updated; + /** * @var Step * diff --git a/src/Mine/SeekerBundle/Entity/Step.php b/src/Mine/SeekerBundle/Entity/Step.php index 42c3914..4f82cf6 100644 --- a/src/Mine/SeekerBundle/Entity/Step.php +++ b/src/Mine/SeekerBundle/Entity/Step.php @@ -49,6 +49,13 @@ class Step */ private $playedGame; + /** + * @var \DateTime + * + * @ORM\Column(name="created", type="datetime", nullable=true) + */ + private $created; + /** * Get id @@ -155,4 +162,28 @@ class Step { return $this->wBomb; } + + /** + * Set created + * + * @param \DateTime $created + * + * @return Step + */ + public function setCreated($created) + { + $this->created = $created; + + return $this; + } + + /** + * Get created + * + * @return \DateTime + */ + public function getCreated() + { + return $this->created; + } } diff --git a/src/Mine/SeekerBundle/Entity/Step.php~ b/src/Mine/SeekerBundle/Entity/Step.php~ index 42c3914..cc14d85 100644 --- a/src/Mine/SeekerBundle/Entity/Step.php~ +++ b/src/Mine/SeekerBundle/Entity/Step.php~ @@ -49,6 +49,13 @@ class Step */ private $playedGame; + /** + * @var \DateTime + * + * @ORM\Column(name="created", type="datetime", nullable=true) + */ + private $created; + /** * Get id diff --git a/src/Mine/SeekerBundle/Resources/public/css/style.homepage.css b/src/Mine/SeekerBundle/Resources/public/css/style.homepage.css index 7789380..866e107 100644 --- a/src/Mine/SeekerBundle/Resources/public/css/style.homepage.css +++ b/src/Mine/SeekerBundle/Resources/public/css/style.homepage.css @@ -46,7 +46,7 @@ header section > img { position: absolute; width: 1300px; height: 1300px; - right: -10%; + right: -20%; top: -10%; z-index: 1; @@ -149,7 +149,6 @@ header section div.buttons > a.small:hover { } header section div.buttons > a { - padding: 25px 5px; margin: 0 auto 20px auto; } @@ -167,10 +166,10 @@ header section div.buttons > a.small:hover { } @media screen and (max-width: 500px) { - header { - min-height: 100%; - height: auto; - } + /*header {*/ + /*min-height: 100%;*/ + /*height: auto;*/ + /*}*/ header section { width: auto; @@ -182,5 +181,6 @@ header section div.buttons > a.small:hover { header section div.buttons > a { display: block; + padding: 25px 5px; } } diff --git a/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig b/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig index 942b91d..942c843 100644 --- a/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig +++ b/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig @@ -7,7 +7,8 @@ - + {% endblock %} {% block header %} @@ -19,15 +20,25 @@
-
+
{% if is_granted("IS_AUTHENTICATED_REMEMBERED") %} -

- Hello, {{ app.user.realName is not null ? app.user.realName : app.user.username }}! -

-

Let's play!! :D

+ {% if app.user.facebookId is not null %} +
+ Facebook profile +
+ {% endif %} +
+ + Hello, {{ app.user.realName is not null ? app.user.realName : app.user.username }}! + +

Let's play!! :D

+
{% else %} -

A minesweeper game rethought...

-

...and you can play w/o register!!

+
+

A minesweeper game rethought...

+

...and you can play w/o register!!

+
{% endif %}
@@ -54,11 +65,13 @@

Used technologies

- Used Websocket + Used Websocket Used React.js Used Symfony Used jQuery - Used Let's Encrypt + Used Let's Encrypt
{% endblock %} diff --git a/src/Mine/SeekerBundle/Rpc/MineseekerRpc.php b/src/Mine/SeekerBundle/Rpc/MineseekerRpc.php index 92df0a2..1ae0808 100644 --- a/src/Mine/SeekerBundle/Rpc/MineseekerRpc.php +++ b/src/Mine/SeekerBundle/Rpc/MineseekerRpc.php @@ -150,6 +150,8 @@ class MineseekerRpc implements RpcInterface /** Save PlayedGame */ $playedGame->setGameAssoc($data[1]); $playedGame->setGrid($grid); + $playedGame->setCreated(new \DateTime()); + $playedGame->setUpdated(new \DateTime()); $this->em->persist($playedGame); $this->em->flush(); diff --git a/src/Mine/SeekerBundle/Topic/MineseekerTopic.php b/src/Mine/SeekerBundle/Topic/MineseekerTopic.php index 8a38be7..72366c1 100644 --- a/src/Mine/SeekerBundle/Topic/MineseekerTopic.php +++ b/src/Mine/SeekerBundle/Topic/MineseekerTopic.php @@ -167,12 +167,14 @@ class MineseekerTopic implements TopicInterface $step->setCol($event['coords'][1]); $step->setWBomb($event['bomb']); $step->setPlayedGame($playedGame); + $step->setCreated(new \DateTime()); $this->em->persist($step); $playedGame->setBluePoints($event['bluePoints']); $playedGame->setRedPoints($event['redPoints']); $playedGame->setBlueExplodedBomb($event['blueExplodedBomb'] ? true : null); $playedGame->setRedExplodedBomb($event['redExplodedBomb'] ? true : null); + $playedGame->setUpdated(new \DateTime()); $this->em->persist($playedGame); $this->em->flush();