mktcms 0.2.11 → 0.2.13

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "mktcms",
   "configKey": "mktcms",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.1"

package/dist/runtime/app/components/content/editor/txt.vue

@@ -6,6 +6,7 @@ const { path } = usePathParam();
 const { data: content } = await useFetch(`/api/admin/txt?path=${path}`);
 const isSaving = ref(false);
 const savingSuccessful = ref(false);
+const commitMessage = ref("Inhaltliche \xC4nderungen");
 async function saveContent() {
   if (content.value === void 0) return;
   isSaving.value = true;
@@ -13,7 +14,8 @@ async function saveContent() {
   await useFetch(`/api/admin/txt?path=${path}`, {
     method: "POST",
     body: {
-      text: content.value
+      text: content.value,
+      commitMessage: commitMessage.value
     }
   });
   isSaving.value = false;
@@ -28,9 +30,27 @@ async function saveContent() {
       class="w-full h-24 resize-y border border-gray-300 p-2 box-border font-mono"
     />
 
+    <div class="mt-3">
+      <label
+        for="commit-message"
+        class="block mb-1"
+      >
+        Kommentar / Änderungsgrund
+      </label>
+      <input
+        id="commit-message"
+        v-model="commitMessage"
+        type="text"
+        required
+        class="w-full border border-gray-200 rounded-sm px-3 py-2"
+        placeholder="Inhaltliche Änderungen"
+      >
+    </div>
+
     <button
       type="button"
       class="button w-full justify-center mt-3"
+      :disabled="!commitMessage.trim() || isSaving"
       @click="saveContent"
     >
       <span v-if="isSaving">Speichern...</span>

package/dist/runtime/server/api/admin/txt.post.js

@@ -1,17 +1,24 @@
 import { z } from "zod";
 import { defineEventHandler, getValidatedQuery, readValidatedBody } from "h3";
 import { useStorage } from "nitropack/runtime";
+import syncGitContent from "../../utils/syncGitContent.js";
 const querySchema = z.object({
   path: z.string().min(1)
 });
 const bodySchema = z.object({
-  text: z.string()
+  text: z.string(),
+  commitMessage: z.string().trim().min(1)
 });
 export default defineEventHandler(async (event) => {
   const { path } = await getValidatedQuery(event, (query) => querySchema.parse(query));
-  const { text } = await readValidatedBody(event, (body) => bodySchema.parse(body));
+  const { text, commitMessage } = await readValidatedBody(event, (body) => bodySchema.parse(body));
   const decodedPath = decodeURIComponent(path);
   const storage = useStorage("content");
   await storage.setItem(decodedPath, text);
+  try {
+    await syncGitContent(commitMessage, [decodedPath]);
+  } catch (error) {
+    console.error("Git-Fehler:", error);
+  }
   return { success: true };
 });

package/dist/runtime/server/utils/syncGitContent.js

@@ -10,8 +10,9 @@ function toStorageFilePath(file) {
 }
 export default async function syncGitContent(commitMessage, files) {
   const { git, authUrl } = createAuthenticatedGitClient();
+  const currentBranch = (await git.branchLocal()).current;
   try {
-    await git.raw(["pull", "--rebase", "--autostash", authUrl]);
+    await git.raw(["pull", "--rebase", "--autostash", authUrl, currentBranch]);
   } catch (error) {
     throw new Error(toGitErrorMessage(error, "Git pull failed"));
   }
@@ -27,16 +28,15 @@ export default async function syncGitContent(commitMessage, files) {
     throw new Error(toGitErrorMessage(error, "Git commit failed"));
   }
   try {
-    await git.push([authUrl]);
+    await git.push([authUrl, `HEAD:${currentBranch}`]);
   } catch (error) {
     throw new Error(toGitErrorMessage(error, "Git push failed"));
   }
   try {
-    const currentBranch = (await git.branchLocal()).current;
     const remotes = await git.getRemotes(true);
     const hasOriginRemote = remotes.some((remote) => remote.name === "origin");
     if (hasOriginRemote) {
-      await git.fetch(["--prune", "origin", currentBranch]);
+      await git.raw(["update-ref", `refs/remotes/origin/${currentBranch}`, "HEAD"]);
     }
   } catch (error) {
     throw new Error(toGitErrorMessage(error, "Git status refresh failed"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mktcms",
-  "version": "0.2.11",
+  "version": "0.2.13",
   "description": "Simple CMS module for Nuxt",
   "repository": "mktcode/mktcms",
   "license": "MIT",