Skip to content

P
projet-cdaw
Commit c204846b authored by quentin.vrel's avatar quentin.vrel
Browse files
Options

Merge branch 'master' of http://gvipers.imt-lille-douai.fr/QVrel/projet-cdaw

parents 74d5b35c 70b31a64
Show whitespace changes
Inline Side-by-side
Showing with 17895 additions and 3036 deletions
AGL/BD/dump.sql
View file @ c204846b
...@@ -44,7 +44,7 @@ create table MJ_USER ...@@ -44,7 +44,7 @@ create table MJ_USER
ID_USER int not null auto_increment comment '', ID_USER int not null auto_increment comment '',
ID_ROLE int comment '', ID_ROLE int comment '',
LOGIN varchar(16) not null comment '', LOGIN varchar(16) not null comment '',
PASWORD char(40) not null comment '', PASWORD char(80) not null comment '',
AVATAR char(255) comment '', AVATAR char(255) comment '',
LASTNAME char(55) comment '', LASTNAME char(55) comment '',
FIRSTNAME char(55) comment '', FIRSTNAME char(55) comment '',
......
AGL/BD/sample.sql
View file @ c204846b
...@@ -9,6 +9,7 @@ VALUES ...@@ -9,6 +9,7 @@ VALUES
(1,'Membre'), (1,'Membre'),
(2,'Admin'); (2,'Admin');
/* Password lenght to 80*/
INSERT INTO `MJ_USER` (`ID_USER`, `ID_ROLE`, `LOGIN`, `PASWORD`, `AVATAR`, `LASTNAME`, `FIRSTNAME`, `MAIL`, `BAN_ACCOUNT`, `LAST_IP`) INSERT INTO `MJ_USER` (`ID_USER`, `ID_ROLE`, `LOGIN`, `PASWORD`, `AVATAR`, `LASTNAME`, `FIRSTNAME`, `MAIL`, `BAN_ACCOUNT`, `LAST_IP`)
VALUES VALUES
(1, 1, 'pierrp59', 'hashedpierrepwd', 'becky.jpg', 'pierre', 'poljak', 'pierre.poljak@free.fr', 0, '92.169.12.1'), (1, 1, 'pierrp59', 'hashedpierrepwd', 'becky.jpg', 'pierre', 'poljak', 'pierre.poljak@free.fr', 0, '92.169.12.1'),
......
frontend/package-lock.json
View file @ c204846b
This source diff could not be displayed because it is too large. You can view the blob instead.
frontend/package.json
View file @ c204846b
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
"lint": "vue-cli-service lint" "lint": "vue-cli-service lint"
}, },
"dependencies": { "dependencies": {
"bcryptjs": "^2.4.3",
"core-js": "^3.6.5", "core-js": "^3.6.5",
"vue": "^2.6.11", "vue": "^2.6.11",
"vue-router": "^3.2.0" "vue-router": "^3.2.0"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment