test
', content_type='text/html') + ) + Experiment.objects.create( + name='test_template', + slug='TEMPLATE', + consent=SimpleUploadedFile('template.html', b'{% load i18n %}{% blocktranslate %}test
{% endblocktranslate %}', content_type='text/html') + ) + + def test_markdown_rendering(self): + consent = Consent('', url='dev/consent_mock.md') + self.assertEqual(consent.render_format, 'MARKDOWN') + self.assertEqual(consent.text, 'test
') + + def test_html_rendering(self): + consent = Consent('', url='dev/consent_mock.html') + self.assertEqual(consent.render_format, 'HTML') + self.assertEqual(consent.text, 'test
') + + def test_uploaded_markdown_rendering(self): + experiment = Experiment.objects.get(slug='MARKDOWN') + consent = Consent(experiment.consent) + self.assertEqual(consent.render_format, 'MARKDOWN') + self.assertEqual(consent.text, 'test
') + + def test_uploaded_html_rendering(self): + experiment = Experiment.objects.get(slug='HTML') + consent = Consent(experiment.consent) + self.assertEqual(consent.render_format, 'HTML') + self.assertEqual(consent.text, 'test
') + + def test_template_language_rendering(self): + experiment = Experiment.objects.get(slug='TEMPLATE') + consent = Consent(experiment.consent) + self.assertEqual(consent.text, 'test
') diff --git a/backend/experiment/tests/test_actions_form.py b/backend/experiment/tests/test_actions_form.py new file mode 100644 index 000000000..c10a07676 --- /dev/null +++ b/backend/experiment/tests/test_actions_form.py @@ -0,0 +1,342 @@ +from django.test import TestCase + +from experiment.actions.form import BooleanQuestion, ChoiceQuestion, Form, NumberQuestion, TextQuestion, DropdownQuestion, AutoCompleteQuestion, RadiosQuestion, ButtonArrayQuestion, RangeQuestion, LikertQuestion, LikertQuestionIcon + + +class FormTest(TestCase): + def setUp(self): + self.questions = [NumberQuestion(key='test_key', min_value=1, max_value=10)] + self.form = Form(form=self.questions, submit_label='Submit', skip_label='Skip', is_skippable=True) + + def test_initialization(self): + self.assertEqual(len(self.form.form), 1) + self.assertEqual(self.form.submit_label, 'Submit') + self.assertEqual(self.form.skip_label, 'Skip') + self.assertTrue(self.form.is_skippable) + + def test_action_method(self): + action_result = self.form.action() + self.assertIn('form', action_result) + self.assertEqual(len(action_result['form']), 1) + self.assertIn('submit_label', action_result) + self.assertIn('skip_label', action_result) + self.assertIn('is_skippable', action_result) + + +class NumberQuestionTest(TestCase): + def setUp(self): + self.number_question = NumberQuestion( + key='test_key', + min_value=1, + max_value=10, + input_type='number' + ) + + def test_initialization(self): + self.assertEqual(self.number_question.key, 'test_key') + self.assertEqual(self.number_question.min_value, 1) + self.assertEqual(self.number_question.max_value, 10) + self.assertEqual(self.number_question.input_type, 'number') + + def test_action_method(self): + action_result = self.number_question.action() + self.assertIn('key', action_result) + self.assertIn('min_value', action_result) + self.assertIn('max_value', action_result) + self.assertEqual(action_result['min_value'], 1) + self.assertEqual(action_result['max_value'], 10) + + +class TextQuestionTest(TestCase): + def setUp(self): + self.text_question = TextQuestion( + key='test_key', + max_length=100, + input_type='text' + ) + + def test_initialization(self): + self.assertEqual(self.text_question.key, 'test_key') + self.assertEqual(self.text_question.max_length, 100) + self.assertEqual(self.text_question.input_type, 'text') + + def test_action_method(self): + action_result = self.text_question.action() + self.assertIn('key', action_result) + self.assertIn('max_length', action_result) + self.assertEqual(action_result['max_length'], 100) + + +class BooleanQuestionTest(TestCase): + def setUp(self): + self.boolean_question = BooleanQuestion( + key='test_key', + choices={ + 'no': 'No', + 'yes': 'Yes' + } + ) + + def test_initialization(self): + self.assertEqual(self.boolean_question.key, 'test_key') + self.assertEqual(self.boolean_question.choices, {'no': 'No', 'yes': 'Yes'}) + + def test_action_method(self): + action_result = self.boolean_question.action() + self.assertIn('key', action_result) + self.assertIn('choices', action_result) + self.assertEqual(action_result['choices'], {'no': 'No', 'yes': 'Yes'}) + + +class ChoiceQuestionTest(TestCase): + def setUp(self): + self.choice_question = ChoiceQuestion( + key='test_key', + choices={ + 'no': 'No', + 'yes': 'Yes' + }, + min_values=1 + ) + + def test_initialization(self): + self.assertEqual(self.choice_question.key, 'test_key') + self.assertEqual(self.choice_question.choices, {'no': 'No', 'yes': 'Yes'}) + self.assertEqual(self.choice_question.min_values, 1) + + def test_action_method(self): + action_result = self.choice_question.action() + self.assertIn('key', action_result) + self.assertIn('choices', action_result) + self.assertEqual(action_result['choices'], {'no': 'No', 'yes': 'Yes'}) + self.assertIn('min_values', action_result) + self.assertEqual(action_result['min_values'], 1) + + +class DropdownQuestionTest(TestCase): + def setUp(self): + self.dropdown_question = DropdownQuestion( + key='test_key', + choices={ + 'no': 'No', + 'yes': 'Yes' + }, + ) + + def test_initialization(self): + self.assertEqual(self.dropdown_question.key, 'test_key') + self.assertEqual(self.dropdown_question.choices, {'no': 'No', 'yes': 'Yes'}) + + def test_action_method(self): + action_result = self.dropdown_question.action() + self.assertIn('key', action_result) + self.assertIn('choices', action_result) + self.assertEqual(action_result['choices'], {'no': 'No', 'yes': 'Yes'}) + + +class AutoCompleteQuestionTest(TestCase): + def setUp(self): + self.autocomplete_question = AutoCompleteQuestion( + key='test_key', + choices={ + 'no': 'No', + 'yes': 'Yes' + }, + ) + + def test_initialization(self): + self.assertEqual(self.autocomplete_question.key, 'test_key') + self.assertEqual(self.autocomplete_question.choices, {'no': 'No', 'yes': 'Yes'}) + + def test_action_method(self): + action_result = self.autocomplete_question.action() + self.assertIn('key', action_result) + self.assertIn('choices', action_result) + self.assertEqual(action_result['choices'], {'no': 'No', 'yes': 'Yes'}) + + +class RadiosQuestionTest(TestCase): + def setUp(self): + self.radios_question = RadiosQuestion( + key='test_key', + choices={ + 'no': 'No', + 'yes': 'Yes' + }, + ) + + def test_initialization(self): + self.assertEqual(self.radios_question.key, 'test_key') + self.assertEqual(self.radios_question.choices, {'no': 'No', 'yes': 'Yes'}) + + def test_action_method(self): + action_result = self.radios_question.action() + self.assertIn('key', action_result) + self.assertIn('choices', action_result) + self.assertEqual(action_result['choices'], {'no': 'No', 'yes': 'Yes'}) + + +class ButtonArrayQuestionTest(TestCase): + def setUp(self): + self.buttonarray_question = ButtonArrayQuestion( + key='test_key', + choices={ + 'no': 'No', + 'yes': 'Yes' + }, + ) + + def test_initialization(self): + self.assertEqual(self.buttonarray_question.key, 'test_key') + self.assertEqual(self.buttonarray_question.choices, {'no': 'No', 'yes': 'Yes'}) + + def test_action_method(self): + action_result = self.buttonarray_question.action() + self.assertIn('key', action_result) + self.assertIn('choices', action_result) + self.assertEqual(action_result['choices'], {'no': 'No', 'yes': 'Yes'}) + + +class RangeQuestionTest(TestCase): + def setUp(self): + self.range_question = RangeQuestion( + key='test_key', + min_value=1, + max_value=10, + ) + + def test_initialization(self): + self.assertEqual(self.range_question.key, 'test_key') + self.assertEqual(self.range_question.min_value, 1) + self.assertEqual(self.range_question.max_value, 10) + + def test_action_method(self): + action_result = self.range_question.action() + self.assertIn('key', action_result) + self.assertIn('min_value', action_result) + self.assertIn('max_value', action_result) + self.assertEqual(action_result['min_value'], 1) + self.assertEqual(action_result['max_value'], 10) + + +class LikertQuestionCustomChoicesTest(TestCase): + def setUp(self): + self.likert_question = LikertQuestion( + key='test_key', + choices={ + 'no': 'No', + 'yes': 'Yes' + }, + ) + + def test_initialization(self): + self.assertEqual(self.likert_question.key, 'test_key') + self.assertEqual(self.likert_question.choices, {'no': 'No', 'yes': 'Yes'}) + + def test_action_method(self): + action_result = self.likert_question.action() + self.assertIn('key', action_result) + self.assertIn('choices', action_result) + self.assertEqual(action_result['choices'], {'no': 'No', 'yes': 'Yes'}) + + +class LikertQuestionSevenScaleStepsTest(TestCase): + def setUp(self): + self.likert_question = LikertQuestion( + key='test_key', + scale_steps=7, + ) + + def test_initialization(self): + self.assertEqual(self.likert_question.key, 'test_key') + self.assertEqual(self.likert_question.choices, { + 1: "Completely Disagree", + 2: "Strongly Disagree", + 3: "Disagree", + 4: "Neither Agree nor Disagree", + 5: "Agree", + 6: "Strongly Agree", + 7: "Completely Agree", + }) + + def test_action_method(self): + action_result = self.likert_question.action() + self.assertIn('key', action_result) + self.assertIn('choices', action_result) + self.assertEqual(action_result['choices'], { + 1: "Completely Disagree", + 2: "Strongly Disagree", + 3: "Disagree", + 4: "Neither Agree nor Disagree", + 5: "Agree", + 6: "Strongly Agree", + 7: "Completely Agree", + }) + + +class LikertQuestionFiveScaleStepsTest(TestCase): + def setUp(self): + self.likert_question = LikertQuestion( + key='test_key', + scale_steps=5, + ) + + def test_initialization(self): + self.assertEqual(self.likert_question.key, 'test_key') + self.assertEqual(self.likert_question.choices, { + 1: "Strongly Disagree", + 2: "Disagree", + 3: "Neither Agree nor Disagree", + 4: "Agree", + 5: "Strongly Agree", + }) + + def test_action_method(self): + action_result = self.likert_question.action() + self.assertIn('key', action_result) + self.assertIn('choices', action_result) + self.assertEqual(action_result['choices'], { + 1: "Strongly Disagree", + 2: "Disagree", + 3: "Neither Agree nor Disagree", + 4: "Agree", + 5: "Strongly Agree", + }) + + +class LikertQuestionIconTest(TestCase): + def setUp(self): + self.likert_question_icon = LikertQuestionIcon( + key='test_key', + scale_steps=7, + likert_view="ICON_RANGE", + ) + + def test_initialization(self): + self.assertEqual(self.likert_question_icon.key, 'test_key') + self.assertEqual(self.likert_question_icon.view, 'ICON_RANGE') + self.assertEqual(self.likert_question_icon.choices, { + 1: 'fa-face-grin-hearts', + 2: 'fa-face-grin', + 3: 'fa-face-smile', + 4: 'fa-face-meh', + 5: 'fa-face-frown', + 6: 'fa-face-frown-open', + 7: 'fa-face-angry', + }) + + def test_action_method(self): + action_result = self.likert_question_icon.action() + self.assertIn('key', action_result) + self.assertIn('view', action_result) + self.assertEqual(action_result['view'], 'ICON_RANGE') + self.assertIn('choices', action_result) + self.assertEqual(action_result['choices'], { + 1: 'fa-face-grin-hearts', + 2: 'fa-face-grin', + 3: 'fa-face-smile', + 4: 'fa-face-meh', + 5: 'fa-face-frown', + 6: 'fa-face-frown-open', + 7: 'fa-face-angry', + }) diff --git a/backend/experiment/tests/test_actions_html.py b/backend/experiment/tests/test_actions_html.py new file mode 100644 index 000000000..79d913211 --- /dev/null +++ b/backend/experiment/tests/test_actions_html.py @@ -0,0 +1,11 @@ +from django.test import TestCase + +from experiment.actions.html import HTML + + +class HTMLTest(TestCase): + + def test_initialization(self): + test_html_body = "Test HTML Content
"
+ html_action = HTML(body=test_html_body)
+ self.assertEqual(html_action.body, test_html_body)
diff --git a/backend/experiment/tests/test_actions_info.py b/backend/experiment/tests/test_actions_info.py
new file mode 100644
index 000000000..8fe2dec6d
--- /dev/null
+++ b/backend/experiment/tests/test_actions_info.py
@@ -0,0 +1,36 @@
+import unittest
+
+from experiment.actions.info import Info
+
+
+class TestInfo(unittest.TestCase):
+
+ def test_initialization_all_parameters(self):
+ info = Info(
+ body="Test Body
", + heading="Test Heading", + button_label="Test Label", + button_link="http://example.com" + ) + self.assertEqual(info.body, "Test Body
") + self.assertEqual(info.heading, "Test Heading") + self.assertEqual(info.button_label, "Test Label") + self.assertEqual(info.button_link, "http://example.com") + + def test_initialization_only_body(self): + info = Info(body="Only Body
") + self.assertEqual(info.body, "Only Body
") + self.assertEqual(info.heading, "") + self.assertIsNone(info.button_label) + self.assertIsNone(info.button_link) + + def test_initialization_default_values(self): + info = Info(body="Body
", heading="Heading") + self.assertEqual(info.body, "Body
") + self.assertEqual(info.heading, "Heading") + self.assertIsNone(info.button_label) + self.assertIsNone(info.button_link) + + +if __name__ == '__main__': + unittest.main() diff --git a/backend/experiment/tests/test_actions_playlist.py b/backend/experiment/tests/test_actions_playlist.py new file mode 100644 index 000000000..98223082e --- /dev/null +++ b/backend/experiment/tests/test_actions_playlist.py @@ -0,0 +1,38 @@ +import unittest +from unittest.mock import MagicMock + +from experiment.actions.playlist import Playlist + + +class TestPlaylist(unittest.TestCase): + + def setUp(self): + self.mock_playlists = [ + MagicMock(id=1, name='Playlist 1'), + MagicMock(id=2, name='Playlist 2') + ] + + self.mock_playlists[0].name = 'Playlist 1' + self.mock_playlists[1].name = 'Playlist 2' + + def test_initialization_with_playlists(self): + playlist_action = Playlist(playlists=self.mock_playlists) + self.assertEqual(len(playlist_action.playlists), 2) + self.assertEqual(playlist_action.playlists[0]['id'], 1) + self.assertEqual(playlist_action.playlists[0]['name'], 'Playlist 1') + + def test_initialization_with_empty_list(self): + playlist_action = Playlist(playlists=[]) + self.assertEqual(playlist_action.playlists, []) + + def test_playlists_structure(self): + playlist_action = Playlist(playlists=self.mock_playlists) + for playlist in playlist_action.playlists: + self.assertIn('id', playlist) + self.assertIn('name', playlist) + self.assertIsInstance(playlist['id'], int) + self.assertIsInstance(playlist['name'], str) + + +if __name__ == '__main__': + unittest.main() diff --git a/backend/experiment/tests/test_actions_score.py b/backend/experiment/tests/test_actions_score.py new file mode 100644 index 000000000..579ec5544 --- /dev/null +++ b/backend/experiment/tests/test_actions_score.py @@ -0,0 +1,78 @@ +import unittest +from unittest.mock import Mock + +from experiment.actions.score import Score + + +class TestScore(unittest.TestCase): + + def setUp(self): + self.mock_session = Mock() + self.mock_session.last_score.return_value = 10 + self.mock_session.last_song.return_value = "Test Song" + self.mock_session.total_score.return_value = 50 + self.mock_session.rounds_passed.return_value = 2 + self.mock_session.experiment.rounds = 5 + + def test_initialization_full_parameters(self): + score = Score( + session=self.mock_session, + title="Test Title", + score=100, + score_message=lambda x: f"Score is {x}", + config={'show_section': True, 'show_total_score': True}, + icon="icon-test", + timer=5, + feedback="Test Feedback" + ) + self.assertEqual(score.title, "Test Title") + self.assertEqual(score.score, 100) + self.assertEqual(score.score_message(score.score), "Score is 100") + self.assertEqual(score.feedback, "Test Feedback") + self.assertEqual(score.config, {'show_section': True, 'show_total_score': True}) + self.assertEqual(score.icon, "icon-test") + self.assertEqual(score.texts, { + 'score': 'Total Score', + 'next': 'Next', + 'listen_explainer': 'You listened to:' + }) + self.assertEqual(score.timer, 5) + + def test_initialization_minimal_parameters(self): + score = Score(session=self.mock_session) + self.assertIsNone(score.title) + self.assertEqual(score.score, 10) + self.assertEqual(score.score_message, score.default_score_message) + self.assertIsNone(score.feedback) + self.assertEqual(score.config, {'show_section': False, 'show_total_score': False}) + self.assertIsNone(score.icon) + self.assertEqual(score.texts, { + 'score': 'Total Score', + 'next': 'Next', + 'listen_explainer': 'You listened to:' + }) + self.assertIsNone(score.timer) + + def test_action_serialization(self): + score = Score(session=self.mock_session, config={'show_section': True, 'show_total_score': True}) + action = score.action() + self.assertIn('view', action) + self.assertIn('last_song', action) + self.assertIn('total_score', action) + self.assertIn('score', action) + self.assertIn('score_message', action) + self.assertIn('texts', action) + self.assertIn('feedback', action) + self.assertIn('icon', action) + self.assertIn('timer', action) + + def test_default_score_message(self): + score = Score(session=self.mock_session) + self.assertIn(score.default_score_message(10), ["Correct"]) # Positive + self.assertIn(score.default_score_message(0), ["No points"]) # Zero + self.assertIn(score.default_score_message(-5), ["Incorrect"]) # Negative + self.assertIn(score.default_score_message(None), ["No points"]) # None + + +if __name__ == '__main__': + unittest.main() diff --git a/backend/experiment/tests/test_admin_experiment.py b/backend/experiment/tests/test_admin_experiment.py index d3f40e408..610398676 100644 --- a/backend/experiment/tests/test_admin_experiment.py +++ b/backend/experiment/tests/test_admin_experiment.py @@ -11,7 +11,7 @@ from session.models import Session # Expected field count per model -EXPECTED_EXPERIMENT_FIELDS = 13 +EXPECTED_EXPERIMENT_FIELDS = 14 EXPECTED_SESSION_FIELDS = 9 EXPECTED_RESULT_FIELDS = 12 EXPECTED_PARTICIPANT_FIELDS = 5 @@ -20,11 +20,13 @@ class MockRequest: pass + request = MockRequest() this_experiment_admin = ExperimentAdmin( model=Experiment, admin_site=AdminSite) + class TestAdminExperiment(TestCase): @classmethod @@ -62,20 +64,17 @@ def test_participant_model(self): participant_fields = [key for key in participant] self.assertEqual(len(participant_fields), EXPECTED_PARTICIPANT_FIELDS) - class TestAdminExperimentExport(TestCase): fixtures = ['playlist', 'experiment'] - + @classmethod def setUpTestData(cls): cls.participant = Participant.objects.create(unique_hash=42) cls.experiment = Experiment.objects.get(name='Hooked-China') - print(cls.experiment) for playlist in cls.experiment.playlists.all(): - playlist.update_sections() - print(cls.experiment.pk) + playlist.update_sections() cls.session = Session.objects.create( experiment=cls.experiment, participant=cls.participant, @@ -84,14 +83,15 @@ def setUpTestData(cls): Result.objects.create( session=Session.objects.first(), expected_response = i, - given_response = i + given_response = i, + question_key = 'test_question_' + str(i), ) Result.objects.create( participant=cls.participant, question_key= i, - given_response = i + given_response = i, ) - + def setUp(self): self.client = Client() @@ -133,3 +133,18 @@ def test_admin_export(self): # test response from forced download self.assertEqual(response.status_code, 200) self.assertEqual(response['content-type'], 'application/x-zip-compressed') + + def test_export_table_includes_question_key(self): + session_keys = ['session_start', 'session_end'] + result_keys = ['question_key'] + export_options = ['convert_result_json'] # Adjust based on your needs + + # Call the method under test + rows, fieldnames = self.experiment.export_table(session_keys, result_keys, export_options) + + # Assert that 'question_key' is in the fieldnames and check its value in rows + self.assertIn('question_key', fieldnames) + for i in range(len(rows)): + row = rows[i] + self.assertIn('question_key', row) + self.assertEqual(row['question_key'], 'test_question_' + str(i)) \ No newline at end of file diff --git a/backend/experiment/tests/test_forms.py b/backend/experiment/tests/test_forms.py new file mode 100644 index 000000000..2e73b3ddf --- /dev/null +++ b/backend/experiment/tests/test_forms.py @@ -0,0 +1,47 @@ +from django.test import TestCase + +from experiment.forms import ExperimentForm, ExportForm, TemplateForm, EXPERIMENT_RULES, SESSION_CHOICES, RESULT_CHOICES, EXPORT_OPTIONS, TEMPLATE_CHOICES + + +class ExperimentFormTest(TestCase): + def test_form_fields(self): + form = ExperimentForm() + self.assertIn('name', form.fields) + self.assertIn('slug', form.fields) + self.assertIn('active', form.fields) + self.assertIn('rules', form.fields) + self.assertIn('questions', form.fields) + self.assertIn('rounds', form.fields) + self.assertIn('bonus_points', form.fields) + self.assertIn('playlists', form.fields) + self.assertIn('experiment_series', form.fields) + + def test_rules_field_choices(self): + form = ExperimentForm() + expected_choices = [(i, EXPERIMENT_RULES[i].__name__) for i in EXPERIMENT_RULES] + expected_choices.append(("", "---------")) + self.assertEqual(form.fields['rules'].choices, sorted(expected_choices)) + + +class ExportFormTest(TestCase): + def test_form_fields(self): + form = ExportForm() + self.assertIn('export_session_fields', form.fields) + self.assertIn('export_result_fields', form.fields) + self.assertIn('export_options', form.fields) + + def test_field_choices(self): + form = ExportForm() + self.assertEqual(form.fields['export_session_fields'].choices, SESSION_CHOICES) + self.assertEqual(form.fields['export_result_fields'].choices, RESULT_CHOICES) + self.assertEqual(form.fields['export_options'].choices, EXPORT_OPTIONS) + + +class TemplateFormTest(TestCase): + def test_form_fields(self): + form = TemplateForm() + self.assertIn('select_template', form.fields) + + def test_template_choices(self): + form = TemplateForm() + self.assertEqual(form.fields['select_template'].choices, TEMPLATE_CHOICES) diff --git a/backend/experiment/tests/test_frontend_style.py b/backend/experiment/tests/test_frontend_style.py new file mode 100644 index 000000000..6e4ce8a01 --- /dev/null +++ b/backend/experiment/tests/test_frontend_style.py @@ -0,0 +1,41 @@ +import unittest + +from experiment.actions.frontend_style import FrontendStyle, EFrontendStyle + + +class TestFrontendStyle(unittest.TestCase): + + def test_init_with_valid_root_style(self): + style = FrontendStyle(EFrontendStyle.PRIMARY) + self.assertEqual(style.get_style('root'), EFrontendStyle.PRIMARY) + + def test_init_with_invalid_root_style(self): + with self.assertRaises(ValueError): + FrontendStyle("invalid-style") + + def test_get_style(self): + style = FrontendStyle(EFrontendStyle.SECONDARY) + self.assertEqual(style.get_style('root'), EFrontendStyle.SECONDARY) + + def test_get_style_non_existing_element(self): + style = FrontendStyle(EFrontendStyle.SECONDARY) + self.assertIsNone(style.get_style('non-existing')) + + def test_apply_valid_style(self): + style = FrontendStyle(EFrontendStyle.EMPTY) + style.apply_style('root', EFrontendStyle.INFO) + self.assertEqual(style.get_style('root'), EFrontendStyle.INFO) + + def test_apply_invalid_style(self): + style = FrontendStyle(EFrontendStyle.EMPTY) + with self.assertRaises(ValueError): + style.apply_style('root', "invalid-style") + + def test_to_dict(self): + style = FrontendStyle(EFrontendStyle.NEUTRAL) + expected_dict = {'root': EFrontendStyle.NEUTRAL.value } + self.assertEqual(style.to_dict(), expected_dict) + + +if __name__ == '__main__': + unittest.main() diff --git a/backend/experiment/tests/test_model_functions.py b/backend/experiment/tests/test_model_functions.py index 77a767aa1..2fb18c92f 100644 --- a/backend/experiment/tests/test_model_functions.py +++ b/backend/experiment/tests/test_model_functions.py @@ -1,6 +1,7 @@ from django.test import TestCase from experiment.models import Experiment, ExperimentSeries + class TestModelExperiment(TestCase): @classmethod def setUpTestData(cls): @@ -13,6 +14,7 @@ def test_separate_rules_instance(self): keys2 = [q.key for q in rules2.questions] assert keys1 != keys2 + class TestModelExperimentSeries(TestCase): def test_verbose_name_plural(self): diff --git a/backend/experiment/tests/test_rules_gold_msi.py b/backend/experiment/tests/test_rules_gold_msi.py new file mode 100644 index 000000000..d2025d08a --- /dev/null +++ b/backend/experiment/tests/test_rules_gold_msi.py @@ -0,0 +1,27 @@ +from django.test import TestCase +from django.core.files.uploadedfile import SimpleUploadedFile +from experiment.models import Experiment +from experiment.rules.gold_msi import GoldMSI + + +class TestGoldMSI(TestCase): + @classmethod + def setUpTestData(cls): + Experiment.objects.create( + name='test_md', + slug='MARKDOWN', + consent=SimpleUploadedFile('consent.md', b'#test', content_type='text/html') + ) + + def test_init(self): + goldMSI = GoldMSI() + assert goldMSI.ID == 'GOLD_MSI' + + def test_first_round(self): + experiment = Experiment.objects.first() + goldMSI = GoldMSI() + result = goldMSI.first_round(experiment) + + assert result[0].__class__.__name__ == 'Consent' + assert result[0].ID == 'CONSENT' + diff --git a/backend/experiment/tests/test_utils.py b/backend/experiment/tests/test_utils.py new file mode 100644 index 000000000..0ae83aea7 --- /dev/null +++ b/backend/experiment/tests/test_utils.py @@ -0,0 +1,14 @@ +from django.test import TestCase + +from experiment.utils import create_player_labels + + +class TestExperimentUtils(TestCase): + + def test_create_player_labels(self): + labels = create_player_labels(3, 'alphabetic') + assert labels == ['A', 'B', 'C'] + labels = create_player_labels(4, 'roman') + assert labels == ['I', 'II', 'III', 'IV'] + labels = create_player_labels(2) + assert labels == ['1', '2'] \ No newline at end of file diff --git a/backend/experiment/utils.py b/backend/experiment/utils.py index 03ed3354b..17dcaaa89 100644 --- a/backend/experiment/utils.py +++ b/backend/experiment/utils.py @@ -1,3 +1,5 @@ +import roman + def serialize(actions): ''' Serialize an array of actions ''' @@ -5,6 +7,7 @@ def serialize(actions): return [a.action() for a in actions] return actions.action() + def slugify(text): """Create a slug from given string""" non_url_safe = ['"', '#', '$', '%', '&', '+', @@ -16,12 +19,27 @@ def slugify(text): text = u'_'.join(text.split()) return text.lower() + def non_breaking_spaces(s): # Convert regular spaces to non breaking spacing # on the given string non_breaking_space = chr(160) return s.replace(" ", non_breaking_space) + def external_url(text, url): # Create a HTML element for an external url return '{}'.format(url, text) + + +def create_player_labels(num_labels, label_style='number'): + return [format_label(i, label_style) for i in range(num_labels)] + + +def format_label(number, label_style): + if label_style == 'alphabetic': + return chr(number + 65) + elif label_style == 'roman': + return roman.toRoman(number+1) + else: + return str(number+1) diff --git a/backend/experiment/validators.py b/backend/experiment/validators.py new file mode 100644 index 000000000..bf5ee0751 --- /dev/null +++ b/backend/experiment/validators.py @@ -0,0 +1,7 @@ +from django.core.validators import FileExtensionValidator + +valid_extensions = ['md', 'html'] + + +def consent_file_validator(): + return FileExtensionValidator(allowed_extensions=valid_extensions) diff --git a/backend/experiment/views.py b/backend/experiment/views.py index 0768f6a23..eeecc9b39 100644 --- a/backend/experiment/views.py +++ b/backend/experiment/views.py @@ -9,13 +9,13 @@ from .models import Experiment, Feedback from .utils import serialize from session.models import Session +from experiment.rules import EXPERIMENT_RULES logger = logging.getLogger(__name__) -from experiment.rules import EXPERIMENT_RULES - # Experiment + def get_experiment(request, slug): """Get experiment data from active experiment with given :slug DO NOT modify session data here, it will break participant_id system @@ -80,6 +80,7 @@ def get_experiment(request, slug): response.set_cookie(settings.LANGUAGE_COOKIE_NAME, None) return response + def post_feedback(request, slug): text = request.POST.get('feedback') experiment = experiment_or_404(slug) @@ -87,6 +88,7 @@ def post_feedback(request, slug): feedback.save() return JsonResponse({'status': 'ok'}) + def experiment_or_404(slug): # get experiment try: @@ -94,5 +96,6 @@ def experiment_or_404(slug): except Experiment.DoesNotExist: raise Http404("Experiment does not exist") + def default_questions(request, rules): return JsonResponse({'default_questions': [q.key for q in EXPERIMENT_RULES[rules]().questions]}) diff --git a/backend/manage.py b/backend/manage.py index 041efeacc..4ac5acba2 100755 --- a/backend/manage.py +++ b/backend/manage.py @@ -4,6 +4,7 @@ from os.path import join, dirname from dotenv import load_dotenv + def main(): env_path = join(dirname(__file__), '.env') load_dotenv(dotenv_path=env_path) diff --git a/backend/participant/apps.py b/backend/participant/apps.py index 103321f4c..cfc9ee2d2 100644 --- a/backend/participant/apps.py +++ b/backend/participant/apps.py @@ -1,4 +1,5 @@ from django.apps import AppConfig + class ParticipantConfig(AppConfig): name = 'participant' diff --git a/backend/participant/tests.py b/backend/participant/tests.py index d23212dc4..74d1f868b 100644 --- a/backend/participant/tests.py +++ b/backend/participant/tests.py @@ -7,6 +7,7 @@ from session.models import Session from result.models import Result + class ParticipantTest(TestCase): @classmethod @@ -35,21 +36,21 @@ def setUp(self): self.session = self.client.session self.session['country_code'] = 'BLA' self.session.save() - + def set_participant(self): self.session['participant_id'] = self.participant.id self.session.save() - + def test_current_view(self): self.set_participant() response = json.loads(self.client.get('/participant/').content) assert response.get('id') == self.participant.id assert int(response.get('hash')) == self.participant.unique_hash - assert response.get('csrf_token') != None + assert response.get('csrf_token') is not None def test_profile(self): assert len(self.participant.profile()) == 1 - + def test_profile_object(self): po = self.participant.profile_object() assert len(po.keys()) == 2 @@ -65,5 +66,5 @@ def test_country_code(self): self.client.get('/participant/') participant = Participant.objects.last() assert participant.country_code == 'BLA' - + diff --git a/backend/participant/utils.py b/backend/participant/utils.py index 3a3a8b51b..d1ec74ece 100644 --- a/backend/participant/utils.py +++ b/backend/participant/utils.py @@ -13,6 +13,7 @@ def located_in_nl(request): """Return True if the requesting IP-address is located in NL""" return country(request) == 'nl' + def country(request): """Get country code of requesting ip""" @@ -38,6 +39,7 @@ def country(request): return country_code + def get_country_code(ip_address): """Get country code from given ip address""" @@ -56,6 +58,7 @@ def get_country_code(ip_address): except: return None + def visitor_ip_address(request): """Get visitor ip address from request""" @@ -67,6 +70,7 @@ def visitor_ip_address(request): return request.META.get('REMOTE_ADDR') + def get_participant(request): # get participant from session participant_id = request.session.get(PARTICIPANT_KEY, -1) @@ -76,6 +80,7 @@ def get_participant(request): except Participant.DoesNotExist: raise + def get_or_create_participant(request): """Get a participant from URL, the session, or create/add a new one""" diff --git a/backend/participant/views.py b/backend/participant/views.py index cabc4ef98..f40584cde 100644 --- a/backend/participant/views.py +++ b/backend/participant/views.py @@ -38,7 +38,7 @@ def scores(request): 'messages': { 'title': _('My profile'), 'summary': ngettext( - 'You have participated in %(count)d Amsterdam Music Lab experiment. Your best score is:', + 'You have participated in %(count)d Amsterdam Music Lab experiment. Your best score is:', 'You have partcipated in %(count)d Amsterdam Music Lab experiments. Your best scores are:', len(scores)) % {'count': len(scores)}, 'points': _('points'), diff --git a/backend/requirements.in/base.txt b/backend/requirements.in/base.txt index 30aeb7e60..e53e70cfc 100644 --- a/backend/requirements.in/base.txt +++ b/backend/requirements.in/base.txt @@ -20,6 +20,9 @@ IPToCC # PostgrSQL database client psycopg2 +# to convert labels to Roman numerals +roman + # Sentry SDK, for monitoring performance & errors. See also sentry.io. sentry-sdk @@ -31,3 +34,6 @@ coverage # Generate a code coverage badge genbadge[coverage] + +# Convert markdown to html +django-markup[all_filter_dependencies] diff --git a/backend/requirements.in/dev.txt b/backend/requirements.in/dev.txt index 9cbdba765..58728f34b 100644 --- a/backend/requirements.in/dev.txt +++ b/backend/requirements.in/dev.txt @@ -17,3 +17,6 @@ requests # Add pip-tools so we can use pip-compile in our develop environment pip-tools + +# Flake8 for linting +flake8 diff --git a/backend/requirements/dev.txt b/backend/requirements/dev.txt index d2b22fdcf..eaf6c4b12 100644 --- a/backend/requirements/dev.txt +++ b/backend/requirements/dev.txt @@ -12,6 +12,8 @@ audioread==2.1.9 # via -r requirements.in/base.txt autopep8==1.5.7 # via -r requirements.in/dev.txt +bleach==6.1.0 + # via django-markup build==1.0.3 # via pip-tools certifi==2023.7.22 @@ -28,39 +30,56 @@ coverage==7.3.2 # via -r requirements.in/base.txt defusedxml==0.7.1 # via genbadge -django==3.2.23 +django==3.2.24 # via # -r requirements.in/base.txt # django-cors-headers # django-debug-toolbar # django-inline-actions + # django-markup django-cors-headers==3.10.0 # via -r requirements.in/base.txt -django-debug-toolbar==3.2.2 +django-debug-toolbar==4.3.0 # via -r requirements.in/dev.txt django-inline-actions==2.4.0 # via -r requirements.in/base.txt +django-markup[all_filter_dependencies]==1.8.1 + # via -r requirements.in/base.txt +docutils==0.20.1 + # via + # django-markup + # python-creole +flake8==4.0.1 + # via -r requirements.in/dev.txt genbadge[coverage]==1.1.1 # via -r requirements.in/base.txt +html5lib==1.1 + # via textile idna==3.3 # via requests importlib-metadata==7.0.0 - # via build + # via + # build + # markdown iptocc==2.1.2 # via -r requirements.in/base.txt isort==5.9.3 # via pylint lazy-object-proxy==1.6.0 # via astroid +markdown==3.5.2 + # via django-markup mccabe==0.6.1 - # via pylint + # via + # flake8 + # pylint numpy==1.22.0 # via pandas packaging==23.2 # via build pandas==1.3.4 # via iptocc -pillow==10.1.0 +pillow==10.2.0 # via genbadge pip-tools==7.3.0 # via -r requirements.in/dev.txt @@ -69,7 +88,13 @@ platformdirs==2.4.0 psycopg2==2.9.1 # via -r requirements.in/base.txt pycodestyle==2.8.0 - # via autopep8 + # via + # autopep8 + # flake8 +pyflakes==2.4.0 + # via flake8 +pygments==2.17.2 + # via django-markup pylint==2.11.1 # via # -r requirements.in/dev.txt @@ -81,6 +106,8 @@ pylint-plugin-utils==0.6 # via pylint-django pyproject-hooks==1.0.0 # via build +python-creole==1.4.10 + # via django-markup python-dateutil==2.8.2 # via pandas python-dotenv==0.19.1 @@ -89,18 +116,29 @@ pytz==2021.3 # via # django # pandas +regex==2023.12.25 + # via textile requests==2.31.0 # via # -r requirements.in/dev.txt # genbadge +roman==4.1 + # via -r requirements.in/base.txt sentry-sdk==1.38.0 # via -r requirements.in/base.txt six==1.16.0 - # via python-dateutil + # via + # bleach + # html5lib + # python-dateutil +smartypants==2.0.1 + # via django-markup sqlparse==0.4.4 # via # django # django-debug-toolbar +textile==4.0.2 + # via django-markup toml==0.10.2 # via # autopep8 @@ -120,6 +158,10 @@ urllib3==1.26.18 # via # requests # sentry-sdk +webencodings==0.5.1 + # via + # bleach + # html5lib wheel==0.42.0 # via pip-tools wrapt==1.13.2 diff --git a/backend/requirements/prod.txt b/backend/requirements/prod.txt index 81daf2f11..de4794ebd 100644 --- a/backend/requirements/prod.txt +++ b/backend/requirements/prod.txt @@ -8,6 +8,8 @@ asgiref==3.7.2 # via django audioread==3.0.0 # via -r requirements.in/base.txt +bleach==6.1.0 + # via django-markup certifi==2023.11.17 # via # requests @@ -20,31 +22,48 @@ coverage==7.3.2 # via -r requirements.in/base.txt defusedxml==0.7.1 # via genbadge -django==3.2.23 +django==3.2.24 # via # -r requirements.in/base.txt # django-cors-headers # django-inline-actions + # django-markup django-cors-headers==4.0.0 # via -r requirements.in/base.txt django-inline-actions==2.4.0 # via -r requirements.in/base.txt +django-markup[all_filter_dependencies]==1.8.1 + # via -r requirements.in/base.txt +docutils==0.20.1 + # via + # django-markup + # python-creole genbadge[coverage]==1.1.1 # via -r requirements.in/base.txt gunicorn==20.1.0 # via -r requirements.in/prod.txt +html5lib==1.1 + # via textile idna==3.6 # via requests +importlib-metadata==7.0.1 + # via markdown iptocc==2.1.2 # via -r requirements.in/base.txt +markdown==3.5.2 + # via django-markup numpy==1.24.3 # via pandas pandas==1.5.3 # via iptocc -pillow==10.1.0 +pillow==10.2.0 # via genbadge psycopg2==2.9.6 # via -r requirements.in/base.txt +pygments==2.17.2 + # via django-markup +python-creole==1.4.10 + # via django-markup python-dateutil==2.8.2 # via pandas python-dotenv==1.0.0 @@ -53,14 +72,25 @@ pytz==2023.3 # via # django # pandas +regex==2023.12.25 + # via textile requests==2.31.0 # via genbadge +roman==4.1 + # via -r requirements.in/base.txt sentry-sdk==1.38.0 # via -r requirements.in/base.txt six==1.16.0 - # via python-dateutil + # via + # bleach + # html5lib + # python-dateutil +smartypants==2.0.1 + # via django-markup sqlparse==0.4.4 # via django +textile==4.0.2 + # via django-markup tqdm==4.65.0 # via -r requirements.in/base.txt typing-extensions==4.6.3 @@ -69,6 +99,12 @@ urllib3==2.1.0 # via # requests # sentry-sdk +webencodings==0.5.1 + # via + # bleach + # html5lib +zipp==3.17.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/backend/result/apps.py b/backend/result/apps.py index 05553ec4d..8cc17182b 100644 --- a/backend/result/apps.py +++ b/backend/result/apps.py @@ -1,5 +1,6 @@ from django.apps import AppConfig + class ResultConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' name = 'result' diff --git a/backend/result/migrations/0002_data_migration.py b/backend/result/migrations/0002_data_migration.py index d89e5b517..f2ca60ff6 100644 --- a/backend/result/migrations/0002_data_migration.py +++ b/backend/result/migrations/0002_data_migration.py @@ -5,6 +5,7 @@ logger = logging.getLogger(__name__) + def populate_results(apps, schema_editor): ExperimentResult = apps.get_model('experiment', 'Result') Profile = apps.get_model('experiment', 'Profile') @@ -44,6 +45,7 @@ def populate_results(apps, schema_editor): OldParticipant = apps.get_model('experiment', 'Participant') OldParticipant.objects.all().delete() + def backwards_populate_results(apps, schema_editor): ExperimentResult = apps.get_model('experiment', 'Result') Profile = apps.get_model('experiment', 'Profile') @@ -82,12 +84,14 @@ def backwards_populate_results(apps, schema_editor): OldParticipant = apps.get_model('participant', 'Participant') OldParticipant.objects.all().delete() + def attempt_set_section(new_result, result): try: new_result.section = result.section except: logging.warning('result {} could not set section {}'.format(new_result.id, result.section.id)) + def get_or_create_participant(participant, apps, app_name='participant'): Participant = apps.get_model(app_name, 'Participant') try: @@ -103,6 +107,7 @@ def get_or_create_participant(participant, apps, app_name='participant'): new_participant.save() return new_participant + def get_or_create_session(session, new_participant, apps, app_name='session'): Session = apps.get_model(app_name, 'Session') try: diff --git a/backend/result/migrations/0004_migrate_json_data_to_JSONField.py b/backend/result/migrations/0004_migrate_json_data_to_JSONField.py index e330970d7..6d123752f 100644 --- a/backend/result/migrations/0004_migrate_json_data_to_JSONField.py +++ b/backend/result/migrations/0004_migrate_json_data_to_JSONField.py @@ -3,6 +3,7 @@ from django.db import migrations import json + def forwards_func(apps, schema_editor): Result = apps.get_model('result', 'Result') for result in Result.objects.all(): @@ -11,12 +12,14 @@ def forwards_func(apps, schema_editor): result.json_temp[key] = value result.save() + def reverse_func(apps, schema_editor): Result = apps.get_model('result', 'Result') for result in Result.objects.all(): result.json_data = json.dumps(result.json_temp) result.save() + class Migration(migrations.Migration): dependencies = [('result', '0003_result_json_temp'),] diff --git a/backend/result/models.py b/backend/result/models.py index dd3b03727..240112fc0 100644 --- a/backend/result/models.py +++ b/backend/result/models.py @@ -5,6 +5,7 @@ from django.core.exceptions import ValidationError + # Create your models here. class Result(models.Model): """Score for each step in a session""" diff --git a/backend/result/score.py b/backend/result/score.py index 6fca9dfc7..a1f528f5f 100644 --- a/backend/result/score.py +++ b/backend/result/score.py @@ -5,6 +5,7 @@ logger = logging.getLogger(__name__) + def check_expected_response(result): try: return result.expected_response @@ -12,6 +13,7 @@ def check_expected_response(result): logger.log(e) return None + def correctness_score(result, data): expected_response = check_expected_response(result) if expected_response and expected_response == result.given_response: @@ -19,22 +21,27 @@ def correctness_score(result, data): else: return 0 + def boolean_score(result, data): if result.given_response == 'yes': return 1 else: return 0 + def likert_score(result, data): return int(data['value']) + def reverse_likert_score(result, data): return int(data['scale_steps']) + 1 - int(data['value']) + def categories_likert_score(result, data): choices = list(data['choices'].keys()) return choices.index(data['value']) + 1 + def reaction_time_score(result, data): expected_response = check_expected_response(result) json_data = result.load_json_data() @@ -45,6 +52,7 @@ def reaction_time_score(result, data): return math.ceil(timeout - time) else: return math.floor(-time) + def song_sync_recognition_score(result, data): if result.given_response == 'TIMEOUT' or result.given_response == 'no': @@ -54,7 +62,8 @@ def song_sync_recognition_score(result, data): time = json_data.get('decision_time') timeout = json_data.get('config').get('response_time') return math.ceil(timeout - time) - + + def song_sync_continuation_score(result, data): ''' modify previous result and return None''' previous_result = result.session.get_previous_result(['recognize']) @@ -63,6 +72,7 @@ def song_sync_continuation_score(result, data): previous_result.save() return None + SCORING_RULES = { 'BOOLEAN': boolean_score, 'CORRECTNESS': correctness_score, diff --git a/backend/result/tests/test_result.py b/backend/result/tests/test_result.py index ab579e4c2..bd6784e7c 100644 --- a/backend/result/tests/test_result.py +++ b/backend/result/tests/test_result.py @@ -5,6 +5,7 @@ from result.models import Result from session.models import Session + class ResultTest(TestCase): @classmethod diff --git a/backend/result/tests/test_views.py b/backend/result/tests/test_views.py index b0ed4832e..f5d0454d6 100644 --- a/backend/result/tests/test_views.py +++ b/backend/result/tests/test_views.py @@ -10,6 +10,7 @@ from result.utils import handle_results + class ResultTest(TestCase): @classmethod @@ -27,11 +28,11 @@ def setUp(self): session = self.client.session session['participant_id'] = self.participant.id session.save() - + def test_get(self): response = self.client.get('/result/speed_swallow/') assert response.status_code == 204 - + def test_create(self): result = Result.objects.create( question_key="speed_swallow", @@ -53,10 +54,10 @@ def test_create(self): assert response.status_code == 200 assert Result.objects.count() == 1 response = self.client.get('/result/speed_swallow/') - assert json.loads(response.content).get('answer') != None + assert json.loads(response.content).get('answer') is not None response = self.client.post('/result/score/', request) assert Result.objects.count() == 1 - + def test_handle_results_with_form(self): result1 = Result.objects.create( session=self.session @@ -74,9 +75,10 @@ def test_handle_results_with_form(self): handle_results(data, self.session) assert self.session.result_count() == 2 json_data = self.session.result_set.first().json_data - assert json_data.get('config') != None + assert json_data.get('config') is not None assert json_data.get('decision_time') == 42 + class ScoringTest(TestCase): @classmethod @@ -101,7 +103,7 @@ def setUpTestData(cls): participant=cls.participant, playlist=playlist ) - + def likert_request(self, rule, value, profile=False): result = Result.objects.create( question_key="test", @@ -119,7 +121,7 @@ def likert_request(self, rule, value, profile=False): }] } return self.make_request(action) - + def choice_request(self): result = Result.objects.create( session=self.session, @@ -145,8 +147,8 @@ def choice_request(self): ], } return self.make_request(view) - - def correctness_request(self, value): + + def correctness_request(self, value): result = Result.objects.create( session = self.session, section = self.section, @@ -180,7 +182,7 @@ def song_sync_recognize_request(self, result_type): ] } return self.make_request(view) - + def song_sync_continue_request(self, result_type): result = Result.objects.create( question_key='correct_place', @@ -199,7 +201,7 @@ def song_sync_continue_request(self, result_type): ] } return self.make_request(view) - + def make_request(self, view): """ set up the Django session data, return a request wrapping the view and id of the custom Session object """ @@ -211,34 +213,34 @@ def make_request(self, view): "session_id": session_id, "json_data": json.dumps(view) } - + def test_likert_score(self): client_request = self.likert_request('LIKERT', 2) response = self.client.post('/result/score/', client_request) assert response.status_code == 200 assert self.session.result_set.count() == 1 assert self.session.result_set.last().score == 2 - + def test_likert_reversed(self): client_request = self.likert_request('REVERSE_LIKERT', 2) response = self.client.post('/result/score/', client_request) assert response.status_code == 200 assert self.session.result_set.count() == 1 assert self.session.result_set.last().score == 6 - + def test_likert_profile(self): client_request = self.likert_request('LIKERT', 6, True) response = self.client.post('/result/score/', client_request) assert response.status_code == 200 assert self.session.result_set.count() == 1 assert self.session.result_set.last().score == 6 - + def test_categories_to_likert(self): client_request = self.choice_request() response = self.client.post('/result/score/', client_request) assert response.status_code == 200 assert self.session.result_set.last().score == 2 - + def test_correctness(self): client_request = self.correctness_request('spam') response = self.client.post('/result/score/', client_request) @@ -249,7 +251,7 @@ def test_correctness(self): assert response.status_code == 200 assert self.session.result_set.count() == 2 assert self.session.result_set.last().score == 0 - + def test_song_sync(self): client_request = self.song_sync_recognize_request("TIMEOUT") response = self.client.post('/result/score/', client_request) diff --git a/backend/result/urls.py b/backend/result/urls.py index d989560ec..6eb92176a 100644 --- a/backend/result/urls.py +++ b/backend/result/urls.py @@ -1,6 +1,6 @@ from django.urls import path -from result.views import current_profile, consent, get_result, score +from result.views import current_profile, consent, get_result, intermediate_score, score app_name = 'result' @@ -9,6 +9,8 @@ name='current_profile'), path('score/', score, name='result_score'), + path('intermediate_score/', intermediate_score, + name='intermediate_score'), path('consent/', consent, name='register_consent'), path('
+ Export to CSV
+
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/backend/section/tests.py b/backend/section/tests.py
index 8b9887572..350d8dbdf 100644
--- a/backend/section/tests.py
+++ b/backend/section/tests.py
@@ -1,7 +1,11 @@
+from typing import Any
from django.test import Client, TestCase
from django.contrib.admin.sites import AdminSite
+from django.core.files.uploadedfile import SimpleUploadedFile
+from django.urls import reverse
from section.admin import PlaylistAdmin
from section.models import Playlist, Section, Song
+from section.forms import PlaylistAdminForm
class PlaylistModelTest(TestCase):
@@ -20,30 +24,30 @@ def test_update_sections_csv_empty(self):
def test_update_sections_invalid_row_length(self):
playlist = Playlist.objects.get(name='TestPlaylist')
# Third row invalid, len < 8
- playlist.csv = ("Måneskin,Zitti e buoni,0.0,10.0,bat/maneskin.mp3,0,0,0\n"
- "Duncan Laurence,Arcade,0.0,10.0,bat/laurence.mp3,0,0,0\n"
- "Netta,Toy,0.0,10.0,0,0,0\n"
- "Salvador Sobral,Amar pelos dois,0.0,10.0,bat/sobral.mp3,0,0,0\n")
+ playlist.csv = ("Måneskin,Zitti e buoni,0.0,10.0,bat/maneskin.mp3,0,0\n"
+ "Duncan Laurence,Arcade,0.0,10.0,bat/laurence.mp3,0,0\n"
+ "Netta,Toy,0.0,10.0,0,0\n"
+ "Salvador Sobral,Amar pelos dois,0.0,10.0,bat/sobral.mp3,0,0\n")
s = playlist.update_sections()
self.assertEqual(s['status'], playlist.CSV_ERROR)
def test_update_sections_not_number(self):
playlist = Playlist.objects.get(name='TestPlaylist')
- # Third row string is not a number
- playlist.csv = ("Måneskin,Zitti e buoni,0.0,10.0,bat/maneskin.mp3,0,0,0\n"
- "Duncan Laurence,Arcade,0.0,10.0,bat/laurence.mp3,0,0,0\n"
+ # Third row string is not a number
+ playlist.csv = ("Måneskin,Zitti e buoni,0.0,10.0,bat/maneskin.mp3,0,0\n"
+ "Duncan Laurence,Arcade,0.0,10.0,bat/laurence.mp3,0,0\n"
"Netta,Toy,string,string,bat/netta.mp3,string,tag,group\n"
- "Salvador Sobral,Amar pelos dois,0.0,10.0,bat/sobral.mp3,0,0,0\n")
+ "Salvador Sobral,Amar pelos dois,0.0,10.0,bat/sobral.mp3,0,0\n")
s = playlist.update_sections()
self.assertEqual(s['status'], playlist.CSV_ERROR)
-
+
def test_get_section(self):
playlist = Playlist.objects.get(name='TestPlaylist')
playlist.csv = (
- "Weird Al,Eat It,0.0,10.0,some/file.mp3,0,tag1,0\n"
- "Weird Al,Eat It,10.0,20.0,some/file.mp3,0,tag2,0\n"
- "Weird Al,Like a Surgeon,0.0,10.0,some/otherfile.mp3,0,tag1,0\n"
- "Weird Al,Like a Surgeon,10.0,20.0,some/otherfile.mp3,0,tag2,0\n"
+ "Weird Al,Eat It,0.0,10.0,some/file.mp3,tag1,0\n"
+ "Weird Al,Eat It,10.0,20.0,some/file.mp3,tag2,0\n"
+ "Weird Al,Like a Surgeon,0.0,10.0,some/otherfile.mp3,tag1,0\n"
+ "Weird Al,Like a Surgeon,10.0,20.0,some/otherfile.mp3,tag2,0\n"
)
playlist.update_sections()
assert Song.objects.count() == 2
@@ -57,11 +61,11 @@ def test_get_section(self):
assert section.tag == 'tag2' and section.song.id == song2.id
def test_valid_csv(self):
- playlist = Playlist.objects.get(name='TestPlaylist')
- playlist.csv = ("Måneskin,Zitti e buoni,0.0,10.0,bat/maneskin.mp3,0,0,0\n"
- "Duncan Laurence,Arcade,0.0,10.0,bat/laurence.mp3,0,1,2\n"
- "Netta,Toy,0.0,10.0,bat/netta.mp3,1,tag,group\n"
- "Salvador Sobral,Amar pelos dois,0.0,10.0,bat/sobral.mp3,1,0,0\n")
+ playlist = Playlist.objects.get(name='TestPlaylist')
+ playlist.csv = ("Måneskin,Zitti e buoni,0.0,10.0,bat/maneskin.mp3,0,0\n"
+ "Duncan Laurence,Arcade,0.0,10.0,bat/laurence.mp3,1,2\n"
+ "Netta,Toy,0.0,10.0,bat/netta.mp3,tag,group\n"
+ "Salvador Sobral,Amar pelos dois,0.0,10.0,bat/sobral.mp3,0,0\n")
s = playlist.update_sections()
self.assertEqual(s['status'], playlist.CSV_OK)
sections = playlist.section_set.all()
@@ -72,7 +76,6 @@ def test_valid_csv(self):
self.assertEqual(sections[2].start_time, 0.0)
self.assertEqual(sections[2].duration, 10.0)
self.assertEqual(sections[2].filename,"bat/netta.mp3")
- self.assertEqual(sections[2].song.restricted, [{"restricted": "nl"}])
self.assertEqual(sections[2].tag, "tag")
self.assertEqual(sections[2].group, "group")
@@ -81,24 +84,24 @@ def test_valid_csv(self):
self.assertEqual(sections[3].start_time, 0.0)
self.assertEqual(sections[3].duration, 10.0)
self.assertEqual(sections[3].filename,"bat/sobral.mp3")
- self.assertEqual(sections[3].song.restricted, [{"restricted": "nl"}])
self.assertEqual(sections[3].tag, "0")
self.assertEqual(sections[3].group, '0')
-
+
+
class MockRequest:
pass
+
this_playlist_admin = PlaylistAdmin(
model=Playlist, admin_site=AdminSite)
-class TestAmdinEditSection(TestCase):
+
+class TestAdminEditSection(TestCase):
@classmethod
def setUpTestData(cls):
cls.playlist = Playlist.objects.create()
- cls.song = Song.objects.create(artist='default',
- name='default',
- restricted= [{"restricted": "nl"}])
+ cls.song = Song.objects.create(artist='default', name='default')
Section.objects.create(playlist=cls.playlist,
song=cls.song)
@@ -106,15 +109,16 @@ def test_edit_sections(self):
request = MockRequest()
this_section = Section.objects.first()
pre_fix = str(this_section.id)
- request.POST = {'_update': '',
- pre_fix + '_artist': 'edited',
- pre_fix + '_name': 'edited',
- pre_fix + '_start_time': '1.1',
- pre_fix + '_duration': '1.1',
- pre_fix + '_tag': 'edited',
- pre_fix + '_group': 'edited',
- pre_fix + '_restricted': '0'}
- this_playlist = Playlist.objects.first()
+ request.POST = {
+ '_update': '',
+ pre_fix + '_artist': 'edited',
+ pre_fix + '_name': 'edited',
+ pre_fix + '_start_time': '1.1',
+ pre_fix + '_duration': '1.1',
+ pre_fix + '_tag': 'edited',
+ pre_fix + '_group': 'edited',
+ }
+ this_playlist = Playlist.objects.first()
response = this_playlist_admin.edit_sections(request, this_playlist)
edit_section = Section.objects.first()
self.assertEqual(edit_section.song.artist, 'edited')
@@ -123,6 +127,62 @@ def test_edit_sections(self):
self.assertEqual(edit_section.duration, 1.1)
self.assertEqual(edit_section.tag, 'edited')
self.assertEqual(edit_section.group, 'edited')
- self.assertEqual(edit_section.song.restricted, [])
self.assertEqual(response.status_code, 302)
-
\ No newline at end of file
+
+
+class PlaylistAdminTest(TestCase):
+ def setUp(self):
+ self.playlist = Playlist.objects.create(name="Test Playlist")
+ self.client = Client()
+ self.playlist_admin = PlaylistAdmin(model=Playlist, admin_site=AdminSite())
+
+ def test_export_csv(self):
+ url = reverse('admin:section_playlist_export_csv', args=[self.playlist.pk])
+ response = self.client.get(url)
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(response['Content-Type'], 'text/csv')
+
+
+class PlaylistAdminFormTest(TestCase):
+
+ def setUp(self):
+ self.csv_content = b'The Beatles, A day in the life,1.0,1.0,https://example.com/the-beatles/a-day-in-the-life.mp3,0,band,9\nGustav Mahler, Symphony No. 5,2.0,2.0,https://example.com/gustav-mahler/symphony-no-5.mp3,0,composer,5\nDjango Reinhardt, Minor Swing,3.0,3.0,https://example.com/django-reinhardt/minor-swing.mp3,0,artist,3\n'
+
+ def test_csv_file_upload(self):
+ uploaded_file = SimpleUploadedFile('test.csv', self.csv_content, content_type='text/csv')
+
+ form_data = {'name': 'Test Playlist', 'process_csv': True}
+ file_data = {'csv_file': uploaded_file}
+
+ form = PlaylistAdminForm(data=form_data, files=file_data)
+
+ self.assertTrue(form.is_valid())
+
+ playlist = form.save()
+
+ self.assertEqual(playlist.csv, self.csv_content.decode('utf-8'))
+
+ def test_csv_text_input(self):
+ form_data = {'name': 'Test Playlist', 'process_csv': True, 'csv': self.csv_content.decode('utf-8')}
+
+ form = PlaylistAdminForm(data=form_data)
+
+ self.assertTrue(form.is_valid())
+
+ playlist = form.save()
+
+ self.assertEqual(playlist.csv.strip(), self.csv_content.decode('utf-8').strip())
+
+ def test_should_not_process_csv(self):
+ uploaded_file = SimpleUploadedFile('test.csv', self.csv_content, content_type='text/csv')
+
+ form_data = {'name': 'Test Playlist', 'process_csv': False}
+ file_data = {'csv_file': uploaded_file}
+
+ form = PlaylistAdminForm(data=form_data, files=file_data)
+
+ self.assertTrue(form.is_valid())
+
+ playlist = form.save()
+
+ self.assertEqual(playlist.csv, '')
diff --git a/backend/section/urls.py b/backend/section/urls.py
index 0de24999f..a2d0947b2 100644
--- a/backend/section/urls.py
+++ b/backend/section/urls.py
@@ -5,7 +5,7 @@
app_name = 'section'
urlpatterns = [
-# Section
+ # Section
path('Error: {error}
; + } + return (
+
{
? "experiment-" + experiment.slug
: ""
)}
+ data-testid="experiment-wrapper"
>
- {(!loadingExperiment && experiment) || key === "ERROR" ? (
+ {(!loadingExperiment && experiment) || view === "ERROR" ? (
- {render(state.view)}
+ {render(view)}
+
+ {experiment?.feedback_info?.show_float_button && (
+
+
+ )}
) : (
);
diff --git a/frontend/src/components/Experiment/Experiment.test.js b/frontend/src/components/Experiment/Experiment.test.js
new file mode 100644
index 000000000..728fe5ffc
--- /dev/null
+++ b/frontend/src/components/Experiment/Experiment.test.js
@@ -0,0 +1,44 @@
+import React from 'react';
+import { MemoryRouter } from 'react-router-dom';
+import { fireEvent, render, screen } from '@testing-library/react';
+
+import Experiment from './Experiment';
+
+jest.mock("../../util/stores");
+
+// need to define the returned objects, otherwise the mocked function
+// creates a different object every time, causing useEffect to trigger unnecessarily
+const experimentObj = {
+ id: 24, slug: 'test', name: 'Test', playlists: [{id: 42, name: 'TestPlaylist'}],
+ next_round: [{view: 'INFO', button_label: 'Continue'}]
+};
+const sessionObj = {data: {session: {id: 1}}};
+const nextRoundObj = {next_round: [{view: 'EXPLAINER'}]};
+
+jest.mock("../../API", () => ({
+ useExperiment: () => {
+
+ return [experimentObj, false]
+ },
+ createSession: () => Promise.resolve(sessionObj),
+ getNextRound: () => Promise.resolve(nextRoundObj)
+}));
+
+describe('Experiment Component', () => {
+
+ xit('renders with given props', async () => {
+ /**
+ * render is caught in an endless useEffect loop now
+ * skipping for the time being
+ */
+ render(
+
+
+ );
+ await screen.findByTestId('experiment-wrapper');
+ expect(screen.getByText('Continue')).toBeInTheDocument();
+
+ });
+
+});
\ No newline at end of file
diff --git a/frontend/src/components/Explainer/Explainer.js b/frontend/src/components/Explainer/Explainer.js
index b35d020c5..bd24d8c1c 100644
--- a/frontend/src/components/Explainer/Explainer.js
+++ b/frontend/src/components/Explainer/Explainer.js
@@ -3,17 +3,17 @@ import Button from "../Button/Button";
// Explainer is an experiment view that shows a list of steps
// If the button has not been clicked, onNext will be called automatically after the timer expires (in milliseconds). If timer == null, onNext will only be called after the button is clicked.
-const Explainer = ({ instruction, button_label, steps = [], onNext, timer }) => {
+const Explainer = ({ instruction, button_label, steps = [], timer = null, onNext }) => {
useEffect( () => {
if (timer != null) {
const id = setTimeout(onNext, timer);
return () => {clearTimeout(id)}; // if button has been clicked, clear timeout
}
- })
+ }, [onNext, timer])
return (
-
{title}
diff --git a/frontend/src/components/Consent/Consent.test.js b/frontend/src/components/Consent/Consent.test.js index 347c602d0..46598f878 100644 --- a/frontend/src/components/Consent/Consent.test.js +++ b/frontend/src/components/Consent/Consent.test.js @@ -58,7 +58,7 @@ describe('Consent', () => { it('auto advances if consent is already given', () => { useConsent.mockReturnValue([true, false]); const onNext = jest.fn(); - render(Error: {state.error}
;
case "CONSENT":
return Error: No valid state
;
+ setError('No valid state');
}
- let key = state.view;
+ const view = state.view;
- // Force view refresh for consecutive questions
- if (state.view === "QUESTION") {
- key = state.question.key;
- }
return (
+
{instruction}
-
diff --git a/frontend/src/components/Explainer/Explainer.test.js b/frontend/src/components/Explainer/Explainer.test.js
new file mode 100644
index 000000000..636c519fb
--- /dev/null
+++ b/frontend/src/components/Explainer/Explainer.test.js
@@ -0,0 +1,25 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+
+import Explainer from './Explainer';
+
+describe('Explainer Component', () => {
+ const props = {
+ instruction: 'Some instruction',
+ button_label: 'Next',
+ steps: [],
+ onNext: jest.fn(),
+ timer: 1
+ }
+
+ it('renders with given props', () => {
+
+ render(
+
- {
onClick(playlist.id);
}}
diff --git a/frontend/src/components/Playlist/Playlist.test.js b/frontend/src/components/Playlist/Playlist.test.js
new file mode 100644
index 000000000..8b472cbd8
--- /dev/null
+++ b/frontend/src/components/Playlist/Playlist.test.js
@@ -0,0 +1,38 @@
+import React from 'react';
+import { fireEvent, render, screen } from '@testing-library/react';
+
+import Playlist from './Playlist';
+
+jest.mock("../../util/stores");
+
+describe('Playlist Component', () => {
+ const playlist = { current: 25 };
+ const experimentProp = { slug: 'test-experiment', playlists: [{id: 42}, {id: 43}] };
+ const onNext = jest.fn();
+
+ it('renders correctly with given props', () => {
+ render(
+
+ ) + expect(screen.getByTestId('playlist-instruction')).toBeInTheDocument(); + const playlistItems = screen.getAllByTestId('playlist-item'); + expect(playlistItems.length === 2); + }); + + it('calls registerPlaylist when playlist item is clicked', () => { + render( + + ) + fireEvent.click(screen.getAllByTestId('playlist-item')[0]); + expect((onNext).toHaveBeenCalled); + }) + + it('does not render with less than 2 playlists', () => { + experimentProp.playlists = [{id: 42}] + render( + + ) + expect((onNext).toHaveBeenCalled); + expect(screen.queryByTestId('playlist-instruction')).not.toBeInTheDocument(); + }); +}); \ No newline at end of file diff --git a/frontend/src/components/Preload/Preload.js b/frontend/src/components/Preload/Preload.js index 7a28ee7d9..eb3fa258b 100644 --- a/frontend/src/components/Preload/Preload.js +++ b/frontend/src/components/Preload/Preload.js @@ -1,75 +1,86 @@ -import React, { useEffect, useRef, useState } from "react"; +import React, { useEffect, useState } from "react"; +import classNames from "classnames"; +import { MEDIA_ROOT } from "../../config"; import ListenFeedback from "../Listen/ListenFeedback"; import CountDown from "../CountDown/CountDown"; import * as audio from "../../util/audio"; import * as webAudio from "../../util/webAudio"; -import { MEDIA_ROOT } from "../../config"; -import classNames from "classnames"; // Preload is an experiment screen that continues after a given time or after an audio file has been preloaded -const Preload = ({ instruction, pageTitle, duration, sections, playConfig, onNext }) => { - const timeHasPassed = useRef(false); - const audioIsAvailable = useRef(false); - const [loaderDuration, setLoaderDuration] = useState(duration); +const Preload = ({ sections, playMethod, duration, preloadMessage, pageTitle, onNext }) => { + const [timePassed, setTimePassed] = useState(false); + const [audioAvailable, setAudioAvailable] = useState(false); const [overtime, setOvertime] = useState(false); + const [loaderDuration, setLoaderDuration] = useState(duration); const onTimePassed = () => { - timeHasPassed.current = true; + setTimePassed(true) setLoaderDuration(0); setOvertime(true); - if (audioIsAvailable.current) { + if (audioAvailable) { onNext(); } }; // Audio preloader - useEffect(() => { - if (playConfig.play_method === 'BUFFER') { + useEffect(() => { + const preloadResources = async () => { + if (playMethod === 'NOAUDIO') { - // Use Web-audio and preload sections in buffers - sections.map((section, index) => { - // skip Preload if the section has already been loaded in the previous action - if (webAudio.checkSectionLoaded(section)) { - onNext(); - return undefined; - } - // Clear buffers if this is the first section - if (index === 0) { - webAudio.clearBuffers(); - } - - // Load sections in buffer - return webAudio.loadBuffer(section.id, section.url, () => { - if (index === (sections.length - 1)) { - audioIsAvailable.current = true; - if (timeHasPassed.current) { - onNext(); - } - } - }); - }) - } else { - if (playConfig.play_method === 'EXTERNAL') { - webAudio.closeWebAudio(); + await Promise.all(sections.map((section) => fetch(MEDIA_ROOT + section.url))); + + return onNext(); } - // Load audio until available - // Return remove listener - return audio.loadUntilAvailable(MEDIA_ROOT + sections[0].url, () => { - audioIsAvailable.current = true; - if (timeHasPassed.current) { - onNext(); + + if (playMethod === 'BUFFER') { + + // Use Web-audio and preload sections in buffers + sections.map((section, index) => { + // skip Preload if the section has already been loaded in the previous action + if (webAudio.checkSectionLoaded(section)) { + onNext(); + return undefined; + } + // Clear buffers if this is the first section + if (index === 0) { + webAudio.clearBuffers(); + } + + // Load sections in buffer + return webAudio.loadBuffer(section.id, section.url, () => { + if (index === (sections.length - 1)) { + setAudioAvailable(true); + if (timePassed) { + onNext(); + } + } + }); + }) + } else { + if (playMethod === 'EXTERNAL') { + webAudio.closeWebAudio(); } - }); - } - }, [sections, onNext]); + // Load audio until available + // Return remove listener + return audio.loadUntilAvailable(sections[0].url, () => { + setAudioAvailable(true); + if (timePassed) { + onNext(); + } + }); + } + } + + preloadResources(); + }, [sections, playMethod, onNext, timePassed]); return ( = 1 && } /> diff --git a/frontend/src/components/Question/_ButtonArray.js b/frontend/src/components/Question/_ButtonArray.js index 61e5e9659..f5f787e7f 100644 --- a/frontend/src/components/Question/_ButtonArray.js +++ b/frontend/src/components/Question/_ButtonArray.js @@ -4,7 +4,7 @@ import classNames from "classnames"; import { renderLabel } from "../../util/label"; // ButtonArray is a question view for selecting a single option from a list of buttons -const ButtonArray = ({ question, disabled, onChange }) => { +const ButtonArray = ({ question, disabled, onChange, value }) => { const buttonPress = (value) => { if (disabled) { @@ -15,7 +15,6 @@ const ButtonArray = ({ question, disabled, onChange }) => { } } - return ( @@ -29,6 +28,7 @@ const ButtonArray = ({ question, disabled, onChange }) => { key={question.key + index} onChange={buttonPress} disabled={disabled} + checked={value === val} /> ))}@@ -36,11 +36,12 @@ const ButtonArray = ({ question, disabled, onChange }) => { ) } -const ToggleButton = ({ label, value, index, name, disabled, onChange }) => { +const ToggleButton = ({ label, value, index, name, disabled, onChange, checked }) => { const disabledClasses = disabled ? 'disabled' : ''; + const checkedClasses = checked ? 'checked' : ''; return ( ) diff --git a/frontend/src/components/Question/_ButtonArray.scss b/frontend/src/components/Question/_ButtonArray.scss index 34d86fb13..84c560ffc 100644 --- a/frontend/src/components/Question/_ButtonArray.scss +++ b/frontend/src/components/Question/_ButtonArray.scss @@ -31,10 +31,14 @@ } &.invisible-text { - .btn.btn-secondary:not(.disabled):not(:disabled) { + .btn.btn-secondary { color: transparent; width: 4rem; height: 4rem; + + &:hover { + color: transparent; + } } } } diff --git a/frontend/src/components/Question/_ButtonArray.test.js b/frontend/src/components/Question/_ButtonArray.test.js new file mode 100644 index 000000000..19037680a --- /dev/null +++ b/frontend/src/components/Question/_ButtonArray.test.js @@ -0,0 +1,66 @@ +import React from 'react'; +import { render, fireEvent } from '@testing-library/react'; +import ButtonArray from './_ButtonArray'; + +const getProps = (overrides = {}) => ({ + question: { + "key": "know_song", + "view": "BUTTON_ARRAY", + "explainer": "", + "question": "1. Do you know this song?", + "result_id": 12345, + "is_skippable": false, + "submits": false, + "style": "boolean", + "choices": { + "yes": "Yes", + "unsure": "Unsure", + "no": "No" + }, + "min_values": 1, + }, + disabled: false, + onChange: jest.fn(), + value: null, + ...overrides, +}); + +describe('ButtonArray', () => { + it('adds the "checked" class to a button when it is selected', () => { + const props = getProps({ value: 'yes' }); + const { getByText } = render(); + + const button = getByText('Yes'); + + expect(button).toHaveClass('checked'); + }); + + it('does not add the "checked" class to a button when it is not selected', () => { + const props = getProps({ value: 'yes' }); + const { getByText } = render( ); + + const button = getByText('Unsure'); + + expect(button).not.toHaveClass('checked'); + }); + + it('calls the onChange function when a button is clicked', () => { + const props = getProps(); + const { getByText } = render( ); + + const button = getByText('Yes'); + fireEvent.click(button); + + expect(props.onChange).toHaveBeenCalledWith('yes'); + }); + + it('does not call the onChange function when a disabled button is clicked', () => { + const props = getProps({ disabled: true }); + const { getByText } = render( ); + + const button = getByText('Yes'); + fireEvent.click(button); + + expect(props.onChange).not.toHaveBeenCalled(); + }); +}); diff --git a/frontend/src/components/StartSession/StartSession.js b/frontend/src/components/StartSession/StartSession.js deleted file mode 100644 index 20704d5b3..000000000 --- a/frontend/src/components/StartSession/StartSession.js +++ /dev/null @@ -1,42 +0,0 @@ -import React, { useEffect } from "react"; -import { createSession } from "../../API.js"; -import Loading from "../Loading/Loading"; - -// StartSession is an experiment view that handles the creation of an experiment session -// - It only shows a loader screen while the session is created -// - This view is requird in every experiment as it created the session that is used for storing results -const StartSession = ({ - experiment, - participant, - playlist, - setError, - session, - onNext, -}) => { - // Create a new session, and set state to next_round - useEffect(() => { - const init = async () => { - const data = await createSession({ - experiment, - participant, - playlist, - }); - - if (!data) { - setError("Could not create a session"); - return; - } - - // Store session - session.current = data.session; - - onNext(); - - }; - init(); - }, [experiment, participant, playlist, session, setError, onNext]); - - return ; -}; - -export default StartSession; diff --git a/frontend/src/components/StoreProfile/StoreProfile.js b/frontend/src/components/StoreProfile/StoreProfile.js index 8980b00c9..3c0297b76 100644 --- a/frontend/src/components/StoreProfile/StoreProfile.js +++ b/frontend/src/components/StoreProfile/StoreProfile.js @@ -3,7 +3,8 @@ import classNames from "classnames"; import { Link, withRouter } from "react-router-dom"; import * as EmailValidator from "email-validator"; import { URLS } from "../../config"; -import { shareParticipant, useParticipant } from "../../API"; +import useBoundStore from "../../util/stores"; +import { shareParticipant} from "../../API"; import DefaultPage from "../Page/DefaultPage"; import Loading from "../Loading/Loading"; @@ -12,7 +13,7 @@ const StoreProfile = ({ history }) => { const [email, setEmail] = useState(""); const validEmail = email && EmailValidator.validate(email); - const [participant, loadingParticipant] = useParticipant(); + const participant = useBoundStore((state) => state.participant); const sendLink = async () => { if (validEmail) { @@ -28,7 +29,7 @@ const StoreProfile = ({ history }) => { } }; - if (loadingParticipant) { + if (!participant) { return ; } diff --git a/frontend/src/components/Trial/Trial.js b/frontend/src/components/Trial/Trial.js index 742d5379c..546b3157d 100644 --- a/frontend/src/components/Trial/Trial.js +++ b/frontend/src/components/Trial/Trial.js @@ -23,7 +23,7 @@ const Trial = ({ }) => { // Main component state const [formActive, setFormActive] = useState(!config.listen_first); - const [preloadReady, setPreloadReady] = useState(!playback?.play_config?.ready_time); + const [preloadReady, setPreloadReady] = useState(!(playback?.ready_time)); const submitted = useRef(false); @@ -50,7 +50,7 @@ const Trial = ({ } if (feedback_form) { - + if (feedback_form.is_skippable) { form.map((formElement => (formElement.value = formElement.value || ''))) } @@ -81,7 +81,7 @@ const Trial = ({ } }, - [feedback_form, config, onNext, onResult] + [feedback_form, config, onNext, onResult, result_id] ); const checkBreakRound = (values, breakConditions) => { @@ -108,8 +108,8 @@ const Trial = ({ if (config.auto_advance) { // Create a time_passed result - if (config.auto_advance_timer != null) { - if (playback.player_type === 'BUTTON') { + if (config.auto_advance_timer != null) { + if (playback.view === 'BUTTON') { startTime.current = getCurrentTime(); } @@ -126,21 +126,16 @@ const Trial = ({ return; }, [config, playback, makeResult]); - return ( {playback && ({ setPreloadReady(true); }} - preloadMessage={playback.preload_message} autoAdvance={config.auto_advance} responseTime={config.response_time} - playConfig={playback.play_config} - sections={playback.sections} submitResult={makeResult} startedPlaying={startTimer} finishedPlaying={finishedPlaying} diff --git a/frontend/src/components/Trial/Trial.spec.js b/frontend/src/components/Trial/Trial.test.js similarity index 96% rename from frontend/src/components/Trial/Trial.spec.js rename to frontend/src/components/Trial/Trial.test.js index 26f41c6ca..a960fb44d 100644 --- a/frontend/src/components/Trial/Trial.spec.js +++ b/frontend/src/components/Trial/Trial.test.js @@ -3,6 +3,8 @@ import { render, screen } from '@testing-library/react'; import Trial from "./Trial"; +jest.mock("../../util/stores"); + const feedback_form = { form: [{ key: 'test_question', diff --git a/frontend/src/components/UserFeedback/UserFeedback.js b/frontend/src/components/UserFeedback/UserFeedback.js index 0d2fc4227..0431fcdae 100644 --- a/frontend/src/components/UserFeedback/UserFeedback.js +++ b/frontend/src/components/UserFeedback/UserFeedback.js @@ -3,8 +3,9 @@ import React, { useState} from 'react'; import { postFeedback } from '../../API'; import Button from '../Button/Button'; import HTML from '../HTML/HTML'; +import classNames from 'util/classNames'; -const UserFeedback = ({experimentSlug, participant, feedbackInfo}) => { +const UserFeedback = ({experimentSlug, participant, feedbackInfo, inline = true}) => { const [value, setValue] = useState(''); const [showForm, setShowForm] = useState(true); @@ -22,13 +23,15 @@ const UserFeedback = ({experimentSlug, participant, feedbackInfo}) => { const handleChange = (event) => { setValue(event.target.value); } - + + const orientationClassNames = inline ? '' : 'aha__user-feedback--vertical' + return ( - +{showForm === true ? ({feedbackInfo.header}-+)}; -export default UserFeedback; \ No newline at end of file +export default UserFeedback; diff --git a/frontend/src/components/UserFeedback/UserFeedback.scss b/frontend/src/components/UserFeedback/UserFeedback.scss index 3976b2f68..e9927556a 100644 --- a/frontend/src/components/UserFeedback/UserFeedback.scss +++ b/frontend/src/components/UserFeedback/UserFeedback.scss @@ -1,9 +1,52 @@ +@import '../../scss/variables.scss'; + .aha__user-feedback { * { margin-top: .2rem; } } +.user-feedback__form { + display: flex; + flex-direction: row; + justify-content: center; + gap: 0; + + .aha__user-feedback--vertical & { + display: block; + } +} + + .user-feedback__input { + border: 1px solid #ccc; + border-right: none; + border-radius: 4px; + border-top-right-radius: 0%; + border-bottom-right-radius: 0%; width: 50vw; -} \ No newline at end of file + + .aha__user-feedback--vertical & { + height: 5rem; + width: 100%; + align-items: center; + justify-content: center; + border-top-right-radius: 4px; + border-bottom-right-radius: 4px; + border-right: 1px solid #ccc; + } +} + + +.user-feedback__button { + border-top-left-radius: 0%; + border-bottom-left-radius: 0%; + + .aha__user-feedback--vertical & { + margin-top: .5rem; + border-radius: 4px; + border-top-left-radius: 4px; + border-bottom-left-radius: 4px; + width: 100%; + } +} diff --git a/frontend/src/components/UserFeedback/UserFeedback.test.js b/frontend/src/components/UserFeedback/UserFeedback.test.js new file mode 100644 index 000000000..b9a78f723 --- /dev/null +++ b/frontend/src/components/UserFeedback/UserFeedback.test.js @@ -0,0 +1,74 @@ +import React from 'react'; +import { render, fireEvent, waitFor } from '@testing-library/react'; +import UserFeedback from './UserFeedback'; +import { postFeedback } from '../../API'; + +// Mock the API call +jest.mock('../../API', () => ({ + postFeedback: jest.fn(), +})); + +describe('UserFeedback', () => { + const mockExperimentSlug = 'test-slug'; + const mockParticipant = { id: 1 }; + const mockFeedbackInfo = { + header: 'Your Feedback', + button: 'Submit', + contact_body: 'Contact us at test@example.com', + thank_you: 'Thank you for your feedback!' + }; + + it('renders the feedback form', () => { + const { getByText, getByRole } = render( +@@ -47,4 +50,4 @@ const UserFeedback = ({experimentSlug, participant, feedbackInfo}) => {+ ); + + expect(getByText(mockFeedbackInfo.header)).toBeInTheDocument(); + expect(getByRole('textbox')).toBeInTheDocument(); + expect(getByText(mockFeedbackInfo.button)).toBeInTheDocument(); + }); + + it('allows input to be entered', () => { + const { getByRole } = render( + + ); + + const input = getByRole('textbox'); + fireEvent.change(input, { target: { value: 'Great experience!' } }); + + expect(input.value).toBe('Great experience!'); + }); + + it('submits feedback and shows thank you message', async () => { + postFeedback.mockResolvedValueOnce({}); // Mocking resolved promise + + const { getByText, getByRole, queryByText } = render( + + ); + + fireEvent.change(getByRole('textbox'), { target: { value: 'Great experience!' } }); + fireEvent.click(getByText(mockFeedbackInfo.button)); + + await waitFor(() => { + expect(postFeedback).toHaveBeenCalledWith({ + experimentSlug: mockExperimentSlug, + feedback: 'Great experience!', + participant: mockParticipant + }); + expect(queryByText(mockFeedbackInfo.header)).not.toBeInTheDocument(); + expect(getByText(mockFeedbackInfo.thank_you)).toBeInTheDocument(); + }); + }); +}); diff --git a/frontend/src/components/VisualMatchingPairs/VisualMatchingPairs.js b/frontend/src/components/VisualMatchingPairs/VisualMatchingPairs.js new file mode 100644 index 000000000..0fe5f3316 --- /dev/null +++ b/frontend/src/components/VisualMatchingPairs/VisualMatchingPairs.js @@ -0,0 +1,265 @@ +import React, { useEffect, useState } from "react"; +import classNames from "classnames"; + +import PlayCard from "../PlayButton/PlayCard"; + +const VisualMatchingPairs = (props) => { + + const { + sections, + playerIndex, + finishedPlaying, + setPlayerIndex, + submitResult, + view, + } = props; + + const [gameState, setGameState] = useState(sections); + const [inBetweenTurns, setInBetweenTurns] = useState(false); + const [score, setScore] = useState(null); + const [firstCard, setFirstCard] = useState(-1); + const [secondCard, setSecondCard] = useState(-1); + const [total, setTotal] = useState(100); + const [message, setMessage] = useState('Pick a card') + const [end, setEnd] = useState(false); + const columnCount = gameState.length > 6 ? 4 : 3; + + const [resultBuffer, setResultBuffer] = useState([]); + + const [startTime] = useState(Date.now()); + + const getScoreMessage = (score) => { + switch (score) { + case -10: return '-10
Misremembered'; + case 0: return '0
No match'; + case 10: return '+10
Lucky match'; + case 20: return '+20
Good job!'; + default: return ''; + } + } + + const formatTime = (time) => { + return time / 1000; + } + + // Show (animated) feedback after second click on second card or finished playing + const showFeedback = (firstCard, secondCard, score) => { + + // update total score & display current score + setTotal(total + score); + setMessage(getScoreMessage(score)); + + // show end of turn animations + switch (score) { + case 10: + setGameState(prev => prev.map((section, i) => { + if (i === firstCard || i === secondCard) { + return { ...section, lucky: true }; + } + return section; + })); + + break; + case 20: + setGameState(prev => prev.map((section, i) => { + if (i === firstCard || i === secondCard) { + return { ...section, memory: true }; + } + return section; + })); + break; + default: + setGameState(prev => prev.map((section, i) => { + if (i === firstCard || i === secondCard) { + return { ...section, nomatch: true }; + } + return section; + })); + + // reset nomatch cards for coming turns + setTimeout(() => { + setGameState(prev => prev.map((section, i) => { + if (i === firstCard || i === secondCard) { + return { ...section, nomatch: false }; + } + return section; + })); + }, 700); + break; + } + + // add third click event to finish the turn + setInBetweenTurns(true); + + return; + } + + const checkMatchingPairs = (index) => { + let gameStateCopy = gameState.map(s => ({ ...s })); + const currentCard = gameStateCopy[index]; + const turnedCardsCount = gameStateCopy.filter(s => s.turned).length; + let newScore = 0; + + if (turnedCardsCount === 1) { + // We have two turned cards + gameStateCopy[index].turned = true; + setSecondCard(index); + + // set no mouse events for all but current + gameStateCopy = gameStateCopy.map((section, i) => { + if (i === index) { + return { ...currentCard, noevents: true }; + } + return { ...section, noevents: true }; + }); + + // check for match + const lastCard = gameStateCopy[firstCard]; + if (lastCard.group === currentCard.group) { + // match + if (currentCard.seen) { + newScore = 20; + } else { + newScore = 10; + } + } else { + if (currentCard.seen) { + newScore = -10; + } else { + newScore = 0; + } + }; + gameStateCopy[index].seen = true; + gameStateCopy[firstCard].seen = true; + + setScore(newScore); + setGameState([...gameStateCopy]); + showFeedback(firstCard, index, newScore); + } + + if (turnedCardsCount === 0) { + // first click of the turn + setFirstCard(index); + // turn first card, disable events + gameStateCopy[index] = { + ...currentCard, + turned: true, + noevents: true, + } + + setGameState(gameStateCopy); + + // clear message + setMessage(''); + } + + const newResult = { + selectedSection: currentCard.id, + cardIndex: index, + score: newScore, + timestamp: formatTime(Date.now() - startTime) + } + + setResultBuffer([...resultBuffer, newResult]); + + return; + }; + + const finishTurn = () => { + finishedPlaying(); + // remove matched cards from the board + if (score === 10 || score === 20) { + setGameState(prev => prev.map((section, i) => { + if (i === firstCard || i === secondCard) { + return { ...section, inactive: true }; + } + + return section; + })) + } + setFirstCard(-1); + setSecondCard(-1); + // remove third click event + setScore(null); + // Turn all cards back and enable events + setGameState(prev => prev.map((section, i) => { + return { ...section, turned: false, noevents: false }; + })); + + setMessage(''); + + setInBetweenTurns(false); + } + + useEffect(() => { + const noMoreActiveCards = !gameState.some(s => !s.inactive); + + if (noMoreActiveCards) { + setEnd(true); + } + }, [gameState, setEnd]); + + const registerUserClicks = () => void 0; + + + const onPlayCardClick = (index) => { + setPlayerIndex(-1); + checkMatchingPairs(index); + } + + useEffect(() => { + if (end) { + submitResult({ score: total, moves: resultBuffer }); + } + }, [end, submitResult, total, resultBuffer]); + + const getScoreClasses = (score) => { + switch (score) { + case -10: return 'fbmisremembered'; + case 0: return 'fbnomatch'; + case 10: return 'fblucky'; + case 20: return 'fbmemory'; + default: return ''; + } + } + + return ( ++ ++ ) +} + +export default VisualMatchingPairs; diff --git a/frontend/src/components/VisualMatchingPairs/VisualMatchingPairs.scss b/frontend/src/components/VisualMatchingPairs/VisualMatchingPairs.scss new file mode 100644 index 000000000..4dbe8295c --- /dev/null +++ b/frontend/src/components/VisualMatchingPairs/VisualMatchingPairs.scss @@ -0,0 +1,94 @@ +@import url('https://fonts.googleapis.com/css2?family=Rajdhani&display=swap'); + +@media (min-aspect-ratio: 1/1) { + $card: 16vh; +} + +@media (max-aspect-ratio: 1/1) { + $card: 18vw; +} + +.aha__page .container { + padding-top: 2vh; +} + +.aha__visual-matching-pairs { + position: absolute; + left: 50%; + transform: translateX(-50%); + margin: 0px auto; +} + +@media (min-aspect-ratio: 1/1) { + .playing-board { + grid-template-columns: 16vh 16vh 16vh 16vh; + column-gap: 1.5vh; + row-gap: 1.5vh; + + &.playing-board--three-columns { + grid-template-columns: 16vh 16vh 16vh; + } + } +} + +@media (max-aspect-ratio: 1/1) { + .playing-board { + grid-template-columns: 18vw 18vw 18vw 18vw; + column-gap: 2vw; + row-gap: 2vw; + + &.playing-board--three-columns { + grid-template-columns: 18vw 18vw 18vw; + } + } +} + +.playing-board { + display: inline-grid; + max-width: 100%; +} + +.visual-matching-pairs__feedback, .visual-matching-pairs__score { + font-family: 'Rajdhani', sans-serif; + line-height: 1; + text-align: center; + padding-bottom: .7rem; + font-weight: 700; + font-size: 95%; + width: auto; + + @media(min-width: 900px) { + font-size: 150%; + } +} + +.visual-matching-pairs__feedback { + float: left; + color: white; + + &.fbnomatch { + color: $gray; + } + &.fblucky { + color: $yellow; + } + &.fbmemory { + color: $teal; + } + &.fbmisremembered { + color: $red; + } +} + +.visual-matching-pairs__score { + float: right; +} + +.visual-matching-pairs__overlay { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + z-index: 100; +} diff --git a/frontend/src/components/VisualMatchingPairs/VisualMatchingPairs.test.js b/frontend/src/components/VisualMatchingPairs/VisualMatchingPairs.test.js new file mode 100644 index 000000000..b6966671d --- /dev/null +++ b/frontend/src/components/VisualMatchingPairs/VisualMatchingPairs.test.js @@ -0,0 +1,122 @@ +import React from 'react'; +import { render, fireEvent, waitFor } from '@testing-library/react'; +import VisualMatchingPairs from './VisualMatchingPairs'; // Adjust the import path as necessary + +jest.mock("../../util/stores"); + +// Mock data for sections +const mockSections = [ + { id: 1, content: 'Card 1', url: '/cat-01.jpg', inactive: false, turned: false, noevents: false, seen: false, group: 1 }, + { id: 2, content: 'Card 2', url: '/cat-02.jpg', inactive: false, turned: false, noevents: false, seen: false, group: 2 }, + { id: 3, content: 'Card 1', url: '/cat-01.jpg', inactive: false, turned: false, noevents: false, seen: false, group: 1 }, + { id: 4, content: 'Card 2', url: '/cat-02.jpg', inactive: false, turned: false, noevents: false, seen: false, group: 2 }, +]; + +describe('VisualMatchingPairs', () => { + it('renders correctly', () => { + const { getByText } = render(++ ++ +++++ Score:+
{total} ++ {(gameState).map((section, index) => ( ++ +onPlayCardClick(index)} + playing={playerIndex === index} + registerUserClicks={registerUserClicks} + section={section} + view={view} + /> + ) + )} + ); + expect(getByText('Pick a card')).toBeInTheDocument(); + }); + + it('flips a card when clicked', async () => { + const { getAllByTestId } = render( ); + const cards = getAllByTestId('play-card'); // Assuming each card is a button, adjust if necessary + + fireEvent.click(cards[0]); + + await waitFor(() => expect(cards[0]).toHaveClass('turned')); + }); + + it('updates score after a match', async () => { + const { getAllByTestId, getByTestId } = render( ); + const cards = getAllByTestId('play-card'); + + fireEvent.click(cards[0]); + fireEvent.click(cards[1]); + + await waitFor(() => expect(getByTestId('score')).toBeInTheDocument()); + expect(getByTestId('score')).toHaveTextContent('100'); + }); + + it('does not update score for a non-matching pair', async () => { + const { getAllByTestId, getByTestId } = render( ); + const cards = getAllByTestId('play-card'); + + fireEvent.click(cards[0]); + fireEvent.click(cards[1]); + + await waitFor(() => expect(getByTestId('score')).toBeInTheDocument()); + expect(getByTestId('score')).toHaveTextContent('100'); // Assuming 100 is the initial score + }); + + it('ends the game when all pairs are matched', async () => { + const finishedPlaying = jest.fn(); + const submitResult = jest.fn(); + const { getAllByTestId, getByTestId, queryByText } = render( + + ); + const cards = getAllByTestId('play-card'); + + fireEvent.click(cards[0]); + fireEvent.click(cards[2]); + fireEvent.click(getByTestId('overlay')); + fireEvent.click(cards[1]); + fireEvent.click(cards[3]); + fireEvent.click(getByTestId('overlay')); + + await waitFor(() => { + expect(queryByText('Pick a card')).not.toBeInTheDocument(); + expect(submitResult).toHaveBeenCalled(); + }); + }); + + it('disables card clicks in-between turns', async () => { + const { getAllByTestId } = render( ); + const cards = getAllByTestId('play-card'); + + await waitFor(() => expect(cards[0]).not.toHaveClass('noevents')); + await waitFor(() => expect(cards[1]).not.toHaveClass('noevents')); + + fireEvent.click(cards[0]); + fireEvent.click(cards[1]); + + await waitFor(() => expect(cards[0]).toHaveClass('noevents')); + await waitFor(() => expect(cards[1]).toHaveClass('noevents')); + }); + + it('calculates the correct score for a match', async () => { + const finishedPlaying = jest.fn(); + const submitResult = jest.fn(); + const { getAllByTestId, getByTestId } = render( ); + const cards = getAllByTestId('play-card'); + + fireEvent.click(cards[0]); + fireEvent.click(cards[1]); + fireEvent.click(getByTestId('overlay')); + + // No match, no score + await waitFor(() => expect(getByTestId('score')).toHaveTextContent('100')); + + fireEvent.click(cards[0]); + fireEvent.click(cards[3]); + fireEvent.click(getByTestId('overlay')); + + // No match, no score + await waitFor(() => expect(getByTestId('score')).toHaveTextContent('100')); + + fireEvent.click(cards[0]); + fireEvent.click(cards[2]); + fireEvent.click(getByTestId('overlay')); + + // Lucky match, +10 + await waitFor(() => expect(getByTestId('score')).toHaveTextContent('110')); + + fireEvent.click(cards[1]); + fireEvent.click(cards[3]); + fireEvent.click(getByTestId('overlay')); + + // Known match, +20 + await waitFor(() => expect(getByTestId('score')).toHaveTextContent('130')); + }); +}); + diff --git a/frontend/src/components/components.scss b/frontend/src/components/components.scss index 0f6017b94..1100b623a 100644 --- a/frontend/src/components/components.scss +++ b/frontend/src/components/components.scss @@ -21,6 +21,7 @@ @import "./Experiment/Experiment"; @import "./Explainer/Explainer"; @import "./Final/Final"; +@import "./FloatingActionButton/FloatingActionButton"; @import "./HTML/HTML"; @import "./Info/Info"; @import "./Listen/Listen"; @@ -33,10 +34,11 @@ @import "./Playback/Multiplayer"; @import "./Playback/Playback"; @import "./Playback/MatchingPairs"; -@import "./Playback/SpectrogramPlayer"; +@import "./Playback/ImagePlayer"; @import "./Question/Question"; @import "./Score/Score"; @import "./Trial/Trial"; @import "./FeedbackForm/FeedbackForm"; @import "./ToontjeHoger/ToontjeHoger"; @import "./UserFeedback/UserFeedback"; +@import "./VisualMatchingPairs/VisualMatchingPairs.scss"; diff --git a/frontend/src/hooks/useResultHandler.js b/frontend/src/hooks/useResultHandler.js index 19a8b3e87..fa6463fcc 100644 --- a/frontend/src/hooks/useResultHandler.js +++ b/frontend/src/hooks/useResultHandler.js @@ -31,7 +31,7 @@ const useResultHandler = ({ session, participant, onNext, state }) => { // Create result data const data = { - session: session.current, + session, participant, result: mergedResults, }; diff --git a/frontend/src/hooks/useResultHandler.test.js b/frontend/src/hooks/useResultHandler.test.js index 0c6ab8d0d..0025fda94 100644 --- a/frontend/src/hooks/useResultHandler.test.js +++ b/frontend/src/hooks/useResultHandler.test.js @@ -1,4 +1,4 @@ -import { renderHook, act } from "@testing-library/react-hooks"; +import { renderHook, act } from "@testing-library/react"; import useResultHandler from "./useResultHandler"; import * as API from '../API.js'; @@ -9,7 +9,7 @@ describe('useResultHandler', () => { const mockOnNext = jest.fn(); const initialState = { next_round: ['round2'] }; // Example initial state - const mockSession = { current: 'session-id' }; + const mockSession = 'session-id'; const mockParticipant = 'participant-id'; it('buffers results correctly', async () => { diff --git a/frontend/src/index.js b/frontend/src/index.js index 57db4e185..bd6aaee31 100644 --- a/frontend/src/index.js +++ b/frontend/src/index.js @@ -1,6 +1,6 @@ import "./index.css"; -import React from "react"; -import ReactDOM from "react-dom"; +import React, { StrictMode } from "react"; +import { createRoot } from 'react-dom/client'; import App from "./components/App/App"; import { initSentry } from "./config/sentry"; import { initAudioListener } from "./util/audio"; @@ -13,9 +13,18 @@ initSentry(); initAudioListener(); initWebAudioListener(); - // Create app -ReactDOM.render( , document.getElementById("root")); +const container = document.getElementById("root"); +const root = createRoot(container); +root.render( + process.env.REACT_APP_STRICT === true ? ( + + + ) : ( ++ + ) +); // import * as serviceWorker from "./serviceWorker"; // If you want your app to work offline and load faster, you can change diff --git a/frontend/src/scss/color-schemes.scss b/frontend/src/scss/color-schemes.scss index 7d0bd0b2d..fe7719d67 100644 --- a/frontend/src/scss/color-schemes.scss +++ b/frontend/src/scss/color-schemes.scss @@ -78,4 +78,4 @@ .is-7 { color: #0cc7f1; } -} \ No newline at end of file +} diff --git a/frontend/src/scss/elements.scss b/frontend/src/scss/elements.scss index 472cdaf1f..6421a5916 100644 --- a/frontend/src/scss/elements.scss +++ b/frontend/src/scss/elements.scss @@ -29,7 +29,7 @@ h3.title { color: white; } - &:focus { + &:focus, &.checked { box-shadow: 0 0 0 0.2rem rgba($color, 0.5); } diff --git a/frontend/src/scss/variables.scss b/frontend/src/scss/variables.scss index f2fdee84d..991c660cc 100644 --- a/frontend/src/scss/variables.scss +++ b/frontend/src/scss/variables.scss @@ -8,17 +8,26 @@ $blue: #0cc7f1; $green: #00b612; $indigo: #2b2bee; $gray: #bdbebf; +$gray-200: #e9ecef; $gray-900: #212529; $black: $gray-900; $primary: $pink; +$secondary: $gray-900; $success: $teal; $positive: $teal; $negative: $red; -$secondary: $gray-900; +$warning: $yellow; $info: $blue; $facebook-blue: #4267b2; $twitter-blue: #1da1f2; $fa-font-path: "../public/vendor/font-awesome/webfonts"; + +// breakpoints +$breakpoint-xs: 0; +$breakpoint-sm: 576px; +$breakpoint-md: 768px; +$breakpoint-lg: 992px; +$breakpoint-xl: 1200px; diff --git a/frontend/src/stories/ButtonArray.stories.js b/frontend/src/stories/ButtonArray.stories.js index 44cb04b1a..1cb8d3519 100644 --- a/frontend/src/stories/ButtonArray.stories.js +++ b/frontend/src/stories/ButtonArray.stories.js @@ -1,4 +1,3 @@ - import ButtonArray from '../components/Question/_ButtonArray'; export default { @@ -9,25 +8,40 @@ export default { }, }; -export const Default = { - args: { - question: { - question: "This is the question", - explainer: "This is the explainer", - view: "BUTTON_ARRAY", - value: "", - choices: [ - "Choice 1", - "Choice 2", - "Choice 3", - ], - }, - onChange: () => { }, - id: 0, - active: true, - style: {}, - emphasizeTitle: false, +const defaultArgs = { + question: { + question: "This is the question", + explainer: "This is the explainer", + view: "BUTTON_ARRAY", + value: "", + choices: [ + "Choice 1", + "Choice 2", + "Choice 3", + ], }, + onChange: () => { }, + id: 0, + active: true, + style: {}, + emphasizeTitle: false, +} + +const getArgs = (args = {}) => ({ ...defaultArgs, ...args }); + +export const Default = { + args: getArgs(), + decorators: [ + (Story) => ( + ++ ), + ], +}; + +export const Disabled = { + args: getArgs({ disabled: true }), decorators: [ (Story) => (+ @@ -38,7 +52,7 @@ export const Default = { }; export const CategorizationWithHiddenText = { - args: { + args: getArgs({ question: { "key": "choice", "view": "BUTTON_ARRAY", @@ -60,12 +74,41 @@ export const CategorizationWithHiddenText = { "min_values": 1, "expected_response": "A" }, - onChange: () => { }, - id: 0, - active: true, - style: {}, - emphasizeTitle: false, - }, + }), + decorators: [ + (Story) => ( +++ ), + ], +} + +export const CategorizationWithHiddenTextDisabled = { + args: getArgs({ + disabled: true, + question: { + "key": "choice", + "view": "BUTTON_ARRAY", + "explainer": "", + "question": "", + "result_id": 16549, + "is_skippable": false, + "submits": true, + "style": { + "invisible-text": true, + "buttons-large-gap": true, + "buttons-large-text": true, + "neutral-inverted": true + }, + "choices": { + "A": "___", + "B": "___" + }, + "min_values": 1, + "expected_response": "A" + }, + }), decorators: [ (Story) => (+ @@ -74,3 +117,55 @@ export const CategorizationWithHiddenText = { ), ], } + +export const BooleanColorScheme = { + args: getArgs(), + decorators: [ + (Story) => ( +++ ), + ], +} + +export const BooleanNegativeFirstColorScheme = { + args: getArgs(), + decorators: [ + (Story) => ( ++ ++ ), + ], +} + +export const NeutralColorScheme = { + args: getArgs(), + decorators: [ + (Story) => ( ++ ++ ), + ], +} + +export const NeutralInvertedColorScheme = { + args: getArgs(), + decorators: [ + (Story) => ( ++ ++ ), + ], +} diff --git a/frontend/src/stories/Consent.stories.js b/frontend/src/stories/Consent.stories.js new file mode 100644 index 000000000..14be6c4dc --- /dev/null +++ b/frontend/src/stories/Consent.stories.js @@ -0,0 +1,43 @@ + +import Consent from '../components/Consent/Consent'; + +const defaultArgs = { + title: "This is the title", + text: "This is the text", + onNext: () => {console.log("Next button clicked")}, + confirm: "Confirm", + deny: "Deny", + experiment: { + slug: "experiment-slug", + } +} + +const getArgs = (args = {}) => ({ ...defaultArgs, ...args }); + +export default { + title: 'Consent', + component: Consent, + parameters: { + layout: 'fullscreen', + }, +}; + +export const Default = { + args: { + title: "This is the Consent component's title", + text: "+ This is the Consent component's text
It can contain lists, headings, bold, italic and underlined text, you name it!
- Item 1
- Item 2
- Item 3
++ ), + ], +}; diff --git a/frontend/src/stories/Final.stories.js b/frontend/src/stories/Final.stories.js new file mode 100644 index 000000000..384d4d04e --- /dev/null +++ b/frontend/src/stories/Final.stories.js @@ -0,0 +1,66 @@ +import { + BrowserRouter as Router, +} from "react-router-dom"; + +import Final from '../components/Final/Final'; + +export default { + title: 'Final', + component: Final, + parameters: { + layout: 'fullscreen', + }, +}; + +export const Default = { + args: { + score: 100, + rank: { + text: 'Rank', + class: 'rank', + }, + final_text: '+ Final text
', + points: 'points', + button: { + text: 'Button', + link: 'https://www.google.com', + }, + logo: { + image: 'https://via.placeholder.com/150', + link: 'https://www.google.com', + }, + social: { + apps: ['facebook', 'whatsapp', 'twitter', 'weibo', 'share', 'clipboard'], + url: 'https://www.google.com', + message: 'Message', + hashtags: ['hashtag'], + text: 'Text', + }, + show_profile_link: true, + action_texts: { + all_experiments: 'All experiments', + profile: 'Profile', + }, + show_participant_link: true, + participant_id_only: false, + feedback_info: { + header: 'Feedback', + button: 'Submit', + thank_you: 'Thank you for your feedback!', + contact_body: 'Please contact us at info@example.com if you have any questions.
', + }, + experiment: { + slug: 'test', + }, + participant: 'test', + }, + decorators: [ + (Story) => ( +++ ), + ], +}; diff --git a/frontend/src/stories/FloatingActionButton.stories.js b/frontend/src/stories/FloatingActionButton.stories.js new file mode 100644 index 000000000..a79a3e51d --- /dev/null +++ b/frontend/src/stories/FloatingActionButton.stories.js @@ -0,0 +1,133 @@ +import UserFeedback from 'components/UserFeedback/UserFeedback'; +import FloatingActionButton from '../components/FloatingActionButton/FloatingActionButton'; + +export default { + title: 'FloatingActionButton', + component: FloatingActionButton, + parameters: { + layout: 'fullscreen', + }, +}; + +const userFeedbackProps = { + experimentSlug: 'test', + participant: 'test', + feedbackInfo: { + header: 'Feedback', + button: 'Submit', + thank_you: 'Thank you for your feedback!', + contact_body: '+ ++ Please contact us at info@example.com if you have any questions.
' + }, + inline: false +} + +export const Default = { + args: { + children: ( ++ ), + }, + decorators: [ + (Story) => ( + ++ ), + ], +}; + +export const TopLeft = { + args: { + position: 'top-left', + children: ( ++ + ), + }, + decorators: [ + (Story) => ( + ++ ), + ], +}; + +export const TopRight = { + args: { + position: 'top-right', + children: ( ++ + ), + }, + decorators: [ + (Story) => ( + ++ ), + ], +}; + +export const BottomLeft = { + args: { + position: 'bottom-left', + children: ( ++ + ), + }, + decorators: [ + (Story) => ( + ++ ), + ], +}; + +export const BottomRight = { + args: { + position: 'bottom-right', + children: ( ++ + ), + }, + decorators: [ + (Story) => ( + ++ ), + ], +}; + +export const CenterLeft = { + args: { + position: 'center-left', + children: ( ++ + ), + }, + decorators: [ + (Story) => ( + ++ ), + ], +}; + +export const CenterRight = { + args: { + position: 'center-right', + children: ( ++ + ), + }, + decorators: [ + (Story) => ( + ++ ), + ], +}; diff --git a/frontend/src/stories/Histogram.stories.js b/frontend/src/stories/Histogram.stories.js new file mode 100644 index 000000000..c669e2edf --- /dev/null +++ b/frontend/src/stories/Histogram.stories.js @@ -0,0 +1,31 @@ + +import Histogram from '../components/Histogram/Histogram'; + +export default { + title: 'Histogram', + component: Histogram, + parameters: { + layout: 'fullscreen', + }, +}; + + +export const Default = { + args: { + bars: 7, + spacing: 6, + interval: 100, + running: true, + marginLeft: 0, + marginTop: 0, + backgroundColor: undefined, + borderRadius: '0.15rem', + }, + decorators: [ + (Story) => ( ++ ++ ), + ], +}; \ No newline at end of file diff --git a/frontend/src/stories/MatchingPairs.stories.js b/frontend/src/stories/MatchingPairs.stories.js index 092255888..6bd57febc 100644 --- a/frontend/src/stories/MatchingPairs.stories.js +++ b/frontend/src/stories/MatchingPairs.stories.js @@ -1,7 +1,23 @@ -import MatchingPairs from '../components/Playback/MatchingPairs'; +import useBoundStore from 'util/stores'; +import MatchingPairs, { SCORE_FEEDBACK_DISPLAY } from '../components/Playback/MatchingPairs'; import audio from './assets/audio.wav'; + +const StoreDecorator = (Story) => { + const setSession = useBoundStore(state => state.setSession); + const setParticipant = useBoundStore(state => state.setParticipant); + setSession({ id: 1 }); + setParticipant({ id: 1, csrf_token: '123' }); + + return ( ++ ++ ) +} + + export default { title: 'MatchingPairs', component: MatchingPairs, @@ -87,13 +103,7 @@ export const Default = { args: { ...getDefaultArgs(), }, - decorators: [ - (Story) => ( -+ -- ), - ], + decorators: [ StoreDecorator ], parameters: { docs: { description: { @@ -149,15 +159,8 @@ export const WithThreeColumns = { memory: false, }, ], - }, - ), - decorators: [ - (Story) => ( -- -- ), - ], + }), + decorators: [ StoreDecorator ], parameters: { docs: { description: { @@ -166,3 +169,33 @@ export const WithThreeColumns = { }, }, }; + +export const WithSmallBottomRightScoreFeedback = { + args: { + ...getDefaultArgs(), + scoreFeedbackDisplay: SCORE_FEEDBACK_DISPLAY.SMALL_BOTTOM_RIGHT + }, + decorators: [ StoreDecorator ], + parameters: { + docs: { + description: { + component: 'This story shows the component with the default props.', + }, + }, + }, +}; + +export const WithShowAnimation = { + args: { + ...getDefaultArgs(), + showAnimation: true, + }, + decorators: [ StoreDecorator ], + parameters: { + docs: { + description: { + component: 'This story shows the component with the default props.', + }, + }, + }, +}; \ No newline at end of file diff --git a/frontend/src/stories/PlayButton.stories.js b/frontend/src/stories/PlayButton.stories.js new file mode 100644 index 000000000..d307505b4 --- /dev/null +++ b/frontend/src/stories/PlayButton.stories.js @@ -0,0 +1,92 @@ + +import PlayButton from '../components/PlayButton/PlayButton'; + +export default { + title: 'PlayButton', + component: PlayButton, + parameters: { + layout: 'fullscreen', + }, +}; + +export const Default = { + args: { + + }, + decorators: [ + (Story) => ( +- ++ ), + ], +}; + +export const Playing = { + args: { + isPlaying: true, + }, + decorators: [ + (Story) => ( ++ ++ ), + ], +}; + +export const BooleanColorScheme = { + args: { + isPlaying: false, + className: 'boolean', + }, + decorators: [ + (Story) => ( ++ ++ ), + ], +}; + +export const BooleanNegativeFirstColorScheme = { + args: { + isPlaying: false, + className: 'boolean-negative-first', + }, + decorators: [ + (Story) => ( ++ ++ ), + ], +}; + +export const NeutralColorScheme = { + args: { + isPlaying: false, + className: 'neutral', + }, + decorators: [ + (Story) => ( ++ ++ ), + ], +}; + +export const NeutralInvertedColorScheme = { + args: { + isPlaying: false, + className: 'neutral-inverted', + }, + decorators: [ + (Story) => ( ++ ++ ), + ], +}; diff --git a/frontend/src/stories/PlayCard.stories.js b/frontend/src/stories/PlayCard.stories.js new file mode 100644 index 000000000..a7917129d --- /dev/null +++ b/frontend/src/stories/PlayCard.stories.js @@ -0,0 +1,190 @@ + +import PlayCard from '../components/PlayButton/PlayCard'; +import catImage from './assets/images/cat-01.webp'; + +console.log(catImage); + +export default { + title: 'PlayCard', + component: PlayCard, + parameters: { + layout: 'fullscreen', + }, +}; + +const getDefaultArgs = (overrides = {}) => ({ + onClick: () => alert("Clicked!"), + registerUserClicks: () => void 0, + playing: true, + section: { + "id": 32, + "url": "/section/32/78165/", + "group": "\t1" + }, + showAnimation: true, + view: "MATCHINGPAIRS", + ...overrides +}); + +export const Default = { + args: getDefaultArgs(), + decorators: [ + (Story) => ( ++ ++ ), + ], +}; + +export const Turned = { + args: getDefaultArgs({ + section: { + "id": 32, + "url": "/section/32/78165/", + "group": "\t1", + "turned": true + }, + }), + decorators: [ + (Story) => ( ++ ++ ), + ], +}; + +export const Seen = { + args: getDefaultArgs({ + section: { + "id": 32, + "url": "/section/32/78165/", + "group": "\t1", + "seen": true + }, + }), + decorators: [ + (Story) => ( ++ ++ ), + ], +}; + +export const Memory = { + args: getDefaultArgs({ + section: { + "id": 32, + "url": "/section/32/78165/", + "group": "\t1", + "memory": true + }, + }), + decorators: [ + (Story) => ( ++ ++ ), + ], +}; + +export const Lucky = { + args: getDefaultArgs({ + section: { + "id": 32, + "url": "/section/32/78165/", + "group": "\t1", + "lucky": true + }, + }), + decorators: [ + (Story) => ( ++ ++ ), + ], +}; + +export const NoEvents = { + args: getDefaultArgs({ + section: { + "id": 32, + "url": "/section/32/78165/", + "group": "\t1", + "noevents": true + }, + }), + decorators: [ + (Story) => ( ++ ++ ), + ], +}; + +export const Inactive = { + args: getDefaultArgs({ + section: { + "id": 32, + "url": "/section/32/78165/", + "group": "\t1", + "inactive": true + }, + }), + decorators: [ + (Story) => ( ++ ++ ), + ], +}; + +export const Playing = { + args: getDefaultArgs({ + onClick: () => void 0, + registerUserClicks: () => void 0, + playing: true, + showAnimation: true, + section: { + "id": 32, + "url": "/section/32/78165/", + "group": "\t1", + "turned": true + }, + }), + decorators: [ + (Story) => ( ++ ++ ), + ], +}; + +export const VisualMatchingPairs = { + args: getDefaultArgs({ + onClick: () => alert("Clicked!"), + registerUserClicks: () => alert('Registered'), + playing: false, + section: { + "id": 32, + "url": `http://localhost:6006/${catImage}`, + "group": "\t1", + "turned": true + }, + view: "VISUALMATCHINGPAIRS" + }), + decorators: [ + (Story) => ( ++ ++ ), + ], +}; \ No newline at end of file diff --git a/frontend/src/stories/PlayerSmall.stories.js b/frontend/src/stories/PlayerSmall.stories.js new file mode 100644 index 000000000..848660fed --- /dev/null +++ b/frontend/src/stories/PlayerSmall.stories.js @@ -0,0 +1,54 @@ + +import PlayerSmall from '../components/PlayButton/PlayerSmall'; + +export default { + title: 'PlayerSmall', + component: PlayerSmall, + parameters: { + layout: 'fullscreen', + }, +}; + +export const Default = { + args: { + label: 'Default', + onClick: () => { alert('Default'); }, + }, + decorators: [ + (Story) => ( ++ ++ ), + ], +}; + +export const Playing = { + args: { + label: 'Playing', + onClick: () => { alert('Playing'); }, + playing: true, + }, + decorators: [ + (Story) => ( ++ ++ ), + ], +}; + +export const Disabled = { + args: { + label: 'Disabled', + onClick: () => { alert('Disabled'); }, + disabled: true, + }, + decorators: [ + (Story) => ( ++ ++ ), + ], +}; diff --git a/frontend/src/stories/Trial.stories.js b/frontend/src/stories/Trial.stories.js index c9ebe99b8..0e5cd726c 100644 --- a/frontend/src/stories/Trial.stories.js +++ b/frontend/src/stories/Trial.stories.js @@ -8,77 +8,177 @@ export default { }, }; +const getDefaultArgs = (overrides = {}) => ({ + html: { + body: "+ This is the HTML body
", + }, + config: { + style: "AUTOPLAY", + auto_advance: true, + response_time: 1000, + continue_label: "Continue", + show_continue_button: true, + }, + playback: { + view: "BUTTON", + instruction: "This is the instruction", + preload_message: "This is the preload message", + play_config: { + autoplay: true, + controls: true, + loop: true, + muted: true, + playback_rate: 1, + preload: "auto", + }, + sections: [ + { + start: 0, + end: 10, + text: "This is the first section", + }, + { + start: 10, + end: 20, + text: "This is the second section", + }, + ], + }, + feedback_form: { + form: [ + { + "key": "know_song", + "view": "BUTTON_ARRAY", + "explainer": "", + "question": "1. Do you know this song?", + "result_id": 17242, + "is_skippable": false, + "submits": false, + "style": "boolean", + "choices": { + "yes": "fa-check", + "unsure": "fa-question", + "no": "fa-xmark" + }, + "min_values": 1 + }, + { + "key": "like_song", + "view": "ICON_RANGE", + "explainer": "", + "question": "2. How much do you like this song?", + "result_id": 17241, + "is_skippable": false, + "submits": false, + "style": "gradient-7", + "choices": { + "1": "fa-face-grin-hearts", + "2": "fa-face-grin", + "3": "fa-face-smile", + "4": "fa-face-meh", + "5": "fa-face-frown", + "6": "fa-face-frown-open", + "7": "fa-face-angry" + } + } + ], + submit_label: "Submit", + skip_label: "Skip", + is_skippable: true, + is_profile: true, + }, + onNext: () => { }, + onResult: () => { }, + ...overrides, +}); + export const Default = { - args: { - html: { - body: "This is the HTML body
", + args: getDefaultArgs(), + decorators: [ + (Story) => ( +++ ), + ], +}; + +export const BooleanColorScheme = { + args: getDefaultArgs({ + config: { + style: "boolean", + auto_advance: true, + response_time: 1000, + continue_label: "Continue", + show_continue_button: true, }, + }), + decorators: [ + (Story) => ( ++ ++ ), + ], +} + +export const BooleanNegativeFirstColorScheme = { + args: getDefaultArgs({ config: { - style: "AUTOPLAY", + style: "boolean-negative-first", auto_advance: true, response_time: 1000, continue_label: "Continue", show_continue_button: true, }, - playback: { - view: "BUTTON", - instruction: "This is the instruction", - preload_message: "This is the preload message", - play_config: { - autoplay: true, - controls: true, - loop: true, - muted: true, - playback_rate: 1, - preload: "auto", - }, - sections: [ - { - start: 0, - end: 10, - text: "This is the first section", - }, - { - start: 10, - end: 20, - text: "This is the second section", - }, - ], + }), + decorators: [ + (Story) => ( ++ ++ ), + ], +} + +export const NeutralColorScheme = { + args: getDefaultArgs({ + config: { + style: "neutral", + auto_advance: true, + response_time: 1000, + continue_label: "Continue", + show_continue_button: true, }, - feedback_form: { - form: [{ - key: "msi_14_never_complimented", - view: "TEXT_RANGE", - value: "", - question: "Ik heb nog nooit complimenten gekregen voor mijn talenten als muzikant.", - explainer: "In hoeverre ben je het hiermee eens of oneens?", - result_id: 18, - style: "neutral", - scoring_rule: "LIKERT", - scale_steps: 7, - choices: { - "1": "Helemaal mee oneens", - "2": "Zeer mee oneens", - "3": "Mee oneens", - "4": "Niet mee eens of oneens", - "5": "Mee eens", - "6": "Zeer mee eens", - "7": "Helemaal mee eens" - } - }], - submit_label: "Submit", - skip_label: "Skip", - is_skippable: true, - is_profile: true, + }), + decorators: [ + (Story) => ( ++ ++ ), + ], +} + +export const NeutralInvertedColorScheme = { + args: getDefaultArgs({ + config: { + style: "neutral-inverted", + auto_advance: true, + response_time: 1000, + continue_label: "Continue", + show_continue_button: true, }, - onNext: () => { }, - onResult: () => { }, - }, + }), decorators: [ (Story) => ( -+ +), ], -}; +} diff --git a/frontend/src/stories/UserFeedback.stories.js b/frontend/src/stories/UserFeedback.stories.js new file mode 100644 index 000000000..7a2173c92 --- /dev/null +++ b/frontend/src/stories/UserFeedback.stories.js @@ -0,0 +1,51 @@ +import UserFeedback from '../components/UserFeedback/UserFeedback'; + +export default { + title: 'UserFeedback', + component: UserFeedback, + parameters: { + layout: 'fullscreen', + }, +}; + +export const Default = { + args: { + experimentSlug: 'test', + participant: 'test', + feedbackInfo: { + header: 'Feedback', + button: 'Submit', + thank_you: 'Thank you for your feedback!', + contact_body: 'Please contact us at info@example.com if you have any questions.
' + }, + inline: true + }, + decorators: [ + (Story) => ( +++ ), + ], +}; + +export const Vertical = { + args: { + experimentSlug: 'test', + participant: 'test', + feedbackInfo: { + header: 'Feedback', + button: 'Submit', + thank_you: 'Thank you for your feedback!', + contact_body: '+ Please contact us at info@example.com if you have any questions.
' + }, + inline: false + }, + decorators: [ + (Story) => ( +++ ), + ], +}; diff --git a/frontend/src/stories/VisualMatchingPairs.stories.js b/frontend/src/stories/VisualMatchingPairs.stories.js new file mode 100644 index 000000000..6ff301d34 --- /dev/null +++ b/frontend/src/stories/VisualMatchingPairs.stories.js @@ -0,0 +1,218 @@ +import VisualMatchingPairs from '../components/VisualMatchingPairs/VisualMatchingPairs'; + +import Cat01 from './assets/images/cat-01.webp'; +import Cat02 from './assets/images/cat-02.webp'; +import Cat03 from './assets/images/cat-03.webp'; + +export default { + title: 'VisualMatchingPairs', + component: VisualMatchingPairs, + parameters: { + layout: 'fullscreen', + docs: { + description: { + component: 'This story shows the component with the default props.', + story: 'This story shows the component with the default props.', + }, + } + }, +}; + +const getDefaultArgs = (overrides = {}) => ({ + playSection: () => { }, + sections: [ + { + id: 1, + url: Cat01, + turned: false, + lucky: false, + memory: false, + group: 1, + }, + { + id: 2, + url: Cat02, + turned: false, + lucky: false, + memory: false, + group: 2, + }, + { + id: 3, + url: Cat03, + turned: false, + lucky: false, + memory: false, + group: 3, + }, + { + id: 4, + url: Cat02, + turned: false, + lucky: false, + memory: false, + group: 2, + }, + { + id: 5, + url: Cat01, + turned: false, + lucky: false, + memory: false, + group: 1, + }, + { + id: 6, + url: Cat03, + turned: false, + lucky: false, + memory: false, + group: 3, + }, + ], + playerIndex: 0, + stopAudio: () => { }, + submitResult: (args) => { alert('submitResult: ' + JSON.stringify(args, null, 2)); }, + finishedPlaying: () => { console.log('finished playing') }, + setPlayerIndex: (i) => { console.log('set player index', i) }, + ...overrides, +}) + +export const Default = { + args: { + ...getDefaultArgs(), + }, + decorators: [ + (Story) => ( ++ ++ ), + ], + parameters: { + docs: { + description: { + component: 'This story shows the component with the default props.', + }, + }, + }, +}; + +export const MoreCards = { + args: { + ...getDefaultArgs({ + sections: [ + { + id: 1, + url: Cat01, + turned: false, + lucky: false, + memory: false, + group: 1, + }, + { + id: 2, + url: Cat02, + turned: false, + lucky: false, + memory: false, + group: 2, + }, + { + id: 3, + url: Cat03, + turned: false, + lucky: false, + memory: false, + group: 3, + }, + { + id: 4, + url: Cat02, + turned: false, + lucky: false, + memory: false, + group: 2, + }, + { + id: 5, + url: Cat01, + turned: false, + lucky: false, + memory: false, + group: 1, + }, + { + id: 6, + url: Cat03, + turned: false, + lucky: false, + memory: false, + group: 3, + }, + { + id: 7, + url: Cat01, + turned: false, + lucky: false, + memory: false, + group: 1, + }, + { + id: 8, + url: Cat02, + turned: false, + lucky: false, + memory: false, + group: 2, + }, + { + id: 9, + url: Cat03, + turned: false, + lucky: false, + memory: false, + group: 3, + }, + { + id: 10, + url: Cat02, + turned: false, + lucky: false, + memory: false, + group: 2, + }, + { + id: 11, + url: Cat01, + turned: false, + lucky: false, + memory: false, + group: 1, + }, + { + id: 12, + url: Cat03, + turned: false, + lucky: false, + memory: false, + group: 3, + }, + ], + }), + }, + decorators: [ + (Story) => ( ++ ++ ), + ], + parameters: { + docs: { + description: { + component: 'This story shows the component with more cards.', + }, + }, + }, +}; \ No newline at end of file diff --git a/frontend/src/stories/assets/images/cat-01.webp b/frontend/src/stories/assets/images/cat-01.webp new file mode 100644 index 000000000..b6527ad38 Binary files /dev/null and b/frontend/src/stories/assets/images/cat-01.webp differ diff --git a/frontend/src/stories/assets/images/cat-02.webp b/frontend/src/stories/assets/images/cat-02.webp new file mode 100644 index 000000000..3292a3a88 Binary files /dev/null and b/frontend/src/stories/assets/images/cat-02.webp differ diff --git a/frontend/src/stories/assets/images/cat-03.webp b/frontend/src/stories/assets/images/cat-03.webp new file mode 100644 index 000000000..6797142df Binary files /dev/null and b/frontend/src/stories/assets/images/cat-03.webp differ diff --git a/frontend/src/util/__mocks__/stores.js b/frontend/src/util/__mocks__/stores.js new file mode 100644 index 000000000..b80a6f373 --- /dev/null +++ b/frontend/src/util/__mocks__/stores.js @@ -0,0 +1,11 @@ +module.exports = { + useBoundStore: () => { + return { + setError: jest.fn(), + setParticipant: jest.fn(), + setSession: jest.fn(), + participant: { id: 1 }, + session: { id: 1 } + } + } +}; \ No newline at end of file diff --git a/frontend/src/util/audio.js b/frontend/src/util/audio.js index 72ffb8f6b..271f35fbe 100644 --- a/frontend/src/util/audio.js +++ b/frontend/src/util/audio.js @@ -1,4 +1,4 @@ -import { API_ROOT, SILENT_MP3 } from "../config.js"; +import { API_ROOT, MEDIA_ROOT, SILENT_MP3 } from "../config.js"; import Timer from "./timer"; // Audio provides function around a shared audio object @@ -170,7 +170,7 @@ export const loadUntilAvailable = (src, canPlay) => { // without having to stop for further buffering of content. const removeListener = listenOnce("canplaythrough", canPlay); - load(src); + load(MEDIA_ROOT + src); // If the ready state is already > 3, data is already loaded; // Call canPlay right away diff --git a/frontend/src/util/audioControl.js b/frontend/src/util/audioControl.js index 0e8b61458..b10a15e56 100644 --- a/frontend/src/util/audioControl.js +++ b/frontend/src/util/audioControl.js @@ -1,22 +1,21 @@ import * as audio from "./audio"; import * as webAudio from "./webAudio"; -export const playAudio = (playConfig, section, playheadShift=0) => { +export const playAudio = (section, playMethod, playheadShift=0) => { let latency = 0; - const playhead = playConfig.playhead + playheadShift - if (playConfig.play_method === 'BUFFER') { + if (playMethod === 'BUFFER') { // Determine latency for current audio device latency = webAudio.getTotalLatency() // Play audio - webAudio.playBufferFrom(section.id, playhead); + webAudio.playBufferFrom(section.id, playheadShift); return latency } else { // Only initialize webaudio if section is hosted local - if (playConfig.play_method !== 'EXTERNAL') { + if (playMethod !== 'EXTERNAL') { // Determine latency for current audio device latency = webAudio.getTotalLatency() webAudio.initWebAudio(); @@ -26,14 +25,16 @@ export const playAudio = (playConfig, section, playheadShift=0) => { audio.setVolume(1); // Play audio - audio.playFrom(Math.max(0, playhead)); + audio.loadUntilAvailable(section.url, () => { + audio.playFrom(Math.max(0, playheadShift)); + }); return latency } } -export const pauseAudio = (playConfig) => { - if (playConfig.play_method === 'BUFFER') { +export const pauseAudio = (playMethod) => { + if (playMethod === 'BUFFER') { webAudio.stopBuffer(); } else { audio.stop(); diff --git a/frontend/src/util/label.js b/frontend/src/util/label.js index eec6271fb..86ea9cf3b 100644 --- a/frontend/src/util/label.js +++ b/frontend/src/util/label.js @@ -1,32 +1,3 @@ -import { romanNumeral } from "./roman"; - -export const LABEL_NUMERIC = "NUMERIC"; -export const LABEL_ALPHABETIC = "ALPHABETIC"; -export const LABEL_CUSTOM = "CUSTOM"; -export const LABEL_ROMAN = "ROMAN"; - -/** - * @deprecated This function is deprecated and will be removed in the future. - * See also https://github.com/Amsterdam-Music-Lab/MUSCLE/pull/640 - * Get a player label, based on index, labelstyle and customLabels - */ -export const getPlayerLabel = (index, labelStyle, customLabels) => { - index = parseInt(index); - - switch (labelStyle) { - case LABEL_NUMERIC: - return parseInt(index) + 1; - case LABEL_ALPHABETIC: - return String.fromCharCode(65 + index); - case LABEL_ROMAN: - return romanNumeral(index + 1); - case LABEL_CUSTOM: - return customLabels[index] || ""; - default: - return ""; - } -}; - export const renderLabel = (label, size="fa-lg") => { if (!label) return label if (label.startsWith('fa-')) return diff --git a/frontend/src/util/label.test.js b/frontend/src/util/label.test.js index e27736501..b97f434d7 100644 --- a/frontend/src/util/label.test.js +++ b/frontend/src/util/label.test.js @@ -1,35 +1,5 @@ import { render } from '@testing-library/react'; -import { getPlayerLabel, LABEL_NUMERIC, LABEL_ALPHABETIC, LABEL_ROMAN, LABEL_CUSTOM, renderLabel } from "./label"; - -describe('getPlayerLabel', () => { - - it('returns numeric label correctly', () => { - expect(getPlayerLabel(0, LABEL_NUMERIC)).toBe(1); - expect(getPlayerLabel(1, LABEL_NUMERIC)).toBe(2); - }); - - it('returns alphabetic label correctly', () => { - expect(getPlayerLabel(0, LABEL_ALPHABETIC)).toBe('A'); - expect(getPlayerLabel(25, LABEL_ALPHABETIC)).toBe('Z'); - }); - - it('returns roman label correctly', () => { - expect(getPlayerLabel(0, LABEL_ROMAN)).toBe('I'); - expect(getPlayerLabel(3, LABEL_ROMAN)).toBe('IV'); - }); - - it('returns custom label correctly', () => { - const customLabels = ['One', 'Two', 'Three']; - expect(getPlayerLabel(0, LABEL_CUSTOM, customLabels)).toBe('One'); - expect(getPlayerLabel(2, LABEL_CUSTOM, customLabels)).toBe('Three'); - }); - - it('returns empty string for unknown label style', () => { - expect(getPlayerLabel(1, 'UNKNOWN')).toBe(''); - }); - -}); - +import { renderLabel } from "./label"; describe('renderLabel', () => { diff --git a/frontend/src/util/roman.js b/frontend/src/util/roman.js deleted file mode 100644 index 6663a95eb..000000000 --- a/frontend/src/util/roman.js +++ /dev/null @@ -1,21 +0,0 @@ -export const romanNumeral = (int) => { - let roman = ''; - - if (int < 0 || !int) return roman; - - roman += 'M'.repeat(int / 1000); int %= 1000; - roman += 'CM'.repeat(int / 900); int %= 900; - roman += 'D'.repeat(int / 500); int %= 500; - roman += 'CD'.repeat(int / 400); int %= 400; - roman += 'C'.repeat(int / 100); int %= 100; - roman += 'XC'.repeat(int / 90); int %= 90; - roman += 'L'.repeat(int / 50); int %= 50; - roman += 'XL'.repeat(int / 40); int %= 40; - roman += 'X'.repeat(int / 10); int %= 10; - roman += 'IX'.repeat(int / 9); int %= 9; - roman += 'V'.repeat(int / 5); int %= 5; - roman += 'IV'.repeat(int / 4); int %= 4; - roman += 'I'.repeat(int); - - return roman; -} diff --git a/frontend/src/util/roman.test.js b/frontend/src/util/roman.test.js deleted file mode 100644 index 322b6ffe2..000000000 --- a/frontend/src/util/roman.test.js +++ /dev/null @@ -1,45 +0,0 @@ -import { romanNumeral } from './roman'; - -describe('romanNumeral', () => { - it('converts basic numbers correctly', () => { - expect(romanNumeral(1)).toBe('I'); - expect(romanNumeral(5)).toBe('V'); - expect(romanNumeral(10)).toBe('X'); - expect(romanNumeral(50)).toBe('L'); - expect(romanNumeral(100)).toBe('C'); - expect(romanNumeral(500)).toBe('D'); - expect(romanNumeral(1000)).toBe('M'); - }); - - it('converts composite numbers correctly', () => { - expect(romanNumeral(23)).toBe('XXIII'); - expect(romanNumeral(44)).toBe('XLIV'); - expect(romanNumeral(89)).toBe('LXXXIX'); - expect(romanNumeral(199)).toBe('CXCIX'); - expect(romanNumeral(499)).toBe('CDXCIX'); - }); - - it('handles subtractive notation correctly', () => { - expect(romanNumeral(4)).toBe('IV'); - expect(romanNumeral(9)).toBe('IX'); - expect(romanNumeral(40)).toBe('XL'); - expect(romanNumeral(90)).toBe('XC'); - expect(romanNumeral(400)).toBe('CD'); - expect(romanNumeral(900)).toBe('CM'); - expect(romanNumeral(444)).toBe('CDXLIV'); - expect(romanNumeral(999)).toBe('CMXCIX'); - }); - - it('converts large numbers correctly', () => { - expect(romanNumeral(1984)).toBe('MCMLXXXIV'); - expect(romanNumeral(2022)).toBe('MMXXII'); - expect(romanNumeral(3999)).toBe('MMMCMXCIX'); - expect(romanNumeral(4444)).toBe('MMMMCDXLIV'); - expect(romanNumeral(9999)).toBe('MMMMMMMMMCMXCIX'); - }); - - it('handles edge cases correctly', () => { - expect(romanNumeral(0)).toBe(''); - expect(romanNumeral(-1)).toBe(''); - }); -}); diff --git a/frontend/src/util/stores.js b/frontend/src/util/stores.js new file mode 100644 index 000000000..7e59966c8 --- /dev/null +++ b/frontend/src/util/stores.js @@ -0,0 +1,25 @@ +import { create } from "zustand"; + +// Stores +const createErrorSlice = (set) => ({ + error: null, + setError: (error) => set(() => ({ error })) +}); + +const createParticipantSlice = (set) => ({ + participant: null, + setParticipant: (participant) => set(() => ({ participant })) +}); + +const createSessionSlice = (set) => ({ + session: null, + setSession: (session) => set(() => ({ session })) +}); + +export const useBoundStore = create((...args) => ({ + ...createErrorSlice(...args), + ...createParticipantSlice(...args), + ...createSessionSlice(...args) +})); + +export default useBoundStore; \ No newline at end of file diff --git a/frontend/src/util/testUtils/useEffectDebugger.js b/frontend/src/util/testUtils/useEffectDebugger.js new file mode 100644 index 000000000..1ddcc0ac0 --- /dev/null +++ b/frontend/src/util/testUtils/useEffectDebugger.js @@ -0,0 +1,36 @@ +const { useEffect, useRef } = require("react"); + +const usePrevious = (value, initialValue) => { + const ref = useRef(initialValue); + useEffect(() => { + ref.current = value; + }); + return ref.current; + }; + +export const useEffectDebugger = (effectHook, dependencies, dependencyNames = []) => { + /** can be used as a drop-in replacement for useEffect + * to check which dependencies changed. */ + const previousDeps = usePrevious(dependencies, []); + + const changedDeps = dependencies.reduce((accum, dependency, index) => { + if (dependency !== previousDeps[index]) { + const keyName = dependencyNames[index] || index; + return { + ...accum, + [keyName]: { + before: previousDeps[index], + after: dependency + } + }; + } + + return accum; + }, {}); + + if (Object.keys(changedDeps).length) { + console.log('[use-effect-debugger] ', changedDeps); + } + + useEffect(effectHook, dependencies); + }; diff --git a/frontend/src/util/webAudio.js b/frontend/src/util/webAudio.js index d34450b3e..f98b3e873 100644 --- a/frontend/src/util/webAudio.js +++ b/frontend/src/util/webAudio.js @@ -25,21 +25,21 @@ export const initWebAudioListener = () => { }; // init HTML audio element in webaudio context and connect track to destination (output) -export const initWebAudio = () => { - if (track === undefined) { +export const initWebAudio = () => { + if (track === undefined) { track = audioContext.createMediaElementSource(window.audio); - track.connect(audioContext.destination); - } -} + track.connect(audioContext.destination); + } +}; // Change HTML audio element crossorigin attribute for playing external files -export const closeWebAudio = () => { - window.audio.removeAttribute('crossOrigin'); - window.audio.crossorigin = "use-credentials"; -} +export const closeWebAudio = () => { + window.audio.removeAttribute('crossOrigin'); + window.audio.crossorigin = "use-credentials"; +}; // return total audio latency in milliseconds -export const getTotalLatency = () => { +export const getTotalLatency = () => { let baseLatency = audioContext.baseLatency; let outputLatency = audioContext.outputLatency; @@ -51,85 +51,77 @@ export const getTotalLatency = () => { outputLatency = 0; } - let totalLatency = (baseLatency + outputLatency) * 1000; + let totalLatency = (baseLatency + outputLatency) * 1000; return totalLatency; -} +}; // return base audio latency in seconds export const getBaseLatency = () => { return audioContext.baseLatency; -} +}; // return output audio latency in seconds -export const getOutputLatency = () => { +export const getOutputLatency = () => { return audioContext.outputLatency; -} +}; // Adjust gain export const changeGain = (level) => { const gainNode = audioContext.createGain(); track.connect(gainNode).connect(audioContext.destination); - gainNode.gain.value = level; -} + gainNode.gain.value = level; +}; // load sound data and store in buffers object -export const loadBuffer = async (id, src, canPlay) => { +export const loadBuffer = async (id, src, canPlay) => { await fetch(MEDIA_ROOT + src, {}) - // Return the data as an ArrayBuffer + // Return the data as an ArrayBuffer .then(response => response.arrayBuffer()) // Decode the audio data .then(buffer => audioContext.decodeAudioData(buffer)) // store buffer in buffers object - .then(decodedData => { + .then(decodedData => { buffers[id] = decodedData; previousSource = src; canPlay(); }); -} +}; export const checkSectionLoaded = (section) => { if (section.url === previousSource) { return true; - } -} + }; +}; // Clear buffer list export const clearBuffers = () => { buffers = {}; -} +}; // stop buffer playback export const stopBuffer = () => { if (source) { source.stop(); - } -} - -// play buffer by section.id -export const playBuffer = (id) => { - source = audioContext.createBufferSource(); - source.buffer = buffers[id]; - source.connect(audioContext.destination); - source.start(); -} + }; +}; // Play buffer from given time export const playBufferFrom = (id, time) => { source = audioContext.createBufferSource(); - source.buffer = buffers[id]; - source.connect(audioContext.destination); + source.buffer = buffers[id]; + source.connect(audioContext.destination); source.start(0, time); -} +}; // Suspend webaudio (frees up resources) export const suspend = () => { audioContext.suspend(); -} +}; // Resume webaudio export const resume = () => { audioContext.resume(); -} +}; // Listen once to the given event // After that remove listener @@ -144,3 +136,17 @@ export const listenOnce = (event, callback) => { source.addEventListener(event, _callback); return remove; }; + +// function to check wether a users device is webaudio compatible +export const compatibleDevice = () => { + const userAgentString = window.navigator.userAgent; + let compatible = true; + // Disable webaudio for ios versions below 17 + if ((userAgentString.indexOf('iPhone') > -1 || userAgentString.indexOf('iPad') > -1) && (userAgentString.indexOf('OS') > -1)) { + const iosVersion = userAgentString.substring(userAgentString.indexOf('OS') + 3, userAgentString.indexOf('OS') + 5) + if (iosVersion < 17) { + compatible = false; + } + } + return compatible; +}; diff --git a/frontend/yarn.lock b/frontend/yarn.lock index e7ab9b80a..182a67471 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -12,7 +12,7 @@ __metadata: languageName: node linkType: hard -"@adobe/css-tools@npm:^4.0.1": +"@adobe/css-tools@npm:^4.3.1": version: 4.3.2 resolution: "@adobe/css-tools@npm:4.3.2" checksum: 296a03dd29f227c60500d2da8c7f64991fecf1d8b456ce2b4adb8cec7363d9c08b5b03f1463673fc8cbfe54b538745588e7a13c736d2dd14a80c01a20f127f39 @@ -70,6 +70,16 @@ __metadata: languageName: node linkType: hard +"@babel/code-frame@npm:^7.23.5": + version: 7.23.5 + resolution: "@babel/code-frame@npm:7.23.5" + dependencies: + "@babel/highlight": "npm:^7.23.4" + chalk: "npm:^2.4.2" + checksum: a10e843595ddd9f97faa99917414813c06214f4d9205294013e20c70fbdf4f943760da37dec1d998bf3e6fc20fa2918a47c0e987a7e458663feb7698063ad7c6 + languageName: node + linkType: hard + "@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9": version: 7.22.9 resolution: "@babel/compat-data@npm:7.22.9" @@ -84,6 +94,13 @@ __metadata: languageName: node linkType: hard +"@babel/compat-data@npm:^7.23.5": + version: 7.23.5 + resolution: "@babel/compat-data@npm:7.23.5" + checksum: 081278ed46131a890ad566a59c61600a5f9557bd8ee5e535890c8548192532ea92590742fd74bd9db83d74c669ef8a04a7e1c85cdea27f960233e3b83c3a957c + languageName: node + linkType: hard + "@babel/core@npm:^7.1.0, @babel/core@npm:^7.11.1, @babel/core@npm:^7.12.3, @babel/core@npm:^7.16.0, @babel/core@npm:^7.7.2, @babel/core@npm:^7.8.0": version: 7.22.11 resolution: "@babel/core@npm:7.22.11" @@ -107,7 +124,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:^7.11.6, @babel/core@npm:^7.13.16, @babel/core@npm:^7.22.0, @babel/core@npm:^7.22.9, @babel/core@npm:^7.7.5": +"@babel/core@npm:^7.11.6": version: 7.23.3 resolution: "@babel/core@npm:7.23.3" dependencies: @@ -130,6 +147,29 @@ __metadata: languageName: node linkType: hard +"@babel/core@npm:^7.18.9, @babel/core@npm:^7.23.0, @babel/core@npm:^7.23.2": + version: 7.23.6 + resolution: "@babel/core@npm:7.23.6" + dependencies: + "@ampproject/remapping": "npm:^2.2.0" + "@babel/code-frame": "npm:^7.23.5" + "@babel/generator": "npm:^7.23.6" + "@babel/helper-compilation-targets": "npm:^7.23.6" + "@babel/helper-module-transforms": "npm:^7.23.3" + "@babel/helpers": "npm:^7.23.6" + "@babel/parser": "npm:^7.23.6" + "@babel/template": "npm:^7.22.15" + "@babel/traverse": "npm:^7.23.6" + "@babel/types": "npm:^7.23.6" + convert-source-map: "npm:^2.0.0" + debug: "npm:^4.1.0" + gensync: "npm:^1.0.0-beta.2" + json5: "npm:^2.2.3" + semver: "npm:^6.3.1" + checksum: a02bae7d916029b70706dc301535e1b31e5d216f55d4ee6f64a15825c6b69ee2c14c52a213d1497ec414e925ed4e9d897d41fb0d75df9fea28ed2c0008790e31 + languageName: node + linkType: hard + "@babel/eslint-parser@npm:^7.16.3": version: 7.22.11 resolution: "@babel/eslint-parser@npm:7.22.11" @@ -144,18 +184,6 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.12.11, @babel/generator@npm:^7.22.9, @babel/generator@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/generator@npm:7.23.3" - dependencies: - "@babel/types": "npm:^7.23.3" - "@jridgewell/gen-mapping": "npm:^0.3.2" - "@jridgewell/trace-mapping": "npm:^0.3.17" - jsesc: "npm:^2.5.1" - checksum: d5fff1417eecfada040e01a7c77a4968e81c436aeb35815ce85b4e80cd01e731423613d61033044a6cb5563bb8449ee260e3379b63eb50b38ec0a9ea9c00abfd - languageName: node - linkType: hard - "@babel/generator@npm:^7.22.10, @babel/generator@npm:^7.7.2": version: 7.22.10 resolution: "@babel/generator@npm:7.22.10" @@ -180,6 +208,30 @@ __metadata: languageName: node linkType: hard +"@babel/generator@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/generator@npm:7.23.3" + dependencies: + "@babel/types": "npm:^7.23.3" + "@jridgewell/gen-mapping": "npm:^0.3.2" + "@jridgewell/trace-mapping": "npm:^0.3.17" + jsesc: "npm:^2.5.1" + checksum: d5fff1417eecfada040e01a7c77a4968e81c436aeb35815ce85b4e80cd01e731423613d61033044a6cb5563bb8449ee260e3379b63eb50b38ec0a9ea9c00abfd + languageName: node + linkType: hard + +"@babel/generator@npm:^7.23.6": + version: 7.23.6 + resolution: "@babel/generator@npm:7.23.6" + dependencies: + "@babel/types": "npm:^7.23.6" + "@jridgewell/gen-mapping": "npm:^0.3.2" + "@jridgewell/trace-mapping": "npm:^0.3.17" + jsesc: "npm:^2.5.1" + checksum: 53540e905cd10db05d9aee0a5304e36927f455ce66f95d1253bb8a179f286b88fa7062ea0db354c566fe27f8bb96567566084ffd259f8feaae1de5eccc8afbda + languageName: node + linkType: hard + "@babel/helper-annotate-as-pure@npm:^7.18.6, @babel/helper-annotate-as-pure@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-annotate-as-pure@npm:7.22.5" @@ -233,6 +285,19 @@ __metadata: languageName: node linkType: hard +"@babel/helper-compilation-targets@npm:^7.23.6": + version: 7.23.6 + resolution: "@babel/helper-compilation-targets@npm:7.23.6" + dependencies: + "@babel/compat-data": "npm:^7.23.5" + "@babel/helper-validator-option": "npm:^7.23.5" + browserslist: "npm:^4.22.2" + lru-cache: "npm:^5.1.1" + semver: "npm:^6.3.1" + checksum: ba38506d11185f48b79abf439462ece271d3eead1673dd8814519c8c903c708523428806f05f2ec5efd0c56e4e278698fac967e5a4b5ee842c32415da54bc6fa + languageName: node + linkType: hard + "@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.22.10, @babel/helper-create-class-features-plugin@npm:^7.22.11, @babel/helper-create-class-features-plugin@npm:^7.22.5": version: 7.22.11 resolution: "@babel/helper-create-class-features-plugin@npm:7.22.11" @@ -538,6 +603,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-string-parser@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/helper-string-parser@npm:7.23.4" + checksum: f348d5637ad70b6b54b026d6544bd9040f78d24e7ec245a0fc42293968181f6ae9879c22d89744730d246ce8ec53588f716f102addd4df8bbc79b73ea10004ac + languageName: node + linkType: hard + "@babel/helper-validator-identifier@npm:^7.22.20": version: 7.22.20 resolution: "@babel/helper-validator-identifier@npm:7.22.20" @@ -566,6 +638,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-validator-option@npm:^7.23.5": + version: 7.23.5 + resolution: "@babel/helper-validator-option@npm:7.23.5" + checksum: af45d5c0defb292ba6fd38979e8f13d7da63f9623d8ab9ededc394f67eb45857d2601278d151ae9affb6e03d5d608485806cd45af08b4468a0515cf506510e94 + languageName: node + linkType: hard + "@babel/helper-wrap-function@npm:^7.22.20": version: 7.22.20 resolution: "@babel/helper-wrap-function@npm:7.22.20" @@ -610,6 +689,17 @@ __metadata: languageName: node linkType: hard +"@babel/helpers@npm:^7.23.6": + version: 7.23.6 + resolution: "@babel/helpers@npm:7.23.6" + dependencies: + "@babel/template": "npm:^7.22.15" + "@babel/traverse": "npm:^7.23.6" + "@babel/types": "npm:^7.23.6" + checksum: df1cf6607676ad36f52f652ec03536f2732d70aef5e76dba5c964e34d49f3c2d3dcf9fb3740db359f53071d74b64606a833d5ba156f79f437f71bfe06e2e7e19 + languageName: node + linkType: hard + "@babel/highlight@npm:^7.22.13": version: 7.22.13 resolution: "@babel/highlight@npm:7.22.13" @@ -621,6 +711,17 @@ __metadata: languageName: node linkType: hard +"@babel/highlight@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/highlight@npm:7.23.4" + dependencies: + "@babel/helper-validator-identifier": "npm:^7.22.20" + chalk: "npm:^2.4.2" + js-tokens: "npm:^4.0.0" + checksum: fbff9fcb2f5539289c3c097d130e852afd10d89a3a08ac0b5ebebbc055cc84a4bcc3dcfed463d488cde12dd0902ef1858279e31d7349b2e8cee43913744bda33 + languageName: node + linkType: hard + "@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.11, @babel/parser@npm:^7.22.5": version: 7.22.13 resolution: "@babel/parser@npm:7.22.13" @@ -630,7 +731,16 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.13.16, @babel/parser@npm:^7.22.7, @babel/parser@npm:^7.23.3": +"@babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.0": + version: 7.23.0 + resolution: "@babel/parser@npm:7.23.0" + bin: + parser: ./bin/babel-parser.js + checksum: ab4ea9360ed4ba3c728c5a9bf33035103ebde20a7e943c4ae1d42becb02a313d731d12a93c795c5a19777031e4022e64b92a52262eda902522a1a18649826283 + languageName: node + linkType: hard + +"@babel/parser@npm:^7.23.3": version: 7.23.3 resolution: "@babel/parser@npm:7.23.3" bin: @@ -639,12 +749,12 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.0": - version: 7.23.0 - resolution: "@babel/parser@npm:7.23.0" +"@babel/parser@npm:^7.23.6": + version: 7.23.6 + resolution: "@babel/parser@npm:7.23.6" bin: parser: ./bin/babel-parser.js - checksum: ab4ea9360ed4ba3c728c5a9bf33035103ebde20a7e943c4ae1d42becb02a313d731d12a93c795c5a19777031e4022e64b92a52262eda902522a1a18649826283 + checksum: 6f76cd5ccae1fa9bcab3525b0865c6222e9c1d22f87abc69f28c5c7b2c8816a13361f5bd06bddbd5faf903f7320a8feba02545c981468acec45d12a03db7755e languageName: node linkType: hard @@ -708,7 +818,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-class-properties@npm:^7.13.0, @babel/plugin-proposal-class-properties@npm:^7.16.0": +"@babel/plugin-proposal-class-properties@npm:^7.16.0": version: 7.18.6 resolution: "@babel/plugin-proposal-class-properties@npm:7.18.6" dependencies: @@ -735,7 +845,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.13.8, @babel/plugin-proposal-nullish-coalescing-operator@npm:^7.16.0": +"@babel/plugin-proposal-nullish-coalescing-operator@npm:^7.16.0": version: 7.18.6 resolution: "@babel/plugin-proposal-nullish-coalescing-operator@npm:7.18.6" dependencies: @@ -759,7 +869,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-optional-chaining@npm:^7.13.12, @babel/plugin-proposal-optional-chaining@npm:^7.16.0": +"@babel/plugin-proposal-optional-chaining@npm:^7.16.0": version: 7.21.0 resolution: "@babel/plugin-proposal-optional-chaining@npm:7.21.0" dependencies: @@ -1152,9 +1262,9 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-async-generator-functions@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.3" +"@babel/plugin-transform-async-generator-functions@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-async-generator-functions@npm:7.23.4" dependencies: "@babel/helper-environment-visitor": "npm:^7.22.20" "@babel/helper-plugin-utils": "npm:^7.22.5" @@ -1162,7 +1272,7 @@ __metadata: "@babel/plugin-syntax-async-generators": "npm:^7.8.4" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: e846f282658e097fce4fccf3ee29289bf05f0654846a5994727a36f0cdc2e47abdffd4be4fa65787e94aa975824fae894c90afbfdc8caacd46c12c7f43e99d7f + checksum: f2eef4de609975a3f7da7832576b5ffc93e43c80f87e1a99e886b0f8591096cfc4c37e2d5f52fdeaa2a9c09a25a59f3e621159abaca75d3193922a5c0e4cbe0c languageName: node linkType: hard @@ -1225,14 +1335,14 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-block-scoping@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-block-scoping@npm:7.23.3" +"@babel/plugin-transform-block-scoping@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-block-scoping@npm:7.23.4" dependencies: "@babel/helper-plugin-utils": "npm:^7.22.5" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: ccaeded7954c196811d22a35322579254cda52676e823682b6234885a3aaf88fe0d5152dacaec43db9031dcf35a050a5343e36028e5905b0ba9c02d36b30a57f + checksum: 83006804dddf980ab1bcd6d67bc381e24b58c776507c34f990468f820d0da71dba3697355ca4856532fa2eeb2a1e3e73c780f03760b5507a511cbedb0308e276 languageName: node linkType: hard @@ -1273,16 +1383,16 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-class-static-block@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-class-static-block@npm:7.23.3" +"@babel/plugin-transform-class-static-block@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-class-static-block@npm:7.23.4" dependencies: "@babel/helper-create-class-features-plugin": "npm:^7.22.15" "@babel/helper-plugin-utils": "npm:^7.22.5" "@babel/plugin-syntax-class-static-block": "npm:^7.14.5" peerDependencies: "@babel/core": ^7.12.0 - checksum: 89cdb66d7bc834cd51659eb7286a6bee23add0bc114943d68c4b6c0c834178cf0d55183df0cf508fec9c55ed4155641360e6f55a91c16fe826ccaf1adf381922 + checksum: fdca96640ef29d8641a7f8de106f65f18871b38cc01c0f7b696d2b49c76b77816b30a812c08e759d06dd10b4d9b3af6b5e4ac22a2017a88c4077972224b77ab0 languageName: node linkType: hard @@ -1305,9 +1415,9 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-classes@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-classes@npm:7.23.3" +"@babel/plugin-transform-classes@npm:^7.23.5": + version: 7.23.5 + resolution: "@babel/plugin-transform-classes@npm:7.23.5" dependencies: "@babel/helper-annotate-as-pure": "npm:^7.22.5" "@babel/helper-compilation-targets": "npm:^7.22.15" @@ -1320,7 +1430,7 @@ __metadata: globals: "npm:^11.1.0" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 88bfd332db0ba5cbfb8557a2ba5a7185151aebc9cfe3035b014aa6d795556acbe672bb8c78da3c9fd1d23f55a333d14b5daa127ef037f5ced5198b6d79a146d6 + checksum: 07988f52b4893151887d1ea6ff79e5fe834078c5731bd09babd5659edbbae21ea4e2de326a02443a63fd776b4c945da6177f07875b56fe66e0b7899e830a9e92 languageName: node linkType: hard @@ -1428,15 +1538,15 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-dynamic-import@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-dynamic-import@npm:7.23.3" +"@babel/plugin-transform-dynamic-import@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-dynamic-import@npm:7.23.4" dependencies: "@babel/helper-plugin-utils": "npm:^7.22.5" "@babel/plugin-syntax-dynamic-import": "npm:^7.8.3" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: df3fd130312dc53d068fa76333991dce5e86987b023af8c3b502bd7d36a8e67da6f718e61dc838576a9fbacd06628e29607ee22d9bae30705485c14130eab201 + checksum: 19ae4a4a2ca86d35224734c41c48b2aa6a13139f3cfa1cbd18c0e65e461de8b65687dec7e52b7a72bb49db04465394c776aa1b13a2af5dc975b2a0cde3dcab67 languageName: node linkType: hard @@ -1476,15 +1586,15 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-export-namespace-from@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-export-namespace-from@npm:7.23.3" +"@babel/plugin-transform-export-namespace-from@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-export-namespace-from@npm:7.23.4" dependencies: "@babel/helper-plugin-utils": "npm:^7.22.5" "@babel/plugin-syntax-export-namespace-from": "npm:^7.8.3" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 390c6626dcda99023629049d92090242b4575351a4a7b47f97febabd2381f2cd0f624de661d8de8d1f715fedd63753cfd1feddead19e5960c27b88e447465b81 + checksum: 38bf04f851e36240bbe83ace4169da626524f4107bfb91f05b4ad93a5fb6a36d5b3d30b8883c1ba575ccfc1bac7938e90ca2e3cb227f7b3f4a9424beec6fd4a7 languageName: node linkType: hard @@ -1523,14 +1633,15 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-for-of@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-for-of@npm:7.23.3" +"@babel/plugin-transform-for-of@npm:^7.23.6": + version: 7.23.6 + resolution: "@babel/plugin-transform-for-of@npm:7.23.6" dependencies: "@babel/helper-plugin-utils": "npm:^7.22.5" + "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 8a36202cfee312ba80e509c7c2131e6773524e572b4dc64a8ee95bd912634fdeb5ea91c6c7747ee30e03562d0f0d333f88ed7dbb929b36b60b8d74189189e12f + checksum: 46681b6ab10f3ca2d961f50d4096b62ab5d551e1adad84e64be1ee23e72eb2f26a1e30e617e853c74f1349fffe4af68d33921a128543b6f24b6d46c09a3e2aec languageName: node linkType: hard @@ -1572,15 +1683,15 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-json-strings@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-json-strings@npm:7.23.3" +"@babel/plugin-transform-json-strings@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-json-strings@npm:7.23.4" dependencies: "@babel/helper-plugin-utils": "npm:^7.22.5" "@babel/plugin-syntax-json-strings": "npm:^7.8.3" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: e1cef6a485b9da32aba9449fb459dac062dfc401f3d6ad48e7fbdcb73bbe470c995cc15ce5c421b95efe1e9a90d5507eb606360fe10b6d8cb869dd5dae7a2562 + checksum: 39e82223992a9ad857722ae051291935403852ad24b0dd64c645ca1c10517b6bf9822377d88643fed8b3e61a4e3f7e5ae41cf90eb07c40a786505d47d5970e54 languageName: node linkType: hard @@ -1618,15 +1729,15 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-logical-assignment-operators@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.23.3" +"@babel/plugin-transform-logical-assignment-operators@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.23.4" dependencies: "@babel/helper-plugin-utils": "npm:^7.22.5" "@babel/plugin-syntax-logical-assignment-operators": "npm:^7.10.4" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 23b7588b26d420c8b132bd08916d49871ca0c8db892f6b58637b10e2a0d918163d413c505db880a9157fc2e61d089040f139298a60d837ccbd0efca0474ac7ca + checksum: 87b034dd13143904e405887e6125d76c27902563486efc66b7d9a9d8f9406b76c6ac42d7b37224014af5783d7edb465db0cdecd659fa3227baad0b3a6a35deff languageName: node linkType: hard @@ -1676,29 +1787,29 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-modules-commonjs@npm:^7.13.8, @babel/plugin-transform-modules-commonjs@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-modules-commonjs@npm:7.23.3" +"@babel/plugin-transform-modules-commonjs@npm:^7.22.11, @babel/plugin-transform-modules-commonjs@npm:^7.22.5": + version: 7.22.11 + resolution: "@babel/plugin-transform-modules-commonjs@npm:7.22.11" dependencies: - "@babel/helper-module-transforms": "npm:^7.23.3" + "@babel/helper-module-transforms": "npm:^7.22.9" "@babel/helper-plugin-utils": "npm:^7.22.5" "@babel/helper-simple-access": "npm:^7.22.5" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 5c8840c5c9ecba39367ae17c973ed13dbc43234147b77ae780eec65010e2a9993c5d717721b23e8179f7cf49decdd325c509b241d69cfbf92aa647a1d8d5a37d + checksum: 3c51fb9e3c3d9d35a6572f8ceb7701bdd971022e9a0c4f292d97a6f63131ba24359794a082be081f00af4d9d26fdfe460c2e0c6325726cdd8c286e6df5446015 languageName: node linkType: hard -"@babel/plugin-transform-modules-commonjs@npm:^7.22.11, @babel/plugin-transform-modules-commonjs@npm:^7.22.5": - version: 7.22.11 - resolution: "@babel/plugin-transform-modules-commonjs@npm:7.22.11" +"@babel/plugin-transform-modules-commonjs@npm:^7.23.0, @babel/plugin-transform-modules-commonjs@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/plugin-transform-modules-commonjs@npm:7.23.3" dependencies: - "@babel/helper-module-transforms": "npm:^7.22.9" + "@babel/helper-module-transforms": "npm:^7.23.3" "@babel/helper-plugin-utils": "npm:^7.22.5" "@babel/helper-simple-access": "npm:^7.22.5" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 3c51fb9e3c3d9d35a6572f8ceb7701bdd971022e9a0c4f292d97a6f63131ba24359794a082be081f00af4d9d26fdfe460c2e0c6325726cdd8c286e6df5446015 + checksum: 5c8840c5c9ecba39367ae17c973ed13dbc43234147b77ae780eec65010e2a9993c5d717721b23e8179f7cf49decdd325c509b241d69cfbf92aa647a1d8d5a37d languageName: node linkType: hard @@ -1788,27 +1899,27 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.5": - version: 7.22.11 - resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.22.11" +"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.11, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.23.4" dependencies: "@babel/helper-plugin-utils": "npm:^7.22.5" "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 328c0ebfbbc82256af00252fb795996b093f57b528a57afcb30843ca52d24a6d824029ad6d22f042f3af336bb4dc1963b4841c2ad774424b02d14ae7cfff2701 + checksum: bce490d22da5c87ff27fffaff6ad5a4d4979b8d7b72e30857f191e9c1e1824ba73bb8d7081166289369e388f94f0ce5383a593b1fc84d09464a062c75f824b0b languageName: node linkType: hard -"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.23.3" +"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.5": + version: 7.22.11 + resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.22.11" dependencies: "@babel/helper-plugin-utils": "npm:^7.22.5" "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.8.3" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: f960faed3975c8454c52d2b5d85daf0c9a27677b248d7933882e59b10202ade2a98c7b925ce0bae2b8eb4d66eb5d63a5588c1090d54eaa4cd235533d71228ff3 + checksum: 328c0ebfbbc82256af00252fb795996b093f57b528a57afcb30843ca52d24a6d824029ad6d22f042f3af336bb4dc1963b4841c2ad774424b02d14ae7cfff2701 languageName: node linkType: hard @@ -1824,15 +1935,15 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-numeric-separator@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-numeric-separator@npm:7.23.3" +"@babel/plugin-transform-numeric-separator@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-numeric-separator@npm:7.23.4" dependencies: "@babel/helper-plugin-utils": "npm:^7.22.5" "@babel/plugin-syntax-numeric-separator": "npm:^7.10.4" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: d3748cce20e8752e61dfda55e275c699459a3ff8d0bb46585da813136e04066b1ce70b71beef504fcdc8d4cca3c955112cea96d5e9fd5a42a5bc8956d05236c2 + checksum: e34902da4f5588dc4812c92cb1f6a5e3e3647baf7b4623e30942f551bf1297621abec4e322ebfa50b320c987c0f34d9eb4355b3d289961d9035e2126e3119c12 languageName: node linkType: hard @@ -1851,9 +1962,9 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-object-rest-spread@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-object-rest-spread@npm:7.23.3" +"@babel/plugin-transform-object-rest-spread@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-object-rest-spread@npm:7.23.4" dependencies: "@babel/compat-data": "npm:^7.23.3" "@babel/helper-compilation-targets": "npm:^7.22.15" @@ -1862,7 +1973,7 @@ __metadata: "@babel/plugin-transform-parameters": "npm:^7.23.3" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 31ab631aaba945c118662943e5f1f54a21f07d64f06e06b25d55871168c460f3eeeccdf7b05aa74a1340e2cfbe781ad3c7ceccd0c2585d39f7b73ba11ebaa9d0 + checksum: b56017992ffe7fcd1dd9a9da67c39995a141820316266bcf7d77dc912980d228ccbd3f36191d234f5cc389b09157b5d2a955e33e8fb368319534affd1c72b262 languageName: node linkType: hard @@ -1902,15 +2013,15 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-optional-catch-binding@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.23.3" +"@babel/plugin-transform-optional-catch-binding@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.23.4" dependencies: "@babel/helper-plugin-utils": "npm:^7.22.5" "@babel/plugin-syntax-optional-catch-binding": "npm:^7.8.3" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 85ac1e94ee8f21648816151628ff931cc16143ec8c904649a1ecfd8960160290eccc5a197b4ae3ee7a1c7a27a7c4189e61b4de24483d5bad4040784afe2d206f + checksum: 4ef61812af0e4928485e28301226ce61139a8b8cea9e9a919215ebec4891b9fea2eb7a83dc3090e2679b7d7b2c8653da601fbc297d2addc54a908b315173991e languageName: node linkType: hard @@ -1927,6 +2038,19 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-optional-chaining@npm:^7.23.0, @babel/plugin-transform-optional-chaining@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-optional-chaining@npm:7.23.4" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.22.5" + "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.22.5" + "@babel/plugin-syntax-optional-chaining": "npm:^7.8.3" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 305b773c29ad61255b0e83ec1e92b2f7af6aa58be4cba1e3852bddaa14f7d2afd7b4438f41c28b179d6faac7eb8d4fb5530a17920294f25d459b8f84406bfbfb + languageName: node + linkType: hard + "@babel/plugin-transform-optional-chaining@npm:^7.23.3": version: 7.23.3 resolution: "@babel/plugin-transform-optional-chaining@npm:7.23.3" @@ -2000,9 +2124,9 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-private-property-in-object@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/plugin-transform-private-property-in-object@npm:7.23.3" +"@babel/plugin-transform-private-property-in-object@npm:^7.23.4": + version: 7.23.4 + resolution: "@babel/plugin-transform-private-property-in-object@npm:7.23.4" dependencies: "@babel/helper-annotate-as-pure": "npm:^7.22.5" "@babel/helper-create-class-features-plugin": "npm:^7.22.15" @@ -2010,7 +2134,7 @@ __metadata: "@babel/plugin-syntax-private-property-in-object": "npm:^7.14.5" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 9211dd25a6e87a01535f2d97a663fa6de3472b963c8dcfaacce229a2e3fa6500f2e9fc690bc100a540fc7b66c8364faf7ef19b32e9c9b9791e4561b742c15ed3 + checksum: 8d31b28f24204b4d13514cd3a8f3033abf575b1a6039759ddd6e1d82dd33ba7281f9bc85c9f38072a665d69bfa26dc40737eefaf9d397b024654a483d2357bf5 languageName: node linkType: hard @@ -2520,14 +2644,14 @@ __metadata: languageName: node linkType: hard -"@babel/preset-env@npm:^7.22.9": - version: 7.23.3 - resolution: "@babel/preset-env@npm:7.23.3" +"@babel/preset-env@npm:^7.23.2": + version: 7.23.6 + resolution: "@babel/preset-env@npm:7.23.6" dependencies: - "@babel/compat-data": "npm:^7.23.3" - "@babel/helper-compilation-targets": "npm:^7.22.15" + "@babel/compat-data": "npm:^7.23.5" + "@babel/helper-compilation-targets": "npm:^7.23.6" "@babel/helper-plugin-utils": "npm:^7.22.5" - "@babel/helper-validator-option": "npm:^7.22.15" + "@babel/helper-validator-option": "npm:^7.23.5" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.23.3" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.23.3" "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.23.3" @@ -2551,25 +2675,25 @@ __metadata: "@babel/plugin-syntax-top-level-await": "npm:^7.14.5" "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6" "@babel/plugin-transform-arrow-functions": "npm:^7.23.3" - "@babel/plugin-transform-async-generator-functions": "npm:^7.23.3" + "@babel/plugin-transform-async-generator-functions": "npm:^7.23.4" "@babel/plugin-transform-async-to-generator": "npm:^7.23.3" "@babel/plugin-transform-block-scoped-functions": "npm:^7.23.3" - "@babel/plugin-transform-block-scoping": "npm:^7.23.3" + "@babel/plugin-transform-block-scoping": "npm:^7.23.4" "@babel/plugin-transform-class-properties": "npm:^7.23.3" - "@babel/plugin-transform-class-static-block": "npm:^7.23.3" - "@babel/plugin-transform-classes": "npm:^7.23.3" + "@babel/plugin-transform-class-static-block": "npm:^7.23.4" + "@babel/plugin-transform-classes": "npm:^7.23.5" "@babel/plugin-transform-computed-properties": "npm:^7.23.3" "@babel/plugin-transform-destructuring": "npm:^7.23.3" "@babel/plugin-transform-dotall-regex": "npm:^7.23.3" "@babel/plugin-transform-duplicate-keys": "npm:^7.23.3" - "@babel/plugin-transform-dynamic-import": "npm:^7.23.3" + "@babel/plugin-transform-dynamic-import": "npm:^7.23.4" "@babel/plugin-transform-exponentiation-operator": "npm:^7.23.3" - "@babel/plugin-transform-export-namespace-from": "npm:^7.23.3" - "@babel/plugin-transform-for-of": "npm:^7.23.3" + "@babel/plugin-transform-export-namespace-from": "npm:^7.23.4" + "@babel/plugin-transform-for-of": "npm:^7.23.6" "@babel/plugin-transform-function-name": "npm:^7.23.3" - "@babel/plugin-transform-json-strings": "npm:^7.23.3" + "@babel/plugin-transform-json-strings": "npm:^7.23.4" "@babel/plugin-transform-literals": "npm:^7.23.3" - "@babel/plugin-transform-logical-assignment-operators": "npm:^7.23.3" + "@babel/plugin-transform-logical-assignment-operators": "npm:^7.23.4" "@babel/plugin-transform-member-expression-literals": "npm:^7.23.3" "@babel/plugin-transform-modules-amd": "npm:^7.23.3" "@babel/plugin-transform-modules-commonjs": "npm:^7.23.3" @@ -2577,15 +2701,15 @@ __metadata: "@babel/plugin-transform-modules-umd": "npm:^7.23.3" "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.22.5" "@babel/plugin-transform-new-target": "npm:^7.23.3" - "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.23.3" - "@babel/plugin-transform-numeric-separator": "npm:^7.23.3" - "@babel/plugin-transform-object-rest-spread": "npm:^7.23.3" + "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.23.4" + "@babel/plugin-transform-numeric-separator": "npm:^7.23.4" + "@babel/plugin-transform-object-rest-spread": "npm:^7.23.4" "@babel/plugin-transform-object-super": "npm:^7.23.3" - "@babel/plugin-transform-optional-catch-binding": "npm:^7.23.3" - "@babel/plugin-transform-optional-chaining": "npm:^7.23.3" + "@babel/plugin-transform-optional-catch-binding": "npm:^7.23.4" + "@babel/plugin-transform-optional-chaining": "npm:^7.23.4" "@babel/plugin-transform-parameters": "npm:^7.23.3" "@babel/plugin-transform-private-methods": "npm:^7.23.3" - "@babel/plugin-transform-private-property-in-object": "npm:^7.23.3" + "@babel/plugin-transform-private-property-in-object": "npm:^7.23.4" "@babel/plugin-transform-property-literals": "npm:^7.23.3" "@babel/plugin-transform-regenerator": "npm:^7.23.3" "@babel/plugin-transform-reserved-words": "npm:^7.23.3" @@ -2606,11 +2730,11 @@ __metadata: semver: "npm:^6.3.1" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 36b02a86817ab5474bb74a8d62a110723b0b05904a52ddc5627cf89457525b8d5ac0739b8e435a6ae12ef8b90cd5fc191169898c3dc2ac9d2c84026b02f2580a + checksum: 5b24d179af52f082d04b9b98cc4777e37bf31a97cef5a91d8917e996dbd75f2f743c88c40f80744cb8529355bb674619d150c0260c32d834aa4067e21d0c8962 languageName: node linkType: hard -"@babel/preset-flow@npm:^7.13.13, @babel/preset-flow@npm:^7.22.5": +"@babel/preset-flow@npm:^7.22.15": version: 7.23.3 resolution: "@babel/preset-flow@npm:7.23.3" dependencies: @@ -2652,7 +2776,7 @@ __metadata: languageName: node linkType: hard -"@babel/preset-react@npm:^7.22.5": +"@babel/preset-react@npm:^7.22.15": version: 7.23.3 resolution: "@babel/preset-react@npm:7.23.3" dependencies: @@ -2668,21 +2792,6 @@ __metadata: languageName: node linkType: hard -"@babel/preset-typescript@npm:^7.13.0": - version: 7.23.3 - resolution: "@babel/preset-typescript@npm:7.23.3" - dependencies: - "@babel/helper-plugin-utils": "npm:^7.22.5" - "@babel/helper-validator-option": "npm:^7.22.15" - "@babel/plugin-syntax-jsx": "npm:^7.23.3" - "@babel/plugin-transform-modules-commonjs": "npm:^7.23.3" - "@babel/plugin-transform-typescript": "npm:^7.23.3" - peerDependencies: - "@babel/core": ^7.0.0-0 - checksum: e72b654c7f0f08b35d7e1c0e3a59c0c13037f295c425760b8b148aa7dde01e6ddd982efc525710f997a1494fafdd55cb525738c016609e7e4d703d02014152b7 - languageName: node - linkType: hard - "@babel/preset-typescript@npm:^7.16.0": version: 7.22.11 resolution: "@babel/preset-typescript@npm:7.22.11" @@ -2698,7 +2807,22 @@ __metadata: languageName: node linkType: hard -"@babel/register@npm:^7.13.16": +"@babel/preset-typescript@npm:^7.23.0": + version: 7.23.3 + resolution: "@babel/preset-typescript@npm:7.23.3" + dependencies: + "@babel/helper-plugin-utils": "npm:^7.22.5" + "@babel/helper-validator-option": "npm:^7.22.15" + "@babel/plugin-syntax-jsx": "npm:^7.23.3" + "@babel/plugin-transform-modules-commonjs": "npm:^7.23.3" + "@babel/plugin-transform-typescript": "npm:^7.23.3" + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: e72b654c7f0f08b35d7e1c0e3a59c0c13037f295c425760b8b148aa7dde01e6ddd982efc525710f997a1494fafdd55cb525738c016609e7e4d703d02014152b7 + languageName: node + linkType: hard + +"@babel/register@npm:^7.22.15": version: 7.22.15 resolution: "@babel/register@npm:7.22.15" dependencies: @@ -2729,7 +2853,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.7.6": +"@babel/runtime@npm:^7.13.10, @babel/runtime@npm:^7.17.8": version: 7.23.2 resolution: "@babel/runtime@npm:7.23.2" dependencies: @@ -2738,6 +2862,15 @@ __metadata: languageName: node linkType: hard +"@babel/runtime@npm:^7.7.6": + version: 7.23.7 + resolution: "@babel/runtime@npm:7.23.7" + dependencies: + regenerator-runtime: "npm:^0.14.0" + checksum: 3e304133ee55b0750e03e53cb4efb47fb2bdcdb5795f85bbffa10595196c34b9be60eb65bd6d833c87f49fc827f0365f86f95f51d85b188004d3128bb5129c93 + languageName: node + linkType: hard + "@babel/template@npm:^7.22.15": version: 7.22.15 resolution: "@babel/template@npm:7.22.15" @@ -2760,21 +2893,21 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.22.8, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.23.3": - version: 7.23.3 - resolution: "@babel/traverse@npm:7.23.3" +"@babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.23.6": + version: 7.23.6 + resolution: "@babel/traverse@npm:7.23.6" dependencies: - "@babel/code-frame": "npm:^7.22.13" - "@babel/generator": "npm:^7.23.3" + "@babel/code-frame": "npm:^7.23.5" + "@babel/generator": "npm:^7.23.6" "@babel/helper-environment-visitor": "npm:^7.22.20" "@babel/helper-function-name": "npm:^7.23.0" "@babel/helper-hoist-variables": "npm:^7.22.5" "@babel/helper-split-export-declaration": "npm:^7.22.6" - "@babel/parser": "npm:^7.23.3" - "@babel/types": "npm:^7.23.3" - debug: "npm:^4.1.0" + "@babel/parser": "npm:^7.23.6" + "@babel/types": "npm:^7.23.6" + debug: "npm:^4.3.1" globals: "npm:^11.1.0" - checksum: 3c2784f4765185126d64fd5eebce0413b7aee6d54f779998594a343a7f973a9693a441ba27533df84e7ab7ce22f1239c6837f35e903132a1b25f7fc7a67bc30f + checksum: 5b4ebb94a00a7e1daf111e4b0b45a7998d5b7598637a14e75e855e88cc1b702789e09a958726b5d599a003be1e9032dbdfde4b88ea6061332228738950d5582d languageName: node linkType: hard @@ -2796,6 +2929,24 @@ __metadata: languageName: node linkType: hard +"@babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.23.3": + version: 7.23.3 + resolution: "@babel/traverse@npm:7.23.3" + dependencies: + "@babel/code-frame": "npm:^7.22.13" + "@babel/generator": "npm:^7.23.3" + "@babel/helper-environment-visitor": "npm:^7.22.20" + "@babel/helper-function-name": "npm:^7.23.0" + "@babel/helper-hoist-variables": "npm:^7.22.5" + "@babel/helper-split-export-declaration": "npm:^7.22.6" + "@babel/parser": "npm:^7.23.3" + "@babel/types": "npm:^7.23.3" + debug: "npm:^4.1.0" + globals: "npm:^11.1.0" + checksum: 3c2784f4765185126d64fd5eebce0413b7aee6d54f779998594a343a7f973a9693a441ba27533df84e7ab7ce22f1239c6837f35e903132a1b25f7fc7a67bc30f + languageName: node + linkType: hard + "@babel/types@npm:^7.0.0, @babel/types@npm:^7.12.6, @babel/types@npm:^7.20.7, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.11, @babel/types@npm:^7.22.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4": version: 7.22.11 resolution: "@babel/types@npm:7.22.11" @@ -2807,14 +2958,14 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:^7.2.0, @babel/types@npm:^7.22.19, @babel/types@npm:^7.23.3, @babel/types@npm:^7.8.3": - version: 7.23.3 - resolution: "@babel/types@npm:7.23.3" +"@babel/types@npm:^7.18.9, @babel/types@npm:^7.23.6": + version: 7.23.6 + resolution: "@babel/types@npm:7.23.6" dependencies: - "@babel/helper-string-parser": "npm:^7.22.5" + "@babel/helper-string-parser": "npm:^7.23.4" "@babel/helper-validator-identifier": "npm:^7.22.20" to-fast-properties: "npm:^2.0.0" - checksum: 371a10dd9c8d8ebf48fc5d9e1b327dafd74453f8ea582dcbddd1cee5ae34e8881b743e783a86c08c04dcd1849b1842455472a911ae8a1c185484fe9b7b5f1595 + checksum: 42cefce8a68bd09bb5828b4764aa5586c53c60128ac2ac012e23858e1c179347a4aac9c66fc577994fbf57595227611c5ec8270bf0cfc94ff033bbfac0550b70 languageName: node linkType: hard @@ -2829,6 +2980,17 @@ __metadata: languageName: node linkType: hard +"@babel/types@npm:^7.22.19, @babel/types@npm:^7.23.3, @babel/types@npm:^7.8.3": + version: 7.23.3 + resolution: "@babel/types@npm:7.23.3" + dependencies: + "@babel/helper-string-parser": "npm:^7.22.5" + "@babel/helper-validator-identifier": "npm:^7.22.20" + to-fast-properties: "npm:^2.0.0" + checksum: 371a10dd9c8d8ebf48fc5d9e1b327dafd74453f8ea582dcbddd1cee5ae34e8881b743e783a86c08c04dcd1849b1842455472a911ae8a1c185484fe9b7b5f1595 + languageName: node + linkType: hard + "@base2/pretty-print-object@npm:1.0.1": version: 1.0.1 resolution: "@base2/pretty-print-object@npm:1.0.1" @@ -3508,7 +3670,7 @@ __metadata: languageName: node linkType: hard -"@istanbuljs/schema@npm:^0.1.2, @istanbuljs/schema@npm:^0.1.3": +"@istanbuljs/schema@npm:^0.1.2": version: 0.1.3 resolution: "@istanbuljs/schema@npm:0.1.3" checksum: 61c5286771676c9ca3eb2bd8a7310a9c063fb6e0e9712225c8471c582d157392c88f5353581c8c9adbe0dff98892317d2fdfc56c3499aa42e0194405206a963a @@ -3596,15 +3758,6 @@ __metadata: languageName: node linkType: hard -"@jest/expect-utils@npm:^29.6.4": - version: 29.6.4 - resolution: "@jest/expect-utils@npm:29.6.4" - dependencies: - jest-get-type: "npm:^29.6.3" - checksum: 17d87d551090f6b460fa45605c614b2ad28e257360a5b8152216fe983370f4cfb8482d2d017552c2be43be1caa0ff5594f1381be17798dcad3899e05b297fe83 - languageName: node - linkType: hard - "@jest/fake-timers@npm:^27.5.1": version: 27.5.1 resolution: "@jest/fake-timers@npm:27.5.1" @@ -3855,30 +4008,30 @@ __metadata: languageName: node linkType: hard -"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14": +"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.15": version: 1.4.15 resolution: "@jridgewell/sourcemap-codec@npm:1.4.15" checksum: 0c6b5ae663087558039052a626d2d7ed5208da36cfd707dcc5cea4a07cfc918248403dcb5989a8f7afaf245ce0573b7cc6fd94c4a30453bd10e44d9363940ba5 languageName: node linkType: hard -"@jridgewell/trace-mapping@npm:^0.3.12, @jridgewell/trace-mapping@npm:^0.3.18": - version: 0.3.20 - resolution: "@jridgewell/trace-mapping@npm:0.3.20" +"@jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9": + version: 0.3.19 + resolution: "@jridgewell/trace-mapping@npm:0.3.19" dependencies: "@jridgewell/resolve-uri": "npm:^3.1.0" "@jridgewell/sourcemap-codec": "npm:^1.4.14" - checksum: 0ea0b2675cf513ec44dc25605616a3c9b808b9832e74b5b63c44260d66b58558bba65764f81928fc1033ead911f8718dca1134049c3e7a93937faf436671df31 + checksum: 845e6c6efca621b2b85e4d13fd25c319b6e4ab1ea78d4385ff6c0f78322ea0fcdfec8ac763aa4b56e8378c96d7bef101a2638c7a1a076f7d62f6376230c940a7 languageName: node linkType: hard -"@jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9": - version: 0.3.19 - resolution: "@jridgewell/trace-mapping@npm:0.3.19" +"@jridgewell/trace-mapping@npm:^0.3.18": + version: 0.3.20 + resolution: "@jridgewell/trace-mapping@npm:0.3.20" dependencies: "@jridgewell/resolve-uri": "npm:^3.1.0" "@jridgewell/sourcemap-codec": "npm:^1.4.14" - checksum: 845e6c6efca621b2b85e4d13fd25c319b6e4ab1ea78d4385ff6c0f78322ea0fcdfec8ac763aa4b56e8378c96d7bef101a2638c7a1a076f7d62f6376230c940a7 + checksum: 0ea0b2675cf513ec44dc25605616a3c9b808b9832e74b5b63c44260d66b58558bba65764f81928fc1033ead911f8718dca1134049c3e7a93937faf436671df31 languageName: node linkType: hard @@ -3984,7 +4137,7 @@ __metadata: languageName: node linkType: hard -"@pmmmwh/react-refresh-webpack-plugin@npm:^0.5.1, @pmmmwh/react-refresh-webpack-plugin@npm:^0.5.3, @pmmmwh/react-refresh-webpack-plugin@npm:^0.5.5": +"@pmmmwh/react-refresh-webpack-plugin@npm:^0.5.1, @pmmmwh/react-refresh-webpack-plugin@npm:^0.5.11, @pmmmwh/react-refresh-webpack-plugin@npm:^0.5.3": version: 0.5.11 resolution: "@pmmmwh/react-refresh-webpack-plugin@npm:0.5.11" dependencies: @@ -4776,111 +4929,61 @@ __metadata: languageName: node linkType: hard -"@storybook/addon-actions@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-actions@npm:7.5.3" +"@storybook/addon-actions@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/addon-actions@npm:7.6.6" dependencies: - "@storybook/client-logger": "npm:7.5.3" - "@storybook/components": "npm:7.5.3" - "@storybook/core-events": "npm:7.5.3" + "@storybook/core-events": "npm:7.6.6" "@storybook/global": "npm:^5.0.0" - "@storybook/manager-api": "npm:7.5.3" - "@storybook/preview-api": "npm:7.5.3" - "@storybook/theming": "npm:7.5.3" - "@storybook/types": "npm:7.5.3" + "@types/uuid": "npm:^9.0.1" dequal: "npm:^2.0.2" - lodash: "npm:^4.17.21" polished: "npm:^4.2.2" - prop-types: "npm:^15.7.2" - react-inspector: "npm:^6.0.0" - telejson: "npm:^7.2.0" - ts-dedent: "npm:^2.0.0" uuid: "npm:^9.0.0" - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: c9077396239e03370a6010f6cf60cfa566fab7e39c013d887f78398a17b29774d34991eaa8560add3692c25a12ac1db01b15b7a8552709b1d700aac0b7e24c5f + checksum: 71bfd976c0b9f23bd23661787f382193814291e2ad06d7828c70b6c5c4e1f0636d02d8a7788828037a62dee4f87ce6ce25a9c6b79ed6d8a6db94b698cfaf614a languageName: node linkType: hard -"@storybook/addon-backgrounds@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-backgrounds@npm:7.5.3" +"@storybook/addon-backgrounds@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/addon-backgrounds@npm:7.6.6" dependencies: - "@storybook/client-logger": "npm:7.5.3" - "@storybook/components": "npm:7.5.3" - "@storybook/core-events": "npm:7.5.3" "@storybook/global": "npm:^5.0.0" - "@storybook/manager-api": "npm:7.5.3" - "@storybook/preview-api": "npm:7.5.3" - "@storybook/theming": "npm:7.5.3" - "@storybook/types": "npm:7.5.3" memoizerific: "npm:^1.11.3" ts-dedent: "npm:^2.0.0" - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: 70308dbec3cc77e3978d1036e5dc442c3ec84904d5d44e877c286d1db56d7f0d87dc5eea1284160006111b10e2e57f9b4c55025fd953dbcc3717a5e9c6025d63 + checksum: 485e9712c82e72579ad538a36bac1200e652dbf42141164f75930ddd2d394493adbba94ad930ff4233504a3f9b9bdded51df5c4758e14703727ec7789448d283 languageName: node linkType: hard -"@storybook/addon-controls@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-controls@npm:7.5.3" +"@storybook/addon-controls@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/addon-controls@npm:7.6.6" dependencies: - "@storybook/blocks": "npm:7.5.3" - "@storybook/client-logger": "npm:7.5.3" - "@storybook/components": "npm:7.5.3" - "@storybook/core-common": "npm:7.5.3" - "@storybook/core-events": "npm:7.5.3" - "@storybook/manager-api": "npm:7.5.3" - "@storybook/node-logger": "npm:7.5.3" - "@storybook/preview-api": "npm:7.5.3" - "@storybook/theming": "npm:7.5.3" - "@storybook/types": "npm:7.5.3" + "@storybook/blocks": "npm:7.6.6" lodash: "npm:^4.17.21" ts-dedent: "npm:^2.0.0" - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: 43d39c726ff9c21aab0472f0b56e17633b2c1bc4ad3c445b0e718eff92efde29a3c6c5b4d3cd50841c9d03fe6b8231873e9dedf178e4b11efaa79ff717ca25b3 + checksum: 895139db0c3f8e2fd8ad666133e60c8fab9c514baae4d895d2c533c2501114ed271f0e8c8997ba2220f560634028d55a991389ab48373b73840a5be24331214d languageName: node linkType: hard -"@storybook/addon-docs@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-docs@npm:7.5.3" +"@storybook/addon-docs@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/addon-docs@npm:7.6.6" dependencies: "@jest/transform": "npm:^29.3.1" "@mdx-js/react": "npm:^2.1.5" - "@storybook/blocks": "npm:7.5.3" - "@storybook/client-logger": "npm:7.5.3" - "@storybook/components": "npm:7.5.3" - "@storybook/csf-plugin": "npm:7.5.3" - "@storybook/csf-tools": "npm:7.5.3" + "@storybook/blocks": "npm:7.6.6" + "@storybook/client-logger": "npm:7.6.6" + "@storybook/components": "npm:7.6.6" + "@storybook/csf-plugin": "npm:7.6.6" + "@storybook/csf-tools": "npm:7.6.6" "@storybook/global": "npm:^5.0.0" "@storybook/mdx2-csf": "npm:^1.0.0" - "@storybook/node-logger": "npm:7.5.3" - "@storybook/postinstall": "npm:7.5.3" - "@storybook/preview-api": "npm:7.5.3" - "@storybook/react-dom-shim": "npm:7.5.3" - "@storybook/theming": "npm:7.5.3" - "@storybook/types": "npm:7.5.3" + "@storybook/node-logger": "npm:7.6.6" + "@storybook/postinstall": "npm:7.6.6" + "@storybook/preview-api": "npm:7.6.6" + "@storybook/react-dom-shim": "npm:7.6.6" + "@storybook/theming": "npm:7.6.6" + "@storybook/types": "npm:7.6.6" fs-extra: "npm:^11.1.0" remark-external-links: "npm:^8.0.0" remark-slug: "npm:^6.0.0" @@ -4888,223 +4991,137 @@ __metadata: peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: a54f608cbf9f67db3dde5c2fc8ce05579a2a3ca449cf52a919535710881d88d6548fffad8c1fc7964a16d6e68578a85b5cf1ab3d15b691a0154d94ab444feab1 - languageName: node - linkType: hard - -"@storybook/addon-essentials@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-essentials@npm:7.5.3" - dependencies: - "@storybook/addon-actions": "npm:7.5.3" - "@storybook/addon-backgrounds": "npm:7.5.3" - "@storybook/addon-controls": "npm:7.5.3" - "@storybook/addon-docs": "npm:7.5.3" - "@storybook/addon-highlight": "npm:7.5.3" - "@storybook/addon-measure": "npm:7.5.3" - "@storybook/addon-outline": "npm:7.5.3" - "@storybook/addon-toolbars": "npm:7.5.3" - "@storybook/addon-viewport": "npm:7.5.3" - "@storybook/core-common": "npm:7.5.3" - "@storybook/manager-api": "npm:7.5.3" - "@storybook/node-logger": "npm:7.5.3" - "@storybook/preview-api": "npm:7.5.3" + checksum: f98102c91d0f811a75f765088a3cc4ec2e79ce7ae07eb102ca49f7cc2f1fd54e9ad54ee94b560812d93cad9ad0ece5dd83f916f6d133ec8aebaa3ecea177ed76 + languageName: node + linkType: hard + +"@storybook/addon-essentials@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/addon-essentials@npm:7.6.6" + dependencies: + "@storybook/addon-actions": "npm:7.6.6" + "@storybook/addon-backgrounds": "npm:7.6.6" + "@storybook/addon-controls": "npm:7.6.6" + "@storybook/addon-docs": "npm:7.6.6" + "@storybook/addon-highlight": "npm:7.6.6" + "@storybook/addon-measure": "npm:7.6.6" + "@storybook/addon-outline": "npm:7.6.6" + "@storybook/addon-toolbars": "npm:7.6.6" + "@storybook/addon-viewport": "npm:7.6.6" + "@storybook/core-common": "npm:7.6.6" + "@storybook/manager-api": "npm:7.6.6" + "@storybook/node-logger": "npm:7.6.6" + "@storybook/preview-api": "npm:7.6.6" ts-dedent: "npm:^2.0.0" peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 4f74cb0558c965b04e955004f8902464341bc87f790d6b80b2824a8707b4038ca3334634f7a0e29c814de913b38eb1e116bb58db86f8819ea37bd5d6cb927a39 + checksum: 3392e9fe5994f996804425a942762f7bdb8f26344848d9b58a81b50d85f9ce86ebdaf2ba15d7dac1f64897a61b61653ead3f2e995897cfd7fe894f60e452ac56 languageName: node linkType: hard -"@storybook/addon-highlight@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-highlight@npm:7.5.3" +"@storybook/addon-highlight@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/addon-highlight@npm:7.6.6" dependencies: - "@storybook/core-events": "npm:7.5.3" "@storybook/global": "npm:^5.0.0" - "@storybook/preview-api": "npm:7.5.3" - checksum: d0d8665682bcbc4241489e75695dba4fa831803ddbe17c0936dc7a1e1981237f8698b6b228031594def37a2df9a7ce217afc279aa4f3af052c67c2579972bf70 + checksum: fc526ae81476dca1b0d4e1f062af41ba534a06a762bd1197a5c30e10d68cb94ab3d42454171609de32cc2283adee37f0d29c84704c436a02b9bd1fa03b97c8d7 languageName: node linkType: hard -"@storybook/addon-interactions@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-interactions@npm:7.5.3" +"@storybook/addon-interactions@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/addon-interactions@npm:7.6.6" dependencies: - "@storybook/client-logger": "npm:7.5.3" - "@storybook/components": "npm:7.5.3" - "@storybook/core-common": "npm:7.5.3" - "@storybook/core-events": "npm:7.5.3" "@storybook/global": "npm:^5.0.0" - "@storybook/instrumenter": "npm:7.5.3" - "@storybook/manager-api": "npm:7.5.3" - "@storybook/preview-api": "npm:7.5.3" - "@storybook/theming": "npm:7.5.3" - "@storybook/types": "npm:7.5.3" + "@storybook/types": "npm:7.6.6" jest-mock: "npm:^27.0.6" polished: "npm:^4.2.2" ts-dedent: "npm:^2.2.0" - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: e9c4b42e781a56f151687a8c116bcdfd2033ff104af66d2e802f35d6f1fc859c1b312186946836cd4be7ebba8b85487c9f4a17b0b2d54778cd88066fc7ed03d5 + checksum: 6ae3d389f5a569fb718b4137f4dbba16d7524af8f1e6b3da7a0b6793fae1402eea27be2d6741d662824f1e000147f39a0300ac3b46f809cfd916d60483e2ac1b languageName: node linkType: hard -"@storybook/addon-links@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-links@npm:7.5.3" +"@storybook/addon-links@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/addon-links@npm:7.6.6" dependencies: - "@storybook/client-logger": "npm:7.5.3" - "@storybook/core-events": "npm:7.5.3" - "@storybook/csf": "npm:^0.1.0" + "@storybook/csf": "npm:^0.1.2" "@storybook/global": "npm:^5.0.0" - "@storybook/manager-api": "npm:7.5.3" - "@storybook/preview-api": "npm:7.5.3" - "@storybook/router": "npm:7.5.3" - "@storybook/types": "npm:7.5.3" - prop-types: "npm:^15.7.2" ts-dedent: "npm:^2.0.0" peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 peerDependenciesMeta: react: optional: true - react-dom: - optional: true - checksum: 5ac8ccf17be8a2029a028cb1e680bcc24ea937b60e5a1d785018668b4388809c5a42744ec4a9c17d1e6571241298c7f4de0750ab32feed49b82ac32aa4d6dcbc + checksum: 2598ee0bff2794f86e5797d0cae157960b6ba083820628d1bf1a90ef0d48dc7d54901a5cb8cba8cdf3d2aa8e5147b6e362034981a5a5ff14870b594d49b6898f languageName: node linkType: hard -"@storybook/addon-measure@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-measure@npm:7.5.3" +"@storybook/addon-measure@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/addon-measure@npm:7.6.6" dependencies: - "@storybook/client-logger": "npm:7.5.3" - "@storybook/components": "npm:7.5.3" - "@storybook/core-events": "npm:7.5.3" "@storybook/global": "npm:^5.0.0" - "@storybook/manager-api": "npm:7.5.3" - "@storybook/preview-api": "npm:7.5.3" - "@storybook/types": "npm:7.5.3" tiny-invariant: "npm:^1.3.1" - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: 48a7bf4d6b252ec1b892ece3ee0bf3385ede2aa7a284f49443fe77d36d64cc12366051a6ad3b403da7282f2e631253722b76cf7310f0110c5da812fa27c8cc6b + checksum: 7dfa01eedb3432afff9122afa091f9d841a81b18a4049d2bf50525de1914511ffd7fb4c1fc1349a3c07148d0f69fe38761635b576da4bf735863be7f8089ba8f languageName: node linkType: hard -"@storybook/addon-onboarding@npm:1.0.8": - version: 1.0.8 - resolution: "@storybook/addon-onboarding@npm:1.0.8" +"@storybook/addon-onboarding@npm:1.0.10": + version: 1.0.10 + resolution: "@storybook/addon-onboarding@npm:1.0.10" dependencies: - "@storybook/telemetry": "npm:^7.1.0-alpha.32" + "@storybook/telemetry": "npm:^7.1.0" react-confetti: "npm:^6.1.0" peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 12444cd8831e289df6e46d76fb61932678e4424e591a3ea0be1517547e2111bd35e54161674b851d00d507b05b7e28c6ca83e2b1b09bca483004c51b8f4b5acd + checksum: 4ee04976e9adcf73d9b3645b766e39ba19e34144c05348b63390719cdf77f79fe9e44da45af2cd61849940427c1c553563165d57511e54e1bf26fb3817ec53dc languageName: node linkType: hard -"@storybook/addon-outline@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-outline@npm:7.5.3" +"@storybook/addon-outline@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/addon-outline@npm:7.6.6" dependencies: - "@storybook/client-logger": "npm:7.5.3" - "@storybook/components": "npm:7.5.3" - "@storybook/core-events": "npm:7.5.3" "@storybook/global": "npm:^5.0.0" - "@storybook/manager-api": "npm:7.5.3" - "@storybook/preview-api": "npm:7.5.3" - "@storybook/types": "npm:7.5.3" ts-dedent: "npm:^2.0.0" - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: 754413dc06a7fc4a0e0bd8e64553443afd0930b387ddeec5b32ef1e84ba9740d0944f9e60d793d8797fd588400c09fdfb3c5aa9330955bb4967e0b1c1fa3f309 + checksum: 789ce5acd082256ccc5e754c6877beb45d8d27e9c3aef30a9eef0f391beaa4fbac25053a860136f74a4bfc6c593684f194e1a5cce299c67a969cfa2bb027026d languageName: node linkType: hard -"@storybook/addon-toolbars@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-toolbars@npm:7.5.3" - dependencies: - "@storybook/client-logger": "npm:7.5.3" - "@storybook/components": "npm:7.5.3" - "@storybook/manager-api": "npm:7.5.3" - "@storybook/preview-api": "npm:7.5.3" - "@storybook/theming": "npm:7.5.3" - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: d0c393c9e16b14654fdc92a78eaf20b2c0685fa1ac9c1d1011c11e72cc5ad69a187ef7ac2e6568e3a77c32a53c524da126b55f3d7a31d97d958bc809d34b79c8 +"@storybook/addon-toolbars@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/addon-toolbars@npm:7.6.6" + checksum: 1a71902f5e4a0e1d54847fdbe1312355eac6f3043ccd4c0ebaabb057b530b6c271bdad0a13e7b84b2cc2a604b144234567177f43a8bd1411a671d496c6151693 languageName: node linkType: hard -"@storybook/addon-viewport@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/addon-viewport@npm:7.5.3" +"@storybook/addon-viewport@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/addon-viewport@npm:7.6.6" dependencies: - "@storybook/client-logger": "npm:7.5.3" - "@storybook/components": "npm:7.5.3" - "@storybook/core-events": "npm:7.5.3" - "@storybook/global": "npm:^5.0.0" - "@storybook/manager-api": "npm:7.5.3" - "@storybook/preview-api": "npm:7.5.3" - "@storybook/theming": "npm:7.5.3" memoizerific: "npm:^1.11.3" - prop-types: "npm:^15.7.2" - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: 50207e3bb943ea43914513324fc35c8036556a797c20f1b66bf89615a7158450652d78bbe9ae09a11c539d4dcfeb8a716f1bb41d92e3fecca61aa1ac5bf8646f + checksum: 4821247b05fb08771c65ae2a31e54acae5ce75ceef251693789d1fbe40b8baf948848f3b22032df62053a20a46b16b14f2a0234f5576ec970ef2bb81c7cac124 languageName: node linkType: hard -"@storybook/blocks@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/blocks@npm:7.5.3" +"@storybook/blocks@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/blocks@npm:7.6.6" dependencies: - "@storybook/channels": "npm:7.5.3" - "@storybook/client-logger": "npm:7.5.3" - "@storybook/components": "npm:7.5.3" - "@storybook/core-events": "npm:7.5.3" - "@storybook/csf": "npm:^0.1.0" - "@storybook/docs-tools": "npm:7.5.3" + "@storybook/channels": "npm:7.6.6" + "@storybook/client-logger": "npm:7.6.6" + "@storybook/components": "npm:7.6.6" + "@storybook/core-events": "npm:7.6.6" + "@storybook/csf": "npm:^0.1.2" + "@storybook/docs-tools": "npm:7.6.6" "@storybook/global": "npm:^5.0.0" - "@storybook/manager-api": "npm:7.5.3" - "@storybook/preview-api": "npm:7.5.3" - "@storybook/theming": "npm:7.5.3" - "@storybook/types": "npm:7.5.3" + "@storybook/manager-api": "npm:7.6.6" + "@storybook/preview-api": "npm:7.6.6" + "@storybook/theming": "npm:7.6.6" + "@storybook/types": "npm:7.6.6" "@types/lodash": "npm:^4.14.167" color-convert: "npm:^2.0.1" dequal: "npm:^2.0.2" @@ -5120,18 +5137,18 @@ __metadata: peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: d7036bea0ff1137063dd7aab28a6fe2e114809127b7f53aadfae272b752b1ffaaf54ec8cbdff689da54285d64cfff58108885fe8f937748efc71a7bbdae0bf75 + checksum: b824c337fe4f8eafc36c2c41f69ce005db364bf9b9396110b00f87b2e7600a9827663d80e1ab85c34e5ee4697f9109857a4547aabc37d99f68cbf482596dbf4b languageName: node linkType: hard -"@storybook/builder-manager@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/builder-manager@npm:7.5.3" +"@storybook/builder-manager@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/builder-manager@npm:7.6.6" dependencies: "@fal-works/esbuild-plugin-global-externals": "npm:^2.1.2" - "@storybook/core-common": "npm:7.5.3" - "@storybook/manager": "npm:7.5.3" - "@storybook/node-logger": "npm:7.5.3" + "@storybook/core-common": "npm:7.6.6" + "@storybook/manager": "npm:7.6.6" + "@storybook/node-logger": "npm:7.6.6" "@types/ejs": "npm:^3.1.1" "@types/find-cache-dir": "npm:^3.2.1" "@yarnpkg/esbuild-plugin-pnp": "npm:^3.0.0-rc.10" @@ -5144,36 +5161,37 @@ __metadata: fs-extra: "npm:^11.1.0" process: "npm:^0.11.10" util: "npm:^0.12.4" - checksum: 35ed5138a7b7fd968539a3b177a3b8b9a2eff4ddea0a05eb1134188a5c14c0d4334a8e7ac6e5bb5a2eea0c1fe7eec079eee7e056a9584933fd1e9f01def98157 + checksum: a6f2ca8c4478f15c561cea0f06f4bc38af5eaf39d743803414561546c04d3707f485f8cd219f83863d3d3ccade10600d1f3053bdb8cdbdf19da19acdc4c86097 languageName: node linkType: hard -"@storybook/builder-webpack5@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/builder-webpack5@npm:7.5.3" +"@storybook/builder-webpack5@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/builder-webpack5@npm:7.6.6" dependencies: - "@babel/core": "npm:^7.22.0" - "@storybook/channels": "npm:7.5.3" - "@storybook/client-logger": "npm:7.5.3" - "@storybook/core-common": "npm:7.5.3" - "@storybook/core-events": "npm:7.5.3" - "@storybook/core-webpack": "npm:7.5.3" - "@storybook/node-logger": "npm:7.5.3" - "@storybook/preview": "npm:7.5.3" - "@storybook/preview-api": "npm:7.5.3" + "@babel/core": "npm:^7.23.2" + "@storybook/channels": "npm:7.6.6" + "@storybook/client-logger": "npm:7.6.6" + "@storybook/core-common": "npm:7.6.6" + "@storybook/core-events": "npm:7.6.6" + "@storybook/core-webpack": "npm:7.6.6" + "@storybook/node-logger": "npm:7.6.6" + "@storybook/preview": "npm:7.6.6" + "@storybook/preview-api": "npm:7.6.6" "@swc/core": "npm:^1.3.82" "@types/node": "npm:^18.0.0" "@types/semver": "npm:^7.3.4" babel-loader: "npm:^9.0.0" - babel-plugin-named-exports-order: "npm:^0.0.2" browser-assert: "npm:^1.2.1" case-sensitive-paths-webpack-plugin: "npm:^2.4.0" constants-browserify: "npm:^1.0.0" css-loader: "npm:^6.7.1" + es-module-lexer: "npm:^1.4.1" express: "npm:^4.17.3" fork-ts-checker-webpack-plugin: "npm:^8.0.0" fs-extra: "npm:^11.1.0" html-webpack-plugin: "npm:^5.5.0" + magic-string: "npm:^0.30.5" path-browserify: "npm:^1.0.1" process: "npm:^0.11.10" semver: "npm:^7.3.7" @@ -5191,40 +5209,40 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: ac979ca329a55796743790adcd1279ee92628c81dfc2fb1d2a399b00baf88b5ed99b4ba386bc39177ded26edf8e3a75ced2cd89c5d361865edd358fd288d0fc4 + checksum: dd0c14966fad66d3fb24fc30c3b6ee7b62db003112154902f8eaaec2784589183f41d0cfd41a2f16948f838400567faa0b56dd6023a4b3698800273839d9fb2c languageName: node linkType: hard -"@storybook/channels@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/channels@npm:7.5.3" +"@storybook/channels@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/channels@npm:7.6.6" dependencies: - "@storybook/client-logger": "npm:7.5.3" - "@storybook/core-events": "npm:7.5.3" + "@storybook/client-logger": "npm:7.6.6" + "@storybook/core-events": "npm:7.6.6" "@storybook/global": "npm:^5.0.0" qs: "npm:^6.10.0" telejson: "npm:^7.2.0" tiny-invariant: "npm:^1.3.1" - checksum: 875977b663c0d9d82e47206fa94bbe2f072b2e8700e1f7bec9a0848bbc368247c270d1823221b3455292dd68cc580483a03849bc43e92c551b2224932ff57f92 + checksum: 081666ebe90e1710ed1cd8eb0cae01ff1a307d448c83f83a51d4ff9d55fa54063460024f6d6464ffb0713be37471120a2d60a9981dfcd786cf6a628487c525c2 languageName: node linkType: hard -"@storybook/cli@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/cli@npm:7.5.3" +"@storybook/cli@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/cli@npm:7.6.6" dependencies: - "@babel/core": "npm:^7.22.9" - "@babel/preset-env": "npm:^7.22.9" - "@babel/types": "npm:^7.22.5" + "@babel/core": "npm:^7.23.2" + "@babel/preset-env": "npm:^7.23.2" + "@babel/types": "npm:^7.23.0" "@ndelangen/get-tarball": "npm:^3.0.7" - "@storybook/codemod": "npm:7.5.3" - "@storybook/core-common": "npm:7.5.3" - "@storybook/core-events": "npm:7.5.3" - "@storybook/core-server": "npm:7.5.3" - "@storybook/csf-tools": "npm:7.5.3" - "@storybook/node-logger": "npm:7.5.3" - "@storybook/telemetry": "npm:7.5.3" - "@storybook/types": "npm:7.5.3" + "@storybook/codemod": "npm:7.6.6" + "@storybook/core-common": "npm:7.6.6" + "@storybook/core-events": "npm:7.6.6" + "@storybook/core-server": "npm:7.6.6" + "@storybook/csf-tools": "npm:7.6.6" + "@storybook/node-logger": "npm:7.6.6" + "@storybook/telemetry": "npm:7.6.6" + "@storybook/types": "npm:7.6.6" "@types/semver": "npm:^7.3.4" "@yarnpkg/fslib": "npm:2.10.3" "@yarnpkg/libzip": "npm:2.3.0" @@ -5241,7 +5259,7 @@ __metadata: get-port: "npm:^5.1.1" giget: "npm:^1.0.0" globby: "npm:^11.0.2" - jscodeshift: "npm:^0.14.0" + jscodeshift: "npm:^0.15.1" leven: "npm:^3.1.0" ora: "npm:^5.4.1" prettier: "npm:^2.8.0" @@ -5257,79 +5275,79 @@ __metadata: bin: getstorybook: ./bin/index.js sb: ./bin/index.js - checksum: 8d1e694fb39d805482f5b61fa9b2c4fcc5fa70cfe97ba64e0be220b73faaf69454e7347f1630618e53e6c3abb6c152c57df72f6b93b103a172b8930f4286f480 + checksum: 2f186d602508c19e4a46b69c2e1bb4d41c00e81c4cbed3babd91e522fb29a70313a49924376f4d50a23ccb9becbf2226891303840af864d5f2f2be5dace8c2f0 languageName: node linkType: hard -"@storybook/client-logger@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/client-logger@npm:7.5.3" +"@storybook/client-logger@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/client-logger@npm:7.6.6" dependencies: "@storybook/global": "npm:^5.0.0" - checksum: 43997b47a4e49b38c599a08de1cec7a6ae6f000ec35a1d676522325aba60bc11507ad18cb0f40954bcfd77dfbb853493687e4e8fd88e2fdac07cd282ecc0d0bf + checksum: c7d1c8ef8d885c1b82b27a7ef45d75b33cb5a8805dc978240b82e4d319165e690a28b296fb9d364a0450be2fad478e49e99b898294c520082f7f9890dda8f1a6 languageName: node linkType: hard -"@storybook/codemod@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/codemod@npm:7.5.3" +"@storybook/codemod@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/codemod@npm:7.6.6" dependencies: - "@babel/core": "npm:^7.22.9" - "@babel/preset-env": "npm:^7.22.9" - "@babel/types": "npm:^7.22.5" - "@storybook/csf": "npm:^0.1.0" - "@storybook/csf-tools": "npm:7.5.3" - "@storybook/node-logger": "npm:7.5.3" - "@storybook/types": "npm:7.5.3" + "@babel/core": "npm:^7.23.2" + "@babel/preset-env": "npm:^7.23.2" + "@babel/types": "npm:^7.23.0" + "@storybook/csf": "npm:^0.1.2" + "@storybook/csf-tools": "npm:7.6.6" + "@storybook/node-logger": "npm:7.6.6" + "@storybook/types": "npm:7.6.6" "@types/cross-spawn": "npm:^6.0.2" cross-spawn: "npm:^7.0.3" globby: "npm:^11.0.2" - jscodeshift: "npm:^0.14.0" + jscodeshift: "npm:^0.15.1" lodash: "npm:^4.17.21" prettier: "npm:^2.8.0" recast: "npm:^0.23.1" - checksum: 83c3e2306a00e2351b1a9930fe1a85eeffb5cee5a92946339352094c01d6d5c223ec3be075e35e7d1abd9957a69046d32f414625cfc245c6b567d76443567c20 + checksum: 0611928617ceeb998b82353cf7926b9a7f7db3729dc5cf3230bf28794b1fbfba113fbf94edeed2ac67926359f8dc4cd2f1e3646075b27aedd65f9399e21e6314 languageName: node linkType: hard -"@storybook/components@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/components@npm:7.5.3" +"@storybook/components@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/components@npm:7.6.6" dependencies: "@radix-ui/react-select": "npm:^1.2.2" "@radix-ui/react-toolbar": "npm:^1.0.4" - "@storybook/client-logger": "npm:7.5.3" - "@storybook/csf": "npm:^0.1.0" + "@storybook/client-logger": "npm:7.6.6" + "@storybook/csf": "npm:^0.1.2" "@storybook/global": "npm:^5.0.0" - "@storybook/theming": "npm:7.5.3" - "@storybook/types": "npm:7.5.3" + "@storybook/theming": "npm:7.6.6" + "@storybook/types": "npm:7.6.6" memoizerific: "npm:^1.11.3" use-resize-observer: "npm:^9.1.0" util-deprecate: "npm:^1.0.2" peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 7d25a5fa2d7c8686c455ee260989e2cf5c0ad3e9d8ba1093a1e43c5647775c06ef79c084b539cbc9fee4753ee175759a7d0e2715d22c7b929687620ad9f4e841 + checksum: 125918bef3cc57cbdc0d267fcfde0553c306e644b99c4451a704632e071a6f38d3395757d442227a48648ae1b399585ffc74d1e1130d94b2f2d626bc04b1db8e languageName: node linkType: hard -"@storybook/core-client@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/core-client@npm:7.5.3" +"@storybook/core-client@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/core-client@npm:7.6.6" dependencies: - "@storybook/client-logger": "npm:7.5.3" - "@storybook/preview-api": "npm:7.5.3" - checksum: 41c21431f803843c2cf43c72685f10df9282fbe0730623000979296e864770d38c444b4812ed81e6a14bdbfc7ad778761b5c68dd27a8888029cb23e6f82cb1c3 + "@storybook/client-logger": "npm:7.6.6" + "@storybook/preview-api": "npm:7.6.6" + checksum: 71eff6c95de026bc00d7fd78b49c9213ebb698670692859aa05371d6afcd3d621bc4912e00e7aa54acb7d72df0311c1d8e3e86d0ca9902d7b9ab978cd37c2304 languageName: node linkType: hard -"@storybook/core-common@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/core-common@npm:7.5.3" +"@storybook/core-common@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/core-common@npm:7.6.6" dependencies: - "@storybook/core-events": "npm:7.5.3" - "@storybook/node-logger": "npm:7.5.3" - "@storybook/types": "npm:7.5.3" + "@storybook/core-events": "npm:7.6.6" + "@storybook/node-logger": "npm:7.6.6" + "@storybook/types": "npm:7.6.6" "@types/find-cache-dir": "npm:^3.2.1" "@types/node": "npm:^18.0.0" "@types/node-fetch": "npm:^2.6.4" @@ -5350,38 +5368,38 @@ __metadata: pretty-hrtime: "npm:^1.0.3" resolve-from: "npm:^5.0.0" ts-dedent: "npm:^2.0.0" - checksum: f099aca961729abaeafdf224e61da64237632bf13088dea703d13036c89d7b0a188ce4ac4b0d26d40523ddb8b8d12a64a26dac2c5514f7ed7939c47340acba4f + checksum: 19c7eefc93d8884f204cf7b2a8f232de531783789d55f243de2a54f5813fc7eee9f93aa30d36434b05579ad6e812c7fb99c2fdf8cd58c368761d91fa4031d8a8 languageName: node linkType: hard -"@storybook/core-events@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/core-events@npm:7.5.3" +"@storybook/core-events@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/core-events@npm:7.6.6" dependencies: ts-dedent: "npm:^2.0.0" - checksum: 2c0db835f840e8001928cc032b55531f9225eb146aaf069437925c2f55ad28a15eea287885c3cd59b9be3bb31822dc427fe9a33d79bc0861ceb3f6ee5395766d + checksum: 5d43c14374015bbf653009bb0fcc99690ace861af6130074c38bf2e2baaf8415ab9381261f1d058e4890a6151d827df00e4a59b9d593ecb06cca7b0af0cd7abe languageName: node linkType: hard -"@storybook/core-server@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/core-server@npm:7.5.3" +"@storybook/core-server@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/core-server@npm:7.6.6" dependencies: "@aw-web-design/x-default-browser": "npm:1.4.126" "@discoveryjs/json-ext": "npm:^0.5.3" - "@storybook/builder-manager": "npm:7.5.3" - "@storybook/channels": "npm:7.5.3" - "@storybook/core-common": "npm:7.5.3" - "@storybook/core-events": "npm:7.5.3" - "@storybook/csf": "npm:^0.1.0" - "@storybook/csf-tools": "npm:7.5.3" + "@storybook/builder-manager": "npm:7.6.6" + "@storybook/channels": "npm:7.6.6" + "@storybook/core-common": "npm:7.6.6" + "@storybook/core-events": "npm:7.6.6" + "@storybook/csf": "npm:^0.1.2" + "@storybook/csf-tools": "npm:7.6.6" "@storybook/docs-mdx": "npm:^0.1.0" "@storybook/global": "npm:^5.0.0" - "@storybook/manager": "npm:7.5.3" - "@storybook/node-logger": "npm:7.5.3" - "@storybook/preview-api": "npm:7.5.3" - "@storybook/telemetry": "npm:7.5.3" - "@storybook/types": "npm:7.5.3" + "@storybook/manager": "npm:7.6.6" + "@storybook/node-logger": "npm:7.6.6" + "@storybook/preview-api": "npm:7.6.6" + "@storybook/telemetry": "npm:7.6.6" + "@storybook/types": "npm:7.6.6" "@types/detect-port": "npm:^1.3.0" "@types/node": "npm:^18.0.0" "@types/pretty-hrtime": "npm:^1.0.0" @@ -5408,47 +5426,47 @@ __metadata: util-deprecate: "npm:^1.0.2" watchpack: "npm:^2.2.0" ws: "npm:^8.2.3" - checksum: 6fa783f3efbd6e2cbfb2d29c8d4da8c5bf6daa0c1615bd6484bfd92115c45295fc91de095961f178cb28f5e95cc73c62f67d59c53c5d972ba3fdd1e086d006f4 + checksum: 6381bd6fa0f55320d3204a42cb8ea8da2d48c940c3ede060e6d07a980bc6c3a460094d5b5b2b9a11ddd1b78bfa3e2f5e4a54f8cbb64ec7d084413ff1c9ad763d languageName: node linkType: hard -"@storybook/core-webpack@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/core-webpack@npm:7.5.3" +"@storybook/core-webpack@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/core-webpack@npm:7.6.6" dependencies: - "@storybook/core-common": "npm:7.5.3" - "@storybook/node-logger": "npm:7.5.3" - "@storybook/types": "npm:7.5.3" + "@storybook/core-common": "npm:7.6.6" + "@storybook/node-logger": "npm:7.6.6" + "@storybook/types": "npm:7.6.6" "@types/node": "npm:^18.0.0" ts-dedent: "npm:^2.0.0" - checksum: 996a12ef62406fc54da0d8c6ebd597b824059fd8597c831e241ea1f4115dcdcdaeff9c1572cbe66a949194295436ba0a029555964d03effa3babfe2ee7024eb7 + checksum: 92ff0a2c092375114d588e9898910070db486c57b4746c314b95d2953eba740759f308b5ff08c6e43490c460c59a1df20e1eed2eb1b5ed8b3984c198a0fbcb32 languageName: node linkType: hard -"@storybook/csf-plugin@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/csf-plugin@npm:7.5.3" +"@storybook/csf-plugin@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/csf-plugin@npm:7.6.6" dependencies: - "@storybook/csf-tools": "npm:7.5.3" + "@storybook/csf-tools": "npm:7.6.6" unplugin: "npm:^1.3.1" - checksum: 700ef994b1694faf5955d37e52569b8e20f15d800c3aa8ff4a24b02f5a0cf1467a07d72149314b46de477bb710d7d523ca05b20f97f953b28323aa41b30930da + checksum: 9abfe41923e26d804d65fa3e653c1eb07d1b3d003e1e27c96ee3146a0c4d0757ca1ad201c4d3ae5939a29c5276d1081bfcc55b793354b9aeb2e4cfe5af6770d5 languageName: node linkType: hard -"@storybook/csf-tools@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/csf-tools@npm:7.5.3" +"@storybook/csf-tools@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/csf-tools@npm:7.6.6" dependencies: - "@babel/generator": "npm:^7.22.9" - "@babel/parser": "npm:^7.22.7" - "@babel/traverse": "npm:^7.22.8" - "@babel/types": "npm:^7.22.5" - "@storybook/csf": "npm:^0.1.0" - "@storybook/types": "npm:7.5.3" + "@babel/generator": "npm:^7.23.0" + "@babel/parser": "npm:^7.23.0" + "@babel/traverse": "npm:^7.23.2" + "@babel/types": "npm:^7.23.0" + "@storybook/csf": "npm:^0.1.2" + "@storybook/types": "npm:7.6.6" fs-extra: "npm:^11.1.0" recast: "npm:^0.23.1" ts-dedent: "npm:^2.0.0" - checksum: d92300f8bb1c70b2313f3fe8fdae5a88fd46b8ca6403ac74543b695289bddd827a7ed8e46b31b1ebc87c5a3b5f4c07a3652f05ff00e85a66df5159bbfc36e2df + checksum: 8a94ca5eb2fa06e81434d4aff61b2002765a332764690ae29a571358910ccd9d46e5464b980b70162fe420975fdaf68ebc5008fa3caa145bb87bc5008f935388 languageName: node linkType: hard @@ -5461,12 +5479,12 @@ __metadata: languageName: node linkType: hard -"@storybook/csf@npm:^0.1.0": - version: 0.1.1 - resolution: "@storybook/csf@npm:0.1.1" +"@storybook/csf@npm:^0.1.2": + version: 0.1.2 + resolution: "@storybook/csf@npm:0.1.2" dependencies: type-fest: "npm:^2.19.0" - checksum: 999bb87fbbe047a559bbaa5baf2ed84872fcd5cdcae3c1169f8e4c641eefe8759d09a09034a78ed114032c0e5cf6301b7fa89e5e3ce60d75cf0bd5e33ec0a6e7 + checksum: b51a55292e5d2af8b1d135a28ecaa94f8860ddfedcb393adfa2cca1ee23853156066f737d8be1cb5412f572781aa525dc0b2f6e4a6f6ce805489f0149efe837c languageName: node linkType: hard @@ -5477,17 +5495,18 @@ __metadata: languageName: node linkType: hard -"@storybook/docs-tools@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/docs-tools@npm:7.5.3" +"@storybook/docs-tools@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/docs-tools@npm:7.6.6" dependencies: - "@storybook/core-common": "npm:7.5.3" - "@storybook/preview-api": "npm:7.5.3" - "@storybook/types": "npm:7.5.3" + "@storybook/core-common": "npm:7.6.6" + "@storybook/preview-api": "npm:7.6.6" + "@storybook/types": "npm:7.6.6" "@types/doctrine": "npm:^0.0.3" + assert: "npm:^2.1.0" doctrine: "npm:^3.0.0" lodash: "npm:^4.17.21" - checksum: 1726947cbe552531831df426f55e297e2ad8dce5af274ab09ba52aa667f656420705301a34776d38a503728e86f4b6a4301566dfa543d40c909fd652f1b2a4a3 + checksum: fae6350b3f1328078129c8efe32abafd1c215d440ab189886178e300467b5a6306c9e2bab8f5629adb2461647b61b9243c790418cd4336510a1553ac0bdfea8d languageName: node linkType: hard @@ -5498,31 +5517,18 @@ __metadata: languageName: node linkType: hard -"@storybook/instrumenter@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/instrumenter@npm:7.5.3" - dependencies: - "@storybook/channels": "npm:7.5.3" - "@storybook/client-logger": "npm:7.5.3" - "@storybook/core-events": "npm:7.5.3" - "@storybook/global": "npm:^5.0.0" - "@storybook/preview-api": "npm:7.5.3" - checksum: dc260bc908df36119023512129fb07e297da0aefb880f469e9aceb0dac0edc2dc8be1754f693483382796b46c7b9854018f81999de315ef008d730b0e35a5822 - languageName: node - linkType: hard - -"@storybook/manager-api@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/manager-api@npm:7.5.3" +"@storybook/manager-api@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/manager-api@npm:7.6.6" dependencies: - "@storybook/channels": "npm:7.5.3" - "@storybook/client-logger": "npm:7.5.3" - "@storybook/core-events": "npm:7.5.3" - "@storybook/csf": "npm:^0.1.0" + "@storybook/channels": "npm:7.6.6" + "@storybook/client-logger": "npm:7.6.6" + "@storybook/core-events": "npm:7.6.6" + "@storybook/csf": "npm:^0.1.2" "@storybook/global": "npm:^5.0.0" - "@storybook/router": "npm:7.5.3" - "@storybook/theming": "npm:7.5.3" - "@storybook/types": "npm:7.5.3" + "@storybook/router": "npm:7.6.6" + "@storybook/theming": "npm:7.6.6" + "@storybook/types": "npm:7.6.6" dequal: "npm:^2.0.2" lodash: "npm:^4.17.21" memoizerific: "npm:^1.11.3" @@ -5530,17 +5536,14 @@ __metadata: store2: "npm:^2.14.2" telejson: "npm:^7.2.0" ts-dedent: "npm:^2.0.0" - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 8f48834b477ba07a252cb7a99e7513fab4d3f1cd52e4133e30de1984e43a5f86b94f55bfc06c218cfd98dc15ebb62d07f2f3929a37dbc74af29aaad0b779edea + checksum: 2d72453d55dbe329ded778164fa2bc9ebe3556e4daba8bd39732a7707fef842dadd7210274cbfa5f28e4709d14a010f3207794e211c2aa2dab92ef609ce674a9 languageName: node linkType: hard -"@storybook/manager@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/manager@npm:7.5.3" - checksum: 19e0a7d3791c0621c63fe1cbc6de6bdb92195d0cdff9259437c54763bd9958ddaaea75497a0be2b9ea8e5300e746f39c7c3ee5e0e1902a48f4f04a2f3aa0a23d +"@storybook/manager@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/manager@npm:7.6.6" + checksum: c6352090a810155fa04d670f682cd19e063245d9164416a7ae042b29c84af1963ad98c238613ae6c47a8af0c8a80eba22bf80528af73199610f086e4cc858ce3 languageName: node linkType: hard @@ -5551,56 +5554,56 @@ __metadata: languageName: node linkType: hard -"@storybook/node-logger@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/node-logger@npm:7.5.3" - checksum: 327f5eef43adcbbf9c5daa49c82ee8d57e6cf795defdde12b9988e04c66209ea99a49574f73a82c01c78331756dd5d50440a1d09cc7b3b6ff19e672d24390e94 +"@storybook/node-logger@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/node-logger@npm:7.6.6" + checksum: 2f6929c9260d2523953aa63faec5dc477a37bf18f5d0c20aff7711f4d39e428eb27c80a4a982a5842759d1531219e41a00635b2219fae999d8ec11354eab3aee languageName: node linkType: hard -"@storybook/postinstall@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/postinstall@npm:7.5.3" - checksum: b2bc3a91ffedb83a54624d6880fa10fab86db86abd6aaa07bc130abd9ffab21f5be8d7e880173c911e58b56f2dfcab03ae0d6e6ce710997f1c323b378d917932 +"@storybook/postinstall@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/postinstall@npm:7.6.6" + checksum: f70bc49a7f490da2615b4e59a0a2fd2dde14e4bb88322428055977182d85cd68cc85bdb46b5c8b4ba17e5920c3295bc6124550b2f8bd2e05b84ad28613367896 languageName: node linkType: hard -"@storybook/preset-create-react-app@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/preset-create-react-app@npm:7.5.3" +"@storybook/preset-create-react-app@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/preset-create-react-app@npm:7.6.6" dependencies: "@pmmmwh/react-refresh-webpack-plugin": "npm:^0.5.1" "@storybook/react-docgen-typescript-plugin": "npm:1.0.6--canary.9.0c3f3b7.0" - "@storybook/types": "npm:7.5.3" + "@storybook/types": "npm:7.6.6" "@types/babel__core": "npm:^7.1.7" - babel-plugin-react-docgen: "npm:^4.1.0" pnp-webpack-plugin: "npm:^1.7.0" semver: "npm:^7.3.5" peerDependencies: "@babel/core": "*" react-scripts: ">=5.0.0" - checksum: cd9582dc5306234609824b73dd1527c5b6a7b88210010e2a2f0df2696412393fa4b7ccfef12d13636eec8be4d18709d784395f0b5ea571a5498f9289282dc4f5 + checksum: e634bbcfb60bc9c85b6f2ba76b84e0db5ed2d613fd85100e2d030266b4636980024f850c7fe6c96616df9b31f6b8889b53dfb1c10dd025659853974a71c9a54c languageName: node linkType: hard -"@storybook/preset-react-webpack@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/preset-react-webpack@npm:7.5.3" +"@storybook/preset-react-webpack@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/preset-react-webpack@npm:7.6.6" dependencies: - "@babel/preset-flow": "npm:^7.22.5" - "@babel/preset-react": "npm:^7.22.5" - "@pmmmwh/react-refresh-webpack-plugin": "npm:^0.5.5" - "@storybook/core-webpack": "npm:7.5.3" - "@storybook/docs-tools": "npm:7.5.3" - "@storybook/node-logger": "npm:7.5.3" - "@storybook/react": "npm:7.5.3" + "@babel/preset-flow": "npm:^7.22.15" + "@babel/preset-react": "npm:^7.22.15" + "@pmmmwh/react-refresh-webpack-plugin": "npm:^0.5.11" + "@storybook/core-webpack": "npm:7.6.6" + "@storybook/docs-tools": "npm:7.6.6" + "@storybook/node-logger": "npm:7.6.6" + "@storybook/react": "npm:7.6.6" "@storybook/react-docgen-typescript-plugin": "npm:1.0.6--canary.9.0c3f3b7.0" "@types/node": "npm:^18.0.0" "@types/semver": "npm:^7.3.4" babel-plugin-add-react-displayname: "npm:^0.0.5" - babel-plugin-react-docgen: "npm:^4.2.1" fs-extra: "npm:^11.1.0" - react-refresh: "npm:^0.11.0" + magic-string: "npm:^0.30.5" + react-docgen: "npm:^7.0.0" + react-refresh: "npm:^0.14.0" semver: "npm:^7.3.7" webpack: "npm:5" peerDependencies: @@ -5612,20 +5615,20 @@ __metadata: optional: true typescript: optional: true - checksum: f0db46025dce3858a816b2dd71c8b52587360988dee0f89d79f69043326207efae07ae9450678bddbcf28b85fa41bf231294bce8404a3017d99c1aaa395b263c + checksum: d7ca93d1dcff815359bd7a7e9cd09001fb1e2c5c22401997a374180b27cdf8cedf3f5ca991f6876f4a41cbe280e26d2dfe277784f572dc783ef1f21f6c73ee95 languageName: node linkType: hard -"@storybook/preview-api@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/preview-api@npm:7.5.3" +"@storybook/preview-api@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/preview-api@npm:7.6.6" dependencies: - "@storybook/channels": "npm:7.5.3" - "@storybook/client-logger": "npm:7.5.3" - "@storybook/core-events": "npm:7.5.3" - "@storybook/csf": "npm:^0.1.0" + "@storybook/channels": "npm:7.6.6" + "@storybook/client-logger": "npm:7.6.6" + "@storybook/core-events": "npm:7.6.6" + "@storybook/csf": "npm:^0.1.2" "@storybook/global": "npm:^5.0.0" - "@storybook/types": "npm:7.5.3" + "@storybook/types": "npm:7.6.6" "@types/qs": "npm:^6.9.5" dequal: "npm:^2.0.2" lodash: "npm:^4.17.21" @@ -5634,14 +5637,14 @@ __metadata: synchronous-promise: "npm:^2.0.15" ts-dedent: "npm:^2.0.0" util-deprecate: "npm:^1.0.2" - checksum: 3acc48f1a9e801ff3b9e93261f68810a7f1827b777939dea0065c6385062c24e0e9081f3cca4b8b35d907dccbc2f1ea405ff8dcbfb6bbac9b4cd993f5ad23ccb + checksum: 7a26c769de6255c4ed5644da83b857960bae804f709f88d896cf0b643331d8ef1387ffd892231de9ed580f320406b75f9a7c436726916aae648a8e789734f4a3 languageName: node linkType: hard -"@storybook/preview@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/preview@npm:7.5.3" - checksum: e1f86b40f2d510f0f53ecb214c2cfb67f58c7f4b19456c1ef843e52e9caba4515d25c1ee74fcd514b5d4f74994d02d53f37f9b1c34a2209525b354f7fe8af111 +"@storybook/preview@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/preview@npm:7.6.6" + checksum: c9e966f667da878b771aed60ce18eb5c7e49ca8ed24de28a95c24d9ae3e604cedc10e77c9391ceda79764899b1aa5d3c5ca8dff000041930fffd1b9b44d2a048 languageName: node linkType: hard @@ -5663,23 +5666,23 @@ __metadata: languageName: node linkType: hard -"@storybook/react-dom-shim@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/react-dom-shim@npm:7.5.3" +"@storybook/react-dom-shim@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/react-dom-shim@npm:7.6.6" peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 91314e9891ef7f80fe32c2c239b112dafbc739d5eba72f8fd2ccde62058b9e649280dd2245705f13cb00044d9482a8b6f358a8262018449f5feb8e5df5b96494 + checksum: bf28419e6369f9044614b368816696b822e7543bed97487671b9749a76215000ad40393b1294aa5cf9effc5e5046372a3159a9534e7852e817d2b8deaea8d126 languageName: node linkType: hard -"@storybook/react-webpack5@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/react-webpack5@npm:7.5.3" +"@storybook/react-webpack5@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/react-webpack5@npm:7.6.6" dependencies: - "@storybook/builder-webpack5": "npm:7.5.3" - "@storybook/preset-react-webpack": "npm:7.5.3" - "@storybook/react": "npm:7.5.3" + "@storybook/builder-webpack5": "npm:7.6.6" + "@storybook/preset-react-webpack": "npm:7.6.6" + "@storybook/react": "npm:7.6.6" "@types/node": "npm:^18.0.0" peerDependencies: "@babel/core": ^7.22.0 @@ -5691,21 +5694,21 @@ __metadata: optional: true typescript: optional: true - checksum: 0e84dd5caffabfe75cf0405e1d40be8d26ac2d078198fc38494d90ede3d157042af86166c844186f6c32be76cab5bb774df7ee76526ec1020cc54f083cadaefc + checksum: ad253f848df3949ef42e4e7ed0925fe685aa910782b1714be7926d47c42a9069b248747878da3d69b8534b2086708291095e9235b296d99736e5763cb7d84bb0 languageName: node linkType: hard -"@storybook/react@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/react@npm:7.5.3" +"@storybook/react@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/react@npm:7.6.6" dependencies: - "@storybook/client-logger": "npm:7.5.3" - "@storybook/core-client": "npm:7.5.3" - "@storybook/docs-tools": "npm:7.5.3" + "@storybook/client-logger": "npm:7.6.6" + "@storybook/core-client": "npm:7.6.6" + "@storybook/docs-tools": "npm:7.6.6" "@storybook/global": "npm:^5.0.0" - "@storybook/preview-api": "npm:7.5.3" - "@storybook/react-dom-shim": "npm:7.5.3" - "@storybook/types": "npm:7.5.3" + "@storybook/preview-api": "npm:7.6.6" + "@storybook/react-dom-shim": "npm:7.6.6" + "@storybook/types": "npm:7.6.6" "@types/escodegen": "npm:^0.0.6" "@types/estree": "npm:^0.0.51" "@types/node": "npm:^18.0.0" @@ -5727,37 +5730,34 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 6433c12e12e1eb570d06bd1e03a8eacfcea08387b708bc3d423685d90c6de980ea39a79f5c188fa58c2b8b78fabbe0cb1c07136806f264eb05d2d50fd3532a13 + checksum: b9b349597b47f040faa7949405dc843073d0ca1c0799477e4ac3e1c8ffb0f5ff9462b2ff782391cefb8cf521ee804dbfb5da8a8f74d7ab69c3b012bccac556c0 languageName: node linkType: hard -"@storybook/router@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/router@npm:7.5.3" +"@storybook/router@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/router@npm:7.6.6" dependencies: - "@storybook/client-logger": "npm:7.5.3" + "@storybook/client-logger": "npm:7.6.6" memoizerific: "npm:^1.11.3" qs: "npm:^6.10.0" - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 2d85a9c16e2817f38a66d1718dbe2b9b23a31676e991d4760273acb508c40491cb7ff91f14a563529c3cd15becc213c3e3f5cf3290001323a89528907388b368 + checksum: cf8b81908a64692ebda42620ca18aa4db1e4472ea5e8bf6085db489503d2d315e3dbcee1d3097ead724cebfb20d26f8ca656055ebb5afa607e073ccd5488f0a4 languageName: node linkType: hard -"@storybook/telemetry@npm:7.5.3, @storybook/telemetry@npm:^7.1.0-alpha.32": - version: 7.5.3 - resolution: "@storybook/telemetry@npm:7.5.3" +"@storybook/telemetry@npm:7.6.6, @storybook/telemetry@npm:^7.1.0": + version: 7.6.6 + resolution: "@storybook/telemetry@npm:7.6.6" dependencies: - "@storybook/client-logger": "npm:7.5.3" - "@storybook/core-common": "npm:7.5.3" - "@storybook/csf-tools": "npm:7.5.3" + "@storybook/client-logger": "npm:7.6.6" + "@storybook/core-common": "npm:7.6.6" + "@storybook/csf-tools": "npm:7.6.6" chalk: "npm:^4.1.0" detect-package-manager: "npm:^2.0.1" fetch-retry: "npm:^5.0.2" fs-extra: "npm:^11.1.0" read-pkg-up: "npm:^7.0.1" - checksum: 6dc3eb14162ea7846913591b425701e9e238cad704bb00c062850b1db99417073a3c1e7a699768bb79968a4f11b4f4b542ba45845e578cf58665a7e101cf4f40 + checksum: b9e55909ab06a14f7836ff33a0e12a4531a0ae8770a149a15fbc59d5ed4ce73c77c9b5ac37828f863a4dc7821cadb5466a0c907e7215f2b6f6e4b6733be6fc1f languageName: node linkType: hard @@ -5772,30 +5772,30 @@ __metadata: languageName: node linkType: hard -"@storybook/theming@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/theming@npm:7.5.3" +"@storybook/theming@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/theming@npm:7.6.6" dependencies: "@emotion/use-insertion-effect-with-fallbacks": "npm:^1.0.0" - "@storybook/client-logger": "npm:7.5.3" + "@storybook/client-logger": "npm:7.6.6" "@storybook/global": "npm:^5.0.0" memoizerific: "npm:^1.11.3" peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 30dc5fd55617fcd7f33a6c75ddd1b2b5e1e28ce2973425fb8764f5770292659e1676264252bd14909ac9843799ab2e0a5d9e83ad3b4a29848c54600264f8af10 + checksum: 6f38bf55108c85ef8ab83e32839136cdb82495ff64a8a562ffda1d9e05361f2583f388b3ec0748ad8eb38c36fdcd302db360bff9c4e1e2745dbb2621f4b88b58 languageName: node linkType: hard -"@storybook/types@npm:7.5.3": - version: 7.5.3 - resolution: "@storybook/types@npm:7.5.3" +"@storybook/types@npm:7.6.6": + version: 7.6.6 + resolution: "@storybook/types@npm:7.6.6" dependencies: - "@storybook/channels": "npm:7.5.3" + "@storybook/channels": "npm:7.6.6" "@types/babel__core": "npm:^7.0.0" "@types/express": "npm:^4.7.0" file-system-cache: "npm:2.3.0" - checksum: 4219a92a6e7762ac5a1dae101aa1072f4c37607f6f2173ae70d224ddc294d9f70e55462eb42028a87e676840f2e87f1bc0e82b28bbb35207278405868b467eb7 + checksum: e0f657336ad9d554715a362119e550707129611ee31809b3d5a081d20830f331cf40bdf1471d667d7824f17ae2cd34f75b69dca8c2e443b09266d228d7937f2a languageName: node linkType: hard @@ -6072,22 +6072,6 @@ __metadata: languageName: node linkType: hard -"@testing-library/dom@npm:^8.0.0": - version: 8.20.1 - resolution: "@testing-library/dom@npm:8.20.1" - dependencies: - "@babel/code-frame": "npm:^7.10.4" - "@babel/runtime": "npm:^7.12.5" - "@types/aria-query": "npm:^5.0.1" - aria-query: "npm:5.1.3" - chalk: "npm:^4.1.0" - dom-accessibility-api: "npm:^0.5.9" - lz-string: "npm:^1.5.0" - pretty-format: "npm:^27.0.2" - checksum: 614013756706467f2a7f3f693c18377048c210ec809884f0f9be866f7d865d075805ad15f5d100e8a699467fdde09085bf79e23a00ea0a6ab001d9583ef15e5d - languageName: node - linkType: hard - "@testing-library/dom@npm:^9.0.0": version: 9.3.3 resolution: "@testing-library/dom@npm:9.3.3" @@ -6104,71 +6088,51 @@ __metadata: languageName: node linkType: hard -"@testing-library/jest-dom@npm:^5.16.1": - version: 5.17.0 - resolution: "@testing-library/jest-dom@npm:5.17.0" +"@testing-library/jest-dom@npm:^6.1.5": + version: 6.1.5 + resolution: "@testing-library/jest-dom@npm:6.1.5" dependencies: - "@adobe/css-tools": "npm:^4.0.1" + "@adobe/css-tools": "npm:^4.3.1" "@babel/runtime": "npm:^7.9.2" - "@types/testing-library__jest-dom": "npm:^5.9.1" aria-query: "npm:^5.0.0" chalk: "npm:^3.0.0" css.escape: "npm:^1.5.1" dom-accessibility-api: "npm:^0.5.6" lodash: "npm:^4.17.15" redent: "npm:^3.0.0" - checksum: 24e09c5779ea44644945ec26f2e4e5f48aecfe57d469decf2317a3253a5db28d865c55ad0ea4818d8d1df7572a6486c45daa06fa09644a833a7dd84563881939 - languageName: node - linkType: hard - -"@testing-library/react-hooks@npm:^8.0.1": - version: 8.0.1 - resolution: "@testing-library/react-hooks@npm:8.0.1" - dependencies: - "@babel/runtime": "npm:^7.12.5" - react-error-boundary: "npm:^3.1.0" peerDependencies: - "@types/react": ^16.9.0 || ^17.0.0 - react: ^16.9.0 || ^17.0.0 - react-dom: ^16.9.0 || ^17.0.0 - react-test-renderer: ^16.9.0 || ^17.0.0 + "@jest/globals": ">= 28" + "@types/jest": ">= 28" + jest: ">= 28" + vitest: ">= 0.32" peerDependenciesMeta: - "@types/react": + "@jest/globals": optional: true - react-dom: + "@types/jest": optional: true - react-test-renderer: + jest: optional: true - checksum: 83bef2d4c437b84143213b5275ef00ef14e5bcd344f9ded12b162d253dc3c799138ead4428026b9c725e5a38dbebf611f2898aa43f3e43432bcaccbd7bf413e5 - languageName: node - linkType: hard - -"@testing-library/react@npm:^12.1.2": - version: 12.1.5 - resolution: "@testing-library/react@npm:12.1.5" - dependencies: - "@babel/runtime": "npm:^7.12.5" - "@testing-library/dom": "npm:^8.0.0" - "@types/react-dom": "npm:<18.0.0" - peerDependencies: - react: <18.0.0 - react-dom: <18.0.0 - checksum: 3c2433d2fdb6535261f62cd85d79657989cebd96f9072da03c098a1cfa56dec4dfec83d7c2e93633a3ccebdb178ea8578261533d11551600966edab77af00c8b + vitest: + optional: true + checksum: f3643a56fcd970b5c7e8fd10faf3c4817d8ab0e74fb1198d726643bdc5ac675ceaac3b0068c5b4fbad254470e8f98ed50028741de875a29ceaa2f854570979c9 languageName: node linkType: hard -"@testing-library/user-event@npm:^13.5.0": - version: 13.5.0 - resolution: "@testing-library/user-event@npm:13.5.0" +"@testing-library/react@npm:^14.2.1": + version: 14.2.1 + resolution: "@testing-library/react@npm:14.2.1" dependencies: "@babel/runtime": "npm:^7.12.5" + "@testing-library/dom": "npm:^9.0.0" + "@types/react-dom": "npm:^18.0.0" peerDependencies: - "@testing-library/dom": ">=7.21.4" - checksum: ff57edaeab31322c80c3f01d55404b4cebb907b9ec7672b96a1a14d053f172046b01c5f27b45677927ebee8ed91bce695a7d09edec9a48875cfacabe39d0426a + react: ^18.0.0 + react-dom: ^18.0.0 + checksum: 83b35cf8bf5640f1b63b32223ebc75799dc1a8e034d819120b26838fba0b0ab10bdbe6ad07dd8ae8287365f2b0c52dc9892a6fa11bb24d3e63ad97dfb7f2f296 languageName: node linkType: hard -"@testing-library/user-event@npm:^14.4.0": +"@testing-library/user-event@npm:^14.4.0, @testing-library/user-event@npm:^14.5.1": version: 14.5.1 resolution: "@testing-library/user-event@npm:14.5.1" peerDependencies: @@ -6224,6 +6188,19 @@ __metadata: languageName: node linkType: hard +"@types/babel__core@npm:^7.18.0": + version: 7.20.5 + resolution: "@types/babel__core@npm:7.20.5" + dependencies: + "@babel/parser": "npm:^7.20.7" + "@babel/types": "npm:^7.20.7" + "@types/babel__generator": "npm:*" + "@types/babel__template": "npm:*" + "@types/babel__traverse": "npm:*" + checksum: bdee3bb69951e833a4b811b8ee9356b69a61ed5b7a23e1a081ec9249769117fa83aaaf023bb06562a038eb5845155ff663e2d5c75dd95c1d5ccc91db012868ff + languageName: node + linkType: hard + "@types/babel__generator@npm:*": version: 7.6.4 resolution: "@types/babel__generator@npm:7.6.4" @@ -6252,6 +6229,15 @@ __metadata: languageName: node linkType: hard +"@types/babel__traverse@npm:^7.18.0": + version: 7.20.4 + resolution: "@types/babel__traverse@npm:7.20.4" + dependencies: + "@babel/types": "npm:^7.20.7" + checksum: e76cb4974c7740fd61311152dc497e7b05c1c46ba554aab875544ab0a7457f343cafcad34ba8fb2ff543ab0e012ef2d3fa0c13f1a4e9a4cd9c4c703c7a2a8d62 + languageName: node + linkType: hard + "@types/body-parser@npm:*": version: 1.19.2 resolution: "@types/body-parser@npm:1.19.2" @@ -6313,6 +6299,13 @@ __metadata: languageName: node linkType: hard +"@types/doctrine@npm:^0.0.9": + version: 0.0.9 + resolution: "@types/doctrine@npm:0.0.9" + checksum: cdaca493f13c321cf0cacd1973efc0ae74569633145d9e6fc1128f32217a6968c33bea1f858275239fe90c98f3be57ec8f452b416a9ff48b8e8c1098b20fa51c + languageName: node + linkType: hard + "@types/ejs@npm:^3.1.1": version: 3.1.5 resolution: "@types/ejs@npm:3.1.5" @@ -6418,6 +6411,16 @@ __metadata: languageName: node linkType: hard +"@types/fs-extra@npm:~11.0.0": + version: 11.0.4 + resolution: "@types/fs-extra@npm:11.0.4" + dependencies: + "@types/jsonfile": "npm:*" + "@types/node": "npm:*" + checksum: 9e34f9b24ea464f3c0b18c3f8a82aefc36dc524cc720fc2b886e5465abc66486ff4e439ea3fb2c0acebf91f6d3f74e514f9983b1f02d4243706bdbb7511796ad + languageName: node + linkType: hard + "@types/graceful-fs@npm:^4.1.2": version: 4.1.6 resolution: "@types/graceful-fs@npm:4.1.6" @@ -6484,16 +6487,6 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:*": - version: 29.5.4 - resolution: "@types/jest@npm:29.5.4" - dependencies: - expect: "npm:^29.0.0" - pretty-format: "npm:^29.0.0" - checksum: 49c1f0fa20e45b1dfd69aea8af667a8be30e210f00673c365d504ca285cf9040d8f4861dd89657640af5f4a49eadcadc08907b5cf82eda28afea8ddd3dda8390 - languageName: node - linkType: hard - "@types/json-schema@npm:*, @types/json-schema@npm:^7.0.4, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": version: 7.0.12 resolution: "@types/json-schema@npm:7.0.12" @@ -6508,6 +6501,15 @@ __metadata: languageName: node linkType: hard +"@types/jsonfile@npm:*": + version: 6.1.4 + resolution: "@types/jsonfile@npm:6.1.4" + dependencies: + "@types/node": "npm:*" + checksum: b12d068b021e4078f6ac4441353965769be87acf15326173e2aea9f3bf8ead41bd0ad29421df5bbeb0123ec3fc02eb0a734481d52903704a1454a1845896b9eb + languageName: node + linkType: hard + "@types/lodash@npm:^4.14.167": version: 4.14.201 resolution: "@types/lodash@npm:4.14.201" @@ -6543,6 +6545,13 @@ __metadata: languageName: node linkType: hard +"@types/minimist@npm:~1.2.2": + version: 1.2.5 + resolution: "@types/minimist@npm:1.2.5" + checksum: 3f791258d8e99a1d7d0ca2bda1ca6ea5a94e5e7b8fc6cde84dd79b0552da6fb68ade750f0e17718f6587783c24254bbca0357648dd59dc3812c150305cabdc46 + languageName: node + linkType: hard + "@types/node-fetch@npm:^2.6.4": version: 2.6.9 resolution: "@types/node-fetch@npm:2.6.9" @@ -6632,12 +6641,12 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:<18.0.0": - version: 17.0.20 - resolution: "@types/react-dom@npm:17.0.20" +"@types/react-dom@npm:^18.0.0": + version: 18.2.17 + resolution: "@types/react-dom@npm:18.2.17" dependencies: - "@types/react": "npm:^17" - checksum: 1389bfd96ec5f0c580bb1c237c8af137203de912cf403b4116cdfb026762bf31b4206cc1de0a5c20d0df2e07b0ba1b1b72ac51995d5ef45889d5d878321b7418 + "@types/react": "npm:*" + checksum: 33b53078ed7e9e0cfc4dc691e938f7db1cc06353bc345947b41b581c3efe2b980c9e4eb6460dbf5ddc521dd91959194c970221a2bd4bfad9d23ebce338e12938 languageName: node linkType: hard @@ -6672,17 +6681,6 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:^17": - version: 17.0.65 - resolution: "@types/react@npm:17.0.65" - dependencies: - "@types/prop-types": "npm:*" - "@types/scheduler": "npm:*" - csstype: "npm:^3.0.2" - checksum: 6451cb4fa43228ea9be05522f02ba2295fd11276a6e7e2e61f9de02690006d1137fc83c65449f3c909c35bb760623cdb312949431cd9b152bcb38facc63ffb2f - languageName: node - linkType: hard - "@types/resolve@npm:1.17.1": version: 1.17.1 resolution: "@types/resolve@npm:1.17.1" @@ -6692,6 +6690,13 @@ __metadata: languageName: node linkType: hard +"@types/resolve@npm:^1.20.2": + version: 1.20.6 + resolution: "@types/resolve@npm:1.20.6" + checksum: a9b0549d816ff2c353077365d865a33655a141d066d0f5a3ba6fd4b28bc2f4188a510079f7c1f715b3e7af505a27374adce2a5140a3ece2a059aab3d6e1a4244 + languageName: node + linkType: hard + "@types/retry@npm:0.12.0": version: 0.12.0 resolution: "@types/retry@npm:0.12.0" @@ -6766,15 +6771,6 @@ __metadata: languageName: node linkType: hard -"@types/testing-library__jest-dom@npm:^5.9.1": - version: 5.14.9 - resolution: "@types/testing-library__jest-dom@npm:5.14.9" - dependencies: - "@types/jest": "npm:*" - checksum: 91f7b15e8813b515912c54da44464fb60ecf21162b7cae2272fcb3918074f4e1387dc2beca1f5041667e77b76b34253c39675ea4e0b3f28f102d8cc87fdba9fa - languageName: node - linkType: hard - "@types/trusted-types@npm:^2.0.2": version: 2.0.3 resolution: "@types/trusted-types@npm:2.0.3" @@ -6789,6 +6785,13 @@ __metadata: languageName: node linkType: hard +"@types/uuid@npm:^9.0.1": + version: 9.0.7 + resolution: "@types/uuid@npm:9.0.7" + checksum: b329ebd4f9d1d8e08d4f2cc211be4922d70d1149f73d5772630e4a3acfb5170c6d37b3d7a39a0412f1a56e86e8a844c7f297c798b082f90380608bf766688787 + languageName: node + linkType: hard + "@types/ws@npm:^8.5.5": version: 8.5.5 resolution: "@types/ws@npm:8.5.5" @@ -7359,41 +7362,43 @@ __metadata: resolution: "aml-frontend@workspace:." dependencies: "@sentry/react": "npm:^7.85.0" - "@storybook/addon-essentials": "npm:7.5.3" - "@storybook/addon-interactions": "npm:7.5.3" - "@storybook/addon-links": "npm:7.5.3" - "@storybook/addon-onboarding": "npm:1.0.8" - "@storybook/blocks": "npm:7.5.3" - "@storybook/preset-create-react-app": "npm:7.5.3" - "@storybook/react": "npm:7.5.3" - "@storybook/react-webpack5": "npm:7.5.3" + "@storybook/addon-essentials": "npm:7.6.6" + "@storybook/addon-interactions": "npm:7.6.6" + "@storybook/addon-links": "npm:7.6.6" + "@storybook/addon-onboarding": "npm:1.0.10" + "@storybook/blocks": "npm:7.6.6" + "@storybook/preset-create-react-app": "npm:7.6.6" + "@storybook/react": "npm:7.6.6" + "@storybook/react-webpack5": "npm:7.6.6" "@storybook/testing-library": "npm:0.2.2" - "@testing-library/jest-dom": "npm:^5.16.1" - "@testing-library/react": "npm:^12.1.2" - "@testing-library/react-hooks": "npm:^8.0.1" - "@testing-library/user-event": "npm:^13.5.0" + "@testing-library/jest-dom": "npm:^6.1.5" + "@testing-library/react": "npm:^14.2.1" + "@testing-library/user-event": "npm:^14.5.1" axios: "npm:>=1.6.0" babel-plugin-named-exports-order: "npm:0.0.2" classnames: "npm:^2.2.6" + coverage-badges-cli: "npm:^1.2.5" email-validator: "npm:^2.0.4" eslint: "npm:^8.54.0" eslint-config-react-app: "npm:^7.0.1" eslint-plugin-storybook: "npm:^0.6.15" file-saver: "npm:^2.0.5" + history: "npm:^5.3.0" next-share: "npm:0.25.0" prop-types: "npm:15.8.1" qs: "npm:^6.10.3" - react: "npm:^17.0.2" - react-dom: "npm:^17.0.2" + react: "npm:^18.2.0" + react-dom: "npm:^18.2.0" react-rangeslider: "npm:^2.2.0" react-router: "npm:5.2.0" react-router-dom: "npm:5.2.0" react-scripts: "npm:5.0.0" react-select: "npm:^5.4.0" - react-transition-group: "npm:^4.3.0" - sass: "npm:^1.50" - storybook: "npm:7.5.3" + react-transition-group: "npm:^4.4.5" + sass: "npm:^1.69.5" + storybook: "npm:7.6.6" webpack: "npm:5.89.0" + zustand: "npm:^4.4.7" languageName: unknown linkType: soft @@ -7663,7 +7668,7 @@ __metadata: languageName: node linkType: hard -"assert@npm:^2.0.0": +"assert@npm:^2.0.0, assert@npm:^2.1.0": version: 2.1.0 resolution: "assert@npm:2.1.0" dependencies: @@ -7683,24 +7688,6 @@ __metadata: languageName: node linkType: hard -"ast-types@npm:0.15.2": - version: 0.15.2 - resolution: "ast-types@npm:0.15.2" - dependencies: - tslib: "npm:^2.0.1" - checksum: 5b26e3656e9e8d1db8c8d14971d0cb88ca0138aacce72171cb4cd4555fc8dc53c07e821c568e57fe147366931708fefd25cb9d7e880d42ce9cb569947844c962 - languageName: node - linkType: hard - -"ast-types@npm:^0.14.2": - version: 0.14.2 - resolution: "ast-types@npm:0.14.2" - dependencies: - tslib: "npm:^2.0.1" - checksum: 5d66d89b6c07fe092087454b6042dbaf81f2882b176db93861e2b986aafe0bce49e1f1ff59aac775d451c1426ad1e967d250e9e3548f5166ea8a3475e66c169d - languageName: node - linkType: hard - "ast-types@npm:^0.16.1": version: 0.16.1 resolution: "ast-types@npm:0.16.1" @@ -7906,7 +7893,7 @@ __metadata: languageName: node linkType: hard -"babel-plugin-named-exports-order@npm:0.0.2, babel-plugin-named-exports-order@npm:^0.0.2": +"babel-plugin-named-exports-order@npm:0.0.2": version: 0.0.2 resolution: "babel-plugin-named-exports-order@npm:0.0.2" checksum: e1d001722bddabc296b74f7cd020418a3cce9ca7052d5dd5dbd2870745d9566e286d14707c0bbfc9d4b4b643031052b358124ec735069f214d22b0b6768daf9d @@ -7985,17 +7972,6 @@ __metadata: languageName: node linkType: hard -"babel-plugin-react-docgen@npm:^4.1.0, babel-plugin-react-docgen@npm:^4.2.1": - version: 4.2.1 - resolution: "babel-plugin-react-docgen@npm:4.2.1" - dependencies: - ast-types: "npm:^0.14.2" - lodash: "npm:^4.17.15" - react-docgen: "npm:^5.0.0" - checksum: 9f7af20e6ebd794beae14aa1ffe4f1c1c5855821a5a9f205099602c89b557e33b9cb3dc3fe0b3a2f2ca35007c6ab45f52da9695a681d8495ad0f5494ef78ec34 - languageName: node - linkType: hard - "babel-plugin-transform-react-remove-prop-types@npm:^0.4.24": version: 0.4.24 resolution: "babel-plugin-transform-react-remove-prop-types@npm:0.4.24" @@ -8061,6 +8037,13 @@ __metadata: languageName: node linkType: hard +"badgen@npm:~3.2.2": + version: 3.2.3 + resolution: "badgen@npm:3.2.3" + checksum: da7bd02c7643097682024515420f8e2e544cc6f3064cfe67b1306c206d37f758741dc1c9ac8c957fbeaf7f439231fa1c4a9e5d73a75976c3d2fec06b9ad644fe + languageName: node + linkType: hard + "balanced-match@npm:^1.0.0": version: 1.0.2 resolution: "balanced-match@npm:1.0.2" @@ -8269,6 +8252,20 @@ __metadata: languageName: node linkType: hard +"browserslist@npm:^4.22.2": + version: 4.22.2 + resolution: "browserslist@npm:4.22.2" + dependencies: + caniuse-lite: "npm:^1.0.30001565" + electron-to-chromium: "npm:^1.4.601" + node-releases: "npm:^2.0.14" + update-browserslist-db: "npm:^1.0.13" + bin: + browserslist: cli.js + checksum: 2a331aab90503130043ca41dd5d281fa1e89d5e076d07a2d75e76bf4d693bd56e73d5abcd8c4f39119da6328d450578c216cf1cd5c99b82d8a90a2ae6271b465 + languageName: node + linkType: hard + "bser@npm:2.1.1": version: 2.1.1 resolution: "bser@npm:2.1.1" @@ -8323,28 +8320,6 @@ __metadata: languageName: node linkType: hard -"c8@npm:^7.6.0": - version: 7.14.0 - resolution: "c8@npm:7.14.0" - dependencies: - "@bcoe/v8-coverage": "npm:^0.2.3" - "@istanbuljs/schema": "npm:^0.1.3" - find-up: "npm:^5.0.0" - foreground-child: "npm:^2.0.0" - istanbul-lib-coverage: "npm:^3.2.0" - istanbul-lib-report: "npm:^3.0.0" - istanbul-reports: "npm:^3.1.4" - rimraf: "npm:^3.0.2" - test-exclude: "npm:^6.0.0" - v8-to-istanbul: "npm:^9.0.0" - yargs: "npm:^16.2.0" - yargs-parser: "npm:^20.2.9" - bin: - c8: bin/c8.js - checksum: 8946f55f2dcc85bf146f429a3deeede78502da245e515a2d181342475d8d8698b4055ec1d9b887ab8e1615f49c1a2af4d63557e68b2005844572fb785991e148 - languageName: node - linkType: hard - "cacache@npm:^18.0.0": version: 18.0.0 resolution: "cacache@npm:18.0.0" @@ -8450,6 +8425,13 @@ __metadata: languageName: node linkType: hard +"caniuse-lite@npm:^1.0.30001565": + version: 1.0.30001570 + resolution: "caniuse-lite@npm:1.0.30001570" + checksum: e47230d2016edea56e002fa462a5289f697b48dcfbf703fb01aecc6c98ad4ecaf945ab23c253cb7af056c2d05f266e4e4cbebf45132100e2c9367439cb95b95b + languageName: node + linkType: hard + "case-sensitive-paths-webpack-plugin@npm:^2.4.0": version: 2.4.0 resolution: "case-sensitive-paths-webpack-plugin@npm:2.4.0" @@ -8724,7 +8706,7 @@ __metadata: languageName: node linkType: hard -"commander@npm:^2.19.0, commander@npm:^2.20.0": +"commander@npm:^2.20.0": version: 2.20.3 resolution: "commander@npm:2.20.3" checksum: 74c781a5248c2402a0a3e966a0a2bba3c054aad144f5c023364be83265e796b20565aa9feff624132ff629aa64e16999fa40a743c10c12f7c61e96a794b99288 @@ -8953,6 +8935,24 @@ __metadata: languageName: node linkType: hard +"coverage-badges-cli@npm:^1.2.5": + version: 1.2.5 + resolution: "coverage-badges-cli@npm:1.2.5" + dependencies: + "@types/fs-extra": "npm:~11.0.0" + "@types/minimist": "npm:~1.2.2" + badgen: "npm:~3.2.2" + fs-extra: "npm:~11.1.0" + lodash.get: "npm:^4.4.2" + mini-svg-data-uri: "npm:^1.4.4" + minimist: "npm:~1.2.5" + bin: + coverage-badges: bin/cli + coverage-badges-cli: bin/cli + checksum: 851fa35f56bec6b38e6f64c0a4f66853d64013791aa1758d71c38206c2ccf1a2c9563cb294b807da895b7f576e81ea55c5f9aae7ff11b51a8eb75e927378d2fc + languageName: node + linkType: hard + "cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3": version: 7.0.3 resolution: "cross-spawn@npm:7.0.3" @@ -9276,7 +9276,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.2, debug@npm:^4.3.4": +"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4": version: 4.3.4 resolution: "debug@npm:4.3.4" dependencies: @@ -9542,13 +9542,6 @@ __metadata: languageName: node linkType: hard -"diff-sequences@npm:^29.6.3": - version: 29.6.3 - resolution: "diff-sequences@npm:29.6.3" - checksum: 32e27ac7dbffdf2fb0eb5a84efd98a9ad084fbabd5ac9abb8757c6770d5320d2acd172830b28c4add29bb873d59420601dfc805ac4064330ce59b1adfd0593b2 - languageName: node - linkType: hard - "dir-glob@npm:^3.0.1": version: 3.0.1 resolution: "dir-glob@npm:3.0.1" @@ -9795,6 +9788,13 @@ __metadata: languageName: node linkType: hard +"electron-to-chromium@npm:^1.4.601": + version: 1.4.615 + resolution: "electron-to-chromium@npm:1.4.615" + checksum: 6602172761e44ca1a6c010a010efd0c42710e1e08911e76dd2d3df72ae2a563fb75b0853387273d1e45a4befd314162b2b1debcf9055513f62c6d6a8df4de73a + languageName: node + linkType: hard + "email-validator@npm:^2.0.4": version: 2.0.4 resolution: "email-validator@npm:2.0.4" @@ -10031,6 +10031,13 @@ __metadata: languageName: node linkType: hard +"es-module-lexer@npm:^1.4.1": + version: 1.4.1 + resolution: "es-module-lexer@npm:1.4.1" + checksum: b7260a138668554d3f0ddcc728cb4b60c2fa463f15545cf155ecbdd5450a1348952d58298a7f48642e900ee579f21d7f5304b6b3c61b3d9fc2d4b2109b5a9dff + languageName: node + linkType: hard + "es-set-tostringtag@npm:^2.0.1": version: 2.0.1 resolution: "es-set-tostringtag@npm:2.0.1" @@ -10599,17 +10606,6 @@ __metadata: languageName: node linkType: hard -"estree-to-babel@npm:^3.1.0": - version: 3.2.1 - resolution: "estree-to-babel@npm:3.2.1" - dependencies: - "@babel/traverse": "npm:^7.1.6" - "@babel/types": "npm:^7.2.0" - c8: "npm:^7.6.0" - checksum: c7949b141f569528b2608ab715d593a04f7e2e529df04e0b595d0a7dea819b410e71d1f04716e43ac1480942afc5701cb5151ad2906ee8402969651a389881bb - languageName: node - linkType: hard - "estree-walker@npm:^1.0.1": version: 1.0.1 resolution: "estree-walker@npm:1.0.1" @@ -10681,19 +10677,6 @@ __metadata: languageName: node linkType: hard -"expect@npm:^29.0.0": - version: 29.6.4 - resolution: "expect@npm:29.6.4" - dependencies: - "@jest/expect-utils": "npm:^29.6.4" - jest-get-type: "npm:^29.6.3" - jest-matcher-utils: "npm:^29.6.4" - jest-message-util: "npm:^29.6.3" - jest-util: "npm:^29.6.3" - checksum: d3f4ed2fcc33f743b1dd9cf25a07c2f56c9ddd7e1b327d3e74b5febfc90880a9e2ab10c56b3bf31e14d5ead69dc4cb68f718b7fbc3fae8571f8e18675ffe8080 - languageName: node - linkType: hard - "exponential-backoff@npm:^3.1.1": version: 3.1.1 resolution: "exponential-backoff@npm:3.1.1" @@ -11027,12 +11010,12 @@ __metadata: linkType: hard "follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.15.0": - version: 1.15.2 - resolution: "follow-redirects@npm:1.15.2" + version: 1.15.4 + resolution: "follow-redirects@npm:1.15.4" peerDependenciesMeta: debug: optional: true - checksum: da5932b70e63944d38eecaa16954bac4347036f08303c913d166eda74809d8797d38386e3a0eb1d2fe37d2aaff2764cce8e9dbd99459d860cf2cdfa237923b5f + checksum: 5f37ed9170c9eb19448c5418fdb0f2b73f644b5364834e70791a76ecc7db215246f9773bbef4852cfae4067764ffc852e047f744b661b0211532155b73556a6a languageName: node linkType: hard @@ -11045,16 +11028,6 @@ __metadata: languageName: node linkType: hard -"foreground-child@npm:^2.0.0": - version: 2.0.0 - resolution: "foreground-child@npm:2.0.0" - dependencies: - cross-spawn: "npm:^7.0.0" - signal-exit: "npm:^3.0.2" - checksum: 6719982783a448162f9a01500757fb2053bc5dcd4d67c7cd30739b38ccc01b39f84e408c30989d1d8774519c021c0498e2450ab127690fb09d7f2568fd94ffcc - languageName: node - linkType: hard - "foreground-child@npm:^3.1.0": version: 3.1.1 resolution: "foreground-child@npm:3.1.1" @@ -11169,7 +11142,7 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:11.1.1, fs-extra@npm:^11.1.0": +"fs-extra@npm:11.1.1, fs-extra@npm:^11.1.0, fs-extra@npm:~11.1.0": version: 11.1.1 resolution: "fs-extra@npm:11.1.1" dependencies: @@ -11681,6 +11654,15 @@ __metadata: languageName: node linkType: hard +"history@npm:^5.3.0": + version: 5.3.0 + resolution: "history@npm:5.3.0" + dependencies: + "@babel/runtime": "npm:^7.7.6" + checksum: 812ec839386222d6437bd78d9f05db32e47d105ada0ad8834b32626919dd2fee7a10001bc489510f93a8069d02f118214bd8d42a82f7cf9daf8e84fbcbbb2016 + languageName: node + linkType: hard + "hoist-non-react-statics@npm:^3.1.0, hoist-non-react-statics@npm:^3.3.1, hoist-non-react-statics@npm:^3.3.2": version: 3.3.2 resolution: "hoist-non-react-statics@npm:3.3.2" @@ -12082,9 +12064,9 @@ __metadata: linkType: hard "ip@npm:^2.0.0": - version: 2.0.0 - resolution: "ip@npm:2.0.0" - checksum: 8d186cc5585f57372847ae29b6eba258c68862055e18a75cc4933327232cb5c107f89800ce29715d542eef2c254fbb68b382e780a7414f9ee7caf60b7a473958 + version: 2.0.1 + resolution: "ip@npm:2.0.1" + checksum: cab8eb3e88d0abe23e4724829621ec4c4c5cb41a7f936a2e626c947128c1be16ed543448d42af7cca95379f9892bfcacc1ccd8d09bc7e8bea0e86d492ce33616 languageName: node linkType: hard @@ -12589,7 +12571,7 @@ __metadata: languageName: node linkType: hard -"istanbul-reports@npm:^3.1.3, istanbul-reports@npm:^3.1.4": +"istanbul-reports@npm:^3.1.3": version: 3.1.6 resolution: "istanbul-reports@npm:3.1.6" dependencies: @@ -12753,18 +12735,6 @@ __metadata: languageName: node linkType: hard -"jest-diff@npm:^29.6.4": - version: 29.6.4 - resolution: "jest-diff@npm:29.6.4" - dependencies: - chalk: "npm:^4.0.0" - diff-sequences: "npm:^29.6.3" - jest-get-type: "npm:^29.6.3" - pretty-format: "npm:^29.6.3" - checksum: 5f96be0f15ba8e70acfa5512ca49ba67363678e7ce222889612385a8d9dd042822fdd22a514394fe726b1f462e605bc5d7fc130bd81fa2247e7d40413975d576 - languageName: node - linkType: hard - "jest-docblock@npm:^27.5.1": version: 27.5.1 resolution: "jest-docblock@npm:27.5.1" @@ -12823,13 +12793,6 @@ __metadata: languageName: node linkType: hard -"jest-get-type@npm:^29.6.3": - version: 29.6.3 - resolution: "jest-get-type@npm:29.6.3" - checksum: 552e7a97a983d3c2d4e412a44eb7de0430ff773dd99f7500962c268d6dfbfa431d7d08f919c9d960530e5f7f78eb47f267ad9b318265e5092b3ff9ede0db7c2b - languageName: node - linkType: hard - "jest-haste-map@npm:^27.5.1": version: 27.5.1 resolution: "jest-haste-map@npm:27.5.1" @@ -12924,18 +12887,6 @@ __metadata: languageName: node linkType: hard -"jest-matcher-utils@npm:^29.6.4": - version: 29.6.4 - resolution: "jest-matcher-utils@npm:29.6.4" - dependencies: - chalk: "npm:^4.0.0" - jest-diff: "npm:^29.6.4" - jest-get-type: "npm:^29.6.3" - pretty-format: "npm:^29.6.3" - checksum: aa54f7075438160bd29e8c0a02d6b7e6ed1f18bab5670d161d1555e5cfa9b61e86306a260ca0304680fb1b357a944fd1d007b6519f91fc6f67d72997b1a7fdb8 - languageName: node - linkType: hard - "jest-message-util@npm:^27.5.1": version: 27.5.1 resolution: "jest-message-util@npm:27.5.1" @@ -12970,23 +12921,6 @@ __metadata: languageName: node linkType: hard -"jest-message-util@npm:^29.6.3": - version: 29.6.3 - resolution: "jest-message-util@npm:29.6.3" - dependencies: - "@babel/code-frame": "npm:^7.12.13" - "@jest/types": "npm:^29.6.3" - "@types/stack-utils": "npm:^2.0.0" - chalk: "npm:^4.0.0" - graceful-fs: "npm:^4.2.9" - micromatch: "npm:^4.0.4" - pretty-format: "npm:^29.6.3" - slash: "npm:^3.0.0" - stack-utils: "npm:^2.0.3" - checksum: 5ae17c0aa8076bd0d4c68a036865cf156084cf7b4f69b4ffee0f49da61f7fe9eb38c6405c1f6967df031ffe14f8a31830baa1f04f1dbea52f239689cd4e5b326 - languageName: node - linkType: hard - "jest-mock@npm:^27.0.6, jest-mock@npm:^27.5.1": version: 27.5.1 resolution: "jest-mock@npm:27.5.1" @@ -13186,20 +13120,6 @@ __metadata: languageName: node linkType: hard -"jest-util@npm:^29.6.3": - version: 29.6.3 - resolution: "jest-util@npm:29.6.3" - dependencies: - "@jest/types": "npm:^29.6.3" - "@types/node": "npm:*" - chalk: "npm:^4.0.0" - ci-info: "npm:^3.2.0" - graceful-fs: "npm:^4.2.9" - picomatch: "npm:^2.2.3" - checksum: 9428c07696f27aa8f230a13a35546559f9a087f3e3744f53f69a620598234c03004b808b1b4a12120cc5771a88403bf0a1e3f95a7ccd610acf03d90c36135e88 - languageName: node - linkType: hard - "jest-util@npm:^29.7.0": version: 29.7.0 resolution: "jest-util@npm:29.7.0" @@ -13378,19 +13298,20 @@ __metadata: languageName: node linkType: hard -"jscodeshift@npm:^0.14.0": - version: 0.14.0 - resolution: "jscodeshift@npm:0.14.0" - dependencies: - "@babel/core": "npm:^7.13.16" - "@babel/parser": "npm:^7.13.16" - "@babel/plugin-proposal-class-properties": "npm:^7.13.0" - "@babel/plugin-proposal-nullish-coalescing-operator": "npm:^7.13.8" - "@babel/plugin-proposal-optional-chaining": "npm:^7.13.12" - "@babel/plugin-transform-modules-commonjs": "npm:^7.13.8" - "@babel/preset-flow": "npm:^7.13.13" - "@babel/preset-typescript": "npm:^7.13.0" - "@babel/register": "npm:^7.13.16" +"jscodeshift@npm:^0.15.1": + version: 0.15.1 + resolution: "jscodeshift@npm:0.15.1" + dependencies: + "@babel/core": "npm:^7.23.0" + "@babel/parser": "npm:^7.23.0" + "@babel/plugin-transform-class-properties": "npm:^7.22.5" + "@babel/plugin-transform-modules-commonjs": "npm:^7.23.0" + "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.22.11" + "@babel/plugin-transform-optional-chaining": "npm:^7.23.0" + "@babel/plugin-transform-private-methods": "npm:^7.22.5" + "@babel/preset-flow": "npm:^7.22.15" + "@babel/preset-typescript": "npm:^7.23.0" + "@babel/register": "npm:^7.22.15" babel-core: "npm:^7.0.0-bridge.0" chalk: "npm:^4.1.2" flow-parser: "npm:0.*" @@ -13398,14 +13319,17 @@ __metadata: micromatch: "npm:^4.0.4" neo-async: "npm:^2.5.0" node-dir: "npm:^0.1.17" - recast: "npm:^0.21.0" + recast: "npm:^0.23.3" temp: "npm:^0.8.4" write-file-atomic: "npm:^2.3.0" peerDependencies: "@babel/preset-env": ^7.1.6 + peerDependenciesMeta: + "@babel/preset-env": + optional: true bin: jscodeshift: bin/jscodeshift.js - checksum: dab63bdb4b7e67d79634fcd3f5dc8b227146e9f68aa88700bc49c5a45b6339d05bd934a98aa53d29abd04f81237d010e7e037799471b2aab66ec7b9a7d752786 + checksum: 334de6ffa776a68b3f59f2f18a285ea977f3339d85e3517f3854761e65769ffa7e453c35cde320fc969106d573df39bd3fb08b23db54ae17c1b1516e5bf05742 languageName: node linkType: hard @@ -13737,6 +13661,13 @@ __metadata: languageName: node linkType: hard +"lodash.get@npm:^4.4.2": + version: 4.4.2 + resolution: "lodash.get@npm:4.4.2" + checksum: 48f40d471a1654397ed41685495acb31498d5ed696185ac8973daef424a749ca0c7871bf7b665d5c14f5cc479394479e0307e781f61d5573831769593411be6e + languageName: node + linkType: hard + "lodash.memoize@npm:^4.1.2": version: 4.1.2 resolution: "lodash.memoize@npm:4.1.2" @@ -13847,6 +13778,15 @@ __metadata: languageName: node linkType: hard +"magic-string@npm:^0.30.5": + version: 0.30.5 + resolution: "magic-string@npm:0.30.5" + dependencies: + "@jridgewell/sourcemap-codec": "npm:^1.4.15" + checksum: 38ac220ca7539e96da7ea2f38d85796bdf5c69b6bcae728c4bc2565084e6dc326b9174ee9770bea345cf6c9b3a24041b767167874fab5beca874d2356a9d1520 + languageName: node + linkType: hard + "make-dir@npm:^2.0.0, make-dir@npm:^2.1.0": version: 2.1.0 resolution: "make-dir@npm:2.1.0" @@ -14069,7 +14009,7 @@ __metadata: languageName: node linkType: hard -"min-indent@npm:^1.0.0": +"min-indent@npm:^1.0.0, min-indent@npm:^1.0.1": version: 1.0.1 resolution: "min-indent@npm:1.0.1" checksum: 7e207bd5c20401b292de291f02913230cb1163abca162044f7db1d951fa245b174dc00869d40dd9a9f32a885ad6a5f3e767ee104cf278f399cb4e92d3f582d5c @@ -14100,6 +14040,15 @@ __metadata: languageName: node linkType: hard +"mini-svg-data-uri@npm:^1.4.4": + version: 1.4.4 + resolution: "mini-svg-data-uri@npm:1.4.4" + bin: + mini-svg-data-uri: cli.js + checksum: 24545fa30b5a45449241bf19c25b8bc37594b63ec06401b3d563bd1c2e8a6abb7c18741f8b354e0064baa63c291be214154bf3a66f201ae71dfab3cc1a5e3191 + languageName: node + linkType: hard + "minimalistic-assert@npm:^1.0.0": version: 1.0.1 resolution: "minimalistic-assert@npm:1.0.1" @@ -14134,7 +14083,7 @@ __metadata: languageName: node linkType: hard -"minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6": +"minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:~1.2.5": version: 1.2.8 resolution: "minimist@npm:1.2.8" checksum: 19d3fcdca050087b84c2029841a093691a91259a47def2f18222f41e7645a0b7c44ef4b40e88a1e58a40c84d2ef0ee6047c55594d298146d0eb3f6b737c20ce6 @@ -14333,7 +14282,7 @@ __metadata: languageName: node linkType: hard -"neo-async@npm:^2.5.0, neo-async@npm:^2.6.1, neo-async@npm:^2.6.2": +"neo-async@npm:^2.5.0, neo-async@npm:^2.6.2": version: 2.6.2 resolution: "neo-async@npm:2.6.2" checksum: c2f5a604a54a8ec5438a342e1f356dff4bc33ccccdb6dc668d94fe8e5eccfc9d2c2eea6064b0967a767ba63b33763f51ccf2cd2441b461a7322656c1f06b3f5d @@ -14368,7 +14317,7 @@ __metadata: languageName: node linkType: hard -"node-dir@npm:^0.1.10, node-dir@npm:^0.1.17": +"node-dir@npm:^0.1.17": version: 0.1.17 resolution: "node-dir@npm:0.1.17" dependencies: @@ -14439,6 +14388,13 @@ __metadata: languageName: node linkType: hard +"node-releases@npm:^2.0.14": + version: 2.0.14 + resolution: "node-releases@npm:2.0.14" + checksum: 199fc93773ae70ec9969bc6d5ac5b2bbd6eb986ed1907d751f411fef3ede0e4bfdb45ceb43711f8078bea237b6036db8b1bf208f6ff2b70c7d615afd157f3ab9 + languageName: node + linkType: hard + "nopt@npm:^7.0.0": version: 7.2.0 resolution: "nopt@npm:7.2.0" @@ -15992,17 +15948,6 @@ __metadata: languageName: node linkType: hard -"pretty-format@npm:^29.0.0, pretty-format@npm:^29.6.3": - version: 29.6.3 - resolution: "pretty-format@npm:29.6.3" - dependencies: - "@jest/schemas": "npm:^29.6.3" - ansi-styles: "npm:^5.0.0" - react-is: "npm:^18.0.0" - checksum: 73c6a46acdad4cb9337add02c850769fb831d7154cdb50b1152f3970a8fbf8292188dcccd1ba597f3e34c360af71fc0b63f1db4cf155a0098ffe2812eb7a6b22 - languageName: node - linkType: hard - "pretty-hrtime@npm:^1.0.3": version: 1.0.3 resolution: "pretty-hrtime@npm:1.0.3" @@ -16324,36 +16269,33 @@ __metadata: languageName: node linkType: hard -"react-docgen@npm:^5.0.0": - version: 5.4.3 - resolution: "react-docgen@npm:5.4.3" - dependencies: - "@babel/core": "npm:^7.7.5" - "@babel/generator": "npm:^7.12.11" - "@babel/runtime": "npm:^7.7.6" - ast-types: "npm:^0.14.2" - commander: "npm:^2.19.0" +"react-docgen@npm:^7.0.0": + version: 7.0.1 + resolution: "react-docgen@npm:7.0.1" + dependencies: + "@babel/core": "npm:^7.18.9" + "@babel/traverse": "npm:^7.18.9" + "@babel/types": "npm:^7.18.9" + "@types/babel__core": "npm:^7.18.0" + "@types/babel__traverse": "npm:^7.18.0" + "@types/doctrine": "npm:^0.0.9" + "@types/resolve": "npm:^1.20.2" doctrine: "npm:^3.0.0" - estree-to-babel: "npm:^3.1.0" - neo-async: "npm:^2.6.1" - node-dir: "npm:^0.1.10" - strip-indent: "npm:^3.0.0" - bin: - react-docgen: bin/react-docgen.js - checksum: c920e9611e08317f8fdae707114cf02baaa18e2f1bd23ed18f57e66b9e1042e51dc98cc9de828b03d018ccc4e26300c9a6c4f74e862fc94dc64029267c801a01 + resolve: "npm:^1.22.1" + strip-indent: "npm:^4.0.0" + checksum: 870c1193211f14497bf7a96137f96840dc058842ca75ff7251d91e88c3c71d7a41d5f1a124cc1b53bfbf1f2b6b58bfccc4dd6e22592814a5155d3894953274be languageName: node linkType: hard -"react-dom@npm:^17.0.2": - version: 17.0.2 - resolution: "react-dom@npm:17.0.2" +"react-dom@npm:^18.2.0": + version: 18.2.0 + resolution: "react-dom@npm:18.2.0" dependencies: loose-envify: "npm:^1.1.0" - object-assign: "npm:^4.1.1" - scheduler: "npm:^0.20.2" + scheduler: "npm:^0.23.0" peerDependencies: - react: 17.0.2 - checksum: 51abbcb72450fe527ebf978c3bc989ba266630faaa53f47a2fae5392369729e8de62b2e4683598cbe651ea7873cd34ec7d5127e2f50bf4bfe6bd0c3ad9bddcb0 + react: ^18.2.0 + checksum: 66dfc5f93e13d0674e78ef41f92ed21dfb80f9c4ac4ac25a4b51046d41d4d2186abc915b897f69d3d0ebbffe6184e7c5876f2af26bfa956f179225d921be713a languageName: node linkType: hard @@ -16371,17 +16313,6 @@ __metadata: languageName: node linkType: hard -"react-error-boundary@npm:^3.1.0": - version: 3.1.4 - resolution: "react-error-boundary@npm:3.1.4" - dependencies: - "@babel/runtime": "npm:^7.12.5" - peerDependencies: - react: ">=16.13.1" - checksum: f977ca61823e43de2381d53dd7aa8b4d79ff6a984c9afdc88dc44f9973b99de7fd382d2f0f91f2688e24bb987c0185bf45d0b004f22afaaab0f990a830253bfb - languageName: node - linkType: hard - "react-error-overlay@npm:^6.0.11": version: 6.0.11 resolution: "react-error-overlay@npm:6.0.11" @@ -16389,15 +16320,6 @@ __metadata: languageName: node linkType: hard -"react-inspector@npm:^6.0.0": - version: 6.0.2 - resolution: "react-inspector@npm:6.0.2" - peerDependencies: - react: ^16.8.4 || ^17.0.0 || ^18.0.0 - checksum: 8f9b23c21b4d95722e28c9455c2bf00fd9437347714382594461f98e5b9954d60864d0f4e74e881639b065e752a97ba52a65e39930c234072e5bff291bb02b5e - languageName: node - linkType: hard - "react-is@npm:18.1.0": version: 18.1.0 resolution: "react-is@npm:18.1.0" @@ -16445,6 +16367,13 @@ __metadata: languageName: node linkType: hard +"react-refresh@npm:^0.14.0": + version: 0.14.0 + resolution: "react-refresh@npm:0.14.0" + checksum: b8ae07ad153357d77830928a7f1fc2df837aabefee907fa273ba04c7643f3b860e986f1d4b7ada9b721c8d79b8c24b5b911a314a1a2398b105f1b13d19ea2b8d + languageName: node + linkType: hard + "react-remove-scroll-bar@npm:^2.3.3": version: 2.3.4 resolution: "react-remove-scroll-bar@npm:2.3.4" @@ -16621,7 +16550,7 @@ __metadata: languageName: node linkType: hard -"react-transition-group@npm:^4.3.0": +"react-transition-group@npm:^4.3.0, react-transition-group@npm:^4.4.5": version: 4.4.5 resolution: "react-transition-group@npm:4.4.5" dependencies: @@ -16636,13 +16565,12 @@ __metadata: languageName: node linkType: hard -"react@npm:^17.0.2": - version: 17.0.2 - resolution: "react@npm:17.0.2" +"react@npm:^18.2.0": + version: 18.2.0 + resolution: "react@npm:18.2.0" dependencies: loose-envify: "npm:^1.1.0" - object-assign: "npm:^4.1.1" - checksum: 07ae8959acf1596f0550685102fd6097d461a54a4fd46a50f88a0cd7daaa97fdd6415de1dcb4bfe0da6aa43221a6746ce380410fa848acc60f8ac41f6649c148 + checksum: b562d9b569b0cb315e44b48099f7712283d93df36b19a39a67c254c6686479d3980b7f013dc931f4a5a3ae7645eae6386b4aa5eea933baa54ecd0f9acb0902b8 languageName: node linkType: hard @@ -16713,19 +16641,7 @@ __metadata: languageName: node linkType: hard -"recast@npm:^0.21.0": - version: 0.21.5 - resolution: "recast@npm:0.21.5" - dependencies: - ast-types: "npm:0.15.2" - esprima: "npm:~4.0.0" - source-map: "npm:~0.6.1" - tslib: "npm:^2.0.1" - checksum: a45168c82195f24fa2c70293a624fece0069a2e8e8adb637f9963777735f81cb3bb62e55172db677ec3573b08b2daaf1eddd85b74da6fe0bd37c9b15eeaf94b4 - languageName: node - linkType: hard - -"recast@npm:^0.23.1": +"recast@npm:^0.23.1, recast@npm:^0.23.3": version: 0.23.4 resolution: "recast@npm:0.23.4" dependencies: @@ -17003,7 +16919,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.10.0": +"resolve@npm:^1.10.0, resolve@npm:^1.22.1": version: 1.22.8 resolution: "resolve@npm:1.22.8" dependencies: @@ -17042,7 +16958,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@npm%3A^1.10.0#optional!builtin+ ": +"resolve@patch:resolve@npm%3A^1.10.0#optional!builtin , resolve@patch:resolve@npm%3A^1.22.1#optional!builtin ": version: 1.22.8 resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin ::version=1.22.8&hash=c3c19d" dependencies: @@ -17245,16 +17161,16 @@ __metadata: languageName: node linkType: hard -"sass@npm:^1.50": - version: 1.66.1 - resolution: "sass@npm:1.66.1" +"sass@npm:^1.69.5": + version: 1.69.5 + resolution: "sass@npm:1.69.5" dependencies: chokidar: "npm:>=3.0.0 <4.0.0" immutable: "npm:^4.0.0" source-map-js: "npm:>=0.6.2 <2.0.0" bin: sass: sass.js - checksum: 2fd9510088c8754010479132b9708b2c7178fe158bba1cb84aba4f22d333919d5e9561b5aa33fee3e635ae2d33e3835d6aad132705200d66e5773ce50842c8a1 + checksum: a9003a9482f2e467fc412cfe58ba4fa14fb78bef7e1283ce5d64a065f8a31114ec3bbf5d4e724f94eb8512c32c768a6f91f228c7f16a26a300bbf4db293b5608 languageName: node linkType: hard @@ -17274,13 +17190,12 @@ __metadata: languageName: node linkType: hard -"scheduler@npm:^0.20.2": - version: 0.20.2 - resolution: "scheduler@npm:0.20.2" +"scheduler@npm:^0.23.0": + version: 0.23.0 + resolution: "scheduler@npm:0.23.0" dependencies: loose-envify: "npm:^1.1.0" - object-assign: "npm:^4.1.1" - checksum: b0982e4b0f34f4ffa4f2f486161c0fd9ce9b88680b045dccbf250eb1aa4fd27413570645455187a83535e2370f5c667a251045547765408492bd883cbe95fcdb + checksum: b777f7ca0115e6d93e126ac490dbd82642d14983b3079f58f35519d992fa46260be7d6e6cede433a92db70306310c6f5f06e144f0e40c484199e09c1f7be53dd languageName: node linkType: hard @@ -17803,15 +17718,15 @@ __metadata: languageName: node linkType: hard -"storybook@npm:7.5.3": - version: 7.5.3 - resolution: "storybook@npm:7.5.3" +"storybook@npm:7.6.6": + version: 7.6.6 + resolution: "storybook@npm:7.6.6" dependencies: - "@storybook/cli": "npm:7.5.3" + "@storybook/cli": "npm:7.6.6" bin: sb: ./index.js storybook: ./index.js - checksum: 9a2ad5dd703f86bf488efdd425eedb850cbbeca05d2d15f97bca5700d02234cd281f81c07b5d9566986e8d96901c9dc8536f449ba7c1c9e40707b670b9aa6820 + checksum: 3fa91dfc9c107c19817fd09f2ae76960ca84594e0773460a9cf4ce066656aa7331eec817139ad35f2594e5f93ff9770bc204576f78e5b12a52025042e587ab51 languageName: node linkType: hard @@ -18004,6 +17919,15 @@ __metadata: languageName: node linkType: hard +"strip-indent@npm:^4.0.0": + version: 4.0.0 + resolution: "strip-indent@npm:4.0.0" + dependencies: + min-indent: "npm:^1.0.1" + checksum: 6b1fb4e22056867f5c9e7a6f3f45922d9a2436cac758607d58aeaac0d3b16ec40b1c43317de7900f1b8dd7a4107352fa47fb960f2c23566538c51e8585c8870e + languageName: node + linkType: hard + "strip-json-comments@npm:^3.0.1, strip-json-comments@npm:^3.1.1": version: 3.1.1 resolution: "strip-json-comments@npm:3.1.1" @@ -18988,6 +18912,15 @@ __metadata: languageName: node linkType: hard +"use-sync-external-store@npm:1.2.0": + version: 1.2.0 + resolution: "use-sync-external-store@npm:1.2.0" + peerDependencies: + react: ^16.8.0 || ^17.0.0 || ^18.0.0 + checksum: ac4814e5592524f242921157e791b022efe36e451fe0d4fd4d204322d5433a4fc300d63b0ade5185f8e0735ded044c70bcf6d2352db0f74d097a238cebd2da02 + languageName: node + linkType: hard + "util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2, util-deprecate@npm:~1.0.1": version: 1.0.2 resolution: "util-deprecate@npm:1.0.2" @@ -19063,17 +18996,6 @@ __metadata: languageName: node linkType: hard -"v8-to-istanbul@npm:^9.0.0": - version: 9.1.3 - resolution: "v8-to-istanbul@npm:9.1.3" - dependencies: - "@jridgewell/trace-mapping": "npm:^0.3.12" - "@types/istanbul-lib-coverage": "npm:^2.0.1" - convert-source-map: "npm:^2.0.0" - checksum: 7acfc460731b629a0d547b231e9d510aaa826df67f4deeaeeb991b492f78faf3bb1aa4b54fa0f9b06d815bc69eb0a04a6c2180c16ba43a83cc5e5490fa160a96 - languageName: node - linkType: hard - "validate-npm-package-license@npm:^3.0.1": version: 3.0.4 resolution: "validate-npm-package-license@npm:3.0.4" @@ -19953,7 +19875,7 @@ __metadata: languageName: node linkType: hard -"yargs-parser@npm:^20.2.2, yargs-parser@npm:^20.2.9": +"yargs-parser@npm:^20.2.2": version: 20.2.9 resolution: "yargs-parser@npm:20.2.9" checksum: 0685a8e58bbfb57fab6aefe03c6da904a59769bd803a722bb098bd5b0f29d274a1357762c7258fb487512811b8063fb5d2824a3415a0a4540598335b3b086c72 @@ -19998,3 +19920,23 @@ __metadata: checksum: 856117aa15cf5103d2a2fb173f0ab4acb12b4b4d0ed3ab249fdbbf612e55d1cadfd27a6110940e24746fb0a78cf640b522cc8bca76f30a3b00b66e90cf82abe0 languageName: node linkType: hard + +"zustand@npm:^4.4.7": + version: 4.4.7 + resolution: "zustand@npm:4.4.7" + dependencies: + use-sync-external-store: "npm:1.2.0" + peerDependencies: + "@types/react": ">=16.8" + immer: ">=9.0" + react: ">=16.8" + peerDependenciesMeta: + "@types/react": + optional: true + immer: + optional: true + react: + optional: true + checksum: de507f09eb79039d74d282df6ffac6c7fb6b840ca3620b0392bcbe3f9049902802db5448b4002e6fcb32f903f7ec1aea14602049eb2a3a8410bfea7186d72fb7 + languageName: node + linkType: hard diff --git a/nginx/custom-nginx.conf b/nginx/custom-nginx.conf new file mode 100644 index 000000000..433d8af8d --- /dev/null +++ b/nginx/custom-nginx.conf @@ -0,0 +1,20 @@ +server { + listen 80; + + # Serve frontend files for root requests + location / { + root /usr/share/nginx/html; + try_files $uri $uri/ /index.html; + } + + # Proxy pass to the Django app + location /server/ { + client_max_body_size 100M; + + proxy_pass http://server:8000; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } +} diff --git a/package.json b/package.json index 08f83029d..5ac04f197 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,9 @@ { "name": "aml-experiments", - "version": "1.8.0", - "private": true, + "version": "1.9.0", + "private": false, + "description": "The MUSCLE platform is an application that provides an easy way to implement and run online listening experiments for music research.", + "license": "MIT", "__comment1__": "private set to true to suppress 'warning package.json: No license field'", "scripts": { "test-front": "sudo docker-compose run client yarn test --watchAll=false", diff --git a/scripts/add-hosts-entries b/scripts/add-hosts-entries new file mode 100755 index 000000000..82ccbadb2 --- /dev/null +++ b/scripts/add-hosts-entries @@ -0,0 +1,27 @@ +#!/bin/bash + +# Define host entries +HOST_ENTRIES=( + "# MUSCLE" + "127.0.0.1 muscle.local" + "127.0.0.1 backend.muscle.local" + "# END MUSCLE" +) + +# Path to the hosts file +HOSTS_FILE="/etc/hosts" + +# Function to add an entry if it doesn't exist +add_host_entry() { + local entry=$1 + if ! grep -q "$entry" "$HOSTS_FILE"; then + echo "$entry" | sudo tee -a "$HOSTS_FILE" + else + echo "Entry already exists: $entry" + fi +} + +# Add each host entry +for entry in "${HOST_ENTRIES[@]}"; do + add_host_entry "$entry" +done diff --git a/scripts/lint-back b/scripts/lint-back new file mode 100755 index 000000000..533b74a94 --- /dev/null +++ b/scripts/lint-back @@ -0,0 +1,2 @@ +#!/bin/bash +docker-compose run --rm server bash -c "flake8" diff --git a/scripts/manage b/scripts/manage new file mode 100755 index 000000000..8c7cccdc5 --- /dev/null +++ b/scripts/manage @@ -0,0 +1,4 @@ +#!/bin/bash + +# This script executes Django management commands through Docker. +docker-compose run --rm server python manage.py $@ \ No newline at end of file diff --git a/scripts/test-back-coverage b/scripts/test-back-coverage new file mode 100755 index 000000000..67a0101e0 --- /dev/null +++ b/scripts/test-back-coverage @@ -0,0 +1,3 @@ +#!/bin/bash +docker-compose run --rm server bash -c "coverage run manage.py test && coverage report --show-missing" + diff --git a/tests/tests-selenium.py b/tests/tests-selenium.py index d3fd36536..22a1828b1 100644 --- a/tests/tests-selenium.py +++ b/tests/tests-selenium.py @@ -17,7 +17,7 @@ class TestsSelenium(unittest.TestCase): Install selenium on your system pip install selenium - Create tests-selenium.ini file in the same directory as this file describing your setup: + Create tests-selenium.ini file in the same directory as this file describing your setup: ``` [selenium] @@ -40,7 +40,7 @@ class TestsSelenium(unittest.TestCase): To skip individual tests, add `@unittest.skip` before the test """ - + def setUp(self): warnings.simplefilter("ignore", ResourceWarning) @@ -48,7 +48,7 @@ def setUp(self): self.config = configparser.ConfigParser() self.config.read('tests-selenium.ini') - browser = self.config['selenium']['browser'] + browser = self.config['selenium']['browser'] headless = self.config['selenium']['headless'] == "yes" if browser == "Firefox": @@ -71,7 +71,7 @@ def setUp(self): self.driver.set_window_size(1920, 1080) - + def tearDown(self): self.driver.quit() #warnings.simplefilter("default", ResourceWarning) @@ -80,14 +80,14 @@ def tearDown(self): def test_beatalignment(self): self.driver.get("{}/{}".format(self.config['url']['root'], self.config['experiment_slugs']['beat_alignment'])) - + # Explainer self.driver.find_element(By.XPATH, "//div[text()='Ok']").click() # If consent present, agree if self.driver.find_element(By.TAG_NAME,"h4").text.lower() == "informed consent": self.driver.find_element(By.XPATH, '//div[text()="I agree"]').click() - + # Wait for examples to end and click Start WebDriverWait(self.driver, 60, poll_frequency = 1) \ .until(expected_conditions.element_to_be_clickable((By.XPATH, '//div[text()="Start"]'))) \ @@ -95,7 +95,7 @@ def test_beatalignment(self): btn1 = '//label[text()="ALIGNED TO THE BEAT"]' btn2 = '//label[text()="NOT ALIGNED TO THE BEAT"]' - + while self.driver.find_element(By.TAG_NAME,"h4").text != "END": btn = random.choice([btn1, btn2]) # randomly pick a button to click WebDriverWait(self.driver, 30, poll_frequency = 1) \ @@ -104,7 +104,7 @@ def test_beatalignment(self): def test_eurovision(self): - + self.driver.get("{}/{}".format(self.config['url']['root'], self.config['experiment_slugs']['eurovision'])) # Explainer @@ -117,9 +117,9 @@ def test_eurovision(self): h4_text = None bonus_rounds = False - while True: + while True: - if h4_text == None: time.sleep(1) + if h4_text is None: time.sleep(1) h4_text = WebDriverWait(self.driver, 1).until(presence_of_element_located((By.TAG_NAME,"h4"))).text if "ROUND " in h4_text: @@ -137,12 +137,12 @@ def test_eurovision(self): WebDriverWait(self.driver, 25, poll_frequency = 1) \ .until(presence_of_element_located((By.XPATH, '//*[text()="Next"]'))) \ .click() - + elif h4_text == "QUESTIONNAIRE": if self.driver.find_elements(By.CLASS_NAME, "aha__radios"): self.driver.find_element(By.CSS_SELECTOR, ".radio:nth-child(1)").click() - + if self.driver.find_elements(By.TAG_NAME, "select"): select = Select(self.driver.find_element(By.TAG_NAME, 'select')) select.select_by_value('nl') @@ -156,7 +156,7 @@ def test_eurovision(self): # Click Continue after question answered self.driver.find_element(By.XPATH, '//*[text()="Continue"]').click() - + elif h4_text == "FINAL SCORE": break @@ -164,7 +164,7 @@ def test_eurovision(self): self.driver.find_element(By.XPATH, '//*[text()="Continue"]').click() bonus_rounds = True - else: + else: raise Exception("Unknown view") self.driver.find_element(By.XPATH, '//*[text()="Play again"]')
{rank && (
-
-
+ {showScore} {points}
-
+
)}
{showScore} {points}
+
@@ -85,10 +87,9 @@ const Final= ({ experiment, participant, session, score, final_text, action_text
{action_texts.all_experiments}
+
+ );
+
+ expect(screen.getByText(/Final Text/i)).toBeInTheDocument();
+ expect(screen.getByTestId('score')).toBeInTheDocument(); // Adjust based on how you display points
+ });
+
+ it('calls onNext prop when button is clicked', async () => {
+ const onNextMock = jest.fn();
+ render(
+
+
+ );
+
+ fireEvent.click(screen.getByText('Next'));
+ await waitFor(() => {
+ expect(onNextMock).toHaveBeenCalled();
+ });
+ });
+
+ it('does not render rank and social components when props are not provided', () => {
+ render(
+
+
+ );
+
+ expect(screen.queryByText('Rank')).not.toBeInTheDocument();
+ expect(screen.queryByText('Social')).not.toBeInTheDocument();
+ });
+
+ it('navigates to profile page when profile link is clicked', async () => {
+
+ const history = createMemoryHistory();
+
+ const mockActionTexts = {
+ all_experiments: 'All Experiments',
+ profile: 'Profile',
+ };
+
+ render(
+
+
+ );
+
+ const profileLink = screen.getByTestId('profile-link');
+
+ expect(profileLink).toBeInTheDocument();
+
+ expect(history.location.pathname).toBe('/');
+
+ fireEvent.click(profileLink)
+
+ expect(history.location.pathname).toBe('/profile');
+
+ });
+
+ it('calls finalizeSession with correct arguments', () => {
+ const { finalizeSession } = require('../../API');
+ render(
+
+
+ );
+
+ expect(finalizeSession).toHaveBeenCalledWith({ session: 1, participant: 'participant-id' });
+ });
+});
diff --git a/frontend/src/components/FloatingActionButton/FloatingActionButton.js b/frontend/src/components/FloatingActionButton/FloatingActionButton.js
new file mode 100644
index 000000000..76a01b943
--- /dev/null
+++ b/frontend/src/components/FloatingActionButton/FloatingActionButton.js
@@ -0,0 +1,78 @@
+
+import React from 'react';
+import classNames from 'util/classNames';
+
+/**
+ * The FloatingActionButton component is a reusable component that renders a floating action button with customizable position, icon, and content.
+ * @param {Object} props - The props object containing the following properties:
+ * - children: The content to be rendered inside the floating action button.
+ * - icon: The icon class name for the button. Default value is 'fa-comment'.
+ * - position: The position of the button. Possible values are 'bottom-left', 'bottom-right', 'top-left', 'top-right', 'center-left', 'center-right'. Default value is 'center-right'.
+ * - className: Additional CSS class names for the button.
+ * @returns {JSX.Element} The rendered FloatingActionButton component.
+ */
+const FloatingActionButton = ({
+ children,
+ icon = 'fa-comment',
+ position = 'center-right', // 'bottom-left', 'bottom-right', 'top-left', 'top-right', 'center-left', 'center-right' (default)
+ className,
+}) => {
+
+ const [expanded, setExpanded] = React.useState(false);
+
+ /**
+ * The getPositionClassNames function generates CSS class names based on the provided position string for a floating action button.
+ * Which is used to position the button and overlay.
+ * @param {string} position (e.g. 'bottom-left', 'center-right')
+ * @returns {string} (e.g. 'floating-action-button--bottom floating-action-button--left' or 'floating-action-button--center floating-action-button--right')
+ */
+ const getPositionClassNames = (position) => {
+ const [vertical, horizontal] = position.split('-');
+ return `floating-action-button--${vertical} ${horizontal ? `floating-action-button--${horizontal}` : ''}`;
+ }
+
+ return (<>
+
{
- history.push(URLS.profile);
- }}
+ onClick={() => history.push(URLS.profile)}
>
{action_texts.profile}
diff --git a/frontend/src/components/Final/Final.test.js b/frontend/src/components/Final/Final.test.js
new file mode 100644
index 000000000..cb3d75eb9
--- /dev/null
+++ b/frontend/src/components/Final/Final.test.js
@@ -0,0 +1,132 @@
+import React from 'react';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { BrowserRouter, Router } from 'react-router-dom';
+import { createMemoryHistory } from 'history'
+
+import Final from './Final'; // Adjust the import path as necessary
+
+// import useBoundStore from "../../util/stores";
+
+// const session = useBoundStore((state) => state.session);
+
+// console.log(session, useBoundStore)
+
+jest.mock('../../util/stores', () => ({
+ __esModule: true,
+ default: (fn) => {
+ const state = {
+ session: 1,
+ participant: 'participant-id',
+ };
+
+ return fn(state);
+ },
+ useBoundStore: jest.fn()
+}));
+
+jest.mock('../../API', () => ({
+ finalizeSession: jest.fn(),
+}));
+
+jest.mock('../../config', () => ({
+ URLS: {
+ AMLHome: '/aml',
+ profile: '/profile',
+ },
+}));
+
+describe('Final Component', () => {
+ it('renders correctly with given props', () => {
+ render(
+
+
+
+
+ {children}
+
+ setExpanded(false)}
+ aria-hidden={expanded ? 'false' : 'true'}
+ role="presentation"
+ >
+
+
+ );
+};
+
+export default FloatingActionButton;
+
diff --git a/frontend/src/components/FloatingActionButton/FloatingActionButton.scss b/frontend/src/components/FloatingActionButton/FloatingActionButton.scss
new file mode 100644
index 000000000..bf3a6c488
--- /dev/null
+++ b/frontend/src/components/FloatingActionButton/FloatingActionButton.scss
@@ -0,0 +1,136 @@
+@import "../../scss/variables.scss";
+
+.floating-action-button {
+ $self: &;
+
+ display: flex;
+ flex-direction: row;
+ position: fixed;
+ z-index: 100;
+ cursor: pointer;
+ transition-property: transform, left, right, top, bottom, filter;
+ transition-duration: 0.2s;
+ transition-timing-function: ease-in-out;
+ filter: drop-shadow(0, 0, 0, rgba(0, 0, 0, 0));
+
+ &--expanded {
+ filter: drop-shadow(0px 2px 2px rgba(0, 0, 0, 0.2));
+ }
+
+ &--left {
+ flex-direction: row-reverse;
+ right: auto;
+ left: -200px;
+
+ &#{$self}--expanded {
+ left: 0px;
+ }
+ }
+
+ &--right {
+ left: auto;
+ right: -200px;
+
+ &#{$self}--expanded {
+ right: 0px;
+ }
+ }
+
+ &--top {
+ align-items: flex-start;
+ bottom: auto;
+ top: 0px;
+ }
+
+ &--bottom {
+ align-items: flex-end;
+ top: auto;
+ bottom: 0px;
+ }
+
+ // vertically centered
+ &--center {
+ align-items: center;
+ top: 50%;
+ transform: translateY(-50%);
+ }
+
+ &__toggle-button {
+ background: $gray;
+ border: none;
+ padding: .5rem;
+
+ #{$self}--left & {
+ border-top-left-radius: 0px;
+ border-bottom-left-radius: 0px;
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ }
+
+ #{$self}--right & {
+ border-top-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+ border-top-right-radius: 0px;
+ border-bottom-right-radius: 0px;
+ }
+ }
+
+ &__icon {
+ width: 24px;
+ height: 24px;
+ color: $black;
+ }
+
+ &__content {
+ background: $gray;
+ border: none;
+ padding: .5rem;
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ width: 200px;
+ min-height: 100px;
+ max-height: 100vh;
+
+ #{$self}--left & {
+ border-top-left-radius: 0px;
+ border-bottom-left-radius: 0px;
+ border-top-right-radius: 4px;
+ border-bottom-right-radius: 4px;
+ }
+
+ #{$self}--right & {
+ border-top-left-radius: 4px;
+ border-bottom-left-radius: 4px;
+ border-top-right-radius: 0px;
+ border-bottom-right-radius: 0px;
+ }
+
+ #{$self}--top & {
+ border-top-left-radius: 0px;
+ border-top-right-radius: 0px;
+ }
+
+ #{$self}--bottom & {
+ border-bottom-left-radius: 0px;
+ border-bottom-right-radius: 0px;
+ }
+ }
+
+ &__overlay {
+ position: fixed;
+ z-index: 99;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ background: rgba(0,0,0,.2);
+ opacity: 0;
+ pointer-events: none;
+ transition: opacity .2s ease-in-out;
+
+ &--expanded {
+ opacity: 1;
+ pointer-events: all;
+ }
+ }
+}
diff --git a/frontend/src/components/FloatingActionButton/FloatingActionButton.test.js b/frontend/src/components/FloatingActionButton/FloatingActionButton.test.js
new file mode 100644
index 000000000..684c83805
--- /dev/null
+++ b/frontend/src/components/FloatingActionButton/FloatingActionButton.test.js
@@ -0,0 +1,73 @@
+import React from 'react';
+import { render, fireEvent, screen } from '@testing-library/react';
+import FloatingActionButton from './FloatingActionButton';
+
+describe('FloatingActionButton', () => {
+ it('renders the button with the initial icon', () => {
+ render(Test Content
Test Content
{setClicked(true); playSection(0);} : undefined}
@@ -17,6 +18,8 @@ const PlayButton = ({ playSection, isPlaying, className="" }) => {
}}
>
+
+
);
};
diff --git a/frontend/src/components/PlayButton/PlayButton.scss b/frontend/src/components/PlayButton/PlayButton.scss
index 7c6ccf0cc..6406c6a9c 100644
--- a/frontend/src/components/PlayButton/PlayButton.scss
+++ b/frontend/src/components/PlayButton/PlayButton.scss
@@ -19,8 +19,6 @@ $playIconSize: 30px;
opacity: 0.5;
}
-
-
&::before {
content: "";
transition: border 0.1s ease-out, margin 0.1s ease-out, width 0.1s ease-out, height 0.1s ease-out;
@@ -52,3 +50,7 @@ $playIconSize: 30px;
}
}
}
+
+.playbutton-spacer {
+ height: 87px; // Difference in height between PlayButton and Preload
+}
diff --git a/frontend/src/components/PlayButton/PlayCard.js b/frontend/src/components/PlayButton/PlayCard.js
index f4aab4664..9ff57c5ca 100644
--- a/frontend/src/components/PlayButton/PlayCard.js
+++ b/frontend/src/components/PlayButton/PlayCard.js
@@ -1,29 +1,63 @@
import classNames from "classnames";
import Histogram from "../Histogram/Histogram";
+import { VISUALMATCHINGPAIRS } from "components/Playback/Playback";
+import { API_ROOT } from "config";
-const PlayCard = ({ onClick, registerUserClicks, playing, section }) => {
+const PlayCard = ({ onClick, registerUserClicks, playing, section, view, showAnimation }) => {
+ const getImgSrc = (url) => {
+ if (url.startsWith("http")) {
+ return url;
+ }
+ return API_ROOT + url;
+ }
+
+ const histogramBars = showAnimation ? 5 : 0;
return (
- {
- registerUserClicks(event.clientX, event.clientY);
- onClick();
- }}>
- { section.turned ?
- {
+ registerUserClicks(event.clientX, event.clientY);
+ onClick();
+ }}
+ role="button"
+ >
+ {section.turned ?
+ view === VISUALMATCHINGPAIRS ?
+
);
};
-export default PlayCard;
\ No newline at end of file
+export default PlayCard;
diff --git a/frontend/src/components/PlayButton/PlayCard.scss b/frontend/src/components/PlayButton/PlayCard.scss
index 80773063d..743051cd0 100644
--- a/frontend/src/components/PlayButton/PlayCard.scss
+++ b/frontend/src/components/PlayButton/PlayCard.scss
@@ -80,30 +80,45 @@ $playButtonWideDisplay: 16vh;
&.nomatch {
animation-duration: 0.7s;
animation-name: nomatch;
- animation-iteration-count: 1;
+ animation-iteration-count: 1;
}
&.lucky {
animation-duration: 0.55s;
animation-name: luckymatch;
- animation-iteration-count: 1;
+ animation-iteration-count: 1;
}
&.memory {
animation-duration: 0.8s;
animation-name: memorymatch;
- animation-iteration-count: 1;
+ animation-iteration-count: 1;
}
-
+
&.noevents {
pointer-events: none;
}
+ .front {
+ border-radius : .5rem;
+
+ &--visual {
+ overflow: hidden;
+
+ img {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ aspect-ratio: 1/1;
+ }
+ }
+ }
+
.back {
background-color: $gray;
border-radius: .5rem;
}
-
+
@media(min-aspect-ratio: 1/1) {
.back, .turned {
width: $playButtonWideDisplay;
@@ -117,5 +132,4 @@ $playButtonWideDisplay: 16vh;
height: $playButtonHighDisplay;
}
}
-
}
diff --git a/frontend/src/components/PlayButton/PlayCard.test.js b/frontend/src/components/PlayButton/PlayCard.test.js
new file mode 100644
index 000000000..9ca8cb405
--- /dev/null
+++ b/frontend/src/components/PlayButton/PlayCard.test.js
@@ -0,0 +1,104 @@
+import React from "react";
+import { render, fireEvent, screen } from "@testing-library/react";
+import PlayCard from "./PlayCard"; // Adjust the path as necessary
+
+jest.mock("../../util/stores");
+
+describe("PlayCard Component Tests", () => {
+ const mockOnClick = jest.fn();
+ const mockRegisterUserClicks = jest.fn();
+
+ const sectionProps = {
+ turned: false,
+ noevents: false,
+ inactive: false,
+ memory: false,
+ lucky: false,
+ nomatch: false,
+ seen: false,
+ url: "test.jpg",
+ name: "Test"
+ };
+
+ it("should render without crashing", () => {
+ render(
+ })
+
+ :
+
-
- }
+ :
+
+
+ }
+const PlayerSmall = ({ label, onClick, playing, disabled}) => (
+
{label && <>
{label}
diff --git a/frontend/src/components/Playback/Autoplay.js b/frontend/src/components/Playback/Autoplay.js index 10bb080a0..f58d76c5e 100644 --- a/frontend/src/components/Playback/Autoplay.js +++ b/frontend/src/components/Playback/Autoplay.js @@ -1,17 +1,16 @@ -import React, { useRef, useEffect } from "react"; +import React, { useEffect, useState } from "react"; import Circle from "../Circle/Circle"; import ListenCircle from "../ListenCircle/ListenCircle"; -const AutoPlay = ({instruction, playConfig, playSection, time, startedPlaying, finishedPlaying, responseTime, className=''}) => { - // player state +const AutoPlay = ({instruction, showAnimation, playSection, startedPlaying, finishedPlaying, responseTime, className=''}) => { - const running = useRef(playConfig.auto_play); + const [running, setRunning] = useState(true); // Handle view logic useEffect(() => { playSection(0) - }, [playConfig, startedPlaying]); + }, [playSection, startedPlaying]); // Render component return ( @@ -21,14 +20,15 @@ const AutoPlay = ({instruction, playConfig, playSection, time, startedPlaying, f running={running} duration={responseTime} color="white" - animateCircle={playConfig.show_animation} + animateCircle={showAnimation} onFinish={() => { // Stop audio + setRunning(false); finishedPlaying(); }} />
- {playConfig.show_animation
+ {showAnimation
? {
+const ImagePlayer = (props) => {
const playSection = props.playSection;
// extraContent callback can be used to add content to each player
const extraContent = useCallback(
(index) => {
- const spectrograms = props.playConfig.spectrograms;
- if (!spectrograms) {
- return
Warning: No spectrograms found
; + const images = props.images; + if (!images) { + returnWarning: No images found
; } - const labels = props.playConfig.spectrogram_labels; + const labels = props.image_labels; - if (index >= 0 && index < spectrograms.length) { + if (index >= 0 && index < images.length) { return ( -
+
{
playSection(index);
}}
@@ -32,14 +32,14 @@ const SpectrogramPlayer = (props) => {
return
Warning: No spectrograms available for index {index}
; } }, - [props.playConfig.spectrograms, props.playConfig.spectrogram_labels, playSection] + [props.images, props.image_labels, playSection] ); return ( -
+
-
-
-
-
-
-
+
+ )
+}
- Score:
{total}
+ {total}
+
+
+ {scoreFeedbackDisplay !== SCORE_FEEDBACK_DISPLAY.HIDDEN &&
+
+ {Object.keys(sections).map((index) => (
+ {
+ playSection(index);
+ checkMatchingPairs(index);
+ }}
+ registerUserClicks={registerUserClicks}
+ playing={playerIndex === index}
+ section={sections[index]}
+ onFinish={showFeedback}
+ showAnimation={showAnimation}
+ />
+ )
+ )}
- {Object.keys(sections).map((index) => (
- {
- playSection(index);
- checkMatchingPairs(index);
- }}
- registerUserClicks={registerUserClicks}
- playing={playerIndex === index}
- section={sections[index]}
- onFinish={showFeedback}
- stopAudioAfter={stopAudioAfter}
- />
- )
- )}
+const ScoreFeedback = ({
+ message,
+ scoreFeedbackDisplay = SCORE_FEEDBACK_DISPLAY.LARGE_TOP,
+ score,
+ total,
+}) => {
+ return (
+ {
- setView(playerType);
+ {
+ setView(playbackArgs.view);
onPreloadReady();
}}
/>
);
case AUTOPLAY:
- return -1}
- disabled={playConfig.play_once && hasPlayed.includes(0)}
+ disabled={playbackArgs.play_once && hasPlayed.includes(0)}
/>
);
case MULTIPLAYER:
return (
+
)
}
export default MatchingPairs;
+
diff --git a/frontend/src/components/Playback/MatchingPairs.scss b/frontend/src/components/Playback/MatchingPairs.scss
index a27622f58..d2286bcd0 100644
--- a/frontend/src/components/Playback/MatchingPairs.scss
+++ b/frontend/src/components/Playback/MatchingPairs.scss
@@ -13,10 +13,10 @@
}
.aha__matching-pairs {
- position: absolute;
- left: 50%;
- transform: translateX(-50%);
- margin: 0px auto;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
}
@media (min-aspect-ratio: 1/1) {
@@ -45,7 +45,26 @@
.playing-board {
display: inline-grid;
- max-width: 100%;
+}
+
+.matching-pairs__score-feedback {
+
+ font-weight: 700;
+
+ &--small-bottom-right {
+ position: fixed;
+ justify-content: flex-end;
+ bottom: 0;
+ right: 0;
+ text-align: right;
+ font-size: 0.5rem;
+ backface-visibility: hidden;
+ font-weight: normal;
+
+ .matching-pairs__feedback, .matching-pairs__score {
+ float: none;
+ }
+ }
}
.matching-pairs__feedback, .matching-pairs__score {
@@ -53,7 +72,6 @@
line-height: 1;
text-align: center;
padding-bottom: .7rem;
- font-weight: 700;
font-size: 95%;
width: auto;
@@ -78,8 +96,24 @@
&.fbmisremembered {
color: $red;
}
-}
+ &.nomessage {
+ opacity: 0;
+ }
+}
.matching-pairs__score {
float: right;
+
+ &.noscore {
+ opacity: 0;
+ }
}
+
+.turnscore {
+ position: fixed;
+ bottom: -2rem;
+ left: -2rem;
+ &.noturnscore {
+ opacity: 0;
+ }
+}
\ No newline at end of file
diff --git a/frontend/src/components/Playback/MatchingPairs.test.js b/frontend/src/components/Playback/MatchingPairs.test.js
index 4ceac1208..47a63e812 100644
--- a/frontend/src/components/Playback/MatchingPairs.test.js
+++ b/frontend/src/components/Playback/MatchingPairs.test.js
@@ -1,10 +1,12 @@
import React from 'react';
import { render } from '@testing-library/react';
-import MatchingPairs from './MatchingPairs';
+import MatchingPairs, { SCORE_FEEDBACK_DISPLAY } from './MatchingPairs';
-jest.mock("../PlayButton/PlayCard", () => (props) => (
-
-));
+jest.mock("../../util/stores", () => ({
+ __esModule: true,
+ default: jest.fn(),
+ useBoundStore: jest.fn()
+}));
describe('MatchingPairs Component', () => {
@@ -12,8 +14,10 @@ describe('MatchingPairs Component', () => {
playSection: jest.fn(),
playerIndex: 0,
finishedPlaying: jest.fn(),
- stopAudioAfter: jest.fn(),
+ onFinish: jest.fn(),
+ stopAudioAfter: 4.0,
submitResult: jest.fn(),
+ showAnimation: false
};
it('displays three columns when sections length is less than or equal to 6', () => {
@@ -25,6 +29,30 @@ describe('MatchingPairs Component', () => {
it('displays four columns when sections length is greater than 6', () => {
const sections = new Array(7).fill({}).map((_, index) => ({ id: index }));
const { container } = render(
+
+
+
+
Score:
{total}
{total}
-
);
};
diff --git a/frontend/src/components/Playback/Playback.test.js b/frontend/src/components/Playback/Playback.test.js
new file mode 100644
index 000000000..4ee8562ba
--- /dev/null
+++ b/frontend/src/components/Playback/Playback.test.js
@@ -0,0 +1,45 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+
+import Playback from './Playback';
+
+jest.mock("../../util/stores");
+
+describe('Playback', () => {
+
+ const basicProps = {
+ autoAdvance: false,
+ responseTime: 42,
+ onPreloadReady: jest.fn(),
+ startedPlaying: jest.fn(),
+ finishedPlaying: jest.fn(),
+ submitResult: jest.fn(),
+ }
+
+ let playbackArgs = {
+ view: 'BUTTON',
+ show_animation: false,
+ instruction: 'Listen, just listen!',
+ play_method: 'HTML',
+ ready_time: 1,
+ preload_message: 'Get ready',
+ sections: [{id: 13, url: 'some/fancy/tune.mp3'}]
+ };
+
+ it('renders itself', () => {
+ const { container } = render(
+ {render(playerType)}
{" "}
+ {render(playbackArgs.view)}
{" "}
-
- );
- }
+ if (playlists.length > 1) {
+ return (
+ {instruction}
- --
- {playlists.map((playlist, index) => (
-
+
+ );
+ } else { return null };
};
const PlaylistItem = ({ delay, playlist, onClick }) => (
{instruction}
+-
+ {playlists.map((playlistItem, index) => (
+