diff --git a/src/assets/icons/angle.svg b/src/assets/icons/angle.svg new file mode 100644 index 0000000..31cb922 --- /dev/null +++ b/src/assets/icons/angle.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/assets/images/icon/xyz.png b/src/assets/images/icon/xyz.png new file mode 100644 index 0000000..a09a06d Binary files /dev/null and b/src/assets/images/icon/xyz.png differ diff --git a/src/views/canvas/components/card.vue b/src/views/canvas/components/card.vue index 825b9eb..705c087 100644 --- a/src/views/canvas/components/card.vue +++ b/src/views/canvas/components/card.vue @@ -21,6 +21,13 @@ import { computed, ref, markRaw, onMounted } from 'vue' import ToRealStyle from './cards/to-real-style.vue' import SceneComposition from './cards/scene-composition.vue' + import ColorPalette from './cards/color-palette.vue' + import ToVideo from './cards/to-video.vue' + import To3DModel from './cards/to-3d-model.vue' + import AddPrint from './cards/add-print.vue' + import ToCAD from './cards/to-cad.vue' + + import EditMaterial from './cards/edit-material.vue' const components = [ { type: 'to-real-style', @@ -35,27 +42,32 @@ { type: 'color-palette', title: 'Color Palette', - component: SceneComposition + component: ColorPalette }, { type: 'to-video', title: 'To Video', - component: SceneComposition + component: ToVideo }, { type: 'to-3d-model', title: 'To 3D Model', - component: SceneComposition + component: To3DModel + }, + { + type: 'to-cad', + title: 'To CAD', + component: ToCAD }, { type: 'add-print', title: 'Add Print', - component: SceneComposition + component: AddPrint }, { type: 'edit-material', title: 'Edit Material', - component: SceneComposition + component: EditMaterial } ] const emit = defineEmits(['add', 'generate']) @@ -121,6 +133,20 @@ } > .body { padding: 1.6rem 1.3rem; + &:deep(> *) { + width: 100%; + > * { + margin-bottom: 1rem; + &:last-child { + margin-bottom: 0; + } + } + > .label { + font-size: 1.2rem; + font-family: Medium; + color: #000; + } + } } > .footer { margin-bottom: 1.6rem; diff --git a/src/views/canvas/components/cards/add-print.vue b/src/views/canvas/components/cards/add-print.vue new file mode 100644 index 0000000..c1907f9 --- /dev/null +++ b/src/views/canvas/components/cards/add-print.vue @@ -0,0 +1,116 @@ + + + + Print + + Settings + + + Angle + + + + Scale + + + + Gap X + + + + Gap Y + + + + Offset + + + + + + + Prompt + + + + + + + diff --git a/src/views/canvas/components/cards/color-palette.vue b/src/views/canvas/components/cards/color-palette.vue new file mode 100644 index 0000000..e4ee1ee --- /dev/null +++ b/src/views/canvas/components/cards/color-palette.vue @@ -0,0 +1,65 @@ + + + + Choose Color + + + + + + + + + + + + + diff --git a/src/views/canvas/components/cards/edit-material.vue b/src/views/canvas/components/cards/edit-material.vue new file mode 100644 index 0000000..e2ec238 --- /dev/null +++ b/src/views/canvas/components/cards/edit-material.vue @@ -0,0 +1,26 @@ + + + + Material + + Prompt + + + + + + + diff --git a/src/views/canvas/components/cards/scene-composition.vue b/src/views/canvas/components/cards/scene-composition.vue index 9f2ceaf..65ae059 100644 --- a/src/views/canvas/components/cards/scene-composition.vue +++ b/src/views/canvas/components/cards/scene-composition.vue @@ -1,22 +1,86 @@ - + + Prompt + + Choose Style + + + + {{ v.label }} + + + diff --git a/src/views/canvas/components/cards/to-3d-model.vue b/src/views/canvas/components/cards/to-3d-model.vue new file mode 100644 index 0000000..7cb286f --- /dev/null +++ b/src/views/canvas/components/cards/to-3d-model.vue @@ -0,0 +1,26 @@ + + + + Image + + Prompt + + + + + + + diff --git a/src/views/canvas/components/cards/to-cad.vue b/src/views/canvas/components/cards/to-cad.vue new file mode 100644 index 0000000..c84d459 --- /dev/null +++ b/src/views/canvas/components/cards/to-cad.vue @@ -0,0 +1,26 @@ + + + + 3D Model + + Prompt + + + + + + + diff --git a/src/views/canvas/components/cards/to-real-style.vue b/src/views/canvas/components/cards/to-real-style.vue index cbf9ae5..a6f4e2b 100644 --- a/src/views/canvas/components/cards/to-real-style.vue +++ b/src/views/canvas/components/cards/to-real-style.vue @@ -1,27 +1,51 @@ + Prompt + + + {{ v.label }} + + + Size - + + diff --git a/src/views/canvas/components/tools/my-input.vue b/src/views/canvas/components/tools/my-input.vue new file mode 100644 index 0000000..a413a07 --- /dev/null +++ b/src/views/canvas/components/tools/my-input.vue @@ -0,0 +1,79 @@ + + + + + + + {{ before }} + + {{ after }} + + + + + diff --git a/src/views/canvas/components/my-textarea.vue b/src/views/canvas/components/tools/my-textarea.vue similarity index 100% rename from src/views/canvas/components/my-textarea.vue rename to src/views/canvas/components/tools/my-textarea.vue diff --git a/src/views/canvas/components/tools/offset-tool.vue b/src/views/canvas/components/tools/offset-tool.vue new file mode 100644 index 0000000..9d9c237 --- /dev/null +++ b/src/views/canvas/components/tools/offset-tool.vue @@ -0,0 +1,217 @@ + + + + + + + + + + X: {{ left }}% + Y: {{ top }}% + + + + + + + + + + diff --git a/src/views/canvas/components/pixel-ratio-selection.vue b/src/views/canvas/components/tools/pixel-ratio-selection.vue similarity index 100% rename from src/views/canvas/components/pixel-ratio-selection.vue rename to src/views/canvas/components/tools/pixel-ratio-selection.vue diff --git a/src/views/canvas/components/tools/slider.vue b/src/views/canvas/components/tools/slider.vue new file mode 100644 index 0000000..46cd80a --- /dev/null +++ b/src/views/canvas/components/tools/slider.vue @@ -0,0 +1,172 @@ + + + + {{ props.tipFormatter(value) }} + + + + + + + + + + + diff --git a/src/views/canvas/components/tools/upload-file.vue b/src/views/canvas/components/tools/upload-file.vue new file mode 100644 index 0000000..eb5c28b --- /dev/null +++ b/src/views/canvas/components/tools/upload-file.vue @@ -0,0 +1,97 @@ + + + + + + + + + + + {{ tip }} + Select File + + + + + + + diff --git a/src/views/canvas/components/upload-file.vue b/src/views/canvas/components/upload-file.vue deleted file mode 100644 index cb5fe6f..0000000 --- a/src/views/canvas/components/upload-file.vue +++ /dev/null @@ -1,59 +0,0 @@ - - - - Upload your files - Select File - - - - - - diff --git a/src/views/canvas/index.vue b/src/views/canvas/index.vue index 2b83bc1..ed8ba68 100644 --- a/src/views/canvas/index.vue +++ b/src/views/canvas/index.vue @@ -5,6 +5,7 @@ + @@ -25,10 +26,12 @@
Print
Settings
Angle
Prompt
Choose Color
Material
Choose Style
Image
3D Model
Size
{{ tip }}