From 1a4754a21e0c8da57e1667e5dae22b5768b16ecd Mon Sep 17 00:00:00 2001 From: Heitor Mattosinho Date: Thu, 10 Sep 2020 10:58:17 -0300 Subject: [PATCH 1/3] fix (text editor): quill css added again Fixes #237 --- src/adonisjs/resources/views/author/author.edge | 1 + 1 file changed, 1 insertion(+) diff --git a/src/adonisjs/resources/views/author/author.edge b/src/adonisjs/resources/views/author/author.edge index 0db39d223..0cb542293 100644 --- a/src/adonisjs/resources/views/author/author.edge +++ b/src/adonisjs/resources/views/author/author.edge @@ -11,6 +11,7 @@ + @include('layout.template-min') From e21fedf6dcd9fa8395f886886c3d287949ddaf57 Mon Sep 17 00:00:00 2001 From: Heitor Mattosinho Date: Thu, 10 Sep 2020 11:16:48 -0300 Subject: [PATCH 2/3] refactor (draft): buttons to EventListener 'draft.js' Fixes #232 --- src/adonisjs/public/author/js/draft.js | 91 +++++++++++-------------- src/adonisjs/resources/views/index.edge | 2 +- 2 files changed, 40 insertions(+), 53 deletions(-) diff --git a/src/adonisjs/public/author/js/draft.js b/src/adonisjs/public/author/js/draft.js index 7b143e09b..4b259f0fe 100644 --- a/src/adonisjs/public/author/js/draft.js +++ b/src/adonisjs/public/author/js/draft.js @@ -20,11 +20,12 @@ class DraftManager { this._boxesPanel = document.querySelector('#case-boxes') // this._draftSelect(authorState.userid, advanced); - //this._draftSelect(advanced) - this._draftQuestCasesSelect(advanced) + document.getElementsByClassName('buttons-container').length > 0 ? + this._draftQuestCasesSelect(advanced) : this._draftSelect(advanced) } async _draftSelect (advanced) { + console.log('Drafting total cases') const cases = await MessageBus.ext.request('data/case/*/list') // {user: userid}); @@ -76,63 +77,49 @@ class DraftManager { } async _draftQuestCasesSelect (advanced) { + console.log('Drafting cases by quest') // const cases = await MessageBus.ext.request('data/case/*/list') // {user: userid}); const cl = document.getElementsByClassName('buttons-container') + // for (var i in cl){ + // let test = cl[i].children + // for(var e in ) + // } for (const c in cl) { - //console.log(cl[c]); - const editButton = cl[c].children[0] - //console.log(editButton.id.substring(2)) - const previewButton = cl[c].children[1] - const deleteButton = cl[c].children[2] - - editButton.addEventListener('click', - function () { - Basic.service.authorPropertyStore('caseId', editButton.id.substring(1)) - // window.location.href = "http://0.0.0.0:10010/author/author.html"; - window.location.href = - '/author?id=' + editButton.id.substring(1) - } - ) - previewButton.addEventListener('click', - function () { - Basic.service.authorPropertyStore('caseId', editButton.id.substring(1)) - window.location.href = '/player/case?id=' + - previewButton.id.substring(1) + - '&preview' - } - ) - deleteButton.addEventListener('click', - function () { - MessageBus.int.publish('control/case/delete', editButton.id.substring(1)) - } - ) - if (advanced) { - downloadButton.addEventListener('click', - function () { - MessageBus.int.publish('control/case/download', this.id.substring(1)) - } - ) - } - } - // const template = document.createElement('template') - // const html = DraftManager.caseBox - // .replace('[download]', (advanced) ? DraftManager.caseDownload : '') - // template.innerHTML = html - // .replace(/\[id\]/ig, cl[c].id) - // // .replace("[icon]", cl[c].icon) - // .replace('[title]', cl[c].title) - // // .replace("[description]", cl[c].description); - // this._boxesPanel.appendChild(template.content.cloneNode(true)) - // const editButton = this._boxesPanel.querySelector('#e' + cl[c].id) - // const previewButton = this._boxesPanel.querySelector('#p' + cl[c].id) - // const deleteButton = this._boxesPanel.querySelector('#d' + cl[c].id) - // const downloadButton = (advanced) - // ? this._boxesPanel.querySelector('#w' + cl[c].id) : null + if (cl[c].children) { + const editButton = cl[c].children[0] + // console.log(editButton.id.substring(2)) + const previewButton = cl[c].children[1] + const deleteButton = cl[c].children[2] + editButton.addEventListener('click', + function () { + Basic.service.authorPropertyStore('caseId', editButton.id.substring(1)) + // window.location.href = "http://0.0.0.0:10010/author/author.html"; + window.location.href = + '/author?id=' + editButton.id.substring(1) + }) + previewButton.addEventListener('click', + function () { + Basic.service.authorPropertyStore('caseId', editButton.id.substring(1)) + window.location.href = '/player/case?id=' + + previewButton.id.substring(1) + + '&preview' + }) + deleteButton.addEventListener('click', + function () { + MessageBus.int.publish('control/case/delete', editButton.id.substring(1)) + }) + if (advanced) { + downloadButton.addEventListener('click', + function () { + MessageBus.int.publish('control/case/download', this.id.substring(1)) + }) + } + } } - + } async deleteCase (topic, message) { const decision = diff --git a/src/adonisjs/resources/views/index.edge b/src/adonisjs/resources/views/index.edge index ddeead9b4..d59c92f6b 100644 --- a/src/adonisjs/resources/views/index.edge +++ b/src/adonisjs/resources/views/index.edge @@ -32,7 +32,7 @@
-

Phil Muchbetter: a clinical reasoning game

+

Jacinto Bemelhor: a clinical reasoning game

Join us in this adventure of becoming a doctor

From 0bda8df53ad1982120a8b939b33dbfc3961de816 Mon Sep 17 00:00:00 2001 From: Heitor Mattosinho Date: Fri, 11 Sep 2020 12:06:52 -0300 Subject: [PATCH 3/3] temp fix (create/case): CSRF set to false --- src/adonisjs/config/shield.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/adonisjs/config/shield.js b/src/adonisjs/config/shield.js index 255cee356..e81c4ba44 100644 --- a/src/adonisjs/config/shield.js +++ b/src/adonisjs/config/shield.js @@ -132,7 +132,7 @@ module.exports = { | */ csrf: { - enable: true, + enable: false, methods: ['POST', 'PUT', 'DELETE'], filterUris: [], cookieOptions: {