diff --git a/app/AppKernel.php b/app/AppKernel.php index 0f8e12f..f974f50 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php @@ -24,6 +24,7 @@ class AppKernel extends Kernel new Gos\Bundle\PubSubRouterBundle\GosPubSubRouterBundle(), new Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle(), new Snc\RedisBundle\SncRedisBundle(), + new CL\Bundle\SlackBundle\CLSlackBundle(), new Jotunheimr\AdminBundle\JotunheimrAdminBundle(), new Jotunheimr\UserBundle\JotunheimrUserBundle(), diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index 92cee5d..2d26677 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -62,6 +62,21 @@ fjs.parentNode.insertBefore(js, fjs); }(document, 'script', 'facebook-jssdk')); + + {% 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 %} + + + {% endblock %} diff --git a/app/config/config.yml b/app/config/config.yml index 8e2b86e..9f15a0e 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -41,6 +41,7 @@ twig: debug: "%kernel.debug%" strict_variables: "%kernel.debug%" globals: + version: "0.21.12 (beta2)" facebook_api: "%facebook.api%" facebook_api_version: "%facebook.version%" @@ -84,3 +85,6 @@ fos_user: db_driver: orm # other valid values are 'mongodb', 'couchdb' and 'propel' firewall_name: main user_class: Jotunheimr\UserBundle\Entity\User + +cl_slack: + api_token: xoxp-107639806167-107029084564-115427085733-cccaa4f96c89c87ce680c7f22acfd001 \ No newline at end of file diff --git a/composer.json b/composer.json index 2c0289a..ea74dd9 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,8 @@ "symfony/assetic-bundle": "^2.8", "predis/predis": "^1.0", "snc/redis-bundle": "^2.0", - "hwi/oauth-bundle": "^0.5.1" + "hwi/oauth-bundle": "^0.5.1", + "cleentfaar/slack-bundle": "^0.20.1" }, "require-dev": { "sensio/generator-bundle": "^3.0", diff --git a/composer.lock b/composer.lock index a38a9b8..1bf05b6 100644 --- a/composer.lock +++ b/composer.lock @@ -4,9 +4,122 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "9ab894ab9dec6a53088c8bea70e8ee9a", - "content-hash": "06afd75cc129d2765a6803d384805417", + "hash": "8325ddf53babcbda387208723c05a0f0", + "content-hash": "d9f2a2a5e6279269f9f7c2cc1fe0573a", "packages": [ + { + "name": "cleentfaar/slack", + "version": "0.20.1", + "source": { + "type": "git", + "url": "https://github.com/cleentfaar/slack.git", + "reference": "ba7073cb79ccea423cd68f6a69096384a730a013" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cleentfaar/slack/zipball/ba7073cb79ccea423cd68f6a69096384a730a013", + "reference": "ba7073cb79ccea423cd68f6a69096384a730a013", + "shasum": "" + }, + "require": { + "doctrine/collections": "^1.2", + "ext-curl": "*", + "guzzlehttp/guzzle": "^6.0", + "jms/serializer": "^1.0", + "php": ">=5.5", + "symfony/event-dispatcher": "^2.3|^3.0", + "symfony/yaml": "^2.3|^3.0" + }, + "require-dev": { + "mockery/mockery": "^0.9", + "phpunit/phpunit": "^4.7", + "symfony/var-dumper": "^2.3|^3.0" + }, + "suggest": { + "cleentfaar/slack-bundle": "For easy integration with your Symfony projects", + "cleentfaar/slack-cli": "Command-line application for interacting with the Slack API" + }, + "type": "library", + "autoload": { + "psr-4": { + "CL\\Slack\\": "src/CL/Slack/", + "CL\\Slack\\Test\\": "tests/src/CL/Slack/Test/", + "CL\\Slack\\Tests\\": "tests/src/CL/Slack/Tests/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Cas Leentfaar", + "email": "info@casleentfaar.com", + "homepage": "https://github.com/cleentfaar" + } + ], + "description": "Access your Slack Team's API through PHP objects", + "homepage": "http://cleentfaar.github.io/slack/", + "keywords": [ + "chat", + "slack", + "slack api" + ], + "time": "2016-05-30 21:02:28" + }, + { + "name": "cleentfaar/slack-bundle", + "version": "0.20.1", + "source": { + "type": "git", + "url": "https://github.com/cleentfaar/CLSlackBundle.git", + "reference": "f9fec94912a845f44d8de686ed06925168c1fc5b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cleentfaar/CLSlackBundle/zipball/f9fec94912a845f44d8de686ed06925168c1fc5b", + "reference": "f9fec94912a845f44d8de686ed06925168c1fc5b", + "shasum": "" + }, + "require": { + "cleentfaar/slack": "~0.20", + "php": ">=5.5", + "symfony/framework-bundle": "^2.3|^3.0" + }, + "require-dev": { + "matthiasnoback/symfony-config-test": "^0.2", + "matthiasnoback/symfony-dependency-injection-test": "^0.7", + "phpunit/phpunit": "^4.0|^5.0" + }, + "suggest": { + "cleentfaar/slack-cli": "Command-line application for interacting with the Slack API" + }, + "type": "symfony-bundle", + "autoload": { + "psr-4": { + "CL\\Bundle\\SlackBundle\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Cas Leentfaar", + "email": "info@casleentfaar.com", + "homepage": "https://github.com/cleentfaar" + } + ], + "description": "This bundle provides integration with the Slack API library, allowing you to interact with the Slack API from within your Symfony projects", + "keywords": [ + "api", + "bundle", + "slack", + "symfony" + ], + "time": "2016-05-30 22:12:25" + }, { "name": "doctrine/annotations", "version": "v1.2.7", @@ -1560,6 +1673,177 @@ "abandoned": "guzzle/guzzle", "time": "2014-05-01 21:36:02" }, + { + "name": "guzzlehttp/guzzle", + "version": "6.2.2", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle.git", + "reference": "ebf29dee597f02f09f4d5bbecc68230ea9b08f60" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ebf29dee597f02f09f4d5bbecc68230ea9b08f60", + "reference": "ebf29dee597f02f09f4d5bbecc68230ea9b08f60", + "shasum": "" + }, + "require": { + "guzzlehttp/promises": "^1.0", + "guzzlehttp/psr7": "^1.3.1", + "php": ">=5.5" + }, + "require-dev": { + "ext-curl": "*", + "phpunit/phpunit": "^4.0", + "psr/log": "^1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "6.2-dev" + } + }, + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle is a PHP HTTP client library", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" + ], + "time": "2016-10-08 15:01:37" + }, + { + "name": "guzzlehttp/promises", + "version": "1.3.0", + "source": { + "type": "git", + "url": "https://github.com/guzzle/promises.git", + "reference": "2693c101803ca78b27972d84081d027fca790a1e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/promises/zipball/2693c101803ca78b27972d84081d027fca790a1e", + "reference": "2693c101803ca78b27972d84081d027fca790a1e", + "shasum": "" + }, + "require": { + "php": ">=5.5.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Promise\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle promises library", + "keywords": [ + "promise" + ], + "time": "2016-11-18 17:47:58" + }, + { + "name": "guzzlehttp/psr7", + "version": "1.3.1", + "source": { + "type": "git", + "url": "https://github.com/guzzle/psr7.git", + "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/5c6447c9df362e8f8093bda8f5d8873fe5c7f65b", + "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b", + "shasum": "" + }, + "require": { + "php": ">=5.4.0", + "psr/http-message": "~1.0" + }, + "provide": { + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "PSR-7 message implementation", + "keywords": [ + "http", + "message", + "stream", + "uri" + ], + "time": "2016-06-24 23:00:38" + }, { "name": "hwi/oauth-bundle", "version": "0.5.1", @@ -1810,6 +2094,167 @@ ], "time": "2014-01-12 16:20:24" }, + { + "name": "jms/metadata", + "version": "1.6.0", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/metadata.git", + "reference": "6a06970a10e0a532fb52d3959547123b84a3b3ab" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/schmittjoh/metadata/zipball/6a06970a10e0a532fb52d3959547123b84a3b3ab", + "reference": "6a06970a10e0a532fb52d3959547123b84a3b3ab", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "doctrine/cache": "~1.0", + "symfony/cache": "~3.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.5.x-dev" + } + }, + "autoload": { + "psr-0": { + "Metadata\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Class/method/property metadata management in PHP", + "keywords": [ + "annotations", + "metadata", + "xml", + "yaml" + ], + "time": "2016-12-05 10:18:33" + }, + { + "name": "jms/parser-lib", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/parser-lib.git", + "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/schmittjoh/parser-lib/zipball/c509473bc1b4866415627af0e1c6cc8ac97fa51d", + "reference": "c509473bc1b4866415627af0e1c6cc8ac97fa51d", + "shasum": "" + }, + "require": { + "phpoption/phpoption": ">=0.9,<2.0-dev" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "JMS\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache2" + ], + "description": "A library for easily creating recursive-descent parsers.", + "time": "2012-11-18 18:08:43" + }, + { + "name": "jms/serializer", + "version": "1.4.2", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/serializer.git", + "reference": "f39d8b4660d5cef43b0c3265ce642173d9b2c58b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/f39d8b4660d5cef43b0c3265ce642173d9b2c58b", + "reference": "f39d8b4660d5cef43b0c3265ce642173d9b2c58b", + "shasum": "" + }, + "require": { + "doctrine/annotations": "^1.0", + "doctrine/instantiator": "^1.0.3", + "jms/metadata": "~1.1", + "jms/parser-lib": "1.*", + "php": ">=5.5.0", + "phpcollection/phpcollection": "~0.1", + "phpoption/phpoption": "^1.1" + }, + "conflict": { + "twig/twig": "<1.12" + }, + "require-dev": { + "doctrine/orm": "~2.1", + "doctrine/phpcr-odm": "^1.3|^2.0", + "ext-pdo_sqlite": "*", + "jackalope/jackalope-doctrine-dbal": "^1.1.5", + "phpunit/phpunit": "^4.8|^5.0", + "propel/propel1": "~1.7", + "symfony/filesystem": "^2.1", + "symfony/form": "~2.1", + "symfony/translation": "^2.1", + "symfony/validator": "^2.2", + "symfony/yaml": "^2.1", + "twig/twig": "~1.12|~2.0" + }, + "suggest": { + "symfony/yaml": "Required if you'd like to serialize data to YAML format." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "psr-0": { + "JMS\\Serializer": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache2" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Library for (de-)serializing data of any complexity; supports XML, JSON, and YAML.", + "homepage": "http://jmsyst.com/libs/serializer", + "keywords": [ + "deserialization", + "jaxb", + "json", + "serialization", + "xml" + ], + "time": "2016-11-13 10:20:11" + }, { "name": "kriswallsmith/assetic", "version": "v1.3.2", @@ -2172,6 +2617,104 @@ ], "time": "2016-10-17 15:23:22" }, + { + "name": "phpcollection/phpcollection", + "version": "0.5.0", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/php-collection.git", + "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/schmittjoh/php-collection/zipball/f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6", + "reference": "f2bcff45c0da7c27991bbc1f90f47c4b7fb434a6", + "shasum": "" + }, + "require": { + "phpoption/phpoption": "1.*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.4-dev" + } + }, + "autoload": { + "psr-0": { + "PhpCollection": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache2" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "General-Purpose Collection Library for PHP", + "keywords": [ + "collection", + "list", + "map", + "sequence", + "set" + ], + "time": "2015-05-17 12:39:23" + }, + { + "name": "phpoption/phpoption", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/php-option.git", + "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/94e644f7d2051a5f0fcf77d81605f152eecff0ed", + "reference": "94e644f7d2051a5f0fcf77d81605f152eecff0ed", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "4.7.*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3-dev" + } + }, + "autoload": { + "psr-0": { + "PhpOption\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache2" + ], + "authors": [ + { + "name": "Johannes M. Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Option Type for PHP", + "keywords": [ + "language", + "option", + "php", + "type" + ], + "time": "2015-07-25 16:39:46" + }, { "name": "predis/predis", "version": "v1.1.1", @@ -2268,6 +2811,56 @@ ], "time": "2016-08-06 20:24:11" }, + { + "name": "psr/http-message", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "time": "2016-08-06 14:39:51" + }, { "name": "psr/log", "version": "1.0.2", diff --git a/src/Jotunheimr/UserBundle/Resources/public/css/layout.css b/src/Jotunheimr/UserBundle/Resources/public/css/layout.css index 6eaf671..3e8a242 100644 --- a/src/Jotunheimr/UserBundle/Resources/public/css/layout.css +++ b/src/Jotunheimr/UserBundle/Resources/public/css/layout.css @@ -111,8 +111,8 @@ header section form { z-index: 2; } -header section a.fb-login, -header section a.slack-login { +header section div.buttons > a.fb-login, +header section div.buttons > a.slack-login { position: relative; display: block; width: 500px; @@ -128,39 +128,39 @@ header section a.slack-login { box-shadow: 0 3px 5px rgba(0, 0, 0, 0.15); } -header section a.fb-login:hover, -header section a.slack-login:hover { +header section div.buttons > a.fb-login:hover, +header section div.buttons > a.slack-login:hover { 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, -header section a.slack-login i { +header section div.buttons > a.fb-login i, +header section div.buttons > a.slack-login i { position: absolute; font-size: 130px; top: 0; left: 15px; } -header section a.fb-login { +header section div.buttons > a.fb-login { background: #5975b1; border: 1px solid #50649f; } -header section a.fb-login:hover { +header section div.buttons > a.fb-login:hover { background: #42598c; color: #FFFFFF; } -header section a.slack-login { +header section div.buttons > a.slack-login { background: #FFFFFF; border: 1px solid #5c3a58; color: #5c3a58; } -header section a.slack-login:hover { +header section div.buttons > a.slack-login:hover { background: #e6e6e6; color: #5c3a58; } @@ -180,7 +180,8 @@ header section a.slack-login:hover { width: 100%; } - header section a.fb-login { + header section div.buttons > a.fb-login, + header section div.buttons > a.slack-login { margin: 0 auto; } } @@ -204,11 +205,13 @@ header section a.slack-login:hover { width: 100%; } - header section a.fb-login { + header section div.buttons > a.fb-login, + header section div.buttons > a.slack-login { width: 100%; } - header section a.fb-login span { + header section div.buttons > a.fb-login span, + header section div.buttons > a.slack-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 60849b6..13aea4a 100644 --- a/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig +++ b/src/Jotunheimr/UserBundle/Resources/views/Registration/register.html.twig @@ -5,8 +5,10 @@ {% block fos_user_content %}

Sign up

@@ -39,7 +41,7 @@
-

vagy regisztrálj egy kattintással

+

or login w/ one click

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

Bejelentkezés

+

Sign in

@@ -36,7 +38,7 @@
-

vagy jelentkezz be egy kattintással

+

or login w/ one click

{% include('@JotunheimrUser/Social/facebook.html.twig') %} {#
Most játszom egyet! - Regisztrálok · - Belépek -

version 0.18.11 (beta2) · MineSeeker© · www.laszlolang.com +

A minesweeper game rethought...

+

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

+ +

+ version {{ version }} · MineSeeker© · www.laszlolang.com

MineSeeker Logo diff --git a/src/Mine/SeekerBundle/Resources/views/Game/play.html.twig b/src/Mine/SeekerBundle/Resources/views/Game/play.html.twig index 9836d0a..5594447 100644 --- a/src/Mine/SeekerBundle/Resources/views/Game/play.html.twig +++ b/src/Mine/SeekerBundle/Resources/views/Game/play.html.twig @@ -1,14 +1,9 @@ {% extends '::base.html.twig' %} -{% block metas %} - {##} - {##} - {##} - {##} - {##} -{% endblock %} - {% block body %} + + Mineseeker Logo +
{% endblock %} +{% block metas %} + {##} + {##} + {##} + {##} + {##} +{% endblock %} + {% block stylesheets %} {% stylesheets filter='?uglifycss' '@MineSeekerBundle/Resources/public/css/style.mineseeker.css' %}