From 15beb4db3e4128b2de67b6b1bb08f3f5f7714790 Mon Sep 17 00:00:00 2001 From: Oleh-Kril <91199925+Oleh-Kril@users.noreply.github.com> Date: Wed, 24 Jan 2024 13:03:29 +0200 Subject: [PATCH] Update master 24.01.2023 1 p.m. (#1132) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Change amount of pictures for different size of screen (#1096) * Change amount of pictures for different size of sreenview * - change breakpoint to standard 768 --------- Co-authored-by: Oleh-Kril * Gmail is opened in new tab (#1087) * - refactor to open in a new tab (#1093) * fix modals closing (#1085) * fix modals closing * separate arrow function from props --------- Co-authored-by: Oleh-Kril * New editor v2 (#1086) * Initial react-quill config (news/main streetcode text). Needs cleaning & refactoring * Added quill everywhere, needs refactoring * cleaned code * Fixed text updating in ForFans admin block * Added utility to convert content to quill delta * Added validation when empty text fields in modals * Fixed bug with max length quill * Added the impossibility of saving a record with improper length * Cleaned code * Refactoring of editor * Removed package-lock.json changes from PR * Dynamics meta tags (#1095) * modify index.html * add server and configure metadata for news * add dynamic metatags for streetcodes * moved news file to another folder * run linter * add update for news (not completed) * adjust put and delete * handle delete and update of streetcode and news * add part of tests * -add api error filter * - cover with tests & refactor * - refactor code to separate logic and reduce code complexity * - test get and update * - write tests for delete - refactor to use constants - add all urls-to-omit * fix comments * fix comments: - refactor to use destructuring assigment - remove comments - move some lines to constants * remove stageback url * Update develop (#1102) * Develop (#1084) * Hide a slide outline * fix news modal from closing when image is not created (#1061) * - getting news from cache - green notification on news modal success (#1063) * fix scrolling to the main text (#1075) * remove react helmet + add banner (#1072) * Fixed progress bar visibility and popups (#1070) * Fixed progress bar visibility and popups * add animation transition to make it smoother --------- Co-authored-by: Oleh-Kril * Fix issue 847 Fix Url Ref (#1068) * Fix PrivatePolicy streetcode reference * Change ref to https://streetcode.com.ua * Add some fix * Fixed the amount buttons and input in donates modal (#1060) * Fix news image on safari (#1058) * refactor newsImage styles * add max-height * Fix for fans category editing (#1037) * Fixed unavalaible categories on new streetcode * Fixed category editing of for fans categories * Made a mobile ornament with varying lengths for screens with a width … (#1030) * Made a mobile ornament with varying lengths for screens with a width of 480 pixels or less * adjust margins to correspond design --------- Co-authored-by: Oleh-Kril * Fixed Issue 870, 871 (#1025) * Add red * to Timeline date field and vanish an error * Fix logic when error message shoud vanish * fix data check in timelineAdminModal * set fixed position for arrows in connection(streetcode) (#1029) * set fixed position for arrows in connection(streetcode) * adjust position of arrows --------- Co-authored-by: Oleh-Kril * fix our partners title (#1022) now it takes only 1 row instead of 2 * Refactor teams modal & list (#1069) * Refactor teams modal & list * remove commented code * Jest config (#1028) * Configured Jest * Configured Jest * Adding/modifying code spliting for dev and prod setups (#1041) * modify_bundle_split_for_dev_setup * adding_bundle_split_to_prod_condig * adding_entry_to_gitignore_file * adding_empty_line * adjust admin page styles (#1066) * Refactor partner modal (#1073) * refactor code part 1 - reduce code amount * refactor image uploading logic to make it correct * Minor changes and improvements (#1042) * adding_check-node-version_lib_and engine_configs * update_package-lock_and_yarn-lock_files * edit_readme_file --------- Co-authored-by: Oleh-Kril * Issue 604 (Change padding in main text field) (#1077) * Change padding in the text field * adjust on phone --------- Co-authored-by: Oleh-Kril * fix related events modal (#1080) * deleted scroll up on mobile and tablet * update components * add loading all tags * update streetcode components * update tags modal * update tags slider * delete streetcodeid * update related figure * - refactor code (no business logic changes) (#1065) * run linter (#1081) * revert_resolve_path_for_dev_build * revert_resolve_path_for_prod_build --------- Co-authored-by: ValDekh Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Bohdan Bozhyk <53005363+Adeodonne@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> Co-authored-by: mykola-krai <133663112+mykola-krai@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: Roman Serhiychuk <60231618+Rominos7@users.noreply.github.com> Co-authored-by: Rominos7 * Update master (#1101) * Change amount of pictures for different size of screen (#1096) * Change amount of pictures for different size of sreenview * - change breakpoint to standard 768 --------- Co-authored-by: Oleh-Kril * Gmail is opened in new tab (#1087) * - refactor to open in a new tab (#1093) * fix modals closing (#1085) * fix modals closing * separate arrow function from props --------- Co-authored-by: Oleh-Kril * New editor v2 (#1086) * Initial react-quill config (news/main streetcode text). Needs cleaning & refactoring * Added quill everywhere, needs refactoring * cleaned code * Fixed text updating in ForFans admin block * Added utility to convert content to quill delta * Added validation when empty text fields in modals * Fixed bug with max length quill * Added the impossibility of saving a record with improper length * Cleaned code * Refactoring of editor * Removed package-lock.json changes from PR * Dynamics meta tags (#1095) * modify index.html * add server and configure metadata for news * add dynamic metatags for streetcodes * moved news file to another folder * run linter * add update for news (not completed) * adjust put and delete * handle delete and update of streetcode and news * add part of tests * -add api error filter * - cover with tests & refactor * - refactor code to separate logic and reduce code complexity * - test get and update * - write tests for delete - refactor to use constants - add all urls-to-omit * fix comments * fix comments: - refactor to use destructuring assigment - remove comments - move some lines to constants * remove stageback url --------- Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> --------- Co-authored-by: ValDekh Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Bohdan Bozhyk <53005363+Adeodonne@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> Co-authored-by: mykola-krai <133663112+mykola-krai@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: Roman Serhiychuk <60231618+Rominos7@users.noreply.github.com> Co-authored-by: Rominos7 * - temporary remove AgentFrontend (#1103) * Update develop (#1102) * Develop (#1084) * Hide a slide outline * fix news modal from closing when image is not created (#1061) * - getting news from cache - green notification on news modal success (#1063) * fix scrolling to the main text (#1075) * remove react helmet + add banner (#1072) * Fixed progress bar visibility and popups (#1070) * Fixed progress bar visibility and popups * add animation transition to make it smoother --------- Co-authored-by: Oleh-Kril * Fix issue 847 Fix Url Ref (#1068) * Fix PrivatePolicy streetcode reference * Change ref to https://streetcode.com.ua * Add some fix * Fixed the amount buttons and input in donates modal (#1060) * Fix news image on safari (#1058) * refactor newsImage styles * add max-height * Fix for fans category editing (#1037) * Fixed unavalaible categories on new streetcode * Fixed category editing of for fans categories * Made a mobile ornament with varying lengths for screens with a width … (#1030) * Made a mobile ornament with varying lengths for screens with a width of 480 pixels or less * adjust margins to correspond design --------- Co-authored-by: Oleh-Kril * Fixed Issue 870, 871 (#1025) * Add red * to Timeline date field and vanish an error * Fix logic when error message shoud vanish * fix data check in timelineAdminModal * set fixed position for arrows in connection(streetcode) (#1029) * set fixed position for arrows in connection(streetcode) * adjust position of arrows --------- Co-authored-by: Oleh-Kril * fix our partners title (#1022) now it takes only 1 row instead of 2 * Refactor teams modal & list (#1069) * Refactor teams modal & list * remove commented code * Jest config (#1028) * Configured Jest * Configured Jest * Adding/modifying code spliting for dev and prod setups (#1041) * modify_bundle_split_for_dev_setup * adding_bundle_split_to_prod_condig * adding_entry_to_gitignore_file * adding_empty_line * adjust admin page styles (#1066) * Refactor partner modal (#1073) * refactor code part 1 - reduce code amount * refactor image uploading logic to make it correct * Minor changes and improvements (#1042) * adding_check-node-version_lib_and engine_configs * update_package-lock_and_yarn-lock_files * edit_readme_file --------- Co-authored-by: Oleh-Kril * Issue 604 (Change padding in main text field) (#1077) * Change padding in the text field * adjust on phone --------- Co-authored-by: Oleh-Kril * fix related events modal (#1080) * deleted scroll up on mobile and tablet * update components * add loading all tags * update streetcode components * update tags modal * update tags slider * delete streetcodeid * update related figure * - refactor code (no business logic changes) (#1065) * run linter (#1081) * revert_resolve_path_for_dev_build * revert_resolve_path_for_prod_build --------- Co-authored-by: ValDekh Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Bohdan Bozhyk <53005363+Adeodonne@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> Co-authored-by: mykola-krai <133663112+mykola-krai@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: Roman Serhiychuk <60231618+Rominos7@users.noreply.github.com> Co-authored-by: Rominos7 * Update master (#1101) * Change amount of pictures for different size of screen (#1096) * Change amount of pictures for different size of sreenview * - change breakpoint to standard 768 --------- Co-authored-by: Oleh-Kril * Gmail is opened in new tab (#1087) * - refactor to open in a new tab (#1093) * fix modals closing (#1085) * fix modals closing * separate arrow function from props --------- Co-authored-by: Oleh-Kril * New editor v2 (#1086) * Initial react-quill config (news/main streetcode text). Needs cleaning & refactoring * Added quill everywhere, needs refactoring * cleaned code * Fixed text updating in ForFans admin block * Added utility to convert content to quill delta * Added validation when empty text fields in modals * Fixed bug with max length quill * Added the impossibility of saving a record with improper length * Cleaned code * Refactoring of editor * Removed package-lock.json changes from PR * Dynamics meta tags (#1095) * modify index.html * add server and configure metadata for news * add dynamic metatags for streetcodes * moved news file to another folder * run linter * add update for news (not completed) * adjust put and delete * handle delete and update of streetcode and news * add part of tests * -add api error filter * - cover with tests & refactor * - refactor code to separate logic and reduce code complexity * - test get and update * - write tests for delete - refactor to use constants - add all urls-to-omit * fix comments * fix comments: - refactor to use destructuring assigment - remove comments - move some lines to constants * remove stageback url --------- Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> --------- Co-authored-by: ValDekh Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Bohdan Bozhyk <53005363+Adeodonne@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> Co-authored-by: mykola-krai <133663112+mykola-krai@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: Roman Serhiychuk <60231618+Rominos7@users.noreply.github.com> Co-authored-by: Rominos7 * - temporary remove AgentFrontend (#1103) * Set up jest and add new unit test (#1092) * install_new_modules_in-dev_dependencies * edit_jest_config_file * refactor_DeleteStreetcodeModal.component,tsx * adding_mock_for_root-store * adding_mock_for_modal * adding_unit_test_for_DeleteStreetcodeModal * fix_comment * fix_comment * restore_mobx * change_type * rename_constans_file * refactor_mock * refactor_modal_mock * adding_test_cases_with_getByRole * refactor_component_after_merge_with_develop * fix_UT * fix_lint * improve_UT * 1097 rq text editor fix validation of texts for the max allowable length (#1107) * Fixed bug with main/additional texts * Fixed improper length validation in modals (ReactQuill editor) * Removed the inaccuracy in the editor * Added ability to press Ctrl+A * Fixed indents in news page (#1099) * Fixed indents in news page * Fixed bug with indents for tinymce texts * Fixed bug with improper indents * Renamed utility * Fixed styles with indents - for fans modal * try to fix donate button (#1106) * Update master 2 (#1105) * Change amount of pictures for different size of screen (#1096) * Change amount of pictures for different size of sreenview * - change breakpoint to standard 768 --------- Co-authored-by: Oleh-Kril * Gmail is opened in new tab (#1087) * - refactor to open in a new tab (#1093) * fix modals closing (#1085) * fix modals closing * separate arrow function from props --------- Co-authored-by: Oleh-Kril * New editor v2 (#1086) * Initial react-quill config (news/main streetcode text). Needs cleaning & refactoring * Added quill everywhere, needs refactoring * cleaned code * Fixed text updating in ForFans admin block * Added utility to convert content to quill delta * Added validation when empty text fields in modals * Fixed bug with max length quill * Added the impossibility of saving a record with improper length * Cleaned code * Refactoring of editor * Removed package-lock.json changes from PR * Dynamics meta tags (#1095) * modify index.html * add server and configure metadata for news * add dynamic metatags for streetcodes * moved news file to another folder * run linter * add update for news (not completed) * adjust put and delete * handle delete and update of streetcode and news * add part of tests * -add api error filter * - cover with tests & refactor * - refactor code to separate logic and reduce code complexity * - test get and update * - write tests for delete - refactor to use constants - add all urls-to-omit * fix comments * fix comments: - refactor to use destructuring assigment - remove comments - move some lines to constants * remove stageback url * Update develop (#1102) * Develop (#1084) * Hide a slide outline * fix news modal from closing when image is not created (#1061) * - getting news from cache - green notification on news modal success (#1063) * fix scrolling to the main text (#1075) * remove react helmet + add banner (#1072) * Fixed progress bar visibility and popups (#1070) * Fixed progress bar visibility and popups * add animation transition to make it smoother --------- Co-authored-by: Oleh-Kril * Fix issue 847 Fix Url Ref (#1068) * Fix PrivatePolicy streetcode reference * Change ref to https://streetcode.com.ua * Add some fix * Fixed the amount buttons and input in donates modal (#1060) * Fix news image on safari (#1058) * refactor newsImage styles * add max-height * Fix for fans category editing (#1037) * Fixed unavalaible categories on new streetcode * Fixed category editing of for fans categories * Made a mobile ornament with varying lengths for screens with a width … (#1030) * Made a mobile ornament with varying lengths for screens with a width of 480 pixels or less * adjust margins to correspond design --------- Co-authored-by: Oleh-Kril * Fixed Issue 870, 871 (#1025) * Add red * to Timeline date field and vanish an error * Fix logic when error message shoud vanish * fix data check in timelineAdminModal * set fixed position for arrows in connection(streetcode) (#1029) * set fixed position for arrows in connection(streetcode) * adjust position of arrows --------- Co-authored-by: Oleh-Kril * fix our partners title (#1022) now it takes only 1 row instead of 2 * Refactor teams modal & list (#1069) * Refactor teams modal & list * remove commented code * Jest config (#1028) * Configured Jest * Configured Jest * Adding/modifying code spliting for dev and prod setups (#1041) * modify_bundle_split_for_dev_setup * adding_bundle_split_to_prod_condig * adding_entry_to_gitignore_file * adding_empty_line * adjust admin page styles (#1066) * Refactor partner modal (#1073) * refactor code part 1 - reduce code amount * refactor image uploading logic to make it correct * Minor changes and improvements (#1042) * adding_check-node-version_lib_and engine_configs * update_package-lock_and_yarn-lock_files * edit_readme_file --------- Co-authored-by: Oleh-Kril * Issue 604 (Change padding in main text field) (#1077) * Change padding in the text field * adjust on phone --------- Co-authored-by: Oleh-Kril * fix related events modal (#1080) * deleted scroll up on mobile and tablet * update components * add loading all tags * update streetcode components * update tags modal * update tags slider * delete streetcodeid * update related figure * - refactor code (no business logic changes) (#1065) * run linter (#1081) * revert_resolve_path_for_dev_build * revert_resolve_path_for_prod_build --------- Co-authored-by: ValDekh Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Bohdan Bozhyk <53005363+Adeodonne@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> Co-authored-by: mykola-krai <133663112+mykola-krai@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: Roman Serhiychuk <60231618+Rominos7@users.noreply.github.com> Co-authored-by: Rominos7 * Update master (#1101) * Change amount of pictures for different size of screen (#1096) * Change amount of pictures for different size of sreenview * - change breakpoint to standard 768 --------- Co-authored-by: Oleh-Kril * Gmail is opened in new tab (#1087) * - refactor to open in a new tab (#1093) * fix modals closing (#1085) * fix modals closing * separate arrow function from props --------- Co-authored-by: Oleh-Kril * New editor v2 (#1086) * Initial react-quill config (news/main streetcode text). Needs cleaning & refactoring * Added quill everywhere, needs refactoring * cleaned code * Fixed text updating in ForFans admin block * Added utility to convert content to quill delta * Added validation when empty text fields in modals * Fixed bug with max length quill * Added the impossibility of saving a record with improper length * Cleaned code * Refactoring of editor * Removed package-lock.json changes from PR * Dynamics meta tags (#1095) * modify index.html * add server and configure metadata for news * add dynamic metatags for streetcodes * moved news file to another folder * run linter * add update for news (not completed) * adjust put and delete * handle delete and update of streetcode and news * add part of tests * -add api error filter * - cover with tests & refactor * - refactor code to separate logic and reduce code complexity * - test get and update * - write tests for delete - refactor to use constants - add all urls-to-omit * fix comments * fix comments: - refactor to use destructuring assigment - remove comments - move some lines to constants * remove stageback url --------- Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> --------- Co-authored-by: ValDekh Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Bohdan Bozhyk <53005363+Adeodonne@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> Co-authored-by: mykola-krai <133663112+mykola-krai@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: Roman Serhiychuk <60231618+Rominos7@users.noreply.github.com> Co-authored-by: Rominos7 * - temporary remove AgentFrontend (#1103) * Update develop (#1102) * Develop (#1084) * Hide a slide outline * fix news modal from closing when image is not created (#1061) * - getting news from cache - green notification on news modal success (#1063) * fix scrolling to the main text (#1075) * remove react helmet + add banner (#1072) * Fixed progress bar visibility and popups (#1070) * Fixed progress bar visibility and popups * add animation transition to make it smoother --------- Co-authored-by: Oleh-Kril * Fix issue 847 Fix Url Ref (#1068) * Fix PrivatePolicy streetcode reference * Change ref to https://streetcode.com.ua * Add some fix * Fixed the amount buttons and input in donates modal (#1060) * Fix news image on safari (#1058) * refactor newsImage styles * add max-height * Fix for fans category editing (#1037) * Fixed unavalaible categories on new streetcode * Fixed category editing of for fans categories * Made a mobile ornament with varying lengths for screens with a width … (#1030) * Made a mobile ornament with varying lengths for screens with a width of 480 pixels or less * adjust margins to correspond design --------- Co-authored-by: Oleh-Kril * Fixed Issue 870, 871 (#1025) * Add red * to Timeline date field and vanish an error * Fix logic when error message shoud vanish * fix data check in timelineAdminModal * set fixed position for arrows in connection(streetcode) (#1029) * set fixed position for arrows in connection(streetcode) * adjust position of arrows --------- Co-authored-by: Oleh-Kril * fix our partners title (#1022) now it takes only 1 row instead of 2 * Refactor teams modal & list (#1069) * Refactor teams modal & list * remove commented code * Jest config (#1028) * Configured Jest * Configured Jest * Adding/modifying code spliting for dev and prod setups (#1041) * modify_bundle_split_for_dev_setup * adding_bundle_split_to_prod_condig * adding_entry_to_gitignore_file * adding_empty_line * adjust admin page styles (#1066) * Refactor partner modal (#1073) * refactor code part 1 - reduce code amount * refactor image uploading logic to make it correct * Minor changes and improvements (#1042) * adding_check-node-version_lib_and engine_configs * update_package-lock_and_yarn-lock_files * edit_readme_file --------- Co-authored-by: Oleh-Kril * Issue 604 (Change padding in main text field) (#1077) * Change padding in the text field * adjust on phone --------- Co-authored-by: Oleh-Kril * fix related events modal (#1080) * deleted scroll up on mobile and tablet * update components * add loading all tags * update streetcode components * update tags modal * update tags slider * delete streetcodeid * update related figure * - refactor code (no business logic changes) (#1065) * run linter (#1081) * revert_resolve_path_for_dev_build * revert_resolve_path_for_prod_build --------- Co-authored-by: ValDekh Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Bohdan Bozhyk <53005363+Adeodonne@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> Co-authored-by: mykola-krai <133663112+mykola-krai@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: Roman Serhiychuk <60231618+Rominos7@users.noreply.github.com> Co-authored-by: Rominos7 * Update master (#1101) * Change amount of pictures for different size of screen (#1096) * Change amount of pictures for different size of sreenview * - change breakpoint to standard 768 --------- Co-authored-by: Oleh-Kril * Gmail is opened in new tab (#1087) * - refactor to open in a new tab (#1093) * fix modals closing (#1085) * fix modals closing * separate arrow function from props --------- Co-authored-by: Oleh-Kril * New editor v2 (#1086) * Initial react-quill config (news/main streetcode text). Needs cleaning & refactoring * Added quill everywhere, needs refactoring * cleaned code * Fixed text updating in ForFans admin block * Added utility to convert content to quill delta * Added validation when empty text fields in modals * Fixed bug with max length quill * Added the impossibility of saving a record with improper length * Cleaned code * Refactoring of editor * Removed package-lock.json changes from PR * Dynamics meta tags (#1095) * modify index.html * add server and configure metadata for news * add dynamic metatags for streetcodes * moved news file to another folder * run linter * add update for news (not completed) * adjust put and delete * handle delete and update of streetcode and news * add part of tests * -add api error filter * - cover with tests & refactor * - refactor code to separate logic and reduce code complexity * - test get and update * - write tests for delete - refactor to use constants - add all urls-to-omit * fix comments * fix comments: - refactor to use destructuring assigment - remove comments - move some lines to constants * remove stageback url --------- Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> --------- Co-authored-by: ValDekh Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Bohdan Bozhyk <53005363+Adeodonne@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> Co-authored-by: mykola-krai <133663112+mykola-krai@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: Roman Serhiychuk <60231618+Rominos7@users.noreply.github.com> Co-authored-by: Rominos7 * - temporary remove AgentFrontend (#1103) --------- Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> Co-authored-by: ValDekh Co-authored-by: Bohdan Bozhyk <53005363+Adeodonne@users.noreply.github.com> Co-authored-by: mykola-krai <133663112+mykola-krai@users.noreply.github.com> Co-authored-by: Roman Serhiychuk <60231618+Rominos7@users.noreply.github.com> Co-authored-by: Rominos7 * try to fix donate button --------- Co-authored-by: Oleh-Kril <91199925+Oleh-Kril@users.noreply.github.com> Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> Co-authored-by: ValDekh Co-authored-by: Bohdan Bozhyk <53005363+Adeodonne@users.noreply.github.com> Co-authored-by: mykola-krai <133663112+mykola-krai@users.noreply.github.com> Co-authored-by: Roman Serhiychuk <60231618+Rominos7@users.noreply.github.com> Co-authored-by: Rominos7 * hotfix editor main/additional texts (#1113) * hotfix editor main/additional texts * Cleaned code * Update develop (#1102) * Develop (#1084) * Hide a slide outline * fix news modal from closing when image is not created (#1061) * - getting news from cache - green notification on news modal success (#1063) * fix scrolling to the main text (#1075) * remove react helmet + add banner (#1072) * Fixed progress bar visibility and popups (#1070) * Fixed progress bar visibility and popups * add animation transition to make it smoother --------- Co-authored-by: Oleh-Kril * Fix issue 847 Fix Url Ref (#1068) * Fix PrivatePolicy streetcode reference * Change ref to https://streetcode.com.ua * Add some fix * Fixed the amount buttons and input in donates modal (#1060) * Fix news image on safari (#1058) * refactor newsImage styles * add max-height * Fix for fans category editing (#1037) * Fixed unavalaible categories on new streetcode * Fixed category editing of for fans categories * Made a mobile ornament with varying lengths for screens with a width … (#1030) * Made a mobile ornament with varying lengths for screens with a width of 480 pixels or less * adjust margins to correspond design --------- Co-authored-by: Oleh-Kril * Fixed Issue 870, 871 (#1025) * Add red * to Timeline date field and vanish an error * Fix logic when error message shoud vanish * fix data check in timelineAdminModal * set fixed position for arrows in connection(streetcode) (#1029) * set fixed position for arrows in connection(streetcode) * adjust position of arrows --------- Co-authored-by: Oleh-Kril * fix our partners title (#1022) now it takes only 1 row instead of 2 * Refactor teams modal & list (#1069) * Refactor teams modal & list * remove commented code * Jest config (#1028) * Configured Jest * Configured Jest * Adding/modifying code spliting for dev and prod setups (#1041) * modify_bundle_split_for_dev_setup * adding_bundle_split_to_prod_condig * adding_entry_to_gitignore_file * adding_empty_line * adjust admin page styles (#1066) * Refactor partner modal (#1073) * refactor code part 1 - reduce code amount * refactor image uploading logic to make it correct * Minor changes and improvements (#1042) * adding_check-node-version_lib_and engine_configs * update_package-lock_and_yarn-lock_files * edit_readme_file --------- Co-authored-by: Oleh-Kril * Issue 604 (Change padding in main text field) (#1077) * Change padding in the text field * adjust on phone --------- Co-authored-by: Oleh-Kril * fix related events modal (#1080) * deleted scroll up on mobile and tablet * update components * add loading all tags * update streetcode components * update tags modal * update tags slider * delete streetcodeid * update related figure * - refactor code (no business logic changes) (#1065) * run linter (#1081) * revert_resolve_path_for_dev_build * revert_resolve_path_for_prod_build --------- Co-authored-by: ValDekh Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Bohdan Bozhyk <53005363+Adeodonne@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> Co-authored-by: mykola-krai <133663112+mykola-krai@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: Roman Serhiychuk <60231618+Rominos7@users.noreply.github.com> Co-authored-by: Rominos7 * Update master (#1101) * Change amount of pictures for different size of screen (#1096) * Change amount of pictures for different size of sreenview * - change breakpoint to standard 768 --------- Co-authored-by: Oleh-Kril * Gmail is opened in new tab (#1087) * - refactor to open in a new tab (#1093) * fix modals closing (#1085) * fix modals closing * separate arrow function from props --------- Co-authored-by: Oleh-Kril * New editor v2 (#1086) * Initial react-quill config (news/main streetcode text). Needs cleaning & refactoring * Added quill everywhere, needs refactoring * cleaned code * Fixed text updating in ForFans admin block * Added utility to convert content to quill delta * Added validation when empty text fields in modals * Fixed bug with max length quill * Added the impossibility of saving a record with improper length * Cleaned code * Refactoring of editor * Removed package-lock.json changes from PR * Dynamics meta tags (#1095) * modify index.html * add server and configure metadata for news * add dynamic metatags for streetcodes * moved news file to another folder * run linter * add update for news (not completed) * adjust put and delete * handle delete and update of streetcode and news * add part of tests * -add api error filter * - cover with tests & refactor * - refactor code to separate logic and reduce code complexity * - test get and update * - write tests for delete - refactor to use constants - add all urls-to-omit * fix comments * fix comments: - refactor to use destructuring assigment - remove comments - move some lines to constants * remove stageback url --------- Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> --------- Co-authored-by: ValDekh Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Bohdan Bozhyk <53005363+Adeodonne@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> Co-authored-by: mykola-krai <133663112+mykola-krai@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: Roman Serhiychuk <60231618+Rominos7@users.noreply.github.com> Co-authored-by: Rominos7 * Dynamics meta tags (#1095) * modify index.html * add server and configure metadata for news * add dynamic metatags for streetcodes * moved news file to another folder * run linter * add update for news (not completed) * adjust put and delete * handle delete and update of streetcode and news * add part of tests * -add api error filter * - cover with tests & refactor * - refactor code to separate logic and reduce code complexity * - test get and update * - write tests for delete - refactor to use constants - add all urls-to-omit * fix comments * fix comments: - refactor to use destructuring assigment - remove comments - move some lines to constants * remove stageback url * Update develop (#1102) * Develop (#1084) * Hide a slide outline * fix news modal from closing when image is not created (#1061) * - getting news from cache - green notification on news modal success (#1063) * fix scrolling to the main text (#1075) * remove react helmet + add banner (#1072) * Fixed progress bar visibility and popups (#1070) * Fixed progress bar visibility and popups * add animation transition to make it smoother --------- Co-authored-by: Oleh-Kril * Fix issue 847 Fix Url Ref (#1068) * Fix PrivatePolicy streetcode reference * Change ref to https://streetcode.com.ua * Add some fix * Fixed the amount buttons and input in donates modal (#1060) * Fix news image on safari (#1058) * refactor newsImage styles * add max-height * Fix for fans category editing (#1037) * Fixed unavalaible categories on new streetcode * Fixed category editing of for fans categories * Made a mobile ornament with varying lengths for screens with a width … (#1030) * Made a mobile ornament with varying lengths for screens with a width of 480 pixels or less * adjust margins to correspond design --------- Co-authored-by: Oleh-Kril * Fixed Issue 870, 871 (#1025) * Add red * to Timeline date field and vanish an error * Fix logic when error message shoud vanish * fix data check in timelineAdminModal * set fixed position for arrows in connection(streetcode) (#1029) * set fixed position for arrows in connection(streetcode) * adjust position of arrows --------- Co-authored-by: Oleh-Kril * fix our partners title (#1022) now it takes only 1 row instead of 2 * Refactor teams modal & list (#1069) * Refactor teams modal & list * remove commented code * Jest config (#1028) * Configured Jest * Configured Jest * Adding/modifying code spliting for dev and prod setups (#1041) * modify_bundle_split_for_dev_setup * adding_bundle_split_to_prod_condig * adding_entry_to_gitignore_file * adding_empty_line * adjust admin page styles (#1066) * Refactor partner modal (#1073) * refactor code part 1 - reduce code amount * refactor image uploading logic to make it correct * Minor changes and improvements (#1042) * adding_check-node-version_lib_and engine_configs * update_package-lock_and_yarn-lock_files * edit_readme_file --------- Co-authored-by: Oleh-Kril * Issue 604 (Change padding in main text field) (#1077) * Change padding in the text field * adjust on phone --------- Co-authored-by: Oleh-Kril * fix related events modal (#1080) * deleted scroll up on mobile and tablet * update components * add loading all tags * update streetcode components * update tags modal * update tags slider * delete streetcodeid * update related figure * - refactor code (no business logic changes) (#1065) * run linter (#1081) * revert_resolve_path_for_dev_build * revert_resolve_path_for_prod_build --------- Co-authored-by: ValDekh Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Bohdan Bozhyk <53005363+Adeodonne@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> Co-authored-by: mykola-krai <133663112+mykola-krai@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: Roman Serhiychuk <60231618+Rominos7@users.noreply.github.com> Co-authored-by: Rominos7 * Update master (#1101) * Change amount of pictures for different size of screen (#1096) * Change amount of pictures for different size of sreenview * - change breakpoint to standard 768 --------- Co-authored-by: Oleh-Kril * Gmail is opened in new tab (#1087) * - refactor to open in a new tab (#1093) * fix modals closing (#1085) * fix modals closing * separate arrow function from props --------- Co-authored-by: Oleh-Kril * New editor v2 (#1086) * Initial react-quill config (news/main streetcode text). Needs cleaning & refactoring * Added quill everywhere, needs refactoring * cleaned code * Fixed text updating in ForFans admin block * Added utility to convert content to quill delta * Added validation when empty text fields in modals * Fixed bug with max length quill * Added the impossibility of saving a record with improper length * Cleaned code * Refactoring of editor * Removed package-lock.json changes from PR * Dynamics meta tags (#1095) * modify index.html * add server and configure metadata for news * add dynamic metatags for streetcodes * moved news file to another folder * run linter * add update for news (not completed) * adjust put and delete * handle delete and update of streetcode and news * add part of tests * -add api error filter * - cover with tests & refactor * - refactor code to separate logic and reduce code complexity * - test get and update * - write tests for delete - refactor to use constants - add all urls-to-omit * fix comments * fix comments: - refactor to use destructuring assigment - remove comments - move some lines to constants * remove stageback url --------- Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> --------- Co-authored-by: ValDekh Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Bohdan Bozhyk <53005363+Adeodonne@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> Co-authored-by: mykola-krai <133663112+mykola-krai@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: Roman Serhiychuk <60231618+Rominos7@users.noreply.github.com> Co-authored-by: Rominos7 * hotfix editor main/additional texts (#1113) * hotfix editor main/additional texts * Cleaned code * Create unit tests for Partner link component (#1109) * install_new_modules_in-dev_dependencies * edit_jest_config_file * refactor_DeleteStreetcodeModal.component,tsx * adding_mock_for_root-store * adding_mock_for_modal * adding_unit_test_for_DeleteStreetcodeModal * fix_comment * fix_comment * restore_mobx * change_type * rename_constans_file * refactor_mock * refactor_modal_mock * adding_test_cases_with_getByRole * refactor_component_after_merge_with_develop * fix_UT * fix_lint * improve_UT * install_jest-transformer-svg * adding_new_jest_configs_fro_svg_icon_testing * refactor_ParterLink_component * work_with_UT * fix_naming * install_missing_dependencies * fix_comments * fix_coverage_collection * fix_typo * remove_package * delete server folder (#1115) * delete server folder * revert extra changes * fix layout on streetcode edit/create (#1108) * refactor StreetcodeSliderItem on main page and NewsSliderItem on main page to use Link component (#1110) * remove "Оживити картинку" button (#1111) * Links open in new tabs (#1118) * Links open in new tabs * Cleaned code * Ordered/unordered lists are displayed now (#1119) * change mobile screen size (#1130) * Two-line title for interesting facts (#1116) * Two-line title for interesting facts * fix layout on streetcode edit/create (#1108) * refactor StreetcodeSliderItem on main page and NewsSliderItem on main page to use Link component (#1110) * remove "Оживити картинку" button (#1111) * Links open in new tabs (#1118) * Links open in new tabs * Cleaned code * Ordered/unordered lists are displayed now (#1119) * remove unused fields and imports (no logic modified) * Two-line title for interesting facts * remove unused fields and imports (no logic modified) --------- Co-authored-by: Oleh-Kril <91199925+Oleh-Kril@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: Oleh-Kril * fix redirects in streetcodeCard on mobile and newsCard (#1128) * Http link for social network field for team member modal (#1129) * refactor to open (as well in new tab in safari and Apple devices) (#1127) --------- Co-authored-by: Valerii Dekhtiyk <61435019+ValDekh@users.noreply.github.com> Co-authored-by: Kateryna Yatsiuk <113370393+KateYatsiuk@users.noreply.github.com> Co-authored-by: BohdanBybliv <125794488+BohdanBybliv@users.noreply.github.com> Co-authored-by: ValDekh Co-authored-by: Bohdan Bozhyk <53005363+Adeodonne@users.noreply.github.com> Co-authored-by: mykola-krai <133663112+mykola-krai@users.noreply.github.com> Co-authored-by: Roman Serhiychuk <60231618+Rominos7@users.noreply.github.com> Co-authored-by: Rominos7 Co-authored-by: Vitalii <98163405+MementoMorj@users.noreply.github.com> --- .../modals/Sources/SourcesModal.styles.scss | 8 ++---- .../images/partners/{https.svg => http.svg} | 0 src/assets/sass/mixins/_utils.mixins.scss | 5 ++++ .../TeamMemberLinks.component.tsx | 4 +-- .../Vacancies/Vacancy/Vacancy.syles.scss | 28 +++++++++---------- .../VacancyModal/VacancyModal.component.tsx | 5 ++-- .../VacancyModal/VacancyModal.styles.scss | 8 ++++++ .../ContactBlock/ContactBlock.component.tsx | 2 +- .../AdditionalPages/NewsPage/News.styles.scss | 15 ++++------ .../SectionFifth.component.tsx | 4 ++- .../components/DonationBlock.component.tsx | 14 ++++++---- .../AdminPage/TeamPage/TeamLink.component.tsx | 4 +-- .../TeamModal/constants/socialOptions.ts | 2 +- .../AdminPage/TeamPage/TeamPage.component.tsx | 4 +-- .../NewsSlider/NewsSlider.component.tsx | 20 ++----------- .../NewsSliderItem.component.tsx | 17 +++++------ .../StreetcodeSliderItem.component.tsx | 10 +++++-- .../TeamItemSlider.component.tsx | 4 +-- .../InterestingFactItem.component.tsx | 7 +---- .../InterestingFactItem.styles.scss | 6 ++-- .../InterestingFacts.component.tsx | 3 +- .../StreetcodeCard/StreetcodeCard.styles.scss | 2 +- .../TextBlock/ReadMore/ReadMore.styles.scss | 8 ++++++ src/models/team/team.model.ts | 2 +- 24 files changed, 92 insertions(+), 90 deletions(-) rename src/assets/images/partners/{https.svg => http.svg} (100%) diff --git a/src/app/common/components/modals/Sources/SourcesModal.styles.scss b/src/app/common/components/modals/Sources/SourcesModal.styles.scss index 2bdca321d..b98f0ffa1 100644 --- a/src/app/common/components/modals/Sources/SourcesModal.styles.scss +++ b/src/app/common/components/modals/Sources/SourcesModal.styles.scss @@ -67,13 +67,11 @@ $CancelBtn: "/src/assets/images/utils/Cancel_btn.svg"; font-size: 15px; ul { - list-style-type: disc; - padding-inline-start: revert; + @include mut.list-styles($type: disc); } - + ol { - list-style-type: decimal; - padding-inline-start: revert; + @include mut.list-styles($type: decimal); } >h1 { diff --git a/src/assets/images/partners/https.svg b/src/assets/images/partners/http.svg similarity index 100% rename from src/assets/images/partners/https.svg rename to src/assets/images/partners/http.svg diff --git a/src/assets/sass/mixins/_utils.mixins.scss b/src/assets/sass/mixins/_utils.mixins.scss index 1afb5ed15..e5a9e8888 100644 --- a/src/assets/sass/mixins/_utils.mixins.scss +++ b/src/assets/sass/mixins/_utils.mixins.scss @@ -276,3 +276,8 @@ z-index: $z-index; } } + +@mixin list-styles($type) { + list-style-type: $type; + padding-inline-start: revert; +} diff --git a/src/features/AboutUsPage/TeamMemberCard/TeamMemberLinks/TeamMemberLinks.component.tsx b/src/features/AboutUsPage/TeamMemberCard/TeamMemberLinks/TeamMemberLinks.component.tsx index 79a005c8e..fe9d876eb 100644 --- a/src/features/AboutUsPage/TeamMemberCard/TeamMemberLinks/TeamMemberLinks.component.tsx +++ b/src/features/AboutUsPage/TeamMemberCard/TeamMemberLinks/TeamMemberLinks.component.tsx @@ -1,6 +1,6 @@ import behance from '@assets/images/partners/behance.svg'; import facebook from '@assets/images/partners/facebook.svg'; -import https from '@assets/images/partners/https.svg'; +import http from '@assets/images/partners/http.svg'; import instagram from '@assets/images/partners/instagram.svg'; import linkedin from '@assets/images/partners/linkedin.svg'; import tiktok from '@assets/images/partners/tiktok.svg'; @@ -9,7 +9,7 @@ import youtube from '@assets/images/partners/youtube.svg'; import { TeamMemberLinkCreateUpdate } from '@/models/team/team.model'; -const LogoType = [twitter, instagram, facebook, youtube, linkedin, tiktok, behance, https]; +const LogoType = [twitter, instagram, facebook, youtube, linkedin, tiktok, behance, http]; type Props = { link: TeamMemberLinkCreateUpdate }; diff --git a/src/features/AboutUsPage/Vacancies/Vacancy/Vacancy.syles.scss b/src/features/AboutUsPage/Vacancies/Vacancy/Vacancy.syles.scss index bc02bee22..9a2150ffc 100644 --- a/src/features/AboutUsPage/Vacancies/Vacancy/Vacancy.syles.scss +++ b/src/features/AboutUsPage/Vacancies/Vacancy/Vacancy.syles.scss @@ -11,18 +11,17 @@ padding: f.pxToRem(50px) f.pxToRem(74px); box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25); - @include textCard.cardText( - $title-max-lines: 1, - $text-max-lines: 3); + @include textCard.cardText($title-max-lines: 1, + $text-max-lines: 3); - .cardTextContainer{ + .cardTextContainer { padding: 0; - &TopPart{ + &TopPart { gap: f.pxToRem(10px); } - &Title{ + &Title { font-size: f.pxToRem(32px) !important; @media screen and (max-width: s.$tablet) { @@ -30,29 +29,28 @@ } } - &SubTitle{ + &SubTitle { color: c.$lighter-gray-color; } - &Text{ + &Text { font-family: ft.$roboto-font !important; - font-weight: 300 !important; + font-weight: 300 !important; @media screen and (max-width: s.$phone) { @include mut.truncated($line-num: 9); } } - &Button{ + &Button { font-weight: 500; text-decoration: none; } p { - @include mut.with-font( - $font-family: ft.$closer-text-font, - $font-weight: 500, - $font-size: 20px); + @include mut.with-font($font-family: ft.$closer-text-font, + $font-weight: 500, + $font-size: 20px); @media screen and (max-width: s.$tablet) { $font-size: f.pxToRem(20px) !important; @@ -63,4 +61,4 @@ @media screen and (max-width: s.$tablet) { padding: f.pxToRem(40px); } -} +} \ No newline at end of file diff --git a/src/features/AboutUsPage/Vacancies/Vacancy/VacancyModal/VacancyModal.component.tsx b/src/features/AboutUsPage/Vacancies/Vacancy/VacancyModal/VacancyModal.component.tsx index 213635ac1..e6981992e 100644 --- a/src/features/AboutUsPage/Vacancies/Vacancy/VacancyModal/VacancyModal.component.tsx +++ b/src/features/AboutUsPage/Vacancies/Vacancy/VacancyModal/VacancyModal.component.tsx @@ -59,9 +59,8 @@ const VacancyModal = ({ isOpen, setOpen, job }: Props) => {