From cb7e7210deefe2ccd2595a4a94a221b96f194a15 Mon Sep 17 00:00:00 2001 From: Matthias Lodner Date: Tue, 3 Feb 2026 21:45:05 +0100 Subject: [PATCH] Moved html editor to ingredients, added additional styling options and added md file for bartender settings und queries. --- bartender/README.md | 23 ++++++++++++ frontend/app/components/article/article.vue | 41 +++++++++++---------- frontend/app/plugins/vuetify.ts | 4 +- frontend/package-lock.json | 2 +- 4 files changed, 48 insertions(+), 22 deletions(-) create mode 100644 bartender/README.md diff --git a/bartender/README.md b/bartender/README.md new file mode 100644 index 0000000..5278d7e --- /dev/null +++ b/bartender/README.md @@ -0,0 +1,23 @@ +# Bartender settings + +--- + +## SQL + + + +--- + +### HTML settings for label + +### Product title +```html +

+

+``` + +### Allergens info +```html + + +``` diff --git a/frontend/app/components/article/article.vue b/frontend/app/components/article/article.vue index 2d8dea0..c17c568 100644 --- a/frontend/app/components/article/article.vue +++ b/frontend/app/components/article/article.vue @@ -177,14 +177,23 @@ /> - + counter + :persistentCounter=true + rows="6" + no-resize + :readonly="!edit" + persistent-placeholder + > + + + @@ -199,21 +208,13 @@ /> - - - + rounded + :max-height="200" + :disabled="!edit" + /> diff --git a/frontend/app/plugins/vuetify.ts b/frontend/app/plugins/vuetify.ts index ffaf82c..7bc3c17 100644 --- a/frontend/app/plugins/vuetify.ts +++ b/frontend/app/plugins/vuetify.ts @@ -13,7 +13,7 @@ import { Table, TextAlign, VuetifyTiptap, - createVuetifyProTipTap, + createVuetifyProTipTap, FontSize, FontFamily, } from 'vuetify-pro-tiptap' import 'vuetify/styles' @@ -35,6 +35,8 @@ const vuetifyProTipTap = createVuetifyProTipTap({ Bold, Heading, TextAlign, + FontSize, + FontFamily, Clear.configure({ divider: true }), Indent.configure({ divider: true }), Table.configure({ divider: true }), diff --git a/frontend/package-lock.json b/frontend/package-lock.json index a45ea1f..feb383d 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -14,7 +14,7 @@ "pinia": "3.0.4", "vue": "3.5.27", "vue-router": "5.0.2", - "vuetify-pro-tiptap": "^2.8.2" + "vuetify-pro-tiptap": "2.8.2" }, "devDependencies": { "vite-plugin-vuetify": "2.1.3",