From 97fa85188bb57350d8c53b830ebb45a57d095988 Mon Sep 17 00:00:00 2001
From: Alexandre Bourlier <alexandre@happy-dev.fr>
Date: Tue, 15 May 2018 08:08:31 +0200
Subject: [PATCH] Edit profile - Connected correctly now (via hack)
---
index.php | 2 ++
src/html/channel-edition.html | 7 +++++
src/html/dashboard.html | 27 ++++++++++---------
src/html/edit-profile.html | 13 +++++-----
src/html/home.html | 5 ----
src/html/member.html | 49 +++++++++++++++++++++++------------
src/html/menu.html | 10 +++----
src/html/project-edition.html | 8 ++++++
src/scss/_channels.scss | 1 -
src/scss/_dashboard.scss | 5 ++--
src/scss/_member.scss | 20 ++++++++++++--
src/scss/_projects.scss | 1 -
12 files changed, 95 insertions(+), 53 deletions(-)
create mode 100644 src/html/channel-edition.html
delete mode 100644 src/html/home.html
create mode 100644 src/html/project-edition.html
diff --git a/index.php b/index.php
index 06766093..17b78814 100644
--- a/index.php
+++ b/index.php
@@ -32,8 +32,10 @@
<?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-edition.html'); ?>
<?php require_once('src/html/channels.html'); ?>
<?php require_once('src/html/channel.html'); ?>
+ <?php require_once('src/html/channel-edition.html'); ?>
<?php require_once('src/html/search.html'); ?>
</main>
diff --git a/src/html/channel-edition.html b/src/html/channel-edition.html
new file mode 100644
index 00000000..f6c9ff48
--- /dev/null
+++ b/src/html/channel-edition.html
@@ -0,0 +1,7 @@
+<div id="channel-edition" style="display: none">
+ <ldp-form
+ class="edit-form"
+ data-src="<?php echo $sdn; ?>/channels/1/"
+ bind-resources
+ ></ldp-form>
+</div>
diff --git a/src/html/dashboard.html b/src/html/dashboard.html
index 3d43d0e8..37ffb96e 100644
--- a/src/html/dashboard.html
+++ b/src/html/dashboard.html
@@ -7,17 +7,20 @@
<!--</form>-->
<div class="list-condensed">
- <ldp-router>
- <ldp-route name="edit-profile" id-prefix="<?php echo $sdn; ?>/members/">
- <ldp-display
- data-src="<?php echo $sdn; ?>/members/1/"
- set-name="firstname, name-separator, lastname"
- value-name-separator=" "
- data-fields="avatar, name"
- widget-avatar="ldp-display-img"
- next="edit-profile"
- ></ldp-display>
- </ldp-route>
- </ldp-router>
+ <ldp-display
+ id="to-user-profile"
+ data-src="<?php echo $sdn; ?>/members/1/"
+ set-name="firstname, name-separator, lastname"
+ value-name-separator=" "
+ data-fields="avatar, name"
+ widget-avatar="ldp-display-img"
+ ></ldp-display>
</div>
+
+ <script>
+ document.querySelector("#to-user-profile").addEventListener("click", () => {
+ document.getElementById("navbar-router").navigate("member");
+ document.getElementById("member-page-router").navigate("member-detail");
+ });
+ </script>
</div>
diff --git a/src/html/edit-profile.html b/src/html/edit-profile.html
index cbde15fb..f2dfa908 100644
--- a/src/html/edit-profile.html
+++ b/src/html/edit-profile.html
@@ -18,17 +18,16 @@
</script>
<div id="edit-profile" style="display: none">
- <!--ldp-form
- class="edit-form"
- data-src="<?php echo $sdn; ?>/members/1/"
- bind-resources
- ></ldp-form-->
-
-
<label for="avatar-input">
<img id="avatar-preview" src="http://cdn.hd-app.local/members/alexandre-bourlier.jpg" style="width: 100%;"/>
</label>
<input type="file" id="avatar-input" name="avatar" value="http://cdn.hd-app.local/members/alexandre-bourlier.jpg" />`;
+
+ <ldp-form
+ class="edit-form"
+ data-src="<?php echo $sdn; ?>/members/1/"
+ bind-resources
+ ></ldp-form>
</div>
<div id="crop-modal">
diff --git a/src/html/home.html b/src/html/home.html
deleted file mode 100644
index 14c027aa..00000000
--- a/src/html/home.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<div id="home" style="display: none">
- <div id="logoContainer">
- <img src="./img/Logo_Happy_Dev.png" alt="Logo Happy Dev">
- </div>
-</div>
diff --git a/src/html/member.html b/src/html/member.html
index 21a20e77..85bab3db 100644
--- a/src/html/member.html
+++ b/src/html/member.html
@@ -11,23 +11,40 @@
<div id="member-chat" class="chat-wrapper"></div>
<div id="member-detail" style="display: none">
- <ldp-display
- id="member-info"
- set-name="firstname, name-separator, lastname"
- value-name-separator=" "
- data-fields="avatar, name, cell, email, number"
- widget-avatar="ldp-display-img"
- widget-cell="ldp-display-cell"
- widget-email="ldp-display-mailto"
- widget-number="ldp-display-tel"
- bind-resources
- ></ldp-display>
+ <div class="section info">
+ <i class="fa fa-pencil" aria-hidden="true"></i>
+ <i class="name fa fa-pencil" aria-hidden="true"></i>
- <h2 class="section skills">Compétences</h2>
- <ldp-display
- id="member-skills"
- id-suffix="skills"
- bind-resources
+ <ldp-display
+ id="member-info"
+ data-src="<?php echo $sdn; ?>/members/1/"
+ set-name="firstname, name-separator, lastname"
+ value-name-separator=" "
+ data-fields="avatar, name, cell, email, number"
+ widget-avatar="ldp-display-img"
+ widget-cell="ldp-display-cell"
+ widget-email="ldp-display-mailto"
+ widget-number="ldp-display-tel"
+ bind-resources
></ldp-display>
+ </div>
+
+ <div class="section skills">
+ <i class="fa fa-pencil" aria-hidden="true"></i>
+ <h2>Compétences</h2>
+ <ldp-display
+ id="member-skills"
+ id-suffix="skills"
+ bind-resources
+ ></ldp-display>
+ </div>
</div>
</div>
+
+<script>
+ document.querySelectorAll("#member-detail .fa-pencil").forEach((el) => {
+ el.addEventListener("click", (e) => {
+ document.getElementById('navbar-router').navigate('edit-profile');
+ });
+ });
+</script>
diff --git a/src/html/menu.html b/src/html/menu.html
index 2598d69d..21090ec6 100644
--- a/src/html/menu.html
+++ b/src/html/menu.html
@@ -17,17 +17,15 @@
<i class="fa fa-tasks" aria-hidden="true"></i>
<span class="d-none d-md-inline"> Projets</span>
</ldp-route>
- <ldp-route class="nav-item d-none" name="project" id-prefix="<?php echo $sdn; ?>/projects/">
- Projet
- </ldp-route>
+ <ldp-route class="d-none" name="project" id-prefix="<?php echo $sdn; ?>/projects/"></ldp-route>
+ <ldp-route class="d-none" name="project-edition" id-prefix="<?php echo $sdn; ?>/channels/"></ldp-route>
<ldp-route class="nav-item pb-2 align-self-stretch text-center text-md-left" name="channels">
<i class="fa fa-comments" aria-hidden="true"></i>
<span class="d-none d-md-inline"> Channels</span>
</ldp-route>
- <ldp-route class="nav-item d-none" name="channel" id-prefix="<?php echo $sdn; ?>/channels/">
- channel
- </ldp-route>
+ <ldp-route class="d-none" name="channel" id-prefix="<?php echo $sdn; ?>/channels/"></ldp-route>
+ <ldp-route class="d-none" name="channel-edition" id-prefix="<?php echo $sdn; ?>/channels/"></ldp-route>
</div>
<div class="col-2 col-md-1"></div>
diff --git a/src/html/project-edition.html b/src/html/project-edition.html
new file mode 100644
index 00000000..fbd8a5af
--- /dev/null
+++ b/src/html/project-edition.html
@@ -0,0 +1,8 @@
+<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/scss/_channels.scss b/src/scss/_channels.scss
index efd811f8..d5f0e816 100644
--- a/src/scss/_channels.scss
+++ b/src/scss/_channels.scss
@@ -2,7 +2,6 @@
#channels-list {
display: flex;
flex-direction: column;
- margin-top: 40px;
ldp-display {
@extend %td;
diff --git a/src/scss/_dashboard.scss b/src/scss/_dashboard.scss
index ed3af217..c85ed58c 100644
--- a/src/scss/_dashboard.scss
+++ b/src/scss/_dashboard.scss
@@ -1,6 +1,5 @@
#dashboard {
- #search-help {
- font-style: italic;
- padding-left: 5px;
+ #to-user-profile {
+ cursor: pointer;
}
}
diff --git a/src/scss/_member.scss b/src/scss/_member.scss
index 79aa023c..359cb2ac 100644
--- a/src/scss/_member.scss
+++ b/src/scss/_member.scss
@@ -61,8 +61,24 @@
}
.section {
- @extend %detail-section;
- margin-top: 40px;
+ position: relative;
+
+ i {
+ position: absolute;
+ display: block;
+ top: 5px;
+ right: 10px;
+ cursor: pointer;
+
+ &.name {
+ top: 290px;
+ }
+ }
+
+ h2 {
+ @extend %detail-section;
+ margin-top: 40px;
+ }
}
#member-skills {
diff --git a/src/scss/_projects.scss b/src/scss/_projects.scss
index a24e197a..3ace468d 100644
--- a/src/scss/_projects.scss
+++ b/src/scss/_projects.scss
@@ -2,7 +2,6 @@
#projects-list {
display: flex;
flex-direction: column;
- margin-top: 40px;
ldp-display {
@extend %td;
--
GitLab