Skip to content

Commit

Permalink
Merge pull request #163 from datasci4health/development
Browse files Browse the repository at this point in the history 
Using relative urls using assetsUrls
  • Loading branch information
@matheusmota
matheusmota authored Aug 12, 2020
2 parents 524c913 + 805fa54 commit 8485548
Show file tree
Hide file tree
Showing 8 changed files with 106 additions and 100 deletions.
1 change: 1 addition & 0 deletions docker-compose-dev.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ services:
- HARENA_SPACE_API_VERSION=v1

- HARENA_MANAGER_URL=http://manager:10020
- HARENA_MANAGER_URL_CLIENT=http://localhost:10020
- HARENA_MANAGER_API_VERSION=v1

- HARENA_LOGGER_URL=http://localhost:10030
Expand Down
40 changes: 20 additions & 20 deletions src/adonisjs/resources/views/author/author-layout.edge
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@

<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no" name="viewport">

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

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

<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="/author/js/dcc-author-server-proxy.js"></script>

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

<script src="/author/js/create.js"></script>
<script src="/author/js/template-case.js"></script>
<script src="/author/js/draft.js"></script>
<link rel="stylesheet" href="{{ assetsUrl('lib/fontawesome-5-10-1/css/all.min.css') }}">
<link rel="stylesheet" href="{{ assetsUrl('lib/bootstrap-4-3-1/css/bootstrap.min.css') }}">

<link rel="stylesheet" href="{{ assetsUrl('infra/css/common-player.css') }}">
<link rel="stylesheet" href="{{ assetsUrl('infra/css/common-author.css') }}">
<link rel="stylesheet" href="{{ assetsUrl('author/css/author.css') }}">

<script src="{{ assetsUrl('infra/bus.js') }}"></script>
<script src="{{ assetsUrl('infra/basic.js') }}"></script>
<script src="{{ assetsUrl('infra/dcc-common-server-proxy.js') }}"></script>
<script src="{{ assetsUrl('infra/dcc-common-server-address.js') }}"></script>
<script src="{{ assetsUrl('author/js/dcc-author-server-proxy.js') }}"></script>

<script src="{{ assetsUrl('dccs/components/dcc-base.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-visual.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-notice-input.js') }}"></script>

<script src="{{ assetsUrl('author/js/create.js') }}"></script>
<script src="{{ assetsUrl('author/js/template-case.js') }}"></script>
<script src="{{ assetsUrl('author/js/draft.js') }}"></script>
</head>

@!section('content')
Expand Down
108 changes: 54 additions & 54 deletions src/adonisjs/resources/views/author/author.edge
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,70 +7,70 @@
<!-- Tell the browser to be responsive to screen width -->
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no" name="viewport">

<link rel="stylesheet" href="/lib/fontawesome-5-10-1/css/all.min.css">
<link rel="stylesheet" href="/lib/bootstrap-4-3-1/css/bootstrap.min.css">
<link rel="stylesheet" href="{{ assetsUrl('lib/fontawesome-5-10-1/css/all.min.css') }}">
<link rel="stylesheet" href="{{ assetsUrl('lib/bootstrap-4-3-1/css/bootstrap.min.css') }}">

<link rel="stylesheet" href="/infra/css/common-player.css">
<link rel="stylesheet" href="/infra/css/common-author.css">
<link rel="stylesheet" href="/dccs/css/dccs.css">
<link rel="stylesheet" href="/author/css/author.css">
<link rel="stylesheet" href="/dccs/css/properties.css">
<link rel="stylesheet" href="{{ assetsUrl('infra/css/common-player.css') }}">
<link rel="stylesheet" href="{{ assetsUrl('infra/css/common-author.css') }}">
<link rel="stylesheet" href="{{ assetsUrl('dccs/css/dccs.css') }}">
<link rel="stylesheet" href="{{ assetsUrl('author/css/author.css') }}">
<link rel="stylesheet" href="{{ assetsUrl('dccs/css/properties.css') }}">

<link rel="stylesheet" href="/lib/quill-1-3-7/quill.snow.css">
<link rel="stylesheet" href="{{ assetsUrl('lib/quill-1-3-7/quill.snow.css') }}">

<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="/context/context.js"></script>
<script src="{{ assetsUrl('infra/bus.js') }}"></script>
<script src="{{ assetsUrl('infra/basic.js') }}"></script>
<script src="{{ assetsUrl('infra/dcc-common-server-proxy.js') }}"></script>
<script src="{{ assetsUrl('infra/dcc-common-server-address.js') }}"></script>
<script src="{{ assetsUrl('context/context.js') }}"></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-3-1/js/bootstrap.min.js"></script>
<script src="{{ assetsUrl('lib/jquery-3-4-1/jquery-3.4.1.slim.min.js') }}"></script>
<script src="{{ assetsUrl('lib/popper-1-15-0/popper.min.js') }}"></script>
<script src="{{ assetsUrl('lib/bootstrap-4-3-1/js/bootstrap.min.js') }}"></script>


<script src="/lib/quill-1-3-7/quill.min.js"></script>
<script src="/lib/d3.min.js"></script>
<script src="{{ assetsUrl('lib/quill-1-3-7/quill.min.js') }}"></script>
<script src="{{ assetsUrl('lib/d3.min.js') }}"></script>

<script src="/dccs/components/dcc-base.js"></script>
<script src="/dccs/components/dcc-visual.js"></script>
<script src="/dccs/components/dcc-markdown.js"></script>
<script src="/dccs/components/dcc-annotation.js"></script>
<script src="/dccs/components/dcc-image.js"></script>
<script src="/dccs/components/dcc-expression.js"></script>
<script src="/dccs/components/dcc-block.js"></script>
<script src="/dccs/components/dcc-trigger.js"></script>
<script src="/dccs/components/dcc-character.js"></script>
<script src="/dccs/components/dcc-lively-dialog.js"></script>
<script src="/dccs/components/dcc-notice-input.js"></script>
<script src="/dccs/components/dcc-context-menu.js"></script>
<script src="/dccs/components/dcc-state-select.js"></script>
<script src="/dccs/components/dcc-image-marker.js"></script>
<script src="/dccs/components/dcc-styler.js"></script>
<script src="/dccs/components/dcc-entity.js"></script>
<script src="/dccs/components/dcc-input.js"></script>
<script src="/dccs/components/dcc-input-typed.js"></script>
<script src="/dccs/components/dcc-input-choice.js"></script>
<script src="/dccs/components/dcc-input-table.js"></script>
<script src="/dccs/components/dcc-slider.js"></script>
<script src="/dccs/components/dcc-compute.js"></script>
<script src="/dccs/components/dcc-report.js"></script>
<script src="/dccs/components/dcc-graph.js"></script>
<script src="{{ assetsUrl('dccs/components/dcc-base.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-visual.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-markdown.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-annotation.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-image.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-expression.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-block.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-trigger.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-character.js') }})"></script>
<script src="{{ assetsUrl('dccs/components/dcc-lively-dialog.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-notice-input.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-context-menu.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-state-select.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-image-marker.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-styler.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-entity.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-input.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-input-typed.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-input-choice.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-input-table.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-slider.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-compute.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-report.js') }}"></script>
<script src="{{ assetsUrl('dccs/components/dcc-graph.js') }}"></script>

<script src="/lib/showdown-2-0-0/showdown.min.js"></script>
<script src="/translator/translator.js"></script>
<script src="/translator/item-templates.js"></script>
<script src="{{ assetsUrl('lib/showdown-2-0-0/showdown.min.js') }}"></script>
<script src="{{ assetsUrl('translator/translator.js') }}"></script>
<script src="{{ assetsUrl('translator/item-templates.js') }}"></script>

<script src="/dccs/edit/properties.js"></script>
<script src="/dccs/edit/inplace-editor.js"></script>
<script src="/dccs/edit/inplace-plain-editor.js"></script>
<script src="/dccs/edit/inplace-text-editor.js"></script>
<script src="/dccs/edit/inplace-image-editor.js"></script>
<script src="{{ assetsUrl('dccs/edit/properties.js') }}"></script>
<script src="{{ assetsUrl('dccs/edit/inplace-editor.js') }}"></script>
<script src="{{ assetsUrl('dccs/edit/inplace-plain-editor.js') }}"></script>
<script src="{{ assetsUrl('dccs/edit/inplace-text-editor.js') }}"></script>
<script src="{{ assetsUrl('dccs/edit/inplace-image-editor.js') }}"></script>

<script src="/author/js/dcc-author-server-proxy.js"></script>
<script src="/author/js/panels.js"></script>
<script src="/author/js/navigator.js"></script>
<script src="/author/js/author.js"></script>
<script src="{{ assetsUrl('author/js/dcc-author-server-proxy.js') }}"></script>
<script src="{{ assetsUrl('author/js/panels.js') }}"></script>
<script src="{{ assetsUrl('author/js/navigator.js') }}"></script>
<script src="{{ assetsUrl('author/js/author.js') }}"></script>

</head>

Expand Down
2 changes: 1 addition & 1 deletion src/adonisjs/resources/views/dcc-common-server-address.edge
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

(function() {
DCCCommonServer.managerAddress = "{{harena_manager_url}}/";
DCCCommonServer.managerAddress = "{{harena_manager_url_client}}/";
DCCCommonServer.managerAddressAPI = DCCCommonServer.managerAddress +
"api/{{harena_manager_api_version}}/";
DCCCommonServer.loggerAddress = "{{harena_logger_url}}/";
Expand Down
2 changes: 1 addition & 1 deletion src/adonisjs/resources/views/index.edge
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<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="../start/img/home-image.png" class="h-100 float-right" id="home-image" />
<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="flex-column">
<h1 class="home-header-text"> Phil Muchbetter: a clinical reasoning game</h1>
Expand Down
6 changes: 3 additions & 3 deletions src/adonisjs/resources/views/layout/partials/header.edge
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Hello {{ auth.user.username }}
{{ token }} -->
<span class="inline-flex mr-4 rounded-md shadow mr-auto">
<a href="/" 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">
<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">
Home
</a>
</span>
Expand All @@ -20,12 +20,12 @@ Hello {{ auth.user.username }}

@loggedIn
<span class="inline-flex mr-4 rounded-md shadow">
<a href="/posts/create" class="inline-flex items-center px-4 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">
<a href="player" class="inline-flex items-center px-4 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">
Play
</a>
</span>
<span class="inline-flex rounded-md shadow">
<a href="/logout" class="inline-flex items-center px-4 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">
<a href="logout" class="inline-flex items-center px-4 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">
Logout
</a>
</span>
Expand Down
28 changes: 13 additions & 15 deletions src/adonisjs/resources/views/registration/template.edge
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,23 @@

<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no" name="viewport">

<link rel="stylesheet" href="../lib/fontawesome-5-10-1/css/all.min.css">
{{-- {{ sytle('https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css') }} --}}
<link rel="stylesheet" href="../lib/bootstrap-4-3-1/css/bootstrap.min.css">
<link rel="stylesheet" href="lib/fontawesome-5-10-1/css/all.min.css">
<link rel="stylesheet" href="lib/bootstrap-4-3-1/css/bootstrap.min.css">

<link rel="stylesheet" href="../infra/css/common-player.css">
<link rel="stylesheet" href="../infra/css/common-author.css">
<link rel="stylesheet" href="{{ assetsUrl('infra/css/common-player.css') }}">
<link rel="stylesheet" href="{{ assetsUrl('infra/css/common-author.css') }}">
{{-- {{ style('author') }} --}}

<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="js/dcc-author-server-proxy.js"></script>
<script src="{{ assetsUrl('infra/bus.js') }}"></script>
<script src="{{ assetsUrl('infra/basic.js') }}"></script>
<script src="{{ assetsUrl('infra/dcc-common-server-proxy.js') }}"></script>
<script src="{{ assetsUrl('infra/dcc-common-server-address.js') }}"></script>
<script src="{{ assetsUrl('author/js/dcc-author-server-proxy.js') }} "></script>
<script src="{{ assetsUrl('dccs/components/dcc-base.js') }} "></script>
<script src="{{ assetsUrl('dccs/components/dcc-visual.js') }} "></script>
<script src="{{ assetsUrl('dccs/components/dcc-notice-input.js') }}"></script>
<script src="{{ assetsUrl('author/js/template-case.js') }}"></script>

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

<script src="js/template-case.js"></script>
</head>

<body onload="TemplateToCase.s.start()">
Expand Down
19 changes: 13 additions & 6 deletions src/adonisjs/start/routes.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,14 @@
/** @type {typeof import('@adonisjs/framework/src/Route/Manager')} */
const Route = use("Route");
const View = use('View');
const Helpers = use('Helpers')
const axios = use("axios")

Route.get( 'populate_modal', 'CaseController.populate_modal')

Route.get('/', ({ view }) => view.render('index') )
Route.get('/', ({ view }) =>
view.render('index')
).as('index')

Route.get('institution-registration', async ({ view }) => {
const pageTitle = "Institution Registration"
Expand All @@ -32,11 +35,12 @@ Route.get('institution-registration', async ({ view }) => {
// when you are not logged in
Route.group(() => {

Route.get( 'signup', 'UserController.create')
Route.get( 'login', 'AuthController.create')
Route.get( 'signup', 'UserController.create').as('signup')
Route.get( 'login', 'AuthController.create').as('login')

Route.post( 'signup', 'UserController.signup').as('signup')
Route.post( 'login', 'AuthController.login').as('login')

Route.post( 'signup', 'UserController.signup')
Route.post( 'login', 'AuthController.login')

}).middleware(['guest'])

Expand Down Expand Up @@ -108,7 +112,8 @@ Route.group(() => {

Route.post('store', 'CaseController.store');
Route.post('update', 'CaseController.update');
}).prefix('author/choose-template').as('author_template_case')
}).prefix('choose-template').as('author_template_case')



Route.get("drafts", ({ view }) => {
Expand All @@ -125,6 +130,7 @@ const Env = use("Env");
Route.get("infra/dcc-common-server-address.js", async ({response, view}) =>{
const harena_manager_url = Env.get("HARENA_MANAGER_URL", "http://127.0.0.1:10020");
// const harena_manager_url = "http://127.0.0.1:10020"
const harena_manager_url_client = Env.get("HARENA_MANAGER_URL_CLIENT", "http://127.0.0.1:10020");
const harena_manager_api_version = Env.get("HARENA_MANAGER_API_VERSION", "v1");
// const harena_manager_api_version = "v1"
const harena_logger_url = Env.get("HARENA_LOGGER_URL", "http://127.0.0.1:10030");
Expand All @@ -134,6 +140,7 @@ Route.get("infra/dcc-common-server-address.js", async ({response, view}) =>{
response.header("Content-type", "application/javascript");
return view.render("dcc-common-server-address",
{"harena_manager_url": harena_manager_url,
"harena_manager_url_client": harena_manager_url_client,
"harena_manager_api_version": harena_manager_api_version,
"harena_logger_url": harena_logger_url,
"harena_logger_api_version": harena_logger_api_version});
Expand Down

0 comments on commit 8485548

Please sign in to comment.