Merge pull request #27 from datasci4health/development

Visual Editor for Images and Text
harena-lab · May 31, 2019 · 9338908 · 9338908
2 parents 2ba753d + 00078dc
commit 9338908
Show file tree

Hide file tree

Showing 29 changed files with 974 additions and 236 deletions.
diff --git a/src/adonisjs/package.json b/src/adonisjs/package.json
@@ -25,7 +25,8 @@
     "@adonisjs/ignitor": "^2.0.8",
     "@adonisjs/lucid": "^6.1.3",
     "@adonisjs/session": "^1.0.27",
-    "@adonisjs/shield": "^1.0.8"
+    "@adonisjs/shield": "^1.0.8",
+    "npm": "^6.9.0"
   },
   "devDependencies": {},
   "autoload": {

diff --git a/src/adonisjs/public/author/css/author.css b/src/adonisjs/public/author/css/author.css
@@ -113,6 +113,12 @@ body {
 
 }
 
+.sty-editable-asset:hover {
+   border: 5px;
+   border-color: black;
+   cursor: pointer;
+}
+
 .sty-navigation-knot-cover {
    position: absolute;
    left: 0px;

diff --git a/src/adonisjs/public/author/icons/icon-edit-knot-selected.svg b/src/adonisjs/public/author/icons/icon-edit-knot-selected.svg
diff --git a/src/adonisjs/public/author/index.html b/src/adonisjs/public/author/index.html
@@ -17,6 +17,8 @@
    <script src="../infra/dcc-common-server-address.js"></script>
 
    <script src="../dccs/components/dcc-base.js"></script>
+   <script src="../dccs/components/dcc-markdown.js"></script>
+   <script src="../dccs/components/editable/dcc-markdown-editable.js"></script>
    <script src="../dccs/components/dcc-image.js"></script>
    <script src="../dccs/components/editable/dcc-image-editable.js"></script>
    <script src="../dccs/components/dcc-expression.js"></script>
@@ -35,10 +37,10 @@
    <script src="../dccs/components/dcc-compute.js"></script>
    <script src="../dccs/components/dcc-report.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="../lib/showdown-2-0-0/showdown.min.js"></script>
    <script src="../lib/quill-1-3-6/quill.min.js"></script>
    <script src="../lib/d3.v5.min.js"></script>
 
@@ -52,7 +54,7 @@
          <div class="control-button"><dcc-trigger action="control/case/load" label="Load" image="icons/icon-load.svg"></dcc-trigger></div>
          <div class="control-button"><dcc-trigger action="control/case/save" label="Save" image="icons/icon-save.svg"></dcc-trigger></div>
          <div class="control-button"><dcc-trigger action="control/knot/new" label="New Knot" image="icons/icon-new-knot.svg"></dcc-trigger></div>
-         <div class="control-button"><dcc-trigger action="control/knot/edit" label="Edit Knot" image="icons/icon-edit-knot.svg"></dcc-trigger></div>
+         <div class="control-button"><dcc-trigger id="trigger-knot-edit" action="control/knot/edit" label="Edit Knot" image="icons/icon-edit-knot.svg"></dcc-trigger></div>
          <div class="control-button"><dcc-trigger action="control/knot/markdown" label="Edit Knot Markdown" image="icons/icon-edit-knot-markdown.svg"></dcc-trigger></div>
          <div class="control-button"><dcc-trigger action="control/case/markdown" label="Edit Case Markdown" image="icons/icon-edit-case-markdown.svg"></dcc-trigger></div>
          <div class="control-button"><dcc-trigger action="control/case/play" label="Play" image="icons/icon-play.svg"></dcc-trigger></div>