Changeset 35770

Timestamp:

2021-12-08T13:26:51+13:00 (2 years ago)

Author:

cstephen

Message:

Fix bundle resolution and imports

Location:

main/trunk/model-interfaces-dev/atea/ocr

Files:

• public/images (deleted)
• src/assets (added)
• src/assets/rotate-arrow.svg (added)
• src/components/EditPage.vue (modified) (2 diffs)
• src/js/OcrService.js (modified) (3 diffs)
• vue.config.js (modified) (1 diff)

main/trunk/model-interfaces-dev/atea/ocr/src/components/EditPage.vue

@@ -10 +10 @@
     <div class="image-panel">
         <div class="image-container" :style="{ transform: transformString }">
-            <img v-if="rotateMode" src="images/rotate-arrow.svg" class="rotate-handle rotate-tl" @mousedown="allowRotation = true" draggable="false" />
-            <img v-if="rotateMode" src="images/rotate-arrow.svg" class="rotate-handle rotate-tr" @mousedown="allowRotation = true" draggable="false" />
-            <img v-if="rotateMode" src="images/rotate-arrow.svg" class="rotate-handle rotate-bl" @mousedown="allowRotation = true" draggable="false" />
-            <img v-if="rotateMode" src="images/rotate-arrow.svg" class="rotate-handle rotate-br" @mousedown="allowRotation = true" draggable="false" />
+            <img v-if="rotateMode" src="../assets/rotate-arrow.svg" class="rotate-handle rotate-tl" @mousedown="allowRotation = true" draggable="false" />
+            <img v-if="rotateMode" src="../assets/rotate-arrow.svg" class="rotate-handle rotate-tr" @mousedown="allowRotation = true" draggable="false" />
+            <img v-if="rotateMode" src="../assets/rotate-arrow.svg" class="rotate-handle rotate-bl" @mousedown="allowRotation = true" draggable="false" />
+            <img v-if="rotateMode" src="../assets/rotate-arrow.svg" class="rotate-handle rotate-br" @mousedown="allowRotation = true" draggable="false" />
 
             <table v-if="rotateMode" class="rotate-guide" :style="{ transform: transformStringInverted }">
@@ -230 +230 @@
         },
         async closeAndSave() {
-            const Jimp = await import("jimp/es");
+            const { default: Jimp } = await import("jimp/es");
 
             const buffer = Buffer.from(this.imageBuffer);

main/trunk/model-interfaces-dev/atea/ocr/src/js/OcrService.js

@@ -74 +74 @@
         /** @type {String} The URL to which query POST requests should be made. */
         if (process.env.NODE_ENV !== "production") {
-            this.queryUrl = "//localhost:8383/gs3-atea-ocr/";
+            this.rootQueryUrl = "//localhost:8383/gs3-atea-ocr/";
         }
         else {
-            this.queryUrl = "/gs3-atea-ocr/tesseract";
+            this.rootQueryUrl = "/gs3-atea-ocr/";
         }
     }
@@ -88 +88 @@
     async run(images)
     {
-        const queryUrl = this.queryUrl + "tesseract";
+        const queryUrl = this.rootQueryUrl + "tesseract";
 
         try
@@ -135 +135 @@
     async getThresholdedImage(key)
     {
-        const queryUrl = this.queryUrl + `image?key=${key}`;
+        const queryUrl = this.rootQueryUrl + `image?key=${key}`;
 
         try

main/trunk/model-interfaces-dev/atea/ocr/vue.config.js

@@ -5 +5 @@
  */
 module.exports = {
-    // publicPath: "interfaces/atea/ocr/dist",
-    filenameHashing: false, // Allows us to easily setup direct links to the bundles in ocr.xsl. You may want to change this for production in order to help with caching
+    filenameHashing: false, // Allows us to easily setup direct links to the bundles in macron-restoration.xsl. You may want to change this for production in order to help with caching
+    publicPath: process.env.NODE_ENV === 'production'
+        ? '/greenstone3/interfaces/atea/ocr/dist'
+        : '/',
 
     chainWebpack: config => {