From 32d1f652520a101ce7b0fc60c6b51b9c2431cb8f Mon Sep 17 00:00:00 2001
From: Marc Vachon <vachon.marc@outlook.com>
Date: Mon, 12 Aug 2019 12:30:40 +0200
Subject: [PATCH] hash id
---
webapp/views/elements/nav.inc.ejs | 4 ++--
webapp/views/js/meeting.js | 5 +++--
webapp/views/meeting.ejs | 12 +++++++-----
webapp/views/style/navbar.scss | 4 ++++
webapp/views/style/style.css | 8 ++++++++
webapp/views/style/style.css.map | 2 +-
webapp/views/style/style.scss | 3 +++
7 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/webapp/views/elements/nav.inc.ejs b/webapp/views/elements/nav.inc.ejs
index 561979b..dd23bde 100644
--- a/webapp/views/elements/nav.inc.ejs
+++ b/webapp/views/elements/nav.inc.ejs
@@ -17,10 +17,10 @@
<div class="nav-mobile d-xl-none" id="navMobile">
<ul class="nav-mobile-body list-group">
<a class="nav-link active" href="/">
- <li class="list-group-item"><i class="fas fa-home fa-2x"></i></li>
+ <li class="list-group-item"><i class="fas fa-home"></i> Accueil</li>
</a>
<a class="nav-link" href="/create-meeting">
- <li class="list-group-item"><i class="fas fa-address-book fa-2x"></i></li>
+ <li class="list-group-item"><i class="fas fa-address-book"></i> Creer Meeting</li>
</a>
</ul>
</div>
diff --git a/webapp/views/js/meeting.js b/webapp/views/js/meeting.js
index ba64920..b037351 100644
--- a/webapp/views/js/meeting.js
+++ b/webapp/views/js/meeting.js
@@ -40,6 +40,7 @@ $(document).ready(function(){
socket.on('get_meeting', function(data){
+
$('#users').html('')
const parameters = `
@@ -53,7 +54,7 @@ socket.on('get_meeting', function(data){
<dd class="col-sm-9">${data.creator}</dd>
<dt class="col-sm-3">Périodes</dt>
- <dd class="col-sm-9">Du ${data.period.date_from.day}/${data.period.date_from.month}/${data.period.date_from.year} au ${data.period.date_to.day}/${data.period.date_to.month}/${data.period.date_to.year}</dd>
+<dd class="col-sm-9">Du ${data.period.date_from.day}/${data.period.date_from.month}/${data.period.date_from.year} au ${data.period.date_to.day}/${data.period.date_to.month}/${data.period.date_to.year}</dd>
<dt class="col-sm-3">Code</dt>
<dd class="col-sm-9">${id_meeting}</dd>
@@ -65,7 +66,7 @@ socket.on('get_meeting', function(data){
<dl class="row">
<dt class="col-sm-3">Date</dt>
<dd class="col-sm-9">
- ${data.date.time ? `Le ${data.date.day}/${data.date.month}/${data.date.year} à ${data.date.time.hour}:${data.date.time.minutes}` : ''}
+ ${data.date ? `Le ${data.date.day}/${data.date.month}/${data.date.year} à ${data.date.time.hour}:${data.date.time.minutes}` : ''}
</dd>
<dt class="col-sm-3">Works for</dt>
diff --git a/webapp/views/meeting.ejs b/webapp/views/meeting.ejs
index 3966149..1c17ff1 100644
--- a/webapp/views/meeting.ejs
+++ b/webapp/views/meeting.ejs
@@ -7,7 +7,7 @@
</head>
<body>
<script>
- var id_meeting = <%- id_meeting %>
+ var id_meeting = '<%- id_meeting %>'
</script>
<script type="text/javascript" src="/js/meeting.js"></script>
@@ -16,13 +16,15 @@
<%- include('elements/nav.inc.ejs') %>
- <div class="w-100 d-flex mt-4 mb-3">
- <div class="d-flex justify-content-end">
- <button type="button" name="add user" class="btn btn-primary mr-2" onclick="toggle_add_user()">Ajouter un membre</button>
+ <div class="w-100 d-flex mb-3">
+ <div class="d-flex justify-content-end w-100">
+ <button type="button" name="add user" class="btn btn-primary" onclick="toggle_add_user()">Ajouter un membre</button>
+ <!--
<button type="button" name="button" class="btn btn-info mx-2" onclick="update_center()">Center</button>
<button type="button" name="button" class="btn btn-secondary mx-2" onclick="update_appointement()">Appointement</button>
<button type="button" name="button" class="btn btn-danger mx-2" onclick="update_journeys()">Journey</button>
<button type="button" name="button" class="btn btn-success mx-2" onclick="socket.emit('test_class')">Test</button>
+ -->
</div>
</div>
<div class="card mb-4">
@@ -33,7 +35,7 @@
</div>
</div>
- <div class="row w-100" id="users">
+ <div class="row" id="users">
</div>
diff --git a/webapp/views/style/navbar.scss b/webapp/views/style/navbar.scss
index 80c94ac..e64ee7e 100644
--- a/webapp/views/style/navbar.scss
+++ b/webapp/views/style/navbar.scss
@@ -1,3 +1,7 @@
+.navbar a{
+ color: var(--text-main);
+}
+
.navbar-computer{
background-color: var(--bg-element);
.main-title{
diff --git a/webapp/views/style/style.css b/webapp/views/style/style.css
index 61ba17a..ed7ab6f 100644
--- a/webapp/views/style/style.css
+++ b/webapp/views/style/style.css
@@ -15,6 +15,10 @@
--color-primary: purple;
}
+.navbar a {
+ color: var(--text-main);
+}
+
.navbar-computer {
background-color: var(--bg-element);
}
@@ -119,6 +123,10 @@ body {
box-shadow: 3px 0 15px 1px var(--shadow);
}
+.card-header {
+ background-color: var(--bg-element);
+}
+
.card-subtitle {
font-weight: 700;
margin-top: 1em;
diff --git a/webapp/views/style/style.css.map b/webapp/views/style/style.css.map
index 0b7dfc1..592d68b 100644
--- a/webapp/views/style/style.css.map
+++ b/webapp/views/style/style.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["vars.scss","navbar.scss","add-user.scss","style.scss"],"names":[],"mappings":"AAAA;AACE;AAEA;AACA;EACA;EACA;AAEA;EACA;EACA;EACA;EAGA;EACA;EAEA;EAEA;EAEA;;;ACrBF;EACE;;AACA;EACE;;AAGA;EACE;;;AAKJ;EACE;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;;;AAIF;EACE;EACA;;;AAGJ;EAEI;IACE;;;EAGJ;IACE;;;ACnDJ;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;;AAGF;EACE;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;EACE;;AACF;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;EACA;;;AC5BN;EACE;EACA;;;AAIF;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;EACA;EACA","file":"style.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["vars.scss","navbar.scss","add-user.scss","style.scss"],"names":[],"mappings":"AAAA;AACE;AAEA;AACA;EACA;EACA;AAEA;EACA;EACA;EACA;EAGA;EACA;EAEA;EAEA;EAEA;;;ACrBF;EACE;;;AAGF;EACE;;AACA;EACE;;AAGA;EACE;;;AAKJ;EACE;EACA;;;AAGJ;EACE;EACA;EACA;EACA;EACA;EACA;;AACA;EACE;;AAEF;EACE;EACA;EACA;;AAEF;EACE;EACA;EACA;;;AAIF;EACE;EACA;;;AAGJ;EAEI;IACE;;;EAGJ;IACE;;;ACvDJ;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;;AAGF;EACE;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;EACE;;AACF;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;EACA;;;AC5BN;EACE;EACA;;;AAIF;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA","file":"style.css"}
\ No newline at end of file
diff --git a/webapp/views/style/style.scss b/webapp/views/style/style.scss
index 2675515..58ffe40 100644
--- a/webapp/views/style/style.scss
+++ b/webapp/views/style/style.scss
@@ -18,6 +18,9 @@ body{
border-radius: 0;
box-shadow: 3px 0 15px 1px var(--shadow);
}
+.card-header{
+ background-color: var(--bg-element);
+}
.card-subtitle{
font-weight: 700;
margin-top: 1em;
--
GitLab