From a5b22a483661e1049f54e1f846ba2138ea4a4bde Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Tue, 7 Nov 2017 12:08:45 +0100
Subject: [PATCH] Added 'in-dev' flag for incomplete views + added 'add' icon
 for sub-menu + migrated views for: profile, settings

---
 build/generic/view/history/details/main.twig  |  2 +-
 build/generic/view/profile/password/main.php  | 12 +++++
 build/generic/view/profile/password/main.twig | 15 ++++++
 build/generic/view/profile/view/main.php      | 12 +++++
 build/generic/view/profile/view/main.twig     |  1 +
 .../view/settings/admin/create/main.php       | 12 +++++
 .../view/settings/admin/create/main.twig      | 14 +++++
 .../generic/view/settings/admin/view/main.php | 12 +++++
 .../view/settings/admin/view/main.twig        |  1 +
 build/generic/view/settings/password/main.php | 12 +++++
 .../generic/view/settings/password/main.twig  | 15 ++++++
 build/generic/view/settings/view/main.php     | 12 +++++
 build/generic/view/settings/view/main.twig    |  1 +
 public_html/css/container.scss                | 11 +++-
 public_html/css/min/container.css             |  8 ++-
 public_html/src/static/sub-menu-side/add.svg  | 47 +++++++++++++++++
 public_html/view/profile.php                  | 25 +++------
 public_html/view/settings.php                 | 51 +++++++++++--------
 18 files changed, 221 insertions(+), 42 deletions(-)
 create mode 100644 build/generic/view/profile/password/main.php
 create mode 100644 build/generic/view/profile/password/main.twig
 create mode 100644 build/generic/view/profile/view/main.php
 create mode 100644 build/generic/view/profile/view/main.twig
 create mode 100644 build/generic/view/settings/admin/create/main.php
 create mode 100644 build/generic/view/settings/admin/create/main.twig
 create mode 100644 build/generic/view/settings/admin/view/main.php
 create mode 100644 build/generic/view/settings/admin/view/main.twig
 create mode 100644 build/generic/view/settings/password/main.php
 create mode 100644 build/generic/view/settings/password/main.twig
 create mode 100644 build/generic/view/settings/view/main.php
 create mode 100644 build/generic/view/settings/view/main.twig
 create mode 100644 public_html/src/static/sub-menu-side/add.svg

diff --git a/build/generic/view/history/details/main.twig b/build/generic/view/history/details/main.twig
index 89e4228..cfa9de2 100644
--- a/build/generic/view/history/details/main.twig
+++ b/build/generic/view/history/details/main.twig
@@ -1 +1 @@
-details
\ No newline at end of file
+<span class='in-dev'>In development.. This feature will soon be available.</span>
\ No newline at end of file
diff --git a/build/generic/view/profile/password/main.php b/build/generic/view/profile/password/main.php
new file mode 100644
index 0000000..611c9c5
--- /dev/null
+++ b/build/generic/view/profile/password/main.php
@@ -0,0 +1,12 @@
+<?php
+
+	namespace view\profile\password;
+
+	use \generic\core\i_view;
+
+
+	class main extends i_view{
+
+		public function __construct(){}
+
+	}
\ No newline at end of file
diff --git a/build/generic/view/profile/password/main.twig b/build/generic/view/profile/password/main.twig
new file mode 100644
index 0000000..697f191
--- /dev/null
+++ b/build/generic/view/profile/password/main.twig
@@ -0,0 +1,15 @@
+<form class='search'>
+
+	<input id='old_pwd' type='password' placeholder='Mot de passe actuel'><br>
+	<span class='error-msg old_pwd'></span><br>
+
+	<input id='new_pwd' type='password' placeholder='Nouveau mot de passe'><br>
+	<span class='error-msg new_pwd'></span><br>
+
+	<input id='confirm_pwd' type='password' placeholder='Confirmation'><br>
+	<span class='error-msg confirm_pwd'></span><br>
+
+
+	<button id='update_pwd'>Mettre à jour</button>
+
+</form>
\ No newline at end of file
diff --git a/build/generic/view/profile/view/main.php b/build/generic/view/profile/view/main.php
new file mode 100644
index 0000000..1210e78
--- /dev/null
+++ b/build/generic/view/profile/view/main.php
@@ -0,0 +1,12 @@
+<?php
+
+	namespace view\profile\view;
+
+	use \generic\core\i_view;
+
+
+	class main extends i_view{
+
+		public function __construct(){}
+
+	}
\ No newline at end of file
diff --git a/build/generic/view/profile/view/main.twig b/build/generic/view/profile/view/main.twig
new file mode 100644
index 0000000..cfa9de2
--- /dev/null
+++ b/build/generic/view/profile/view/main.twig
@@ -0,0 +1 @@
+<span class='in-dev'>In development.. This feature will soon be available.</span>
\ No newline at end of file
diff --git a/build/generic/view/settings/admin/create/main.php b/build/generic/view/settings/admin/create/main.php
new file mode 100644
index 0000000..3fe6883
--- /dev/null
+++ b/build/generic/view/settings/admin/create/main.php
@@ -0,0 +1,12 @@
+<?php
+
+	namespace view\settings\admin\create;
+
+	use \generic\core\i_view;
+
+
+	class main extends i_view{
+
+		public function __construct(){}
+
+	}
\ No newline at end of file
diff --git a/build/generic/view/settings/admin/create/main.twig b/build/generic/view/settings/admin/create/main.twig
new file mode 100644
index 0000000..c71f8f2
--- /dev/null
+++ b/build/generic/view/settings/admin/create/main.twig
@@ -0,0 +1,14 @@
+<form class='valid'>
+
+	<input id='admin_username' type='text' placeholder='Identifiant'><br>
+	<span class='error-msg admin_username'></span><br>
+
+	<input id='admin_mail' type='text' placeholder='Adresse mail'><br>
+	<span class='error-msg admin_mail'></span><br>
+
+	<input id='admin_password' type='text' placeholder='Mot de passe généré...' disabled><br>
+
+
+	<button id='admin_submit'>Créer l'administrateur</button>
+
+</form>
\ No newline at end of file
diff --git a/build/generic/view/settings/admin/view/main.php b/build/generic/view/settings/admin/view/main.php
new file mode 100644
index 0000000..ae74d69
--- /dev/null
+++ b/build/generic/view/settings/admin/view/main.php
@@ -0,0 +1,12 @@
+<?php
+
+	namespace view\settings\admin\view;
+
+	use \generic\core\i_view;
+
+
+	class main extends i_view{
+
+		public function __construct(){}
+
+	}
\ No newline at end of file
diff --git a/build/generic/view/settings/admin/view/main.twig b/build/generic/view/settings/admin/view/main.twig
new file mode 100644
index 0000000..cfa9de2
--- /dev/null
+++ b/build/generic/view/settings/admin/view/main.twig
@@ -0,0 +1 @@
+<span class='in-dev'>In development.. This feature will soon be available.</span>
\ No newline at end of file
diff --git a/build/generic/view/settings/password/main.php b/build/generic/view/settings/password/main.php
new file mode 100644
index 0000000..a909b76
--- /dev/null
+++ b/build/generic/view/settings/password/main.php
@@ -0,0 +1,12 @@
+<?php
+
+	namespace view\settings\password;
+
+	use \generic\core\i_view;
+
+
+	class main extends i_view{
+
+		public function __construct(){}
+
+	}
\ No newline at end of file
diff --git a/build/generic/view/settings/password/main.twig b/build/generic/view/settings/password/main.twig
new file mode 100644
index 0000000..c893bb3
--- /dev/null
+++ b/build/generic/view/settings/password/main.twig
@@ -0,0 +1,15 @@
+<form class='search'>
+
+	<input id='old_pwd' type='password' placeholder="Code d'accès actuel"><br>
+	<span class='error-msg old_pwd'></span><br>
+
+	<input id='new_pwd' type='password' placeholder="Nouveau code d'accès"><br>
+	<span class='error-msg new_pwd'></span><br>
+
+	<input id='confirm_pwd' type='password' placeholder='Confirmation'><br>
+	<span class='error-msg confirm_pwd'></span><br>
+
+
+	<button id='update_pwd'>Mettre à jour</button>
+
+</form>
\ No newline at end of file
diff --git a/build/generic/view/settings/view/main.php b/build/generic/view/settings/view/main.php
new file mode 100644
index 0000000..edc5aa0
--- /dev/null
+++ b/build/generic/view/settings/view/main.php
@@ -0,0 +1,12 @@
+<?php
+
+	namespace view\settings\view;
+
+	use \generic\core\i_view;
+
+
+	class main extends i_view{
+
+		public function __construct(){}
+
+	}
\ No newline at end of file
diff --git a/build/generic/view/settings/view/main.twig b/build/generic/view/settings/view/main.twig
new file mode 100644
index 0000000..cfa9de2
--- /dev/null
+++ b/build/generic/view/settings/view/main.twig
@@ -0,0 +1 @@
+<span class='in-dev'>In development.. This feature will soon be available.</span>
\ No newline at end of file
diff --git a/public_html/css/container.scss b/public_html/css/container.scss
index 2ebd558..187ee34 100755
--- a/public_html/css/container.scss
+++ b/public_html/css/container.scss
@@ -59,7 +59,7 @@
 		}
 
 		// Erreur
-		.error{
+		.error, .in-dev{
 			display: inline-block;
 			position: relative;
 				width: calc( 100% - 2*1em - 2*1em );
@@ -75,6 +75,15 @@
 			color: #fff;
 			text-shadow: 1px 1px darken($form-invalid-color, 10);
 		}
+
+
+		.in-dev{
+			border-color: $form-search-color;
+
+			background: $form-search-color;
+
+			text-shadow: 1px 1px darken($form-search-color, 10);
+		}
 	}
 
 
diff --git a/public_html/css/min/container.css b/public_html/css/min/container.css
index 16349c1..d73f7f3 100644
--- a/public_html/css/min/container.css
+++ b/public_html/css/min/container.css
@@ -62,7 +62,7 @@
   border-color: #5630ed;
 }
 
-#WRAPPER > #CONTAINER > section.active .error {
+#WRAPPER > #CONTAINER > section.active .error, #WRAPPER > #CONTAINER > section.active .in-dev {
   display: inline-block;
   position: relative;
   width: calc( 100% - 2*1em - 2*1em);
@@ -76,6 +76,12 @@
   text-shadow: 1px 1px #a72013;
 }
 
+#WRAPPER > #CONTAINER > section.active .in-dev {
+  border-color: #5630ed;
+  background: #5630ed;
+  text-shadow: 1px 1px #3a13d7;
+}
+
 #WRAPPER > #CONTAINER > section > .inline-box,
 #WRAPPER > #CONTAINER > section > .inline-row {
   display: inline-block;
diff --git a/public_html/src/static/sub-menu-side/add.svg b/public_html/src/static/sub-menu-side/add.svg
new file mode 100644
index 0000000..1fa6e5a
--- /dev/null
+++ b/public_html/src/static/sub-menu-side/add.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="32"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 32 32"
+   width="32"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="add.svg"><metadata
+     id="metadata9"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1056"
+     id="namedview5"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="14.75"
+     inkscape:cx="7.8644068"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     d="M 30,12 20,12 20,2 C 20,0.9 19.1,0 18,0 l -4,0 c -1.1,0 -2,0.9 -2,2 l 0,10 -10,0 c -1.1,0 -2,0.9 -2,2 l 0,4 c 0,1.1 0.9,2 2,2 l 10,0 0,10 c 0,1.1 0.9,2 2,2 l 4,0 c 1.1,0 2,-0.9 2,-2 l 0,-10 10,0 c 1.1,0 2,-0.9 2,-2 l 0,-4 c 0,-1.1 -0.9,-2 -2,-2 z"
+     id="stylisable"
+     inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
diff --git a/public_html/view/profile.php b/public_html/view/profile.php
index c901aae..5659d1a 100755
--- a/public_html/view/profile.php
+++ b/public_html/view/profile.php
@@ -1,6 +1,6 @@
 <?php define('__ROOT__', dirname(dirname(dirname(__FILE__))) );
 	require_once __ROOT__.'/vendor/autoload.php';
-	use \api\core\Request;
+	use \generic\core\View;
 ?>
 
 
@@ -34,13 +34,12 @@
 	/* MON PROFIL
 	*
 	*/
-	// if( $sublink == 'view' ){
+	echo "<section data-sublink='view'>";
 
-		echo "<section data-sublink='view'>";
-			echo 'Profil';
-		echo '</section>';
+		$view = View::load('profile.view');
+		echo $view->render();
 
-	// }
+	echo '</section>';
 
 
 
@@ -59,18 +58,8 @@
 	*/
 	echo "<section data-sublink='password'>";
 
-		echo "<form class='search'>";
-			echo "<input id='old_pwd' type='password' placeholder='Mot de passe actuel'><br>";
-			echo "<span class='error-msg old_pwd'></span><br>";
-
-			echo "<input id='new_pwd' type='password' placeholder='Nouveau mot de passe'><br>";
-			echo "<span class='error-msg new_pwd'></span><br>";
-
-			echo "<input id='confirm_pwd' type='password' placeholder='Confirmation'><br>";
-			echo "<span class='error-msg confirm_pwd'></span><br>";
-
-			echo "<button id='update_pwd'>Mettre à jour</button>";
-		echo "</form>";
+		$view = View::load('profile.password');
+		echo $view->render();
 
 	echo '</section>';
 
diff --git a/public_html/view/settings.php b/public_html/view/settings.php
index 35a6a16..d9d4e55 100755
--- a/public_html/view/settings.php
+++ b/public_html/view/settings.php
@@ -1,6 +1,6 @@
 <?php define('__ROOT__', dirname(dirname(dirname(__FILE__))) );
 	require_once __ROOT__.'/vendor/autoload.php';
-	use \api\core\Request;
+	use \generic\core\View;
 ?>
 
 <!-- [1] Gestion du sous-menu de gauche -->
@@ -16,35 +16,51 @@
 		<span>Mot de passe</span>
 	</span>
 
-	<span data-sublink='admin'    >
+	<span data-sublink='admins'   >
 		<span class='svg'><?php echo file_get_contents( __PUBLIC__.'/src/static/sub-menu-side/user.svg'  ); ?></span>
 		<span>Administrateurs</span>
 	</span>
 
+	<span data-sublink='admin'    >
+		<span class='svg'><?php echo file_get_contents( __PUBLIC__.'/src/static/sub-menu-side/add.svg'  ); ?></span>
+		<span>Administrateur</span>
+	</span>
+
 </nav>
 
 <?php
 
 
-	echo "<section data-sublink='info'></section>";
+	/* INFORMATIONS ENTREPOT
+	*
+	*/
+	echo "<section data-sublink='info'>";
+
+		$view = View::load('settings.view');
+		echo $view->render();
+
+	echo "</section>";
+
 
 	/* CHANGEMENT MOT DE PASSE
 	*
 	*/
 	echo "<section data-sublink='password'>";
 
-		echo "<form class='search'>";
-			echo "<input id='old_pwd' type='password' placeholder=\"Code d'accès actuel\"><br>";
-			echo "<span class='error-msg old_pwd'></span><br>";
+		$view = View::load('settings.password');
+		echo $view->render();
 
-			echo "<input id='new_pwd' type='password' placeholder=\"Nouveau code d'accès\"><br>";
-			echo "<span class='error-msg new_pwd'></span><br>";
+	echo '</section>';
 
-			echo "<input id='confirm_pwd' type='password' placeholder='Confirmation'><br>";
-			echo "<span class='error-msg confirm_pwd'></span><br>";
 
-			echo "<button id='update_pwd'>Mettre à jour</button>";
-		echo "</form>";
+
+	/* LISTE ADMINISTRATEURS
+	*
+	*/
+	echo "<section data-sublink='admins'>";
+
+		$view = View::load('settings.admin.view');
+		echo $view->render();
 
 	echo '</section>';
 
@@ -55,14 +71,7 @@
 	*/
 	echo "<section data-sublink='admin'>";
 
-		echo "<form class='valid'>";
-			echo "<input id='admin_username' type='text' placeholder='Identifiant'><br>";
-			echo "<span class='error-msg admin_username'></span><br>";
-			echo "<input id='admin_mail' type='text' placeholder='Adresse mail'><br>";
-			echo "<span class='error-msg admin_mail'></span><br>";
-			echo "<input id='admin_password' type='text' placeholder='Mot de passe généré...' disabled><br>";
-
-			echo "<button id='admin_submit'>Créer l'administrateur</button>";
-		echo "</form>";
+		$view = View::load('settings.admin.create');
+		echo $view->render();
 
 	echo '</section>';
\ No newline at end of file