Skip to content

Commit d3565a9

Browse files
Merge branch 'next' of https://github.com/Geode-solutions/OpenGeodeWeb-Front into fix/object_selector_card_size
2 parents 3092d2e + 11fa5e3 commit d3565a9

File tree

11 files changed

+328
-61
lines changed

11 files changed

+328
-61
lines changed

assets/geode_objects.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ import EdgedCurve2D from "@/assets/img/geode_objects/EdgedCurve2D.svg"
44
import EdgedCurve3D from "@/assets/img/geode_objects/EdgedCurve3D.svg"
55
import Graph from "@/assets/img/geode_objects/Graph.svg"
66
import HybridSolid3D from "@/assets/img/geode_objects/HybridSolid3D.svg"
7+
import ImplicitCrossSection from "@/assets/img/geode_objects/ImplicitCrossSection.svg"
8+
import ImplicitStructuralModel from "@/assets/img/geode_objects/ImplicitStructuralModel.svg"
79
import LightRegularGrid2D from "@/assets/img/geode_objects/LightRegularGrid2D.svg"
810
import LightRegularGrid3D from "@/assets/img/geode_objects/LightRegularGrid3D.svg"
911
import PointSet2D from "@/assets/img/geode_objects/PointSet2D.svg"
@@ -47,6 +49,14 @@ const geode_objects = {
4749
tooltip: "HybridSolid3D",
4850
image: HybridSolid3D,
4951
},
52+
ImplicitCrossSection: {
53+
tooltip: "ImplicitCrossSection",
54+
image: ImplicitCrossSection,
55+
},
56+
ImplicitStructuralModel: {
57+
tooltip: "ImplicitStructuralModel",
58+
image: ImplicitStructuralModel,
59+
},
5060
LightRegularGrid2D: {
5161
tooltip: "LightRegularGrid2D",
5262
image: LightRegularGrid2D,
Lines changed: 109 additions & 0 deletions
Loading
Lines changed: 128 additions & 0 deletions
Loading

components/FileUploader.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@
4444
4545
const { multiple, accept } = toRefs(props)
4646
47-
const label = multiple ? "Please select file(s)" : "Please select a file"
47+
const label = multiple
48+
? "Please select file(s) to import"
49+
: "Please select a file to import"
4850
const files = ref([])
4951
const loading = ref(false)
5052
const files_uploaded = ref(false)

components/RemoteRenderingView.vue

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,18 @@
22
<ClientOnly>
33
<div style="position: relative; width: 100%; height: 100%">
44
<view-toolbar />
5+
<div
6+
style="
7+
position: absolute;
8+
z-index: 2;
9+
left: 0;
10+
top: 0;
11+
background-color: transparent;
12+
border-radius: 16px;
13+
"
14+
>
15+
<slot name="tree-object"></slot>
16+
</div>
517
<v-col
618
ref="viewer"
719
style="
@@ -103,3 +115,14 @@
103115
view.render()
104116
}
105117
</script>
118+
119+
<style scoped>
120+
.list {
121+
position: absolute;
122+
z-index: 2;
123+
left: 0;
124+
top: 0;
125+
background-color: transparent;
126+
border-radius: 16px;
127+
}
128+
</style>

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
"geode_objects": "node scripts/generate_geode_objects.js && prettier ./assets/geode_objects.js --write"
88
},
99
"devDependencies": {
10-
"@nuxt/test-utils": "^3.14.1",
11-
"@pinia/testing": "^0.1.5",
12-
"@vitejs/plugin-vue": "^5.1.3",
10+
"@nuxt/test-utils": "^3.14.3",
11+
"@pinia/testing": "^0.1.6",
12+
"@vitejs/plugin-vue": "^5.1.4",
1313
"@vitest/coverage-v8": "^1.6.0",
1414
"@vue/test-utils": "^2.4.6",
1515
"eslint": "^8.57.0",
@@ -21,15 +21,15 @@
2121
"eslint-plugin-vuetify": "^2.4.0",
2222
"happy-dom": "^14.12.0",
2323
"jsdom": "^24.1.0",
24-
"nuxt": "^3.12.1",
24+
"nuxt": "^3.13.2",
2525
"playwright-core": "^1.44.1",
2626
"prettier": "3.3.2",
2727
"resize-observer-polyfill": "^1.5.1",
2828
"vite": "^5.2.13",
2929
"vite-plugin-vuetify": "^2.0.3",
3030
"vitest": "^1.6.0",
3131
"vitest-environment-nuxt": "^1.0.0",
32-
"vuetify": "^3.6.9",
32+
"vuetify": "^3.7.2",
3333
"wslink": "1.12.4"
3434
},
3535
"overrides": {
@@ -40,7 +40,7 @@
4040
"version": "0.0.0-semantically-released",
4141
"main": "./nuxt.config.js",
4242
"dependencies": {
43-
"@geode/opengeodeweb-back": "5.1.0",
43+
"@geode/opengeodeweb-back": "5.3.0",
4444
"@geode/opengeodeweb-viewer": "0.2.0",
4545
"@kitware/vtk.js": "30.3.1",
4646
"@mdi/font": "^7.4.47",

0 commit comments

Comments
 (0)