Merge branch 'feature/refactor-author' into development

harena-lab · Sep 9, 2020 · a844f23 · a844f23
2 parents de53f9a + dd299d1
commit a844f23
Show file tree

Hide file tree

Showing 10 changed files with 272 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -0,0 +1,43 @@
+@layout('author.author-layout')
+
+@section('content')
+<body>
+  <!-- Create a section to place page content -->
+  <main role="main">
+    <div class="d-flex flex-column vh-100 vw-100 home-author-padding hidden-overflow">
+
+      <!-- Create breadcrumbs -->
+      <div class="container-fluid" >
+        <nav aria-label="breadcrumb">
+          <ol class="breadcrumb">
+            <li class="breadcrumb-item"><a href={{route('author_home')}}>Home</a></li>
+            <li class="breadcrumb-item active" aria-current="page">Drafts</li>
+          </ol>
+        </nav>
+      </div>
+      <!-- End of breadcrumbs -->
+
+      <div class="h-100 w-100 draft-content-padding">
+        <div class="home-text mb-5">
+          <p>Continue editing your draft cases.</p>
+        </div>
+        <div id="case-boxes" class="container-fluid h-100 scroll-y draft-scroll-container">
+          @each(c in cases)
+          <div id="b{{c.id}}" class="row draft-author-case-container">
+            <div class="col draft-case-title">{{c.title}}</div>
+            <div class="d-flex justify-content-end">
+              <div id="e{{c.id}}" class="col author-panel-button" onclick="window.location.href='/author?id={{c.id}}'">EDIT</div>
+              <div id="p{{c.id}}" class="col author-panel-button">PREVIEW</div>
+              <div id="d{{c.id}}" class="col author-panel-button">DELETE</div>
+            </div>
+          </div>
+          @endeach
+
+        </div>
+      </div>
+    </div>
+  </main>
+  <!-- end of div /.container -->
+
+</body>
+@endsection
diff --git a/src/adonisjs/resources/views/author/drafts-quest.edge b/src/adonisjs/resources/views/author/drafts-quest.edge
@@ -0,0 +1,46 @@
+@layout('author.author-layout')
+
+@section('content')
+<body>
+  <!-- Create a section to place page content -->
+  <main role="main">
+    <div class="d-flex flex-column vh-100 vw-100 home-author-padding hidden-overflow">
+
+      <!-- Create breadcrumbs -->
+      <div class="container-fluid" >
+        <nav aria-label="breadcrumb">
+          <ol class="breadcrumb">
+            <li class="breadcrumb-item"><a href={{route('author_home')}}>Home</a></li>
+            <li class="breadcrumb-item active" aria-current="page">Drafts</li>
+          </ol>
+        </nav>
+      </div>
+      <!-- End of breadcrumbs -->
+
+      <div class="h-100 w-100 home-content-padding">
+        <div class="home-text mb-5">
+          <p>Choose a quest to filter your cases.</p>
+        </div>
+        <div id="case-boxes" class="container-fluid h-100 scroll-x draft-scroll-container">
+          <div class="d-flex">
+
+              @each(q in quests)
+
+              <div class="d-flex justify-content-center text-center draft-quest-container">
+                <a href="{{ route('draft_cases')}}?id={{q.id}}">
+                  <img class="draft-quest-icon"  src="{{q.url}}">
+                  <h5 class="text-center text-wrap txt-visita-virtual" style="color:{{q.color}} !important;">{{q.title}}</h5>
+                </a>
+
+              </div>
+              @endeach
+
+          </div>
+        </div>
+      </div>
+    </div>
+  </main>
+  <!-- end of div /.container -->
+
+</body>
+@endsection
diff --git a/src/adonisjs/resources/views/author/drafts.edge b/src/adonisjs/resources/views/author/drafts.edge
@@ -17,7 +17,7 @@
       </div>
       <!-- End of breadcrumbs -->
 
-      <div class="h-100 w-100 home-content-padding">
+      <div class="h-100 w-100 draft-content-padding">
         <div class="home-text mb-5">
           <p>Continue editing your draft cases.</p>
         </div>

diff --git a/src/adonisjs/resources/views/author/home.edge b/src/adonisjs/resources/views/author/home.edge
@@ -29,7 +29,7 @@
 	            </div>
 	          </a>
 	          -->
-			  <a href="{{ route('cases_drafts') }}" class="d-flex flex-column align-items-center justify-content-center home-author-box-content home-author-case-box">
+			  <a href="{{ route('draft_quests') }}" class="d-flex flex-column align-items-center justify-content-center home-author-box-content home-author-case-box">
 	            Drafts
 	            <div class="home-author-sub-text">
 	              Continue editing a case.

diff --git 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
@@ -25,10 +25,10 @@
             @each(q in quests)
 
 
-            <div class="col text-center player-quest-icon">
+            <div class="col text-center player-quest-container">
               <a href="{{ route('player_quest')}}?id={{q.id}}&color={{q.color.substring(1)}}">
-                <img class="visita-virtual"  src="{{q.url}}">
-                <h5 class="text-center text-wrap txt-visita-virtual" style="color:{{q.color}} !important;">{{q.title}}</h5>
+                <img class="player-quest-icon"  src="{{q.url}}">
+                <h5 class="text-center text-wrap player-quest-icon-txt" style="color:{{q.color}} !important;">{{q.title}}</h5>
               </a>
 
             </div>

diff --git 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')