Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade bootstrap to v5.3.1 #537

Merged
merged 2 commits into from
Sep 11, 2023
Merged

Upgrade bootstrap to v5.3.1 #537

merged 2 commits into from
Sep 11, 2023

Conversation

Splines
Copy link
Member

@Splines Splines commented Aug 27, 2023

Update bootstrap version from 5.2.1 to 5.3.1, so that #527 works correctly (z-index did not work properly, see comment over there).

Command used:

bundle update bootstrap

Note that bundle update bootstrap --conservative did not work (containers did not start due to dependency errors).

See migration guide here for what has changed in Bootstrap.

@Splines Splines added the dependencies Pull requests that update a dependency file label Aug 27, 2023
@Splines Splines requested a review from Frodo161 August 27, 2023 15:48
@Splines Splines self-assigned this Aug 27, 2023
Splines added a commit that referenced this pull request Aug 27, 2023
@Splines Splines mentioned this pull request Aug 27, 2023
12 tasks
@codecov

This comment was marked as off-topic.

@Splines Splines mentioned this pull request Aug 27, 2023
Copy link
Collaborator

@Frodo161 Frodo161 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I played around with this branch in my local installation (especially, I've sent a few mails) and everything worked.

In the migration guide of bootstrap they say that navbar-dark is deprecated. I found this one in "app/views/administration/_navbar.html.erb". It doesn't cause any problems in my local MaMpf, but maybe double check this.

@Splines
Copy link
Member Author

Splines commented Sep 10, 2023

I played around with this branch in my local installation (especially, I've sent a few mails) and everything worked.

In the migration guide of bootstrap they say that navbar-dark is deprecated. I found this one in "app/views/administration/_navbar.html.erb". It doesn't cause any problems in my local MaMpf, but maybe double check this.

Good catch. These were the last two occurrences of navbar-dark in our codebase and were removed in #536, so that's not an issue anymore.

@Splines Splines merged commit d54f195 into mampf-next Sep 11, 2023
6 of 7 checks passed
@Splines Splines deleted the deps/upgrade-bootstrap branch September 11, 2023 10:26
Splines added a commit that referenced this pull request Mar 20, 2024
Due to a forced push of the dev branch, the following list might
unfortunately include items from other branches as well.

* Init Feedback model

* Add Feedback modal view and corresponding controller

First working version, of course still a lot to improve from here.

* Migrate feedback form to Bootstrap v5

* Add basic styling to Feedback form

* Add "allow contact via mail" checkbox

A new column was added to the Feedbacks schema.
Note that we did not create a new migration as this is a PR which should
only contain one migration, namely the one for the creation of the whol
Feedback table.

* Toggle "allow email contact" by default

* Improve submit button handler (outsource to function)

* Init feedback mailer

Right now just for ourselves, so that we get a plaintext mail with
the feedback of a user.

Env variables were adjusted accordingly, but need to be set manually
in the production environment!

* Adjust feedback mail in views

* Implement success/error flow with toast messages

* Add missing database field "can_contact"

* Add internationalization to feedback error/success

* Lint some files

* Set feedback text field as required with min 10 chars

* Add "optional" to title in email

* Adjust spacing around feedback button

* Internationalize tooltip

* Delete console log

* Add comment describing hidden submit button handler

* Delete default test specs

* Add proper validation for Feedback body

Alongside this, also made sure that we use a custom client-side
validation message when input is too short (under 10 chars long).
This allows us to use the language the user has selected in MaMpf
instead of the browser language.

* Default `can_contact` to false in backend

* Update bootstrap to v5.3.1

command used: bundle update bootstrap
bundle update bootstrap --conservative did not work, as docker
containers did not start again due to dependency errors

* Revert "Update bootstrap to v5.3.1" in favor of PR #537

This reverts commit 5cd1af2.

* Submit form via Ctrl + Enter when modal is opened

* Remove default nil value from ENV.fetch()

* Revert "Remove default nil value from ENV.fetch()"

This reverts commit 696a395.

* Rename button to 'Send' (not 'Save')

* Check if should register feedback event handlers

* Make feedback button ID more specific

* Fix line wrapping (code style)

* Use delete on cascade to be able to delete a user

even if he/she has sent some feedback

* Move Send button before Cancel button

* Replace "on delete cascade" with "dependent destroy"

* Add cypress rules to ESLint & ignore some patterns

* Allow usage of tempusDominus global variable

* Ignore JS files with Sprocket syntax

* Further improve rules, e.g. allow common globals

* Ignore sprocket syntax in cable.js

* Autofix all `.js` and `.js.erb` files

Command used:
`yarn run eslint --fix .`

Still 47 problems (27 errors, 20 warnings) after this.

* Fix variables in turbolink fix

* Prepend unused variables with "_"

* Get rid of unused widget variable

* Fix specs comment tab alignment

* Warn about too long GitHub commit messages (#586)

* Fix comment status (#585)

* Reapply first fix for Reader/Media

See discussion on #574 for further details.
Previous PR for this was #576, closed in favor of this one
as this directly branches off the new "dev" branch.

* Correctly show latest post (might be current_user's comment)

* Fix update of unread comments logic in comments controller

* Fix update icon logic and latest post comment

* Simplify latest comment logic

* Improve code comments

* Further improve comments

* Fix wording in comment

* Fix construction of media array & use `.blank?` instead of `.empty?`

* Migrate `unread_comments` flag (fix inconsistencies) (#587)

* Add dummy migration

* Implement migration for unread comment flag

* Remove unnecessary comment

* Declare migration as not idempotent

* Use array.length instead of counting

* Throw error to prevent revert of migration

* Fix severe flaws in unread comments migration

* Simplify Reader retrieval

* Use the more explicit `.nil?` method

* Update migration date

* Fix annoying bug: don't use `.select!` but `.select`

* Polish migration

e.g. update comment, more suitable name for the method etc.

* Rename method according to #585

* Use `warn` log level for migration (#588)

* Fix linting in feedback.js

* Fix RuboCop errors

* Fix remaining ESLint errors

* Update timestamp of feedback migration

* Add missing Feedback email to prod docker.env

* Remove unnecessary Feedback env variables

* Add validation message for empty body

* Change `const` to `var` to avoid "redefined" errors

* Update timestamp of feedback migration (again)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Pull requests that update a dependency file
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants