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

[#2151] Update LoadingOverlay and Minor Versions of Node Dependencies #2152

Merged
merged 10 commits into from
Apr 1, 2024
Merged
Show file tree
Hide file tree
Changes from 7 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
1,995 changes: 1,987 additions & 8 deletions frontend/cypress/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion frontend/cypress/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"debug": "cypress open"
},
"devDependencies": {
"cypress": "^13.3.0"
"cypress": "^13.6.4"
}
}
4,284 changes: 2,751 additions & 1,533 deletions frontend/package-lock.json

Large diffs are not rendered by default.

43 changes: 21 additions & 22 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
"main": "index.js",
"dependencies": {
"@fontsource/titillium-web": "^4.5.3",
"@fortawesome/fontawesome-svg-core": "^6.0.0",
"@fortawesome/free-brands-svg-icons": "^6.0.0",
"@fortawesome/free-solid-svg-icons": "^6.0.0",
"@fortawesome/vue-fontawesome": "^3.0.3",
"@fortawesome/fontawesome-svg-core": "^6.5.1",
"@fortawesome/free-brands-svg-icons": "^6.5.1",
"@fortawesome/free-solid-svg-icons": "^6.5.1",
"@fortawesome/vue-fontawesome": "^3.0.6",
"@types/markdown-it": "^13.0.7",
"@types/minimatch": "^5.1.2",
"@types/seedrandom": "^3.0.5",
"core-js": "^3.6.5",
"@types/seedrandom": "^3.0.8",
"core-js": "^3.36.0",
"highlight.js": "^10.5.0",
"jszip": "^3.5.0",
"markdown-it": "^14.0.0",
Expand All @@ -31,39 +31,38 @@
"normalize.css": "^8.0.1",
"pug-lint-vue": "^0.4.0",
"seedrandom": "^3.0.5",
"vue": "^3.2.47",
"vue-loading-overlay": "^5.0.3",
"vue": "~3.4.0",
"vue-loading-overlay": "^6.0.4",
"vue-observe-visibility": "^1.0.0",
"vue-router": "^4.1.6",
"vue-router": "^4.3.0",
"vuex": "^4.0.2",
"zod": "^3.22.3"
"zod": "^3.22.4"
},
"devDependencies": {
"@babel/eslint-parser": "^7.17.0",
"@typescript-eslint/eslint-plugin": "^5.50.0",
"@typescript-eslint/parser": "^5.50.0",
"@babel/eslint-parser": "^7.23.1",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"@vue/cli-plugin-babel": "^5.0.4",
"@vue/cli-plugin-eslint": "^5.0.4",
"@vue/cli-plugin-typescript": "^5.0.4",
"@vue/cli-service": "^5.0.4",
"@vue/compiler-sfc": "^3.2.47",
"@vue/compiler-sfc": "^3.4.21",
"@vue/eslint-config-typescript": "^10.0.0",
"eslint": "^8.33.0",
"eslint": "^8.57.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-plugin-import": "^2.26.0",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-vue": "^8.4.1",
"node-sass": "^7.0.3",
"postcss-html": "^1.4.1",
"postcss-html": "^1.6.0",
"pug": "^3.0.2",
"pug-plain-loader": "^1.1.0",
"sass": "^1.58.0",
"sass": "^1.71.0",
"sass-loader": "^12.6.0",
"stylelint": "^14.7.1",
"stylelint-config-recommended-scss": "^6.0.0",
"stylelint-config-recommended-vue": "^1.4.0",
"stylelint-config-recommended-vue": "^1.5.0",
"stylelint-order": "^5.0.0",
"stylelint-scss": "^4.2.0",
"stylelint-scss": "^4.7.0",
"stylelint-webpack-plugin": "^3.2.0",
"typescript": "^4.9.5"
},
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/app.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template lang="pug">
#app
loading-overlay.overlay-loader(
loading.overlay-loader(
v-bind:active='loadingOverlayCount > 0',
v-bind:opacity='loadingOverlayOpacity'
)
Expand All @@ -25,7 +25,7 @@
<script lang='ts'>
import { defineComponent } from 'vue';
import JSZip from 'jszip';
import LoadingOverlay from 'vue-loading-overlay';
import Loading from 'vue-loading-overlay';
import { mapState } from 'vuex';
import { Repo } from './types/types';
import { ErrorMessage } from './types/zod/summary-type';
Expand All @@ -36,7 +36,7 @@ const loadingResourcesMessage = 'Loading resources...';
const app = defineComponent({
name: 'app',
components: {
LoadingOverlay,
Loading,
sopa301 marked this conversation as resolved.
Show resolved Hide resolved
},
data() {
return {
Expand Down Expand Up @@ -87,7 +87,7 @@ const app = defineComponent({
window.REPORT_ZIP = zip;
}, () => {
window.alert('Either the .zip file is corrupted, or you uploaded a .zip file that is not generated '
+ 'by RepoSense.');
+ 'by RepoSense.');
})
.then(() => this.updateReportView());
},
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import hljs from 'highlight.js';
import router from './router/index';
import 'muicss/dist/css/mui.min.css';
import 'normalize.css/normalize.css';
import 'vue-loading-overlay/dist/vue-loading.css';
import 'vue-loading-overlay/dist/css/index.css';
import '@fontsource/titillium-web';

// Need to import for side effects
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/c-authorship.vue
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,7 @@ export default defineComponent({
if (setIsLoaded) {
this.isLoaded = true;
}
this.$store.commit('incrementLoadingOverlayCount', -1);
await this.$store.dispatch('incrementLoadingOverlayCountForceReload', -1);
},

indicateSearchBar(): void {
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/views/c-summary.vue
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,8 @@ export default defineComponent({
this.$store.dispatch('incrementLoadingOverlayCountForceReload', 1).then(() => {
this.getFilteredRepos();
this.updateMergedGroup(allGroupsMerged);
this.$store.commit('incrementLoadingOverlayCount', -1);
}).then(async () => {
await this.$store.dispatch('incrementLoadingOverlayCountForceReload', -1);
});
},

Expand Down Expand Up @@ -477,7 +478,7 @@ export default defineComponent({
await this.$store.dispatch('incrementLoadingOverlayCountForceReload', 1);
this.getFilteredRepos();
this.getMergedRepos();
this.$store.commit('incrementLoadingOverlayCount', -1);
await this.$store.dispatch('incrementLoadingOverlayCountForceReload', -1);
},

getFilteredRepos() {
Expand Down
Loading