From 67f9a2f02f5737f80a7301659c88f9fdcd789472 Mon Sep 17 00:00:00 2001 From: Alexandre Bourlier <alexandre@happy-dev.fr> Date: Sat, 7 Jul 2018 17:52:41 +0200 Subject: [PATCH] feature - project creation started --- index.php | 5 +++-- src/html/member.html | 41 ++++++++++++---------------------- src/html/menu.html | 1 + src/html/project-creation.html | 8 +++++++ src/html/projects.html | 12 ++++++---- 5 files changed, 34 insertions(+), 33 deletions(-) create mode 100644 src/html/project-creation.html diff --git a/index.php b/index.php index 5f43fc36..0672ece3 100644 --- a/index.php +++ b/index.php @@ -32,6 +32,7 @@ <?php require_once('src/html/edit-profile.html'); ?> <?php require_once('src/html/projects.html'); ?> <?php require_once('src/html/project.html'); ?> + <?php require_once('src/html/project-creation.html'); ?> <?php require_once('src/html/project-edition.html'); ?> <?php require_once('src/html/channels.html'); ?> <?php require_once('src/html/channel.html'); ?> @@ -40,14 +41,14 @@ </main> <!-- This is a hack : https://git.happy-dev.fr/happy-dev/xmpp-chat-component/issues/24 --> - <sib-chat + <!--sib-chat data-src="https://djangoldp.happy-dev.fr/users/1" data-authentication="login" data-auto-login="true" data-bosh-service-url="http://jabber.happy-dev.fr/http-bind/" // FIXME: make HTTPS data-debug="false" data-locales-url="node_modules/converse.js/locale/{{{locale}}}/LC_MESSAGES/converse.json"> - </sib-chat> + </sib-chat--> <script> // Store url on load diff --git a/src/html/member.html b/src/html/member.html index 7e63341e..5d82e401 100644 --- a/src/html/member.html +++ b/src/html/member.html @@ -1,32 +1,19 @@ <div id="member" class="view-with-vertical-menu" style="display: none"> - <sib-router id="member-page-router" class="vertical-menu border-left" default-route="member-chat"> - <sib-route name="member-chat"> - <i class="fa fa-comment" aria-hidden="true"></i> - </sib-route> - <sib-route name="member-detail"> - <i class="fa fa-user" aria-hidden="true"></i> - </sib-route> - </sib-router> + <div class="section info"> + <i class="fa fa-pencil" aria-hidden="true"></i> + <i class="name fa fa-pencil" aria-hidden="true"></i> - <div id="member-chat" class="chat-wrapper"></div> - - <div id="member-detail" style="display: none"> - <div class="section info"> - <i class="fa fa-pencil" aria-hidden="true"></i> - <i class="name fa fa-pencil" aria-hidden="true"></i> - - <sib-display - id="member-info" - data-fields="avatar, user, before-pseudo, pseudo, bio, cell, number, roles, website, skills" - widget-avatar="sib-display-img" - widget-user="hdapp-userinfo" - widget-cell="hdapp-usercell" - widget-number="sib-display-tel" - widget-roles="sib-display-lookuplist" - widget-skills="sib-display-lookuplist" - bind-resources - ></sib-display> - </div> + <sib-display + id="member-info" + data-fields="avatar, user, before-pseudo, pseudo, bio, cell, number, roles, website, skills" + widget-avatar="sib-display-img" + widget-user="hdapp-userinfo" + widget-cell="hdapp-usercell" + widget-number="sib-display-tel" + widget-roles="sib-display-lookuplist" + widget-skills="sib-display-lookuplist" + bind-resources + ></sib-display> </div> </div> diff --git a/src/html/menu.html b/src/html/menu.html index c2fe0c33..a4ec9241 100644 --- a/src/html/menu.html +++ b/src/html/menu.html @@ -17,6 +17,7 @@ <i class="fa fa-tasks" aria-hidden="true"></i> <span class="d-none d-md-inline"> Projets</span> </sib-route> + <sib-route name="new-project">New project</sib-route> <sib-route class="d-none" name="project" id-prefix="<?php echo $sdn; ?>/projects/"></sib-route> <sib-route class="d-none" name="project-edition" id-prefix="<?php echo $sdn; ?>/channels/"></sib-route> diff --git a/src/html/project-creation.html b/src/html/project-creation.html new file mode 100644 index 00000000..6bf935f9 --- /dev/null +++ b/src/html/project-creation.html @@ -0,0 +1,8 @@ +<div id="new-project" style="display: none"> + <h1>NEW PROJECT</h1> + <sib-form + data-src="http://localhost:8000/projects/" + data-fields="name, number, client" + range-client="http://localhost:8000/clients/" + ></sib-form> +</div> diff --git a/src/html/projects.html b/src/html/projects.html index 28203c5b..0deef871 100644 --- a/src/html/projects.html +++ b/src/html/projects.html @@ -12,18 +12,22 @@ }); } } - customElements.define("ldp-display-client", LDPDisplayClient); + customElements.define("sib-display-client", LDPDisplayClient); }); </script> <div id="projects" style="display: none"> - <ldp-display + <sib-router route-prefix="projects"> + <sib-route name="new-project">New project</sib-route> + <sib-router> + + <sib-display id="projects-list" data-src="<?php echo $sdn; ?>/projects/" data-fields="number, client, name" - widget-client="ldp-display-client" + widget-client="sib-display-client" search-fields="number, name" next="project" - ></ldp-display> + ></sib-display> </div> -- GitLab