diff --git a/documents/poster/PowerPoint.pptx b/documents/poster/PowerPoint.pptx
new file mode 100644
index 0000000000000000000000000000000000000000..1a354f9324a25eba657c8e05fd47d69c11983a2d
Binary files /dev/null and b/documents/poster/PowerPoint.pptx differ
diff --git a/webapp/views/create-meeting.ejs b/webapp/views/create-meeting.ejs
index 0682c6068706f021a3e1ca202281cc75f613b89b..ae06b591da1f2b4f7e7a642418e8598744255e67 100644
--- a/webapp/views/create-meeting.ejs
+++ b/webapp/views/create-meeting.ejs
@@ -42,7 +42,7 @@
</script>
<%- include('elements/nav.inc.ejs') %>
-<div class="col-lg-8 offset-lg-2">
+<div class="col-lg-10 offset-lg-1">
<div class="card">
<div class="card-body">
@@ -52,13 +52,6 @@
</div>
<form>
- <div class="form-group row">
- <label for="meeting_name" class="col-sm-4 col-form-label">Id</label>
- <div class="col-sm-8">
- <input class="w-100" type="number" placeholder="id" id="id">
- </div>
- </div>
-
<div class="form-group row">
<label for="meeting_name" class="col-sm-4 col-form-label">Meeting name</label>
<div class="col-sm-8">
diff --git a/webapp/views/elements/nav.inc.ejs b/webapp/views/elements/nav.inc.ejs
index dd23bde55430ff13073ff6278e88d805f78746d6..3b9dde005169c88d014e5244e8ee1bc8e220e3f0 100644
--- a/webapp/views/elements/nav.inc.ejs
+++ b/webapp/views/elements/nav.inc.ejs
@@ -1,4 +1,4 @@
-<nav class="navbar d-lg-none d-flex nav-mobile-header">
+<nav class="navbar d-lg-none d-flex nav-mobile-header mb-5">
<div class="justify-content-start">
<button class="btn" id="navbarToggler">
<i class="fas fa-bars fa-lg"></i>
diff --git a/webapp/views/index.ejs b/webapp/views/index.ejs
index 941b30095a609a5196ff78140d77d511a4b5f2ac..5dd9e15d96253633798c6691e08a044af7ce5f0b 100644
--- a/webapp/views/index.ejs
+++ b/webapp/views/index.ejs
@@ -33,7 +33,7 @@
<h1 class="mb-5">Load meeting</h1>
<form class="mb-4">
- <input class="w-100" type="text" value="0" placeholder="0" id="id_meeting">
+ <input class="w-100" type="text" value="1352698ce0d3f78098da37219c7154a14f351484" placeholder="0" id="id_meeting">
</form>
<button class="btn btn-primary" type="button" name="button" onclick="check_id()">Search</button>
diff --git a/webapp/views/js/meeting.js b/webapp/views/js/meeting.js
index bba43569ba8ca67d084d5988d03cf057a26ba6e8..c41d87a3bed7db617b8fe2e2edeec9fc1e238779 100644
--- a/webapp/views/js/meeting.js
+++ b/webapp/views/js/meeting.js
@@ -44,8 +44,36 @@ socket.on('get_meeting', function(data){
$('#users').html('')
const parameters = `
+
+
+ <div class="card mb-5 w-100 mx-3">
+ <div class="card-body">
+
+ <div class="row">
+
+ <div class="col-md-3">
+ <h2 class="font-weight-bold mb-3 d-inline">Code: </h2>
+ </div>
+
+ <div class="col-md-9 text-md-right">
+ <h2 class="d-inline font-weight-bold"><small>${id_meeting}</small></h2>
+ </div>
+
+ <p class="text-muted ml-3 mt-4 text-right">Ce code correspond à ce rendez-vous. Partagez-le avec les personnes concernées.</p>
+
+ </div>
+
+ </div>
+ </div>
+
+
+
<div class="col-md-6">
- <h2 class="font-weight-bold mb-5">Paramètres généraux</h2>
+ <h2 class="font-weight-bold mb-3">Paramètres généraux</h2>
+
+ <div class="card mb-5">
+ <div class="card-body">
+
<dl class="row">
<dt class="col-sm-3">Nom</dt>
<dd class="col-sm-9">${data.name}</dd>
@@ -54,15 +82,24 @@ 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>
</dl>
+
+ </div>
+ </div>
+
</div>
<div class="col-md-6">
- <h2 class="font-weight-bold mb-5">Résultat</h2>
+
+
+
+ <h2 class="font-weight-bold mb-3">Résultat</h2>
+
+ <div class="card mb-5">
+ <div class="card-body">
+
<dl class="row">
<dt class="col-sm-3">Date</dt>
<dd class="col-sm-9">
@@ -79,6 +116,10 @@ socket.on('get_meeting', function(data){
${data.location ? data.location : ''}
</dd>
</dl>
+
+ </div>
+ </div>
+
</div>
`
$('#parameters').html(parameters)
diff --git a/webapp/views/meeting.ejs b/webapp/views/meeting.ejs
index 8a2667f38ef5288f03a33cbc8c64b9844f459d17..546563dc6f768181a7d5f4715c5c0dd655014bce 100644
--- a/webapp/views/meeting.ejs
+++ b/webapp/views/meeting.ejs
@@ -15,13 +15,8 @@
<%- include('include/user.ejs') %>
<%- include('elements/nav.inc.ejs') %>
+ <div class="row mb-4" id="parameters">
- <div class="card mb-5">
- <div class="card-body">
- <div class="row mb-4" id="parameters">
-
- </div>
- </div>
</div>
<div class="w-100 d-flex mb-3">
diff --git a/webapp/views/style/add-user.scss b/webapp/views/style/add-user.scss
index 1e609fbb3c0eb2603e777f4437e2acf60f53e7c7..6f7c740138d3df9c0fae6b9be4e7941210433b3f 100644
--- a/webapp/views/style/add-user.scss
+++ b/webapp/views/style/add-user.scss
@@ -3,7 +3,7 @@
z-index: 100;
height: 100vh;
.card{
- width: 500px;
+ width: 600px;
margin: auto;
box-shadow: none;
}
diff --git a/webapp/views/style/navbar.scss b/webapp/views/style/navbar.scss
index e64ee7eec0ac6b20a6d10a7a7c4e7770e5e138e8..8308896fcbb13742f83d508303fd7cc7737acd38 100644
--- a/webapp/views/style/navbar.scss
+++ b/webapp/views/style/navbar.scss
@@ -1,9 +1,12 @@
+.navbar{
+ background-color: var(--bg-element);
+}
+
.navbar a{
color: var(--text-main);
}
.navbar-computer{
- background-color: var(--bg-element);
.main-title{
font-weight: bold;
}
diff --git a/webapp/views/style/style.css b/webapp/views/style/style.css
index 7b962316ae0cf68a56c8369b025d461db91517a4..ba81a2d7f3ef5f554cbe91aea96c919e259532b5 100644
--- a/webapp/views/style/style.css
+++ b/webapp/views/style/style.css
@@ -15,13 +15,14 @@
--color-primary: purple;
}
+.navbar {
+ background-color: var(--bg-element);
+}
+
.navbar a {
color: var(--text-main);
}
-.navbar-computer {
- background-color: var(--bg-element);
-}
.navbar-computer .main-title {
font-weight: bold;
}
@@ -76,7 +77,7 @@
height: 100vh;
}
#user .card {
- width: 500px;
+ width: 600px;
margin: auto;
box-shadow: none;
}
diff --git a/webapp/views/style/style.css.map b/webapp/views/style/style.css.map
index 40092384bea8e9b6f11238efd4f06225d160f5dc..944094144079a23b307c645ed99cf10c0f7dbfac 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;;;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;;AACA;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;EACA;;;AC3BN;EACE;EACA;;;AAIF;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;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;;;AAIA;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;;;AC1DJ;EACE;EACA;EACA;;AACA;EACE;EACA;EACA;;AAGF;EACE;;AACA;EACE;;AAEF;EACE;;AAEF;EACE;;AACA;EACE;;AAGJ;EACE;;AACA;EACE;;AAGJ;EACE;EACA;;;AC3BN;EACE;EACA;;;AAIF;EACE;;;AAEF;EACE;EACA;EACA;EACA;;;AAEF;EACE;;;AAEF;EACE;EACA;EACA","file":"style.css"}
\ No newline at end of file