1 files changed, 26 insertions, 13 deletions

diff --git a/src/controller/installation.php b/src/controller/installation.php
index 4aaa4e0..64ed94e 100644
--- a/src/controller/installation.php
+++ b/src/controller/installation.php
@@ -76,27 +76,29 @@ HTACCESS;
 // les informations ici ne sont pas demandées à l'utilisateur pour l'instant (on verra ça plus tard)
 function makeStartPage(EntityManager $entityManager){
         /* -- table page -- */
-        // paramètres: name_page, end_of_path, reachable, in_menu, position, parent
+        // paramètres: name_page, end_of_path, reachable, in_menu, hidden, position, parent
         $accueil = new Page('Accueil', 'accueil', true, true, false, 1, NULL);
-        $connection = new Page('Connexion', 'connexion', true, false, false, NULL, NULL);
         $article = new Page('Article', 'article', true, false, false, NULL, NULL);
+        $connection = new Page('Connexion', 'connexion', true, false, false, NULL, NULL);
         $menu_paths = new Page("Menu et chemins", 'menu_chemins', true, false, false, NULL, NULL);
-        $edit_page = new Page("Modification d'une page", 'modif_page', true, false, false, NULL, NULL);
+        //$edit_page = new Page("Modification d'une page", 'modif_page', true, false, false, NULL, NULL); // pas de page "Modification de la page"
         $new_page = new Page('Nouvelle page', 'nouvelle_page', true, false, false, NULL, NULL);
         
         /* -- table node -- */
         // paramètres: name_node, article_timestamp, attributes, position, parent, page, article
-        $head_accueil = new Node('head', NULL, ['css_array' => ['body', 'head', 'nav', 'main', 'foot'], 'js_array' => ['main']], 1, NULL, $accueil, NULL);
+        $head_accueil = new Node('head', NULL, ['css_array' => ['body', 'head', 'nav', 'foot'], 'js_array' => ['main']], 1, NULL, $accueil, NULL);
+        $head_article = new Node('head', NULL, ['css_array' => ['body', 'head', 'nav', 'foot'], 'js_array' => ['main']], 1, NULL, $article, NULL);
         $header = new Node('header', NULL, [], 2, NULL, NULL, NULL);
         $nav = new Node('nav', NULL, [], 1, $header, NULL, NULL);
         $main = new Node('main', NULL, [], 3, NULL, NULL, NULL);
         $footer = new Node('footer', NULL, [], 4, NULL, NULL, NULL);
         $breadcrumb = new Node('breadcrumb', NULL, [], 2, $header, NULL, NULL);
-        $head_login = new Node('head', NULL, ["stop" => true, 'css_array' => ['body', 'head', 'nav', 'main'], 'js_array' => ['main']], 1, NULL, $connection, NULL);
+        $head_login = new Node('head', NULL, ["stop" => true, 'css_array' => ['body', 'head', 'nav'], 'js_array' => ['main']], 1, NULL, $connection, NULL);
         $login = new Node('login', NULL, [], 1, $main, $connection, NULL);
-        $head_article = new Node('head', NULL, ['css_array' => ['body', 'head', 'nav', 'main', 'foot'], 'js_array' => ['main']], 1, NULL, $article, NULL);
-        $head_edit_menu = new Node('head', NULL, ['css_array' => ['body', 'head', 'nav', 'main', 'menu'], 'js_array' => ['main', 'menu']], 1, NULL, $menu_paths, NULL);
-        $edit_menu = new Node('menu', NULL, [], 1, $main, $menu_paths, NULL);
+        $head_edit_menu = new Node('head', NULL, ['css_array' => ['body', 'head', 'nav', 'menu'], 'js_array' => ['main', 'menu']], 1, NULL, $menu_paths, NULL);
+        $bloc_edit_menu = new Node('menu', NULL, [], 1, $main, $menu_paths, NULL);
+        $head_new_page = new Node('head', NULL, ['css_array' => ['body', 'head', 'nav', 'new_page'], 'js_array' => ['main', 'new_page']], 1, NULL, $new_page, NULL);
+        $bloc_new_page = new Node('new_page', NULL, [], 1, $main, $new_page, NULL);
 
         /* -- table image -- */
         // paramètres: file_name, file_path, file_path_mini, mime_type, alt
@@ -107,20 +109,24 @@ function makeStartPage(EntityManager $entityManager){
         $fond_piscine = new Image("fond-piscine.jpg", "assets/fond-piscine.jpg", NULL, "images/jpg", "fond-piscine");
 
         /* -- table node_data -- */
-        // paramètres: data, node
+        // paramètres: data, node, images
         $head_accueil_data = new NodeData(["description" => "Club, École de natation et Perfectionnement", "title" => "Les Nageurs Bigoudens"], $head_accueil, new ArrayCollection([$favicon]));
         $header_data = new NodeData(["description" => "Club, École de natation et Perfectionnement", "title" => "Les Nageurs Bigoudens", "facebook_link" => "https://www.facebook.com/nageursbigoudens29120", "instagram_link" => "https://www.instagram.com/nageursbigoudens/"], $header, new ArrayCollection([$logo, $facebook, $instagram, $fond_piscine]));
         $footer_data = new NodeData(["adresse" => "17, rue Raymonde Folgoas Guillou, 29120 Pont-l’Abbé", "contact_nom" => "Les Nageurs Bigoudens", "e_mail" => "nb.secretariat@orange.fr", "logo_footer" => "assets/logo-nb-et-ffn.png"], $footer);
         $head_login_data = new NodeData(["description" => "Connexion", "title" => "Connexion"], $head_login, new ArrayCollection([$favicon]));
         $head_article_data = new NodeData(["description" => "", "title" => ""], $head_article, new ArrayCollection([$favicon]));
         $head_edit_menu_data = new NodeData(["description" => "Menu et chemins", "title" => "Menu et chemins"], $head_edit_menu, new ArrayCollection([$favicon]));
+        $head_new_page_data = new NodeData(["description" => "Nouvelle page", "title" => "Nouvelle page"], $head_new_page, new ArrayCollection([$favicon]));
 
+        /* -- table page -- */
     $entityManager->persist($accueil);
-        $entityManager->persist($connection);
         $entityManager->persist($article);
+        $entityManager->persist($connection);
         $entityManager->persist($menu_paths);
-        $entityManager->persist($edit_page);
+        //$entityManager->persist($edit_page); // pas de page "Modification de la page"
         $entityManager->persist($new_page);
+        
+        /* -- table node -- */
         $entityManager->persist($head_accueil);
         $entityManager->persist($header);
         $entityManager->persist($nav);
@@ -131,20 +137,27 @@ function makeStartPage(EntityManager $entityManager){
         $entityManager->persist($login);
         $entityManager->persist($head_article);
         $entityManager->persist($head_edit_menu);
-        $entityManager->persist($edit_menu);
+        $entityManager->persist($bloc_edit_menu);
+        $entityManager->persist($head_new_page);
+        $entityManager->persist($bloc_new_page);
+        
+        /* -- table image -- */
         $entityManager->persist($favicon);
         $entityManager->persist($logo);
         $entityManager->persist($facebook);
         $entityManager->persist($instagram);
         $entityManager->persist($fond_piscine);
+        
+        /* -- table node_data -- */
         $entityManager->persist($head_accueil_data);
         $entityManager->persist($header_data);
         $entityManager->persist($footer_data);
         $entityManager->persist($head_login_data);
         $entityManager->persist($head_article_data);
         $entityManager->persist($head_edit_menu_data);
-    $entityManager->flush();
+        $entityManager->persist($head_new_page_data);
 
+    $entityManager->flush();
         header('Location: ' . new URL);
         die;
 }
\ No newline at end of file