From: PhiTux <redacted>
Date: Mon, 28 Apr 2025 21:48:08 +0000 (+0200)
Subject: insertion of templates works
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=9df0f5771e15051c8554ea35a38da006838c814c;p=DailyTxT.git

insertion of templates works
---

diff --git a/frontend/src/lib/TemplateDropdown.svelte b/frontend/src/lib/TemplateDropdown.svelte
new file mode 100644
index 0000000..bf94081
--- /dev/null
+++ b/frontend/src/lib/TemplateDropdown.svelte
@@ -0,0 +1,25 @@
+<script>
+	import { templates, insertTemplate } from '$lib/templateStore';
+</script>
+
+<select
+	bind:value={$insertTemplate}
+	class="form-select form-select-sm"
+	aria-label="Select template"
+>
+	<option disabled selected>Vorlage einfügen...</option>
+	{#each $templates as template}
+		<option value={template.text} selected={template.name === $insertTemplate}>
+			{template.name}
+		</option>
+	{/each}
+</select>
+
+<style>
+	.form-select {
+		width: inherit !important;
+		padding-top: 0;
+		padding-bottom: 0;
+		align-self: center;
+	}
+</style>
diff --git a/frontend/src/lib/templateStore.js b/frontend/src/lib/templateStore.js
index 6f04ae5..2f701bd 100644
--- a/frontend/src/lib/templateStore.js
+++ b/frontend/src/lib/templateStore.js
@@ -1,3 +1,4 @@
 import { writable } from "svelte/store";
 
-export const templates = writable([]);
\ No newline at end of file
+export const templates = writable([]);
+export const insertTemplate = writable(null);
\ No newline at end of file
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index b3368ed..30b742d 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -20,7 +20,7 @@
 	import trianglify from 'trianglify';
 	import { tags } from '$lib/tagStore.js';
 	import TagModal from '$lib/TagModal.svelte';
-	import { alwaysShowSidenav, offcanvasIsOpen } from '$lib/helpers.js';
+	import { alwaysShowSidenav } from '$lib/helpers.js';
 	import { templates } from '$lib/templateStore';
 	import {
 		faRightFromBracket,
@@ -253,9 +253,6 @@
 			.then((response) => {
 				$templates = response.data;
 
-				// add "new template" option to start
-				$templates.unshift({ name: 'Neue Vorlage erstellen...', text: '' });
-
 				selectedTemplate = null;
 				updateSelectedTemplate();
 			})
@@ -289,7 +286,7 @@
 		if (isSavingTemplate) return;
 		isSavingTemplate = true;
 
-		if (selectedTemplate === 0) {
+		if (selectedTemplate === '-1') {
 			// add new template
 			$templates.push({ name: templateName, text: templateText });
 		} else {
@@ -298,9 +295,6 @@
 			$templates[selectedTemplate].text = templateText;
 		}
 
-		// remove first "new template" option
-		$templates.shift();
-
 		axios
 			.post(API_URL + '/logs/saveTemplates', {
 				templates: $templates
@@ -328,7 +322,7 @@
 
 	let isDeletingTemplate = $state(false);
 	function deleteTemplate() {
-		if (selectedTemplate === null || selectedTemplate === 0) return;
+		if (selectedTemplate === null || selectedTemplate === '-1') return;
 
 		if (isDeletingTemplate) return;
 		isDeletingTemplate = true;
@@ -336,9 +330,6 @@
 		// remove template from list
 		$templates.splice(selectedTemplate, 1);
 
-		// remove first "new template" option
-		$templates.shift();
-
 		axios
 			.post(API_URL + '/logs/saveTemplates', {
 				templates: $templates
@@ -367,7 +358,7 @@
 	}
 
 	function updateSelectedTemplate() {
-		if (selectedTemplate === 0 || selectedTemplate === null) {
+		if (selectedTemplate === '-1' || selectedTemplate === null) {
 			// new template
 			templateName = '';
 			templateText = '';
@@ -766,6 +757,9 @@
 												aria-label="Select template"
 												onchange={updateSelectedTemplate}
 											>
+												<option value="-1" selected={selectedTemplate === '-1'}>
+													Neue Vorlage erstellen...
+												</option>
 												{#each $templates as template, index}
 													<option value={index} selected={index === selectedTemplate}>
 														{template.name}
@@ -813,7 +807,7 @@
 												placeholder="Name der Vorlage"
 											/>
 											<button
-												disabled={selectedTemplate === 0 || selectedTemplate === null}
+												disabled={selectedTemplate === '-1' || selectedTemplate === null}
 												type="button"
 												class="btn btn-outline-danger ms-5"
 												onclick={() => {
diff --git a/frontend/src/routes/+page.server.js b/frontend/src/routes/+page.server.js
new file mode 100644
index 0000000..9743273
--- /dev/null
+++ b/frontend/src/routes/+page.server.js
@@ -0,0 +1,6 @@
+import { redirect } from "@sveltejs/kit";
+
+export function load() {
+  // Redirect to the /home route
+  throw redirect(307, "/write");
+}
\ No newline at end of file
diff --git a/frontend/src/routes/write/+page.svelte b/frontend/src/routes/write/+page.svelte
index dcb57d6..d54f5be 100644
--- a/frontend/src/routes/write/+page.svelte
+++ b/frontend/src/routes/write/+page.svelte
@@ -5,7 +5,7 @@
 	import { selectedDate, cal, readingDate } from '$lib/calendarStore.js';
 	import axios from 'axios';
 	import { goto } from '$app/navigation';
-	import { onMount } from 'svelte';
+	import { mount, onMount } from 'svelte';
 	import { searchString, searchResults } from '$lib/searchStore.js';
 	import * as TinyMDE from 'tiny-markdown-editor';
 	import '../../../node_modules/tiny-markdown-editor/dist/tiny-mde.css';
@@ -27,6 +27,8 @@
 	import FileList from '$lib/FileList.svelte';
 	import { formatBytes, alwaysShowSidenav } from '$lib/helpers.js';
 	import ImageViewer from '$lib/ImageViewer.svelte';
+	import TemplateDropdown from '$lib/TemplateDropdown.svelte';
+	import { templates, insertTemplate } from '$lib/templateStore';
 
 	axios.interceptors.request.use((config) => {
 		config.withCredentials = true;
@@ -48,6 +50,10 @@
 			handleInput();
 		});
 
+		mount(TemplateDropdown, {
+			target: document.querySelector('.TMCommandBar')
+		});
+
 		loadTags();
 
 		getLog();
@@ -60,6 +66,15 @@
 		);
 	});
 
+	$effect(() => {
+		if ($insertTemplate) {
+			currentLog = currentLog + $insertTemplate;
+			tinyMDE.setContent(currentLog);
+
+			$insertTemplate = null;
+		}
+	});
+
 	function loadTags() {
 		axios
 			.get(API_URL + '/logs/getTags')