diff --git a/documents/memoire/ITI_LOG_memoire_diplome_Vachon_2019.docx b/documents/memoire/ITI_LOG_memoire_diplome_Vachon_2019.docx index 930a9e9ee4581e312c6617a192e17166713f502e..1d869f071c865328fbe73fda1ed1e2fc291aa9a3 100644 Binary files a/documents/memoire/ITI_LOG_memoire_diplome_Vachon_2019.docx and b/documents/memoire/ITI_LOG_memoire_diplome_Vachon_2019.docx differ diff --git a/documents/memoire/ITI_LOG_memoire_diplome_Vachon_2019.pdf b/documents/memoire/ITI_LOG_memoire_diplome_Vachon_2019.pdf index 9d9f5ebb43f9dd8ef7c8a782ea31f1c2ee7f785e..19b69b04f3bf2af8ee3175076632fe16ff6946cc 100644 Binary files a/documents/memoire/ITI_LOG_memoire_diplome_Vachon_2019.pdf and b/documents/memoire/ITI_LOG_memoire_diplome_Vachon_2019.pdf differ diff --git a/documents/memoire/resume.docx b/documents/memoire/resume.docx index d63307df0fbb67c1ae59bbe4a96cd9c7f703a9c1..2550d6d8bb713fe119d90dc37c8da89d7049d1b0 100644 Binary files a/documents/memoire/resume.docx and b/documents/memoire/resume.docx differ diff --git a/webapp/class/db/connect_db.js b/webapp/class/db/connect_db.js index 7dc849a38dabe0855fa75a3587dc6c8bd970010d..3c6c60035efd17da3f60be6395732bbfedde2627 100644 --- a/webapp/class/db/connect_db.js +++ b/webapp/class/db/connect_db.js @@ -1,15 +1,23 @@ /* Connection to the database MySql */ var mysql = require('mysql'); - +var config = require('../../config/config.json') +/* var db = mysql.createConnection({ host : 'localhost', user : 'meet', port : '8889', password : 'Super', - database : 'meetus', + database : 'meetus' }); - +*/ +var db = mysql.createConnection({ + host : config.database.host, + user : config.database.user, + port : config.database.port, + password : config.database.password, + database : config.database.db_name +}) db.connect(function(err) { if (err) throw err diff --git a/webapp/config/config.json b/webapp/config/config.json index 5b409bae0a3f51cceca345dd0eef45e90c635b34..0c480b37ce58f8335dddecea97ae0cfeeaa7a55e 100644 --- a/webapp/config/config.json +++ b/webapp/config/config.json @@ -1,5 +1,12 @@ { "node_port": 8080, + "database":{ + "host": "localhost", + "port": 8889, + "db_name": "meetus", + "user": "meet", + "password": "Super" + }, "city_search":{ "method": "geodb", "population": 10000, diff --git a/webapp/json/new_meeting.json b/webapp/json/new_meeting.json index ebc047b81fc2914841c1b6113673a6eb58a0803d..fb30658b982fe931112c6097361e88937e3a6fe8 100644 --- a/webapp/json/new_meeting.json +++ b/webapp/json/new_meeting.json @@ -1,27 +1,20 @@ { - "name": "MarcBook Pro", + "name": "Bachelor 2019", "creator": "Marc Vachon", - "date": { - "day": 27, - "time": { - "hour": 12, - "minutes": 30 - }, - "year": 2019, - "month": 5 - }, - "period": { - "date_to": { - "day": 12, - "year": 2019, - "month": 6 - }, - "date_from": { - "day": 27, - "year": 2019, - "month": 5 - } - }, - "location": "", - "user_table": [] + "percentage": 0, + "period":{ + "date_from": { + "day": 27, + "month": 7, + "year": 2019 + }, + "date_to": { + "day": 12, + "month": 8, + "year": 2019 + } + }, + "date": {}, + "location": "", + "user_table": [] } diff --git a/webapp/server.js b/webapp/server.js index f8d0408dd62f563ff8c1ea16eefa7c3da9e847ec..9f5366e30d4be95ba0254d9092483144850540d3 100644 --- a/webapp/server.js +++ b/webapp/server.js @@ -3,7 +3,6 @@ var express = require("express"); var bodyParser = require('body-parser') var request = require('request') var http = require('http') -require('jquery') var app = express()