Skip to content

Commit f1b84a3

Browse files
JulienChampagnolJulienChampagnol
authored
Merge branch 'next' into fix_dependencies
2 parents 4e748a9 + fd9890e commit f1b84a3

Some content is hidden

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

56 files changed

+20232
-462
lines changed

‎.eslintrc.cjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module.exports = {
77
},
88
extends: [
99
"eslint:recommended",
10-
"plugin:vue/vue3-recommended",
10+
"plugin:vue/recommended",
1111
"plugin:vuetify/recommended",
1212
"plugin:nuxt/recommended",
1313
],

‎.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 i
14+
npm ci
1515
npm run test
1616
1717
build:

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ logs
2626
.pytest_cache
2727
__snapshots__
2828
coverage
29-
package-lock.json
29+
# package-lock.json

‎assets/geode_objects.js‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
import BRep from "@/assets/img/geode_objects/BRep.svg"
2-
import CrossSection from "@/assets/img/geode_objects/CrossSection.svg"
3-
import EdgedCurve2D from "@/assets/img/geode_objects/EdgedCurve2D.svg"
4-
import EdgedCurve3D from "@/assets/img/geode_objects/EdgedCurve3D.svg"
5-
import Graph from "@/assets/img/geode_objects/Graph.svg"
6-
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"
9-
import LightRegularGrid2D from "@/assets/img/geode_objects/LightRegularGrid2D.svg"
10-
import LightRegularGrid3D from "@/assets/img/geode_objects/LightRegularGrid3D.svg"
11-
import PointSet2D from "@/assets/img/geode_objects/PointSet2D.svg"
12-
import PointSet3D from "@/assets/img/geode_objects/PointSet3D.svg"
13-
import PolygonalSurface2D from "@/assets/img/geode_objects/PolygonalSurface2D.svg"
14-
import PolygonalSurface3D from "@/assets/img/geode_objects/PolygonalSurface3D.svg"
15-
import PolyhedralSolid3D from "@/assets/img/geode_objects/PolyhedralSolid3D.svg"
16-
import RasterImage2D from "@/assets/img/geode_objects/RasterImage2D.svg"
17-
import RasterImage3D from "@/assets/img/geode_objects/RasterImage3D.svg"
18-
import RegularGrid2D from "@/assets/img/geode_objects/RegularGrid2D.svg"
19-
import RegularGrid3D from "@/assets/img/geode_objects/RegularGrid3D.svg"
20-
import Section from "@/assets/img/geode_objects/Section.svg"
21-
import StructuralModel from "@/assets/img/geode_objects/StructuralModel.svg"
22-
import TetrahedralSolid3D from "@/assets/img/geode_objects/TetrahedralSolid3D.svg"
23-
import TriangulatedSurface2D from "@/assets/img/geode_objects/TriangulatedSurface2D.svg"
24-
import TriangulatedSurface3D from "@/assets/img/geode_objects/TriangulatedSurface3D.svg"
25-
import VertexSet from "@/assets/img/geode_objects/VertexSet.svg"
1+
import BRep from "@ogw_f/assets/img/geode_objects/BRep.svg"
2+
import CrossSection from "@ogw_f/assets/img/geode_objects/CrossSection.svg"
3+
import EdgedCurve2D from "@ogw_f/assets/img/geode_objects/EdgedCurve2D.svg"
4+
import EdgedCurve3D from "@ogw_f/assets/img/geode_objects/EdgedCurve3D.svg"
5+
import Graph from "@ogw_f/assets/img/geode_objects/Graph.svg"
6+
import HybridSolid3D from "@ogw_f/assets/img/geode_objects/HybridSolid3D.svg"
7+
import ImplicitCrossSection from "@ogw_f/assets/img/geode_objects/ImplicitCrossSection.svg"
8+
import ImplicitStructuralModel from "@ogw_f/assets/img/geode_objects/ImplicitStructuralModel.svg"
9+
import LightRegularGrid2D from "@ogw_f/assets/img/geode_objects/LightRegularGrid2D.svg"
10+
import LightRegularGrid3D from "@ogw_f/assets/img/geode_objects/LightRegularGrid3D.svg"
11+
import PointSet2D from "@ogw_f/assets/img/geode_objects/PointSet2D.svg"
12+
import PointSet3D from "@ogw_f/assets/img/geode_objects/PointSet3D.svg"
13+
import PolygonalSurface2D from "@ogw_f/assets/img/geode_objects/PolygonalSurface2D.svg"
14+
import PolygonalSurface3D from "@ogw_f/assets/img/geode_objects/PolygonalSurface3D.svg"
15+
import PolyhedralSolid3D from "@ogw_f/assets/img/geode_objects/PolyhedralSolid3D.svg"
16+
import RasterImage2D from "@ogw_f/assets/img/geode_objects/RasterImage2D.svg"
17+
import RasterImage3D from "@ogw_f/assets/img/geode_objects/RasterImage3D.svg"
18+
import RegularGrid2D from "@ogw_f/assets/img/geode_objects/RegularGrid2D.svg"
19+
import RegularGrid3D from "@ogw_f/assets/img/geode_objects/RegularGrid3D.svg"
20+
import Section from "@ogw_f/assets/img/geode_objects/Section.svg"
21+
import StructuralModel from "@ogw_f/assets/img/geode_objects/StructuralModel.svg"
22+
import TetrahedralSolid3D from "@ogw_f/assets/img/geode_objects/TetrahedralSolid3D.svg"
23+
import TriangulatedSurface2D from "@ogw_f/assets/img/geode_objects/TriangulatedSurface2D.svg"
24+
import TriangulatedSurface3D from "@ogw_f/assets/img/geode_objects/TriangulatedSurface3D.svg"
25+
import VertexSet from "@ogw_f/assets/img/geode_objects/VertexSet.svg"
2626

2727
const geode_objects = {
2828
BRep: {

‎components/CrsSelector.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</template>
2525

2626
<script setup>
27-
import schemas from "@geode/opengeodeweb-back/schemas.json"
27+
import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
2828
const schema = schemas.opengeodeweb_back.geographic_coordinate_systems
2929
3030
const emit = defineEmits([

‎components/ExtensionSelector.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
</template>
5656

5757
<script setup>
58-
import schemas from "@geode/opengeodeweb-back/schemas.json"
58+
import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
5959
const schema = schemas.opengeodeweb_back.geode_objects_and_output_extensions
6060
const emit = defineEmits([
6161
"update_values",

‎components/FeedBack/Snackers.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
variant="flat"
5252
size="20"
5353
:color="feedback.type"
54-
@click="feedback_store.delete_feedback(index)"
54+
@click="feedback_store.delete_feedback(feedback.id)"
5555
>
5656
<v-icon icon="mdi-close" size="20" color="white" />
5757
</v-btn>

‎components/FileSelector.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</template>
99

1010
<script setup>
11-
import schemas from "@geode/opengeodeweb-back/schemas.json"
11+
import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
1212
1313
const schema = schemas.opengeodeweb_back.allowed_files
1414
const emit = defineEmits([

‎components/FileUploader.vue‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</template>
3434

3535
<script setup>
36-
import schemas from "@geode/opengeodeweb-back/schemas.json"
36+
import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
3737
const schema = schemas.opengeodeweb_back.upload_file
3838
3939
const emit = defineEmits(["files_uploaded", "decrement_step"])
@@ -80,6 +80,7 @@
8080
await Promise.all(promise_array)
8181
files_uploaded.value = true
8282
emit("files_uploaded", internal_files.value)
83+
8384
toggle_loading()
8485
}
8586

‎components/Inspector/InspectionButton.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</template>
1616

1717
<script setup>
18-
import schemas from "@geode/opengeodeweb-back/schemas.json"
18+
import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
1919
const schema = schemas.opengeodeweb_back.inspect_file
2020
2121
const emit = defineEmits([

0 commit comments

Comments
 (0)