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 all frontend JS deps #371

Merged
merged 5 commits into from
May 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 19 additions & 22 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,42 +10,39 @@
},
"dependencies": {
"axios": "^0.21.1",
"buefy": "^0.8.20",
"c3": "^0.7.18",
"buefy": "^0.9.7",
"c3": "^0.7.20",
"codeflask": "^1.4.1",
"core-js": "^3.6.5",
"dayjs": "^1.8.28",
"elliptic": "^6.5.4",
"core-js": "^3.12.1",
"dayjs": "^1.10.4",
"humps": "^2.0.1",
"lodash": "^4.17.21",
"node-forge": "^0.10.0",
"node-sass": "^4.14.1",
"qs": "^6.9.4",
"qs": "^6.10.1",
"quill": "^1.3.7",
"quill-delta": "^4.2.2",
"sass-loader": "^8.0.2",
"textversionjs": "^1.1.3",
"turndown": "^7.0.0",
"vue": "^2.6.11",
"vue": "^2.6.12",
"vue-c3": "^1.2.11",
"vue-i18n": "^8.22.2",
"vue-quill-editor": "^3.0.6",
"vue-router": "^3.2.0",
"vuex": "^3.4.0"
"vuex": "^3.6.2"
},
"devDependencies": {
"@vue/cli-plugin-babel": "~4.4.0",
"@vue/cli-plugin-eslint": "~4.4.0",
"@vue/cli-plugin-router": "~4.4.0",
"@vue/cli-plugin-vuex": "~4.4.0",
"@vue/cli-service": "~4.4.0",
"@vue/eslint-config-airbnb": "^5.0.2",
"@vue/cli-plugin-babel": "~4.5.13",
"@vue/cli-plugin-eslint": "~4.5.13",
"@vue/cli-plugin-router": "~4.5.13",
"@vue/cli-plugin-vuex": "~4.5.13",
"@vue/cli-service": "~4.5.13",
"@vue/eslint-config-airbnb": "^5.3.0",
"babel-eslint": "^10.1.0",
"cypress": "^6.4.0",
"cypress-file-upload": "^5.0.2",
"eslint": "^6.7.2",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-vue": "^6.2.2",
"vue-template-compiler": "^2.6.11"
"eslint": "^7.27.0",
"eslint-plugin-import": "^2.23.3",
"eslint-plugin-vue": "^7.9.0",
"sass": "^1.34.0",
"sass-loader": "^10.2.0",
"vue-template-compiler": "^2.6.12"
}
}
44 changes: 0 additions & 44 deletions frontend/src/assets/buefy.scss

This file was deleted.

9 changes: 5 additions & 4 deletions frontend/src/assets/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ $modal-background-background-color: rgba(0, 0, 0, .30);
$speed-slow: 25ms !default;
$speed-slower: 50ms !default;

/* Import full Bulma and Buefy to override styles. */
// @import "~bulma";
@import "./buefy";
/* Import full Bulma and Buefy */
@import "~bulma";
@import "~buefy/src/scss/buefy";

/* Custom style overrides */
html, body {
height: 100%;
}
Expand Down Expand Up @@ -752,6 +753,7 @@ section.campaign {

/* Hide sidebar menu captions on mobile */
.b-sidebar .sidebar-content.is-mini-mobile {
max-width: 90px;
.menu-list {
li {
margin-bottom: 30px;
Expand All @@ -773,7 +775,6 @@ section.campaign {

td .tags {
display: block;
text-align: right;

.tag:not(:last-child) {
margin-right: 0;
Expand Down
4 changes: 4 additions & 0 deletions frontend/src/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,8 @@ export default class Utils {
duration: duration || 2000,
});
};

// Takes a props.row from a Buefy b-column <td> template and
// returns a `data-id` attribute which Buefy then applies to the td.
tdID = (row) => ({ 'data-id': row.id.toString() });
}
Loading