diff --git a/src/adonisjs/app/Controllers/Http/QuestController.js b/src/adonisjs/app/Controllers/Http/QuestController.js index bb18b4438..1b1f378b1 100644 --- a/src/adonisjs/app/Controllers/Http/QuestController.js +++ b/src/adonisjs/app/Controllers/Http/QuestController.js @@ -5,6 +5,96 @@ const axios = use('axios') const view = use('View') class QuestController { + async getCasesByQuestAuthor({ request, response }) { + try{ + const params = request.all() + console.log('------------------------COR DA QUEST'); + console.log(params.color); + var responseData = []; + let endpoint_url = Env.get("HARENA_MANAGER_URL") + "/api/v1/author/quest/cases" + + var config = { + method: 'get', + url: endpoint_url, + data: { + questId: params.id + }, + headers: { + 'Authorization': 'Bearer ' + request.cookie('token') + } + }; + + + await axios(config) + .then(function (endpoint_response) { + console.log('============ Retrieving cases for selected quests'); + console.log(endpoint_response.data); + const busResponse = [] + for (const c in endpoint_response.data) { + busResponse.push({ + id: endpoint_response.data[c].id, + title: endpoint_response.data[c].title, + + }) + + } + responseData[0] = busResponse; + }) + + .catch(function (error) { + console.log(error); + }); + } catch(e){ + console.log(e) + } + + return view.render('author.drafts-cases', { cases: responseData[0]}); + + } + +async getQuestsAuthor({ request, response }) { + try{ + var responseData = []; + let endpoint_url = Env.get("HARENA_MANAGER_URL") + "/api/v1/author/quests" + + var config = { + method: 'get', + url: endpoint_url, + headers: { + 'Authorization': 'Bearer ' + request.cookie('token') + } + }; + + + await axios(config) + .then(function (endpoint_response) { + console.log('============ Retrieving quests'); + console.log(endpoint_response.data); + const busResponse = [] + for (const c in endpoint_response.data) { + busResponse.push({ + id: endpoint_response.data[c].id, + title: endpoint_response.data[c].title, + color: endpoint_response.data[c].color, + url: endpoint_response.data[c].url, + + }) + + } + responseData[0] = busResponse; + }) + + .catch(function (error) { + console.log(error); + }); + } catch(e){ + console.log(e) + } + + return view.render('author.drafts-quest', { quests: responseData[0]}); + + } + async getCasesByQuest ({ request, response }) { try { const params = request.all() diff --git a/src/adonisjs/public/infra/css/common-author.css b/src/adonisjs/public/infra/css/common-author.css index f24b86ff0..11c4ba43d 100644 --- a/src/adonisjs/public/infra/css/common-author.css +++ b/src/adonisjs/public/infra/css/common-author.css @@ -155,11 +155,49 @@ nav.navbar { } } .home-content-padding{ + + background-color: #f2f2f2; + padding-left: 70px; + padding-right: 70px; + padding-top: 70px; +} +.draft-content-padding{ + border-color: #505050; + border-width: 0.5rem; + border-top-style: solid; + border-left-style: solid; + border-right-style: solid; + border-top-left-radius: 0.94rem; + border-top-right-radius: 0.94rem; background-color: #f2f2f2; + padding-left: 70px; padding-right: 70px; padding-top: 70px; } +.draft-quest-icon{ + border: 7px solid #e8e8e8; + border-radius: 142px; +} + +.draft-quest-icon:hover{ + border: 7px solid #505050; + width: 152px; +} +.draft-quest-container{ + width: 300px; + margin: 5px; + border-radius: 5px; + border-color: #b4b4b4; + border-style: solid; + border-width: 2px; + background-color: #f7f7f7; + + padding-top: 0.5rem; + padding-left: 0.5rem; + padding-right: 0.5rem; +} + .home-author-box-content{ width: 33%; margin: 10px; diff --git a/src/adonisjs/public/infra/css/common-player.css b/src/adonisjs/public/infra/css/common-player.css index fa0415c38..1b33f807a 100644 --- a/src/adonisjs/public/infra/css/common-player.css +++ b/src/adonisjs/public/infra/css/common-player.css @@ -1,5 +1,19 @@ @charset "UTF-8"; +.player-quest-container{ + margin: 5px; + border-radius: 5px; + border-color: #b4b4b4; + border-style: solid; + border-width: 2px; + background-color: #f7f7f7; +} +.player-quest-icon-padding{ + padding-top: 0.5rem; + padding-left: 0.5rem; + padding-right: 0.5rem; +} + .hidden-overflow{ overflow: hidden; } diff --git a/src/adonisjs/resources/views/author/drafts-cases.edge b/src/adonisjs/resources/views/author/drafts-cases.edge new file mode 100644 index 000000000..e1bfe70e5 --- /dev/null +++ b/src/adonisjs/resources/views/author/drafts-cases.edge @@ -0,0 +1,43 @@ +@layout('author.author-layout') + +@section('content') + + +
+
+ + +
+ +
+ + +
+
+

Continue editing your draft cases.

+
+
+ @each(c in cases) +
+
{{c.title}}
+
+
EDIT
+
PREVIEW
+
DELETE
+
+
+ @endeach + +
+
+
+
+ + + +@endsection diff --git a/src/adonisjs/resources/views/author/drafts-quest.edge b/src/adonisjs/resources/views/author/drafts-quest.edge new file mode 100644 index 000000000..0302ca600 --- /dev/null +++ b/src/adonisjs/resources/views/author/drafts-quest.edge @@ -0,0 +1,46 @@ +@layout('author.author-layout') + +@section('content') + + +
+
+ + +
+ +
+ + +
+
+

Choose a quest to filter your cases.

+
+
+
+ + @each(q in quests) + +
+ + +
{{q.title}}
+ + +
+ @endeach + +
+
+
+
+
+ + + +@endsection diff --git a/src/adonisjs/resources/views/author/drafts.edge b/src/adonisjs/resources/views/author/drafts.edge index 72ee90ea2..51ed7d8fa 100644 --- a/src/adonisjs/resources/views/author/drafts.edge +++ b/src/adonisjs/resources/views/author/drafts.edge @@ -17,7 +17,7 @@ -
+

Continue editing your draft cases.

diff --git a/src/adonisjs/resources/views/author/home.edge b/src/adonisjs/resources/views/author/home.edge index eba3e8b4e..a6e7afff8 100644 --- a/src/adonisjs/resources/views/author/home.edge +++ b/src/adonisjs/resources/views/author/home.edge @@ -29,7 +29,7 @@
--> - + Drafts
Continue editing a case. diff --git a/src/adonisjs/resources/views/player/template.edge b/src/adonisjs/resources/views/player/template.edge index e4c7e104a..fafd3af5b 100755 --- a/src/adonisjs/resources/views/player/template.edge +++ b/src/adonisjs/resources/views/player/template.edge @@ -41,6 +41,28 @@ color: #606060; } + .player-quest-icon{ + width: var(--player-quest-icon-size); + height: var(--player-quest-icon-size); + /* margin-top: var(--player-quest-icon-margin); */ + /* background: var(--player-quest-icon-image-map) -5px -155px; */ + border: 7px solid #e8e8e8; + border-radius: var(--player-quest-icon-size); + cursor: pointer; + } + .player-quest-icon:hover{ + + + border: 7px solid #0962b5; + border-radius: var(--player-quest-icon-size); + width: var(--player-quest-icon-size) +10px; + height: var(--player-quest-icon-size) +10px; + /* background: var(--player-quest-icon-image-map) 0 -150px; */ + } + .player-quest-txt{ + color: #245797; + } + .visita-virtual{ width: var(--player-quest-icon-size); height: var(--player-quest-icon-size); @@ -245,14 +267,14 @@ background-color: black; } - .player-quest-icon{ + /* .player-quest-icon{ margin: 5px; border-radius: 5px; border-color: #b4b4b4; border-style: solid; border-width: 2px; background-color: #f7f7f7; - } + } */ .player-welcome-padding{ @@ -268,7 +290,7 @@ .player-cases-content-padding{ /* background-color: #3295ce; */ background-color: #f2f2f2; - border-color: #245797; + border-color: #505050; border-width: 0.5rem; border-top-style: solid; border-left-style: solid; diff --git a/src/adonisjs/resources/views/player/welcome.edge b/src/adonisjs/resources/views/player/welcome.edge index 2db6eb47e..cd5f9b4e7 100755 --- a/src/adonisjs/resources/views/player/welcome.edge +++ b/src/adonisjs/resources/views/player/welcome.edge @@ -25,10 +25,10 @@ @each(q in quests) -
+
- -
{{q.title}}
+ +
{{q.title}}
diff --git a/src/adonisjs/start/routes.js b/src/adonisjs/start/routes.js index 0e88ce4a8..243487ac7 100644 --- a/src/adonisjs/start/routes.js +++ b/src/adonisjs/start/routes.js @@ -59,9 +59,17 @@ Route.group(() => { Route.post('update', 'CaseController.update') }).prefix('choose-template').as('author_template_case') -Route.get('drafts', ({ view }) => { - return view.render('author.drafts') -}).as('cases_drafts') +// Route.get('drafts', ({ view }) => { +// return view.render('author.drafts') +// }).as('cases_drafts') +Route.group(() => { + Route.get('/', ({ view }) => { + return view.render('author.drafts') + }).as('draft_all_cases') + + Route.get('quests', 'QuestController.getQuestsAuthor').as('draft_quests') + Route.get('cases', 'QuestController.getCasesByQuestAuthor').as('draft_cases') +}).prefix('drafts') Route.group(() => { Route.post( 'link/case', 'CaseController.linkCase')