diff --git a/.env b/.env index 99c918a..71d04a1 100644 --- a/.env +++ b/.env @@ -16,6 +16,7 @@ ###> symfony/framework-bundle ### APP_ENV=dev APP_SECRET=597b0529ac702d27dcb9089f7e69c362 +# Base website url, should contain https:// and having no trailing slash. example: BASE_URL=https://framadate.org BASE_URL=http://localhost/ #TRUSTED_PROXIES=127.0.0.1,127.0.0.2 #TRUSTED_HOSTS='^localhost|example\.com$' diff --git a/.env.production b/.env.production index 1c75074..bfa566b 100644 --- a/.env.production +++ b/.env.production @@ -16,7 +16,8 @@ ###> symfony/framework-bundle ### APP_ENV=prod APP_SECRET=597b0529ac702d27dcb9089f7e69c362 -BASE_URL=http://framadate.org +# Base website url, should contain https:// and having no trailing slash. example: BASE_URL=https://framadate.org +BASE_URL=https://framadate.org #TRUSTED_PROXIES=127.0.0.1,127.0.0.2 #TRUSTED_HOSTS='^localhost|example\.com$' ###< symfony/framework-bundle ### diff --git a/README.md b/README.md index 992a6c9..9978515 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,9 @@ Experimental REST backend in symfony 4 for Funky framadate frontend. https://framagit.org/framasoft/framadate/funky-framadate-front +Follow this guide to setup. + + ## TODO: return stack of votes when we want to get the configuration of one poll (see [doc/examples.md](doc/examples.md)) diff --git a/src/Controller/DefaultController.php b/src/Controller/DefaultController.php index 406bea1..7b8ffab 100644 --- a/src/Controller/DefaultController.php +++ b/src/Controller/DefaultController.php @@ -83,7 +83,7 @@ class DefaultController extends AbstractController { ]; $message = ( new Swift_Message( 'Framadate - mes sondages' ) ) - ->setFrom( 'ne-pas-repondre@framdate-api.cipherbliss.com' ) + ->setFrom( 'ne-pas-repondre@framadate-api.cipherbliss.com' ) ->setTo( $founduser->getEmail() ) ->setBody( $this->renderView( diff --git a/templates/emails/footer.html.twig b/templates/emails/footer.html.twig new file mode 100644 index 0000000..0fda947 --- /dev/null +++ b/templates/emails/footer.html.twig @@ -0,0 +1,4 @@ +Merci de votre confiance. + + Framadate + diff --git a/templates/emails/owner-list.html.twig b/templates/emails/owner-list.html.twig index fa32395..f1b44a0 100644 --- a/templates/emails/owner-list.html.twig +++ b/templates/emails/owner-list.html.twig @@ -1,17 +1,65 @@ {#[Framadate][Réservé à l'auteur] Sondage: TESSSSSSSSSST#} -Voici la liste des {{ polls|length }} sondages Framadate que vous avez créé. +

+ + Voici la liste des {{ polls|length }} sondages + + Framadate + + que vous avez créé. +

+
+ Si vous n'avez pas demandé à recevoir cet email, veuillez en informer les administrateurs du site Framadate. +

-Merci de votre confiance. -Framadate +{% include 'footer.html.twig' %} diff --git a/templates/index.html.twig b/templates/index.html.twig index 1f90455..a7d1957 100644 --- a/templates/index.html.twig +++ b/templates/index.html.twig @@ -22,6 +22,16 @@ +