diff --git a/app/config/config.yml b/app/config/config.yml index ce6cb01..324b0ed 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -28,10 +28,10 @@ framework: trusted_hosts: ~ trusted_proxies: ~ session: -# http://symfony.com/doc/current/reference/configuration/framework.html#handler-id +# http://symfony.com/doc/current/reference/configuration/framework.html#handler-id # handler_id: session.handler.native_file - handler_id: session.handler.pdo # save_path: "%kernel.root_dir%/../var/sessions/%kernel.environment%" + handler_id: session.handler.pdo fragments: ~ http_method_override: true assets: ~ @@ -41,7 +41,7 @@ twig: debug: "%kernel.debug%" strict_variables: "%kernel.debug%" globals: - version: "0.29.18 (beta6)" + version: "0.34.18 (beta6)" facebook_api: "%facebook.api%" facebook_scope: "%facebook.scope%" facebook_api_version: "%facebook.version%" diff --git a/src/.htaccess b/src/.htaccess new file mode 100644 index 0000000..fb1de45 --- /dev/null +++ b/src/.htaccess @@ -0,0 +1,7 @@ + + 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 e02c4c1..f05249b 100644 --- a/src/Jotunheimr/UserBundle/Resources/public/css/layout.css +++ b/src/Jotunheimr/UserBundle/Resources/public/css/layout.css @@ -152,6 +152,10 @@ header section h3.or { margin: 20px 0; } +header section #id_welcome { + margin-bottom: 115px; +} + header section .buttons, header section form { z-index: 2; @@ -225,6 +229,83 @@ header section .failure-main { border-radius: 5px; } +main div.txt { + width: 100%; + max-width: 1000px; + font-family: 'Rajdhani', sans-serif; + color: #414040; + margin: 50px auto 0 auto; +} + +main div.txt h2 { + margin: 0 0 50px 0; +} + +main div.txt p { + font: normal 16px 'Rajdhani', sans-serif; +} + +main div.txt li { + font: normal 16px 'Rajdhani', sans-serif; + padding-left: 10px; + margin-left: 50px; +} + +main .technologies { + text-align: center; +} + +main .technologies img { + display: inline-block; + width: 90%; + max-width: 100px; + margin: 20px; +} + +main .technologies h1 { + font-weight: bold; +} + +footer { + background: #414040; + width: 100%; + min-height: 50px; + margin-top: 50px; +} + +footer nav { + display: block; + text-align: center; +} + +footer nav ul { + display: inline-block; + list-style: none; + padding: 0; + margin: 0; +} + +footer nav ul li { + display: inline-block; + font: bold 16px 'Rajdhani', sans-serif; + color: #FFFFFF; +} + +footer nav ul li:nth-child(even) { + width: 50px; + text-align: center; +} + +footer nav ul li a { + text-align: center; + line-height: 50px; + color: #FFFFFF; +} + +footer nav ul li a:hover { + color: #FFFFFF; +} + @media screen and (max-width: 1100px) { header section .form-input, header section .form-check { @@ -248,7 +329,7 @@ header section .failure-main { @media screen and (max-width: 550px) { header section { - padding: 10px; + padding: 20px; } header section .form-input { @@ -274,4 +355,12 @@ header section .failure-main { header section div.buttons > a.slack-login span { display: none; } + + footer nav ul li { + display: block; + } + + footer nav ul li:nth-child(even) { + 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 4908563..b77b4d1 100644 --- a/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig +++ b/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig @@ -79,6 +79,33 @@ {% endblock fos_user_content %} +{% block body %} +
+
+

Used technologies

+ Used Websocket + Used React.js + Used Symfony + Used jQuery + Used Let's Encrypt +
+
+{% endblock %} + +{% block footer %} + +{% endblock %} + {% block javascripts %} {{ parent() }} diff --git a/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig b/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig index 4e6eeca..ba9565d 100644 --- a/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig +++ b/src/Jotunheimr/UserBundle/Resources/views/Security/login.html.twig @@ -61,6 +61,33 @@ {% endblock fos_user_content %} +{% block body %} +
+
+

Used technologies

+ Used Websocket + Used React.js + Used Symfony + Used jQuery + Used Let's Encrypt +
+
+{% endblock %} + +{% block footer %} + +{% endblock %} + {% block javascripts %} {{ parent() }} diff --git a/src/Mine/SeekerBundle/Controller/GameController.php b/src/Mine/SeekerBundle/Controller/GameController.php index 333d690..a4bebbf 100644 --- a/src/Mine/SeekerBundle/Controller/GameController.php +++ b/src/Mine/SeekerBundle/Controller/GameController.php @@ -48,4 +48,24 @@ class GameController extends Controller { } + + public function privacyAction() + { + return $this->render('MineSeekerBundle:Official:privacy.html.twig'); + } + + public function termsAction() + { + return $this->render('MineSeekerBundle:Official:terms.html.twig'); + } + + public function contactAction() + { + return $this->render('MineSeekerBundle:Official:contact.html.twig'); + } + + public function landingAction() + { + return $this->render('MineSeekerBundle:Official:landing.html.twig'); + } } diff --git a/src/Mine/SeekerBundle/Resources/config/routing.yml b/src/Mine/SeekerBundle/Resources/config/routing.yml index 5446f7e..976ce57 100644 --- a/src/Mine/SeekerBundle/Resources/config/routing.yml +++ b/src/Mine/SeekerBundle/Resources/config/routing.yml @@ -17,3 +17,23 @@ MineSeekerBundle_slack: path: /slack defaults: { _controller: MineSeekerBundle:Game:slack } schemes: [https] + +MineSeekerBundle_terms: + path: /terms-of-service + defaults: { _controller: MineSeekerBundle:Game:terms } + schemes: [https] + +MineSeekerBundle_privacy: + path: /privacy-policy + defaults: { _controller: MineSeekerBundle:Game:privacy } + schemes: [https] + +MineSeekerBundle_contact: + path: /contact + defaults: { _controller: MineSeekerBundle:Game:contact } + schemes: [https] + +MineSeekerBundle_landing: + path: /landing-page + defaults: { _controller: MineSeekerBundle:Game:landing } + schemes: [https] diff --git a/src/Mine/SeekerBundle/Resources/public/css/style.homepage.css b/src/Mine/SeekerBundle/Resources/public/css/style.homepage.css index 3a457d2..6f4dcc3 100644 --- a/src/Mine/SeekerBundle/Resources/public/css/style.homepage.css +++ b/src/Mine/SeekerBundle/Resources/public/css/style.homepage.css @@ -9,19 +9,19 @@ html, body { display: block; width: 100%; height: 100%; - - overflow-x: hidden; } header { background: #d1e8ff; + position: relative; width: 100%; - height: 900px; + height: 950px; color: #ffffff; + + overflow: hidden; } header section { - position: relative; display: flex; align-items: flex-start; justify-content: flex-start; @@ -46,8 +46,8 @@ header section > img { position: absolute; width: 1300px; height: 1300px; - right: -50%; - bottom: -30%; + right: -10%; + top: -10%; z-index: 1; } @@ -80,12 +80,12 @@ header section h3 img { } header section div.buttons > a { - background: #83aed9; + background: #69788e; display: table; font: bold 32px 'Rajdhani', sans-serif; text-transform: uppercase; text-decoration: none; - border: 1px solid #658fb8; + border: 5px solid #57667b; color: #FFFFFF; padding: 25px 150px; margin-bottom: 20px; @@ -101,7 +101,7 @@ header section div.buttons > a { } header section div.buttons > a:hover { - background: #86b5e1; + background: #57667b; -webkit-box-shadow: 0 7px 15px rgba(0, 0, 0, 0.2); box-shadow: 0 7px 15px rgba(0, 0, 0, 0.2); @@ -112,15 +112,16 @@ header section div.buttons > a:hover { } header section div.buttons > a.small { - background: transparent; + background: #83aed9; display: inline-block; font: bold 22px 'Rajdhani', sans-serif; - border: 3px solid #83aed9; - color: #83aed9; + border: 1px solid #6890ba; + color: #FFFFFF; padding: 10px; - -webkit-box-shadow: none; - box-shadow: none;-webkit-transition: all 250ms ease-in-out; + -webkit-box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3); + box-shadow: 0 3px 10px rgba(0, 0, 0, 0.3); + -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; @@ -128,10 +129,12 @@ header section div.buttons > a.small { } header section div.buttons > a.small:hover { - background: #658fb8; - border: 3px solid #658fb8; + background: #86b5e1; + border: 1px solid #658fb8; color: #FFFFFF; + -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; diff --git a/src/Mine/SeekerBundle/Resources/public/images/technologies/jquery.png b/src/Mine/SeekerBundle/Resources/public/images/technologies/jquery.png new file mode 100755 index 0000000..6ba6935 Binary files /dev/null and b/src/Mine/SeekerBundle/Resources/public/images/technologies/jquery.png differ diff --git a/src/Mine/SeekerBundle/Resources/public/images/technologies/lets-encrypt.png b/src/Mine/SeekerBundle/Resources/public/images/technologies/lets-encrypt.png new file mode 100755 index 0000000..5d920cc Binary files /dev/null and b/src/Mine/SeekerBundle/Resources/public/images/technologies/lets-encrypt.png differ diff --git a/src/Mine/SeekerBundle/Resources/public/images/technologies/react.png b/src/Mine/SeekerBundle/Resources/public/images/technologies/react.png new file mode 100755 index 0000000..b9fd829 Binary files /dev/null and b/src/Mine/SeekerBundle/Resources/public/images/technologies/react.png differ diff --git a/src/Mine/SeekerBundle/Resources/public/images/technologies/symfony.png b/src/Mine/SeekerBundle/Resources/public/images/technologies/symfony.png new file mode 100755 index 0000000..6882a78 Binary files /dev/null and b/src/Mine/SeekerBundle/Resources/public/images/technologies/symfony.png differ diff --git a/src/Mine/SeekerBundle/Resources/public/images/technologies/websocket.png b/src/Mine/SeekerBundle/Resources/public/images/technologies/websocket.png new file mode 100755 index 0000000..7eea36e Binary files /dev/null and b/src/Mine/SeekerBundle/Resources/public/images/technologies/websocket.png differ diff --git a/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig b/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig index a0738b5..9e612a1 100644 --- a/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig +++ b/src/Mine/SeekerBundle/Resources/views/Game/index.html.twig @@ -3,20 +3,23 @@ {% block header %}
- {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %} -

- 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!!

- {% endif %} - +
+ {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %} +

+ 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!!

+ {% endif %} +
Play NOW! {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %} @@ -37,6 +40,33 @@
{% endblock %} +{% block body %} +
+
+

Used technologies

+ Used Websocket + Used React.js + Used Symfony + Used jQuery + Used Let's Encrypt +
+
+{% endblock %} + +{% block footer %} + +{% endblock %} + {% block stylesheets %} {{ parent() }} @@ -44,7 +74,9 @@ rel="stylesheet"> {% stylesheets filter='?uglifycss' - '@MineSeekerBundle/Resources/public/css/style.homepage.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 %} diff --git a/src/Mine/SeekerBundle/Resources/views/Official/contact.html.twig b/src/Mine/SeekerBundle/Resources/views/Official/contact.html.twig new file mode 100644 index 0000000..40e4158 --- /dev/null +++ b/src/Mine/SeekerBundle/Resources/views/Official/contact.html.twig @@ -0,0 +1,13 @@ +{% extends '@MineSeeker/Game/index.html.twig' %} + +{% block title %} - Contact{% endblock %} + +{% block body %} +
+

Contact and user support

+ +

Under construction

+ + langlasz@gmail.com +
+{% endblock %} diff --git a/src/Mine/SeekerBundle/Resources/views/Official/landing.html.twig b/src/Mine/SeekerBundle/Resources/views/Official/landing.html.twig new file mode 100644 index 0000000..f876c94 --- /dev/null +++ b/src/Mine/SeekerBundle/Resources/views/Official/landing.html.twig @@ -0,0 +1,11 @@ +{% extends '@MineSeeker/Game/index.html.twig' %} + +{% block title %} - Landing page{% endblock %} + +{% block body %} +
+

Landing page w/ marketing

+ +

Under construction

+
+{% endblock %} diff --git a/src/Mine/SeekerBundle/Resources/views/Official/privacy.html.twig b/src/Mine/SeekerBundle/Resources/views/Official/privacy.html.twig new file mode 100644 index 0000000..5681801 --- /dev/null +++ b/src/Mine/SeekerBundle/Resources/views/Official/privacy.html.twig @@ -0,0 +1,52 @@ +{% extends '@MineSeeker/Game/index.html.twig' %} + +{% block title %} - Privacy Policy{% endblock %} + +{% block body %} +
+

MineSeeker Privacy Policy

+ +

Your privacy is important to us.

+ +

It is MineSeeker's policy to respect your privacy regarding any information we may collect while operating + our + website. Accordingly, we have developed this privacy policy in order for you to understand how we collect, + use, + communicate, disclose and otherwise make use of personal information. We have outlined our privacy policy + below.

+ + + +

We are committed to conducting our business in accordance with these principles in order to ensure that the + confidentiality of personal information is protected and maintained. MineSeeker may change this privacy + policy + from time to time at MineSeeker's sole discretion.

+
+{% endblock %} diff --git a/src/Mine/SeekerBundle/Resources/views/Official/terms.html.twig b/src/Mine/SeekerBundle/Resources/views/Official/terms.html.twig new file mode 100644 index 0000000..367eab2 --- /dev/null +++ b/src/Mine/SeekerBundle/Resources/views/Official/terms.html.twig @@ -0,0 +1,100 @@ +{% extends '@MineSeeker/Game/index.html.twig' %} + +{% block title %} - Terms of Service{% endblock %} + +{% block body %} +
+

MineSeeker Terms of Service

+ +

1. Terms

+ +

By accessing the website at https://www.mineseeker.ninja, you are + agreeing to be bound by these terms of service, all applicable laws and regulations, and agree that you are + responsible for compliance with any applicable local laws. If you do not agree with any of these terms, you + are + prohibited from using or accessing this site. The materials contained in this website are protected by + applicable copyright and trademark law.

+ +

2. Use License

+ +
    +
  1. + Permission is granted to temporarily download one copy of the materials (information or software) on + MineSeeker's website for personal, non-commercial transitory viewing only. This is the grant of a + license, + not a transfer of title, and under this license you may not: + +
      +
    1. modify or copy the materials;
    2. +
    3. use the materials for any commercial purpose, or for any public display (commercial or + non-commercial); +
    4. +
    5. attempt to decompile or reverse engineer any software contained on MineSeeker's website;
    6. +
    7. remove any copyright or other proprietary notations from the materials; or
    8. +
    9. transfer the materials to another person or "mirror" the materials on any other server.
    10. +
    +
  2. +
  3. This license shall automatically terminate if you violate any of these restrictions and may be + terminated by + MineSeeker at any time. Upon terminating your viewing of these materials or upon the termination of this + license, you must destroy any downloaded materials in your possession whether in electronic or printed + format. +
  4. +
+ +

3. Disclaimer

+ +
    +
  1. The materials on MineSeeker's website are provided on an 'as is' basis. MineSeeker makes no warranties, + expressed or implied, and hereby disclaims and negates all other warranties including, without + limitation, + implied warranties or conditions of merchantability, fitness for a particular purpose, or + non-infringement + of intellectual property or other violation of rights. +
  2. +
  3. Further, MineSeeker does not warrant or make any representations concerning the accuracy, likely + results, or + reliability of the use of the materials on its website or otherwise relating to such materials or on any + sites linked to this site. +
  4. +
+ +

4. Limitations

+ +

In no event shall MineSeeker or its suppliers be liable for any damages (including, without limitation, + damages + for loss of data or profit, or due to business interruption) arising out of the use or inability to use the + materials on MineSeeker's website, even if MineSeeker or a MineSeeker authorized representative has been + notified orally or in writing of the possibility of such damage. Because some jurisdictions do not allow + limitations on implied warranties, or limitations of liability for consequential or incidental damages, + these + limitations may not apply to you.

+ +

5. Accuracy of materials

+ +

The materials appearing on MineSeeker's website could include technical, typographical, or photographic + errors. + MineSeeker does not warrant that any of the materials on its website are accurate, complete or current. + MineSeeker may make changes to the materials contained on its website at any time without notice. However + MineSeeker does not make any commitment to update the materials.

+ +

6. Links

+ +

MineSeeker has not reviewed all of the sites linked to its website and is not responsible for the contents of + any + such linked site. The inclusion of any link does not imply endorsement by MineSeeker of the site. Use of any + such linked website is at the user's own risk.

+ +

7. Modifications

+ +

MineSeeker may revise these terms of service for its website at any time without notice. By using this + website + you are agreeing to be bound by the then current version of these terms of service.

+ +

8. Governing Law

+ +

These terms and conditions are governed by and construed in accordance with the laws of Budapest, Hungary and + you + irrevocably submit to the exclusive jurisdiction of the courts in that State or location.

+
+{% endblock %}