Merge branch 'master' into doc/conception-bdd

Documentation/conception.puml

@@ -0,0 +1,12 @@
+@startuml
+
+class Connexion
+
+class Modele
+
+class Account
+
+class AccountGateway
+
+
+@enduml

ci/.drone.yml

@@ -44,8 +44,6 @@ steps:
       SERVER_PRIVATE_KEY:
         from_secret: SERVER_PRIVATE_KEY
     commands:
-      - mkdir ~/.ssh
-      - echo "$SERVER_PRIVATE_KEY" > ~/.ssh/id_rsa
-      - chmod 0600 ~/.ssh
-      - chmod 0500 ~/.ssh/id_rsa*
-      - rsync -avz -e "ssh -p 80 -o 'StrictHostKeyChecking=no'" --delete /outputs/* iqball@maxou.dev:/server/nginx/IQBall/$DRONE_BRANCH
+        - chmod +x ci/deploy.sh
+        - ci/deploy.sh
+

ci/deploy.sh

@@ -0,0 +1,9 @@
+set -e
+
+mkdir ~/.ssh
+echo "$SERVER_PRIVATE_KEY" > ~/.ssh/id_rsa
+chmod 0600 ~/.ssh
+chmod 0500 ~/.ssh/id_rsa*
+ssh -p 80 -o 'StrictHostKeyChecking=no' iqball@maxou.dev mkdir -p /server/nginx/IQBall/$DRONE_BRANCH
+rsync -avz -e "ssh -p 80 -o 'StrictHostKeyChecking=no'" --delete /outputs/* iqball@maxou.dev:/server/nginx/IQBall/$DRONE_BRANCH
+ssh -p 80 -o 'StrictHostKeyChecking=no' iqball@maxou.dev "chmod 770 /server/nginx/IQBall/$DRONE_BRANCH; chgrp www-data /server/nginx/IQBall/$DRONE_BRANCH"

composer.json

@@ -8,6 +8,7 @@
     "altorouter/altorouter": "1.2.0",
     "ext-json": "*",
     "ext-pdo": "*",
-    "ext-pdo_sqlite": "*"
+    "ext-pdo_sqlite": "*",
+    "twig/twig":"^2.0"
   }
 }

public/index.php

@@ -4,6 +4,7 @@ require "../vendor/autoload.php";
 require "../config.php";
 require "../sql/database.php";
 
+use \Twig\Loader\FilesystemLoader;
 use App\Connexion;
 use App\Controller\SampleFormController;
 use App\Gateway\FormResultGateway;
@@ -23,6 +24,9 @@ function get_base_path() {
     return $basePath;
 }
 
+$loader = new FilesystemLoader('../src/Views/');
+$twig = new \Twig\Environment($loader);
+
 $basePath = get_base_path();
 $con = new Connexion(get_database());
 
@@ -30,9 +34,11 @@ $con = new Connexion(get_database());
 $router = new AltoRouter();
 $router->setBasePath($basePath);
 
-$sampleFormController = new SampleFormController(new FormResultGateway($con));
+$sampleFormController = new SampleFormController(new FormResultGateway($con), $twig);
 $router->map("GET", "/", fn() => $sampleFormController->displayForm());
 $router->map("POST", "/submit", fn() => $sampleFormController->submitForm($_POST));
+$router->map("GET", "/twig", fn() => $sampleFormController->displayFormTwig());
+$router->map("POST", "/submit-twig", fn() => $sampleFormController->submitFormTwig($_POST));
 
 $match = $router->match();
 

sql/database.php

@@ -6,7 +6,7 @@
 function get_database(): PDO {
     // defined by profiles.
     global $data_source_name;
-    $pdo = new PDO($data_source_name, DATABASE_USER, DATABASE_PASSWORD);
+    $pdo = new PDO($data_source_name, DATABASE_USER, DATABASE_PASSWORD, [PDO::ERRMODE_EXCEPTION]);
 
     $database_exists = $pdo->query("SELECT COUNT(*) FROM sqlite_master WHERE type = 'table'")->fetchColumn() > 0;
 

src/Connexion.php

@@ -22,10 +22,7 @@ class Connexion {
      * @return void
      */
     public function exec(string $query, array $args) {
-        $stmnt = $this->pdo->prepare($query);
-        foreach ($args as $name => $value) {
-            $stmnt->bindValue($name, $value[0], $value[1]);
-        }
+        $stmnt = $this->prepare($query, $args);
         $stmnt->execute();
     }
 
@@ -36,12 +33,17 @@ class Connexion {
      * @return array the returned rows of the request
      */
     public function fetch(string $query, array $args): array {
+        $stmnt = $this->prepare($query, $args);
+        $stmnt->execute();
+        return $stmnt->fetchAll(PDO::FETCH_ASSOC);
+    }
+
+    private function prepare(string $query, array $args): \PDOStatement {
         $stmnt = $this->pdo->prepare($query);
         foreach ($args as $name => $value) {
             $stmnt->bindValue($name, $value[0], $value[1]);
         }
-        $stmnt->execute();
-        return $stmnt->fetchAll();
+        return $stmnt;
     }
 
 }

src/Controller/SampleFormController.php

@@ -4,17 +4,23 @@ namespace App\Controller;
 
 require_once __DIR__ . "/../react-display.php";
 use App\Gateway\FormResultGateway;
+use \Twig\Environment;
+use Twig\Error\LoaderError;
+use Twig\Error\RuntimeError;
+use Twig\Error\SyntaxError;
 
 class SampleFormController {
 
     private FormResultGateway $gateway;
+    private Environment $twig;
 
     /**
      * @param FormResultGateway $gateway
      */
-    public function __construct(FormResultGateway $gateway)
+    public function __construct(FormResultGateway $gateway, Environment $twig)
     {
         $this->gateway = $gateway;
+        $this->twig = $twig;
     }
 
 
@@ -27,4 +33,22 @@ class SampleFormController {
         $results = ["results" => $this->gateway->listResults()];
         send_react_front("views/DisplayResults.tsx", $results);
     }
+
+    public function displayFormTwig() {
+        try {
+            echo $this->twig->render('sample_form.html.twig', []);
+        } catch (LoaderError | RuntimeError | SyntaxError $e) {
+            echo "Twig error: $e";
+        }
+    }
+
+    public function submitFormTwig(array $request) {
+        $this->gateway->insert($request["name"], $request["description"]);
+        try {
+            $results = $this->gateway->listResults();
+            echo $this->twig->render('display_results.html.twig', ['results' => $results]);
+        } catch (LoaderError | RuntimeError | SyntaxError $e) {
+            echo "Twig error: $e";
+        }
+    }
 }

src/Views/display_results.html.twig

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Twig view</title>
+</head>
+<body>
+
+<h1>Hello world</h1>
+
+
+{% for v in results %}
+    <p>username: {{ v.name }}</p>
+    <p>description: {{ v.description }}</p>
+{% endfor %}
+
+</body>
+</html>

src/Views/sample_form.html.twig

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Twig view</title>
+</head>
+<body>
+
+<h1>Hello, this is a sample form made in Twig !</h1>
+
+<form action="submit-twig" method="POST">
+    <label for="name">your name: </label>
+    <input type="text" id="name" name="name"/>
+    <label for="password">a little description about yourself: </label>
+    <input type="text" id="password" name="description"/>
+    <input type="submit" value="click me to submit!"/>
+</form>
+
+</body>
+</html>

src/react-display-file.php

@@ -14,7 +14,6 @@
                 ";
             }
         ?>
-
     </script>
 
     <link rel="icon" href="<?= asset("assets/favicon.ico") ?>">