diff --git a/src/html/member.html b/src/html/member.html index 840e71cec89ba7de529aa2ec10fa0bc6026ef731..7979a91424b1fbc3f4caa99952988da846ae6e98 100644 --- a/src/html/member.html +++ b/src/html/member.html @@ -21,22 +21,22 @@ <div id="member-detail" style="display: none"> <ldp-display + id="member-info" set-name="firstname, name-separator, lastname" value-name-separator=" " - set-location="city, city-separator, country" - value-city-separator=", " - data-fields="avatar, name, location, email, number" + 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> - <span>Skills here</span> - <!--<ldp-display --> - <!--id="member-skills" --> - <!--id-suffix="skills"--> - <!--bind-resources--> - <!-- ></ldp-display>--> + <h2 class="section skills">Compétences</h2> + <ldp-display + id="member-skills" + id-suffix="skills" + bind-resources + ></ldp-display> </div> </div> diff --git a/src/html/members.html b/src/html/members.html index c68e637ebbf6a4727a99ec8adf69e08fe3fb78aa..8b6ff32741ada6d4a485b3847e85bd7c93f2ceab 100644 --- a/src/html/members.html +++ b/src/html/members.html @@ -3,6 +3,13 @@ get template() { return `<div name="${this.name}">${this.value.city} - ${this.value.country}</div>`; } + + render() { + store.get(this.value).then( (value) => { + this._value = value; + this.innerHTML = this.template; + }); + } } customElements.define("ldp-display-cell", LDPDisplayCell); </script> diff --git a/src/models.py b/src/models.py index a2af23994ed27fa2af55f258184f39e2523b13e0..667756c701a076e04bb47a7d2b7fd17c47d8d2a8 100644 --- a/src/models.py +++ b/src/models.py @@ -49,4 +49,11 @@ class Cell(models.Model): return self.name +class ChatRoom(models.Model): + name = models.CharField(max_length=255, default='') + description = models.CharField(max_length=255, default='') + members = models.ManyToManyField("Member") + administrator = models.ManyToManyField("Member") + def __str__(self): + return self.name diff --git a/src/scss/_member.scss b/src/scss/_member.scss index b2267f520b0b0a453ce459ee59610319bfb8168c..578577a8ec24379eb08d453e30755990622471bc 100644 --- a/src/scss/_member.scss +++ b/src/scss/_member.scss @@ -1,3 +1,8 @@ +%detail-section { + font-weight: bold; + font-size: 18px; +} + #member-chat { #conversejs { margin: none; @@ -5,7 +10,7 @@ } #profiles-list, -#member-profile { +#member-info { img { display: block; } @@ -17,9 +22,8 @@ } div[name="name"] { + @extend %detail-section; padding-top: 10px; - font-weight: bold; - font-size: 18px; } div[name="name"], @@ -28,31 +32,53 @@ } } -#member-profile { - ldp-display-mailto, - ldp-display-tel { - display: block; - } +#member-detail { + #member-info { + ldp-display-mailto, + ldp-display-tel { + display: block; + } - a[name="email"], - a[name="number"] { - &::before { - font-family: FontAwesome; - padding-right: 4px; - color: black; + a[name="email"], + a[name="number"] { + &::before { + font-family: FontAwesome; + padding-right: 4px; + color: black; + } } - } - a[name="email"] { - &::before { - content: "\f0e0"; + a[name="email"] { + &::before { + content: "\f0e0"; + } } + a[name="number"] { + &::before { + content: "\f10b"; + font-size: 22px; + padding-left: 3px; + padding-right: 7px; + } + } + } + + .section { + @extend %detail-section; + margin-top: 40px; } - a[name="number"] { - &::before { - content: "\f10b"; - font-size: 22px; - padding-left: 3px; - padding-right: 7px; + + #member-skills { + display: flex; + flex-wrap: wrap; + + ldp-display { + display: block; + background-color: $hd-color; + color: white; + border-radius: 100px; + padding: 3px 10px; + margin-bottom: 5px; + margin-right: 5px; } } } diff --git a/src/scss/_styles.scss b/src/scss/_styles.scss index 7f5345c8935fb55441e4fbee0bb723c678e79b21..59b7f3301ce805f59ecc512d1497b1e68b9ea012 100644 --- a/src/scss/_styles.scss +++ b/src/scss/_styles.scss @@ -1,5 +1,6 @@ * { - box-sizing: border-box; + box-sizing: border-box; + font-family: helvetica; } html, body, #mainContainer {