diff --git a/.gitignore b/.gitignore index b19e0d2..d143f6e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,8 @@ .awcache .vscode -/deployment/server/Cress-gh -/deployment/public +/dev/server/Cress-gh +/dev/public /dist /gh-pages/ \ No newline at end of file diff --git a/deployment/server/samples/Neume shape-small.docx b/deployment/server/samples/Neume shape-small.docx deleted file mode 100644 index dbf7311..0000000 Binary files a/deployment/server/samples/Neume shape-small.docx and /dev/null differ diff --git a/deployment/server/samples/SQUAREnotation-NEUMElevel.csv b/deployment/server/samples/SQUAREnotation-NEUMElevel.csv deleted file mode 100644 index 07920d0..0000000 --- a/deployment/server/samples/SQUAREnotation-NEUMElevel.csv +++ /dev/null @@ -1,154 +0,0 @@ -imagePath,imagesBinary,name,folio,description,classification,width,mei,review,dob,project, -[],[],C clef,001r,clef.c,clef.c,1,"",No,,5d39e8755fbd53216a2fa442, -[],[],F Clef,001r,,clef.f,1,"",No,,5d39e8755fbd53216a2fa442, -[],[],Custos,001r,,custos,1,,No,,5d39e8755fbd53216a2fa442, -,,Divisio,001r,,divisio.maxima,1,"",,,, -,,Flat,001r,,accidental.flat,1,"",,,, -,,Natural,001r,,accidental.natural,1,"",,,, -[],[],Punctum,001r,,neume.punctum,1," - -",No,,5d39e8755fbd53216a2fa442, -[],[],Inclinatum,001r,,neume.inclinatum,1," - -",No,,5d39e8755fbd53216a2fa442, -,,Virga,001r,,neume.virga,1," - -",,,, -,,Reverse virga,001r,,neume.reversevirga,1," - -",,,, -,,Upwards liquescent,001r,,neume.liquescent.up,1," - - - -",,,, -,,Downwards liquescent,001r,,neume.liquescent.down,1," - - - -",,,, -[],,"Podatus 2, width 2",001r,podatus salzinnes,neume.podatus2a,"[1, 1]"," - - -",No,,5d39e8755fbd53216a2fa442,giving it the width to be able to divide the neume bbox (horizontally) into that number of vertical boxes. -,,"Podatus 2, width 1",001r,podatus einsiedeln,neume.podatus2b,2," - - -",No,,,Where should this bbox division into vertical bboxes be done? Heuristic pitch finding (how is that working? because it is getting the pitch of the individual neume-components correcly even having only one bbox for the whole neume) or MEI Encoding job? -[],[],Podatus 3,001r,,neume.podatus3,2," - - -",No,,5d39e8755fbd53216a2fa442,"This file is received by the MEI Encoding job, so it can do the mapping of the IC class into both the MEI code (for encoding the ) and the width column (for dividing the bbox and encoding the s)" -[],[],Podatus 4,001r,,neume.podatus4,2," - - -",No,,5d39e8755fbd53216a2fa442, -,,Podatus 5,001r,,neume.podatus5,2," - - -",,,, -,,Clivis 2,001r,,neume.clivis2,"[1, 1]"," - - -",,,, -,,Clivis 3,001r,,neume.clivis3,"[1, 1]"," - - -",,,, -,,Clivis 4,001r,,neume.clivis4,"[1, 1]"," - - -",,,, -,,Clivis 5,001r,,neume.clivis5,"[1, 1]"," - - -",,,, -,,Pes cephalicus 2,,,neume.pescephalicus2,"[1, 1]"," - - - - -",,,, -,,Pes cephalicus 3,,,neume.pescephalicus3,"[1, 1]"," - - - - -",,,, -[],[],Oblique 2,001r,,neume.oblique2,2," - - -",No,,5d39e8755fbd53216a2fa442, -[],[],Oblique 3,001r,,neume.oblique3,2," - - -",No,,5d39e8755fbd53216a2fa442, -[],[],Oblique 4,001r,,neume.oblique4,2," - - -",No,,5d39e8755fbd53216a2fa442, -[],[],Torculus22,001r,,neume.torculus22,"[1, 1, 1]"," - - - -",No,,5d39e8755fbd53216a2fa442, -,,Torculus23,001r,,neume.torculus23,"[1, 1, 1]"," - - - -",,,, -,,Torculus24,001r,,neume.torculus24,"[1, 1, 1]"," - - - -",,,, -,,Torculus32,001r,,neume.torculus32,"[1, 1, 1]"," - - - -",,,, -,,Torculus33,001r,,neume.torculus33,"[1, 1, 1]"," - - - -",,,, -,,Torculus34,001r,,neume.torculus34,"[1, 1, 1]"," - - - -",,,, -,,Torculus42,001r,,neume.torculus42,"[1, 1, 1]"," - - - -",,,, -,,Torculus43,001r,,neume.torculus43,"[1, 1, 1]"," - - - -",,,, -,,Scandicus 22,001r,,neume.scandicus22a,"[1, 2]"," - - - -",,,,CRES would need to check that # of == # in width column -,,Scandicus 22,001r,,neume.scandicus22b,"[2, 1]"," - - - -",,,, -,,Scandicus 22,001r,,neume.scandicus22c,"[1, 1, 1]"," - - - -",,,, -,,Scandicus 23,001r,,neume.scandicus23,"[1, 2]"," - - - -",,,, -,,Scandicus 33,001r,,neume.scandicus33,"[1, 2]"," - - - -",,,, \ No newline at end of file diff --git a/deployment/scripts/custom.d.ts b/dev/scripts/custom.d.ts similarity index 100% rename from deployment/scripts/custom.d.ts rename to dev/scripts/custom.d.ts diff --git a/deployment/scripts/dashboard.ts b/dev/scripts/dashboard.ts similarity index 100% rename from deployment/scripts/dashboard.ts rename to dev/scripts/dashboard.ts diff --git a/deployment/scripts/editor.ts b/dev/scripts/editor.ts similarity index 98% rename from deployment/scripts/editor.ts rename to dev/scripts/editor.ts index 2791ad2..73b2e91 100644 --- a/deployment/scripts/editor.ts +++ b/dev/scripts/editor.ts @@ -15,7 +15,7 @@ if (sampleId) { const localFileSystem = JSON.parse(fs) as IFolder; const filename = findFileNameById(localFileSystem); if (filename) { - let filePath = `./Cress-gh/assets/samples/${filename}`; + let filePath = `${__ASSET_PREFIX__}assets/samples/${filename}`; window .fetch(filePath) .then((response) => { diff --git a/deployment/scripts/landing.ts b/dev/scripts/landing.ts similarity index 100% rename from deployment/scripts/landing.ts rename to dev/scripts/landing.ts diff --git a/deployment/server/dashboard.html b/dev/server/dashboard.html similarity index 100% rename from deployment/server/dashboard.html rename to dev/server/dashboard.html diff --git a/deployment/server/editor.html b/dev/server/editor.html similarity index 100% rename from deployment/server/editor.html rename to dev/server/editor.html diff --git a/deployment/server/favicon.png b/dev/server/favicon.png similarity index 100% rename from deployment/server/favicon.png rename to dev/server/favicon.png diff --git a/deployment/server/index.html b/dev/server/index.html similarity index 100% rename from deployment/server/index.html rename to dev/server/index.html diff --git a/package.json b/package.json index 9d609d5..ad4a18c 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "description": "A web-based app to map squiggles to MEI snippets", "main": "index.js", "scripts": { - "start": "http-server deployment/server/ -p 9000", - "build": "rm -rf deployment/server/Cress-gh && webpack --config webpack.config.js && cp -R assets src/workers deployment/server/Cress-gh", + "start": "http-server dev/server/ -p 9000", + "build": "rm -rf dev/server/Cress-gh && webpack --config webpack.config.js && cp -R assets src/workers dev/server/Cress-gh", "bundle:pages": "rm -rf gh-pages/Cress/Cress-gh && webpack --config webpack.pages-config.js && cp -R assets src/workers gh-pages/Cress/Cress-gh" }, "repository": "https://github.com/DDMAL/Cress.git", diff --git a/webpack.config.js b/webpack.config.js index 4f67d5e..c327a3c 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -3,14 +3,14 @@ const webpack = require('webpack'); const NodePolyfillPlugin = require('node-polyfill-webpack-plugin'); module.exports = { - mode: 'production', + mode: 'development', entry: { - landing: './deployment/scripts/landing.ts', - dashboard: './deployment/scripts/dashboard.ts', - editor: './deployment/scripts/editor.ts', + landing: './dev/scripts/landing.ts', + dashboard: './dev/scripts/dashboard.ts', + editor: './dev/scripts/editor.ts', }, output: { - path: path.resolve(__dirname, 'deployment', 'server', 'Cress-gh'), + path: path.resolve(__dirname, 'dev', 'server', 'Cress-gh'), publicPath: '/', filename: '[name].js', }, diff --git a/webpack.pages-config.js b/webpack.pages-config.js index d5aa9b3..148db2d 100644 --- a/webpack.pages-config.js +++ b/webpack.pages-config.js @@ -5,9 +5,9 @@ const NodePolyfillPlugin = require('node-polyfill-webpack-plugin'); module.exports = { mode: 'production', entry: { - landing: './deployment/scripts/landing.ts', - editor: './deployment/scripts/editor.ts', - dashboard: './deployment/scripts/dashboard.ts', + landing: './dev/scripts/landing.ts', + editor: './dev/scripts/editor.ts', + dashboard: './dev/scripts/dashboard.ts', }, output: { path: path.resolve(__dirname, 'gh-pages', 'Cress', 'Cress-gh'),