diff --git a/index.php b/index.php
index 29a286fc0264593373cbd2aa0d0a9b498c4b083d..f3fd076c72cbe1d9e08df2e6f80629819393f7e5 100644
--- a/index.php
+++ b/index.php
@@ -30,9 +30,7 @@
<?php require_once('src/html/members.html'); ?>
<?php require_once('src/html/member.php'); ?>
<?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/project.php'); ?>
<?php require_once('src/html/client-creation.html'); ?>
<?php require_once('src/html/channels.html'); ?>
<?php require_once('src/html/channel.html'); ?>
diff --git a/src/html/client-creation.html b/src/html/client-creation.html
index 1f1be0dfa458a20eae57445eb05469ebef917858..9ee6fc083adea355976b3e4bacfb0d54e2b91004 100644
--- a/src/html/client-creation.html
+++ b/src/html/client-creation.html
@@ -1,5 +1,4 @@
<div id="new-client" style="display: none">
- <h1>NEW CLIENT</h1>
<sib-form
data-src="http://localhost:8000/clients/"
data-fields="name, address, logo"
diff --git a/src/html/member-chat.html b/src/html/member-chat.html
index 19186819c214b1c9e394e090ebdced2db95177aa..01db9a074da2a5aea8dbcbcb5a95d611252f93a1 100644
--- a/src/html/member-chat.html
+++ b/src/html/member-chat.html
@@ -5,7 +5,7 @@
data-authentication="login"
data-auto-login="true"
data-bosh-service-url="http://jabber.happy-dev.fr/http-bind/"
- data-debug="true"
+ data-debug="false"
data-locales-url="node_modules/converse.js/locale/{{{locale}}}/LC_MESSAGES/converse.json"
bind-resources>
</sib-chat>
diff --git a/src/html/member-edit-profile.html b/src/html/member-edit.html
similarity index 98%
rename from src/html/member-edit-profile.html
rename to src/html/member-edit.html
index 81859d533973bc33f7e276022f66d385f9ce341c..60e51af903b1970422a8afe67f1eefb8ec3b9b0b 100644
--- a/src/html/member-edit-profile.html
+++ b/src/html/member-edit.html
@@ -16,7 +16,7 @@
//widget-avatar="ldp-form-img-upload"
</script>
-<div id="member-edit-profile" style="display: none">
+<div id="member-edit" style="display: none">
<label for="avatar-input" class="d-none">
<img id="avatar-preview" src="http://cdn.local/hdapp/members/alexandre-bourlier.jpg" style="width: 100%;"/>
</label>
diff --git a/src/html/member.php b/src/html/member.php
index 8b092d2e64595b7e67630c256afa95c4840da7da..b25db2b4fd671ead2d48028292332a60ab02b404 100644
--- a/src/html/member.php
+++ b/src/html/member.php
@@ -1,21 +1,19 @@
<div id="member" style="display: none">
- <div class="section info">
- <sib-router id="member-router" default-route="member-profile">
- <sib-route name="member-chat">
- <button>Chat</button>
- </sib-route>
- <sib-route name="member-profile">
- <button>Voir</button>
- </sib-route>
- <sib-route name="member-edit-profile">
- <button>Éditer</button>
- </sib-route>
- </sib-router>
+ <sib-router id="member-router" default-route="member-profile">
+ <sib-route name="member-chat">
+ <button>Chat</button>
+ </sib-route>
+ <sib-route name="member-profile">
+ <button>Voir</button>
+ </sib-route>
+ <sib-route name="member-edit">
+ <button>Éditer</button>
+ </sib-route>
+ </sib-router>
- <div id="member-views-container">
- <?php require_once('member-chat.html'); ?>
- <?php require_once('member-profile.html'); ?>
- <?php require_once('member-edit-profile.html'); ?>
- </div>
+ <div id="member-views-container">
+ <?php require_once('member-chat.html'); ?>
+ <?php require_once('member-profile.html'); ?>
+ <?php require_once('member-edit.html'); ?>
</div>
</div>
diff --git a/src/html/menu.html b/src/html/menu.html
index 76fe56ba3e079a94c3de5686aafbe4fedad838f1..6f1872294e60659735d8d4584171672d7f217d65 100644
--- a/src/html/menu.html
+++ b/src/html/menu.html
@@ -16,9 +16,8 @@
<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 name="new-client">New client</sib-route>
<sib-route class="d-none" name="project" id-prefix="<?php echo $sdn; ?>/projects/"></sib-route>
+ <sib-route name="new-client">New client</sib-route>
<sib-route class="d-none" name="project-edition" id-prefix="<?php echo $sdn; ?>/channels/"></sib-route>
<sib-route class="nav-item pb-2 align-self-stretch text-center text-md-left" name="channels">
diff --git a/src/html/project-chat.html b/src/html/project-chat.html
new file mode 100644
index 0000000000000000000000000000000000000000..272d2f4ef9c7e6cbc5328f189cc7f7a9e767b3e6
--- /dev/null
+++ b/src/html/project-chat.html
@@ -0,0 +1,3 @@
+<div id="project-chat" style="display: none">
+ <i>Chat coming soon...</i>
+</div>
diff --git a/src/html/project-create.html b/src/html/project-create.html
new file mode 100644
index 0000000000000000000000000000000000000000..01282299ce159b9d93de054150ff2f6ab649f057
--- /dev/null
+++ b/src/html/project-create.html
@@ -0,0 +1,8 @@
+<div id="project-create" style="display: none">
+ <sib-form
+ data-src="http://localhost:8000/projects/"
+ range-client="<?php echo $sdn; ?>/clients/"
+ widget-team="sib-form-multiple-dropdown"
+ range-team="<?php echo $sdn; ?>/team/"
+ ></sib-form>
+</div>
diff --git a/src/html/project-creation.html b/src/html/project-creation.html
deleted file mode 100644
index 6bf935f9eeb7c5ae18e8a81285cd00bd64e8cf5a..0000000000000000000000000000000000000000
--- a/src/html/project-creation.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<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/project-edit.html b/src/html/project-edit.html
new file mode 100644
index 0000000000000000000000000000000000000000..7b554dda6c7bed6324b085319db2788a03b9d2ee
--- /dev/null
+++ b/src/html/project-edit.html
@@ -0,0 +1,9 @@
+<div id="project-edit" style="display: none">
+ <sib-form
+ range-client="<?php echo $sdn; ?>/clients/"
+ widget-team="sib-form-multiple-dropdown"
+ range-team="<?php echo $sdn; ?>/team/"
+ bind-resources
+ ></sib-form>
+</div>
+
diff --git a/src/html/project-edition.html b/src/html/project-edition.html
deleted file mode 100644
index fbd8a5af67a7c5507fa14a46d062fa97c3fbc41e..0000000000000000000000000000000000000000
--- a/src/html/project-edition.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="project-edition" style="display: none">
- <ldp-form
- class="edit-form"
- data-src="<?php echo $sdn; ?>/projects/1/"
- bind-resources
- ></ldp-form>
-</div>
-
diff --git a/src/html/project-profile.html b/src/html/project-profile.html
new file mode 100644
index 0000000000000000000000000000000000000000..0d2ad8b1e2ed4c95644e943080cf9623a1e332ab
--- /dev/null
+++ b/src/html/project-profile.html
@@ -0,0 +1,19 @@
+<div id="project-profile" style="display: none">
+ <sib-display
+ data-fields="name, number, client"
+ widget-client="hdapp-client"
+ bind-resources
+ ></sib-display>
+
+ <h2>Team</h2>
+ <sib-display
+ class="members-list-condensed"
+ id-suffix="team"
+ data-fields="avatar, user"
+ widget-avatar="sib-display-img"
+ widget-user="hdapp-userinfo"
+ next="member"
+ bind-resources
+ ></sib-display>
+</div>
+
diff --git a/src/html/project.html b/src/html/project.html
deleted file mode 100644
index 2cb84de398c85f6dc38245778bdc891985b0f1ea..0000000000000000000000000000000000000000
--- a/src/html/project.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<div id="project" class="view-with-vertical-menu" style="display: none">
- <ldp-router id="project-page-router" class="vertical-menu border-left" default-route="profile-chat">
- <ldp-route name="project-chat">
- <i class="fa fa-comment" aria-hidden="true"></i>
- </ldp-route>
- <ldp-route name="project-detail">
- <i class="fa fa-user" aria-hidden="true"></i>
- </ldp-route>
- </ldp-router>
-
- <div id="project-chat" class="chat-wrapper"></div>
-
- <div id="project-detail" style="display: none">
- <ldp-display
- id="project-info"
- set-label="name, before-num, number, after-num"
- value-before-num=" (n°"
- value-after-num=")"
- data-fields="label, client"
- widget-client="ldp-display-client"
- bind-resources
- ></ldp-display>
-
- <h2 class="section team">L'équipe</h2>
- <ldp-display
- id="project-team"
- class="members-list-condensed"
- id-suffix="team"
- set-name="firstname, name-separator, lastname"
- value-name-separator=" "
- data-fields="avatar, name"
- widget-avatar="ldp-display-img"
- bind-resources
- ></ldp-display>
- </div>
-</div>
diff --git a/src/html/project.php b/src/html/project.php
new file mode 100644
index 0000000000000000000000000000000000000000..68ccc9489c7690cc866247497c121c5f8c6a069e
--- /dev/null
+++ b/src/html/project.php
@@ -0,0 +1,23 @@
+<div id="project" style="display: none">
+ <sib-router id="project-router" default-route="project-profile">
+ <sib-route name="project-chat">
+ <button>Chat</button>
+ </sib-route>
+ <sib-route name="project-profile">
+ <button>Voir</button>
+ </sib-route>
+ <sib-route name="project-edit">
+ <button>Éditer</button>
+ </sib-route>
+ <sib-route name="project-create">
+ <button>Nouveau</button>
+ </sib-route>
+ </sib-router>
+
+ <div id="project-views-container">
+ <?php require_once('project-chat.html'); ?>
+ <?php require_once('project-profile.html'); ?>
+ <?php require_once('project-edit.html'); ?>
+ <?php require_once('project-create.html'); ?>
+ </div>
+</div>
diff --git a/src/html/projects.html b/src/html/projects.html
index 0deef871f378b2d606c3156cc14b8ea1b936f83f..75089b52c6393f274e2ff184d2bc02156b9b1958 100644
--- a/src/html/projects.html
+++ b/src/html/projects.html
@@ -1,6 +1,6 @@
<script>
document.addEventListener("WebComponentsReady", function(event) {
- class LDPDisplayClient extends SIBWidget {
+ class HDAppClient extends SIBWidget {
get template() {
return `<img name="${this.name}" src="${this.value.logo}"/>`;
}
@@ -12,20 +12,15 @@
});
}
}
- customElements.define("sib-display-client", LDPDisplayClient);
+ customElements.define("hdapp-client", HDAppClient);
});
</script>
<div id="projects" style="display: none">
- <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="sib-display-client"
+ widget-client="hdapp-client"
search-fields="number, name"
next="project"
></sib-display>