Skip to content

Commit

Permalink
Merge pull request #291 from harena-lab/development
Browse files Browse the repository at this point in the history 
Development
  • Loading branch information
@santanche
santanche authored Oct 13, 2021
2 parents ce09ba1 + 69c8e8f commit 0534314
Show file tree
Hide file tree
Showing 211 changed files with 15,187 additions and 3,273 deletions.
4 changes: 2 additions & 2 deletions ckeditor-custom/balloon-block/ckeditor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class HarenaPlugin extends Plugin {

// Callback executed once the image is clicked.
view.on( 'execute', () => {
MessageBus.int.publish('control/editor/edit/confirm')
MessageBus.i.publish('control/editor/edit/confirm')
} );

return view;
Expand All @@ -78,7 +78,7 @@ class HarenaPlugin extends Plugin {

// Callback executed once the image is clicked.
view.on( 'execute', () => {
MessageBus.int.publish('control/editor/edit/cancel')
MessageBus.i.publish('control/editor/edit/cancel')
} );

return view;
Expand Down
6 changes: 4 additions & 2 deletions ckeditor-custom/decoupled/ckeditor.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,8 @@ class UploadMediaPlugin extends Plugin {
editor.model.insertContent(mediaElement,
editor.model.document.selection );
} );

this.off('uploadComplete')
}, { priority: 'low' } );

}
Expand Down Expand Up @@ -418,7 +420,7 @@ class HarenaPlugin extends Plugin {
// Callback executed once the image is clicked.
view.on( 'execute', () => {
const confirm = editor.config.get('harena.confirm')
MessageBus.int.publish(confirm)
MessageBus.i.publish(confirm)
} );

return view;
Expand All @@ -436,7 +438,7 @@ class HarenaPlugin extends Plugin {
// Callback executed once the image is clicked.
view.on( 'execute', () => {
const cancel = editor.config.get('harena.cancel')
MessageBus.int.publish(cancel)
MessageBus.i.publish(cancel)
} );

return view;
Expand Down
Binary file added src/adonisjs/public/android-chrome-192x192.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/adonisjs/public/android-chrome-512x512.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/adonisjs/public/apple-touch-icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions src/adonisjs/public/author/create/case/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
<script src="../../../infra/dcc-common-server-address.js"></script>
<script src="../../../infra/token-validator.js"></script>

<script src="../../../dccs/base/primitive-dcc.js"></script>
<script src="../../../dccs/base/scope-dcc.js"></script>
<script src="../../../dccs/base/dcc.js"></script>
<script src="../../../dccs/base/dcc-base.js "></script>
<script src="../../../dccs/base/dcc-visual.js "></script>
Expand Down
2 changes: 2 additions & 0 deletions src/adonisjs/public/author/create/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
<script src="../../infra/simple-page-tasks.js"></script>
<script src="../../infra/token-validator.js"></script>

<script src="../../dccs/base/primitive-dcc.js"></script>
<script src="../../dccs/base/scope-dcc.js"></script>
<script src="../../dccs/base/dcc.js"></script>
<script src="../../dccs/base/dcc-base.js "></script>
<script src="../../dccs/base/dcc-visual.js "></script>
Expand Down
7 changes: 7 additions & 0 deletions src/adonisjs/public/author/drafts/category/cases/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
<script src="/infra/token-validator.js"></script>
<script src="/infra/conditional-layout.js"></script>

<script src="/dccs/base/primitive-dcc.js"></script>
<script src="/dccs/base/scope-dcc.js"></script>
<script src="/dccs/base/dcc.js"></script>
<script src="/dccs/base/dcc-base.js "></script>
<script src="/dccs/base/dcc-visual.js "></script>
Expand All @@ -47,6 +49,11 @@
<script src="/infra/dcc-rest-proxy.js"></script>
<script src="/infra/dcc-basic.js"></script>

<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="shortcut icon" href="/icons/favicon.ico">
<link rel="manifest" href="/site.webmanifest">

<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">
Expand Down
7 changes: 7 additions & 0 deletions src/adonisjs/public/author/drafts/category/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
<script src="/infra/simple-page-tasks.js"></script>
<script src="/infra/token-validator.js"></script>

<script src="/dccs/base/primitive-dcc.js"></script>
<script src="/dccs/base/scope-dcc.js"></script>
<script src="/dccs/base/dcc.js"></script>
<script src="/dccs/base/dcc-base.js "></script>
<script src="/dccs/base/dcc-visual.js "></script>
Expand All @@ -46,6 +48,11 @@
<script src="/infra/dcc-rest-proxy.js"></script>
<script src="/infra/dcc-basic.js"></script>

<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="shortcut icon" href="/icons/favicon.ico">
<link rel="manifest" href="/site.webmanifest">

<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">
Expand Down
7 changes: 7 additions & 0 deletions src/adonisjs/public/author/drafts/feedback/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
<script src="/infra/token-validator.js"></script>
<script src="/infra/conditional-layout.js"></script>

<script src="/dccs/base/primitive-dcc.js"></script>
<script src="/dccs/base/scope-dcc.js"></script>
<script src="/dccs/base/dcc.js"></script>
<script src="/dccs/base/dcc-base.js "></script>
<script src="/dccs/base/dcc-visual.js "></script>
Expand All @@ -47,6 +49,11 @@
<script src="/infra/dcc-rest-proxy.js"></script>
<script src="/infra/dcc-basic.js"></script>

<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="shortcut icon" href="/icons/favicon.ico">
<link rel="manifest" href="/site.webmanifest">

<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">
Expand Down
9 changes: 7 additions & 2 deletions src/adonisjs/public/author/drafts/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
<script src="/infra/token-validator.js"></script>
<script src="/infra/conditional-layout.js"></script>

<script src="/dccs/base/primitive-dcc.js"></script>
<script src="/dccs/base/scope-dcc.js"></script>
<script src="/dccs/base/dcc.js"></script>
<script src="/dccs/base/dcc-base.js "></script>
<script src="/dccs/base/dcc-visual.js "></script>
Expand All @@ -47,8 +49,11 @@
<script src="/infra/dcc-rest-proxy.js"></script>
<script src="/infra/dcc-basic.js"></script>



<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="shortcut icon" href="/icons/favicon.ico">
<link rel="manifest" href="/site.webmanifest">

<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">
Expand Down
2 changes: 2 additions & 0 deletions src/adonisjs/public/author/drafts/quest/cases/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
<script src="../../../../infra/dcc-common-server-address.js"></script>
<script src="../../../../infra/token-validator.js"></script>

<script src="../../../../dccs/base/primitive-dcc.js"></script>
<script src="../../../../dccs/base/scope-dcc.js"></script>
<script src="../../../../dccs/base/dcc.js"></script>
<script src="../../../../dccs/base/dcc-base.js "></script>
<script src="../../../../dccs/base/dcc-visual.js "></script>
Expand Down
2 changes: 2 additions & 0 deletions src/adonisjs/public/author/drafts/quest/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
<script src="../../../infra/dcc-common-server-address.js"></script>
<script src="../../../infra/token-validator.js"></script>

<script src="../../../dccs/base/primitive-dcc.js"></script>
<script src="../../../dccs/base/scope-dcc.js"></script>
<script src="../../../dccs/base/dcc.js"></script>
<script src="../../../dccs/base/dcc-base.js "></script>
<script src="../../../dccs/base/dcc-visual.js "></script>
Expand Down
7 changes: 7 additions & 0 deletions src/adonisjs/public/author/home/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
<script src="/infra/token-validator.js"></script>
<script src="/infra/conditional-layout.js"></script>

<script src="/dccs/base/primitive-dcc.js"></script>
<script src="/dccs/base/scope-dcc.js"></script>
<script src="/dccs/base/dcc.js"></script>
<script src="/dccs/base/dcc-base.js "></script>
<script src="/dccs/base/dcc-visual.js "></script>
Expand All @@ -46,6 +48,11 @@
<script src="/infra/dcc-rest-proxy.js"></script>
<script src="/infra/dcc-basic.js"></script>

<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="shortcut icon" href="/icons/favicon.ico">
<link rel="manifest" href="/site.webmanifest">

<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">
Expand Down
10 changes: 9 additions & 1 deletion src/adonisjs/public/author/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
<script src="/infra/token-validator.js"></script>
<script src="/infra/conditional-layout.js"></script>

<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="shortcut icon" href="/icons/favicon.ico">
<link rel="manifest" href="/site.webmanifest">

<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="/lib/quill-1-3-7/quill.snow.css">
Expand All @@ -38,6 +44,8 @@
<script src="/lib/quill-1-3-7/quill.min.js"></script>
<script src="/lib/d3.min.js"></script>

<script src="/dccs/base/primitive-dcc.js"></script>
<script src="/dccs/base/scope-dcc.js"></script>
<script src="/dccs/base/dcc.js"></script>
<script src="/dccs/base/dcc-base.js"></script>
<script src="/dccs/base/dcc-visual.js"></script>
Expand Down Expand Up @@ -355,7 +363,7 @@ <h6 style="color:#808080;">Created by {{author_grade}}: {{username}} ({{institut
<div class="d-flex h-75">
<!-- Container displaying the flow of the case -->
<!-- -->
<div id="navigatior-block" class="w-25" style="width: 13% !important; min-width: 125px !important;">
<div id="navigation-block" class="w-25" style="width: 13% !important; min-width: 125px !important;">
<div class="sty-navigation-block">
<div class="sty-navigation-panel std-border">
<div id="navigation-panel"></div>
Expand Down
Loading

0 comments on commit 0534314

Please sign in to comment.