From c47e46263cf5a1a69b809ec480a60a3ddb43e8e3 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sun, 21 Apr 2024 16:06:28 +0200
Subject: [PATCH] mostly composition now

---
 .../components/inputs/NumberScalerDialog.vue  | 99 +++++++++----------
 .../components/inputs/RecipeContextMenu.vue   | 22 ++---
 2 files changed, 56 insertions(+), 65 deletions(-)

diff --git a/vue3/src/components/inputs/NumberScalerDialog.vue b/vue3/src/components/inputs/NumberScalerDialog.vue
index ab05c4eac..c394fa5fa 100644
--- a/vue3/src/components/inputs/NumberScalerDialog.vue
+++ b/vue3/src/components/inputs/NumberScalerDialog.vue
@@ -11,11 +11,11 @@
 
                 <v-card-text>
 
-                    <v-number-input v-model="mutable_number" @update:modelValue="updateNumber('set')"  control-variant="split" :min="0" >
+                    <v-number-input v-model="mutable_number" @update:modelValue="updateNumber('set')" control-variant="split" :min="0">
                     </v-number-input>
 
                     <v-btn-group divided class="d-flex">
-                        <v-btn  variant="tonal" class="flex-grow-1" @click="updateNumber( 'half')">
+                        <v-btn variant="tonal" class="flex-grow-1" @click="updateNumber( 'half')">
                             <i class="fas fa-divide"></i> 2
                         </v-btn>
                         <v-btn variant="tonal" class="flex-grow-1" @click="updateNumber('double')">
@@ -34,60 +34,53 @@
     </v-dialog>
 </template>
 
-<script lang="ts">
+<script setup lang="ts">
 
-import {defineComponent} from 'vue'
+import {defineComponent, onMounted, ref, watch} from 'vue'
 import {VNumberInput} from 'vuetify/labs/VNumberInput' //TODO remove once component is out of labs
-export default defineComponent({
-    name: "NumberScalerDialog",
-    components: {VNumberInput},
-    emits: {
-        change(payload: { number: number }) {
-            return payload
-        }
-    },
-    props: {
-        number: {type: Number, default: 0},
-        title: {type: String, default: 'Number'}
-    },
-    data() {
-        return {
-            dialog: false,
-            mutable_number: 0,
-            someNumber: 12
-        }
-    },
-    watch: {
-        number: function (newVal) {
-            this.mutable_number = newVal
-        }
-    },
-    mounted() {
-        this.mutable_number = this.number
-    },
-    methods: {
-        /**
-         * perform given operation on linked number
-         * @param operation update mode
-         */
-        updateNumber: function (operation: string) {
-            if (operation === 'half') {
-                this.mutable_number = this.number / 2
-            }
-            if (operation === 'double') {
-                this.mutable_number = this.number * 2
-            }
-            if (operation === 'add') {
-                this.mutable_number = this.number + 1
-            }
-            if (operation === 'sub') {
-                this.mutable_number = this.number - 1
-            }
-            console.log(operation, this.mutable_number)
-            this.$emit('change', {number: this.mutable_number})
-        }
-    },
+
+const emit = defineEmits({
+    change(payload: { number: number }) {
+        return payload
+    }
 })
+
+const props = defineProps({
+    number: {type: Number, default: 0},
+    title: {type: String, default: 'Number'}
+})
+
+const dialog = ref(false)
+const mutable_number = ref(0)
+
+watch(() => props.number, (newVal) => {
+    mutable_number.value = newVal
+})
+
+onMounted(() => {
+    mutable_number.value = props.number
+})
+
+/**
+ * perform given operation on linked number
+ * @param operation update mode
+ */
+function updateNumber(operation: string) {
+    if (operation === 'half') {
+        mutable_number.value = props.number / 2
+    }
+    if (operation === 'double') {
+        mutable_number.value = props.number * 2
+    }
+    if (operation === 'add') {
+        mutable_number.value = props.number + 1
+    }
+    if (operation === 'sub') {
+        mutable_number.value = props.number - 1
+    }
+    console.log(operation, mutable_number.value)
+    emit('change', {number: mutable_number.value})
+}
 </script>
 
 
diff --git a/vue3/src/components/inputs/RecipeContextMenu.vue b/vue3/src/components/inputs/RecipeContextMenu.vue
index 4639cab4b..30d0f47f4 100644
--- a/vue3/src/components/inputs/RecipeContextMenu.vue
+++ b/vue3/src/components/inputs/RecipeContextMenu.vue
@@ -14,21 +14,19 @@
 
 </template>
 
-<script lang="ts">
-import {defineComponent, PropType} from 'vue'
+<script setup lang="ts">
+import {PropType} from 'vue'
 import {Recipe, RecipeFlat, RecipeOverview} from "@/openapi";
+import {useRouter} from "vue-router";
 
-export default defineComponent({
-    name: "RecipeContextMenu",
-    props: {
-        recipe: {type: Object as PropType<Recipe | RecipeFlat | RecipeOverview>, required: true}
-    },
-    methods: {
-        openRecipe: function () {
-            this.$router.push({name: 'edit_recipe', params: {recipe_id: this.recipe.id}})
-        }
-    }
+const router = useRouter()
+const props = defineProps({
+    recipe: {type: Object as PropType<Recipe | RecipeFlat | RecipeOverview>, required: true}
 })
+
+function openRecipe() {
+    router.push({name: 'edit_recipe', params: {recipe_id: props.recipe.id}})
+}
 </script>