Updated bartender html and added html editor to article creation.

bartender/README.md

@@ -15,14 +15,18 @@ SELECT a.name AS product,
        a.bio AS bio,
        v.ean AS ean,
        COALESCE(v.description, a.description) AS description,
-       CONCAT(COALESCE(v.ingredients, a.ingredients), s.bio_info) AS ingredients,
+       CONCAT(COALESCE(v.ingredients, a.ingredients),
+              CASE
+                  WHEN COALESCE(v.ingredients, a.ingredients) LIKE '%Zutaten:%' THEN CONCAT('<br>', s.bio_info)
+                  ELSE '' END
+       ) AS ingredients,
        CONCAT(
                CONCAT(
                        CONCAT(COALESCE(a.bio_origin, s.bio), '<br>'),
                        CASE
-                           WHEN a.origin = '1' THEN 'EU-'
+                           WHEN a.origin = '0' THEN 'EU-'
-                           WHEN a.origin = '2' THEN 'Nicht-EU-'
+                           WHEN a.origin = '1' THEN 'Nicht-EU-'
-                           WHEN a.origin = '3' THEN 'EU-/Nicht-EU-'
+                           WHEN a.origin = '2' THEN 'EU-/Nicht-EU-'
                            ELSE 'ERROR' END
                ),
                'Landwirtschaft'

frontend/app/components/article/articleCreate.vue

@@ -29,6 +29,11 @@
     ) {
       loading.value = true;
 
+      if (ingredients.value != null) {
+        ingredients.value = ingredients.value.replace(/style="[^"]*"/g, '');
+        ingredients.value = ingredients.value.replace(/<\/?p[^>]*>/g, '');
+      }
+
       const article: Article = new Article(0, name.value, bio.value, origin.value, description.value,
           ingredients.value, default_unit.value, [],
           mhd.value, bio_origin.value, allergens_text.value, bio_info.value, topm_id.value);
@@ -139,10 +144,11 @@
             :clearable="true"
         />
 
-        <v-textarea
+        <VuetifyTiptap
-            v-model.trim="ingredients"
+            v-model="ingredients"
             label="Zutaten"
-            :clearable="true"
+            rounded
+            :max-height="200"
         />
 
         <v-row>

frontend/app/store/labelEditorStore.ts

@@ -276,6 +276,7 @@ export const useLabelEditorStore = defineStore('label_editor_store', {
         try {
           if (article.ingredients != null) {
             article.ingredients = article.ingredients.replace(/style="[^"]*"/g, '');
+            article.ingredients = article.ingredients.replace(/<\/?p[^>]*>/g, '');
           }
 
           let updatedArticle = await $fetch<Article>(this.config.public.url + '/article/' + article.id, {

frontend/nuxt.config.ts

@@ -11,7 +11,8 @@ export default defineNuxtConfig({
 
   runtimeConfig: {
     public: {
-      url: process.env.URL || 'http://localhost:9091',
+      //url: process.env.URL || 'http://localhost:9091',
+      url: process.env.URL || 'http://192.168.10.170:9091',
     },
   },
 

frontend/package.json

@@ -13,7 +13,7 @@
     "@fontsource/roboto": "5.2.9",
     "@mdi/font": "7.4.47",
     "@pinia/nuxt": "0.11.3",
-    "nuxt": "4.3.0",
+    "nuxt": "4.3.1",
     "pinia": "3.0.4",
     "vue": "3.5.27",
     "vue-router": "5.0.2",