Skip to content

Commit d2604c6

Browse files
JulienChampagnolJulienChampagnol
authored
Merge pull request #40 from Geode-solutions/feat_prettier
feat(prettier): install & run
2 parents e196a59 + b79b3b6 commit d2604c6

32 files changed

+899
-702
lines changed

‎.github/workflows/Branch-protection.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ jobs:
77
check-branch-protection:
88
uses: Geode-solutions/actions/.github/workflows/branch-protection.yml@master
99
with:
10-
branch_from: 'next'
11-
branch_to: 'master'
10+
branch_from: "next"
11+
branch_to: "master"

‎.github/workflows/CD.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Publish Package to npmjs
22
on:
33
push:
4-
branches: [ next, master ]
4+
branches: [next, master]
55

66
jobs:
77
build:
@@ -13,4 +13,4 @@ jobs:
1313
id: semantic
1414
env:
1515
GITHUB_TOKEN: ${{ github.token }}
16-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
16+
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

‎.github/workflows/prepare_pr.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Prepare PR
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- next
7+
8+
jobs:
9+
prepare:
10+
uses: Geode-solutions/actions/.github/workflows/web-prepare-pr.yml@master
11+
secrets: inherit

‎.prettierrc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"semi": false,
3+
"vueIndentScriptAndStyle": true
4+
}

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# OpenGeodeWeb-Front
2+
23
OpenSource Vue/Vuetify framework for web applications

‎assets/geode_objects.js‎

Lines changed: 105 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,110 +1,110 @@
1-
import brep from '@/assets/img/geode_objects/BRep.svg'
2-
import cross_section from '@/assets/img/geode_objects/cross_section.svg'
3-
import edged_curve2d from '@/assets/img/geode_objects/edged_curve2d.svg'
4-
import edged_curve3d from '@/assets/img/geode_objects/edged_curve3d.svg'
5-
import edged_curve from '@/assets/img/geode_objects/edged_curve.svg'
6-
import hybrid_solid from '@/assets/img/geode_objects/hybrid_solid.svg'
7-
import point_set2d from '@/assets/img/geode_objects/point_set2d.svg'
8-
import point_set3d from '@/assets/img/geode_objects/point_set3d.svg'
9-
import polygonal_surface2d from '@/assets/img/geode_objects/polygonal_surface2d.svg'
10-
import polygonal_surface3d from '@/assets/img/geode_objects/polygonal_surface3d.svg'
11-
import polyhedral_solid from '@/assets/img/geode_objects/polyhedral_solid.svg'
12-
import raster_image2d from '@/assets/img/geode_objects/raster_image2d.svg'
13-
import raster_image3d from '@/assets/img/geode_objects/raster_image3d.svg'
14-
import regular_grid2d from '@/assets/img/geode_objects/regular_grid2d.svg'
15-
import regular_grid3d from '@/assets/img/geode_objects/regular_grid3d.svg'
16-
import section from '@/assets/img/geode_objects/section.svg'
17-
import structural_model from '@/assets/img/geode_objects/structural_model.svg'
18-
import tetrahedral_solid from '@/assets/img/geode_objects/tetrahedral_solid.svg'
19-
import triangulated_surface2d from '@/assets/img/geode_objects/triangulated_surface2d.svg'
20-
import triangulated_surface3d from '@/assets/img/geode_objects/triangulated_surface3d.svg'
21-
import vertex_set from '@/assets/img/geode_objects/vertex_set.svg'
1+
import brep from "@/assets/img/geode_objects/BRep.svg"
2+
import cross_section from "@/assets/img/geode_objects/cross_section.svg"
3+
import edged_curve2d from "@/assets/img/geode_objects/edged_curve2d.svg"
4+
import edged_curve3d from "@/assets/img/geode_objects/edged_curve3d.svg"
5+
import edged_curve from "@/assets/img/geode_objects/edged_curve.svg"
6+
import hybrid_solid from "@/assets/img/geode_objects/hybrid_solid.svg"
7+
import point_set2d from "@/assets/img/geode_objects/point_set2d.svg"
8+
import point_set3d from "@/assets/img/geode_objects/point_set3d.svg"
9+
import polygonal_surface2d from "@/assets/img/geode_objects/polygonal_surface2d.svg"
10+
import polygonal_surface3d from "@/assets/img/geode_objects/polygonal_surface3d.svg"
11+
import polyhedral_solid from "@/assets/img/geode_objects/polyhedral_solid.svg"
12+
import raster_image2d from "@/assets/img/geode_objects/raster_image2d.svg"
13+
import raster_image3d from "@/assets/img/geode_objects/raster_image3d.svg"
14+
import regular_grid2d from "@/assets/img/geode_objects/regular_grid2d.svg"
15+
import regular_grid3d from "@/assets/img/geode_objects/regular_grid3d.svg"
16+
import section from "@/assets/img/geode_objects/section.svg"
17+
import structural_model from "@/assets/img/geode_objects/structural_model.svg"
18+
import tetrahedral_solid from "@/assets/img/geode_objects/tetrahedral_solid.svg"
19+
import triangulated_surface2d from "@/assets/img/geode_objects/triangulated_surface2d.svg"
20+
import triangulated_surface3d from "@/assets/img/geode_objects/triangulated_surface3d.svg"
21+
import vertex_set from "@/assets/img/geode_objects/vertex_set.svg"
2222

2323
const geode_objects = {
24-
BRep: {
25-
tooltip: 'BRep',
26-
image: brep,
27-
},
28-
CrossSection: {
29-
tooltip: 'CrossSection',
30-
image: cross_section,
31-
},
32-
EdgedCurve2D: {
33-
tooltip: 'EdgedCurve2D',
34-
image: edged_curve2d,
35-
},
36-
EdgedCurve3D: {
37-
tooltip: 'EdgedCurve3D',
38-
image: edged_curve3d,
39-
},
40-
Graph: {
41-
tooltip: 'Graph',
42-
image: edged_curve,
43-
},
44-
HybridSolid3D: {
45-
tooltip: "HybridSolid3D",
46-
image: hybrid_solid,
47-
},
48-
PointSet2D: {
49-
tooltip: 'PointSet2D',
50-
image: point_set2d,
51-
},
52-
PointSet3D: {
53-
tooltip: 'PointSet3D',
54-
image: point_set3d,
55-
},
56-
PolygonalSurface2D: {
57-
tooltip: 'PolygonalSurface2D',
58-
image: polygonal_surface2d,
59-
},
60-
PolygonalSurface3D: {
61-
tooltip: 'PolygonalSurface3D',
62-
image: polygonal_surface3d,
63-
},
64-
PolyhedralSolid3D: {
65-
tooltip: 'PolyhedralSolid3D',
66-
image: polyhedral_solid,
67-
},
68-
RasterImage2D: {
69-
tooltip: 'RasterImage2D',
70-
image: raster_image2d,
71-
},
72-
RasterImage3D: {
73-
tooltip: 'RasterImage3D',
74-
image: raster_image3d,
75-
},
76-
RegularGrid2D: {
77-
tooltip: 'RegularGrid2D',
78-
image: regular_grid2d,
79-
},
80-
RegularGrid3D: {
81-
tooltip: 'RegularGrid3D',
82-
image: regular_grid3d,
83-
},
84-
Section: {
85-
tooltip: 'Section',
86-
image: section,
87-
},
88-
StructuralModel: {
89-
tooltip: 'StructuralModel',
90-
image: structural_model,
91-
},
92-
TetrahedralSolid3D: {
93-
tooltip: 'TetrahedralSolid3D',
94-
image: tetrahedral_solid,
95-
},
96-
TriangulatedSurface2D: {
97-
tooltip: 'TriangulatedSurface2D',
98-
image: triangulated_surface2d,
99-
},
100-
TriangulatedSurface3D: {
101-
tooltip: 'TriangulatedSurface3D',
102-
image: triangulated_surface3d,
103-
},
104-
VertexSet: {
105-
tooltip: 'VertexSet',
106-
image: vertex_set,
107-
}
24+
BRep: {
25+
tooltip: "BRep",
26+
image: brep,
27+
},
28+
CrossSection: {
29+
tooltip: "CrossSection",
30+
image: cross_section,
31+
},
32+
EdgedCurve2D: {
33+
tooltip: "EdgedCurve2D",
34+
image: edged_curve2d,
35+
},
36+
EdgedCurve3D: {
37+
tooltip: "EdgedCurve3D",
38+
image: edged_curve3d,
39+
},
40+
Graph: {
41+
tooltip: "Graph",
42+
image: edged_curve,
43+
},
44+
HybridSolid3D: {
45+
tooltip: "HybridSolid3D",
46+
image: hybrid_solid,
47+
},
48+
PointSet2D: {
49+
tooltip: "PointSet2D",
50+
image: point_set2d,
51+
},
52+
PointSet3D: {
53+
tooltip: "PointSet3D",
54+
image: point_set3d,
55+
},
56+
PolygonalSurface2D: {
57+
tooltip: "PolygonalSurface2D",
58+
image: polygonal_surface2d,
59+
},
60+
PolygonalSurface3D: {
61+
tooltip: "PolygonalSurface3D",
62+
image: polygonal_surface3d,
63+
},
64+
PolyhedralSolid3D: {
65+
tooltip: "PolyhedralSolid3D",
66+
image: polyhedral_solid,
67+
},
68+
RasterImage2D: {
69+
tooltip: "RasterImage2D",
70+
image: raster_image2d,
71+
},
72+
RasterImage3D: {
73+
tooltip: "RasterImage3D",
74+
image: raster_image3d,
75+
},
76+
RegularGrid2D: {
77+
tooltip: "RegularGrid2D",
78+
image: regular_grid2d,
79+
},
80+
RegularGrid3D: {
81+
tooltip: "RegularGrid3D",
82+
image: regular_grid3d,
83+
},
84+
Section: {
85+
tooltip: "Section",
86+
image: section,
87+
},
88+
StructuralModel: {
89+
tooltip: "StructuralModel",
90+
image: structural_model,
91+
},
92+
TetrahedralSolid3D: {
93+
tooltip: "TetrahedralSolid3D",
94+
image: tetrahedral_solid,
95+
},
96+
TriangulatedSurface2D: {
97+
tooltip: "TriangulatedSurface2D",
98+
image: triangulated_surface2d,
99+
},
100+
TriangulatedSurface3D: {
101+
tooltip: "TriangulatedSurface3D",
102+
image: triangulated_surface3d,
103+
},
104+
VertexSet: {
105+
tooltip: "VertexSet",
106+
image: vertex_set,
107+
},
108108
}
109109

110110
export default geode_objects

0 commit comments

Comments
 (0)