diff --git a/src/Controller/DefaultController.php b/src/Controller/DefaultController.php index e9d3f7f..67f4455 100755 --- a/src/Controller/DefaultController.php +++ b/src/Controller/DefaultController.php @@ -15,21 +15,19 @@ use Symfony\Component\Mailer\Exception\TransportExceptionInterface; /** * Class DefaultController * @package App\Controller - * @Route("/page",name="api_") + * @Route("/",name="home_") */ class DefaultController extends FramadateController { /** * @Get(path ="/", - * name = "page_home") + * name = "sweet_home") */ public function indexAction() { $polls = $this->getDoctrine()->getRepository( Poll::class )->findAll(); - return $this->render( 'pages/home.html.twig',[ - 'polls' => $polls, - ]); + return $this->render( 'pages/home.html.twig',[ ]); } diff --git a/templates/base.html.twig b/templates/base.html.twig index 76db111..a2ad8c1 100755 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -2,11 +2,18 @@ + + + + + + + {% block title %}Framdate{% endblock %} - {% block stylesheets %} - - - {% endblock %} +{# {% block stylesheets %}#} +{# #} +{# #} +{# {% endblock %}#} {% include 'split/header.html.twig' %} @@ -14,14 +21,15 @@ {% block outerBody %}
- {% block body %}{% endblock %} + {% block body %} + {% endblock %}
{% endblock %} {% include 'split/footer.html.twig' %} -{% block javascripts %} - - -{% endblock %} +{# {% block javascripts %} #} +{# #} +{# #} +{# {% endblock %} #} diff --git a/templates/pages/home.html.twig b/templates/pages/home.html.twig index 75cc436..0ddeda9 100644 --- a/templates/pages/home.html.twig +++ b/templates/pages/home.html.twig @@ -2,9 +2,12 @@ {% block body %}
-

Accueil

-
- {{ polls|length }} sondages -
+ + + + + + +
{% endblock %} diff --git a/update.sh b/update.sh index a3040b2..aeb7079 100755 --- a/update.sh +++ b/update.sh @@ -46,11 +46,24 @@ npm run $COMMAND_BUILD echo "######################" echo " copying built files in the public folder of the symfony project " echo "######################" -rm -rf ../public/* +cd ../public +rm ./*.js +rm ./*.css +cd ../funky-framadate-front cp -r dist/framadate/* ../public/ -COUNT_FILES = ls -larth ../public |wc -l +COUNT_FILES=$(ls -larth ../public |wc -l) cd .. echo " $COUNT_FILES fichiers de build copiƩs dans /public" -echo "######################" -echo " done " +echo "##################################################################" +echo " renaming unieque name of JS chunks to common names for templates " +cd public + +mv runtime* runtime.js +mv main* main.js +mv polyfills-es5* es5-polyfills.js +mv polyfills* other-polyfills.js +mv scripts* scripts.js +mv styles* styles.css +echo "##################################################################" +echo " $(date) ------- done " echo "######################"