Skip to content

Fix screenshots (again) & update dependencies #346

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Mar 3, 2022
Merged

Fix screenshots (again) & update dependencies #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b01b952
Update vtk.js and other dependencies
annehaley Feb 25, 2022
b2b9889
Lint fixes on most vue files according to eslint update
annehaley Feb 25, 2022
0a64295
Incorporate upstream changes to place camera correctly
annehaley Feb 25, 2022
9d48ec7
Remove comments
annehaley Feb 28, 2022
671a002
TODO for fixing scale later
annehaley Mar 1, 2022
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
3 changes: 2 additions & 1 deletion client/babel.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
module.exports = {
presets: ['@vue/app'],
presets: ['@vue/cli-plugin-babel/preset'],
plugins: ['@babel/plugin-proposal-optional-chaining'],
};
26,672 changes: 23,041 additions & 3,631 deletions client/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

25 changes: 11 additions & 14 deletions client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"@mdi/font": "^6.5.95",
"@sentry/vue": "^6.17.6",
"@types/jest": "^27.0.1",
"@typescript-eslint/eslint-plugin": "^4.31.0",
"@typescript-eslint/parser": "^4.31.0",
"@typescript-eslint/eslint-plugin": "^4.33.0",
"@typescript-eslint/parser": "^4.0.0",
"@vue/cli-plugin-typescript": "^4.5.13",
"@vue/composition-api": "^1.1.4",
"@vue/eslint-config-typescript": "^7.0.0",
Expand All @@ -27,43 +27,40 @@
"mousetrap": "github:scottwittenburg/mousetrap#fix-listener-leak",
"typescript": "^4.4.2",
"uuid": "^3.4.0",
"vtk.js": "14.16.5",
"vtk.js": "22.5.7",
"vue": "^2.6.14",
"vue-async-computed": "^3.5.1",
"vue-css-donut-chart": "^1.3.2",
"vue-router": "3.4.3",
"vuetify": "^2.3.22",
"vuetify": "^2.6.3",
"vuex": "^3.0.1"
},
"devDependencies": {
"@babel/core": "^7.16.7",
"@babel/parser": "^7.16.7",
"@babel/runtime": "^7.16.7",
"@types/lodash": "^4.14.172",
"@types/uuid": "^8.3.1",
"@vue/cli-plugin-babel": "^4.5.15",
"@vue/cli-plugin-eslint": "^4.5.15",
"@vue/cli-plugin-eslint": "^5.0.0",
"@vue/cli-service": "^4.5.13",
"@vue/eslint-config-airbnb": "^5.3.0",
"@vue/eslint-config-prettier": "^4.0.1",
"babel-eslint": "^10.0.1",
"babel-loader": "^8.2.2",
"copy-webpack-plugin": "^4.6.0",
"core-js": "^3.20.2",
"eslint": "^7.32.0",
"eslint-plugin-import": "^2.24.2",
"eslint-plugin-vue": "^5.0.0",
"pug": "^3.0.1",
"eslint-plugin-vue": "^7.0.0",
"postcss-loader": "^3.0.0",
"pug": "^2.0.1",
"pug-loader": "^2.4.0",
"pug-plain-loader": "^1.0.0",
"sass": "^1.39.0",
"sass-loader": "^7.0.1",
"sass": "1.32.0",
"sass-loader": "^10.0.0",
"shader-loader": "^1.3.1",
"vue-cli-plugin-vuetify": "^2.4.2",
"vue-eslint-parser": "^8.0.1",
"vue-template-compiler": "^2.6.14",
"vuetify-loader": "^1.7.3",
"webpack": "^4.46.0",
"worker-loader": "^2.0.0"
"worker-loader": "^3.0.8"
}
}
36 changes: 18 additions & 18 deletions client/src/components/ControlPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,22 +281,22 @@ export default {
</v-flex>
<v-textarea
v-model="currentViewData.experimentNote"
@input="handleExperimentNoteChange"
:disabled="!experimentIsEditable"
filled
:disabled="!experimentIsEditable"
no-resize
height="80px"
hide-details
class="mt-3"
name="input-experiment-notes"
label="Experiment Notes"
placeholder="There are no notes on this experiment."
@input="handleExperimentNoteChange"
/>
<v-row no-gutters>
<v-col
v-on:click="handleExperimentNoteSave()"
:class="newExperimentNote.length > 0 ? 'blue--text' : 'grey--text'"
style="text-align: right"
@click="handleExperimentNoteSave()"
>
Save Note
</v-col>
Expand All @@ -308,19 +308,19 @@ export default {
<div style="flex-grow: 1">
<v-switch
:input-value="showCrosshairs"
@change="setShowCrosshairs"
label="Display crosshairs"
hide-details
class="shrink pa-0 ml-n2"
@change="setShowCrosshairs"
/>
</div>
<div style="flex-grow: 1">
<v-switch
:input-value="storeCrosshairs"
@change="setStoreCrosshairs"
label="Store crosshairs with decision"
hide-details
class="shrink pa-0 ml-n2"
@change="setStoreCrosshairs"
/>
</div>
</v-flex>
Expand Down Expand Up @@ -368,19 +368,19 @@ export default {
>
<v-btn
:disabled="!currentViewData.upTo"
@mousedown="handleKeyPress('previous')"
small
depressed
class="transparent-btn"
@mousedown="handleKeyPress('previous')"
>
<v-icon>fa-caret-up</v-icon>
</v-btn>
<v-btn
:disabled="!currentViewData.downTo"
@mousedown="handleKeyPress('next')"
small
depressed
class="transparent-btn"
@mousedown="handleKeyPress('next')"
>
<v-icon>fa-caret-down</v-icon>
</v-btn>
Expand All @@ -403,19 +403,19 @@ export default {
>
<v-btn
:disabled="!previousFrame"
@mousedown="handleKeyPress('back')"
small
depressed
class="transparent-btn"
@mousedown="handleKeyPress('back')"
>
<v-icon>fa-caret-left</v-icon>
</v-btn>
<v-btn
:disabled="!nextFrame"
@mousedown="handleKeyPress('forward')"
small
depressed
class="transparent-btn"
@mousedown="handleKeyPress('forward')"
>
<v-icon>fa-caret-right</v-icon>
</v-btn>
Expand All @@ -431,11 +431,11 @@ export default {
>
Window width
<v-tooltip bottom>
<template v-slot:activator="{ on, attrs }">
<template #activator="{ on, attrs }">
<v-icon
v-bind="attrs"
v-on="on"
small
v-on="on"
>
info
</v-icon>
Expand All @@ -458,10 +458,10 @@ export default {
class="align-center"
hide-details
>
<template v-slot:prepend>
<template #prepend>
{{ winMin }}
</template>
<template v-slot:append>
<template #append>
<div class="pr-5 pt-2">
{{ winMax }}
</div>
Expand All @@ -485,11 +485,11 @@ export default {
<v-col cols="4">
Window level
<v-tooltip bottom>
<template v-slot:activator="{ on, attrs }">
<template #activator="{ on, attrs }">
<v-icon
v-bind="attrs"
v-on="on"
small
v-on="on"
>
info
</v-icon>
Expand All @@ -511,10 +511,10 @@ export default {
class="align-center"
hide-details
>
<template v-slot:prepend>
<template #prepend>
{{ levMin }}
</template>
<template v-slot:append>
<template #append>
<div class="pr-5 pt-2">
{{ levMax }}
</div>
Expand Down Expand Up @@ -581,8 +581,8 @@ export default {
v-if="editRights && (user.is_superuser || !lockOwner)"
:loading="loadingLock"
:disabled="loadingLock"
@click="switchLock(experimentId, null, force=true)"
color="primary"
@click="switchLock(experimentId, null, force=true)"
>
{{ lockOwner ?"Steal edit access" :"Claim edit access" }}
</v-btn>
Expand Down
18 changes: 9 additions & 9 deletions client/src/components/DataImportExport.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,13 @@ export default defineComponent({
v-if="!exportOnly"
top
>
<template v-slot:activator="{ on, attrs }">
<template #activator="{ on, attrs }">
<v-btn
@click="importDialog = true"
v-bind="attrs"
v-on="on"
text
color="primary"
v-on="on"
@click="importDialog = true"
>
Import
</v-btn>
Expand All @@ -121,14 +121,14 @@ export default defineComponent({
v-if="!importOnly"
top
>
<template v-slot:activator="{ on, attrs }">
<template #activator="{ on, attrs }">
<v-btn
:disabled="exporting"
@click="exportData"
v-bind="attrs"
v-on="on"
text
color="primary"
v-on="on"
@click="exportData"
>
<v-progress-circular
v-if="exporting"
Expand Down Expand Up @@ -165,16 +165,16 @@ export default defineComponent({
<v-spacer />
<v-btn
:disabled="importing"
@click="importDialog = false"
text
@click="importDialog = false"
>
Cancel
</v-btn>
<v-btn
:loading="importing"
@click="importData"
text
color="primary"
@click="importData"
>
Import
</v-btn>
Expand All @@ -195,9 +195,9 @@ export default defineComponent({
<v-card-actions>
<v-spacer />
<v-btn
@click="importErrors = false"
color="primary"
text
@click="importErrors = false"
>
Ok
</v-btn>
Expand Down
22 changes: 11 additions & 11 deletions client/src/components/DecisionButtons.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import EvaluationResults from '@/components/EvaluationResults.vue';

export default {
name: 'DecisionButtons',
inject: ['user', 'MIQAConfig'],
components: {
EvaluationResults,
},
inject: ['user', 'MIQAConfig'],
data() {
return {
warnDecision: false,
Expand Down Expand Up @@ -238,12 +238,12 @@ export default {
<v-subheader class="pa-0 ma-0">
Indicate artifacts in this scan
<v-tooltip bottom>
<template v-slot:activator="{ on, attrs }">
<template #activator="{ on, attrs }">
<v-icon
v-bind="attrs"
v-on="on"
small
class="pl-2"
v-on="on"
>
info
</v-icon>
Expand All @@ -266,12 +266,12 @@ export default {
Auto evaluation
</v-subheader>
<v-tooltip bottom>
<template v-slot:activator="{ on, attrs }">
<template #activator="{ on, attrs }">
<v-icon
v-bind="attrs"
v-on="on"
small
style="height: 25px; padding: 5px"
v-on="on"
>
info
</v-icon>
Expand All @@ -296,12 +296,12 @@ export default {
No Auto evaluation available
</v-subheader>
<v-tooltip bottom>
<template v-slot:activator="{ on, attrs }">
<template #activator="{ on, attrs }">
<v-icon
v-bind="attrs"
v-on="on"
small
style="height: 25px; padding: 5px"
v-on="on"
>
info
</v-icon>
Expand All @@ -321,12 +321,12 @@ export default {
v-for="([artifact, chipState]) in chips"
v-bind="artifact"
:key="artifact.value"
@click="clickChip(artifact, chipState.state)"
:outlined="chipState.outlined"
:color="chipState.color"
:text-color="chipState.textColor"
:style="'text-decoration: '+chipState.textDecoration +'; margin-bottom: 3px;'"
small
@click="clickChip(artifact, chipState.state)"
>
{{ chipState.label }}
</v-chip>
Expand All @@ -338,16 +338,16 @@ export default {
class="pt-5"
>
<v-textarea
@input="handleCommentChange"
v-model="newComment"
:counter="!warnDecision"
:hide-details="warnDecision"
v-model="newComment"
filled
no-resize
height="75px"
name="input-comment"
label="Evaluation Comment"
placeholder="Write a comment about the scan and submit a decision"
@input="handleCommentChange"
/>
</v-col>
</v-row>
Expand All @@ -372,8 +372,8 @@ export default {
style="text-align: center"
>
<v-btn
@click="handleCommentSave(option.code)"
:color="option.color"
@click="handleCommentSave(option.code)"
>
{{ option.label }}
</v-btn>
Expand Down
Loading