diff --git a/editors/demo/config-overrides.js b/editors/demo/config-overrides.js index 65bc6e56a21f8d398ada56d4ca7d83b7da713a16..6bc5ae421f27f4825e4d4bb5a6f9b17606d5a728 100644 --- a/editors/demo/config-overrides.js +++ b/editors/demo/config-overrides.js @@ -11,6 +11,10 @@ module.exports = function override(config, env) { __dirname, '../../wax-prosemirror-services/index', ), + 'wax-questions-service': path.resolve( + __dirname, + '../../wax-questions-service/index', + ), }, }; config.module = { diff --git a/editors/demo/package.json b/editors/demo/package.json index dcc0919d6b4929aa7bdfd5b4cca987c8056dae4b..ef2c70276e1bb2ec1b0c6f8ae1f44c7159ba6a49 100644 --- a/editors/demo/package.json +++ b/editors/demo/package.json @@ -15,7 +15,8 @@ "typeface-inter": "^1.1.13", "typeface-vollkorn": "^0.0.54", "wax-prosemirror-core": "^0.8.8", - "wax-prosemirror-services": "^0.8.8" + "wax-prosemirror-services": "^0.8.8", + "wax-questions-service": "^0.8.8" }, "scripts": { "start": "react-app-rewired start", diff --git a/editors/demo/src/HHMI/config/config.js b/editors/demo/src/HHMI/config/config.js index 2e29aae5a674b0edb628ebed1305cbec18717bd8..38d10101d8b0b2196d2aa5661fcc0c1352fa4788 100644 --- a/editors/demo/src/HHMI/config/config.js +++ b/editors/demo/src/HHMI/config/config.js @@ -16,15 +16,11 @@ import { MathService, FullScreenService, FullScreenToolGroupService, - MultipleChoiceQuestionService, - FillTheGapQuestionService, - QuestionsDropDownToolGroupService, - EssayService, - MatchingService, - MultipleDropDownService, // ExternalAPIContentService, } from 'wax-prosemirror-services'; +import { QuestionsService } from 'wax-questions-service'; + import { DefaultSchema } from 'wax-prosemirror-core'; import invisibles, { hardBreak } from '@guardian/prosemirror-invisibles'; const API_KEY = ''; @@ -138,12 +134,7 @@ export default { PmPlugins: [columnResizing(), tableEditing(), invisibles([hardBreak()])], services: [ // new ExternalAPIContentService(), - new MatchingService(), - new FillTheGapQuestionService(), - new MultipleChoiceQuestionService(), - new QuestionsDropDownToolGroupService(), - new MultipleDropDownService(), - new EssayService(), + new QuestionsService(), new ListsService(), new LinkService(), new InlineAnnotationsService(), diff --git a/lerna-debug.log b/lerna-debug.log index 1a872a616a1d96982e9bbf40579acc017e419732..893ef1faa91076e4aac0d17c7b24dc2c21c2926d 100644 --- a/lerna-debug.log +++ b/lerna-debug.log @@ -14,38 +14,30 @@ 7 silly execute attempt 8 silly runScriptInDir build [] wax-prosemirror-core 9 silly getExecOpts { cwd: '/home/chris/workspace/wax-prosemirror/wax-prosemirror-core' } -10 error build Errored while running script in 'wax-prosemirror-core' -11 error execute callback with error -12 error Error: Command failed: yarn run build -12 error -12 error ./index.js → dist/index.js... -12 error Browserslist: caniuse-lite is outdated. Please run: -12 error npx browserslist@latest --update-db -12 error (!) Circular dependency -12 error index.js -> src/Wax.js -> src/Application.js -> src/config/defaultConfig.js -> src/config/defaultServices/MenuService/MenuService.js -> src/config/defaultServices/MenuService/Menu.js -> src/utilities/lib/ToolGroup.js -> src/components/ToolGroups.js -> src/components/ToolGroupComponent.js -> src/components/ui/Dropdown.js -> src/components/ui/MenuButton.js -> index.js -12 error [!] Error: 'default' is not exported by src/components/icons/icons.js, imported by index.js -12 error https://rollupjs.org/guide/en/#error-name-is-not-exported-by-module -12 error index.js (47:9) -12 error 45: export { default as Tabs } from './src/components/tabs/Tabs'; -12 error 46: export { default as MenuButton } from './src/components/ui/MenuButton'; -12 error 47: export { default as icons } from './src/components/icons/icons'; -12 error ^ -12 error 48: export { default as Icon } from './src/components/icons/Icon'; -12 error 49: export { default as Button } from './src/components/Button'; -12 error Error: 'default' is not exported by src/components/icons/icons.js, imported by index.js -12 error at error (/home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:5171:30) -12 error at Module.error (/home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:9603:16) -12 error at handleMissingExport (/home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:9525:28) -12 error at Module.getVariableForExportName (/home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:9768:24) -12 error at Module.traceVariable (/home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:9983:45) -12 error at ModuleScope.findVariable (/home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:8549:39) -12 error at FunctionScope.findVariable (/home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:2795:38) -12 error at ChildScope.findVariable (/home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:2795:38) -12 error at Identifier$1.bind (/home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:4152:40) -12 error at MemberExpression.bind (/home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:2880:23) -12 error -12 error error Command failed with exit code 1. -12 error $ BABEL_ENV=production rollup -c -12 error info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command. -12 error -12 error at /home/chris/workspace/wax-prosemirror/node_modules/lerna/node_modules/execa/index.js:236:11 +10 silly runScriptInDir build [] wax-prosemirror-services +11 silly getExecOpts { +11 silly getExecOpts cwd: '/home/chris/workspace/wax-prosemirror/wax-prosemirror-services' +11 silly getExecOpts } +12 error build Errored while running script in 'wax-prosemirror-services' +13 error execute callback with error +14 error Error: Command failed: yarn run build +14 error +14 error index.js → dist/index.js... +14 error Browserslist: caniuse-lite is outdated. Please run: +14 error npx browserslist@latest --update-db +14 error [!] Error: Could not resolve './src/MultipleChoiceQuestionService/MultipleChoiceQuestionService' from index.js +14 error Error: Could not resolve './src/MultipleChoiceQuestionService/MultipleChoiceQuestionService' from index.js +14 error at error (/home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:5171:30) +14 error at ModuleLoader.handleResolveId (/home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:17864:24) +14 error at /home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:17856:22 +14 error at async Promise.all (index 26) +14 error at ModuleLoader.fetchStaticDependencies (/home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:17854:34) +14 error at async Promise.all (index 0) +14 error at ModuleLoader.fetchModule (/home/chris/workspace/wax-prosemirror/node_modules/rollup/dist/shared/rollup.js:17831:9) +14 error at async Promise.all (index 0) +14 error +14 error error Command failed with exit code 1. +14 error $ BABEL_ENV=production rollup -c +14 error info Visit https://yarnpkg.com/en/docs/cli/run for documentation about this command. +14 error +14 error at /home/chris/workspace/wax-prosemirror/node_modules/lerna/node_modules/execa/index.js:236:11 diff --git a/package.json b/package.json index ec8e4ce7f853a3bd0ea02719342e70cedf2d93a9..00e25850c1b7483f52364fbc897b77ddbc5aa938 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "workspaces": [ "wax-prosemirror-core", "wax-prosemirror-services", + "wax-questions-service", "editors/*" ], "scripts": { diff --git a/wax-prosemirror-services/index.js b/wax-prosemirror-services/index.js index d2c016666ce2b14fe8e4449255bc2fbcff9043fc..a970f2fea9a98296eed95c466227d3a565231192 100644 --- a/wax-prosemirror-services/index.js +++ b/wax-prosemirror-services/index.js @@ -28,15 +28,7 @@ export { default as TrackOptionsService } from './src/TrackOptionsService/TrackO export { default as CustomTagInlineService } from './src/CustomTagService/CustomTagInlineService/CustomTagInlineService'; export { default as CustomTagBlockService } from './src/CustomTagService/CustomTagBlockService/CustomTagBlockService'; export { default as CustomTagService } from './src/CustomTagService/CustomTagService'; -export { default as MultipleChoiceQuestionService } from './src/MultipleChoiceQuestionService/MultipleChoiceQuestionService'; -export { default as MultipleChoiceSingleCorrectQuestionService } from './src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestionService'; -export { default as TrueFalseQuestionService } from './src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestionService'; -export { default as FillTheGapQuestionService } from './src/FillTheGapQuestionService/FillTheGapQuestionService'; -export { default as EssayService } from './src/EssayService/EssayService'; -export { default as MatchingService } from './src/MatchingService/MatchingService'; export { default as EnterService } from './src/EnterService/EnterService'; -export { default as MultipleDropDownService } from './src/MultipleDropDownService/MultipleDropDownService'; - export { default as OENContainersService } from './src/OENContainersService/OENContainersService'; export { default as YjsService } from './src/YjsService/YjsService'; export { default as ExternalAPIContentService } from './src/ExternalAPIContentService/ExternalAPIContentService'; @@ -64,7 +56,6 @@ export { default as TrackOptionsToolGroupService } from './src/WaxToolGroups/Tra export { default as TrackCommentOptionsToolGroupService } from './src/WaxToolGroups/TrackCommentOptionsToolGroupService/TrackCommentOptionsToolGroupService'; export { default as CustomTagInlineToolGroupService } from './src/WaxToolGroups/CustomTagToolGroupService/CustomTagInlineToolGroupService/CustomTagInlineToolGroupService'; export { default as CustomTagBlockToolGroupService } from './src/WaxToolGroups/CustomTagToolGroupService/CustomTagBlockToolGroupService/CustomTagBlockToolGroupService'; -export { default as QuestionsDropDownToolGroupService } from './src/WaxToolGroups/QuestionsDropDownToolGroupService/QuestionsDropDownToolGroupService'; export { default as OENContainersToolGroupService } from './src/WaxToolGroups/OENContainersToolGroupService/OENContainersToolGroupService'; export { default as OENLeftToolGroupService } from './src/WaxToolGroups/OENLeftToolGroupService/OENLeftToolGroupService'; export { default as FindAndReplaceToolGroupService } from './src/WaxToolGroups/FindAndReplaceToolGroupService/FindAndReplaceToolGroupService'; diff --git a/wax-questions-service/.gitignore b/wax-questions-service/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..b3e3ccb6b0ce3a90e1eb3f9e78da7924ea89f116 --- /dev/null +++ b/wax-questions-service/.gitignore @@ -0,0 +1,25 @@ +# dependencies +/node_modules + +# testing +/coverage + +# production +/build + +# dist +/dist + +# misc +.DS_Store +.env.local +.env.development.local +.env.test.local +.env.production.local +.directory + +npm-debug.log* +yarn-debug.log* +yarn-error.log* +yarn.lock +package-lock.json diff --git a/wax-questions-service/README.md b/wax-questions-service/README.md new file mode 100644 index 0000000000000000000000000000000000000000..372e3c81f6c36899e08e6f72da524c5bce8923ba --- /dev/null +++ b/wax-questions-service/README.md @@ -0,0 +1,16 @@ + +## Wax questions package + +1. Multiple Choice and single correct variant + +2. True / fallse and single correct variant + +3. Matching + +4. Essay + +5. Multiple dropdowns + +6. Fill in the blank + +## How to use diff --git a/wax-questions-service/index.js b/wax-questions-service/index.js new file mode 100644 index 0000000000000000000000000000000000000000..00ab36faac92d5e73a925672334ce1104a71acf3 --- /dev/null +++ b/wax-questions-service/index.js @@ -0,0 +1 @@ +export { default as QuestionsService } from './src/QuestionsService'; diff --git a/wax-questions-service/package.json b/wax-questions-service/package.json new file mode 100644 index 0000000000000000000000000000000000000000..88443b8d054688c7b4dc412c36ecdd73902a26d3 --- /dev/null +++ b/wax-questions-service/package.json @@ -0,0 +1,31 @@ +{ + "name": "wax-questions-service", + "author": "Christos Kokosias & Giannis Kopanas", + "version": "0.8.8", + "description": "Wax Questions Service", + "license": "MIT", + "main": "dist/index.js", + "style": "dist/index.css", + "files": [ + "dist" + ], + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "build": "BABEL_ENV=production rollup -c" + }, + "dependencies": { + "@pubsweet/ui-toolkit": "^2.3.1", + "wax-prosemirror-core":"^0.8.8", + "wax-prosemirror-services":"^0.8.8", + "uuid": "^7.0.3" + }, + "devDependencies": { + "mocha": "^3.4.2", + "prosemirror-test-builder": "^1.0.1" + }, + "peerDependencies": { + "react": "^18.2.0", + "react-dom": "^18.2.0", + "styled-components": "^5.3.1" + } +} diff --git a/wax-questions-service/rollup.config.js b/wax-questions-service/rollup.config.js new file mode 100644 index 0000000000000000000000000000000000000000..4fda92e215d51ab73865ffa00c2e288dd304467b --- /dev/null +++ b/wax-questions-service/rollup.config.js @@ -0,0 +1,51 @@ +import babel from 'rollup-plugin-babel'; +import commonjs from '@rollup/plugin-commonjs'; +import external from 'rollup-plugin-peer-deps-external'; +import css from 'rollup-plugin-import-css'; +import { terser } from 'rollup-plugin-terser'; + +export default { + input: 'index.js', + output: [ + { + file: 'dist/index.js', + format: 'cjs', + sourcemap: false, + }, + ], + plugins: [ + css(), + external({ + includeDependencies: true, + }), + babel({ + presets: ['react-app'], + plugins: [ + [ + '@babel/plugin-transform-runtime', + { + regenerator: true, + }, + ], + ['@babel/plugin-proposal-decorators', { legacy: true }], + 'babel-plugin-parameter-decorator', + ], + exclude: 'node_modules/**', + runtimeHelpers: true, + }), + commonjs(), + terser(), + ], + external: [ + 'uuid', + 'react', + 'react-dom', + 'react-dropdown', + 'lodash', + 'prosemirror-tables', + 'prosemirror-schema-list', + 'prosemirror-model', + 'prosemirror-inputrules', + '@babel/runtime/regenerator', + ], +}; diff --git a/wax-prosemirror-services/src/EssayService/EssayAnswerNodeView.js b/wax-questions-service/src/EssayService/EssayAnswerNodeView.js similarity index 100% rename from wax-prosemirror-services/src/EssayService/EssayAnswerNodeView.js rename to wax-questions-service/src/EssayService/EssayAnswerNodeView.js diff --git a/wax-prosemirror-services/src/EssayService/EssayPromptNodeView.js b/wax-questions-service/src/EssayService/EssayPromptNodeView.js similarity index 100% rename from wax-prosemirror-services/src/EssayService/EssayPromptNodeView.js rename to wax-questions-service/src/EssayService/EssayPromptNodeView.js diff --git a/wax-prosemirror-services/src/EssayService/EssayQuestion.js b/wax-questions-service/src/EssayService/EssayQuestion.js similarity index 100% rename from wax-prosemirror-services/src/EssayService/EssayQuestion.js rename to wax-questions-service/src/EssayService/EssayQuestion.js diff --git a/wax-prosemirror-services/src/EssayService/EssayQuestionNodeView.js b/wax-questions-service/src/EssayService/EssayQuestionNodeView.js similarity index 100% rename from wax-prosemirror-services/src/EssayService/EssayQuestionNodeView.js rename to wax-questions-service/src/EssayService/EssayQuestionNodeView.js diff --git a/wax-prosemirror-services/src/EssayService/EssayService.js b/wax-questions-service/src/EssayService/EssayService.js similarity index 100% rename from wax-prosemirror-services/src/EssayService/EssayService.js rename to wax-questions-service/src/EssayService/EssayService.js diff --git a/wax-prosemirror-services/src/EssayService/components/ContainerEditor.js b/wax-questions-service/src/EssayService/components/ContainerEditor.js similarity index 100% rename from wax-prosemirror-services/src/EssayService/components/ContainerEditor.js rename to wax-questions-service/src/EssayService/components/ContainerEditor.js diff --git a/wax-prosemirror-services/src/EssayService/components/EditorComponent.js b/wax-questions-service/src/EssayService/components/EditorComponent.js similarity index 100% rename from wax-prosemirror-services/src/EssayService/components/EditorComponent.js rename to wax-questions-service/src/EssayService/components/EditorComponent.js diff --git a/wax-prosemirror-services/src/EssayService/components/EssayAnswerComponent.js b/wax-questions-service/src/EssayService/components/EssayAnswerComponent.js similarity index 100% rename from wax-prosemirror-services/src/EssayService/components/EssayAnswerComponent.js rename to wax-questions-service/src/EssayService/components/EssayAnswerComponent.js diff --git a/wax-prosemirror-services/src/EssayService/components/EssayPromptComponent.js b/wax-questions-service/src/EssayService/components/EssayPromptComponent.js similarity index 100% rename from wax-prosemirror-services/src/EssayService/components/EssayPromptComponent.js rename to wax-questions-service/src/EssayService/components/EssayPromptComponent.js diff --git a/wax-prosemirror-services/src/EssayService/components/EssayQuestionComponent.js b/wax-questions-service/src/EssayService/components/EssayQuestionComponent.js similarity index 100% rename from wax-prosemirror-services/src/EssayService/components/EssayQuestionComponent.js rename to wax-questions-service/src/EssayService/components/EssayQuestionComponent.js diff --git a/wax-prosemirror-services/src/EssayService/components/ToolBarBtn.js b/wax-questions-service/src/EssayService/components/ToolBarBtn.js similarity index 100% rename from wax-prosemirror-services/src/EssayService/components/ToolBarBtn.js rename to wax-questions-service/src/EssayService/components/ToolBarBtn.js diff --git a/wax-prosemirror-services/src/EssayService/essay.css b/wax-questions-service/src/EssayService/essay.css similarity index 100% rename from wax-prosemirror-services/src/EssayService/essay.css rename to wax-questions-service/src/EssayService/essay.css diff --git a/wax-prosemirror-services/src/EssayService/schema/essayAnswerNode.js b/wax-questions-service/src/EssayService/schema/essayAnswerNode.js similarity index 100% rename from wax-prosemirror-services/src/EssayService/schema/essayAnswerNode.js rename to wax-questions-service/src/EssayService/schema/essayAnswerNode.js diff --git a/wax-prosemirror-services/src/EssayService/schema/essayContainerNode.js b/wax-questions-service/src/EssayService/schema/essayContainerNode.js similarity index 100% rename from wax-prosemirror-services/src/EssayService/schema/essayContainerNode.js rename to wax-questions-service/src/EssayService/schema/essayContainerNode.js diff --git a/wax-prosemirror-services/src/EssayService/schema/essayPromptNode.js b/wax-questions-service/src/EssayService/schema/essayPromptNode.js similarity index 100% rename from wax-prosemirror-services/src/EssayService/schema/essayPromptNode.js rename to wax-questions-service/src/EssayService/schema/essayPromptNode.js diff --git a/wax-prosemirror-services/src/EssayService/schema/essayQuestionNode.js b/wax-questions-service/src/EssayService/schema/essayQuestionNode.js similarity index 100% rename from wax-prosemirror-services/src/EssayService/schema/essayQuestionNode.js rename to wax-questions-service/src/EssayService/schema/essayQuestionNode.js diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/CreateGapService/CreateGap.js b/wax-questions-service/src/FillTheGapQuestionService/CreateGapService/CreateGap.js similarity index 100% rename from wax-prosemirror-services/src/FillTheGapQuestionService/CreateGapService/CreateGap.js rename to wax-questions-service/src/FillTheGapQuestionService/CreateGapService/CreateGap.js diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/CreateGapService/CreateGapService.js b/wax-questions-service/src/FillTheGapQuestionService/CreateGapService/CreateGapService.js similarity index 100% rename from wax-prosemirror-services/src/FillTheGapQuestionService/CreateGapService/CreateGapService.js rename to wax-questions-service/src/FillTheGapQuestionService/CreateGapService/CreateGapService.js diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapContainerNodeView.js b/wax-questions-service/src/FillTheGapQuestionService/FillTheGapContainerNodeView.js similarity index 100% rename from wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapContainerNodeView.js rename to wax-questions-service/src/FillTheGapQuestionService/FillTheGapContainerNodeView.js diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapNodeView.js b/wax-questions-service/src/FillTheGapQuestionService/FillTheGapNodeView.js similarity index 100% rename from wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapNodeView.js rename to wax-questions-service/src/FillTheGapQuestionService/FillTheGapNodeView.js diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapQuestion.js b/wax-questions-service/src/FillTheGapQuestionService/FillTheGapQuestion.js similarity index 100% rename from wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapQuestion.js rename to wax-questions-service/src/FillTheGapQuestionService/FillTheGapQuestion.js diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapQuestionService.js b/wax-questions-service/src/FillTheGapQuestionService/FillTheGapQuestionService.js similarity index 100% rename from wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapQuestionService.js rename to wax-questions-service/src/FillTheGapQuestionService/FillTheGapQuestionService.js diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapToolGroupService/FillTheGap.js b/wax-questions-service/src/FillTheGapQuestionService/FillTheGapToolGroupService/FillTheGap.js similarity index 100% rename from wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapToolGroupService/FillTheGap.js rename to wax-questions-service/src/FillTheGapQuestionService/FillTheGapToolGroupService/FillTheGap.js diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapToolGroupService/FillTheGapToolGroupService.js b/wax-questions-service/src/FillTheGapQuestionService/FillTheGapToolGroupService/FillTheGapToolGroupService.js similarity index 100% rename from wax-prosemirror-services/src/FillTheGapQuestionService/FillTheGapToolGroupService/FillTheGapToolGroupService.js rename to wax-questions-service/src/FillTheGapQuestionService/FillTheGapToolGroupService/FillTheGapToolGroupService.js diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/components/ContainerEditor.js b/wax-questions-service/src/FillTheGapQuestionService/components/ContainerEditor.js similarity index 100% rename from wax-prosemirror-services/src/FillTheGapQuestionService/components/ContainerEditor.js rename to wax-questions-service/src/FillTheGapQuestionService/components/ContainerEditor.js diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/components/EditorComponent.js b/wax-questions-service/src/FillTheGapQuestionService/components/EditorComponent.js similarity index 100% rename from wax-prosemirror-services/src/FillTheGapQuestionService/components/EditorComponent.js rename to wax-questions-service/src/FillTheGapQuestionService/components/EditorComponent.js diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/components/FillTheGapContainerComponent.js b/wax-questions-service/src/FillTheGapQuestionService/components/FillTheGapContainerComponent.js similarity index 100% rename from wax-prosemirror-services/src/FillTheGapQuestionService/components/FillTheGapContainerComponent.js rename to wax-questions-service/src/FillTheGapQuestionService/components/FillTheGapContainerComponent.js diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/components/GapComponent.js b/wax-questions-service/src/FillTheGapQuestionService/components/GapComponent.js similarity index 100% rename from wax-prosemirror-services/src/FillTheGapQuestionService/components/GapComponent.js rename to wax-questions-service/src/FillTheGapQuestionService/components/GapComponent.js diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/components/InputComponent.js b/wax-questions-service/src/FillTheGapQuestionService/components/InputComponent.js similarity index 100% rename from wax-prosemirror-services/src/FillTheGapQuestionService/components/InputComponent.js rename to wax-questions-service/src/FillTheGapQuestionService/components/InputComponent.js diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/fillTheGap.css b/wax-questions-service/src/FillTheGapQuestionService/fillTheGap.css similarity index 100% rename from wax-prosemirror-services/src/FillTheGapQuestionService/fillTheGap.css rename to wax-questions-service/src/FillTheGapQuestionService/fillTheGap.css diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapContainerNode.js b/wax-questions-service/src/FillTheGapQuestionService/schema/fillTheGapContainerNode.js similarity index 100% rename from wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapContainerNode.js rename to wax-questions-service/src/FillTheGapQuestionService/schema/fillTheGapContainerNode.js diff --git a/wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js b/wax-questions-service/src/FillTheGapQuestionService/schema/fillTheGapNode.js similarity index 100% rename from wax-prosemirror-services/src/FillTheGapQuestionService/schema/fillTheGapNode.js rename to wax-questions-service/src/FillTheGapQuestionService/schema/fillTheGapNode.js diff --git a/wax-prosemirror-services/src/MatchingService/MatchingContainerNodeView.js b/wax-questions-service/src/MatchingService/MatchingContainerNodeView.js similarity index 100% rename from wax-prosemirror-services/src/MatchingService/MatchingContainerNodeView.js rename to wax-questions-service/src/MatchingService/MatchingContainerNodeView.js diff --git a/wax-prosemirror-services/src/MatchingService/MatchingOptionNodeView.js b/wax-questions-service/src/MatchingService/MatchingOptionNodeView.js similarity index 100% rename from wax-prosemirror-services/src/MatchingService/MatchingOptionNodeView.js rename to wax-questions-service/src/MatchingService/MatchingOptionNodeView.js diff --git a/wax-prosemirror-services/src/MatchingService/MatchingQuestion.js b/wax-questions-service/src/MatchingService/MatchingQuestion.js similarity index 100% rename from wax-prosemirror-services/src/MatchingService/MatchingQuestion.js rename to wax-questions-service/src/MatchingService/MatchingQuestion.js diff --git a/wax-prosemirror-services/src/MatchingService/MatchingService.js b/wax-questions-service/src/MatchingService/MatchingService.js similarity index 100% rename from wax-prosemirror-services/src/MatchingService/MatchingService.js rename to wax-questions-service/src/MatchingService/MatchingService.js diff --git a/wax-prosemirror-services/src/MatchingService/components/ContainerEditor.js b/wax-questions-service/src/MatchingService/components/ContainerEditor.js similarity index 100% rename from wax-prosemirror-services/src/MatchingService/components/ContainerEditor.js rename to wax-questions-service/src/MatchingService/components/ContainerEditor.js diff --git a/wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js b/wax-questions-service/src/MatchingService/components/DropDownComponent.js similarity index 100% rename from wax-prosemirror-services/src/MatchingService/components/DropDownComponent.js rename to wax-questions-service/src/MatchingService/components/DropDownComponent.js diff --git a/wax-prosemirror-services/src/MatchingService/components/EditorComponent.js b/wax-questions-service/src/MatchingService/components/EditorComponent.js similarity index 100% rename from wax-prosemirror-services/src/MatchingService/components/EditorComponent.js rename to wax-questions-service/src/MatchingService/components/EditorComponent.js diff --git a/wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js b/wax-questions-service/src/MatchingService/components/MatchingContainerComponent.js similarity index 100% rename from wax-prosemirror-services/src/MatchingService/components/MatchingContainerComponent.js rename to wax-questions-service/src/MatchingService/components/MatchingContainerComponent.js diff --git a/wax-prosemirror-services/src/MatchingService/components/MatchingOptionComponent.js b/wax-questions-service/src/MatchingService/components/MatchingOptionComponent.js similarity index 100% rename from wax-prosemirror-services/src/MatchingService/components/MatchingOptionComponent.js rename to wax-questions-service/src/MatchingService/components/MatchingOptionComponent.js diff --git a/wax-prosemirror-services/src/MatchingService/components/TestModeDropDownComponent.js b/wax-questions-service/src/MatchingService/components/TestModeDropDownComponent.js similarity index 100% rename from wax-prosemirror-services/src/MatchingService/components/TestModeDropDownComponent.js rename to wax-questions-service/src/MatchingService/components/TestModeDropDownComponent.js diff --git a/wax-prosemirror-services/src/MatchingService/schema/matchingContainerNode.js b/wax-questions-service/src/MatchingService/schema/matchingContainerNode.js similarity index 100% rename from wax-prosemirror-services/src/MatchingService/schema/matchingContainerNode.js rename to wax-questions-service/src/MatchingService/schema/matchingContainerNode.js diff --git a/wax-prosemirror-services/src/MatchingService/schema/matchingOptionNode.js b/wax-questions-service/src/MatchingService/schema/matchingOptionNode.js similarity index 100% rename from wax-prosemirror-services/src/MatchingService/schema/matchingOptionNode.js rename to wax-questions-service/src/MatchingService/schema/matchingOptionNode.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceContainerNodeView.js b/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceContainerNodeView.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceContainerNodeView.js rename to wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceContainerNodeView.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceNodeView.js b/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceNodeView.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceNodeView.js rename to wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceNodeView.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js b/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js rename to wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceQuestion.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js b/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js rename to wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceQuestionService.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectContainerNodeView.js b/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectContainerNodeView.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectContainerNodeView.js rename to wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectContainerNodeView.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectNodeView.js b/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectNodeView.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectNodeView.js rename to wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectNodeView.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestion.js b/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestion.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestion.js rename to wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestion.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestionService.js b/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestionService.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestionService.js rename to wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/MultipleChoiceSingleCorrectQuestionService.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/QuestionMultipleSingleNodeView.js b/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/QuestionMultipleSingleNodeView.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/QuestionMultipleSingleNodeView.js rename to wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/QuestionMultipleSingleNodeView.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/AnswerComponent.js b/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/AnswerComponent.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/AnswerComponent.js rename to wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/AnswerComponent.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js b/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js rename to wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/components/SwitchComponent.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js b/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js rename to wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectContainerNode.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectNode.js b/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectNode.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectNode.js rename to wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/multipleChoiceSingleCorrectNode.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/questionSingleNode.js b/wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/questionSingleNode.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/questionSingleNode.js rename to wax-questions-service/src/MultipleChoiceQuestionService/MultipleChoiceSingleCorrectQuestionService/schema/questionSingleNode.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/QuestionNodeView.js b/wax-questions-service/src/MultipleChoiceQuestionService/QuestionNodeView.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/QuestionNodeView.js rename to wax-questions-service/src/MultipleChoiceQuestionService/QuestionNodeView.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/QuestionTrueFalseNodeView.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/QuestionTrueFalseNodeView.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/QuestionTrueFalseNodeView.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/QuestionTrueFalseNodeView.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseContainerNodeView.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseContainerNodeView.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseContainerNodeView.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseContainerNodeView.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseNodeView.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseNodeView.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseNodeView.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseNodeView.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestion.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestion.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestion.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestion.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestionService.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestionService.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestionService.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/TrueFalseQuestionService.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/AnswerComponent.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/AnswerComponent.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/AnswerComponent.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/AnswerComponent.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/SwitchComponent.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/SwitchComponent.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/SwitchComponent.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/SwitchComponent.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/TrueFalseSwitch.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/TrueFalseSwitch.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/TrueFalseSwitch.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/components/TrueFalseSwitch.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/questionTrueFalseNode.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/questionTrueFalseNode.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/questionTrueFalseNode.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/questionTrueFalseNode.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseContainerNode.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseContainerNode.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseContainerNode.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseContainerNode.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseNode.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseNode.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseNode.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseQuestionService/schema/trueFalseNode.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/QuestionTrueFalseSingleNodeView.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/QuestionTrueFalseSingleNodeView.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/QuestionTrueFalseSingleNodeView.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/QuestionTrueFalseSingleNodeView.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectContainerNodeView.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectContainerNodeView.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectContainerNodeView.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectContainerNodeView.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectNodeView.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectNodeView.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectNodeView.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectNodeView.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectQuestion.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectQuestion.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectQuestion.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectQuestion.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectQuestionService.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectQuestionService.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectQuestionService.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/TrueFalseSingleCorrectQuestionService.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/AnswerComponent.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/AnswerComponent.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/AnswerComponent.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/AnswerComponent.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/components/SwitchComponent.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/questionTrueFalseSingleNode.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/questionTrueFalseSingleNode.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/questionTrueFalseSingleNode.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/questionTrueFalseSingleNode.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectContainerNode.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectContainerNode.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectContainerNode.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectContainerNode.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectNode.js b/wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectNode.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectNode.js rename to wax-questions-service/src/MultipleChoiceQuestionService/TrueFalseSingleCorrectQuestionService/schema/trueFalseSingleCorrectNode.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/AnswerComponent.js b/wax-questions-service/src/MultipleChoiceQuestionService/components/AnswerComponent.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/components/AnswerComponent.js rename to wax-questions-service/src/MultipleChoiceQuestionService/components/AnswerComponent.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/EditorComponent.js b/wax-questions-service/src/MultipleChoiceQuestionService/components/EditorComponent.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/components/EditorComponent.js rename to wax-questions-service/src/MultipleChoiceQuestionService/components/EditorComponent.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/FeedbackComponent.js b/wax-questions-service/src/MultipleChoiceQuestionService/components/FeedbackComponent.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/components/FeedbackComponent.js rename to wax-questions-service/src/MultipleChoiceQuestionService/components/FeedbackComponent.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionComponent.js b/wax-questions-service/src/MultipleChoiceQuestionService/components/QuestionComponent.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/components/QuestionComponent.js rename to wax-questions-service/src/MultipleChoiceQuestionService/components/QuestionComponent.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/Switch.js b/wax-questions-service/src/MultipleChoiceQuestionService/components/Switch.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/components/Switch.js rename to wax-questions-service/src/MultipleChoiceQuestionService/components/Switch.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/SwitchComponent.js b/wax-questions-service/src/MultipleChoiceQuestionService/components/SwitchComponent.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/components/SwitchComponent.js rename to wax-questions-service/src/MultipleChoiceQuestionService/components/SwitchComponent.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/ToolBarBtn.js b/wax-questions-service/src/MultipleChoiceQuestionService/components/ToolBarBtn.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/components/ToolBarBtn.js rename to wax-questions-service/src/MultipleChoiceQuestionService/components/ToolBarBtn.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/components/YesNoSwitch.js b/wax-questions-service/src/MultipleChoiceQuestionService/components/YesNoSwitch.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/components/YesNoSwitch.js rename to wax-questions-service/src/MultipleChoiceQuestionService/components/YesNoSwitch.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/helpers/helpers.js b/wax-questions-service/src/MultipleChoiceQuestionService/helpers/helpers.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/helpers/helpers.js rename to wax-questions-service/src/MultipleChoiceQuestionService/helpers/helpers.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/multipleQuestionStyles.css b/wax-questions-service/src/MultipleChoiceQuestionService/multipleQuestionStyles.css similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/multipleQuestionStyles.css rename to wax-questions-service/src/MultipleChoiceQuestionService/multipleQuestionStyles.css diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/plugins/MoveCursorPlugin.js b/wax-questions-service/src/MultipleChoiceQuestionService/plugins/MoveCursorPlugin.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/plugins/MoveCursorPlugin.js rename to wax-questions-service/src/MultipleChoiceQuestionService/plugins/MoveCursorPlugin.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/plugins/placeholder.js b/wax-questions-service/src/MultipleChoiceQuestionService/plugins/placeholder.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/plugins/placeholder.js rename to wax-questions-service/src/MultipleChoiceQuestionService/plugins/placeholder.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js b/wax-questions-service/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js rename to wax-questions-service/src/MultipleChoiceQuestionService/schema/multipleChoiceContainerNode.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js b/wax-questions-service/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js rename to wax-questions-service/src/MultipleChoiceQuestionService/schema/multipleChoiceNode.js diff --git a/wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/questionNode.js b/wax-questions-service/src/MultipleChoiceQuestionService/schema/questionNode.js similarity index 100% rename from wax-prosemirror-services/src/MultipleChoiceQuestionService/schema/questionNode.js rename to wax-questions-service/src/MultipleChoiceQuestionService/schema/questionNode.js diff --git a/wax-prosemirror-services/src/MultipleDropDownService/CreateDropDownService/CreateDropDown.js b/wax-questions-service/src/MultipleDropDownService/CreateDropDownService/CreateDropDown.js similarity index 100% rename from wax-prosemirror-services/src/MultipleDropDownService/CreateDropDownService/CreateDropDown.js rename to wax-questions-service/src/MultipleDropDownService/CreateDropDownService/CreateDropDown.js diff --git a/wax-prosemirror-services/src/MultipleDropDownService/CreateDropDownService/CreateDropDownService.js b/wax-questions-service/src/MultipleDropDownService/CreateDropDownService/CreateDropDownService.js similarity index 100% rename from wax-prosemirror-services/src/MultipleDropDownService/CreateDropDownService/CreateDropDownService.js rename to wax-questions-service/src/MultipleDropDownService/CreateDropDownService/CreateDropDownService.js diff --git a/wax-prosemirror-services/src/MultipleDropDownService/CreateDropDownService/MultipleDropDownNodeView.js b/wax-questions-service/src/MultipleDropDownService/CreateDropDownService/MultipleDropDownNodeView.js similarity index 100% rename from wax-prosemirror-services/src/MultipleDropDownService/CreateDropDownService/MultipleDropDownNodeView.js rename to wax-questions-service/src/MultipleDropDownService/CreateDropDownService/MultipleDropDownNodeView.js diff --git a/wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownContainerNodeView.js b/wax-questions-service/src/MultipleDropDownService/MultipleDropDownContainerNodeView.js similarity index 100% rename from wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownContainerNodeView.js rename to wax-questions-service/src/MultipleDropDownService/MultipleDropDownContainerNodeView.js diff --git a/wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownQuestion.js b/wax-questions-service/src/MultipleDropDownService/MultipleDropDownQuestion.js similarity index 100% rename from wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownQuestion.js rename to wax-questions-service/src/MultipleDropDownService/MultipleDropDownQuestion.js diff --git a/wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownService.js b/wax-questions-service/src/MultipleDropDownService/MultipleDropDownService.js similarity index 100% rename from wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownService.js rename to wax-questions-service/src/MultipleDropDownService/MultipleDropDownService.js diff --git a/wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownToolGroupService/MultipleDropDown.js b/wax-questions-service/src/MultipleDropDownService/MultipleDropDownToolGroupService/MultipleDropDown.js similarity index 100% rename from wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownToolGroupService/MultipleDropDown.js rename to wax-questions-service/src/MultipleDropDownService/MultipleDropDownToolGroupService/MultipleDropDown.js diff --git a/wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownToolGroupService/MultipleDropDownToolGroupService.js b/wax-questions-service/src/MultipleDropDownService/MultipleDropDownToolGroupService/MultipleDropDownToolGroupService.js similarity index 100% rename from wax-prosemirror-services/src/MultipleDropDownService/MultipleDropDownToolGroupService/MultipleDropDownToolGroupService.js rename to wax-questions-service/src/MultipleDropDownService/MultipleDropDownToolGroupService/MultipleDropDownToolGroupService.js diff --git a/wax-prosemirror-services/src/MultipleDropDownService/components/ContainerEditor.js b/wax-questions-service/src/MultipleDropDownService/components/ContainerEditor.js similarity index 100% rename from wax-prosemirror-services/src/MultipleDropDownService/components/ContainerEditor.js rename to wax-questions-service/src/MultipleDropDownService/components/ContainerEditor.js diff --git a/wax-prosemirror-services/src/MultipleDropDownService/components/DropDownComponent.js b/wax-questions-service/src/MultipleDropDownService/components/DropDownComponent.js similarity index 100% rename from wax-prosemirror-services/src/MultipleDropDownService/components/DropDownComponent.js rename to wax-questions-service/src/MultipleDropDownService/components/DropDownComponent.js diff --git a/wax-prosemirror-services/src/MultipleDropDownService/components/MultipleDropDownComponent.js b/wax-questions-service/src/MultipleDropDownService/components/MultipleDropDownComponent.js similarity index 100% rename from wax-prosemirror-services/src/MultipleDropDownService/components/MultipleDropDownComponent.js rename to wax-questions-service/src/MultipleDropDownService/components/MultipleDropDownComponent.js diff --git a/wax-prosemirror-services/src/MultipleDropDownService/components/MultipleDropDownContainerComponent.js b/wax-questions-service/src/MultipleDropDownService/components/MultipleDropDownContainerComponent.js similarity index 100% rename from wax-prosemirror-services/src/MultipleDropDownService/components/MultipleDropDownContainerComponent.js rename to wax-questions-service/src/MultipleDropDownService/components/MultipleDropDownContainerComponent.js diff --git a/wax-prosemirror-services/src/MultipleDropDownService/components/RadioButton.js b/wax-questions-service/src/MultipleDropDownService/components/RadioButton.js similarity index 100% rename from wax-prosemirror-services/src/MultipleDropDownService/components/RadioButton.js rename to wax-questions-service/src/MultipleDropDownService/components/RadioButton.js diff --git a/wax-prosemirror-services/src/MultipleDropDownService/components/ReadOnlyDropDown.js b/wax-questions-service/src/MultipleDropDownService/components/ReadOnlyDropDown.js similarity index 100% rename from wax-prosemirror-services/src/MultipleDropDownService/components/ReadOnlyDropDown.js rename to wax-questions-service/src/MultipleDropDownService/components/ReadOnlyDropDown.js diff --git a/wax-prosemirror-services/src/MultipleDropDownService/plugins/FakeCursorPlugin.js b/wax-questions-service/src/MultipleDropDownService/plugins/FakeCursorPlugin.js similarity index 100% rename from wax-prosemirror-services/src/MultipleDropDownService/plugins/FakeCursorPlugin.js rename to wax-questions-service/src/MultipleDropDownService/plugins/FakeCursorPlugin.js diff --git a/wax-prosemirror-services/src/MultipleDropDownService/schema/multipleDropDownContainerNode.js b/wax-questions-service/src/MultipleDropDownService/schema/multipleDropDownContainerNode.js similarity index 100% rename from wax-prosemirror-services/src/MultipleDropDownService/schema/multipleDropDownContainerNode.js rename to wax-questions-service/src/MultipleDropDownService/schema/multipleDropDownContainerNode.js diff --git a/wax-prosemirror-services/src/MultipleDropDownService/schema/multipleDropDownOptionNode.js b/wax-questions-service/src/MultipleDropDownService/schema/multipleDropDownOptionNode.js similarity index 100% rename from wax-prosemirror-services/src/MultipleDropDownService/schema/multipleDropDownOptionNode.js rename to wax-questions-service/src/MultipleDropDownService/schema/multipleDropDownOptionNode.js diff --git a/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js b/wax-questions-service/src/QuestionsDropDownToolGroupService/DropDownComponent.js similarity index 100% rename from wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/DropDownComponent.js rename to wax-questions-service/src/QuestionsDropDownToolGroupService/DropDownComponent.js diff --git a/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/QuestionsDropDown.js b/wax-questions-service/src/QuestionsDropDownToolGroupService/QuestionsDropDown.js similarity index 100% rename from wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/QuestionsDropDown.js rename to wax-questions-service/src/QuestionsDropDownToolGroupService/QuestionsDropDown.js diff --git a/wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/QuestionsDropDownToolGroupService.js b/wax-questions-service/src/QuestionsDropDownToolGroupService/QuestionsDropDownToolGroupService.js similarity index 100% rename from wax-prosemirror-services/src/WaxToolGroups/QuestionsDropDownToolGroupService/QuestionsDropDownToolGroupService.js rename to wax-questions-service/src/QuestionsDropDownToolGroupService/QuestionsDropDownToolGroupService.js diff --git a/wax-questions-service/src/QuestionsService.js b/wax-questions-service/src/QuestionsService.js new file mode 100644 index 0000000000000000000000000000000000000000..346fc5784d80271d39d0c02210fa6fc13f765f99 --- /dev/null +++ b/wax-questions-service/src/QuestionsService.js @@ -0,0 +1,22 @@ +import { Service } from 'wax-prosemirror-core'; +import EssayService from './EssayService/EssayService'; +import FillTheGapQuestionService from './FillTheGapQuestionService/FillTheGapQuestionService'; +import MatchingService from './MatchingService/MatchingService'; +import MultipleDropDownService from './MultipleDropDownService/MultipleDropDownService'; +import QuestionsDropDownToolGroupService from './QuestionsDropDownToolGroupService/QuestionsDropDownToolGroupService'; +import MultipleChoiceQuestionService from './MultipleChoiceQuestionService/MultipleChoiceQuestionService'; + +class QuestionsService extends Service { + name = 'QuestionsService'; + + dependencies = [ + new MultipleChoiceQuestionService(), + new EssayService(), + new FillTheGapQuestionService(), + new MatchingService(), + new MultipleDropDownService(), + new QuestionsDropDownToolGroupService(), + ]; +} + +export default QuestionsService; diff --git a/yarn.lock b/yarn.lock index ed6802a7570447415fac0aa732fd4d701f2b2f9b..5f1226e99bc069ee8b6acc3227152c0d85c71ce9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12101,7 +12101,7 @@ prosemirror-state@1.4.2, prosemirror-state@^1.0.0, prosemirror-state@^1.2.2, pro prosemirror-transform "^1.0.0" prosemirror-view "^1.27.0" -prosemirror-tables@^1.3.2: +prosemirror-tables@1.3.2, prosemirror-tables@^1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.3.2.tgz#ca208c6a55d510af14b652d23e800e00ba6bebd4" integrity sha512-/9JTeN6s58Zq66HXaxP6uf8PAmc7XXKZFPlOGVtLvxEd6xBP6WtzaJB9wBjiGUzwbdhdMEy7V62yuHqk/3VrnQ== @@ -15530,7 +15530,7 @@ y-leveldb@^0.1.0: level "^6.0.1" lib0 "^0.2.31" -y-prosemirror@^1.2.0: +y-prosemirror@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/y-prosemirror/-/y-prosemirror-1.2.0.tgz#84771bd350834bc7759e946cd14c62ec26243a5c" integrity sha512-t3uxuX4HIkb1GNt8jV+dplRbNH2OmQD/BNeCCbjLD3Mq0o6JEXxHedv58ZIPFDE6ma24jljlL+u8pGvN6B37XQ== @@ -15538,17 +15538,17 @@ y-prosemirror@^1.2.0: lib0 "^0.2.42" typescript "^4.8.4" -y-protocols@^1.0.1, y-protocols@^1.0.5: +y-protocols@1.0.5, y-protocols@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/y-protocols/-/y-protocols-1.0.5.tgz#91d574250060b29fcac8f8eb5e276fbad594245e" integrity sha512-Wil92b7cGk712lRHDqS4T90IczF6RkcvCwAD0A2OPg+adKmOe+nOiT/N2hvpQIWS3zfjmtL4CPaH5sIW1Hkm/A== dependencies: lib0 "^0.2.42" -y-webrtc@^10.2.0: - version "10.2.3" - resolved "https://registry.yarnpkg.com/y-webrtc/-/y-webrtc-10.2.3.tgz#cb0d3194c18c999ac45a78a182042a305528dd41" - integrity sha512-X7a6c56/jWhEI8LHLmT3LgzwbPA4r8h46pdVvV+55EQJhi+K6RfmisWgj7h6/2gkB0yveq7iDxlmyrYGnAKW/Q== +y-webrtc@10.2.0: + version "10.2.0" + resolved "https://registry.yarnpkg.com/y-webrtc/-/y-webrtc-10.2.0.tgz#dae1460a9f3ae677c072fedff783864452fac1be" + integrity sha512-YhHXJx46zc8En8Jpy5FUpAksAAndTV0dXbEKxJw/Zb8+Y6xVGaeB4+x44k0xo5i+SgZ00OjlXAQXgkJQesLc4Q== dependencies: lib0 "^0.2.42" simple-peer "^9.11.0" @@ -15556,7 +15556,7 @@ y-webrtc@^10.2.0: optionalDependencies: ws "^7.2.0" -y-websocket@^1.4.5: +y-websocket@1.4.5: version "1.4.5" resolved "https://registry.yarnpkg.com/y-websocket/-/y-websocket-1.4.5.tgz#8da81b466997bcc4660059f542d0a6ce62581478" integrity sha512-5d9LTSy0GQKqSd/FKRo5DMBlsiTlCipbKcIgPLlno+5xHtfT8bm3uQdcbY9JvLfckojilLZWauXJu0vzDZX05w== @@ -15694,10 +15694,10 @@ yargs@^8.0.2: y18n "^3.2.1" yargs-parser "^7.0.0" -yjs@^13.5.38: - version "13.5.44" - resolved "https://registry.yarnpkg.com/yjs/-/yjs-13.5.44.tgz#1c79ec7407963e07f44174cffcfde5b58a62b0da" - integrity sha512-UL+abIh2lQonqXfaJ+en7z9eGshpY11j1zNLc2kDYs0vrTjee4gZJUXC3ZsuhP6geQt0IRU04epCGRaVPQAVCA== +yjs@13.5.38: + version "13.5.38" + resolved "https://registry.yarnpkg.com/yjs/-/yjs-13.5.38.tgz#58dc8d679c69bddaf7c62e74c909ca08a8e592c9" + integrity sha512-YCHj6DkgxhIRqdxqTI+htGAhvfmgkS974pz+/OOiuLOj0EgGfUKvtp4yYyQGg1Wf3m4oLet9x7gEvCrxaGiVZQ== dependencies: lib0 "^0.2.49"