Skip to content

Commit 5b02551

Browse files
pedrolamaspedrolamas
committed
Merge branch 'develop'
Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
2 parents ac8fce8 + de444e0 commit 5b02551

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+527
-378
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
"lukas-tr.materialdesignicons-intellisense",
2121
"ms-azuretools.vscode-docker",
2222
"redhat.vscode-yaml",
23-
"vue.volar",
24-
"vue.vscode-typescript-vue-plugin"
23+
"vue.volar"
2524
],
2625
"settings": {
2726
"editor.codeActionsOnSave": {

‎.vscode/extensions.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"lukas-tr.materialdesignicons-intellisense",
99
"ms-azuretools.vscode-docker",
1010
"redhat.vscode-yaml",
11-
"vue.volar",
12-
"vue.vscode-typescript-vue-plugin"
11+
"vue.volar"
1312
]
1413
}

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<script type="module" src="/src/main.ts"></script>
2323
</head>
24-
<body>
24+
<body style="background-color: #1E1E20">
2525
<noscript>
2626
<strong>We're sorry, but fluidd doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
2727
</noscript>

‎package-lock.json‎

Lines changed: 167 additions & 180 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,22 @@
3333
"main": "index.js",
3434
"dependencies": {
3535
"@ctrl/tinycolor": "^4.1.0",
36-
"@fontsource/raleway": "^5.0.21",
37-
"@fontsource/roboto": "^5.0.15",
36+
"@fontsource/raleway": "^5.1.0",
37+
"@fontsource/roboto": "^5.1.0",
3838
"@irojs/iro-core": "^1.2.1",
3939
"@jaames/iro": "^5.5.2",
4040
"axios": "^1.7.7",
4141
"consola": "^3.2.3",
42-
"dompurify": "^3.1.6",
42+
"dompurify": "^3.1.7",
4343
"echarts": "^5.5.1",
4444
"echarts-gl": "^2.0.9",
45-
"hls.js": "^1.5.15",
45+
"hls.js": "^1.5.16",
4646
"jwt-decode": "^4.0.0",
4747
"lodash-es": "^4.17.21",
48-
"marked": "^14.1.2",
48+
"marked": "^14.1.3",
4949
"marked-base-url": "^1.1.5",
5050
"md5": "^2.3.0",
51-
"monaco-editor": "^0.51.0",
51+
"monaco-editor": "^0.52.0",
5252
"monaco-editor-textmate": "^4.0.0",
5353
"monaco-textmate": "^3.0.1",
5454
"onigasm": "^2.2.5",
@@ -81,7 +81,7 @@
8181
"@types/jsdom": "^21.1.7",
8282
"@types/lodash-es": "^4.17.12",
8383
"@types/md5": "^2.3.5",
84-
"@types/node": "^20.16.5",
84+
"@types/node": "^20.16.11",
8585
"@types/semver": "^7.5.8",
8686
"@types/sortablejs": "^1.15.8",
8787
"@types/uuid": "^10.0.0",
@@ -92,20 +92,20 @@
9292
"@vue/eslint-config-typescript": "^13.0.0",
9393
"@vue/test-utils": "^1.3.6",
9494
"@vue/tsconfig": "~0.1.3",
95-
"eslint": "^8.57.0",
95+
"eslint": "^8.57.1",
9696
"eslint-plugin-vue": "^9.28.0",
9797
"husky": "^9.1.6",
98-
"jsdom": "^25.0.0",
98+
"jsdom": "^25.0.1",
9999
"mockdate": "^3.0.5",
100100
"monaco-vscode-textmate-theme-converter": "^0.1.7",
101-
"rollup": "^4.21.3",
101+
"rollup": "^4.24.0",
102102
"sass": "~1.32.13",
103103
"shx": "^0.3.4",
104104
"skott": "^0.35.3",
105105
"standard-version": "^9.5.0",
106106
"typescript": "^5.5.4",
107107
"unplugin-vue-components": "^0.27.4",
108-
"vite": "^5.4.4",
108+
"vite": "^5.4.9",
109109
"vite-plugin-checker": "^0.7.2",
110110
"vite-plugin-monaco-editor": "^1.1.0",
111111
"vite-plugin-pwa": "^0.20.5",

‎src/App.vue‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<template>
2-
<v-app v-if="loading" />
32
<v-app
4-
v-else
53
class="fluidd"
64
:class="{ 'no-pointer-events': dragState }"
75
>
@@ -43,7 +41,6 @@
4341
</v-btn>
4442

4543
<v-main :style="customBackgroundImageStyle">
46-
<!-- <pre>authenticated {{ authenticated }}, socketConnected {{ socketConnected }}, apiConnected {{ apiConnected }}</pre> -->
4744
<v-container
4845
fluid
4946
:class="{
@@ -179,10 +176,6 @@ export default class App extends Mixins(StateMixin, FilesMixin, BrowserMixin) {
179176
return this.$route.meta?.fileDropRoot
180177
}
181178
182-
get loading () {
183-
return this.hasWait(this.$waits.onLoadLanguage)
184-
}
185-
186179
get progress (): number {
187180
const progress = this.$store.getters['printer/getPrintProgress'] as number
188181
return Math.floor(progress * 100)
@@ -326,7 +319,7 @@ export default class App extends Mixins(StateMixin, FilesMixin, BrowserMixin) {
326319
327320
mounted () {
328321
window.addEventListener('dragover', this.handleDragOver)
329-
window.addEventListener('dragenter', this.handleDragEnter)
322+
window.addEventListener('dragenter', this.handleDragOver)
330323
window.addEventListener('dragleave', this.handleDragLeave)
331324
window.addEventListener('drop', this.handleDrop)
332325
window.addEventListener('keydown', this.handleKeyDown, false)
@@ -359,7 +352,7 @@ export default class App extends Mixins(StateMixin, FilesMixin, BrowserMixin) {
359352
360353
beforeDestroy () {
361354
window.removeEventListener('dragover', this.handleDragOver)
362-
window.removeEventListener('dragenter', this.handleDragEnter)
355+
window.removeEventListener('dragenter', this.handleDragOver)
363356
window.removeEventListener('dragleave', this.handleDragLeave)
364357
window.removeEventListener('drop', this.handleDrop)
365358
window.removeEventListener('keydown', this.handleKeyDown)
@@ -387,12 +380,6 @@ export default class App extends Mixins(StateMixin, FilesMixin, BrowserMixin) {
387380
}
388381
}
389382
390-
handleDragEnter (event: DragEvent) {
391-
if (this.fileDropRoot) {
392-
event.preventDefault()
393-
}
394-
}
395-
396383
handleDragLeave (event: DragEvent) {
397384
if (this.fileDropRoot) {
398385
event.preventDefault()

‎src/components/common/BedScrewsAdjustDialog.vue‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<v-text-field
1212
:label="$t('app.general.label.screw_name')"
1313
outlined
14+
persistent-placeholder
1415
hide-details
1516
dense
1617
disabled
@@ -23,6 +24,7 @@
2324
<v-text-field
2425
:label="$t('app.general.label.screw_index')"
2526
outlined
27+
persistent-placeholder
2628
hide-details
2729
dense
2830
disabled
@@ -35,6 +37,7 @@
3537
<v-text-field
3638
:label="$t('app.general.label.accepted_screws')"
3739
outlined
40+
persistent-placeholder
3841
hide-details
3942
dense
4043
disabled
@@ -107,7 +110,7 @@ export default class BedScrewsAdjustDialog extends Mixins(StateMixin, ToolheadMi
107110
}
108111
109112
get currentState () {
110-
return this.bedScrewsAdjust.state || ' '
113+
return this.bedScrewsAdjust.state
111114
}
112115
113116
get currentScrewIndex () {

‎src/components/common/ManualProbeDialog.vue‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<v-text-field
1616
label="Z Min"
1717
outlined
18+
persistent-placeholder
1819
hide-details
1920
dense
2021
disabled
@@ -25,6 +26,7 @@
2526
<v-text-field
2627
label="Z"
2728
outlined
29+
persistent-placeholder
2830
hide-details
2931
dense
3032
disabled
@@ -35,6 +37,7 @@
3537
<v-text-field
3638
label="Z Max"
3739
outlined
40+
persistent-placeholder
3841
hide-details
3942
dense
4043
disabled
@@ -153,15 +156,15 @@ export default class ManualProbeDialog extends Mixins(StateMixin, ToolheadMixin)
153156
}
154157
155158
get zPositionLower () {
156-
return this.manualProbe.z_position_lower?.toFixed(3) || ' '
159+
return this.manualProbe.z_position_lower?.toFixed(3)
157160
}
158161
159162
get zPosition () {
160-
return this.manualProbe.z_position?.toFixed(3) || ' '
163+
return this.manualProbe.z_position?.toFixed(3)
161164
}
162165
163166
get zPositionUpper () {
164-
return this.manualProbe.z_position_upper?.toFixed(3) || ' '
167+
return this.manualProbe.z_position_upper?.toFixed(3)
165168
}
166169
167170
@Watch('isManualProbeActive')

‎src/components/common/PeripheralsDialog.vue‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
:value="device.device_path"
9595
label="device_path"
9696
outlined
97+
persistent-placeholder
9798
dense
9899
readonly
99100
hide-details
@@ -107,6 +108,7 @@
107108
:value="device.path_by_id"
108109
label="path_by_id"
109110
outlined
111+
persistent-placeholder
110112
dense
111113
readonly
112114
hide-details
@@ -120,6 +122,7 @@
120122
:value="device.path_by_hardware"
121123
label="path_by_hardware"
122124
outlined
125+
persistent-placeholder
123126
dense
124127
readonly
125128
hide-details
@@ -287,6 +290,7 @@
287290
:value="canUuid.uuid"
288291
:label="canUuid.application"
289292
outlined
293+
persistent-placeholder
290294
dense
291295
readonly
292296
hide-details

‎src/components/common/SocketDisconnected.vue‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,35 @@
99
class="subtitle-1 text-center"
1010
cols="12"
1111
>
12-
<div v-if="activeInstance">
13-
{{ activeInstance.apiUrl }}
12+
<div v-if="apiUrl">
13+
{{ apiUrl }}
1414
</div>
15-
<span v-if="socketConnecting">{{ $t('app.socket.msg.connecting') }}</span>
16-
<span v-if="!socketConnecting">{{ $t('app.socket.msg.no_connection') }}</span>
15+
<span v-if="socketConnecting || !appReady">{{ $t('app.socket.msg.connecting') }}</span>
16+
<span v-else>{{ $t('app.socket.msg.no_connection') }}</span>
1717
</v-col>
1818
<v-col
1919
cols="6"
2020
lg="4"
2121
>
2222
<v-progress-linear
23-
v-if="socketConnecting"
23+
v-if="socketConnecting || !appReady"
2424
class="mb-4"
2525
color="warning"
2626
indeterminate
2727
rounded
2828
height="6"
2929
/>
30+
3031
<app-btn
31-
v-if="!socketConnecting"
32+
v-if="!socketConnecting && activeInstance"
3233
block
3334
color="info"
3435
class="me-2 mb-2"
3536
@click="reconnect()"
3637
>
3738
{{ $t('app.general.btn.socket_reconnect') }}
3839
</app-btn>
40+
3941
<app-btn
4042
block
4143
color="warning"
@@ -66,6 +68,10 @@ export default class SocketDisconnected extends Mixins(StateMixin) {
6668
return this.$store.getters['config/getCurrentInstance']
6769
}
6870
71+
get apiUrl () {
72+
return this.$store.state.config.apiUrl
73+
}
74+
6975
async reconnect () {
7076
// Re-init the app.
7177
const config = await appInit(this.activeInstance, this.$store.state.config.hostConfig)

0 commit comments

Comments
 (0)