diff --git a/Changelog.md b/Changelog.md index 1ab1ffdf76..47395de84e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -12,6 +12,8 @@ ### 🔧 Internal changes +- Reorganize Javascript files to separate Sprockets and Webpack compilation (#7345) + ## [v2.6.1] ### ✨ New features and improvements diff --git a/app/assets/javascripts/Components/Assessment_Chart/assessment_chart.jsx b/app/javascript/Components/Assessment_Chart/assessment_chart.jsx similarity index 100% rename from app/assets/javascripts/Components/Assessment_Chart/assessment_chart.jsx rename to app/javascript/Components/Assessment_Chart/assessment_chart.jsx diff --git a/app/assets/javascripts/Components/Assessment_Chart/core_statistics.jsx b/app/javascript/Components/Assessment_Chart/core_statistics.jsx similarity index 100% rename from app/assets/javascripts/Components/Assessment_Chart/core_statistics.jsx rename to app/javascript/Components/Assessment_Chart/core_statistics.jsx diff --git a/app/assets/javascripts/Components/Assessment_Chart/fraction_stat.jsx b/app/javascript/Components/Assessment_Chart/fraction_stat.jsx similarity index 100% rename from app/assets/javascripts/Components/Assessment_Chart/fraction_stat.jsx rename to app/javascript/Components/Assessment_Chart/fraction_stat.jsx diff --git a/app/assets/javascripts/Components/Assessment_Chart/grade_breakdown_chart.jsx b/app/javascript/Components/Assessment_Chart/grade_breakdown_chart.jsx similarity index 100% rename from app/assets/javascripts/Components/Assessment_Chart/grade_breakdown_chart.jsx rename to app/javascript/Components/Assessment_Chart/grade_breakdown_chart.jsx diff --git a/app/assets/javascripts/DropDownMenu/MultiSelectDropDown.jsx b/app/javascript/Components/DropDown/MultiSelectDropDown.jsx similarity index 100% rename from app/assets/javascripts/DropDownMenu/MultiSelectDropDown.jsx rename to app/javascript/Components/DropDown/MultiSelectDropDown.jsx diff --git a/app/assets/javascripts/DropDownMenu/SingleSelectDropDown.jsx b/app/javascript/Components/DropDown/SingleSelectDropDown.jsx similarity index 100% rename from app/assets/javascripts/DropDownMenu/SingleSelectDropDown.jsx rename to app/javascript/Components/DropDown/SingleSelectDropDown.jsx diff --git a/app/assets/javascripts/Components/Helpers/chart_helpers.js b/app/javascript/Components/Helpers/chart_helpers.js similarity index 100% rename from app/assets/javascripts/Components/Helpers/chart_helpers.js rename to app/javascript/Components/Helpers/chart_helpers.js diff --git a/app/assets/javascripts/Components/Helpers/data_chart.jsx b/app/javascript/Components/Helpers/data_chart.jsx similarity index 100% rename from app/assets/javascripts/Components/Helpers/data_chart.jsx rename to app/javascript/Components/Helpers/data_chart.jsx diff --git a/app/assets/javascripts/Components/Helpers/range_selector.js b/app/javascript/Components/Helpers/range_selector.js similarity index 100% rename from app/assets/javascripts/Components/Helpers/range_selector.js rename to app/javascript/Components/Helpers/range_selector.js diff --git a/app/assets/javascripts/Components/Helpers/table_helpers.jsx b/app/javascript/Components/Helpers/table_helpers.jsx similarity index 100% rename from app/assets/javascripts/Components/Helpers/table_helpers.jsx rename to app/javascript/Components/Helpers/table_helpers.jsx diff --git a/app/assets/javascripts/Components/Helpers/tag_modal.jsx b/app/javascript/Components/Helpers/tag_modal.jsx similarity index 100% rename from app/assets/javascripts/Components/Helpers/tag_modal.jsx rename to app/javascript/Components/Helpers/tag_modal.jsx diff --git a/app/assets/javascripts/Components/Modals/autotest_specs_upload_modal.jsx b/app/javascript/Components/Modals/autotest_specs_upload_modal.jsx similarity index 100% rename from app/assets/javascripts/Components/Modals/autotest_specs_upload_modal.jsx rename to app/javascript/Components/Modals/autotest_specs_upload_modal.jsx diff --git a/app/assets/javascripts/Components/Modals/collect_submissions_modal.jsx b/app/javascript/Components/Modals/collect_submissions_modal.jsx similarity index 100% rename from app/assets/javascripts/Components/Modals/collect_submissions_modal.jsx rename to app/javascript/Components/Modals/collect_submissions_modal.jsx diff --git a/app/assets/javascripts/Components/Modals/create_modify_annotation_panel_modal.jsx b/app/javascript/Components/Modals/create_modify_annotation_panel_modal.jsx similarity index 100% rename from app/assets/javascripts/Components/Modals/create_modify_annotation_panel_modal.jsx rename to app/javascript/Components/Modals/create_modify_annotation_panel_modal.jsx diff --git a/app/assets/javascripts/Components/Modals/create_tag_modal.jsx b/app/javascript/Components/Modals/create_tag_modal.jsx similarity index 100% rename from app/assets/javascripts/Components/Modals/create_tag_modal.jsx rename to app/javascript/Components/Modals/create_tag_modal.jsx diff --git a/app/assets/javascripts/Components/Modals/download_test_results_modal.jsx b/app/javascript/Components/Modals/download_test_results_modal.jsx similarity index 100% rename from app/assets/javascripts/Components/Modals/download_test_results_modal.jsx rename to app/javascript/Components/Modals/download_test_results_modal.jsx diff --git a/app/assets/javascripts/Components/Modals/edit_tag_modal.jsx b/app/javascript/Components/Modals/edit_tag_modal.jsx similarity index 100% rename from app/assets/javascripts/Components/Modals/edit_tag_modal.jsx rename to app/javascript/Components/Modals/edit_tag_modal.jsx diff --git a/app/assets/javascripts/Components/Modals/extension_modal.jsx b/app/javascript/Components/Modals/extension_modal.jsx similarity index 100% rename from app/assets/javascripts/Components/Modals/extension_modal.jsx rename to app/javascript/Components/Modals/extension_modal.jsx diff --git a/app/assets/javascripts/Components/Modals/file_upload_modal.jsx b/app/javascript/Components/Modals/file_upload_modal.jsx similarity index 100% rename from app/assets/javascripts/Components/Modals/file_upload_modal.jsx rename to app/javascript/Components/Modals/file_upload_modal.jsx diff --git a/app/assets/javascripts/Components/Modals/filter_modal.jsx b/app/javascript/Components/Modals/filter_modal.jsx similarity index 98% rename from app/assets/javascripts/Components/Modals/filter_modal.jsx rename to app/javascript/Components/Modals/filter_modal.jsx index 18b0b7aaa4..2f11d03f46 100644 --- a/app/assets/javascripts/Components/Modals/filter_modal.jsx +++ b/app/javascript/Components/Modals/filter_modal.jsx @@ -1,7 +1,7 @@ import React from "react"; import Modal from "react-modal"; -import {MultiSelectDropdown} from "../../DropDownMenu/MultiSelectDropDown"; -import {SingleSelectDropDown} from "../../DropDownMenu/SingleSelectDropDown"; +import {MultiSelectDropdown} from "../DropDown/MultiSelectDropDown"; +import {SingleSelectDropDown} from "../DropDown/SingleSelectDropDown"; import {CriteriaFilter} from "../criteria_filter"; import {FontAwesomeIcon} from "@fortawesome/react-fontawesome"; diff --git a/app/assets/javascripts/Components/Modals/graders_distribution_modal.jsx b/app/javascript/Components/Modals/graders_distribution_modal.jsx similarity index 100% rename from app/assets/javascripts/Components/Modals/graders_distribution_modal.jsx rename to app/javascript/Components/Modals/graders_distribution_modal.jsx diff --git a/app/assets/javascripts/Components/Modals/release_urls_modal.jsx b/app/javascript/Components/Modals/release_urls_modal.jsx similarity index 100% rename from app/assets/javascripts/Components/Modals/release_urls_modal.jsx rename to app/javascript/Components/Modals/release_urls_modal.jsx diff --git a/app/assets/javascripts/Components/Modals/roster_sync_modal.jsx b/app/javascript/Components/Modals/roster_sync_modal.jsx similarity index 100% rename from app/assets/javascripts/Components/Modals/roster_sync_modal.jsx rename to app/javascript/Components/Modals/roster_sync_modal.jsx diff --git a/app/assets/javascripts/Components/Modals/section_distribution_modal.js b/app/javascript/Components/Modals/section_distribution_modal.js similarity index 100% rename from app/assets/javascripts/Components/Modals/section_distribution_modal.js rename to app/javascript/Components/Modals/section_distribution_modal.js diff --git a/app/assets/javascripts/Components/Modals/send_lti_grades_modal.jsx b/app/javascript/Components/Modals/send_lti_grades_modal.jsx similarity index 100% rename from app/assets/javascripts/Components/Modals/send_lti_grades_modal.jsx rename to app/javascript/Components/Modals/send_lti_grades_modal.jsx diff --git a/app/assets/javascripts/Components/Modals/submission_file_upload_modal.jsx b/app/javascript/Components/Modals/submission_file_upload_modal.jsx similarity index 100% rename from app/assets/javascripts/Components/Modals/submission_file_upload_modal.jsx rename to app/javascript/Components/Modals/submission_file_upload_modal.jsx diff --git a/app/assets/javascripts/Components/Modals/submission_url_submit_modal.jsx b/app/javascript/Components/Modals/submission_url_submit_modal.jsx similarity index 100% rename from app/assets/javascripts/Components/Modals/submission_url_submit_modal.jsx rename to app/javascript/Components/Modals/submission_url_submit_modal.jsx diff --git a/app/assets/javascripts/Components/Modals/submit_view_token_modal.jsx b/app/javascript/Components/Modals/submit_view_token_modal.jsx similarity index 100% rename from app/assets/javascripts/Components/Modals/submit_view_token_modal.jsx rename to app/javascript/Components/Modals/submit_view_token_modal.jsx diff --git a/app/assets/javascripts/Components/Result/annotation_manager.jsx b/app/javascript/Components/Result/annotation_manager.jsx similarity index 100% rename from app/assets/javascripts/Components/Result/annotation_manager.jsx rename to app/javascript/Components/Result/annotation_manager.jsx diff --git a/app/assets/javascripts/Components/Result/annotation_panel.jsx b/app/javascript/Components/Result/annotation_panel.jsx similarity index 100% rename from app/assets/javascripts/Components/Result/annotation_panel.jsx rename to app/javascript/Components/Result/annotation_panel.jsx diff --git a/app/assets/javascripts/Components/Result/annotation_table.jsx b/app/javascript/Components/Result/annotation_table.jsx similarity index 100% rename from app/assets/javascripts/Components/Result/annotation_table.jsx rename to app/javascript/Components/Result/annotation_table.jsx diff --git a/app/assets/javascripts/Components/Result/autosave_text_form.jsx b/app/javascript/Components/Result/autosave_text_form.jsx similarity index 100% rename from app/assets/javascripts/Components/Result/autosave_text_form.jsx rename to app/javascript/Components/Result/autosave_text_form.jsx diff --git a/app/assets/javascripts/Components/Result/binary_viewer.jsx b/app/javascript/Components/Result/binary_viewer.jsx similarity index 100% rename from app/assets/javascripts/Components/Result/binary_viewer.jsx rename to app/javascript/Components/Result/binary_viewer.jsx diff --git a/app/assets/javascripts/Components/Result/download_submission_modal.jsx b/app/javascript/Components/Result/download_submission_modal.jsx similarity index 100% rename from app/assets/javascripts/Components/Result/download_submission_modal.jsx rename to app/javascript/Components/Result/download_submission_modal.jsx diff --git a/app/assets/javascripts/Components/Result/feedback_file_panel.jsx b/app/javascript/Components/Result/feedback_file_panel.jsx similarity index 100% rename from app/assets/javascripts/Components/Result/feedback_file_panel.jsx rename to app/javascript/Components/Result/feedback_file_panel.jsx diff --git a/app/assets/javascripts/Components/Result/file_viewer.jsx b/app/javascript/Components/Result/file_viewer.jsx similarity index 100% rename from app/assets/javascripts/Components/Result/file_viewer.jsx rename to app/javascript/Components/Result/file_viewer.jsx diff --git a/app/assets/javascripts/Components/Result/image_viewer.jsx b/app/javascript/Components/Result/image_viewer.jsx similarity index 100% rename from app/assets/javascripts/Components/Result/image_viewer.jsx rename to app/javascript/Components/Result/image_viewer.jsx diff --git a/app/assets/javascripts/Components/Result/left_pane.jsx b/app/javascript/Components/Result/left_pane.jsx similarity index 100% rename from app/assets/javascripts/Components/Result/left_pane.jsx rename to app/javascript/Components/Result/left_pane.jsx diff --git a/app/assets/javascripts/Components/Result/marks_panel.jsx b/app/javascript/Components/Result/marks_panel.jsx similarity index 99% rename from app/assets/javascripts/Components/Result/marks_panel.jsx rename to app/javascript/Components/Result/marks_panel.jsx index 9f845705af..ecf079ddea 100644 --- a/app/assets/javascripts/Components/Result/marks_panel.jsx +++ b/app/javascript/Components/Result/marks_panel.jsx @@ -2,7 +2,7 @@ import React from "react"; import {render} from "react-dom"; import PropTypes from "prop-types"; -import safe_marked from "../../safe_marked"; +import safe_marked from "../../common/safe_marked"; export class MarksPanel extends React.Component { static defaultProps = { diff --git a/app/assets/javascripts/Components/Result/notebook_viewer.jsx b/app/javascript/Components/Result/notebook_viewer.jsx similarity index 100% rename from app/assets/javascripts/Components/Result/notebook_viewer.jsx rename to app/javascript/Components/Result/notebook_viewer.jsx diff --git a/app/assets/javascripts/Components/Result/pdf_viewer.jsx b/app/javascript/Components/Result/pdf_viewer.jsx similarity index 98% rename from app/assets/javascripts/Components/Result/pdf_viewer.jsx rename to app/javascript/Components/Result/pdf_viewer.jsx index ec71a80bfa..b0b05f1f64 100644 --- a/app/assets/javascripts/Components/Result/pdf_viewer.jsx +++ b/app/javascript/Components/Result/pdf_viewer.jsx @@ -1,5 +1,5 @@ import React from "react"; -import {SingleSelectDropDown} from "../../DropDownMenu/SingleSelectDropDown"; +import {SingleSelectDropDown} from "../DropDown/SingleSelectDropDown"; export class PDFViewer extends React.PureComponent { constructor(props) { diff --git a/app/assets/javascripts/Components/Result/remark_panel.jsx b/app/javascript/Components/Result/remark_panel.jsx similarity index 100% rename from app/assets/javascripts/Components/Result/remark_panel.jsx rename to app/javascript/Components/Result/remark_panel.jsx diff --git a/app/assets/javascripts/Components/Result/result.jsx b/app/javascript/Components/Result/result.jsx similarity index 100% rename from app/assets/javascripts/Components/Result/result.jsx rename to app/javascript/Components/Result/result.jsx diff --git a/app/assets/javascripts/Components/Result/right_pane.jsx b/app/javascript/Components/Result/right_pane.jsx similarity index 100% rename from app/assets/javascripts/Components/Result/right_pane.jsx rename to app/javascript/Components/Result/right_pane.jsx diff --git a/app/assets/javascripts/Components/Result/submission_file_panel.jsx b/app/javascript/Components/Result/submission_file_panel.jsx similarity index 100% rename from app/assets/javascripts/Components/Result/submission_file_panel.jsx rename to app/javascript/Components/Result/submission_file_panel.jsx diff --git a/app/assets/javascripts/Components/Result/submission_info_panel.jsx b/app/javascript/Components/Result/submission_info_panel.jsx similarity index 100% rename from app/assets/javascripts/Components/Result/submission_info_panel.jsx rename to app/javascript/Components/Result/submission_info_panel.jsx diff --git a/app/assets/javascripts/Components/Result/submission_selector.jsx b/app/javascript/Components/Result/submission_selector.jsx similarity index 100% rename from app/assets/javascripts/Components/Result/submission_selector.jsx rename to app/javascript/Components/Result/submission_selector.jsx diff --git a/app/assets/javascripts/Components/Result/summary_panel.jsx b/app/javascript/Components/Result/summary_panel.jsx similarity index 100% rename from app/assets/javascripts/Components/Result/summary_panel.jsx rename to app/javascript/Components/Result/summary_panel.jsx diff --git a/app/assets/javascripts/Components/Result/text_viewer.jsx b/app/javascript/Components/Result/text_viewer.jsx similarity index 100% rename from app/assets/javascripts/Components/Result/text_viewer.jsx rename to app/javascript/Components/Result/text_viewer.jsx diff --git a/app/assets/javascripts/Components/Result/url_viewer.jsx b/app/javascript/Components/Result/url_viewer.jsx similarity index 100% rename from app/assets/javascripts/Components/Result/url_viewer.jsx rename to app/javascript/Components/Result/url_viewer.jsx diff --git a/app/assets/javascripts/Components/__tests__/assignment_summary.test.jsx b/app/javascript/Components/__tests__/assignment_summary.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/assignment_summary.test.jsx rename to app/javascript/Components/__tests__/assignment_summary.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/collect_submissions_modal.test.jsx b/app/javascript/Components/__tests__/collect_submissions_modal.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/collect_submissions_modal.test.jsx rename to app/javascript/Components/__tests__/collect_submissions_modal.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/create_tag_modal.test.jsx b/app/javascript/Components/__tests__/create_tag_modal.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/create_tag_modal.test.jsx rename to app/javascript/Components/__tests__/create_tag_modal.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/criteria_filter.test.jsx b/app/javascript/Components/__tests__/criteria_filter.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/criteria_filter.test.jsx rename to app/javascript/Components/__tests__/criteria_filter.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/edit_tag_modal.test.jsx b/app/javascript/Components/__tests__/edit_tag_modal.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/edit_tag_modal.test.jsx rename to app/javascript/Components/__tests__/edit_tag_modal.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/file_viewer.test.jsx b/app/javascript/Components/__tests__/file_viewer.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/file_viewer.test.jsx rename to app/javascript/Components/__tests__/file_viewer.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/filter_modal.test.jsx b/app/javascript/Components/__tests__/filter_modal.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/filter_modal.test.jsx rename to app/javascript/Components/__tests__/filter_modal.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/graders_distribution_modal.test.jsx b/app/javascript/Components/__tests__/graders_distribution_modal.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/graders_distribution_modal.test.jsx rename to app/javascript/Components/__tests__/graders_distribution_modal.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/graders_manager.test.jsx b/app/javascript/Components/__tests__/graders_manager.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/graders_manager.test.jsx rename to app/javascript/Components/__tests__/graders_manager.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/instructor_table.test.jsx b/app/javascript/Components/__tests__/instructor_table.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/instructor_table.test.jsx rename to app/javascript/Components/__tests__/instructor_table.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/markdown_editor.test.jsx b/app/javascript/Components/__tests__/markdown_editor.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/markdown_editor.test.jsx rename to app/javascript/Components/__tests__/markdown_editor.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/marks_panel.test.jsx b/app/javascript/Components/__tests__/marks_panel.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/marks_panel.test.jsx rename to app/javascript/Components/__tests__/marks_panel.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/markus_file_manager.test.jsx b/app/javascript/Components/__tests__/markus_file_manager.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/markus_file_manager.test.jsx rename to app/javascript/Components/__tests__/markus_file_manager.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/multi_select_dropdown.test.jsx b/app/javascript/Components/__tests__/multi_select_dropdown.test.jsx similarity index 97% rename from app/assets/javascripts/Components/__tests__/multi_select_dropdown.test.jsx rename to app/javascript/Components/__tests__/multi_select_dropdown.test.jsx index a0a5799339..0bc874d5f7 100644 --- a/app/assets/javascripts/Components/__tests__/multi_select_dropdown.test.jsx +++ b/app/javascript/Components/__tests__/multi_select_dropdown.test.jsx @@ -4,7 +4,7 @@ import * as React from "react"; import {render, screen, fireEvent, within} from "@testing-library/react"; -import {MultiSelectDropdown} from "../../DropDownMenu/MultiSelectDropDown"; +import {MultiSelectDropdown} from "../DropDown/MultiSelectDropDown"; jest.mock("@fortawesome/react-fontawesome", () => ({ FontAwesomeIcon: () => { diff --git a/app/assets/javascripts/Components/__tests__/pdf_viewer.test.jsx b/app/javascript/Components/__tests__/pdf_viewer.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/pdf_viewer.test.jsx rename to app/javascript/Components/__tests__/pdf_viewer.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/repo_browser_manual_collection_form.test.jsx b/app/javascript/Components/__tests__/repo_browser_manual_collection_form.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/repo_browser_manual_collection_form.test.jsx rename to app/javascript/Components/__tests__/repo_browser_manual_collection_form.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/single_select_dropdown.test.jsx b/app/javascript/Components/__tests__/single_select_dropdown.test.jsx similarity index 96% rename from app/assets/javascripts/Components/__tests__/single_select_dropdown.test.jsx rename to app/javascript/Components/__tests__/single_select_dropdown.test.jsx index f56fbd91fe..249197ec24 100644 --- a/app/assets/javascripts/Components/__tests__/single_select_dropdown.test.jsx +++ b/app/javascript/Components/__tests__/single_select_dropdown.test.jsx @@ -1,6 +1,6 @@ import * as React from "react"; import {render, screen, fireEvent} from "@testing-library/react"; -import {SingleSelectDropDown} from "../../DropDownMenu/SingleSelectDropDown.jsx"; +import {SingleSelectDropDown} from "../DropDown/SingleSelectDropDown.jsx"; describe("SingleSelectDropdown", () => { let props; diff --git a/app/assets/javascripts/Components/__tests__/starter_file_manager.test.jsx b/app/javascript/Components/__tests__/starter_file_manager.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/starter_file_manager.test.jsx rename to app/javascript/Components/__tests__/starter_file_manager.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/student_table.test.jsx b/app/javascript/Components/__tests__/student_table.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/student_table.test.jsx rename to app/javascript/Components/__tests__/student_table.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/students_action_box.test.jsx b/app/javascript/Components/__tests__/students_action_box.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/students_action_box.test.jsx rename to app/javascript/Components/__tests__/students_action_box.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/submission_file_manager.test.jsx b/app/javascript/Components/__tests__/submission_file_manager.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/submission_file_manager.test.jsx rename to app/javascript/Components/__tests__/submission_file_manager.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/submission_file_upload_modal.test.jsx b/app/javascript/Components/__tests__/submission_file_upload_modal.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/submission_file_upload_modal.test.jsx rename to app/javascript/Components/__tests__/submission_file_upload_modal.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/submission_selector.test.jsx b/app/javascript/Components/__tests__/submission_selector.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/submission_selector.test.jsx rename to app/javascript/Components/__tests__/submission_selector.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/submission_table.test.jsx b/app/javascript/Components/__tests__/submission_table.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/submission_table.test.jsx rename to app/javascript/Components/__tests__/submission_table.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/ta_table.test.jsx b/app/javascript/Components/__tests__/ta_table.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/ta_table.test.jsx rename to app/javascript/Components/__tests__/ta_table.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/tag_modal.test.jsx b/app/javascript/Components/__tests__/tag_modal.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/tag_modal.test.jsx rename to app/javascript/Components/__tests__/tag_modal.test.jsx diff --git a/app/assets/javascripts/Components/__tests__/text_viewer.test.jsx b/app/javascript/Components/__tests__/text_viewer.test.jsx similarity index 100% rename from app/assets/javascripts/Components/__tests__/text_viewer.test.jsx rename to app/javascript/Components/__tests__/text_viewer.test.jsx diff --git a/app/assets/javascripts/Components/admin_course_list.jsx b/app/javascript/Components/admin_course_list.jsx similarity index 100% rename from app/assets/javascripts/Components/admin_course_list.jsx rename to app/javascript/Components/admin_course_list.jsx diff --git a/app/assets/javascripts/Components/admin_users_list.jsx b/app/javascript/Components/admin_users_list.jsx similarity index 100% rename from app/assets/javascripts/Components/admin_users_list.jsx rename to app/javascript/Components/admin_users_list.jsx diff --git a/app/assets/javascripts/Components/annotation_usage_panel.jsx b/app/javascript/Components/annotation_usage_panel.jsx similarity index 100% rename from app/assets/javascripts/Components/annotation_usage_panel.jsx rename to app/javascript/Components/annotation_usage_panel.jsx diff --git a/app/assets/javascripts/Components/assignment_chart.jsx b/app/javascript/Components/assignment_chart.jsx similarity index 100% rename from app/assets/javascripts/Components/assignment_chart.jsx rename to app/javascript/Components/assignment_chart.jsx diff --git a/app/assets/javascripts/Components/assignment_summary.jsx b/app/javascript/Components/assignment_summary.jsx similarity index 100% rename from app/assets/javascripts/Components/assignment_summary.jsx rename to app/javascript/Components/assignment_summary.jsx diff --git a/app/assets/javascripts/Components/assignment_summary_table.jsx b/app/javascript/Components/assignment_summary_table.jsx similarity index 100% rename from app/assets/javascripts/Components/assignment_summary_table.jsx rename to app/javascript/Components/assignment_summary_table.jsx diff --git a/app/assets/javascripts/Components/autotest_manager.jsx b/app/javascript/Components/autotest_manager.jsx similarity index 99% rename from app/assets/javascripts/Components/autotest_manager.jsx rename to app/javascript/Components/autotest_manager.jsx index f8fedb91cd..55319c3867 100644 --- a/app/assets/javascripts/Components/autotest_manager.jsx +++ b/app/javascript/Components/autotest_manager.jsx @@ -9,7 +9,7 @@ import labelPlugin from "flatpickr/dist/plugins/labelPlugin/labelPlugin"; import {FontAwesomeIcon} from "@fortawesome/react-fontawesome"; import FileUploadModal from "./Modals/file_upload_modal"; import AutotestSpecsUploadModal from "./Modals/autotest_specs_upload_modal"; -import {flashMessage} from "../flash"; +import {flashMessage} from "../common/flash"; const ajvOptionsOverrides = {discriminator: true}; const validator = customizeValidator({ajvOptionsOverrides}); diff --git a/app/assets/javascripts/Components/batch_test_run_table.jsx b/app/javascript/Components/batch_test_run_table.jsx similarity index 100% rename from app/assets/javascripts/Components/batch_test_run_table.jsx rename to app/javascript/Components/batch_test_run_table.jsx diff --git a/app/assets/javascripts/Components/course_cards.jsx b/app/javascript/Components/course_cards.jsx similarity index 100% rename from app/assets/javascripts/Components/course_cards.jsx rename to app/javascript/Components/course_cards.jsx diff --git a/app/assets/javascripts/Components/course_list.jsx b/app/javascript/Components/course_list.jsx similarity index 100% rename from app/assets/javascripts/Components/course_list.jsx rename to app/javascript/Components/course_list.jsx diff --git a/app/assets/javascripts/Components/course_summaries_table.jsx b/app/javascript/Components/course_summaries_table.jsx similarity index 100% rename from app/assets/javascripts/Components/course_summaries_table.jsx rename to app/javascript/Components/course_summaries_table.jsx diff --git a/app/assets/javascripts/Components/course_summary_chart.jsx b/app/javascript/Components/course_summary_chart.jsx similarity index 100% rename from app/assets/javascripts/Components/course_summary_chart.jsx rename to app/javascript/Components/course_summary_chart.jsx diff --git a/app/assets/javascripts/Components/criteria_filter.jsx b/app/javascript/Components/criteria_filter.jsx similarity index 97% rename from app/assets/javascripts/Components/criteria_filter.jsx rename to app/javascript/Components/criteria_filter.jsx index c6724c6bd8..b3c01071dc 100644 --- a/app/assets/javascripts/Components/criteria_filter.jsx +++ b/app/javascript/Components/criteria_filter.jsx @@ -1,5 +1,5 @@ import React from "react"; -import {SingleSelectDropDown} from "../DropDownMenu/SingleSelectDropDown"; +import {SingleSelectDropDown} from "./DropDown/SingleSelectDropDown"; import {FontAwesomeIcon} from "@fortawesome/react-fontawesome"; export class CriteriaFilter extends React.Component { diff --git a/app/assets/javascripts/Components/dashboard.jsx b/app/javascript/Components/dashboard.jsx similarity index 100% rename from app/assets/javascripts/Components/dashboard.jsx rename to app/javascript/Components/dashboard.jsx diff --git a/app/assets/javascripts/Components/exam_scan_log_table.jsx b/app/javascript/Components/exam_scan_log_table.jsx similarity index 100% rename from app/assets/javascripts/Components/exam_scan_log_table.jsx rename to app/javascript/Components/exam_scan_log_table.jsx diff --git a/app/assets/javascripts/Components/grade_entry_form_chart.jsx b/app/javascript/Components/grade_entry_form_chart.jsx similarity index 100% rename from app/assets/javascripts/Components/grade_entry_form_chart.jsx rename to app/javascript/Components/grade_entry_form_chart.jsx diff --git a/app/assets/javascripts/Components/grade_entry_form_summary.jsx b/app/javascript/Components/grade_entry_form_summary.jsx similarity index 100% rename from app/assets/javascripts/Components/grade_entry_form_summary.jsx rename to app/javascript/Components/grade_entry_form_summary.jsx diff --git a/app/assets/javascripts/Components/graders_manager.jsx b/app/javascript/Components/graders_manager.jsx similarity index 100% rename from app/assets/javascripts/Components/graders_manager.jsx rename to app/javascript/Components/graders_manager.jsx diff --git a/app/assets/javascripts/Components/grades_summary_display.jsx b/app/javascript/Components/grades_summary_display.jsx similarity index 100% rename from app/assets/javascripts/Components/grades_summary_display.jsx rename to app/javascript/Components/grades_summary_display.jsx diff --git a/app/assets/javascripts/Components/groups_manager.jsx b/app/javascript/Components/groups_manager.jsx similarity index 100% rename from app/assets/javascripts/Components/groups_manager.jsx rename to app/javascript/Components/groups_manager.jsx diff --git a/app/assets/javascripts/Components/instructor_table.jsx b/app/javascript/Components/instructor_table.jsx similarity index 100% rename from app/assets/javascripts/Components/instructor_table.jsx rename to app/javascript/Components/instructor_table.jsx diff --git a/app/assets/javascripts/Components/lti_settings.jsx b/app/javascript/Components/lti_settings.jsx similarity index 100% rename from app/assets/javascripts/Components/lti_settings.jsx rename to app/javascript/Components/lti_settings.jsx diff --git a/app/assets/javascripts/Components/markdown_editor.jsx b/app/javascript/Components/markdown_editor.jsx similarity index 100% rename from app/assets/javascripts/Components/markdown_editor.jsx rename to app/javascript/Components/markdown_editor.jsx diff --git a/app/assets/javascripts/Components/markdown_preview.jsx b/app/javascript/Components/markdown_preview.jsx similarity index 100% rename from app/assets/javascripts/Components/markdown_preview.jsx rename to app/javascript/Components/markdown_preview.jsx diff --git a/app/assets/javascripts/Components/marking_schemes_table.jsx b/app/javascript/Components/marking_schemes_table.jsx similarity index 100% rename from app/assets/javascripts/Components/marking_schemes_table.jsx rename to app/javascript/Components/marking_schemes_table.jsx diff --git a/app/assets/javascripts/Components/marks_graders_manager.jsx b/app/javascript/Components/marks_graders_manager.jsx similarity index 100% rename from app/assets/javascripts/Components/marks_graders_manager.jsx rename to app/javascript/Components/marks_graders_manager.jsx diff --git a/app/assets/javascripts/Components/marks_spreadsheet.jsx b/app/javascript/Components/marks_spreadsheet.jsx similarity index 100% rename from app/assets/javascripts/Components/marks_spreadsheet.jsx rename to app/javascript/Components/marks_spreadsheet.jsx diff --git a/app/assets/javascripts/Components/markus_file_manager.jsx b/app/javascript/Components/markus_file_manager.jsx similarity index 100% rename from app/assets/javascripts/Components/markus_file_manager.jsx rename to app/javascript/Components/markus_file_manager.jsx diff --git a/app/assets/javascripts/Components/markus_with_selection_hoc.jsx b/app/javascript/Components/markus_with_selection_hoc.jsx similarity index 100% rename from app/assets/javascripts/Components/markus_with_selection_hoc.jsx rename to app/javascript/Components/markus_with_selection_hoc.jsx diff --git a/app/assets/javascripts/Components/notes_table.jsx b/app/javascript/Components/notes_table.jsx similarity index 100% rename from app/assets/javascripts/Components/notes_table.jsx rename to app/javascript/Components/notes_table.jsx diff --git a/app/assets/javascripts/Components/one_time_annotations_table.jsx b/app/javascript/Components/one_time_annotations_table.jsx similarity index 100% rename from app/assets/javascripts/Components/one_time_annotations_table.jsx rename to app/javascript/Components/one_time_annotations_table.jsx diff --git a/app/assets/javascripts/Components/peer_review_table.jsx b/app/javascript/Components/peer_review_table.jsx similarity index 100% rename from app/assets/javascripts/Components/peer_review_table.jsx rename to app/javascript/Components/peer_review_table.jsx diff --git a/app/assets/javascripts/Components/peer_reviews_manager.jsx b/app/javascript/Components/peer_reviews_manager.jsx similarity index 100% rename from app/assets/javascripts/Components/peer_reviews_manager.jsx rename to app/javascript/Components/peer_reviews_manager.jsx diff --git a/app/assets/javascripts/Components/repo_browser.jsx b/app/javascript/Components/repo_browser.jsx similarity index 100% rename from app/assets/javascripts/Components/repo_browser.jsx rename to app/javascript/Components/repo_browser.jsx diff --git a/app/assets/javascripts/Components/starter_file_manager.jsx b/app/javascript/Components/starter_file_manager.jsx similarity index 99% rename from app/assets/javascripts/Components/starter_file_manager.jsx rename to app/javascript/Components/starter_file_manager.jsx index be844e848e..30d067651e 100644 --- a/app/assets/javascripts/Components/starter_file_manager.jsx +++ b/app/javascript/Components/starter_file_manager.jsx @@ -4,7 +4,7 @@ import FileManager from "./markus_file_manager"; import FileUploadModal from "./Modals/file_upload_modal"; import ReactTable from "react-table"; import {FontAwesomeIcon} from "@fortawesome/react-fontawesome"; -import {flashMessage} from "../flash"; +import {flashMessage} from "../common/flash"; function blurOnEnter(event) { if (event.key === "Enter") { diff --git a/app/assets/javascripts/Components/student_peer_reviews_table.jsx b/app/javascript/Components/student_peer_reviews_table.jsx similarity index 100% rename from app/assets/javascripts/Components/student_peer_reviews_table.jsx rename to app/javascript/Components/student_peer_reviews_table.jsx diff --git a/app/assets/javascripts/Components/student_table.jsx b/app/javascript/Components/student_table.jsx similarity index 100% rename from app/assets/javascripts/Components/student_table.jsx rename to app/javascript/Components/student_table.jsx diff --git a/app/assets/javascripts/Components/submission_file_manager.jsx b/app/javascript/Components/submission_file_manager.jsx similarity index 99% rename from app/assets/javascripts/Components/submission_file_manager.jsx rename to app/javascript/Components/submission_file_manager.jsx index 91360c7909..28d2435679 100644 --- a/app/assets/javascripts/Components/submission_file_manager.jsx +++ b/app/javascript/Components/submission_file_manager.jsx @@ -5,7 +5,7 @@ import SubmissionFileUploadModal from "./Modals/submission_file_upload_modal"; import SubmitUrlUploadModal from "./Modals/submission_url_submit_modal"; import {FileViewer} from "./Result/file_viewer"; import mime from "mime/lite"; -import {flashMessage} from "../flash"; +import {flashMessage} from "../common/flash"; class SubmissionFileManager extends React.Component { constructor(props) { diff --git a/app/assets/javascripts/Components/submission_table.jsx b/app/javascript/Components/submission_table.jsx similarity index 99% rename from app/assets/javascripts/Components/submission_table.jsx rename to app/javascript/Components/submission_table.jsx index 97ec4929e9..67aadc99f8 100644 --- a/app/assets/javascripts/Components/submission_table.jsx +++ b/app/javascript/Components/submission_table.jsx @@ -11,8 +11,8 @@ import { } from "./Helpers/table_helpers"; import CollectSubmissionsModal from "./Modals/collect_submissions_modal"; import ReleaseUrlsModal from "./Modals/release_urls_modal"; -import consumer from "../../../../app/javascript/channels/consumer"; -import {renderFlashMessages} from "../flash"; +import consumer from "../channels/consumer"; +import {renderFlashMessages} from "../common/flash"; class RawSubmissionTable extends React.Component { constructor() { diff --git a/app/assets/javascripts/Components/ta_table.jsx b/app/javascript/Components/ta_table.jsx similarity index 100% rename from app/assets/javascripts/Components/ta_table.jsx rename to app/javascript/Components/ta_table.jsx diff --git a/app/assets/javascripts/Components/tag_table.jsx b/app/javascript/Components/tag_table.jsx similarity index 100% rename from app/assets/javascripts/Components/tag_table.jsx rename to app/javascript/Components/tag_table.jsx diff --git a/app/assets/javascripts/Components/test_run_table.jsx b/app/javascript/Components/test_run_table.jsx similarity index 99% rename from app/assets/javascripts/Components/test_run_table.jsx rename to app/javascript/Components/test_run_table.jsx index bcb655fefd..a5ba25e967 100644 --- a/app/assets/javascripts/Components/test_run_table.jsx +++ b/app/javascript/Components/test_run_table.jsx @@ -4,8 +4,8 @@ import ReactTable from "react-table"; import mime from "mime/lite"; import {dateSort, selectFilter} from "./Helpers/table_helpers"; import {FileViewer} from "./Result/file_viewer"; -import consumer from "../../../javascript/channels/consumer"; -import {renderFlashMessages} from "../flash"; +import consumer from "../channels/consumer"; +import {renderFlashMessages} from "../common/flash"; export class TestRunTable extends React.Component { constructor(props) { diff --git a/app/javascript/application_webpack.js b/app/javascript/application_webpack.js index c3755e07f3..9c6c1ed3f1 100644 --- a/app/javascript/application_webpack.js +++ b/app/javascript/application_webpack.js @@ -15,14 +15,14 @@ import "jquery-ui/dist/jquery-ui"; import "ui-contextmenu"; // Callbacks for AJAX events (both jQuery and ujs). -import * as ajax_events from "javascripts/ajax_events"; +import * as ajax_events from "./common/ajax_events"; window.ajax_events = ajax_events; // vendor libraries import "javascripts/jquery.easyModal"; // Markdown support (using marked and DOMpurify) -import safe_marked from "javascripts/safe_marked"; +import safe_marked from "./common/safe_marked"; window.safe_marked = safe_marked; // moment (date/times manipulation) @@ -50,7 +50,7 @@ window.Jcrop = Jcrop; import {Chart, registerables} from "chart.js"; Chart.register(...registerables); window.Chart = Chart; -import "javascripts/chart_config"; +import "./common/chart_config"; // flatpickr import flatpickr from "flatpickr"; @@ -78,90 +78,90 @@ import {faCircleQuestion} from "@fortawesome/free-regular-svg-icons"; window.HELP_ICON_HTML = icon(faCircleQuestion).node[0]; // assets with side-effects only -import "javascripts/flatpickr_config"; -import "javascripts/fontawesome_config"; -import "javascripts/help-system"; -import "javascripts/layouts"; -import "javascripts/menu"; -import "javascripts/react_config"; -import "javascripts/redirect"; -import "javascripts/fetch_proxy"; +import "./common/flatpickr_config"; +import "./common/fontawesome_config"; +import "./common/help-system"; +import "./common/layouts"; +import "./common/menu"; +import "./common/react_config"; +import "./common/redirect"; +import "./common/fetch_proxy"; // assets that export vars/functions/classes // TODO: We shouldn't need to make everything global. -import {poll_job} from "javascripts/job_poller"; +import {poll_job} from "./common/job_poller"; window.poll_job = poll_job; -import {colours} from "javascripts/markus_colors"; +import {colours} from "./common/markus_colors"; window.colours = colours; -import {set_theme} from "javascripts/theme_colors"; +import {set_theme} from "./common/theme_colors"; window.set_theme = set_theme; -import {refreshOrLogout} from "javascripts/refresh_or_logout"; +import {refreshOrLogout} from "./common/refresh_or_logout"; window.refreshOrLogout = refreshOrLogout; -import {ModalMarkus} from "javascripts/modals"; +import {ModalMarkus} from "./common/modals"; window.ModalMarkus = ModalMarkus; -import {makeDashboard} from "javascripts/Components/dashboard"; +import {makeDashboard} from "./Components/dashboard"; window.makeDashboard = makeDashboard; -import {makeAssignmentSummary} from "javascripts/Components/assignment_summary"; +import {makeAssignmentSummary} from "./Components/assignment_summary"; window.makeAssignmentSummary = makeAssignmentSummary; -import {makeGradeEntryFormSummary} from "javascripts/Components/grade_entry_form_summary"; +import {makeGradeEntryFormSummary} from "./Components/grade_entry_form_summary"; window.makeGradeEntryFormSummary = makeGradeEntryFormSummary; -import {makeTATable} from "javascripts/Components/ta_table"; +import {makeTATable} from "./Components/ta_table"; window.makeTATable = makeTATable; -import {makeInstructorTable} from "javascripts/Components/instructor_table"; +import {makeInstructorTable} from "./Components/instructor_table"; window.makeInstructorTable = makeInstructorTable; -import {makeStudentTable} from "javascripts/Components/student_table"; +import {makeStudentTable} from "./Components/student_table"; window.makeStudentTable = makeStudentTable; -import {makeOneTimeAnnotationsTable} from "javascripts/Components/one_time_annotations_table"; +import {makeOneTimeAnnotationsTable} from "./Components/one_time_annotations_table"; window.makeOneTimeAnnotationsTable = makeOneTimeAnnotationsTable; -import {makeExamScanLogTable} from "javascripts/Components/exam_scan_log_table"; +import {makeExamScanLogTable} from "./Components/exam_scan_log_table"; window.makeExamScanLogTable = makeExamScanLogTable; -import {makeSubmissionFileManager} from "javascripts/Components/submission_file_manager"; +import {makeSubmissionFileManager} from "./Components/submission_file_manager"; window.makeSubmissionFileManager = makeSubmissionFileManager; -import {makeRepoBrowser} from "javascripts/Components/repo_browser"; +import {makeRepoBrowser} from "./Components/repo_browser"; window.makeRepoBrowser = makeRepoBrowser; -import {makeTestRunTable} from "javascripts/Components/test_run_table"; +import {makeTestRunTable} from "./Components/test_run_table"; window.makeTestRunTable = makeTestRunTable; -import {makeSubmissionTable} from "javascripts/Components/submission_table"; +import {makeSubmissionTable} from "./Components/submission_table"; window.makeSubmissionTable = makeSubmissionTable; -import {makeTagTable} from "javascripts/Components/tag_table"; +import {makeTagTable} from "./Components/tag_table"; window.makeTagTable = makeTagTable; -import {makeMarksGradersManager} from "javascripts/Components/marks_graders_manager"; +import {makeMarksGradersManager} from "./Components/marks_graders_manager"; window.makeMarksGradersManager = makeMarksGradersManager; -import {makePeerReviewsManager} from "javascripts/Components/peer_reviews_manager"; +import {makePeerReviewsManager} from "./Components/peer_reviews_manager"; window.makePeerReviewsManager = makePeerReviewsManager; -import {makePeerReviewTable} from "javascripts/Components/peer_review_table"; +import {makePeerReviewTable} from "./Components/peer_review_table"; window.makePeerReviewTable = makePeerReviewTable; -import {makeGroupsManager} from "javascripts/Components/groups_manager"; +import {makeGroupsManager} from "./Components/groups_manager"; window.makeGroupsManager = makeGroupsManager; -import {makeGradersManager} from "javascripts/Components/graders_manager"; +import {makeGradersManager} from "./Components/graders_manager"; window.makeGradersManager = makeGradersManager; -import {makeBatchTestRunTable} from "javascripts/Components/batch_test_run_table"; +import {makeBatchTestRunTable} from "./Components/batch_test_run_table"; window.makeBatchTestRunTable = makeBatchTestRunTable; -import {makeMarkingSchemeTable} from "javascripts/Components/marking_schemes_table"; +import {makeMarkingSchemeTable} from "./Components/marking_schemes_table"; window.makeMarkingSchemeTable = makeMarkingSchemeTable; -import {makeAutotestManager} from "javascripts/Components/autotest_manager"; +import {makeAutotestManager} from "./Components/autotest_manager"; window.makeAutotestManager = makeAutotestManager; -import {makeStudentPeerReviewsTable} from "javascripts/Components/student_peer_reviews_table"; +import {makeStudentPeerReviewsTable} from "./Components/student_peer_reviews_table"; window.makeStudentPeerReviewsTable = makeStudentPeerReviewsTable; -import {makeAnnotationUsagePanel} from "javascripts/Components/annotation_usage_panel"; +import {makeAnnotationUsagePanel} from "./Components/annotation_usage_panel"; window.makeAnnotationUsagePanel = makeAnnotationUsagePanel; -import {makeGradesSummaryDisplay} from "javascripts/Components/grades_summary_display"; +import {makeGradesSummaryDisplay} from "./Components/grades_summary_display"; window.makeGradesSummaryDisplay = makeGradesSummaryDisplay; -import {makeDataChart} from "javascripts/Components/Helpers/data_chart"; +import {makeDataChart} from "./Components/Helpers/data_chart"; window.makeDataChart = makeDataChart; -import {makeStarterFileManager} from "javascripts/Components/starter_file_manager"; +import {makeStarterFileManager} from "./Components/starter_file_manager"; window.makeStarterFileManager = makeStarterFileManager; -import {makeNotesTable} from "javascripts/Components/notes_table"; +import {makeNotesTable} from "./Components/notes_table"; window.makeNotesTable = makeNotesTable; -import {makeAdminCourseList} from "javascripts/Components/admin_course_list"; +import {makeAdminCourseList} from "./Components/admin_course_list"; window.makeAdminCourseList = makeAdminCourseList; -import {makeAdminUsersList} from "javascripts/Components/admin_users_list"; +import {makeAdminUsersList} from "./Components/admin_users_list"; window.makeAdminUsersList = makeAdminUsersList; -import {makeCourseList} from "javascripts/Components/course_list"; +import {makeCourseList} from "./Components/course_list"; window.makeCourseList = makeCourseList; -import {makeSubmitViewTokenModal} from "javascripts/Components/Modals/submit_view_token_modal"; +import {makeSubmitViewTokenModal} from "./Components/Modals/submit_view_token_modal"; window.makeSubmitViewTokenModal = makeSubmitViewTokenModal; -import {makeLtiSettings} from "javascripts/Components/lti_settings"; +import {makeLtiSettings} from "./Components/lti_settings"; window.makeLtiSettings = makeLtiSettings; -import {makeResult} from "javascripts/Components/Result/result"; +import {makeResult} from "./Components/Result/result"; window.makeResult = makeResult; diff --git a/app/assets/javascripts/ajax_events.js b/app/javascript/common/ajax_events.js similarity index 100% rename from app/assets/javascripts/ajax_events.js rename to app/javascript/common/ajax_events.js diff --git a/app/assets/javascripts/chart_config.js b/app/javascript/common/chart_config.js similarity index 100% rename from app/assets/javascripts/chart_config.js rename to app/javascript/common/chart_config.js diff --git a/app/assets/javascripts/fetch_proxy.js b/app/javascript/common/fetch_proxy.js similarity index 100% rename from app/assets/javascripts/fetch_proxy.js rename to app/javascript/common/fetch_proxy.js diff --git a/app/assets/javascripts/flash.js b/app/javascript/common/flash.js similarity index 100% rename from app/assets/javascripts/flash.js rename to app/javascript/common/flash.js diff --git a/app/assets/javascripts/flatpickr_config.js b/app/javascript/common/flatpickr_config.js similarity index 100% rename from app/assets/javascripts/flatpickr_config.js rename to app/javascript/common/flatpickr_config.js diff --git a/app/assets/javascripts/fontawesome_config.js b/app/javascript/common/fontawesome_config.js similarity index 100% rename from app/assets/javascripts/fontawesome_config.js rename to app/javascript/common/fontawesome_config.js diff --git a/app/assets/javascripts/help-system.js b/app/javascript/common/help-system.js similarity index 100% rename from app/assets/javascripts/help-system.js rename to app/javascript/common/help-system.js diff --git a/app/assets/javascripts/job_poller.js b/app/javascript/common/job_poller.js similarity index 100% rename from app/assets/javascripts/job_poller.js rename to app/javascript/common/job_poller.js diff --git a/app/assets/javascripts/layouts.js b/app/javascript/common/layouts.js similarity index 100% rename from app/assets/javascripts/layouts.js rename to app/javascript/common/layouts.js diff --git a/app/assets/javascripts/markus_colors.js b/app/javascript/common/markus_colors.js similarity index 100% rename from app/assets/javascripts/markus_colors.js rename to app/javascript/common/markus_colors.js diff --git a/app/assets/javascripts/menu.js b/app/javascript/common/menu.js similarity index 100% rename from app/assets/javascripts/menu.js rename to app/javascript/common/menu.js diff --git a/app/assets/javascripts/modals.js b/app/javascript/common/modals.js similarity index 100% rename from app/assets/javascripts/modals.js rename to app/javascript/common/modals.js diff --git a/app/assets/javascripts/react_config.jsx b/app/javascript/common/react_config.jsx similarity index 81% rename from app/assets/javascripts/react_config.jsx rename to app/javascript/common/react_config.jsx index d4d8faecca..0916542f37 100644 --- a/app/assets/javascripts/react_config.jsx +++ b/app/javascript/common/react_config.jsx @@ -1,8 +1,7 @@ import {ReactTableDefaults} from "react-table"; -import React from "react"; import {I18n} from "i18n-js"; import translations from "translations.json"; -import {defaultSort, stringFilterMethod, textFilter} from "./Components/Helpers/table_helpers"; +import {defaultSort, stringFilterMethod, textFilter} from "../Components/Helpers/table_helpers"; const i18n = new I18n(translations); diff --git a/app/assets/javascripts/redirect.js b/app/javascript/common/redirect.js similarity index 100% rename from app/assets/javascripts/redirect.js rename to app/javascript/common/redirect.js diff --git a/app/assets/javascripts/refresh_or_logout.js b/app/javascript/common/refresh_or_logout.js similarity index 100% rename from app/assets/javascripts/refresh_or_logout.js rename to app/javascript/common/refresh_or_logout.js diff --git a/app/assets/javascripts/safe_marked.js b/app/javascript/common/safe_marked.js similarity index 100% rename from app/assets/javascripts/safe_marked.js rename to app/javascript/common/safe_marked.js diff --git a/app/assets/javascripts/theme_colors.js b/app/javascript/common/theme_colors.js similarity index 100% rename from app/assets/javascripts/theme_colors.js rename to app/javascript/common/theme_colors.js