diff --git a/README.md b/README.md index 85386f0..48344b9 100644 --- a/README.md +++ b/README.md @@ -29,3 +29,7 @@ This is a Symfony 3 project w/ React JS in standalone mode and w/ WebSocket. -d --> Debugger; If you write this line somewhere: debugger; The browser will stop the code here!!! + + 3.) Connect to Prod + + ssh xxsvci@laszlolang.com -i ~/.ssh/id_rsa_laszlolang diff --git a/src/.htaccess b/src/.htaccess deleted file mode 100644 index fb1de45..0000000 --- a/src/.htaccess +++ /dev/null @@ -1,7 +0,0 @@ - - Require all denied - - - Order deny,allow - Deny from all - diff --git a/src/Jotunheimr/UserBundle/Resources/public/css/layout.css b/src/Jotunheimr/UserBundle/Resources/public/css/layout.css index 5d35dd6..081652f 100644 --- a/src/Jotunheimr/UserBundle/Resources/public/css/layout.css +++ b/src/Jotunheimr/UserBundle/Resources/public/css/layout.css @@ -28,109 +28,166 @@ box-sizing: border-box; } -main { - background: url('/bundles/mineseeker/images/homepage/header.jpg') no-repeat center center; - background-size: cover; - position: fixed; +.ac-custom { width: 100%; - height: 100%; } -main .wrapper { - display: flex; - align-items: center; - justify-content: center; - width: 100%; - height: 100%; -} - -main .wrapper .form-container { - background: #ffffff; +header section .form-check { display: table; - padding: 15px; -} - -main .wrapper .form-container h1 { - font: normal 32px Arial, Helvetica, sans-serif; - text-align: center; - padding: 0; - margin: 0 0 15px 0; -} - -main .wrapper .form-container h1.sub-title { - margin-top: 15px; -} - -main .wrapper .form-container h2 { - font: normal 18px Arial, Helvetica, sans-serif; - text-align: center; + position: relative; margin: 20px 0; } -main .wrapper .form-container .form-input { - background: #cbcbc8; - min-width: 300px; - border: 0; - padding: 15px; +header section h1 { + margin: 10px 0; +} +header section .input-submit button, +header section .input-submit button:hover, +header section .form-input, +header section .form-input:focus, +header section .form-input:hover { -webkit-transition: all 250ms ease-in-out; + -moz-transition: all 250ms ease-in-out; + -o-transition: all 250ms ease-in-out; transition: all 250ms ease-in-out; } -main .wrapper .form-container .form-input:focus { - background: #e2e2de; - - -webkit-transition: all 250ms ease-in-out; - transition: all 250ms ease-in-out; -} - -main .wrapper .form-container .form-input.form-username { - margin-bottom: 5px; -} - -main .wrapper .form-container .form-check { +header section .input-submit button { + background: #83aed9; display: table; - position: relative; - margin: 20px auto 0 auto; -} - -main .wrapper .form-container .input-submit { + font: bold 32px 'Rajdhani', sans-serif; + text-transform: uppercase; + text-decoration: none; + width: 500px; + border: 1px solid #658fb8; + color: #FFFFFF; + padding: 25px 100px; margin-top: 20px; + + -webkit-box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3); + box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3); + -webkit-border-radius: 3px; + border-radius: 3px; } -main .wrapper .form-container button, -main .wrapper .form-container .fb-login { +header section .input-submit button:hover { + background: #86b5e1; + + -webkit-box-shadow: 0 7px 15px rgba(0, 0, 0, 0.2); + box-shadow: 0 7px 15px rgba(0, 0, 0, 0.2); +} + +header section .form-input { display: block; - background: #7dadcf; - width: 100%; - border: 0; - text-align: center; - padding: 20px; + width: 500px; + font: bold 22px 'Rajdhani', sans-serif; + border: 1px solid #dddddd; + color: #000000; + padding: 15px; + margin-bottom: 10px; - -webkit-transition: all 250ms ease-in-out; - transition: all 250ms ease-in-out; + -webkit-border-radius: 3px; + border-radius: 3px; + -webkit-box-shadow: 0 3px 5px rgba(0, 0, 0, 0.15); + box-shadow: 0 3px 5px rgba(0, 0, 0, 0.15); } -main .wrapper .form-container .fb-login { - background: #3b5998; +header section .form-input:focus, +header section .form-input:hover { + -webkit-box-shadow: 0 7px 10px rgba(0, 0, 0, 0.1); + box-shadow: 0 7px 10px rgba(0, 0, 0, 0.1); } -main .wrapper .form-container button:focus, -main .wrapper .form-container button:hover, -main .wrapper .form-container .fb-login:focus, -main .wrapper .form-container .fb-login:hover { - background: #6fa0c3; - - -webkit-transition: all 250ms ease-in-out; - transition: all 250ms ease-in-out; +header section h3.or { + font: bold 16px 'Rajdhani', sans-serif; + text-transform: uppercase; + color: #a1a1a1; + margin: 20px 0; } -main .wrapper .form-container button i, -main .wrapper .form-container .fb-login i { - font-size: 32px; - font-weight: bolder; - color: #ffffff; +header section .fb, +header section form { + z-index: 2; } +header section a.fb-login { + background: #5975b1; + position: relative; + display: block; + width: 500px; + height: 93px; + border: 1px solid #50649f; + margin: 0; + overflow: hidden; + -webkit-border-radius: 3px; + border-radius: 3px; + -webkit-box-shadow: 0 3px 5px rgba(0, 0, 0, 0.15); + box-shadow: 0 3px 5px rgba(0, 0, 0, 0.15); +} + +header section a.fb-login:hover { + background: #42598c; + color: #FFFFFF; + text-decoration: none; + + -webkit-box-shadow: 0 7px 10px rgba(0, 0, 0, 0.1); + box-shadow: 0 7px 10px rgba(0, 0, 0, 0.1); +} + +header section a.fb-login i { + position: absolute; + font-size: 130px; + top: 0; + left: 15px; +} + +@media screen and (max-width: 1100px) { + header section .form-input, + header section .form-check { + margin-left: auto; + margin-right: auto; + } + + header section .input-submit button { + margin: 0 auto; + } + + header section > div { + width: 100%; + } + + header section a.fb-login { + margin: 0 auto; + } +} + +@media screen and (max-width: 550px) { + header section { + padding: 10px; + } + + header section .form-input { + width: 100%; + margin-left: auto; + margin-right: auto; + } + + header section .form-check { + margin: 20px auto; + } + + header section .input-submit button { + width: 100%; + } + + header section a.fb-login { + width: 100%; + } + + header section a.fb-login span { + display: none; + } +} diff --git a/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig b/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig index 3c78185..c3b61e7 100644 --- a/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig +++ b/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig @@ -3,45 +3,48 @@ {% trans_default_domain 'FOSUserBundle' %} {% block fos_user_content %} -
-
-

Sign up

-
-
-
- {{ form_widget(form.email, {'attr': {'placeholder': 'Email', 'class': 'form-input form-username'}}) }} - {{ form_errors(form.email) }} -
- -
- {{ form_widget(form.username, {'attr': {'placeholder': 'Username ', 'class': 'form-input form-username'}}) }} - {{ form_errors(form.username) }} -
- -
- {{ form_widget(form.plainPassword.first, {'attr': {'placeholder': 'Password', 'class': 'form-input form-username'}}) }} - {{ form_errors(form.plainPassword.first) }} -
- -
- {{ form_widget(form.plainPassword.second, {'attr': {'placeholder': 'Repeat password', 'class': 'form-input'}}) }} - {{ form_errors(form.plainPassword.second) }} -
- -
- -
-
-
-

or enter w/ your Facebook's e-mail

-
- {% include('@JotunheimrUser/Social/facebook.html.twig') %} -
+
+ -
+

Sign up

+
+
+
+ {{ form_widget(form.email, {'attr': {'placeholder': 'Email', 'class': 'form-input form-username'}}) }} + {{ form_errors(form.email) }} +
+ +
+ {{ form_widget(form.username, {'attr': {'placeholder': 'Username ', 'class': 'form-input form-username'}}) }} + {{ form_errors(form.username) }} +
+ +
+ {{ form_widget(form.plainPassword.first, {'attr': {'placeholder': 'Password', 'class': 'form-input form-username'}}) }} + {{ form_errors(form.plainPassword.first) }} +
+ +
+ {{ form_widget(form.plainPassword.second, {'attr': {'placeholder': 'Repeat password', 'class': 'form-input'}}) }} + {{ form_errors(form.plainPassword.second) }} +
+ +
+ +
+
+
+

vagy regisztrálj egy kattintással

+
+ {% include('@JotunheimrUser/Social/facebook.html.twig') %} +
+ MineSeeker Logo + {% endblock fos_user_content %} {% block javascripts %} diff --git a/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig b/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig index 17c4595..d7a929a 100644 --- a/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig +++ b/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig @@ -7,44 +7,41 @@ {{ error.messageKey|trans(error.messageData, 'security') }} {% endif %} -
-
-

Sign in

-
-
- - -
- -
- -
- -
- -
- - -
- -
- -
-
-
-

or enter w/ your Facebook's e-mail

-
- {% include('@JotunheimrUser/Social/facebook.html.twig') %} -
+
+ -
+

Bejelentkezés

+
+ + + + + + +
+ + +
+ +
+ +
+
+

vagy jelentkezz be egy kattintással

+
+ {% include('@JotunheimrUser/Social/facebook.html.twig') %} +
+ MineSeeker Logo + {% endblock fos_user_content %} {% block javascripts %} diff --git a/src/Jotunheimr/UserBundle/Resources/views/Social/facebook.html.twig b/src/Jotunheimr/UserBundle/Resources/views/Social/facebook.html.twig index 04886c6..c365378 100644 --- a/src/Jotunheimr/UserBundle/Resources/views/Social/facebook.html.twig +++ b/src/Jotunheimr/UserBundle/Resources/views/Social/facebook.html.twig @@ -33,4 +33,4 @@ } - + diff --git a/src/Jotunheimr/UserBundle/Resources/views/layout.html.twig b/src/Jotunheimr/UserBundle/Resources/views/layout.html.twig index 2d599b4..173ad3c 100644 --- a/src/Jotunheimr/UserBundle/Resources/views/layout.html.twig +++ b/src/Jotunheimr/UserBundle/Resources/views/layout.html.twig @@ -7,23 +7,17 @@ {% block stylesheets %} {% stylesheets filter='cssrewrite' - '@JotunheimrUserBundle/Resources/public/css/layout.css' - '@JotunheimrAdminBundle/Resources/public/js/vendor/bootstrap/css/bootstrap.min.css' %} + '@JotunheimrAdminBundle/Resources/public/js/vendor/bootstrap/css/bootstrap.min.css' + '@MineSeekerBundle/Resources/public/css/style.homepage.css' + '@JotunheimrUserBundle/Resources/public/css/layout.css' %} {% endstylesheets %} {% endblock %} - - - - + - {% if app.request.hasPreviousSession %} {% for type, messages in app.session.flashbag.all() %} {% for message in messages %} @@ -34,10 +28,15 @@ {% endfor %} {% endif %} -
+
{% block fos_user_content %}{% endblock fos_user_content %} - +
+
+ {% block main %}{% endblock %}
+
+ {% block footer %}{% endblock %} +
{% block javascripts %} {% javascripts @@ -48,6 +47,5 @@ {% endjavascripts %} {% endblock %} - diff --git a/src/Mine/SeekerBundle/Controller/GameController.php b/src/Mine/SeekerBundle/Controller/GameController.php index 6542c5f..2e0922f 100644 --- a/src/Mine/SeekerBundle/Controller/GameController.php +++ b/src/Mine/SeekerBundle/Controller/GameController.php @@ -20,8 +20,13 @@ class GameController extends Controller )); } - public function listAction() + public function slack(Request $request) { - return $this->render('MineSeekerBundle:Game:list.html.twig'); + } + +// public function listAction() +// { +// return $this->render('MineSeekerBundle:Game:list.html.twig'); +// } } diff --git a/src/Mine/SeekerBundle/Resources/config/routing.yml b/src/Mine/SeekerBundle/Resources/config/routing.yml index 35eca24..1b3b22f 100644 --- a/src/Mine/SeekerBundle/Resources/config/routing.yml +++ b/src/Mine/SeekerBundle/Resources/config/routing.yml @@ -10,7 +10,11 @@ MineSeekerBundle_gamePlayWId: path: /play/{gameAssoc} defaults: { _controller: MineSeekerBundle:Game:play } -MineSeekerBundle_gameList: - path: /list - defaults: { _controller: MineSeekerBundle:Game:list } +MineSeekerBundle_slack: + path: /slack + defaults: { _controller: MineSeekerBundle:Game:slack } + +#MineSeekerBundle_gameList: +# path: /list +# defaults: { _controller: MineSeekerBundle:Game:list } diff --git a/src/Mine/SeekerBundle/Resources/public/css/style.homepage.css b/src/Mine/SeekerBundle/Resources/public/css/style.homepage.css index e3f4786..50fe079 100644 --- a/src/Mine/SeekerBundle/Resources/public/css/style.homepage.css +++ b/src/Mine/SeekerBundle/Resources/public/css/style.homepage.css @@ -1,9 +1,3 @@ -/*@import url('https://fonts.googleapis.com/css?family=Open+Sans+Condensed:300,700|Ravi+Prakash&subset=latin-ext');*/ -/* -font-family: 'Ravi Prakash', cursive; -font-family: 'Open Sans Condensed', sans-serif; -*/ - * { outline: none; padding: 0; @@ -11,59 +5,86 @@ font-family: 'Open Sans Condensed', sans-serif; } html, body { - background: #2C3E50; + background: #ffffff; display: block; width: 100%; height: 100%; } header { - background: rgba(255, 255, 255, 0.7) url('/bundles/mineseeker/images/homepage/header.jpg') no-repeat; - background-size: cover; + background: #d1e8ff; + width: 100%; + height: 900px; + color: #ffffff; +} + +header section { position: relative; display: flex; - align-items: center; - justify-content: center; + align-items: flex-start; + justify-content: flex-start; flex-direction: column; + max-width: 1300px; width: 100%; height: 100%; - color: #ffffff; - overflow: hidden; + padding: 20px; + margin: 0 auto; } -header h1 { - display: block; - font: normal 72px 'Ravi Prakash', cursive; - text-align: center; - line-height: 20px; - color: #ffa800; +header section div.logo img { + width: 350px; + margin: 50px 0; +} +header section > img { + position: absolute; + width: 1300px; + height: 1300px; + right: -50%; + bottom: -30%; + + z-index: 1; +} + +header section > div { z-index: 2; } -header h3 { - display: block; - font: normal 32px 'Open Sans Condensed', sans-serif; - text-align: center; - color: #ffcd02; - - z-index: 2; +header section h1 { + font: bold 40px 'Rajdhani', sans-serif; + color: #434242; + margin-bottom: 100px; } -header > a { - background: #e8e8e8; +header section h2 { + font: normal 32px 'Rajdhani', sans-serif; + color: #434242; +} + +header section h3 { display: block; - font: bold 22px 'Open Sans Condensed', sans-serif; + font: bold 16px 'Rajdhani', sans-serif; + color: #434242; + margin-top: 10px; +} + +header section h3 img { + width: 16px; +} + +header section div > a { + background: #83aed9; + display: table; + font: bold 32px 'Rajdhani', sans-serif; text-transform: uppercase; text-decoration: none; - color: #2C3E50; - padding: 10px 70px; + border: 1px solid #658fb8; + color: #FFFFFF; + padding: 25px 100px; margin-top: 20px; - z-index: 2; - - -webkit-box-shadow: 0 3px 5px rgba(0, 0, 0, 0.75); - box-shadow: 0 3px 5px rgba(0, 0, 0, 0.75); + -webkit-box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3); + box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3); -webkit-border-radius: 3px; border-radius: 3px; -webkit-transition: all 250ms ease-in-out; @@ -72,36 +93,56 @@ header > a { transition: all 250ms ease-in-out; } -header > a:hover { - background: #ffffff; +header section div > a:hover { + background: #86b5e1; - -webkit-box-shadow: 0 7px 10px rgba(0, 0, 0, 0.75); - box-shadow: 0 7px 10px rgba(0, 0, 0, 0.75); + -webkit-box-shadow: 0 7px 15px rgba(0, 0, 0, 0.2); + box-shadow: 0 7px 15px rgba(0, 0, 0, 0.2); -webkit-transition: all 250ms ease-in-out; -moz-transition: all 250ms ease-in-out; -o-transition: all 250ms ease-in-out; transition: all 250ms ease-in-out; } -header > img { - position: absolute; - width: 50%; - max-width: 1000px; - bottom: -25%; +@media screen and (max-width: 1100px) { + header section { + align-items: center; + justify-content: center; + text-align: center; + } - z-index: 1; -} + header section div > a { + margin: 0 auto; + } -@media screen and (max-width: 1500px) { - header > img { - width: 60%; - bottom: -40%; + header section h1 { + margin-bottom: 20px; + } + + header section div.logo img { + margin-bottom: 0; + } + + header section > img { + display: none; } } -@media screen and (max-width: 1500px) { - header > img { - width: 70%; - bottom: -20%; +@media screen and (max-width: 500px) { + header { + min-height: 100%; + height: auto; } -} \ No newline at end of file + + header section { + width: auto; + } + + header section div.logo img { + width: 100%; + } + + header section div > a { + display: block; + } +} diff --git a/src/Mine/SeekerBundle/Resources/public/images/bg-mineseeker-outbg.jpg b/src/Mine/SeekerBundle/Resources/public/images/bg-mineseeker-outbg.jpg index fcb3bd2..75a5d98 100644 Binary files a/src/Mine/SeekerBundle/Resources/public/images/bg-mineseeker-outbg.jpg and b/src/Mine/SeekerBundle/Resources/public/images/bg-mineseeker-outbg.jpg differ diff --git a/src/Mine/SeekerBundle/Resources/public/images/bg-mineseeker-outbg.jpg-bak b/src/Mine/SeekerBundle/Resources/public/images/bg-mineseeker-outbg.jpg-bak new file mode 100644 index 0000000..fcb3bd2 Binary files /dev/null and b/src/Mine/SeekerBundle/Resources/public/images/bg-mineseeker-outbg.jpg-bak differ diff --git a/src/Mine/SeekerBundle/Resources/public/images/mine-logo-logo.png b/src/Mine/SeekerBundle/Resources/public/images/mine-logo-logo.png new file mode 100755 index 0000000..dfc14ad Binary files /dev/null and b/src/Mine/SeekerBundle/Resources/public/images/mine-logo-logo.png differ diff --git a/src/Mine/SeekerBundle/Resources/public/images/mine-logo-txt.png b/src/Mine/SeekerBundle/Resources/public/images/mine-logo-txt.png new file mode 100755 index 0000000..808e7db Binary files /dev/null and b/src/Mine/SeekerBundle/Resources/public/images/mine-logo-txt.png differ diff --git a/src/Mine/SeekerBundle/Resources/public/images/msn-logo.png b/src/Mine/SeekerBundle/Resources/public/images/msn-logo.png new file mode 100644 index 0000000..8d354ff Binary files /dev/null and b/src/Mine/SeekerBundle/Resources/public/images/msn-logo.png differ 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 102d7bf..4d51606 100644 --- a/src/Mine/SeekerBundle/Resources/public/js/mine-seeker/app.js +++ b/src/Mine/SeekerBundle/Resources/public/js/mine-seeker/app.js @@ -289,13 +289,14 @@ class MineSeeker extends React.Component { }); } - /** After rendering */ - componentDidMount() { + connectWithWebsocket() { /** 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") + "://www.mineseeker.ninja:6450" + : (this.state.ssl === 'true' ? "wss" : "ws") + "://system7.ddns.net:443/" ); /** @@ -346,6 +347,11 @@ class MineSeeker extends React.Component { }); } + /** After rendering */ + componentDidMount() { + + } + /** * Cache the steps unless reconnection * diff --git a/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig b/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig index 06b3168..6e7954b 100644 --- a/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig +++ b/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig @@ -1,14 +1,22 @@ {% extends "::base.html.twig" %} {% block header %} -

MineSeeker

-

version 0.14.9beta

- Play now - +
+ +
+

Egy aknakereső játék

+

Újragondolva...

+ Játszok! +

version 0.16.11 (beta2) · MineSeeker© · www.laszlolang.com

+
+ MineSeeker Logo +
{% endblock %} {% block stylesheets %} - + {% stylesheets filter='?uglifycss' '@MineSeekerBundle/Resources/public/css/style.homepage.css' %}