diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig index bafd28d..6ec94eb 100644 --- a/app/Resources/views/base.html.twig +++ b/app/Resources/views/base.html.twig @@ -1,13 +1,28 @@ - - - {% block title %}Welcome!{% endblock %} - {% block stylesheets %}{% endblock %} - - - - {% block body %}{% endblock %} - {% block javascripts %}{% endblock %} - + + + + {% block title %}Welcome!{% endblock %} + {% block stylesheets %} + {#{% stylesheets filter='cssrewrite' + '@JotunheimrAdminBundle/Resources/public/js/vendor/bootstrap/css/bootstrap.min.css' + '@TollTereloBundle/Resources/public/css/style.css' %} + + {% endstylesheets %}#} + {% endblock %} + + + +{% block body %}{% endblock %} +{% 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' + '@TollTereloBundle/Resources/public/js/script.js' %} + + {% endjavascripts %}#} +{% endblock %} + diff --git a/src/Mine/SeekerBundle/Controller/DefaultController.php b/src/Mine/SeekerBundle/Controller/DefaultController.php deleted file mode 100644 index e3046db..0000000 --- a/src/Mine/SeekerBundle/Controller/DefaultController.php +++ /dev/null @@ -1,13 +0,0 @@ -render('MineSeekerBundle:Default:index.html.twig'); - } -} diff --git a/src/Mine/SeekerBundle/Controller/GameController.php b/src/Mine/SeekerBundle/Controller/GameController.php new file mode 100644 index 0000000..e9d635d --- /dev/null +++ b/src/Mine/SeekerBundle/Controller/GameController.php @@ -0,0 +1,13 @@ +render('MineSeekerBundle:Game:play.html.twig'); + } +} diff --git a/src/Mine/SeekerBundle/Resources/config/routing.yml b/src/Mine/SeekerBundle/Resources/config/routing.yml index 8a28b54..6084a4c 100644 --- a/src/Mine/SeekerBundle/Resources/config/routing.yml +++ b/src/Mine/SeekerBundle/Resources/config/routing.yml @@ -1,3 +1,3 @@ MineSeekerBundle_homepage: path: / - defaults: { _controller: MineSeekerBundle:Default:index } + defaults: { _controller: MineSeekerBundle:Game:play } diff --git a/src/Mine/SeekerBundle/Resources/public/js/src/build/react-dom-server.js b/src/Mine/SeekerBundle/Resources/public/js/src/build/react-dom-server.js new file mode 100644 index 0000000..3ce1843 --- /dev/null +++ b/src/Mine/SeekerBundle/Resources/public/js/src/build/react-dom-server.js @@ -0,0 +1,42 @@ +/** + * ReactDOMServer v15.3.2 + * + * Copyright 2013-present, Facebook, Inc. + * All rights reserved. + * + * This source code is licensed under the BSD-style license found in the + * LICENSE file in the root directory of this source tree. An additional grant + * of patent rights can be found in the PATENTS file in the same directory. + * + */ +// Based off https://github.com/ForbesLindesay/umd/blob/master/template.js +;(function(f) { + // CommonJS + if (typeof exports === "object" && typeof module !== "undefined") { + module.exports = f(require('react')); + + // RequireJS + } else if (typeof define === "function" && define.amd) { + define(['react'], f); + + // +{% endblock %} + +{% block javascripts %} + {{ parent() }} + + + + +{% endblock %} diff --git a/src/Mine/SeekerBundle/Tests/Controller/GameControllerTest.php b/src/Mine/SeekerBundle/Tests/Controller/GameControllerTest.php new file mode 100644 index 0000000..faf270b --- /dev/null +++ b/src/Mine/SeekerBundle/Tests/Controller/GameControllerTest.php @@ -0,0 +1,9 @@ +