From 8b614953e81f28832bd2b9453192c75eaba78733 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Roig?= Date: Sun, 18 Nov 2018 10:01:19 +0100 Subject: [PATCH 01/45] Reactivating sonar-scanner just on 1 branch (master-sonar-scanner) --- .travis.yml | 2 ++ client/sonar-project.properties | 12 ++++++------ server/sonar-project.properties | 12 ++++++------ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index bef98c45..da182456 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,7 @@ cache: addons: sonarcloud: organization: "kevinhassan-github" + branch: - master-sonar-scanner token: secure: "YTnMdPnt4cH84iID9HaoN4Rb WgQyLSMrTODeefE9RuFkwljL253F/UvimbC @@ -36,6 +37,7 @@ before_script: - cd $TEST_DIR - npm install - npm test +- sonar-scanner notifications: email: false diff --git a/client/sonar-project.properties b/client/sonar-project.properties index 75a3b775..32a37fdf 100644 --- a/client/sonar-project.properties +++ b/client/sonar-project.properties @@ -1,16 +1,16 @@ # must be unique in a given SonarQube instance -# onar.projectKey=prello-app +sonar.projectKey=prello-app # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. -# sonar.projectName=Prello App -# sonar.projectVersion=1.0 +sonar.projectName=Prello App +sonar.projectVersion=1.1 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # This property is optional if sonar.modules is set. -# sonar.sources=. +sonar.sources=. # Encoding of the source code. Default is default system encoding -#sonar.sourceEncoding=UTF-8 +sonar.sourceEncoding=UTF-8 # Exclude folders -# sonar.exclusions=/node_modules/**, /coverage/**, /public/assets/** \ No newline at end of file +sonar.exclusions=/node_modules/**, /coverage/**, /public/assets/** \ No newline at end of file diff --git a/server/sonar-project.properties b/server/sonar-project.properties index 15f6aee5..1b8f8cd8 100644 --- a/server/sonar-project.properties +++ b/server/sonar-project.properties @@ -1,16 +1,16 @@ # must be unique in a given SonarQube instance -# sonar.projectKey=prello-api +sonar.projectKey=prello-api # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. -# sonar.projectName=Prello API -# sonar.projectVersion=1.0 +sonar.projectName=Prello API +sonar.projectVersion=1.1 # Path is relative to the sonar-project.properties file. Replace "\" by "/" on Windows. # This property is optional if sonar.modules is set. -# sonar.sources=. +sonar.sources=. # Encoding of the source code. Default is default system encoding -#sonar.sourceEncoding=UTF-8 +sonar.sourceEncoding=UTF-8 # Exclude folders -# sonar.exclusions=/node_modules/** \ No newline at end of file +sonar.exclusions=/node_modules/** \ No newline at end of file From c272ef1851166fdaf555e06a5222bb9032e61206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Roig?= Date: Sun, 18 Nov 2018 10:05:14 +0100 Subject: [PATCH 02/45] Fix sonar-scanner branch in travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index da182456..c1b04426 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ cache: addons: sonarcloud: organization: "kevinhassan-github" - branch: - master-sonar-scanner + branches: - master-sonar-scanner token: secure: "YTnMdPnt4cH84iID9HaoN4Rb WgQyLSMrTODeefE9RuFkwljL253F/UvimbC From f6f62a5d76f533a18fb6e5d0f975c470f6b6617e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Roig?= Date: Sun, 18 Nov 2018 10:05:14 +0100 Subject: [PATCH 03/45] Fix sonar-scanner branch in travis.yml --- .travis.yml | 1 - client/sonar-project.properties | 5 ++++- server/sonar-project.properties | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1b04426..161cb473 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,6 @@ cache: addons: sonarcloud: organization: "kevinhassan-github" - branches: - master-sonar-scanner token: secure: "YTnMdPnt4cH84iID9HaoN4Rb WgQyLSMrTODeefE9RuFkwljL253F/UvimbC diff --git a/client/sonar-project.properties b/client/sonar-project.properties index 32a37fdf..9219653a 100644 --- a/client/sonar-project.properties +++ b/client/sonar-project.properties @@ -13,4 +13,7 @@ sonar.sources=. sonar.sourceEncoding=UTF-8 # Exclude folders -sonar.exclusions=/node_modules/**, /coverage/**, /public/assets/** \ No newline at end of file +sonar.exclusions=/node_modules/**, /coverage/**, /public/assets/** + +# Branch scanned +sonar.branch=master \ No newline at end of file diff --git a/server/sonar-project.properties b/server/sonar-project.properties index 1b8f8cd8..83698aa2 100644 --- a/server/sonar-project.properties +++ b/server/sonar-project.properties @@ -13,4 +13,7 @@ sonar.sources=. sonar.sourceEncoding=UTF-8 # Exclude folders -sonar.exclusions=/node_modules/** \ No newline at end of file +sonar.exclusions=/node_modules/** + +# Branch scanned +sonar.branch=master \ No newline at end of file From a4730727a457014e274b11e8592f0458d64a120d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Roig?= Date: Sun, 18 Nov 2018 10:05:14 +0100 Subject: [PATCH 04/45] Fix sonar-scanner branch in travis.yml --- client/sonar-project.properties | 10 ++++++++++ server/sonar-project.properties | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/client/sonar-project.properties b/client/sonar-project.properties index 9219653a..dee01dd5 100644 --- a/client/sonar-project.properties +++ b/client/sonar-project.properties @@ -1,6 +1,16 @@ # must be unique in a given SonarQube instance sonar.projectKey=prello-app +sonar.login=YTnMdPnt4cH84iID9HaoN4Rb +WgQyLSMrTODeefE9RuFkwljL253F/UvimbC +OIJDMgDiIzvVg38ZiKku6VCSBYPI7LVme7/jwleEaJOPodhzHTKX6fV9zfnIyiedeJSYax +MEpqpD+Pu1RXsVObrSS2T3h7JHZ1Vj8o3XeYCKVAwQcrPSwRgW7+QIQzVxaCM6v/q2DxNt0to2gTTZvFQfjMWi3x1mhz9RQoZFxcS2Ebo +JsfQP8eHG4XhdIVR0AmP0IPDsE4SJMsuEkxdfPakuln6n7IBi1JcwrtQOykncVXk1kmdGt +CrDkinLB0TodZBxT+bvVv0gTDeaANqBjtEtsoWpY9VjMAKO+piQgexiLA77MpwpW4X+P/V +g0jNl4ZlNEMEKud209gUrSlIqUw0THeiR02YZ5JqUnPVzybBBGWQ3Of4jlwEg+Fkl/X2Lt +fP/Sg6UbxTRAEcrYll6jY/gmF5QOs7jiYS++vcL9oHWv1QEhTnBZfLLeT7gblFXEyMGDW7JxUQFL6h+xqyn3uF8oh3PfS4L0TsVPgrewrKh3cIEIvX2FHH4777FoGzuy9wQczhH0/xTMzX8bSPh3lq3eDAzQ0EIaKacr01OmsI5Ez55SPkC0Ev4jPXBH/CxSZ35sA+Pc0ImjLNzpMTt1kBbxrsX6wX3P9hl3hgGfUohV1Jo= +sonar.password= + # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=Prello App sonar.projectVersion=1.1 diff --git a/server/sonar-project.properties b/server/sonar-project.properties index 83698aa2..a2cea27a 100644 --- a/server/sonar-project.properties +++ b/server/sonar-project.properties @@ -1,6 +1,16 @@ # must be unique in a given SonarQube instance sonar.projectKey=prello-api +sonar.login=YTnMdPnt4cH84iID9HaoN4Rb +WgQyLSMrTODeefE9RuFkwljL253F/UvimbC +OIJDMgDiIzvVg38ZiKku6VCSBYPI7LVme7/jwleEaJOPodhzHTKX6fV9zfnIyiedeJSYax +MEpqpD+Pu1RXsVObrSS2T3h7JHZ1Vj8o3XeYCKVAwQcrPSwRgW7+QIQzVxaCM6v/q2DxNt0to2gTTZvFQfjMWi3x1mhz9RQoZFxcS2Ebo +JsfQP8eHG4XhdIVR0AmP0IPDsE4SJMsuEkxdfPakuln6n7IBi1JcwrtQOykncVXk1kmdGt +CrDkinLB0TodZBxT+bvVv0gTDeaANqBjtEtsoWpY9VjMAKO+piQgexiLA77MpwpW4X+P/V +g0jNl4ZlNEMEKud209gUrSlIqUw0THeiR02YZ5JqUnPVzybBBGWQ3Of4jlwEg+Fkl/X2Lt +fP/Sg6UbxTRAEcrYll6jY/gmF5QOs7jiYS++vcL9oHWv1QEhTnBZfLLeT7gblFXEyMGDW7JxUQFL6h+xqyn3uF8oh3PfS4L0TsVPgrewrKh3cIEIvX2FHH4777FoGzuy9wQczhH0/xTMzX8bSPh3lq3eDAzQ0EIaKacr01OmsI5Ez55SPkC0Ev4jPXBH/CxSZ35sA+Pc0ImjLNzpMTt1kBbxrsX6wX3P9hl3hgGfUohV1Jo= +sonar.password= + # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=Prello API sonar.projectVersion=1.1 From f18e7ee2ffd0176ac88af921e67c46891f590a12 Mon Sep 17 00:00:00 2001 From: Cyprien Legrand Date: Mon, 12 Nov 2018 15:08:02 +0100 Subject: [PATCH 05/45] modify due date (front+back), need reducers --- client/src/containers/CardComp/index.js | 3 +++ server/routes/cards.js | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/client/src/containers/CardComp/index.js b/client/src/containers/CardComp/index.js index a6da42ed..4d98b734 100644 --- a/client/src/containers/CardComp/index.js +++ b/client/src/containers/CardComp/index.js @@ -7,6 +7,9 @@ import { connect } from 'react-redux'; import { editCardDescription, editCardName, deleteLabel, archiveCard, editDate, } from '../../actions/cards'; +import { + editCardDescription, deleteLabel, archiveCard, editDate, +} from '../../actions/cards'; // ===== View import CardView from '../../components/views/CardView'; diff --git a/server/routes/cards.js b/server/routes/cards.js index 11d047cc..35eef4fd 100644 --- a/server/routes/cards.js +++ b/server/routes/cards.js @@ -322,5 +322,18 @@ module.exports = (router) => { } catch (e) { res.status(e.status).send({ error: e.message }); } + }) + + .put('/cards/:cardId/dueDate', Auth.isAuthenticated, Card.canEdit, async (req, res) => { + const errors = validationResult(req); + if (!errors.isEmpty()) { + return res.status(422).json({ error: 'Incorrect query, data provided invalid' }); + } + try { + await cardController.editDate(req.params.cardId, req.body.dueDate); + res.sendStatus(204); + } catch (e) { + res.status(e.status).send({ error: e.message }); + } }); }; From 758272373c9f83a3833fb70d146dffac75e3639a Mon Sep 17 00:00:00 2001 From: Cyprien Legrand Date: Mon, 12 Nov 2018 15:28:47 +0100 Subject: [PATCH 06/45] reducer OK --- client/src/reducers/currentBoardReducer.js | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/client/src/reducers/currentBoardReducer.js b/client/src/reducers/currentBoardReducer.js index 6e66684b..d4c923b8 100644 --- a/client/src/reducers/currentBoardReducer.js +++ b/client/src/reducers/currentBoardReducer.js @@ -428,6 +428,49 @@ export default function currentBoardReducer(state = initialState, action) { }, }; + // ===== Edit due date ===== // + case cardActions.EDIT_DATE_STARTED: + return { + ...state, + board: { + ...state.board, + lists: state.board.lists.map(l => ( + l._id !== action.payload.card.list._id + ? l + : { + ...l, + cards: l.cards.map(card => (card._id === action.payload.card._id + ? { + ...card, + dueDate: action.payload.dueDate, + } + : card)), + } + )), + }, + }; + + case cardActions.EDIT_DATE_FAILURE: + return { + ...state, + board: { + ...state.board, + lists: state.board.lists.map(l => ( + l._id !== action.payload.card.list._id + ? l + : { + ...l, + cards: l.cards.map(card => (card._id === action.payload.card._id + ? { + ...card, + dueDate: action.payload.initialDate, + } + : card)), + } + )), + }, + }; + default: return state; From 659075d8a04f80433f6eb3d941ce4d5d297230ec Mon Sep 17 00:00:00 2001 From: Cyprien Legrand Date: Mon, 12 Nov 2018 16:52:10 +0100 Subject: [PATCH 07/45] front & back tests --- server/test/routes/card.spec.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/server/test/routes/card.spec.js b/server/test/routes/card.spec.js index ab475ae2..4f34b74e 100644 --- a/server/test/routes/card.spec.js +++ b/server/test/routes/card.spec.js @@ -240,3 +240,18 @@ describe('PUT /cards/:cardId/dueDate', () => { .expect(404, done); }); }); + +describe('PUT /cards/:cardId/dueDate', () => { + it('should return 200 OK', (done) => { + request(app) + .put(`/cards/${cardData.id}/dueDate`) + .set('Authorization', `Bearer ${tokenMember}`) + .expect(204, done); + }); + it('should return 404 ERROR', (done) => { + request(app) + .put('/cards/123456/dueDate/') + .set('Authorization', `Bearer ${tokenMember}`) + .expect(404, done); + }); +}); From 94d44fb49931ce8a1784ce1316ae09e184b4e8c2 Mon Sep 17 00:00:00 2001 From: Cyprien Legrand Date: Mon, 12 Nov 2018 17:06:04 +0100 Subject: [PATCH 08/45] fix tests & validators --- server/routes/cards.js | 2 +- server/test/routes/card.spec.js | 7 +++++++ server/validators/card.js | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/server/routes/cards.js b/server/routes/cards.js index 35eef4fd..e58d5235 100644 --- a/server/routes/cards.js +++ b/server/routes/cards.js @@ -324,7 +324,7 @@ module.exports = (router) => { } }) - .put('/cards/:cardId/dueDate', Auth.isAuthenticated, Card.canEdit, async (req, res) => { + .put('/cards/:cardId/dueDate', Auth.isAuthenticated, Card.canEdit, cardValidator.editDate, async (req, res) => { const errors = validationResult(req); if (!errors.isEmpty()) { return res.status(422).json({ error: 'Incorrect query, data provided invalid' }); diff --git a/server/test/routes/card.spec.js b/server/test/routes/card.spec.js index 4f34b74e..40ba4213 100644 --- a/server/test/routes/card.spec.js +++ b/server/test/routes/card.spec.js @@ -239,6 +239,13 @@ describe('PUT /cards/:cardId/dueDate', () => { .set('Authorization', `Bearer ${tokenMember}`) .expect(404, done); }); + it('should return 422 ERROR', (done) => { + request(app) + .put(`/cards/${cardData.id}/dueDate`) + .send(newInvalidDate) + .set('Authorization', `Bearer ${tokenMember}`) + .expect(422, done); + }); }); describe('PUT /cards/:cardId/dueDate', () => { diff --git a/server/validators/card.js b/server/validators/card.js index 122aa73b..852c4d76 100644 --- a/server/validators/card.js +++ b/server/validators/card.js @@ -39,6 +39,12 @@ const updateCardName = [ .isLength({ min: 1 }), ]; +const editDate = [ + check('dueDate') + .isString(), + check('dueDate').not().isEmpty(), +]; + module.exports = { addCard, addLabel, From d06e2da14619d68628796352c110f73c2e05643e Mon Sep 17 00:00:00 2001 From: Cyprien Legrand Date: Mon, 12 Nov 2018 18:13:32 +0100 Subject: [PATCH 09/45] Fix import conflicts --- client/src/containers/CardComp/index.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/client/src/containers/CardComp/index.js b/client/src/containers/CardComp/index.js index 4d98b734..a6da42ed 100644 --- a/client/src/containers/CardComp/index.js +++ b/client/src/containers/CardComp/index.js @@ -7,9 +7,6 @@ import { connect } from 'react-redux'; import { editCardDescription, editCardName, deleteLabel, archiveCard, editDate, } from '../../actions/cards'; -import { - editCardDescription, deleteLabel, archiveCard, editDate, -} from '../../actions/cards'; // ===== View import CardView from '../../components/views/CardView'; From 72014c8d004cc6077da3c8ccf7852176f83de3c8 Mon Sep 17 00:00:00 2001 From: Cyprien Legrand Date: Tue, 13 Nov 2018 11:20:03 +0100 Subject: [PATCH 10/45] Update doc, validator & controller --- server/validators/card.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/server/validators/card.js b/server/validators/card.js index 852c4d76..2ef2d0c4 100644 --- a/server/validators/card.js +++ b/server/validators/card.js @@ -40,9 +40,7 @@ const updateCardName = [ ]; const editDate = [ - check('dueDate') - .isString(), - check('dueDate').not().isEmpty(), + check('dueDate').not().isEmpty().isString(), ]; module.exports = { From d10ee16c329939000e4595657cf1d5d8bbf15eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Roig?= Date: Tue, 13 Nov 2018 14:50:50 +0100 Subject: [PATCH 11/45] Fix empty date and handle empty hour or day --- server/validators/card.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/validators/card.js b/server/validators/card.js index 2ef2d0c4..5a654f9d 100644 --- a/server/validators/card.js +++ b/server/validators/card.js @@ -40,7 +40,8 @@ const updateCardName = [ ]; const editDate = [ - check('dueDate').not().isEmpty().isString(), + check('dueDate') + .isString(), ]; module.exports = { From c3e2dd04be36a9486b2f93e3d593c88d193ad9f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Roig?= Date: Wed, 14 Nov 2018 13:12:42 +0100 Subject: [PATCH 12/45] Dl all assets (bootstrap, jquery, font awesome, google fonts...) --- client/package-lock.json | 1105 +++++++ client/package.json | 2 + client/public/assets/popper.js/README.md | 220 ++ .../assets/popper.js/dist/esm/popper-utils.js | 1097 +++++++ .../popper.js/dist/esm/popper-utils.js.map | 1 + .../popper.js/dist/esm/popper-utils.min.js | 5 + .../dist/esm/popper-utils.min.js.map | 1 + .../assets/popper.js/dist/esm/popper.js | 2534 ++++++++++++++++ .../assets/popper.js/dist/esm/popper.js.map | 1 + .../assets/popper.js/dist/esm/popper.min.js | 5 + .../popper.js/dist/esm/popper.min.js.map | 1 + .../assets/popper.js/dist/esm/poppper.js.flow | 144 + .../assets/popper.js/dist/popper-utils.js | 1046 +++++++ .../assets/popper.js/dist/popper-utils.js.map | 1 + .../assets/popper.js/dist/popper-utils.min.js | 5 + .../popper.js/dist/popper-utils.min.js.map | 1 + client/public/assets/popper.js/dist/popper.js | 2386 ++++++++++++++++ .../assets/popper.js/dist/popper.js.map | 1 + .../assets/popper.js/dist/popper.min.js | 5 + .../assets/popper.js/dist/popper.min.js.map | 1 + .../assets/popper.js/dist/umd/popper-utils.js | 1135 ++++++++ .../popper.js/dist/umd/popper-utils.js.map | 1 + .../popper.js/dist/umd/popper-utils.min.js | 5 + .../dist/umd/popper-utils.min.js.map | 1 + .../assets/popper.js/dist/umd/popper.js | 2542 +++++++++++++++++ .../assets/popper.js/dist/umd/popper.js.map | 1 + .../assets/popper.js/dist/umd/popper.min.js | 5 + .../popper.js/dist/umd/popper.min.js.map | 1 + client/public/assets/popper.js/index.d.ts | 166 ++ client/public/assets/popper.js/index.js.flow | 144 + client/public/assets/popper.js/package.json | 86 + 31 files changed, 12649 insertions(+) create mode 100644 client/public/assets/popper.js/README.md create mode 100644 client/public/assets/popper.js/dist/esm/popper-utils.js create mode 100644 client/public/assets/popper.js/dist/esm/popper-utils.js.map create mode 100644 client/public/assets/popper.js/dist/esm/popper-utils.min.js create mode 100644 client/public/assets/popper.js/dist/esm/popper-utils.min.js.map create mode 100644 client/public/assets/popper.js/dist/esm/popper.js create mode 100644 client/public/assets/popper.js/dist/esm/popper.js.map create mode 100644 client/public/assets/popper.js/dist/esm/popper.min.js create mode 100644 client/public/assets/popper.js/dist/esm/popper.min.js.map create mode 100644 client/public/assets/popper.js/dist/esm/poppper.js.flow create mode 100644 client/public/assets/popper.js/dist/popper-utils.js create mode 100644 client/public/assets/popper.js/dist/popper-utils.js.map create mode 100644 client/public/assets/popper.js/dist/popper-utils.min.js create mode 100644 client/public/assets/popper.js/dist/popper-utils.min.js.map create mode 100644 client/public/assets/popper.js/dist/popper.js create mode 100644 client/public/assets/popper.js/dist/popper.js.map create mode 100644 client/public/assets/popper.js/dist/popper.min.js create mode 100644 client/public/assets/popper.js/dist/popper.min.js.map create mode 100644 client/public/assets/popper.js/dist/umd/popper-utils.js create mode 100644 client/public/assets/popper.js/dist/umd/popper-utils.js.map create mode 100644 client/public/assets/popper.js/dist/umd/popper-utils.min.js create mode 100644 client/public/assets/popper.js/dist/umd/popper-utils.min.js.map create mode 100644 client/public/assets/popper.js/dist/umd/popper.js create mode 100644 client/public/assets/popper.js/dist/umd/popper.js.map create mode 100644 client/public/assets/popper.js/dist/umd/popper.min.js create mode 100644 client/public/assets/popper.js/dist/umd/popper.min.js.map create mode 100644 client/public/assets/popper.js/index.d.ts create mode 100644 client/public/assets/popper.js/index.js.flow create mode 100644 client/public/assets/popper.js/package.json diff --git a/client/package-lock.json b/client/package-lock.json index db2d7de7..5a3959e6 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -311,6 +311,7 @@ "regexpu-core": "^4.2.0" } }, +<<<<<<< develop "@babel/plugin-syntax-async-generators": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.0.0.tgz", @@ -318,6 +319,438 @@ "requires": { "@babel/helper-plugin-utils": "^7.0.0" } +======= + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + } + } + }, + "bonjour": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", + "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", + "dev": true, + "requires": { + "array-flatten": "^2.1.0", + "deep-equal": "^1.0.1", + "dns-equal": "^1.0.0", + "dns-txt": "^2.0.2", + "multicast-dns": "^6.0.1", + "multicast-dns-service-types": "^1.1.0" + } + }, + "boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", + "dev": true + }, + "bootstrap": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.1.3.tgz", + "integrity": "sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w==" + }, + "boxen": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", + "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", + "requires": { + "ansi-align": "^2.0.0", + "camelcase": "^4.0.0", + "chalk": "^2.0.1", + "cli-boxes": "^1.0.0", + "string-width": "^2.0.0", + "term-size": "^1.2.0", + "widest-line": "^2.0.0" + } + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "dev": true, + "requires": { + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" + } + }, + "brorand": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", + "dev": true + }, + "browser-process-hrtime": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz", + "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==", + "dev": true + }, + "browser-resolve": { + "version": "1.11.3", + "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz", + "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==", + "dev": true, + "requires": { + "resolve": "1.1.7" + }, + "dependencies": { + "resolve": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", + "dev": true + } + } + }, + "browserify-aes": { + "version": "1.2.0", + "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", + "dev": true, + "requires": { + "buffer-xor": "^1.0.3", + "cipher-base": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.3", + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" + } + }, + "browserify-cipher": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", + "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", + "dev": true, + "requires": { + "browserify-aes": "^1.0.4", + "browserify-des": "^1.0.0", + "evp_bytestokey": "^1.0.0" + } + }, + "browserify-des": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", + "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", + "dev": true, + "requires": { + "cipher-base": "^1.0.1", + "des.js": "^1.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" + } + }, + "browserify-rsa": { + "version": "4.0.1", + "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", + "dev": true, + "requires": { + "bn.js": "^4.1.0", + "randombytes": "^2.0.1" + } + }, + "browserify-sign": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", + "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", + "dev": true, + "requires": { + "bn.js": "^4.1.1", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.2", + "elliptic": "^6.0.0", + "inherits": "^2.0.1", + "parse-asn1": "^5.0.0" + } + }, + "browserify-zlib": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", + "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", + "dev": true, + "requires": { + "pako": "~1.0.5" + } + }, + "browserslist": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.3.0.tgz", + "integrity": "sha512-j0jLqo+6ZhFWvTjEIcDyR8LIiN8pA3cUrT/SGAs0LPp/cKvkRpCnzuxtnAW+sOPLTic5wfb+TQvRX2RTN2wo4w==", + "dev": true, + "requires": { + "caniuse-lite": "^1.0.30000893", + "electron-to-chromium": "^1.3.80", + "node-releases": "^1.0.0-alpha.14" + } + }, + "bser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/bser/-/bser-2.0.0.tgz", + "integrity": "sha1-mseNPtXZFYBP2HrLFYvHlxR6Fxk=", + "dev": true, + "requires": { + "node-int64": "^0.4.0" + } + }, + "buffer": { + "version": "4.9.1", + "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", + "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", + "dev": true, + "requires": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4", + "isarray": "^1.0.0" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + } + } + }, + "buffer-from": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", + "dev": true + }, + "buffer-indexof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", + "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==", + "dev": true + }, + "buffer-xor": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", + "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", + "dev": true + }, + "builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "dev": true + }, + "builtin-status-codes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", + "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", + "dev": true + }, + "bytes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", + "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=" + }, + "cacache": { + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.2.0.tgz", + "integrity": "sha512-IFWl6lfK6wSeYCHUXh+N1lY72UDrpyrYQJNIVQf48paDuWbv5RbAtJYf/4gUQFObTCHZwdZ5sI8Iw7nqwP6nlQ==", + "dev": true, + "requires": { + "bluebird": "^3.5.1", + "chownr": "^1.0.1", + "figgy-pudding": "^3.1.0", + "glob": "^7.1.2", + "graceful-fs": "^4.1.11", + "lru-cache": "^4.1.3", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.2", + "ssri": "^6.0.0", + "unique-filename": "^1.1.0", + "y18n": "^4.0.0" + }, + "dependencies": { + "y18n": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", + "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", + "dev": true + } + } + }, + "cache-base": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", + "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", + "dev": true, + "requires": { + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" + } + }, + "caller-path": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", + "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", + "dev": true, + "requires": { + "callsites": "^0.2.0" + } + }, + "callsite": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", + "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=" + }, + "callsites": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", + "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", + "dev": true + }, + "camel-case": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", + "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", + "dev": true, + "requires": { + "no-case": "^2.2.0", + "upper-case": "^1.1.1" + } + }, + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" + }, + "caniuse-api": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", + "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", + "dev": true, + "requires": { + "browserslist": "^4.0.0", + "caniuse-lite": "^1.0.0", + "lodash.memoize": "^4.1.2", + "lodash.uniq": "^4.5.0" + } + }, + "caniuse-lite": { + "version": "1.0.30000893", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000893.tgz", + "integrity": "sha512-kOddHcTEef+NgN/fs0zmX2brHTNATVOWMEIhlZHCuwQRtXobjSw9pAECc44Op4bTBcavRjkLaPrGomknH7+Jvg==", + "dev": true + }, + "capture-exit": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-1.2.0.tgz", + "integrity": "sha1-HF/MSJ/QqwDU8ax64QcuMXP7q28=", + "dev": true, + "requires": { + "rsvp": "^3.3.3" + } + }, + "case-sensitive-paths-webpack-plugin": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.1.2.tgz", + "integrity": "sha512-oEZgAFfEvKtjSRCu6VgYkuGxwrWXMnQzyBmlLPP7r6PWQVtHxP5Z5N6XsuJvtoVax78am/r7lr46bwo3IVEBOg==", + "dev": true + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", + "dev": true + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "character-entities": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz", + "integrity": "sha512-sMoHX6/nBiy3KKfC78dnEalnpn0Az0oSNvqUWYTtYrhRI5iUIYsROU48G+E+kMFQzqXaJ8kHJZ85n7y6/PHgwQ==" + }, + "character-entities-legacy": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.2.tgz", + "integrity": "sha512-9NB2VbXtXYWdXzqrvAHykE/f0QJxzaKIpZ5QzNZrrgQ7Iyxr2vnfS8fCBNVW9nUEZE0lo57nxKRqnzY/dKrwlA==" + }, + "character-reference-invalid": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.2.tgz", + "integrity": "sha512-7I/xceXfKyUJmSAn/jw8ve/9DyOP7XxufNYLI9Px7CmsKgEUaZLUTax6nZxGQtaoiZCjpu6cHPj20xC/vqRReQ==" + }, + "chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "dev": true + }, + "check-types": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/check-types/-/check-types-7.4.0.tgz", + "integrity": "sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==", + "dev": true + }, + "chickencurry": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/chickencurry/-/chickencurry-1.1.1.tgz", + "integrity": "sha1-AmVfKyazvC7hrh5TFoht4463lzg=" + }, + "chokidar": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", + "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", + "dev": true, + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.0", + "braces": "^2.3.0", + "fsevents": "^1.2.2", + "glob-parent": "^3.1.0", + "inherits": "^2.0.1", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "lodash.debounce": "^4.0.8", + "normalize-path": "^2.1.1", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.0.0", + "upath": "^1.0.5" + }, + "dependencies": { + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true +>>>>>>> Dl all assets (bootstrap, jquery, font awesome, google fonts...) }, "@babel/plugin-syntax-class-properties": { "version": "7.0.0", @@ -809,6 +1242,7 @@ "to-fast-properties": "^2.0.0" } }, +<<<<<<< develop "@csstools/convert-colors": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz", @@ -834,6 +1268,88 @@ "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==" } } +======= + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } + } + }, + "font-awesome": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz", + "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=" + }, + "for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", + "dev": true + }, + "for-own": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", + "dev": true, + "requires": { + "for-in": "^1.0.1" + } + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "dev": true + }, + "form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "dev": true, + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + } + }, + "forwarded": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", + "dev": true + }, + "fragment-cache": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", + "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", + "dev": true, + "requires": { + "map-cache": "^0.2.2" + } + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", + "dev": true + }, + "from2": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", + "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", + "dev": true, + "requires": { + "inherits": "^2.0.1", + "readable-stream": "^2.0.0" + }, + "dependencies": { + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true +>>>>>>> Dl all assets (bootstrap, jquery, font awesome, google fonts...) }, "@svgr/webpack": { "version": "2.4.1", @@ -2413,6 +2929,7 @@ "node-int64": "^0.4.0" } }, +<<<<<<< develop "buffer": { "version": "4.9.1", "resolved": "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", @@ -2429,6 +2946,328 @@ "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" } } +======= + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, + "jest-validate": { + "version": "23.6.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-23.6.0.tgz", + "integrity": "sha512-OFKapYxe72yz7agrDAWi8v2WL8GIfVqcbKRCLbRG9PAxtzF9b1SEDdTpytNDN12z2fJynoBwpMpvj2R39plI2A==", + "dev": true, + "requires": { + "chalk": "^2.0.1", + "jest-get-type": "^22.1.0", + "leven": "^2.1.0", + "pretty-format": "^23.6.0" + } + }, + "jest-watcher": { + "version": "23.4.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-23.4.0.tgz", + "integrity": "sha1-0uKM50+NrWxq/JIrksq+9u0FyRw=", + "dev": true, + "requires": { + "ansi-escapes": "^3.0.0", + "chalk": "^2.0.1", + "string-length": "^2.0.0" + } + }, + "jest-worker": { + "version": "23.2.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-23.2.0.tgz", + "integrity": "sha1-+vcGqNo2+uYOsmlXJX+ntdjqArk=", + "dev": true, + "requires": { + "merge-stream": "^1.0.1" + } + }, + "joi": { + "version": "11.4.0", + "resolved": "https://registry.npmjs.org/joi/-/joi-11.4.0.tgz", + "integrity": "sha512-O7Uw+w/zEWgbL6OcHbyACKSj0PkQeUgmehdoXVSxt92QFCq4+1390Rwh5moI2K/OgC7D8RHRZqHZxT2husMJHA==", + "dev": true, + "requires": { + "hoek": "4.x.x", + "isemail": "3.x.x", + "topo": "2.x.x" + } + }, + "jquery": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", + "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" + }, + "js-levenshtein": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.4.tgz", + "integrity": "sha512-PxfGzSs0ztShKrUYPIn5r0MtyAhYcCwmndozzpz8YObbPnD1jFxzlBGbRnX2mIu6Z13xN6+PTu05TQFnZFlzow==", + "dev": true + }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + }, + "js-yaml": { + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz", + "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "dev": true + }, + "jsdom": { + "version": "12.2.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-12.2.0.tgz", + "integrity": "sha512-QPOggIJ8fquWPLaYYMoh+zqUmdphDtu1ju0QGTitZT1Yd8I5qenPpXM1etzUegu3MjVp8XPzgZxdn8Yj7e40ig==", + "dev": true, + "requires": { + "abab": "^2.0.0", + "acorn": "^6.0.2", + "acorn-globals": "^4.3.0", + "array-equal": "^1.0.0", + "cssom": "^0.3.4", + "cssstyle": "^1.1.1", + "data-urls": "^1.0.1", + "domexception": "^1.0.1", + "escodegen": "^1.11.0", + "html-encoding-sniffer": "^1.0.2", + "nwsapi": "^2.0.9", + "parse5": "5.1.0", + "pn": "^1.1.0", + "request": "^2.88.0", + "request-promise-native": "^1.0.5", + "saxes": "^3.1.3", + "symbol-tree": "^3.2.2", + "tough-cookie": "^2.4.3", + "w3c-hr-time": "^1.0.1", + "webidl-conversions": "^4.0.2", + "whatwg-encoding": "^1.0.5", + "whatwg-mimetype": "^2.2.0", + "whatwg-url": "^7.0.0", + "ws": "^6.1.0", + "xml-name-validator": "^3.0.0" + } + }, + "jsesc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz", + "integrity": "sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=", + "dev": true + }, + "json-parse-better-errors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz", + "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", + "dev": true + }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" + }, + "json-stable-stringify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "dev": true, + "requires": { + "jsonify": "~0.0.0" + } + }, + "json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", + "dev": true + }, + "json3": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", + "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", + "dev": true + }, + "json5": { + "version": "0.5.1", + "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", + "dev": true + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "jsonify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", + "dev": true + }, + "jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "dev": true, + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + } + }, + "jsx-ast-utils": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.0.1.tgz", + "integrity": "sha1-6AGxs5mF4g//yHtA43SAgOLcrH8=", + "dev": true, + "requires": { + "array-includes": "^3.0.3" + } + }, + "killable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz", + "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==", + "dev": true + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + }, + "kleur": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-2.0.2.tgz", + "integrity": "sha512-77XF9iTllATmG9lSlIv0qdQ2BQ/h9t0bJllHlbvsQ0zUWfU7Yi0S8L5JXzPZgkefIiajLmBJJ4BsMJmqcf7oxQ==", + "dev": true + }, + "last-call-webpack-plugin": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-3.0.0.tgz", + "integrity": "sha512-7KI2l2GIZa9p2spzPIVZBYyNKkN+e/SQPpnjlTiPhdbDW3F86tdKKELxKpzJ5sgU19wQWsACULZmpTPYHeWO5w==", + "dev": true, + "requires": { + "lodash": "^4.17.5", + "webpack-sources": "^1.1.0" + } + }, + "lazy-cache": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", + "dev": true + }, + "lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "dev": true, + "requires": { + "invert-kv": "^1.0.0" + } + }, + "left-pad": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz", + "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==", + "dev": true + }, + "leven": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz", + "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=", + "dev": true + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "requires": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + } + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" + }, + "dependencies": { + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "dev": true, + "requires": { + "error-ex": "^1.2.0" + } + } + } + }, + "loader-fs-cache": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/loader-fs-cache/-/loader-fs-cache-1.0.1.tgz", + "integrity": "sha1-VuC/CL2XCLJqdltoUJhAyN7J/bw=", + "dev": true, + "requires": { + "find-cache-dir": "^0.1.1", + "mkdirp": "0.5.1" + }, + "dependencies": { + "find-cache-dir": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz", + "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=", + "dev": true, + "requires": { + "commondir": "^1.0.1", + "mkdirp": "^0.5.1", + "pkg-dir": "^1.0.0" + } +>>>>>>> Dl all assets (bootstrap, jquery, font awesome, google fonts...) }, "buffer-from": { "version": "1.1.1", @@ -2565,10 +3404,276 @@ "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.1.2.tgz", "integrity": "sha512-oEZgAFfEvKtjSRCu6VgYkuGxwrWXMnQzyBmlLPP7r6PWQVtHxP5Z5N6XsuJvtoVax78am/r7lr46bwo3IVEBOg==" }, +<<<<<<< develop "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" +======= + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "~5.1.0" + } + } + } + }, + "param-case": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", + "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", + "dev": true, + "requires": { + "no-case": "^2.2.0" + } + }, + "parse-asn1": { + "version": "5.1.1", + "resolved": "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz", + "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==", + "dev": true, + "requires": { + "asn1.js": "^4.0.0", + "browserify-aes": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.0", + "pbkdf2": "^3.0.3" + } + }, + "parse-entities": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-1.2.0.tgz", + "integrity": "sha512-XXtDdOPLSB0sHecbEapQi6/58U/ODj/KWfIXmmMCJF/eRn8laX6LZbOyioMoETOOJoWRW8/qTSl5VQkUIfKM5g==", + "requires": { + "character-entities": "^1.0.0", + "character-entities-legacy": "^1.0.0", + "character-reference-invalid": "^1.0.0", + "is-alphanumerical": "^1.0.0", + "is-decimal": "^1.0.0", + "is-hexadecimal": "^1.0.0" + } + }, + "parse-glob": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", + "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "dev": true, + "requires": { + "glob-base": "^0.3.0", + "is-dotfile": "^1.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.0" + } + }, + "parse-json": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz", + "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", + "dev": true, + "requires": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + } + }, + "parse-passwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", + "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", + "dev": true + }, + "parse5": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz", + "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==", + "dev": true + }, + "parseqs": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz", + "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=", + "requires": { + "better-assert": "~1.0.0" + } + }, + "parseuri": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz", + "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=", + "requires": { + "better-assert": "~1.0.0" + } + }, + "parseurl": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", + "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=", + "dev": true + }, + "pascalcase": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", + "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", + "dev": true + }, + "path-browserify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", + "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", + "dev": true + }, + "path-dirname": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", + "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", + "dev": true + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + }, + "path-is-inside": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=" + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" + }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "dev": true + }, + "path-to-regexp": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", + "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", + "requires": { + "isarray": "0.0.1" + } + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + } + }, + "pbkdf2": { + "version": "3.0.17", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz", + "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==", + "dev": true, + "requires": { + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4", + "ripemd160": "^2.0.1", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" + } + }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dev": true, + "requires": { + "pinkie": "^2.0.0" + } + }, + "pkg-dir": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", + "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", + "dev": true, + "requires": { + "find-up": "^2.1.0" + } + }, + "pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz", + "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=", + "dev": true, + "requires": { + "find-up": "^2.1.0" + } + }, + "pluralize": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-7.0.0.tgz", + "integrity": "sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==", + "dev": true + }, + "pn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz", + "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==", + "dev": true + }, + "pnp-webpack-plugin": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.1.0.tgz", + "integrity": "sha512-CPCdcFxx7fEcDMWTDjXe2Wypt4JuMt4q5Q2UrpTcyBBkLiCIyPEh/mCGmUWIcNkKGyXwQ9Y2wVhlKm6ketiBNQ==", + "dev": true + }, + "popper.js": { + "version": "1.14.5", + "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.5.tgz", + "integrity": "sha512-fs4Sd8bZLgEzrk8aS7Em1qh+wcawtE87kRUJQhK6+LndyV1HerX7+LURzAylVaTyWIn5NTB/lyjnWqw/AZ6Yrw==" + }, + "portfinder": { + "version": "1.0.18", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.18.tgz", + "integrity": "sha512-KanzLOERzKoX3En5yTiV8K/arnU1ykYVokmtEn0PgCzqKZG9489tqW8ifp9+v3/VJZ5YDjvDt/PAP5WaPgk7FA==", + "dev": true, + "requires": { + "async": "^1.5.2", + "debug": "^2.2.0", + "mkdirp": "0.5.x" + }, + "dependencies": { + "async": { + "version": "1.5.2", + "resolved": "http://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true +>>>>>>> Dl all assets (bootstrap, jquery, font awesome, google fonts...) }, "chalk": { "version": "2.4.1", diff --git a/client/package.json b/client/package.json index bf2d783d..5243e196 100644 --- a/client/package.json +++ b/client/package.json @@ -21,8 +21,10 @@ }, "dependencies": { "axios": "^0.18.0", + "bootstrap": "^4.1.3", "connected-react-router": "4.5.0", "dotenv": "^6.1.0", + "font-awesome": "^4.7.0", "history": "^4.7.2", "js-file-download": "^0.4.4", "prop-types": "^15.6.2", diff --git a/client/public/assets/popper.js/README.md b/client/public/assets/popper.js/README.md new file mode 100644 index 00000000..6887a80d --- /dev/null +++ b/client/public/assets/popper.js/README.md @@ -0,0 +1,220 @@ + + +

Popper.js

+ +

+ A library used to position poppers in web applications. +

+ +

+ Stable Release Size + Stable Release Size + Istanbul Code Coverage + Dependents packages + Get support or discuss +
+ Build Status + SauceLabs Reports +

+ + + + + +## Wut? Poppers? + +A popper is an element on the screen which "pops out" from the natural flow of your application. +Common examples of poppers are tooltips, popovers and drop-downs. + + +## So, yet another tooltip library? + +Well, basically, **no**. +Popper.js is a **positioning engine**, its purpose is to calculate the position of an element +to make it possible to position it near a given reference element. + +The engine is completely modular and most of its features are implemented as **modifiers** +(similar to middlewares or plugins). +The whole code base is written in ES2015 and its features are automatically tested on real browsers thanks to [SauceLabs](https://saucelabs.com/) and [TravisCI](https://travis-ci.org/). + +Popper.js has zero dependencies. No jQuery, no LoDash, nothing. +It's used by big companies like [Twitter in Bootstrap v4](https://getbootstrap.com/), [Microsoft in WebClipper](https://github.com/OneNoteDev/WebClipper) and [Atlassian in AtlasKit](https://aui-cdn.atlassian.com/atlaskit/registry/). + +### Popper.js + +This is the engine, the library that computes and, optionally, applies the styles to +the poppers. + +Some of the key points are: + +- Position elements keeping them in their original DOM context (doesn't mess with your DOM!); +- Allows to export the computed informations to integrate with React and other view libraries; +- Supports Shadow DOM elements; +- Completely customizable thanks to the modifiers based structure; + +Visit our [project page](https://fezvrasta.github.io/popper.js) to see a lot of examples of what you can do with Popper.js! + +Find [the documentation here](/docs/_includes/popper-documentation.md). + + +### Tooltip.js + +Since lots of users just need a simple way to integrate powerful tooltips in their projects, +we created **Tooltip.js**. +It's a small library that makes it easy to automatically create tooltips using as engine Popper.js. +Its API is almost identical to the famous tooltip system of Bootstrap, in this way it will be +easy to integrate it in your projects. +The tooltips generated by Tooltip.js are accessible thanks to the `aria` tags. + +Find [the documentation here](/docs/_includes/tooltip-documentation.md). + + +## Installation +Popper.js is available on the following package managers and CDNs: + +| Source | | +|:-------|:---------------------------------------------------------------------------------| +| npm | `npm install popper.js --save` | +| yarn | `yarn add popper.js` | +| NuGet | `PM> Install-Package popper.js` | +| Bower | `bower install popper.js --save` | +| unpkg | [`https://unpkg.com/popper.js`](https://unpkg.com/popper.js) | +| cdnjs | [`https://cdnjs.com/libraries/popper.js`](https://cdnjs.com/libraries/popper.js) | + +Tooltip.js as well: + +| Source | | +|:-------|:---------------------------------------------------------------------------------| +| npm | `npm install tooltip.js --save` | +| yarn | `yarn add tooltip.js` | +| Bower* | `bower install tooltip.js=https://unpkg.com/tooltip.js --save` | +| unpkg | [`https://unpkg.com/tooltip.js`](https://unpkg.com/tooltip.js) | +| cdnjs | [`https://cdnjs.com/libraries/popper.js`](https://cdnjs.com/libraries/popper.js) | + +\*: Bower isn't officially supported, it can be used to install Tooltip.js only trough the unpkg.com CDN. This method has the limitation of not being able to define a specific version of the library. Bower and Popper.js suggests to use npm or Yarn for your projects. +For more info, [read the related issue](https://github.com/FezVrasta/popper.js/issues/390). + +### Dist targets + +Popper.js is currently shipped with 3 targets in mind: UMD, ESM and ESNext. + +- UMD - Universal Module Definition: AMD, RequireJS and globals; +- ESM - ES Modules: For webpack/Rollup or browser supporting the spec; +- ESNext: Available in `dist/`, can be used with webpack and `babel-preset-env`; + +Make sure to use the right one for your needs. If you want to import it with a `