diff --git a/core/controllers/creator_dashboard.py b/core/controllers/creator_dashboard.py index 7a47b5c46c52..d4af4ef9000f 100644 --- a/core/controllers/creator_dashboard.py +++ b/core/controllers/creator_dashboard.py @@ -120,15 +120,10 @@ def get(self): dependencies_html, additional_angular_modules = ( dependency_registry.Registry.get_deps_html_and_angular_modules( interaction_dependency_ids + self.ADDITIONAL_DEPENDENCY_IDS)) - interaction_templates = ( - interaction_registry.Registry.get_interaction_html( - interaction_ids)) self.values.update({ 'INTERACTION_SPECS': interaction_registry.Registry.get_all_specs(), 'additional_angular_modules': additional_angular_modules, - 'interaction_templates': jinja2.utils.Markup( - interaction_templates), 'dependencies_html': jinja2.utils.Markup(dependencies_html) }) self.render_template('dist/creator-dashboard-page.mainpage.html') diff --git a/core/controllers/editor.py b/core/controllers/editor.py index 5a007f5cd7bf..ac7fc92ac26b 100644 --- a/core/controllers/editor.py +++ b/core/controllers/editor.py @@ -88,10 +88,6 @@ def get(self, exploration_id): dependency_registry.Registry.get_deps_html_and_angular_modules( interaction_dependency_ids + self.EDITOR_PAGE_DEPENDENCY_IDS)) - interaction_templates = ( - interaction_registry.Registry.get_interaction_html( - interaction_ids)) - self.values.update({ 'INTERACTION_SPECS': interaction_registry.Registry.get_all_specs(), 'additional_angular_modules': additional_angular_modules, @@ -113,8 +109,6 @@ def get(self, exploration_id): 'can_unpublish': rights_manager.check_can_unpublish_activity( self.user, exploration_rights), 'dependencies_html': jinja2.utils.Markup(dependencies_html), - 'interaction_templates': jinja2.utils.Markup( - interaction_templates), 'meta_description': feconf.CREATE_PAGE_DESCRIPTION, }) diff --git a/core/controllers/practice_sessions.py b/core/controllers/practice_sessions.py index 6f7f6735fa70..1d844d4a2cd2 100644 --- a/core/controllers/practice_sessions.py +++ b/core/controllers/practice_sessions.py @@ -44,15 +44,9 @@ def get(self, _): dependency_registry.Registry.get_deps_html_and_angular_modules( interaction_dependency_ids)) - interaction_templates = ( - interaction_registry.Registry.get_interaction_html( - interaction_ids)) - self.values.update({ 'additional_angular_modules': additional_angular_modules, 'INTERACTION_SPECS': interaction_registry.Registry.get_all_specs(), - 'interaction_templates': jinja2.utils.Markup( - interaction_templates), 'dependencies_html': jinja2.utils.Markup(dependencies_html), }) self.render_template('dist/practice-session-page.mainpage.html') diff --git a/core/controllers/reader.py b/core/controllers/reader.py index 1210a0b37b21..0b1c32beb218 100644 --- a/core/controllers/reader.py +++ b/core/controllers/reader.py @@ -77,7 +77,6 @@ def _get_exploration_player_data( - 'exploration_version': int. The version of the exploration. - 'collection_id': str. ID of the collection. - 'collection_title': str. Title of collection. - - 'interaction_templates': str. The HTML bodies of the interactions required by the given exploration ID. - 'is_private': bool. Whether the exploration is private or not. - 'meta_name': str. Title of exploration. @@ -113,10 +112,6 @@ def _get_exploration_player_data( dependency_registry.Registry.get_deps_html_and_angular_modules( dependency_ids)) - interaction_templates = ( - interaction_registry.Registry.get_interaction_html( - interaction_ids)) - return { 'INTERACTION_SPECS': interaction_registry.Registry.get_all_specs(), 'additional_angular_modules': additional_angular_modules, @@ -127,8 +122,6 @@ def _get_exploration_player_data( 'exploration_version': version, 'collection_id': collection_id, 'collection_title': collection_title, - 'interaction_templates': jinja2.utils.Markup( - interaction_templates), 'is_private': rights_manager.is_exploration_private( exploration_id), # Note that this overwrites the value in base.py. diff --git a/core/controllers/review_tests.py b/core/controllers/review_tests.py index 96bfb5b8c3c4..71e449a56e50 100644 --- a/core/controllers/review_tests.py +++ b/core/controllers/review_tests.py @@ -44,15 +44,9 @@ def get(self, _): dependency_registry.Registry.get_deps_html_and_angular_modules( interaction_dependency_ids)) - interaction_templates = ( - interaction_registry.Registry.get_interaction_html( - interaction_ids)) - self.values.update({ 'additional_angular_modules': additional_angular_modules, 'INTERACTION_SPECS': interaction_registry.Registry.get_all_specs(), - 'interaction_templates': jinja2.utils.Markup( - interaction_templates), 'dependencies_html': jinja2.utils.Markup(dependencies_html), }) self.render_template('dist/review-test-page.mainpage.html') diff --git a/core/controllers/skill_editor.py b/core/controllers/skill_editor.py index 22734cc426b7..6700e0e8e916 100644 --- a/core/controllers/skill_editor.py +++ b/core/controllers/skill_editor.py @@ -77,15 +77,9 @@ def get(self, skill_id): dependency_registry.Registry.get_deps_html_and_angular_modules( interaction_dependency_ids + self.EDITOR_PAGE_DEPENDENCY_IDS)) - interaction_templates = ( - interaction_registry.Registry.get_interaction_html( - interaction_ids)) - self.values.update({ 'additional_angular_modules': additional_angular_modules, 'INTERACTION_SPECS': interaction_registry.Registry.get_all_specs(), - 'interaction_templates': jinja2.utils.Markup( - interaction_templates), 'dependencies_html': jinja2.utils.Markup(dependencies_html) }) diff --git a/core/controllers/topic_editor.py b/core/controllers/topic_editor.py index 62d8a97e49b5..20571533467e 100644 --- a/core/controllers/topic_editor.py +++ b/core/controllers/topic_editor.py @@ -123,15 +123,9 @@ def get(self, topic_id): dependency_registry.Registry.get_deps_html_and_angular_modules( interaction_dependency_ids + self.EDITOR_PAGE_DEPENDENCY_IDS)) - interaction_templates = ( - interaction_registry.Registry.get_interaction_html( - interaction_ids)) - self.values.update({ 'additional_angular_modules': additional_angular_modules, 'INTERACTION_SPECS': interaction_registry.Registry.get_all_specs(), - 'interaction_templates': jinja2.utils.Markup( - interaction_templates), 'dependencies_html': jinja2.utils.Markup(dependencies_html) }) diff --git a/core/templates/dev/head/pages/creator-dashboard-page/creator-dashboard-page.mainpage.html b/core/templates/dev/head/pages/creator-dashboard-page/creator-dashboard-page.mainpage.html index bc36758b61cf..a953987b909b 100644 --- a/core/templates/dev/head/pages/creator-dashboard-page/creator-dashboard-page.mainpage.html +++ b/core/templates/dev/head/pages/creator-dashboard-page/creator-dashboard-page.mainpage.html @@ -33,7 +33,6 @@ @require('../footer_js_libs.html') - {{ interaction_templates }} {{ dependencies_html }} diff --git a/core/templates/dev/head/pages/exploration-editor-page/exploration-editor-page.mainpage.html b/core/templates/dev/head/pages/exploration-editor-page/exploration-editor-page.mainpage.html index 687d00bc736a..9d826b7f0114 100644 --- a/core/templates/dev/head/pages/exploration-editor-page/exploration-editor-page.mainpage.html +++ b/core/templates/dev/head/pages/exploration-editor-page/exploration-editor-page.mainpage.html @@ -63,6 +63,5 @@ <% } %> <% } %> - {{ interaction_templates }} {{ dependencies_html }} {% endblock footer_js %} diff --git a/core/templates/dev/head/pages/exploration-player-page/exploration-player-page.mainpage.html b/core/templates/dev/head/pages/exploration-player-page/exploration-player-page.mainpage.html index e650585dc946..88dc2a41d747 100644 --- a/core/templates/dev/head/pages/exploration-player-page/exploration-player-page.mainpage.html +++ b/core/templates/dev/head/pages/exploration-player-page/exploration-player-page.mainpage.html @@ -56,7 +56,6 @@ @require('../footer_js_libs.html') - {{ interaction_templates }} {{ dependencies_html }} diff --git a/core/templates/dev/head/pages/practice-session-page/practice-session-page.mainpage.html b/core/templates/dev/head/pages/practice-session-page/practice-session-page.mainpage.html index 432d8470c590..1b0d7e41480d 100644 --- a/core/templates/dev/head/pages/practice-session-page/practice-session-page.mainpage.html +++ b/core/templates/dev/head/pages/practice-session-page/practice-session-page.mainpage.html @@ -33,7 +33,6 @@ @require('../footer_js_libs.html') - {{ interaction_templates }} {{ dependencies_html }} diff --git a/core/templates/dev/head/pages/review-test-page/review-test-page.mainpage.html b/core/templates/dev/head/pages/review-test-page/review-test-page.mainpage.html index f615f1ea29aa..73b037bc8a30 100644 --- a/core/templates/dev/head/pages/review-test-page/review-test-page.mainpage.html +++ b/core/templates/dev/head/pages/review-test-page/review-test-page.mainpage.html @@ -34,7 +34,6 @@ @require('../footer_js_libs.html') - {{ interaction_templates }} {{ dependencies_html }} diff --git a/core/templates/dev/head/pages/skill-editor-page/skill-editor-page.mainpage.html b/core/templates/dev/head/pages/skill-editor-page/skill-editor-page.mainpage.html index 395ef25c91fa..889111f1658e 100644 --- a/core/templates/dev/head/pages/skill-editor-page/skill-editor-page.mainpage.html +++ b/core/templates/dev/head/pages/skill-editor-page/skill-editor-page.mainpage.html @@ -37,7 +37,6 @@ @require('../footer_js_libs.html') - {{ interaction_templates }} {{ dependencies_html }} diff --git a/core/templates/dev/head/pages/topic-editor-page/topic-editor-page.mainpage.html b/core/templates/dev/head/pages/topic-editor-page/topic-editor-page.mainpage.html index 69b3150bc4da..d8a13c4eac2d 100644 --- a/core/templates/dev/head/pages/topic-editor-page/topic-editor-page.mainpage.html +++ b/core/templates/dev/head/pages/topic-editor-page/topic-editor-page.mainpage.html @@ -37,7 +37,6 @@ @require('../footer_js_libs.html') - {{ interaction_templates }} {{ dependencies_html }} diff --git a/core/tests/karma.conf.ts b/core/tests/karma.conf.ts index 719d5e063647..b43c809e27f4 100644 --- a/core/tests/karma.conf.ts +++ b/core/tests/karma.conf.ts @@ -180,6 +180,10 @@ module.exports = function(config) { loader: 'istanbul-instrumenter-loader', options: { esModules: true } } + }, + { + test: /\.css$/, + use: ['style-loader', 'css-loader'] } ] }, diff --git a/extensions/interactions/CodeRepl/CodeRepl.html b/extensions/interactions/CodeRepl/CodeRepl.html deleted file mode 100644 index b62b6aa1d56b..000000000000 --- a/extensions/interactions/CodeRepl/CodeRepl.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/extensions/interactions/CodeRepl/CodeRepl.ts b/extensions/interactions/CodeRepl/CodeRepl.ts index 0354d6b349f9..6d3067792413 100644 --- a/extensions/interactions/CodeRepl/CodeRepl.ts +++ b/extensions/interactions/CodeRepl/CodeRepl.ts @@ -16,6 +16,8 @@ * @fileoverview Requires for CodeRepl interaction. */ +require('interactions/CodeRepl/static/code_repl.css'); + require('interactions/CodeRepl/CodeReplPredictionService.ts'); require('interactions/CodeRepl/directives/CodeReplRulesService.ts'); diff --git a/extensions/interactions/Continue/Continue.html b/extensions/interactions/Continue/Continue.html deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/extensions/interactions/DragAndDropSortInput/DragAndDropSortInput.html b/extensions/interactions/DragAndDropSortInput/DragAndDropSortInput.html deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/extensions/interactions/EndExploration/EndExploration.html b/extensions/interactions/EndExploration/EndExploration.html deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/extensions/interactions/FractionInput/FractionInput.html b/extensions/interactions/FractionInput/FractionInput.html deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/extensions/interactions/GraphInput/GraphInput.html b/extensions/interactions/GraphInput/GraphInput.html deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/extensions/interactions/ImageClickInput/ImageClickInput.html b/extensions/interactions/ImageClickInput/ImageClickInput.html deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/extensions/interactions/InteractiveMap/InteractiveMap.html b/extensions/interactions/InteractiveMap/InteractiveMap.html deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/extensions/interactions/ItemSelectionInput/ItemSelectionInput.html b/extensions/interactions/ItemSelectionInput/ItemSelectionInput.html deleted file mode 100644 index 218d4aabaafb..000000000000 --- a/extensions/interactions/ItemSelectionInput/ItemSelectionInput.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/extensions/interactions/ItemSelectionInput/ItemSelectionInput.ts b/extensions/interactions/ItemSelectionInput/ItemSelectionInput.ts index 44f2b0d000d0..46cafbef5b8c 100644 --- a/extensions/interactions/ItemSelectionInput/ItemSelectionInput.ts +++ b/extensions/interactions/ItemSelectionInput/ItemSelectionInput.ts @@ -16,6 +16,8 @@ * @fileoverview Requires for ItemSelectionInput interaction. */ +require('interactions/ItemSelectionInput/static/item_selection_input.css'); + require( 'interactions/ItemSelectionInput/directives/' + 'ItemSelectionInputRulesService.ts'); diff --git a/extensions/interactions/LogicProof/LogicProof.html b/extensions/interactions/LogicProof/LogicProof.html deleted file mode 100644 index eed32fc178a3..000000000000 --- a/extensions/interactions/LogicProof/LogicProof.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/extensions/interactions/LogicProof/LogicProof.ts b/extensions/interactions/LogicProof/LogicProof.ts index a30ab8f13bf5..8b5fef99bf10 100644 --- a/extensions/interactions/LogicProof/LogicProof.ts +++ b/extensions/interactions/LogicProof/LogicProof.ts @@ -15,6 +15,9 @@ /** * @fileoverview Requires for LogicProof interaction. */ + +require('interactions/LogicProof/static/logic_proof.css'); + require('interactions/LogicProof/directives/LogicProofRulesService.ts'); require('interactions/LogicProof/directives/LogicProofValidationService.ts'); require( diff --git a/extensions/interactions/MathExpressionInput/MathExpressionInput.html b/extensions/interactions/MathExpressionInput/MathExpressionInput.html deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/extensions/interactions/MultipleChoiceInput/MultipleChoiceInput.html b/extensions/interactions/MultipleChoiceInput/MultipleChoiceInput.html deleted file mode 100644 index d5c3cd2674bd..000000000000 --- a/extensions/interactions/MultipleChoiceInput/MultipleChoiceInput.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/extensions/interactions/MultipleChoiceInput/MultipleChoiceInput.ts b/extensions/interactions/MultipleChoiceInput/MultipleChoiceInput.ts index ced7450b3407..038ed457afc9 100644 --- a/extensions/interactions/MultipleChoiceInput/MultipleChoiceInput.ts +++ b/extensions/interactions/MultipleChoiceInput/MultipleChoiceInput.ts @@ -16,6 +16,8 @@ * @fileoverview Requires for MultipleChoiceInput interaction. */ +require('interactions/MultipleChoiceInput/static/multiple_choice_input.css'); + require( 'interactions/MultipleChoiceInput/directives/' + 'MultipleChoiceInputRulesService.ts'); diff --git a/extensions/interactions/MusicNotesInput/MusicNotesInput.html b/extensions/interactions/MusicNotesInput/MusicNotesInput.html deleted file mode 100644 index ac293a205542..000000000000 --- a/extensions/interactions/MusicNotesInput/MusicNotesInput.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/extensions/interactions/MusicNotesInput/MusicNotesInput.ts b/extensions/interactions/MusicNotesInput/MusicNotesInput.ts index a67b7a5241cd..387259d7a5c1 100644 --- a/extensions/interactions/MusicNotesInput/MusicNotesInput.ts +++ b/extensions/interactions/MusicNotesInput/MusicNotesInput.ts @@ -16,6 +16,8 @@ * @fileoverview Requires for MusicNotesInput interaction. */ +require('interactions/MusicNotesInput/static/music_notes_input.css'); + require( 'interactions/MusicNotesInput/directives/MusicNotesInputRulesService.ts'); require( diff --git a/extensions/interactions/NumberWithUnits/NumberWithUnits.html b/extensions/interactions/NumberWithUnits/NumberWithUnits.html deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/extensions/interactions/NumericInput/NumericInput.html b/extensions/interactions/NumericInput/NumericInput.html deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/extensions/interactions/PencilCodeEditor/PencilCodeEditor.html b/extensions/interactions/PencilCodeEditor/PencilCodeEditor.html deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/extensions/interactions/SetInput/SetInput.html b/extensions/interactions/SetInput/SetInput.html deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/extensions/interactions/TextInput/TextInput.html b/extensions/interactions/TextInput/TextInput.html deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/extensions/interactions/base_test.py b/extensions/interactions/base_test.py index 6937282500f2..945ac6b005a3 100644 --- a/extensions/interactions/base_test.py +++ b/extensions/interactions/base_test.py @@ -267,10 +267,6 @@ def test_default_interactions_are_valid(self): # Required: # * A python file called {InteractionName}.py. # * An __init__.py file used to import the Python file. - # * An html file called {InteractionName}.html. Most of the HTML - # files are empty, only some contain for importing CSS - # do not add anything into these files, they are scheduled for - # deletion (#6962). # * A TypeScript file called {InteractionName}.ts. # * A directory name 'directives' containing TS and HTML files # for directives @@ -306,18 +302,15 @@ def test_default_interactions_are_valid(self): pass self.assertEqual( - interaction_dir_optional_dirs_and_files_count + 6, + interaction_dir_optional_dirs_and_files_count + 5, len(interaction_dir_contents) ) py_file = os.path.join(interaction_dir, '%s.py' % interaction_id) - html_file = os.path.join( - interaction_dir, '%s.html' % interaction_id) ts_file = os.path.join( interaction_dir, '%s.ts' % interaction_id) self.assertTrue(os.path.isfile(py_file)) - self.assertTrue(os.path.isfile(html_file)) self.assertTrue(os.path.isfile(ts_file)) # Check that __init__.py file exists. diff --git a/package.json b/package.json index 7be984ec4489..b5d104687590 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,7 @@ "cache-loader": "^3.0.1", "clean-webpack-plugin": "^2.0.1", "core-js": "^2.5.3", + "css-loader": "^3.1.0", "dotenv": "^7.0.0", "enhanced-resolve": "^4.1.0", "eslint": "^5.16.0", diff --git a/webpack.dev.config.ts b/webpack.dev.config.ts index b6644e5dc04f..3b4cacbc92a0 100644 --- a/webpack.dev.config.ts +++ b/webpack.dev.config.ts @@ -82,6 +82,13 @@ module.exports = { { test: /\.html$/, loader: 'underscore-template-loader' + }, + { + test: /\.css$/, + include: [ + path.resolve(__dirname, 'extensions'), + ], + use: ['style-loader', 'css-loader'] }] }, output: { diff --git a/webpack.prod.config.ts b/webpack.prod.config.ts index 586ed89d51cf..91ce0fb078f1 100644 --- a/webpack.prod.config.ts +++ b/webpack.prod.config.ts @@ -82,6 +82,13 @@ module.exports = { { test: /\.html$/, loader: 'underscore-template-loader' + }, + { + test: /\.css$/, + include: [ + path.resolve(__dirname, 'extensions'), + ], + use: ['style-loader', 'css-loader'] }] }, output: {