From 2dc0d3957bf321b1ac4d01bda82367c55f8a697b Mon Sep 17 00:00:00 2001
From: Marc Vachon <vachon.marc@outlook.com>
Date: Sat, 17 Aug 2019 03:00:07 +0200
Subject: [PATCH] design update
---
webapp/ressources/socket.js | 3 ---
webapp/views/elements/nav.inc.ejs | 8 ++++----
webapp/views/js/meeting.js | 12 ++++++------
webapp/views/meeting.ejs | 8 +++++---
webapp/views/style/style.css | 4 ++++
webapp/views/style/style.css.map | 2 +-
webapp/views/style/style.scss | 4 ++++
7 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/webapp/ressources/socket.js b/webapp/ressources/socket.js
index add8ede..811e0cf 100644
--- a/webapp/ressources/socket.js
+++ b/webapp/ressources/socket.js
@@ -95,11 +95,8 @@ module.exports = function(server){
-
-
function get_meeting(idMeeting){
db.get_meeting(idMeeting, function(data){
- console.log("get get");
socket.emit('get_meeting', data)
})
}
diff --git a/webapp/views/elements/nav.inc.ejs b/webapp/views/elements/nav.inc.ejs
index 3b9dde0..d2c24dd 100644
--- a/webapp/views/elements/nav.inc.ejs
+++ b/webapp/views/elements/nav.inc.ejs
@@ -1,7 +1,7 @@
<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>
+ <i class="fas fa-bars fa-lg text-main"></i>
</button>
</div>
<div class="justify-content-center">
@@ -10,7 +10,7 @@
</a>
</div>
<div class="justify-content-end">
- <button class="btn btn-hidden moon"><i class="far fa-moon fa-flip-horizontal fa-lg text-primary"></i></button>
+ <button class="btn btn-hidden moon"><i class="far fa-moon fa-flip-horizontal fa-lg text-main"></i></button>
</div>
</nav>
@@ -28,7 +28,7 @@
<nav class="navbar navbar-computer d-none d-lg-block px-0 mb-5">
- <div class="container">
+ <div class="container px-0">
<h1 class="main-title">
<a class="text-decoration-none" href="/">Meet Us</a>
@@ -42,7 +42,7 @@
<a class="nav-link" href="/create-meeting"><i class="fas fa-address-book"></i> Creer Meeting</a>
</li>
<li class="nav-item">
- <button class="btn btn-hidden moon"><i class="far fa-moon fa-flip-horizontal text-primary"></i></button>
+ <button class="btn btn-hidden moon"><i class="far fa-moon fa-flip-horizontal text-main"></i></button>
</li>
</ul>
diff --git a/webapp/views/js/meeting.js b/webapp/views/js/meeting.js
index c41d87a..2caa643 100644
--- a/webapp/views/js/meeting.js
+++ b/webapp/views/js/meeting.js
@@ -55,11 +55,11 @@ socket.on('get_meeting', function(data){
<h2 class="font-weight-bold mb-3 d-inline">Code: </h2>
</div>
- <div class="col-md-9 text-md-right">
+ <div class="col-md-9 text-md-right" style="word-wrap: break-word;">
<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>
+ <p class="text-muted mx-3 mt-4 text-right">Ce code correspond à ce rendez-vous. Partagez-le avec les personnes concernées.</p>
</div>
@@ -74,7 +74,7 @@ socket.on('get_meeting', function(data){
<div class="card mb-5">
<div class="card-body">
- <dl class="row">
+ <dl class="row my-1 mx-md-2">
<dt class="col-sm-3">Nom</dt>
<dd class="col-sm-9">${data.name}</dd>
@@ -95,12 +95,12 @@ socket.on('get_meeting', function(data){
- <h2 class="font-weight-bold mb-3">Résultat</h2>
+ <h2 class="font-weight-bold mb-3">Rendez-vous</h2>
<div class="card mb-5">
<div class="card-body">
- <dl class="row">
+ <dl class="row my-1 mx-md-2">
<dt class="col-sm-3">Date</dt>
<dd class="col-sm-9">
${data.date ? `Le ${data.date.day}/${data.date.month}/${data.date.year} à ${data.date.time.hour}:${data.date.time.minutes}` : ''}
@@ -128,7 +128,7 @@ socket.on('get_meeting', function(data){
var user = data.user_table[i]
const markup = `
- <div class="col-md-6 mb-3 px-0 px-md-3">
+ <div class="col-md-6 mb-3">
<div class="card">
<div class="card-header">
<h5 class="card-subtitle d-inline-block">${user.name}</h5>
diff --git a/webapp/views/meeting.ejs b/webapp/views/meeting.ejs
index 546563d..2117ef1 100644
--- a/webapp/views/meeting.ejs
+++ b/webapp/views/meeting.ejs
@@ -23,18 +23,20 @@
<h2 class="font-weight-bold">Utilisateurs</h2>
<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="row w-100 px-0 px-md-3" id="users">
+ <div class="w-100">
+ <div class="row px-0" id="users">
</div>
+ </div>
<%- include('elements/foot.inc.ejs') %>
diff --git a/webapp/views/style/style.css b/webapp/views/style/style.css
index ba81a2d..dddea9b 100644
--- a/webapp/views/style/style.css
+++ b/webapp/views/style/style.css
@@ -112,6 +112,10 @@ body {
color: var(--txt-main);
}
+.text-main {
+ color: var(--txt-main);
+}
+
.shadow-smooth {
box-shadow: 0 0 6px #e6e6e6;
}
diff --git a/webapp/views/style/style.css.map b/webapp/views/style/style.css.map
index 9440941..36705a1 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;;;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
+{"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;;;AAGF;EACE;;;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 58ffe40..f5fa037 100644
--- a/webapp/views/style/style.scss
+++ b/webapp/views/style/style.scss
@@ -8,6 +8,10 @@ body{
color: var(--txt-main);
}
+.text-main{
+ color: var(--txt-main);
+}
+
.shadow-smooth{
box-shadow: 0 0 6px darken(white, 10%);
--
GitLab