Skip to content

Commit 5aa840e

Browse files
pedrolamaspedrolamas
committed
Merge branch 'develop'
Signed-off-by: Pedro Lamas <[email protected]>
2 parents 9ae0124 + 0020b74 commit 5aa840e

Some content is hidden

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

62 files changed

+566
-412
lines changed

‎.versionrc.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"types": [
3+
{
4+
"type": "feat",
5+
"section": "Features"
6+
},
7+
{
8+
"type": "fix",
9+
"section": "Bug Fixes"
10+
},
11+
{
12+
"type": "chore",
13+
"hidden": true
14+
},
15+
{
16+
"type": "docs",
17+
"hidden": true
18+
},
19+
{
20+
"type": "style",
21+
"hidden": true
22+
},
23+
{
24+
"type": "refactor",
25+
"section": "Code Refactorings"
26+
},
27+
{
28+
"type": "perf",
29+
"hidden": true
30+
},
31+
{
32+
"type": "test",
33+
"hidden": true
34+
}
35+
]
36+
}

‎package-lock.json‎

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

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"hls.js": "^1.5.20",
4545
"jwt-decode": "^4.0.0",
4646
"lodash-es": "^4.17.21",
47-
"marked": "^15.0.6",
47+
"marked": "^15.0.7",
4848
"marked-base-url": "^1.1.6",
4949
"md5": "^2.3.0",
5050
"monaco-editor": "^0.52.2",
@@ -84,23 +84,23 @@
8484
"@types/semver": "^7.5.8",
8585
"@types/sortablejs": "^1.15.8",
8686
"@vitejs/plugin-vue2": "^2.3.3",
87-
"@vue/eslint-config-typescript": "^14.3.0",
87+
"@vue/eslint-config-typescript": "^14.4.0",
8888
"@vue/test-utils": "^1.3.6",
8989
"@vue/tsconfig": "~0.1.3",
90-
"eslint": "^9.19.0",
90+
"eslint": "^9.20.1",
9191
"eslint-plugin-regexp": "^2.7.0",
9292
"eslint-plugin-vue": "^9.32.0",
9393
"husky": "^9.1.7",
9494
"jsdom": "^26.0.0",
9595
"mockdate": "^3.0.5",
9696
"monaco-vscode-textmate-theme-converter": "^0.1.7",
9797
"neostandard": "^0.12.1",
98-
"rollup": "^4.34.4",
98+
"rollup": "^4.34.6",
9999
"sass": "~1.32.13",
100100
"skott": "^0.35.4",
101101
"standard-version": "^9.5.0",
102102
"typescript": "^5.7.3",
103-
"typescript-eslint": "^8.23.0",
103+
"typescript-eslint": "^8.24.0",
104104
"unplugin-vue-components": "^28.0.0",
105105
"vite": "^6.1.0",
106106
"vite-plugin-checker": "^0.8.0",

‎src/api/socketActions.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -808,5 +808,18 @@ export const SocketActions = {
808808
dispatch: 'spoolman/onAvailableSpools'
809809
}
810810
)
811+
},
812+
813+
async serverSpoolmanProxyGetSettingCurrency () {
814+
baseEmit(
815+
'server.spoolman.proxy', {
816+
params: {
817+
request_method: 'GET',
818+
path: '/v1/setting/currency',
819+
use_v2_response: true
820+
},
821+
dispatch: 'spoolman/onSettingCurrency'
822+
}
823+
)
811824
}
812825
}

‎src/components/settings/macros/MacroCategorySettings.vue‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
dense
2424
single-line
2525
hide-details
26+
spellcheck="false"
2627
append-icon="$magnify"
28+
@focus="$event.target.select()"
2729
/>
2830
</v-subheader>
2931
<v-card

‎src/components/ui/AppDraggable.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<div>
2+
<div class="app-draggable">
33
<slot />
44
</div>
55
</template>

‎src/components/widgets/camera/CameraItem.vue‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,16 @@
8484
v-if="!fullscreen && (fullscreenMode === 'embed' || !rawCameraUrl) && camera.service !== 'device'"
8585
class="camera-fullscreen"
8686
>
87-
<a :href="`/#/camera/${encodeURIComponent(camera.uid)}`">
87+
<router-link
88+
:to="{
89+
name: 'camera',
90+
params: {
91+
cameraId: camera.uid
92+
}
93+
}"
94+
>
8895
<v-icon>$fullScreen</v-icon>
89-
</a>
96+
</router-link>
9097
</div>
9198
<div
9299
v-else-if="rawCameraUrl"

‎src/components/widgets/console/Console.vue‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,6 @@ export default class Console extends Mixins(StateMixin) {
188188
</script>
189189

190190
<style lang="scss" scoped>
191-
.console {
192-
position: relative;
193-
display: block;
194-
}
195-
196191
.console-item {
197192
white-space: pre-wrap;
198193
}
@@ -208,8 +203,8 @@ export default class Console extends Mixins(StateMixin) {
208203
height: 300px;
209204
}
210205
.console-scroller-fullscreen {
211-
height: calc(100vh - 240px);
212-
height: calc(100svh - 240px);
206+
height: calc(100vh - 260px);
207+
height: calc(100svh - 260px);
213208
}
214209
215210
.v-input {

‎src/components/widgets/console/ConsoleCommand.vue‎

Lines changed: 34 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,38 @@
11
<template>
2-
<v-container>
3-
<v-row align="center">
4-
<v-col>
5-
<v-textarea
6-
ref="input"
7-
:rows="1"
8-
:value="newValue"
9-
:items="history"
10-
:disabled="disabled"
11-
:autofocus="autofocus"
12-
auto-grow
13-
clearable
14-
outlined
15-
single-line
16-
dense
17-
hide-details
18-
spellcheck="false"
19-
class="console-command"
20-
@input="emitChange"
21-
@keyup.enter.exact="emitSend(newValue)"
22-
@keydown.enter.exact.prevent
23-
@keydown.up.exact.prevent="historyUp()"
24-
@keydown.down.exact.prevent="historyDown()"
25-
@keydown.prevent.tab="autoComplete()"
26-
/>
27-
</v-col>
28-
<v-col cols="auto">
29-
<app-btn
30-
:disabled="disabled"
31-
@click="emitSend(newValue)"
32-
>
33-
{{ $t('app.general.btn.send') }}
34-
</app-btn>
35-
</v-col>
36-
</v-row>
37-
</v-container>
38-
<!-- <pre>{{ originalHistory }}</pre>
39-
<pre>{{ history }}</pre> -->
2+
<v-row class="ma-2">
3+
<v-col>
4+
<v-textarea
5+
ref="input"
6+
:rows="1"
7+
:value="newValue"
8+
:items="history"
9+
:disabled="disabled"
10+
:autofocus="autofocus"
11+
auto-grow
12+
clearable
13+
outlined
14+
single-line
15+
dense
16+
hide-details
17+
spellcheck="false"
18+
class="console-command"
19+
@input="emitChange"
20+
@keyup.enter.exact="emitSend(newValue)"
21+
@keydown.enter.exact.prevent
22+
@keydown.up.exact.prevent="historyUp()"
23+
@keydown.down.exact.prevent="historyDown()"
24+
@keydown.prevent.tab="autoComplete()"
25+
/>
26+
</v-col>
27+
<v-col cols="auto">
28+
<app-btn
29+
:disabled="disabled"
30+
@click="emitSend(newValue)"
31+
>
32+
{{ $t('app.general.btn.send') }}
33+
</app-btn>
34+
</v-col>
35+
</v-row>
4036
</template>
4137

4238
<script lang="ts">

‎src/components/widgets/filesystem/FileSystem.vue‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<template>
22
<v-card
33
class="filesystem-wrapper"
4-
:height="height"
5-
:max-height="maxHeight"
64
:class="{ 'no-pointer-events': dragState.overlay }"
75
flat
86
@dragover="handleDragOver"
@@ -191,14 +189,6 @@ export default class FileSystem extends Mixins(StateMixin, FilesMixin, ServicesM
191189
@Prop({ type: Boolean })
192190
readonly dense?: boolean
193191
194-
// Constrain height
195-
@Prop({ type: [Number, String] })
196-
readonly height!: number | string
197-
198-
// Constrain height
199-
@Prop({ type: [Number, String] })
200-
readonly maxHeight!: number | string
201-
202192
// Allow bulk-actions
203193
@Prop({ type: Boolean })
204194
readonly bulkActions?: boolean

0 commit comments

Comments
 (0)