Skip to content

Commit 223adb8

Browse files
Merge pull request #102 from Geode-solutions/next
Next
2 parents 8608a5b + 58d758f commit 223adb8

File tree

8 files changed

+16466
-56
lines changed

8 files changed

+16466
-56
lines changed

.github/workflows/CICD.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
uses: actions/checkout@v4
1212
- name: Unit tests
1313
run: |
14-
npm install
14+
npm i
1515
npm run test
1616
1717
build:

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
.nitro
55
.cache
66
dist
7-
package-lock.json
87

98
# Node dependencies
109
node_modules

components/Errors/Banner.vue

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
>
88
<v-row>
99
<v-col cols="auto" class="text-white text-center">
10-
<v-tooltip location="end">
11-
<span>
12-
We turn off our server automatically after 5 minutes of inactivity
13-
</span>
14-
<template #activator="{ props }">
15-
<v-icon v-bind="props" color="white" class="justify-right">
16-
mdi-information-outline
17-
</v-icon>
18-
</template>
19-
</v-tooltip>
10+
<v-icon
11+
v-bind="props"
12+
color="white"
13+
class="justify-right"
14+
v-tooltip:bottom="
15+
'We turn off our server automatically after 5 minutes of inactivity'
16+
"
17+
>
18+
mdi-information-outline
19+
</v-icon>
2020
</v-col>
2121
<v-col cols="auto" class="text-white font-weight-bold">
2222
Server timed out due to inactivity, please reload this page or click

components/ExtensionSelector.vue

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,12 @@
99
class="justify-left"
1010
>
1111
<v-card class="card ma-2 pa-2" width="100%">
12-
<v-tooltip
13-
:text="`Export as a ${output_geode_object}`"
14-
location="bottom"
12+
<v-card-title
13+
v-tooltip:bottom="`Export as a ${output_geode_object}`"
14+
v-bind="props"
1515
>
16-
<template v-slot:activator="{ props }">
17-
<v-card-title v-bind="props">
18-
{{ output_geode_object }}
19-
</v-card-title>
20-
</template>
21-
</v-tooltip>
16+
{{ output_geode_object }}
17+
</v-card-title>
2218
<v-card-text>
2319
<v-row>
2420
<v-col
@@ -111,10 +107,8 @@
111107
final_object[key] = {}
112108
for (const value of values) {
113109
for (const extension of Object.keys(value[key])) {
114-
if (value[key][extension].is_saveable == false) {
115-
final_object[key][extension] = { is_saveable: false }
116-
} else {
117-
final_object[key][extension] = { is_saveable: true }
110+
final_object[key][extension] = {
111+
is_saveable: value[key][extension].is_saveable,
118112
}
119113
}
120114
}

components/ViewToolbar.vue

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
<template>
22
<v-row dense :class="[$style.floatToolbar, 'flex-column']">
33
<v-col>
4-
<v-tooltip location="left">
5-
Reset camera
6-
<template #activator="{ props }">
7-
<v-btn
8-
density="comfortable"
9-
v-bind="props"
10-
icon
11-
@click.stop="reset_camera"
12-
>
13-
<v-icon size="32"> mdi-cube-scan </v-icon>
14-
</v-btn>
15-
</template>
16-
</v-tooltip>
4+
<v-btn
5+
density="comfortable"
6+
v-bind="props"
7+
icon
8+
@click.stop="reset_camera"
9+
v-tooltip:left="'Reset camera'"
10+
>
11+
<v-icon icon="mdi-cube-scan" size="32" />
12+
</v-btn>
1713
</v-col>
1814
</v-row>
1915
</template>

0 commit comments

Comments
 (0)