Skip to content

Commit

Permalink
feat (footnote/app version): show version based on release tag
Browse files Browse the repository at this point in the history
  • Loading branch information
@HeitorMatt
HeitorMatt committed Oct 28, 2020
1 parent c1a3bf0 commit 4e0bafa
Show file tree
Hide file tree
Showing 4 changed files with 128 additions and 102 deletions.
2 changes: 2 additions & 0 deletions src/adonisjs/public/author/partials/harena-version.html
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<div id="version-footnote" class="fixed-bottom" style="text-align:center">
</div>
201 changes: 100 additions & 101 deletions src/adonisjs/public/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,110 +1,109 @@
<!doctype html>
<html lang="en">
<head>
<!-- meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta http-equiv="X-UA-Compatible" content="IE=edge">

<link rel="stylesheet" href="author/css/author.css">

<script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.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="./lib/jquery-3-4-1/jquery-3.4.1.slim.min.js"></script>
<script src="./lib/popper-1-15-0/popper.min.js"></script>
<script src="./lib/bootstrap-4.4.1/js/bootstrap.bundle.min.js"></script>

<script src="config/config.js"></script>
<script src="infra/bus.js"></script>
<script src="infra/basic.js"></script>
<script src="infra/dcc-common-server-proxy.js"></script>
<script src="infra/dcc-common-server-address.js"></script>
<script src="/infra/simple-page-tasks.js"></script>
<script src="infra/token-validator.js"></script>

<script src="dccs/dcc.js"></script>
<script src="dccs/components/dcc-base.js "></script>
<script src="dccs/components/dcc-visual.js "></script>
<script src="dccs/components/dcc-block.js"></script>
<script src="dccs/components/dcc-button.js"></script>
<script src="dccs/components/dcc-notice-input.js"></script>

<script src="dccs/components/web/dcc-rest.js"></script>
<script src="dccs/components/web/dcc-include.js"></script>
<script src="dccs/components/web/dcc-dhtml.js"></script>

<script src="dccs/components/data/dcc-submit.js"></script>
<script src="dccs/components/data/dcc-model.js"></script>
<script src="dccs/components/data/dcc-record.js"></script>

<script src="dccs/subscribe-dcc.js"></script>
<script src="dccs/trigger-dcc.js"></script>
<script src="dccs/property-dcc.js"></script>
<script src="dccs/connect-dcc.js"></script>

<script src="infra/dcc-rest-proxy.js"></script>
<script src="infra/dcc-basic.js"></script>


<link rel="stylesheet" href="lib/fontawesome-5-10-1/css/all.min.css">
<link rel="stylesheet" href="lib/bootstrap-4.4.1/css/bootstrap.min.css">

<link rel="stylesheet" href="dccs/css/dccs.css">
<link rel="stylesheet" href="dccs/css/properties.css">
<link rel="stylesheet" href="infra/css/common-player.css">
<link rel="stylesheet" href="infra/css/common-author.css">

<script src="author/js/dcc-author-server-proxy.js"></script>

<script src="author/js/create.js"></script>
<script src="author/js/template-case.js"></script>
<script src="author/js/draft.js"></script>
<!-- Reference CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
<link rel="stylesheet" href="start/css/main.css"/>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato"/>

<!-- Favicon -->
<link rel="shortcut icon" href="#">

<title>Phil Muchbetter Game</title>

</head>

<body onload="TokenController.instance.checkToken()">
<!-- Login/logout header -->
<dcc-include src="/author/partials/header.html"></dcc-include>
<div class="d-flex vh-100 vw-100" style="background-color: rgb(245,245,245);">
<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="d-flex flex-column">
<h1 class="home-header-text"> Jacinto Bemelhor: a clinical reasoning game</h1>
<p class="home-p-text">Join us in this adventure of becoming a doctor</p>
<div class="container-fluid">
<div class="row">
<div class="col-4 lets-play rounded-pill" onclick="location.href='/author/home'">Author</div>
<div class="col-4 ml-4 lets-play rounded-pill" onclick="location.href='/player/home?clearance=1&published=1'">Player</div>
<head>
<!-- meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta http-equiv="X-UA-Compatible" content="IE=edge">

<link rel="stylesheet" href="author/css/author.css">

<script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.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="./lib/jquery-3-4-1/jquery-3.4.1.slim.min.js"></script>
<script src="./lib/popper-1-15-0/popper.min.js"></script>
<script src="./lib/bootstrap-4.4.1/js/bootstrap.bundle.min.js"></script>

<script src="config/config.js"></script>
<script src="infra/bus.js"></script>
<script src="infra/basic.js"></script>
<script src="infra/dcc-common-server-proxy.js"></script>
<script src="infra/dcc-common-server-address.js"></script>
<script src="/infra/simple-page-tasks.js"></script>
<script src="infra/token-validator.js"></script>

<script src="dccs/dcc.js"></script>
<script src="dccs/components/dcc-base.js "></script>
<script src="dccs/components/dcc-visual.js "></script>
<script src="dccs/components/dcc-block.js"></script>
<script src="dccs/components/dcc-button.js"></script>
<script src="dccs/components/dcc-notice-input.js"></script>

<script src="dccs/components/web/dcc-rest.js"></script>
<script src="dccs/components/web/dcc-include.js"></script>
<script src="dccs/components/web/dcc-dhtml.js"></script>

<script src="dccs/components/data/dcc-submit.js"></script>
<script src="dccs/components/data/dcc-model.js"></script>
<script src="dccs/components/data/dcc-record.js"></script>

<script src="dccs/subscribe-dcc.js"></script>
<script src="dccs/trigger-dcc.js"></script>
<script src="dccs/property-dcc.js"></script>
<script src="dccs/connect-dcc.js"></script>

<script src="infra/dcc-rest-proxy.js"></script>
<script src="infra/dcc-basic.js"></script>


<link rel="stylesheet" href="lib/fontawesome-5-10-1/css/all.min.css">
<link rel="stylesheet" href="lib/bootstrap-4.4.1/css/bootstrap.min.css">

<link rel="stylesheet" href="dccs/css/dccs.css">
<link rel="stylesheet" href="dccs/css/properties.css">
<link rel="stylesheet" href="infra/css/common-player.css">
<link rel="stylesheet" href="infra/css/common-author.css">

<script src="author/js/dcc-author-server-proxy.js"></script>

<script src="author/js/create.js"></script>
<script src="author/js/template-case.js"></script>
<script src="author/js/draft.js"></script>
<!-- Reference CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
<link rel="stylesheet" href="start/css/main.css"/>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato"/>

<!-- Favicon -->
<link rel="shortcut icon" href="#">

<title>Phil Muchbetter Game</title>

</head>

<body onload="TokenController.instance.checkToken()">
<!-- Login/logout header -->
<dcc-include src="/author/partials/header.html"></dcc-include>
<main>
<div class="d-flex vh-100 vw-100" style="background-color: rgb(245,245,245);">
<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="d-flex flex-column">
<h1 class="home-header-text"> Jacinto Bemelhor: a clinical reasoning game</h1>
<p class="home-p-text">Join us in this adventure of becoming a doctor</p>
<div class="container-fluid">
<div class="row">
<div class="col-4 lets-play rounded-pill" onclick="location.href='/author/home'">Author</div>
<div class="col-4 ml-4 lets-play rounded-pill" onclick="location.href='/player/home?clearance=1&published=1'">Player</div>
</div>

</div>
</div>
</div>
<div class="d-flex ml-auto w-50 flex-column align-items-center justify-content-center"
style="background: url('start/img/background_home.jpeg');">
<div>
<img src="start/img/home_icon.png" alt="" class="h-100 float-right" id="home-image"/>
</div>
</div>

</div>
</div>
</main>
<div id="version-footnote" class="fixed-bottom" style="text-align:center">
</div>
<div class="d-flex ml-auto w-50 flex-column align-items-center justify-content-center"
style="background: url('start/img/background_home.jpeg');">
<div>
<img src="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>

<div class="fixed-bottom" style="text-align:center">
Version Harena - v1.2.0
</div>
</body>

</body>
</html>
24 changes: 24 additions & 0 deletions src/adonisjs/public/infra/simple-page-tasks.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ class PageController {
})
MessageBus.ext.subscribe('control/dhtml/ready', this.removeLoadingIcon)
MessageBus.ext.subscribe('control/case/ready', this.removeLoadingIcon)
MessageBus.ext.subscribe('control/validate/ready', this.removeLoadingIcon)
}

async removeLoadingIcon(){
Expand All @@ -38,10 +39,33 @@ class PageController {
});

}

async harenaVersionFootNote(){
if(!sessionStorage.getItem('harena-version')){
const config = {
url: 'https://api.github.com/repos/harena-lab/harena-space/releases/latest',
}
await axios(config)
.then(function (endpointResponse) {
sessionStorage.setItem('harena-version', endpointResponse.data.tag_name)
console.log(endpointResponse.data.tag_name)

})
.catch(function (error) {
console.log(error)
})
}
window.addEventListener("load", function(event) {
if(document.querySelector('#version-footnote'))
document.querySelector('#version-footnote')
.innerHTML = 'Harena Version - ' + sessionStorage.getItem('harena-version')
})
}
}
(function () {
PageController.instance = new PageController()
PageController.instance.controlDropdownMenu()
PageController.instance.harenaVersionFootNote()
PageController.loadingBox =
`<div id="loading-page-container" class="d-flex flex-column justify-content-center align-items-center" style="position:absolute; top:50%; left:50%;">
<div class="spinner-border align-self-center" role="status" aria-hidden="true"></div>
Expand Down
3 changes: 2 additions & 1 deletion src/adonisjs/public/infra/token-validator.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ class TokenController {
} catch (e) {
// console.log(e)
}
MessageBus.ext.publish('control/validate/ready')
}else{
window.addEventListener("load", function(event) {
try {
Expand All @@ -85,7 +86,7 @@ class TokenController {
} catch (e) {
// console.log(e)
}

MessageBus.ext.publish('control/validate/ready')
});
}
}
Expand Down

0 comments on commit 4e0bafa

Please sign in to comment.