diff --git a/templates/pages/home.html.twig b/templates/pages/home.html.twig index 0ddeda9..10176f3 100644 --- a/templates/pages/home.html.twig +++ b/templates/pages/home.html.twig @@ -1,5 +1,5 @@ {% extends 'base.html.twig' %} -{% block body %} +{% block outerBody %}
diff --git a/templates/poll/index.html.twig b/templates/poll/index.html.twig index 90507fd..88c2d29 100644 --- a/templates/poll/index.html.twig +++ b/templates/poll/index.html.twig @@ -42,7 +42,11 @@ {{ poll.mailOnVote ? 'Yes' : 'No' }} {{ poll.hideResults ? 'Yes' : 'No' }} {{ poll.showResultEvenIfPasswords ? 'Yes' : 'No' }} - {{ poll.password }} + + {% if poll.password %} + (***) oui, caché + {% endif %} + {{ poll.adminKey }} show diff --git a/update.sh b/update.sh index aeb7079..794b51f 100755 --- a/update.sh +++ b/update.sh @@ -11,7 +11,33 @@ composer install php bin/console doctrine:schema:update --force echo "######################" echo " update the funky frontend submodule " -echo "######################" +echo "############################################" +echo " verification des besoins de l'application " +echo "############################################" +if [ ! hash yarn ]; then + echo "la commande yarn est introuvable" + exit 1 +fi +echo " ✅ yarn" +if [ ! hash git ]; then + echo "la commande git est introuvable" + exit 1 +fi +echo " ✅ git" + +if [ ! -f .env || ! -f .env.local ]; then + echo "fichier d'environnement de symfony" + exit 1 +fi +echo " ✅ fichier d'environnement de symfony /.env ou /.env.local" + +if [ ! -f bin/console ]; then + echo "fichier console de symfony" + exit 1 +fi +echo " ✅ fichier console de symfony /bin/console " + + if [ ! -d "funky-framadate-front" ]; then # initiate sub directory for funky front git submodule init