From c47f058f3b8c9b4b77ad1ad241b3d01546a0b689 Mon Sep 17 00:00:00 2001
From: Egor Aristov <ef@efprojects.com>
Date: Tue, 6 May 2025 20:27:39 +0300
Subject: [PATCH] small refactoring

---
 frontend/wizard-vue/src/common/enum.ts        |  5 +++
 .../src/components/EditUrlModal.vue           |  2 +-
 frontend/wizard-vue/src/components/Field.vue  | 45 -------------------
 .../wizard-vue/src/components/SpecsForm.vue   |  4 +-
 .../components/{ => inputs}/RadioButtons.vue  |  3 +-
 .../src/components/{ => inputs}/TextField.vue |  0
 frontend/wizard-vue/src/urlmaker/specs.ts     |  7 +--
 7 files changed, 11 insertions(+), 55 deletions(-)
 create mode 100644 frontend/wizard-vue/src/common/enum.ts
 delete mode 100644 frontend/wizard-vue/src/components/Field.vue
 rename frontend/wizard-vue/src/components/{ => inputs}/RadioButtons.vue (95%)
 rename frontend/wizard-vue/src/components/{ => inputs}/TextField.vue (100%)

diff --git a/frontend/wizard-vue/src/common/enum.ts b/frontend/wizard-vue/src/common/enum.ts
new file mode 100644
index 0000000..9aed736
--- /dev/null
+++ b/frontend/wizard-vue/src/common/enum.ts
@@ -0,0 +1,5 @@
+export type EnumValue = {
+  label: string
+  value: number
+}
+export type Enum = EnumValue[]
diff --git a/frontend/wizard-vue/src/components/EditUrlModal.vue b/frontend/wizard-vue/src/components/EditUrlModal.vue
index 0039bde..727300a 100644
--- a/frontend/wizard-vue/src/components/EditUrlModal.vue
+++ b/frontend/wizard-vue/src/components/EditUrlModal.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 
-import TextField from "@/components/TextField.vue";
+import TextField from "@/components/inputs/TextField.vue";
 import Btn from "@/components/Btn.vue";
 import {onMounted, onUnmounted, ref, watch} from "vue";
 import Modal from "@/components/Modal.vue";
diff --git a/frontend/wizard-vue/src/components/Field.vue b/frontend/wizard-vue/src/components/Field.vue
deleted file mode 100644
index 202e944..0000000
--- a/frontend/wizard-vue/src/components/Field.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<script setup lang="ts">
-import type {Field} from "@/urlmaker/specs.ts";
-import {getCurrentInstance, onMounted, useTemplateRef} from "vue";
-
-const {field, focused} = defineProps<{
-  field: Field,
-  focused?: boolean,
-}>();
-const id = 'field' + getCurrentInstance()?.uid;
-const model = defineModel();
-
-const inputRef = useTemplateRef('field');
-onMounted(() => {
-  if(focused) inputRef.value?.focus();
-})
-
-</script>
-
-<template>
-  <div class="field">
-    <div class="label"><label :for="id">{{ field.label }}</label></div>
-    <div class="input">
-      <input :type="field.input_type" :name="field.name" :id="id" v-model="model" ref="field"/>
-    </div>
-  </div>
-</template>
-
-<style scoped lang="scss">
-div.field {
-  margin: 0 0 8px 0;
-}
-div.label {
-  font-size: 0.9em;
-}
-div.input {
-  margin: 2px 0 0 0;
-  box-sizing: border-box;
-
-  input {
-    box-sizing: border-box;
-    width: 100%;
-    padding: 2px;
-  }
-}
-</style>
diff --git a/frontend/wizard-vue/src/components/SpecsForm.vue b/frontend/wizard-vue/src/components/SpecsForm.vue
index e6bc0b7..564a7a3 100644
--- a/frontend/wizard-vue/src/components/SpecsForm.vue
+++ b/frontend/wizard-vue/src/components/SpecsForm.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import {fields, InputType, type SpecField} from '@/urlmaker/specs.ts';
-import TextField from "@/components/TextField.vue";
-import RadioButtons from "@/components/RadioButtons.vue";
+import TextField from "@/components/inputs/TextField.vue";
+import RadioButtons from "@/components/inputs/RadioButtons.vue";
 import {useWizardStore} from "@/stores/wizard.ts";
 
 const store = useWizardStore();
diff --git a/frontend/wizard-vue/src/components/RadioButtons.vue b/frontend/wizard-vue/src/components/inputs/RadioButtons.vue
similarity index 95%
rename from frontend/wizard-vue/src/components/RadioButtons.vue
rename to frontend/wizard-vue/src/components/inputs/RadioButtons.vue
index 2a59e47..138f747 100644
--- a/frontend/wizard-vue/src/components/RadioButtons.vue
+++ b/frontend/wizard-vue/src/components/inputs/RadioButtons.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import {getCurrentInstance} from "vue";
-import type {Enum} from "@/urlmaker/specs.ts";
+
+import type {Enum} from "@/common/enum.ts";
 
 const {name, label, values} = defineProps<{
   name: string
diff --git a/frontend/wizard-vue/src/components/TextField.vue b/frontend/wizard-vue/src/components/inputs/TextField.vue
similarity index 100%
rename from frontend/wizard-vue/src/components/TextField.vue
rename to frontend/wizard-vue/src/components/inputs/TextField.vue
diff --git a/frontend/wizard-vue/src/urlmaker/specs.ts b/frontend/wizard-vue/src/urlmaker/specs.ts
index 17f3a2b..10da8c1 100644
--- a/frontend/wizard-vue/src/urlmaker/specs.ts
+++ b/frontend/wizard-vue/src/urlmaker/specs.ts
@@ -6,6 +6,7 @@ import {
   type validator
 } from "@/urlmaker/validators.ts";
 import {rssalchemy} from "@/urlmaker/proto/specs.ts";
+import type {Enum} from "@/common/enum.ts";
 
 export type SpecKey = ReturnType<rssalchemy.Specs['toObject']>;
 export type SpecValue = string | number;
@@ -17,12 +18,6 @@ export enum InputType {
   Radio = 'radio'
 }
 
-export type EnumValue = {
-  label: string
-  value: number
-}
-export type Enum = EnumValue[]
-
 export interface SpecField {
   name: keyof Specs
   input_type: InputType