diff --git a/package.json b/package.json index 5d9aa1ba56..bfff8b7b84 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "influx": "^5.9.3", "isomorphic-dompurify": "^0.13.0", "jsesc": "^3.0.2", - "lobes4": "4.0.1", + "lobes5": "git+https://git@github.com/metabrainz/lobes.git#bootstrap5", "lodash": "^4.17.21", "log": "^6.0.0", "log-node": "^8.0.3", @@ -70,7 +70,7 @@ "passport-musicbrainz-oauth2": "git+https://git@github.com/LordSputnik/passport-musicbrainz-oauth2.git", "prop-types": "^15.8.1", "react": "^16.13.1", - "react-bootstrap": "^1.6.4", + "react-bootstrap": "^2.10.5", "react-chartjs-2": "^2.11.2", "react-datepicker": "^4.7.0", "react-dom": "^16.13.1", @@ -115,7 +115,7 @@ "babel-loader": "^8.2.2", "babel-plugin-lodash": "^3.3.4", "babel-plugin-transform-require-ignore": "^0.1.1", - "bootstrap": "^4.6.1", + "bootstrap": "^5.0.0", "chai": "^4.3.6", "chai-arrays": "^2.2.0", "chai-as-promised": "^7.0.0", @@ -141,8 +141,8 @@ "redux-mock-store": "^1.5.4", "resolve-url-loader": "^5.0.0", "rewire": "^7.0.0", - "sass": "^1.59.2", - "sass-loader": "^13.2.0", + "sass": "1.79.5", + "sass-loader": "^16", "sinon": "^14.0.0", "typescript": "^4.0.5", "webpack": "^5.94.0", diff --git a/src/client/components/forms/deletion.js b/src/client/components/forms/deletion.js index fe34a83274..3d470d4f63 100644 --- a/src/client/components/forms/deletion.js +++ b/src/client/components/forms/deletion.js @@ -97,7 +97,7 @@ class EntityDeletionForm extends React.Component { const footerComponent = ( - - +
+

+ Collaborators can add/remove entities from your collection +

+ +
{ this.state.collaborators.map((collaborator, index) => { const buttonAfter = ( @@ -291,30 +287,27 @@ class UserCollectionForm extends React.Component {
Error: {errorText}
- - - - +
+ { this.props.collection.id ? - - - : null + : + null } - +
diff --git a/src/client/components/pages/entities/cb-review.js b/src/client/components/pages/entities/cb-review.js index 3225979e53..0977383351 100644 --- a/src/client/components/pages/entities/cb-review.js +++ b/src/client/components/pages/entities/cb-review.js @@ -56,12 +56,12 @@ function ReviewCard(props) { size={15} stars={5} /> - + Review by: {reviewData.user.display_name} {publishedDate} {reviewText} - View > + View > ); } diff --git a/src/client/components/pages/entities/edition-table.js b/src/client/components/pages/entities/edition-table.js index 5504b6d8ac..ae6dac5769 100644 --- a/src/client/components/pages/entities/edition-table.js +++ b/src/client/components/pages/entities/edition-table.js @@ -151,7 +151,7 @@ function EditionTable({editions, entity, showAddedAtColumn, showAdd, showAuthorC else if (showAdd) { tableContent = ( - + - - - - - - - -
+
+ + + +

Contact Us diff --git a/src/client/components/pages/parts/admin-panel-search-field.tsx b/src/client/components/pages/parts/admin-panel-search-field.tsx index 013ed826ff..ffb3438a69 100644 --- a/src/client/components/pages/parts/admin-panel-search-field.tsx +++ b/src/client/components/pages/parts/admin-panel-search-field.tsx @@ -29,7 +29,6 @@ const {Button, Col, InputGroup, Form, Row} = bootstrap; const SearchButton = ( - - +
+ +
- - +
+ +

: null ); diff --git a/src/client/components/pages/parts/privilege-badges.js b/src/client/components/pages/parts/privilege-badges.js index ec99c2145e..90995a5db2 100644 --- a/src/client/components/pages/parts/privilege-badges.js +++ b/src/client/components/pages/parts/privilege-badges.js @@ -26,7 +26,7 @@ function PrivilegeBadges({privs}) { const privBits = getPrivilegeBitsArray(privs); const privilegeListComp = privBits.map(bit => ( - + {getPrivilegeTitleFromBit(bit)} {' '} diff --git a/src/client/components/pages/parts/revisions-table.js b/src/client/components/pages/parts/revisions-table.js index 1b13f90a5d..4894c091e8 100644 --- a/src/client/components/pages/parts/revisions-table.js +++ b/src/client/components/pages/parts/revisions-table.js @@ -115,7 +115,7 @@ function RevisionsTable(props) { {stringToHTMLWithLinks(note.content)} —{note.author.name} diff --git a/src/client/components/pages/parts/search-field.tsx b/src/client/components/pages/parts/search-field.tsx index 99a4721644..0f74ce7507 100644 --- a/src/client/components/pages/parts/search-field.tsx +++ b/src/client/components/pages/parts/search-field.tsx @@ -31,7 +31,6 @@ const {Button, Col, Dropdown, DropdownButton, InputGroup, Form, Row} = bootstrap const SearchButton = ( : null } diff --git a/src/client/components/pages/revision.js b/src/client/components/pages/revision.js index 93ed0f532f..3efa0c722a 100644 --- a/src/client/components/pages/revision.js +++ b/src/client/components/pages/revision.js @@ -300,7 +300,7 @@ class RevisionPage extends React.Component { /> - + ); @@ -331,44 +325,34 @@ class Layout extends React.Component { renderNavContent() { const {homepage, hideSearch, user} = this.props; - /* - * GOTCHA: Usage of react-bootstrap FormGroup component inside - * Navbar.Form causes a DOM mutation - */ - const revisionsClassName = homepage || hideSearch ? 'ml-auto' : null; - return ( - - {!(homepage || hideSearch) && this.renderSearchForm()} -