Redesign: two columns layout#10819
Merged
ferblape merged 1 commit intofeature/redesignfrom May 8, 2023
Merged
Conversation
ferblape
approved these changes
May 4, 2023
40a542c to
0cc581b
Compare
Contributor
|
Merging, as it has very low impact on the app but avoids conflicts in our side |
entantoencuanto
pushed a commit
that referenced
this pull request
May 11, 2023
entantoencuanto
added a commit
that referenced
this pull request
May 16, 2023
ferblape
pushed a commit
that referenced
this pull request
May 19, 2023
* Add redesign enable ENV variable to control the pipeline * Change accept_confirm helper method to disable redesign expected selectors on admin interactions * Update accept_confirm calls with admin * Add edit link to redesigned wrapper when a component exists * Fix selector in test * Add redesign pending widget layout * Remove deprecated test * Add skip for redesign pending homepage content block * Fix expected text * Add skip for redesign pending homepage content block * Fix expected menu nav items * Fix selector in shared test * Adapt interaction with main navigation dropdown * Recover confirm data in step navigation cell * Adapt triggerWarnings method used when iframes are present to redesign * Fix selector in test * Redesign: processes groups content blocks (#10491) * Pass the options to the metadata cell from card_l and card_g and disable links if the whole card has a link * Pass in highlighted items for component a show_space option * Pass the show_space option from some highlighted resources content blocks settings * Move active content blocks query to controller * Use generic html cell for corresponding content block on processes groups * Set component_manifest_name on register of hihglighted resources blocks for processes groups * Fix selectors in tests of processes groups page * Add sleep * Change content statistics content block in processes groups to use the redesigned version * Update tests * Remove unnecesary blank spaces * Fix test to check private space message depending on content blocks configuration * Remove deprecated examples on steps index page of a participatory process * Move private space announcement out of content blocks * Rename registry name of hero content block in processes * Fix selector in test * Rename registry name of hero content block in processes * Fix ambiguous tests * Fix manifest name in test * Unify tests * Update manifest name * reuse the block-reference styles for the private space * Remove links to last activities inside a participatory process from content blocks * Replace processes content block in process groups homepage with redesigned one * Remove deprecated content block * Remove unused translations * Remove deprecated tests * Add missing cell * Change metadata content block to inherit from redesigned block * Replace title content block with main data * Remove title content block and move translations * Adapt tests * Adapt title cell test * Update icons of metadata content block * Remove comment * Move some process group metadata elements to title block * Update tests * Add missing view * set styles for process-group metadata * split attributes in two blocks * Add comment to keep file * Amend wrong merge conflict resolution * Use cell of related processes for count in ProcessGroupMetadataCell * Ensure that no content blocks related to inactive modules are registered * Change sanitize method for short description on process main data cell * Change filter of processes content block in groups to allow active or all * Update processes content block registry to use filter settings * Add tests to check processes block in porcesses group landing page filter settings * Add order setting to content block registry * Translate and sanitize attributes in photo cell * Remove unused translation * Avoid exceptions in processes hero content block when there is no active step --------- Co-authored-by: Hugoren Martinako <aumpfbahn@gmail.com> * simplify 2col layout (#10819) * Redesign: pending login (#10699) * replace old form (blind, wip) * user invitation page * avoid the last-child form__wrapper-block padding-bottom rule * fix typo * unused key * fix erblint * Adapt within_use_menu tests helper method to redesign * Fix selector * Change temporarily way to reach a path * Add REDESIGN_PENDING skips to verifications tests inside a component not redesigned yet * Adapt data_consent tests helper method to redesign * Fix interaction with add to calendar * Adapt top bar search test in meetings * Prepare within_language_menu tests helper method to redesign * Adapt test * Use accept_confirm on submit * Skip tests pending of merge * Skip test pending of issue resolution * Change within_language_menu to accept an admin variation * Add redesign layout to dummy resources controller * Include required assets in comments invocation from dummy resources show view * Adapt comments reports shared examples to redesign * Adapt comments tests to redesign * Avoid some updates on input character counter js * Include translation bar in redesigned participatory spaces layouts * Adapt tests to redesign * Fix test * Add REDESIGN_PENDING skips to maybe deprecated examples * Skip step in meeting creation test pending of redesign of scope selector in front * Adapt tests to redesign * Adapt examples to deletion of 'official' metadata item in meetings cards * Prepare dynamically_attach_file tests helper method to redesigned interface in front * Use dynamically_attach_file with front interface in verification tests * Adapt test to front interface attaching files when files are invalid * Fix wrong condition * Adapt tests * Use the right redesigned partial for timeout modal in live event * Remove commented code * Unskip examples after follow button redesign --------- Co-authored-by: Eduardo Martinez Echevarria <eduardomech@gmail.com> Co-authored-by: Hugoren Martinako <aumpfbahn@gmail.com>
entantoencuanto
added a commit
that referenced
this pull request
May 22, 2023
…rafts * feature/redesign: Add redesign enable ENV variable to control the pipeline (#10610) Redesign: progress bar (#10638) Redesign: meeting cards (#10722) Redesign: pending login (#10699) simplify 2col layout (#10819) Redesign: processes groups content blocks (#10491) Redesign: assemblies content blocks (#10573)
entantoencuanto
pushed a commit
that referenced
this pull request
May 26, 2023
entantoencuanto
added a commit
that referenced
this pull request
May 26, 2023
* Add redesign enable ENV variable to control the pipeline * Change accept_confirm helper method to disable redesign expected selectors on admin interactions * Update accept_confirm calls with admin * Add edit link to redesigned wrapper when a component exists * Fix selector in test * Add redesign pending widget layout * Remove deprecated test * Add skip for redesign pending homepage content block * Fix expected text * Add skip for redesign pending homepage content block * Fix expected menu nav items * Fix selector in shared test * Adapt interaction with main navigation dropdown * Recover confirm data in step navigation cell * Adapt triggerWarnings method used when iframes are present to redesign * Fix selector in test * Redesign: processes groups content blocks (#10491) * Pass the options to the metadata cell from card_l and card_g and disable links if the whole card has a link * Pass in highlighted items for component a show_space option * Pass the show_space option from some highlighted resources content blocks settings * Move active content blocks query to controller * Use generic html cell for corresponding content block on processes groups * Set component_manifest_name on register of hihglighted resources blocks for processes groups * Fix selectors in tests of processes groups page * Add sleep * Change content statistics content block in processes groups to use the redesigned version * Update tests * Remove unnecesary blank spaces * Fix test to check private space message depending on content blocks configuration * Remove deprecated examples on steps index page of a participatory process * Move private space announcement out of content blocks * Rename registry name of hero content block in processes * Fix selector in test * Rename registry name of hero content block in processes * Fix ambiguous tests * Fix manifest name in test * Unify tests * Update manifest name * reuse the block-reference styles for the private space * Remove links to last activities inside a participatory process from content blocks * Replace processes content block in process groups homepage with redesigned one * Remove deprecated content block * Remove unused translations * Remove deprecated tests * Add missing cell * Change metadata content block to inherit from redesigned block * Replace title content block with main data * Remove title content block and move translations * Adapt tests * Adapt title cell test * Update icons of metadata content block * Remove comment * Move some process group metadata elements to title block * Update tests * Add missing view * set styles for process-group metadata * split attributes in two blocks * Add comment to keep file * Amend wrong merge conflict resolution * Use cell of related processes for count in ProcessGroupMetadataCell * Ensure that no content blocks related to inactive modules are registered * Change sanitize method for short description on process main data cell * Change filter of processes content block in groups to allow active or all * Update processes content block registry to use filter settings * Add tests to check processes block in porcesses group landing page filter settings * Add order setting to content block registry * Translate and sanitize attributes in photo cell * Remove unused translation * Avoid exceptions in processes hero content block when there is no active step --------- Co-authored-by: Hugoren Martinako <aumpfbahn@gmail.com> * simplify 2col layout (#10819) * Redesign: pending login (#10699) * replace old form (blind, wip) * user invitation page * avoid the last-child form__wrapper-block padding-bottom rule * fix typo * unused key * fix erblint * Adapt within_use_menu tests helper method to redesign * Fix selector * Change temporarily way to reach a path * Add REDESIGN_PENDING skips to verifications tests inside a component not redesigned yet * Adapt data_consent tests helper method to redesign * Fix interaction with add to calendar * Adapt top bar search test in meetings * Prepare within_language_menu tests helper method to redesign * Adapt test * Use accept_confirm on submit * Skip tests pending of merge * Skip test pending of issue resolution * Change within_language_menu to accept an admin variation * Add redesign layout to dummy resources controller * Include required assets in comments invocation from dummy resources show view * Adapt comments reports shared examples to redesign * Adapt comments tests to redesign * Avoid some updates on input character counter js * Include translation bar in redesigned participatory spaces layouts * Adapt tests to redesign * Fix test * Add REDESIGN_PENDING skips to maybe deprecated examples * Skip step in meeting creation test pending of redesign of scope selector in front * Adapt tests to redesign * Adapt examples to deletion of 'official' metadata item in meetings cards * Prepare dynamically_attach_file tests helper method to redesigned interface in front * Use dynamically_attach_file with front interface in verification tests * Adapt test to front interface attaching files when files are invalid * Fix wrong condition * Adapt tests * Use the right redesigned partial for timeout modal in live event * Remove commented code * Unskip examples after follow button redesign --------- Co-authored-by: Eduardo Martinez Echevarria <eduardomech@gmail.com> Co-authored-by: Hugoren Martinako <aumpfbahn@gmail.com>
entantoencuanto
added a commit
that referenced
this pull request
May 26, 2023
…rafts * feature/redesign: Feature/redesign components breadcrumb (#10441) Redesign: debates (#10653) Redesign: Remove reference to commentable in activity cell (#10816) Redesign: spinner (#10848) Redesign: omnipresent banner (#10847) Add redesign enable ENV variable to control the pipeline (#10610) Redesign: progress bar (#10638) Redesign: meeting cards (#10722) Redesign: pending login (#10699) simplify 2col layout (#10819) Redesign: processes groups content blocks (#10491) Redesign: assemblies content blocks (#10573)
entantoencuanto
added a commit
that referenced
this pull request
May 26, 2023
* feature/redesign: (21 commits) Feature/redesign components breadcrumb (#10441) Redesign: debates (#10653) Redesign: Remove reference to commentable in activity cell (#10816) Redesign: spinner (#10848) Redesign: omnipresent banner (#10847) Add redesign enable ENV variable to control the pipeline (#10610) Redesign: progress bar (#10638) Redesign: meeting cards (#10722) Redesign: pending login (#10699) simplify 2col layout (#10819) Redesign: processes groups content blocks (#10491) Redesign: assemblies content blocks (#10573) Redesign: process & process group cards (#10716) Redesign: conference cards (#10502) Redesign: pending blogs (#10686) Redesign: blog cards (#10685) Redesign: filters (#10390) replace uses of specific margin-bottom for layout margins (#10675) Redesign: menu mobile (#10351) Fix comments scss to avoid compilation errors (#10657) ...
ferblape
pushed a commit
that referenced
this pull request
Jun 7, 2023
* aside from collaborative draft index * list of collaborative drafts * define card L & metadata * main from collaborative draft show * aside from collaborative draft show * fix links between versions * redesign forms * fix erblint * fix i18n * expand button * normalize i18n * fix css glitches collaborative drafts * Remove index from collaborative drafts versions * include version links in the aside as well * avoid warning rspec * create assets for proposals (partial cherrypicked f1e2324) * move "create proposal" to the last position * collaborative drafts states * fix tests cell * fix state text for show * fix tests * fix tests * Update decidim-proposals/config/locales/en.yml Co-authored-by: Carolina Romero <carolromero@users.noreply.github.com> * Redesign: assemblies content blocks (#10573) * Declare participatory spaces content blocks scope name in manifest and extract to a controller concern * Add admin management of content blocks in assemblies * Register html content block in assemblies * Get content block scope name from space manifest in participatory processes * Make use of manifest to obtain scope_class and base model in spaces content blocks * Register content blocks of documents and images in assemblies using core cell * Use core content blocks for images and documents on processes and remove unnecesary ones * Use core content blocks for announcement on processes and assemblies and remove unnecesary ones * Use core content blocks for last activities on processes and assemblies and remove unnecesary ones * Define stats content block for assemblies and register it * Register highlighted results, meetings, posts and proposals content blocks for assemblies * Move participatory processes hero content block to generic block in core * Register hero block for assemblies * Remove hero block from assembly layout header * Change assembly_nav_items helper method to accept participatory space argument * Define and register main data content block cell for assemblies * Define and register metadata content block for assemblies * Define children assemblies cell * Reorder content blocks * Change div class wrapping assemblies list on cell * Allow configuring title on assemblies cell and set it on content blocks using it * Change query of related processes cell depending on participatory space class * Hide related assemblies and processes cell if there are no elements to show * Change default max results on featured processes and assemblies content blocks * Fix condition * Recover partial used by old layout This partial is expected to be removed after fully enabling redesign * Remove static content blocks from assembly show and remove deprecated partials * Move assembly breadcrumb in show * Remove unused translation * Remove deprecated assembly card-g show The generation of the view is done by the parent class * Fix selector in test * Update selectors in test * Add trait to include content blocks in assemblies factories and use them to fix examples * Fix shared examples for assemblies adding content blocks * Hide stats content blocks if processes or assemblies disable show statistics * Update assembly show tests This test adds the content blocks required to test the contents and updates the selectors changed with the redesign * Unify tests * remove data attribute from process_header partial pending of redesign * Allow participatory space hero cell to define and include a cta link * Define specific hero_cell for processes to include CTA item * Update tests to check CTA in hero content block * Update assembly members spec * Skip filters tests temporarily on assemblies index pending of filters branch merge * Update tests after changing default max results values * Allow the insertion of hooks in card metadata cell * Add upcoming_meeting_for_card hook in assembly card-g metadata * Change upcoming_meeting_for_card hook output depending of redesign enablement * Adapt test * Fix content_block_scope_name in process group landing page admin controller * Ensure that no content blocks related to inactive modules are registered * Change sanitize method for short description on assembly main data cell Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro> * Add with_type to assemblies ransackable scopes * Integrate assemblies index filter * Adapt assemblies filters tests to redesign * Skip failing test extracted to an issue * Ignore unused assemblies filters keys translations * Update filter params in test --------- Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro> * Redesign: processes groups content blocks (#10491) * Pass the options to the metadata cell from card_l and card_g and disable links if the whole card has a link * Pass in highlighted items for component a show_space option * Pass the show_space option from some highlighted resources content blocks settings * Move active content blocks query to controller * Use generic html cell for corresponding content block on processes groups * Set component_manifest_name on register of hihglighted resources blocks for processes groups * Fix selectors in tests of processes groups page * Add sleep * Change content statistics content block in processes groups to use the redesigned version * Update tests * Remove unnecesary blank spaces * Fix test to check private space message depending on content blocks configuration * Remove deprecated examples on steps index page of a participatory process * Move private space announcement out of content blocks * Rename registry name of hero content block in processes * Fix selector in test * Rename registry name of hero content block in processes * Fix ambiguous tests * Fix manifest name in test * Unify tests * Update manifest name * reuse the block-reference styles for the private space * Remove links to last activities inside a participatory process from content blocks * Replace processes content block in process groups homepage with redesigned one * Remove deprecated content block * Remove unused translations * Remove deprecated tests * Add missing cell * Change metadata content block to inherit from redesigned block * Replace title content block with main data * Remove title content block and move translations * Adapt tests * Adapt title cell test * Update icons of metadata content block * Remove comment * Move some process group metadata elements to title block * Update tests * Add missing view * set styles for process-group metadata * split attributes in two blocks * Add comment to keep file * Amend wrong merge conflict resolution * Use cell of related processes for count in ProcessGroupMetadataCell * Ensure that no content blocks related to inactive modules are registered * Change sanitize method for short description on process main data cell * Change filter of processes content block in groups to allow active or all * Update processes content block registry to use filter settings * Add tests to check processes block in porcesses group landing page filter settings * Add order setting to content block registry * Translate and sanitize attributes in photo cell * Remove unused translation * Avoid exceptions in processes hero content block when there is no active step --------- Co-authored-by: Hugoren Martinako <aumpfbahn@gmail.com> * simplify 2col layout (#10819) * Redesign: pending login (#10699) * replace old form (blind, wip) * user invitation page * avoid the last-child form__wrapper-block padding-bottom rule * fix typo * unused key * fix erblint * Redesign: meeting cards (#10722) * renaming meeting cell due to conflict with cards * move some styles to the core to avoid loads additional chunks * wrap body with the dynamic class * update test markup * cell spec must call to the cell itself * update test markup * fix typo * update test markup * useless css binding * fix test * move minutes after agenda, from tabs * include dynamic css class for texts * meetings metadata items order * show comments and endorsers even they're zero * include resource options in the sidebar * fix test * Redesign: progress bar (#10638) * refactor progress bar * add some animation to the progress bar * remove deprecated option uses * remove i18n deprecated * set numbers to bold * fix tests * mark as deprecated for redesign * fix tests --------- Co-authored-by: Eduardo Martinez Echevarria <eduardomech@gmail.com> * Add redesign enable ENV variable to control the pipeline (#10610) * Add redesign enable ENV variable to control the pipeline * Change accept_confirm helper method to disable redesign expected selectors on admin interactions * Update accept_confirm calls with admin * Add edit link to redesigned wrapper when a component exists * Fix selector in test * Add redesign pending widget layout * Remove deprecated test * Add skip for redesign pending homepage content block * Fix expected text * Add skip for redesign pending homepage content block * Fix expected menu nav items * Fix selector in shared test * Adapt interaction with main navigation dropdown * Recover confirm data in step navigation cell * Adapt triggerWarnings method used when iframes are present to redesign * Fix selector in test * Redesign: processes groups content blocks (#10491) * Pass the options to the metadata cell from card_l and card_g and disable links if the whole card has a link * Pass in highlighted items for component a show_space option * Pass the show_space option from some highlighted resources content blocks settings * Move active content blocks query to controller * Use generic html cell for corresponding content block on processes groups * Set component_manifest_name on register of hihglighted resources blocks for processes groups * Fix selectors in tests of processes groups page * Add sleep * Change content statistics content block in processes groups to use the redesigned version * Update tests * Remove unnecesary blank spaces * Fix test to check private space message depending on content blocks configuration * Remove deprecated examples on steps index page of a participatory process * Move private space announcement out of content blocks * Rename registry name of hero content block in processes * Fix selector in test * Rename registry name of hero content block in processes * Fix ambiguous tests * Fix manifest name in test * Unify tests * Update manifest name * reuse the block-reference styles for the private space * Remove links to last activities inside a participatory process from content blocks * Replace processes content block in process groups homepage with redesigned one * Remove deprecated content block * Remove unused translations * Remove deprecated tests * Add missing cell * Change metadata content block to inherit from redesigned block * Replace title content block with main data * Remove title content block and move translations * Adapt tests * Adapt title cell test * Update icons of metadata content block * Remove comment * Move some process group metadata elements to title block * Update tests * Add missing view * set styles for process-group metadata * split attributes in two blocks * Add comment to keep file * Amend wrong merge conflict resolution * Use cell of related processes for count in ProcessGroupMetadataCell * Ensure that no content blocks related to inactive modules are registered * Change sanitize method for short description on process main data cell * Change filter of processes content block in groups to allow active or all * Update processes content block registry to use filter settings * Add tests to check processes block in porcesses group landing page filter settings * Add order setting to content block registry * Translate and sanitize attributes in photo cell * Remove unused translation * Avoid exceptions in processes hero content block when there is no active step --------- Co-authored-by: Hugoren Martinako <aumpfbahn@gmail.com> * simplify 2col layout (#10819) * Redesign: pending login (#10699) * replace old form (blind, wip) * user invitation page * avoid the last-child form__wrapper-block padding-bottom rule * fix typo * unused key * fix erblint * Adapt within_use_menu tests helper method to redesign * Fix selector * Change temporarily way to reach a path * Add REDESIGN_PENDING skips to verifications tests inside a component not redesigned yet * Adapt data_consent tests helper method to redesign * Fix interaction with add to calendar * Adapt top bar search test in meetings * Prepare within_language_menu tests helper method to redesign * Adapt test * Use accept_confirm on submit * Skip tests pending of merge * Skip test pending of issue resolution * Change within_language_menu to accept an admin variation * Add redesign layout to dummy resources controller * Include required assets in comments invocation from dummy resources show view * Adapt comments reports shared examples to redesign * Adapt comments tests to redesign * Avoid some updates on input character counter js * Include translation bar in redesigned participatory spaces layouts * Adapt tests to redesign * Fix test * Add REDESIGN_PENDING skips to maybe deprecated examples * Skip step in meeting creation test pending of redesign of scope selector in front * Adapt tests to redesign * Adapt examples to deletion of 'official' metadata item in meetings cards * Prepare dynamically_attach_file tests helper method to redesigned interface in front * Use dynamically_attach_file with front interface in verification tests * Adapt test to front interface attaching files when files are invalid * Fix wrong condition * Adapt tests * Use the right redesigned partial for timeout modal in live event * Remove commented code * Unskip examples after follow button redesign --------- Co-authored-by: Eduardo Martinez Echevarria <eduardomech@gmail.com> Co-authored-by: Hugoren Martinako <aumpfbahn@gmail.com> * Enable redesign in proposals tests pipeline * Skip tests REDESIGN_PENDING of other PRs * Update expected texts in tests * Skip REDESIGN_PENDING tests which include uploading files * Skip tests REDESIGN_PENDING of other PRs * Activate redesign in proposals * Adapt tests to redesign * Adapt dynamic attach to redesign when title option is present * Skip REDESIGN_PENDING test related with validation messages in front forms * Adapt tests to redesign * Skip tests REDESIGN_PENDING of proposals PR * Skip tests REDESIGN_PENDING of other PRs * Remove has addres checkbox from proposal edition form * Skip REDESIGN_PENDING interaction in front forms with scopes picker * Adapt tests to redesign * Add REDESIGN_PENDING skip related with pending coauthorships display * Skip REDESIGN_PENDING test pending of other PR * Add stylelint disable to blank file * remove deprecated functions and locales * Fix presenter in metadata cell for coauthors on coauthorable resources * remove no longer required file * Update decidim-proposals/app/views/decidim/proposals/collaborative_drafts/new.html.erb Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro> * remove all REDESIGN_PENDING from #10555 * remove all REDESIGN_PENDING from #10765 * Skip example REDESIGN_PENDING of an open issue * Move filter sections to a helper method * Add checks to test * Unskip tests After merging #10921 the related tests are passing and can be enabled again * Add sleep to test * Ignore title on attachment form method and single file upload * Unskip test pending of this PR * Add sleep * use coauthorship cell from #10846 * Change sleep * Add check and simplify test * Skip REDESIGN_PENDING tests failing on GitHub pipeline * Update decidim-proposals/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro> --------- Co-authored-by: Eduardo Martinez Echevarria <eduardomech@gmail.com> Co-authored-by: Carolina Romero <carolromero@users.noreply.github.com> Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🎩 What? Why?
Simplify the HTML layout and styles for the two columns layout. This PR is just a refactor and a code simplification.