config/packages/dev/mailer.yaml

@@ -1,8 +0,0 @@
-# config/packages/dev/mailer.yaml
-framework:
-  mailer:
-    envelope:
-      sender: 'noreply@tktest.com'
-      recipients: ['tykayn@pm.me']
-    headers:
-      from: 'dev framadate funky <noreply@tktest.com>'

config/packages/framework.yaml

@@ -1,6 +1,6 @@
 # see https://symfony.com/doc/current/reference/configuration/framework.html
 framework:
-    trusted_hosts: ['localhost:4200', 'localhost', 'tktest.lan', '127.0.0.1', 'framadate-api.cipherbliss.com']
+    trusted_hosts: ['localhost:4200', 'localhost', 'tktest.lan', 'framadate-api.cipherbliss.com']
     secret: '%env(APP_SECRET)%'
     #csrf_protection: true
     #http_method_override: true

migrations/Version20210518212646.php

@@ -1,31 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace DoctrineMigrations;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-/**
- * Auto-generated Migration: Please modify to your needs!
- */
-final class Version20210518212646 extends AbstractMigration
-{
-    public function getDescription() : string
-    {
-        return '';
-    }
-
-    public function up(Schema $schema) : void
-    {
-        // this up() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE poll ADD is_zero_knowledge TINYINT(1) DEFAULT NULL');
-    }
-
-    public function down(Schema $schema) : void
-    {
-        // this down() migration is auto-generated, please modify it to your needs
-        $this->addSql('ALTER TABLE poll DROP is_zero_knowledge');
-    }
-}

src/Controller/EmailsController.php

@@ -9,6 +9,7 @@ use Swift_Mailer;
 use Swift_Message;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
+
 /**
  * sending emails controller
  *

src/Controller/MigrationController.php

@@ -97,10 +97,10 @@ class MigrationController extends EmailsController {
 			$moments = explode( ',', $d->moments );
 			foreach ( $moments as $moment ) {
 				$newChoice = new Choice();
-				$dateOfDay = date_create( strtotime( $d->title ) );
 				$newChoice
 					->setPoll( $poll )
-					->setName( $dateOfDay->format('y-m-d'). ' >>> ' . $moment );
+					->setDateTime( date_create( strtotime( $d->title ) ) )
+					->setName( $moment );
 
 				$pollChoicesOrderedBySlug[ $pollSlug ][] = $newChoice;
 				$poll->addChoice( $newChoice );

src/Controller/api/v1/PollController.php

@@ -240,17 +240,9 @@ class PollController extends EmailsController {
 		$data = $request->getContent();
 		$data = json_decode( $data, true );
 
-		// search for existing custom url, which must be unique
-		$custom_url = $data[ 'custom_url' ];
-		$repository = $this->getDoctrine()->getRepository( Poll::class );
-		$poll       = $repository->findOneByCustomUrl( $custom_url );
-		if ( $poll ) {
-			throw new \JsonException( 'NOPE, ce sondage existe déjà: ' . $custom_url );
-		}
-
 		$newpoll = new Poll();
 		$newpoll
-			->setModificationPolicy( isset( $data[ 'modification_policy' ] ) ? $data[ 'modification_policy' ] : 'everybody' )
+			->setModificationPolicy( $data[ 'modification_policy' ] )
 			->setTitle( $data[ 'title' ] )
 			->setKind( $data[ 'kind' ] )
 			->setCustomUrl( $data[ 'custom_url' ] );
@@ -302,18 +294,17 @@ class PollController extends EmailsController {
 		if ( $data[ 'password' ] ) {
 			$newpoll->setPassword( $data[ 'password' ] );
 		}
-
+		// manage choices
 		// text kind of answers, dates are below
 		if ( $data[ 'kind' ] == 'text' ) {
-			// manage choices
+
-			$choices = $data[ 'choices' ];
+			$choices = $data[ 'dateChoices' ];
 			foreach ( $choices as $c ) {
 				$newChoice = new Choice();
 				$newChoice
 					->setPoll( $newpoll )
 					->setName( $c[ 'literal' ] );
 				$em->persist( $newChoice );
-				$newpoll->addChoice( $newChoice );
 			}
 		} // date kind of poll
 		elseif ( $data[ 'kind' ] == 'date' ) {
@@ -325,7 +316,7 @@ class PollController extends EmailsController {
 				foreach ( $choices as $c ) {
 					$currentDate = $c[ 'literal' ];
 
-					$timeSlicesOfThisChoice = $c[ 'timeSlices' ];
+					$timeSlicesOfThisChoice = $c[ 'timeList' ];
 					foreach ( $timeSlicesOfThisChoice as $t ) {
 
 						$newChoice = new Choice();
@@ -333,16 +324,14 @@ class PollController extends EmailsController {
 							->setPoll( $newpoll )
 							->setName( $currentDate . ' >>> ' . $t[ 'literal' ] );
 						$em->persist( $newChoice );
-						$newpoll->addChoice( $newChoice );
 					}
-
 				}
 
 			} else {
 				// all choices will be having the same time slices from timeSlices
 				$timeSlicesForAllChoices = $data[ 'timeSlices' ];
 				foreach ( $choices as $c ) {
-					$currentDate = $c[ 'date_object' ];
+					$currentDate = $c[ 'literal' ];
 
 					foreach ( $timeSlicesForAllChoices as $t ) {
 
@@ -351,7 +340,6 @@ class PollController extends EmailsController {
 							->setPoll( $newpoll )
 							->setName( $currentDate . ' >>> ' . $t[ 'literal' ] );
 						$em->persist( $newChoice );
-						$newpoll->addChoice( $newChoice );
 					}
 
 
@@ -359,6 +347,7 @@ class PollController extends EmailsController {
 
 			}
 
+
 		}
 
 		$em->persist( $newpoll );
@@ -370,11 +359,8 @@ class PollController extends EmailsController {
 
 		$this->sendCreationMailAction( $foundOwner, $newpoll );
 
-		$newChoices = $newpoll->display()[ 'choices' ];
-
 		return $this->json( [
-			'message'            => 'you created the poll ' . $newpoll->getCustomUrl() . $precision,
+			'message'            => 'you created a poll ' . $precision,
-			'id'                 => $newpoll->getId(),
 			'poll'               => $newpoll->displayForAdmin(),
 			'password_protected' => is_string( $newpoll->getPassword() ),
 
@@ -402,34 +388,19 @@ class PollController extends EmailsController {
 	public function testSendCreationMailAction(
 		$emailChoice = 'tktest_commentateur@tktest.com'
 	) {
-		$em         = $this->getDoctrine()->getRepository( Poll::class );
-		$foundPoll  = $em->findOneByCustomUrl( 'dessin-anime' );
 		$em         = $this->getDoctrine()->getRepository( Owner::class );
 		$foundOwner = $em->findOneByEmail( $emailChoice );
+		if ( $foundOwner ) {
+			$poll    = $foundOwner->getPolls()[ 0 ];
+			$comment = $foundOwner->getComments()[ 0 ];
 
-		return $this->render( 'emails/creation-mail.html.twig',
+			$sent = $this->sendOwnerPollsAction( $foundOwner );
-			[ 'poll' => $foundPoll, 'owner' => $foundPoll->getOwner() ] );
+			if ( $sent ) {
+				return $this->json( [ "message" => "test email sent to " . $foundOwner->getEmail() . "!" ], 200 );
+			}
+		}
 
-
+		return $this->json( [ "message" => "user with this email was not found" ], 400 );
-//		if ( $foundOwner ) {
-//			$sent = $this->sendOwnerPollsAction( $foundOwner );
-//			if ( $sent ) {
-//				$config = [
-//				'owner'          => $foundOwner,
-//				'title'          => $this->getParameter( 'WEBSITE_NAME' ) . ' | Mes sondages',
-//				'email_template' => 'emails/owner-list.html.twig',
-//			];
-//				return $this->render( 'emails/owner-list.html.twig', $config );
-
-//			}
-//		}
-
-//				return $this->json( [ "message" => "test email sent to " . $foundOwner->getEmail() . "!" ], 200 );
-
-//		$this->sendMailWithVars( $config );
-
-
-//		return $this->json( [ "message" => "user with this email was not found" ], 400 );
 
 	}
 

src/Controller/api/v1/VoteController.php

@@ -47,22 +47,14 @@ class VoteController extends EmailsController {
 		) {
 
 
-		/***
-		 * checks before persisting
-		 */
 		$em    = $this->getDoctrine()->getManager();
 		$emPol = $em->getRepository( Poll::class );
 		$poll  = $emPol->findOneByCustomUrl( $custom_url );
 
-		// check : existence of poll
 		if ( ! $poll ) {
 			return $this->json( [ 'message' => 'poll "' . $custom_url . '" not found' ], 404 );
 		}
-		// check : limit of number of participation max
+
-		if ( count( $poll->getStacksOfVotes() ) == $poll->getVotesMax() ) {
-			return $this->json( [ 'message' => 'poll "' . $custom_url . '" not allowed to have more stack of votes than ' . $poll->getVotesMax() ],
-				403 );
-		}
 		$data = $request->getContent();
 		$data = json_decode( $data, true );
 
@@ -71,7 +63,9 @@ class VoteController extends EmailsController {
 
 		$owner = new Owner();
 		$owner
-			->addPoll( $poll );
+			->addPoll( $poll )
+
+		;
 		$newStack = new StackOfVotes();
 		$newStack
 			->setPoll($poll)

src/Entity/Poll.php

@@ -85,15 +85,6 @@ class Poll {
 	 * @Serializer\Expose()
 	 */
 	public $votesAllowed = true;
-
-	/**
-	 * people can add votes
-	 * @ORM\Column(type="boolean", nullable=true)
-	 * @Serializer\Type("boolean")
-	 * @Serializer\Expose()
-	 */
-	public $isZeroKnowledge ;
-
 	/**
 	 * max number of stack of votes possible.
 	 * limits the number of people who can answer. as long as you trust the people to give only one answer with a reliable system.
@@ -771,18 +762,6 @@ class Poll {
 	public function setCommentsAllowed( ?bool $commentsAllowed ): self {
 		$this->commentsAllowed = $commentsAllowed;
 
-      		return $this;
-      	}
-
-    public function getIsZeroKnowledge(): ?bool
-    {
-        return $this->isZeroKnowledge;
-    }
-
-    public function setIsZeroKnowledge(?bool $isZeroKnowledge): self
-    {
-        $this->isZeroKnowledge = $isZeroKnowledge;
-
 		return $this;
 	}
 }

templates/email-base.html.twig

@@ -9,9 +9,9 @@
     <header>
         {% block title %}
             {% if  title is defined %}
-                <h1 class="text-center">{{ title }}</h1>
+                <h1>{{ title }}</h1>
             {% else %}
-                <h1 class="text-center">Framadate</h1>
+                <h1>Framadate - email</h1>
             {% endif %}
             <hr>
         {% endblock %}
@@ -30,9 +30,6 @@
 
 </div>
 <style type="text/css">
-    .text-center{
-        text-align:center;
-    }
     html, body, main, header, footer, div {
         font-family: "Open Sans", "Helvetica Neue", sans-serif;
     }

templates/emails/creation-mail.html.twig

@@ -2,12 +2,12 @@
 {% extends 'email-base.html.twig' %}
 {% block content %}
 
-<h1>✨ Création de votre sondage {{ poll.title }} </h1>
+
-    Suite à la création de votre sondage <strong>{{ poll.title }}</strong> vous recevez deux emails afin de ne pas transmettre par erreur aux sondés le lien d'administration de votre sondage.
+    Suite à la création de votre sondage {{ title }} vous recevez deux emails afin de ne pas transmettre par erreur aux sondés le lien d'administration de votre sondage.
     <br>
     Ce mail est le premier, comportant le message qui doit être envoyé aux sondés.<br>
 
-    Vous pouvez maintenant transmettre ce message à toutes les personnes susceptibles de participer au vote. ✔️ <br>
+    Vous pouvez maintenant transmettre ce message à toutes les personnes susceptibles de participer au vote.<br>
 
     <br>
     <fieldset>
@@ -15,7 +15,7 @@
         <blockquote>
             <i>
 
-                💡  {{ owner.pseudo }} ( {{ owner.email }} ) vient de créer un sondage intitulé : " <strong>{{ poll.title }}
+                {{ owner.pseudo }} ( {{ owner.email }} ) vient de créer un sondage intitulé : " <strong>{{ title }}
                     "</strong>.
                 <br>
                 <br>

templates/emails/expiration-mail.html.twig

@@ -3,17 +3,13 @@
 {% block content %}
 
 
-    <h1> 🎌  Votre sondage {{  poll.title }} va bientôt expirer dans 1 jour,</h1>
+    Ce sondage va bientôt expirer dans 1 jour, <br>
     <blockquote>
-      le  {{ poll.expiracyDate | date('D Y-m-d') }} :
+      le  {{ poll.expiracyDate | date('D Y-m-d') }}
     </blockquote>
     il ne sera plus possible d'y voter. <br>
     Dans 31 jours il sera supprimé.<br>
     Vous pouvez exporter ses données à tout moment en vous rendant à ce lien pour l'administrer:
     <br>
     {% include 'emails/partial/admin_link.html.twig' %}
-
-    <hr>
-    Plus de détails sur votre sondage :
-    {% include 'emails/partial/poll.html.twig' %}
 {% endblock %}

templates/emails/footer.html.twig

@@ -13,10 +13,10 @@
     <a href="https://framagit.org/framasoft/framadate/funky-framadate-front">
         Sources du client Front end,
     </a>
-    <a href="https://framagit.org/tykayn/date-poll-api">
+    <a href="https://framagit.org/framasoft/framadate/framadate">
         API back end.
     </a>
-    <a href="https://framagit.org/framasoft/framadate/funky-framadate-front/docs">
+    <a href="https://framagit.org/framasoft/framadate/funky-framadate-front/-/wikis/home">
         Documentation
     </a>
 

templates/emails/partial/admin_link.html.twig

@@ -1 +1,2 @@
-<a href="{{ BASE_URL }}/#/poll/{{ poll.customUrl }}/admin/{{ poll.adminKey }}">{{ BASE_URL }}/#/poll/{{ poll.customUrl }}/admin/{{ poll.adminKey }}</a>
+<a href="{{ BASE_URL }}/#/poll/{{ poll.id }}/admin/{{ poll.adminKey }}">{{ BASE_URL }}
+    /admin/{{ poll.adminKey }}</a>

templates/emails/partial/poll.html.twig

@@ -2,9 +2,11 @@
     <h1>
         Sondage {{ poll.title }}
     </h1>
+
+
     <br>
     <div class="creation">
-        créé le {{ poll.createdAt| date('Y m d ') }}
+        créé le {{ poll.creationDate| date('Y m d ') }}
     </div>
     <div class="creation">
         expirera le {{ poll.expiracyDate| date('Y m d ') }}
@@ -16,29 +18,22 @@
                     {{ poll.comments |length }} commentaires
                 </span>
     {% if poll.password |length %}
-        <div class="protected">
+        (accès avec mot de passe)
-        🔐 (accès avec mot de passe)
-        </div>
-    {% else %}
-    {% endif %}
-    {% if poll.isZeroKnowledge |length %}
-        <div class="protected-zero-knoledge">
-            🔐 Ce sondage bénéficie du chiffrement Zéro knowledge, nos administrateurs ne sont pas en mesure de connaître les informations du sondage.
-        </div>
     {% else %}
     {% endif %}
+
     <br>
 
     <div class="public">
-                <div>
+                <span>
                     lien à donner aux votants:
-                </div>
+                </span>
         {% include 'emails/partial/public_link.html.twig' %}
     </div>
     <div class="admin">
-                <div>
+                <span>
                     administration:
-                </div>
+                </span>
         {% include 'emails/partial/admin_link.html.twig' %}
     </div>
 </div>

templates/emails/partial/public_link.html.twig

@@ -1,10 +1,11 @@
 <span class="public-link">
 	{% if poll.customUrl |length %}
-        <a href="{{ BASE_URL }}/#/poll/{{ poll.customUrl }}/consultation">
+        <a href="{{ BASE_URL }}/#/vote/poll/key/{{ poll.customUrl }}">
-
+                {{ BASE_URL }}/#/vote/poll/key/{{ poll.customUrl }}
-✉️  {{ BASE_URL }}/#/poll/{{ poll.customUrl }}/consultation
             </a>
         {% else %}
-        erreur, il manque la customUrl de ce sondage.
+        <a href="{{ BASE_URL }}/#/vote/poll/id/{{ poll.id }}">
+                {{ BASE_URL }}/#/vote/poll/id/{{ poll.id }}
+            </a>
     {% endif %}
 </span>