From bcc96718955e10c47442ff8b6f87e7bac12496d0 Mon Sep 17 00:00:00 2001 From: Lang Date: Wed, 14 Dec 2016 15:50:48 +0100 Subject: [PATCH] release beta4 --- .gitignore | 2 +- app/Resources/views/base.html.twig | 74 +++--------- app/config/config.yml | 6 +- app/config/parameters_prod.yml | 9 +- app/config/routing.yml | 3 - .../Resources/public/css/layout.css | 59 ++++++++++ .../views/Registration/register.html.twig | 38 ++++++- .../Resources/views/Security/login.html.twig | 17 ++- .../Resources/views/layout.html.twig | 106 +++++------------- .../Core/User/MyFOSUBUserProvider.php | 26 +---- .../SeekerBundle/Resources/config/routing.yml | 9 +- .../Resources/public/css/style.homepage.css | 2 + .../Resources/public/css/style.mineseeker.css | 59 ++++++++-- .../images/favicon/android-chrome-192x192.png | Bin 0 -> 20529 bytes .../images/favicon/android-chrome-512x512.png | Bin 0 -> 56433 bytes .../images/favicon/android-icon-144x144.png | Bin 0 -> 14763 bytes .../images/favicon/android-icon-192x192.png | Bin 0 -> 20188 bytes .../images/favicon/android-icon-36x36.png | Bin 0 -> 2696 bytes .../images/favicon/android-icon-48x48.png | Bin 0 -> 3691 bytes .../images/favicon/android-icon-72x72.png | Bin 0 -> 5861 bytes .../images/favicon/android-icon-96x96.png | Bin 0 -> 8589 bytes .../images/favicon/apple-icon-114x114.png | Bin 0 -> 10788 bytes .../images/favicon/apple-icon-120x120.png | Bin 0 -> 11552 bytes .../images/favicon/apple-icon-144x144.png | Bin 0 -> 14763 bytes .../images/favicon/apple-icon-152x152.png | Bin 0 -> 15904 bytes .../images/favicon/apple-icon-180x180.png | Bin 0 -> 19776 bytes .../images/favicon/apple-icon-57x57.png | Bin 0 -> 4505 bytes .../images/favicon/apple-icon-60x60.png | Bin 0 -> 4782 bytes .../images/favicon/apple-icon-72x72.png | Bin 0 -> 5861 bytes .../images/favicon/apple-icon-76x76.png | Bin 0 -> 6295 bytes .../images/favicon/apple-icon-precomposed.png | Bin 0 -> 20762 bytes .../public/images/favicon/apple-icon.png | Bin 0 -> 20762 bytes .../images/favicon/apple-touch-icon.png | Bin 0 -> 14342 bytes .../public/images/favicon/browserconfig.xml | 9 ++ .../public/images/favicon/favicon-16x16.png | Bin 0 -> 1284 bytes .../public/images/favicon/favicon-32x32.png | Bin 0 -> 2579 bytes .../public/images/favicon/favicon-96x96.png | Bin 0 -> 8589 bytes .../public/images/favicon/favicon.ico | Bin 0 -> 15086 bytes .../public/images/favicon/manifest.json | 17 +++ .../public/images/favicon/ms-icon-144x144.png | Bin 0 -> 14763 bytes .../public/images/favicon/ms-icon-150x150.png | Bin 0 -> 15668 bytes .../public/images/favicon/ms-icon-310x310.png | Bin 0 -> 39675 bytes .../public/images/favicon/ms-icon-70x70.png | Bin 0 -> 5560 bytes .../public/images/favicon/mstile-150x150.png | Bin 0 -> 13953 bytes .../images/favicon/safari-pinned-tab.svg | 75 +++++++++++++ .../Resources/public/images/mine-1600x627.png | Bin 0 -> 736684 bytes .../Resources/public/js/mine-seeker/app.js | 17 ++- .../Resources/views/Game/index.html.twig | 39 ++++++- .../Resources/views/Game/play.html.twig | 16 ++- .../Resources/views/Recent/facebook.html.twig | 23 ++++ .../Resources/views/Recent/favicon.html.twig | 12 ++ .../views/Recent/google-analytics.html.twig | 19 ++++ .../Resources/views/layout.html.twig | 12 ++ .../SeekerBundle/Topic/MineseekerTopic.php | 1 + web/favicon.ico | Bin 6518 -> 15086 bytes 55 files changed, 452 insertions(+), 198 deletions(-) create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/android-chrome-192x192.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/android-chrome-512x512.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/android-icon-144x144.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/android-icon-192x192.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/android-icon-36x36.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/android-icon-48x48.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/android-icon-72x72.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/android-icon-96x96.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/apple-icon-114x114.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/apple-icon-120x120.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/apple-icon-144x144.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/apple-icon-152x152.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/apple-icon-180x180.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/apple-icon-57x57.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/apple-icon-60x60.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/apple-icon-72x72.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/apple-icon-76x76.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/apple-icon-precomposed.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/apple-icon.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/apple-touch-icon.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/browserconfig.xml create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/favicon-16x16.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/favicon-32x32.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/favicon-96x96.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/favicon.ico create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/manifest.json create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/ms-icon-144x144.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/ms-icon-150x150.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/ms-icon-310x310.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/ms-icon-70x70.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/mstile-150x150.png create mode 100644 src/Mine/SeekerBundle/Resources/public/images/favicon/safari-pinned-tab.svg create mode 100755 src/Mine/SeekerBundle/Resources/public/images/mine-1600x627.png create mode 100644 src/Mine/SeekerBundle/Resources/views/Recent/facebook.html.twig create mode 100644 src/Mine/SeekerBundle/Resources/views/Recent/favicon.html.twig create mode 100644 src/Mine/SeekerBundle/Resources/views/Recent/google-analytics.html.twig create mode 100644 src/Mine/SeekerBundle/Resources/views/layout.html.twig diff --git a/.gitignore b/.gitignore index 8887610..58eda4f 100644 --- a/.gitignore +++ b/.gitignore @@ -37,4 +37,4 @@ phpunit-report/* nohup.out src/Mine/SeekerBundle/Resources/public/js/index.js src/Mine/SeekerBundle/Resources/public/js/index.min.js -npm-debug.log \ No newline at end of file +npm-debug.log diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index 2d26677..638d615 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -3,31 +3,28 @@ + + + + + + + + + + + {% include '@MineSeeker/Recent/favicon.html.twig' %} {% block metas %}{% endblock %} - {% block title %}Welcome!{% endblock %} + MineSeeker{% block title %}{% endblock %} {% block stylesheets %}{% endblock %} - - + {% include '@MineSeeker/Recent/google-analytics.html.twig' %}
+ +{% block bodyTop %}{% endblock %} +
{% block header %}{% endblock %}
@@ -39,44 +36,7 @@ {% block javascripts %} - - - {% javascripts - '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/jQuery/jquery-3.0.0.min.js' - '@JotunheimrAdminBundle/Resources/public/js/vendor/plugins/jQuery/jquery-migrate-3.0.0.min.js' - '@JotunheimrAdminBundle/Resources/public/js/vendor/bootstrap/js/bootstrap.min.js' %} - - {% endjavascripts %} - - - + {% include '@MineSeeker/Recent/facebook.html.twig' %} {% endblock %} diff --git a/app/config/config.yml b/app/config/config.yml index 9f15a0e..c6ecc34 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.21.12 (beta2)" + version: "0.27.16 (beta4)" facebook_api: "%facebook.api%" facebook_api_version: "%facebook.version%" @@ -72,6 +72,7 @@ assetic: debug: "%kernel.debug%" use_controller: "%kernel.debug%" bundles: ~ + node: /usr/bin/nodejs filters: cssrewrite: ~ uglifyjs2: @@ -86,5 +87,6 @@ fos_user: firewall_name: main user_class: Jotunheimr\UserBundle\Entity\User +# Slack integration cl_slack: - api_token: xoxp-107639806167-107029084564-115427085733-cccaa4f96c89c87ce680c7f22acfd001 \ No newline at end of file + api_token: xoxp-107639806167-107029084564-115427085733-cccaa4f96c89c87ce680c7f22acfd001 diff --git a/app/config/parameters_prod.yml b/app/config/parameters_prod.yml index b254a8a..b982d1d 100644 --- a/app/config/parameters_prod.yml +++ b/app/config/parameters_prod.yml @@ -2,9 +2,12 @@ parameters: database_host: 127.0.0.1 database_port: null - database_name: xxsvci_mineseeker - database_user: xxsvci_mine - database_password: "XTw#8qC$faa*" +# database_name: xxsvci_mineseeker +# database_user: xxsvci_mine +# database_password: "XTw#8qC$faa*" + database_name: mine + database_user: root + database_password: "bazmeg" mailer_transport: smtp mailer_host: 127.0.0.1 mailer_user: null diff --git a/app/config/routing.yml b/app/config/routing.yml index e7b1017..8dc6566 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -4,14 +4,11 @@ fos_user: JotunheimrUserBundle: resource: "@JotunheimrUserBundle/Resources/config/routing.yml" prefix: / - schemes: [https] JotunheimrAdminBundle: resource: "@JotunheimrAdminBundle/Resources/config/routing.yml" prefix: / - schemes: [https] MineSeekerBundle: resource: "@MineSeekerBundle/Resources/config/routing.yml" prefix: / - schemes: [https] diff --git a/src/Jotunheimr/UserBundle/Resources/public/css/layout.css b/src/Jotunheimr/UserBundle/Resources/public/css/layout.css index 3e8a242..03b5e65 100644 --- a/src/Jotunheimr/UserBundle/Resources/public/css/layout.css +++ b/src/Jotunheimr/UserBundle/Resources/public/css/layout.css @@ -99,6 +99,52 @@ header section .form-input:hover { box-shadow: 0 7px 10px rgba(0, 0, 0, 0.1); } +header section .failure { + background: #f00; + position: relative; + border: 3px solid #fff; + font: bold 16px 'Rajdhani', sans-serif; + color: #FFFFFF; + padding: 10px; + margin: 30px 0 10px 0; + + -webkit-border-radius: 5px; + border-radius: 5px; +} + +header section .failure:after, +header section .failure:before { + content: " "; + position: absolute; + bottom: 100%; + left: 50px; + height: 0; + width: 0; + border: solid transparent; + pointer-events: none; +} + +header section .failure:after { + border-color: rgba(0, 0, 0, 0); + border-bottom-color: #f00; + border-width: 20px; + margin-left: -20px; +} + +header section .failure:before { + border-color: rgba(255, 255, 255, 0); + border-bottom-color: #ffffff; + border-width: 26px; + margin-left: -26px; +} + +header section .failure ul { + display: inline-block; + list-style: none; + padding: 0; + margin: 0 10px 0 0; +} + header section h3.or { font: bold 16px 'Rajdhani', sans-serif; text-transform: uppercase; @@ -165,6 +211,19 @@ header section div.buttons > a.slack-login:hover { color: #5c3a58; } +header section .failure-main { + background: #f00; + max-width: 500px; + border: 3px solid #fff; + font: bold 16px 'Rajdhani', sans-serif; + color: #FFFFFF; + padding: 10px; + margin: 0 0 20px 0; + + -webkit-border-radius: 5px; + border-radius: 5px; +} + @media screen and (max-width: 1100px) { header section .form-input, header section .form-check { diff --git a/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig b/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig index 13aea4a..4908563 100644 --- a/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig +++ b/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig @@ -2,6 +2,8 @@ {% trans_default_domain 'FOSUserBundle' %} +{% block title %} - Sign up{% endblock %} + {% block fos_user_content %}