Merge remote-tracking branch 'origin/development' into development

harena-lab · Sep 3, 2020 · 8b905cc · 8b905cc
2 parents 2e4dc04 + 773e9e4
commit 8b905cc
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/src/adonisjs/app/Controllers/Http/QuestController.js b/src/adonisjs/app/Controllers/Http/QuestController.js
@@ -91,8 +91,8 @@ class QuestController {
 		} catch(e){
 			console.log(e)
 		}
-
-		return view.render('player.welcome', { quests: responseData[0]  });
+		const pageTitle = 'Welcome Player';
+		return view.render('player.welcome', { quests: responseData[0], pageTitle});
 
 	}
 }

diff --git a/src/adonisjs/public/start/css/main.css b/src/adonisjs/public/start/css/main.css
@@ -37,12 +37,12 @@ div {
 .home-p-text{
   font-family: 'Lato',serif;
   color: rgb(130,130,130);
-  font-size: 20pt;
+  font-size: 27px;
 }
 .home-header-text{
   font-family: 'Lato',serif;
   font-weight: 700;
-  font-size: 40pt;
+  font-size: 60px;
   font-style: bold;
   color: rgb(52,110,147);
 }

diff --git a/src/adonisjs/public/start/img/background_home.jpeg b/src/adonisjs/public/start/img/background_home.jpeg
diff --git a/src/adonisjs/public/start/img/home_icon.png b/src/adonisjs/public/start/img/home_icon.png
diff --git a/src/adonisjs/resources/views/index.edge b/src/adonisjs/resources/views/index.edge
@@ -13,38 +13,36 @@
 
   <title>Phil Muchbetter Game</title>
 
-  <style media="screen">
-  .test-margin{
-    border-color: rgb(52,110,147);
-    border-bottom-width: 45px;
-    border-top: 0;
-    border-left: 0;
-    border-right: 0;
-    border-style: solid;
-  }
-  </style>
 </head>
 
 <body>
 
   @include('layout.partials.header')
 
   <div class="d-flex vh-100 vw-100" style="background-color: rgb(245,245,245);">
-    <div class="w-100 mx-5 home-image-margin" style="">
-      <img src="{{ assetsUrl('start/img/home-image.png') }}" class="h-100 float-right" id="home-image" />
-      <div class="d-flex h-100 align-items-center">
+    <div class="d-flex w-100 mx-5 home-image-margin" style="">
+
+      <div class="d-flex ml-auto flex-column align-items-center justify-content-center align-items-center">
         <div class="flex-column">
           <h1 class="home-header-text"> Phil Muchbetter: a clinical reasoning game</h1>
           <p class="home-p-text">Join us in this adventure of becoming a doctor</p>
           <div class="lets-play rounded-pill" onclick="location.href='{{ route('author_home') }}'">Let's Play</div>
         </div>
       </div>
+      <div class="d-flex ml-auto w-50 flex-column align-items-center justify-content-center" style="background: url({{ assetsUrl('start/img/background_home.jpeg') }});">
+        <div>
+          <img src="{{ assetsUrl('start/img/home_icon.png') }}" alt="" class="h-100 float-right" id="home-image"/>
+        </div>
+      </div>
     </div>
   </div>
 
   <script src="start/js/Js_Anim.js"> </script>
   <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
   <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+
+  @include('layout.partials.footnote')
+
 </body>
 </html>
diff --git a/src/adonisjs/resources/views/layout/partials/footnote.edge b/src/adonisjs/resources/views/layout/partials/footnote.edge
@@ -0,0 +1,3 @@
+<div class="fixed-bottom" style="text-align:center">
+  Version Harena - v1.2.0
+</div>
diff --git a/src/adonisjs/resources/views/layout/partials/header.edge b/src/adonisjs/resources/views/layout/partials/header.edge
@@ -3,7 +3,6 @@
     {{-- Logo / Main Link --}}
     {{-- Navigation Actions --}}
     <div class="d-flex overflow-hidden pt-3 mr-4">
-Hello {{ auth.user.username }}
 
       <span class="inline-flex mr-4 rounded-md shadow mr-auto">
       <a href="{{ route('index') }}" class="inline-flex items-center px-3 py-2 text-base font-medium leading-6 text-indigo-600 transition duration-150 ease-in-out bg-white border border-transparent rounded-md hover:text-indigo-500 focus:outline-none focus:shadow-outline-blue active:bg-gray-50 active:text-indigo-700">