Merge branch 'main' of github.com:devforth/adminforth-markdown

Author: ivictbor

.woodpecker/buildSlackNotify.sh

@@ -4,8 +4,10 @@ set -x
 
 COMMIT_SHORT_SHA=$(echo $CI_COMMIT_SHA | cut -c1-8)
 
+STATUS=${1}  
 
-if [ "$CI_PREV_PIPELINE_STATUS" = "success" ]; then
+
+if [ "$STATUS" = "success" ]; then
   MESSAGE="Did a build without issues on \`$CI_REPO_NAME/$CI_COMMIT_BRANCH\`. Commit: _${CI_COMMIT_MESSAGE}_ (<$CI_COMMIT_URL|$COMMIT_SHORT_SHA>)"
 
   curl  -s -X POST -H "Content-Type: application/json" -d '{

.woodpecker/release.yml

@@ -16,26 +16,42 @@ steps:
     commands:
       - infisical export --domain https://vault.devforth.io/api --format=dotenv-export --env="prod" > /woodpecker/deploy.vault.env
 
-  release:
+  build:
     image: node:20
     when:
       - event: push
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
     commands:
       - apt update && apt install -y rsync
-      - export $(cat /woodpecker/deploy.vault.env | xargs)
+      - . /woodpecker/deploy.vault.env   
       - npm clean-install
       - /bin/bash ./.woodpecker/buildRelease.sh
       - npm audit signatures
+
+  release:
+    image: node:20
+    when:
+      - event:
+          - push
+        branch:
+          - main
+    commands:
+      - . /woodpecker/deploy.vault.env
       - npx semantic-release
 
   slack-on-failure:
+    image: curlimages/curl
     when:
       - event: push
-        status: [failure, success]
+        status: [failure]
+    commands:
+      - . /woodpecker/deploy.vault.env
+      - /bin/sh ./.woodpecker/buildSlackNotify.sh failure
+      
+  slack-on-success: 
     image: curlimages/curl
+    when:
+      - event: push
+        status: [success]
     commands:
-      - export $(cat /woodpecker/deploy.vault.env | xargs)
-      - /bin/sh ./.woodpecker/buildSlackNotify.sh
-
+      - . /woodpecker/deploy.vault.env
+      - /bin/sh ./.woodpecker/buildSlackNotify.sh success

custom/MarkdownEditor.vue

@@ -15,7 +15,7 @@ import { Editor } from '@milkdown/core';
 import { Crepe } from '@milkdown/crepe';
 import type { AdminForthColumn } from '@/types/Common';
 import '@milkdown/crepe/theme/common/style.css';
-import '@milkdown/crepe/theme/frame-dark.css';
+import '@milkdown/crepe/theme/frame.css';
 
 const props = defineProps<{
   column: AdminForthColumn,
@@ -200,9 +200,9 @@ onBeforeUnmount(() => {
 });
 </script>
 
-<style>
+<style lang="scss">
 #editor [contenteditable="true"] {
-  @apply bg-transparent outline-none border-none shadow-none transition-none min-h-10 p-2 bg-gray-700 dark:placeholder-gray-400;
+  @apply bg-transparent outline-none border-none shadow-none transition-none min-h-10 p-2;
 }
 
 #editor [contenteditable="true"].is-focused {
@@ -238,4 +238,81 @@ onBeforeUnmount(() => {
 }
 
 
+.editor, .milkdown {
+  border-radius: 6px;
+}
+
+.ProseMirror [data-placeholder]::before {
+  color: #6b7280;
+}
+
+.milkdown milkdown-block-handle .operation-item:hover {
+  @apply bg-gray-200 dark:bg-gray-600;
+}
+
+.milkdown milkdown-slash-menu .tab-group ul li:hover {
+  @apply bg-gray-200 dark:bg-gray-600;
+} 
+
+.milkdown milkdown-toolbar {
+  @apply bg-gray-50 border border-gray-300 text-gray-900 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white;
+}
+
+.milkdown milkdown-toolbar .toolbar-item:hover {
+  @apply bg-gray-200 dark:bg-gray-600;
+}
+
+.milkdown milkdown-latex-inline-edit {
+  @apply bg-gray-200
+}
+
+.milkdown milkdown-latex-inline-edit .container button:hover {
+  @apply bg-gray-300 dark:bg-gray-500; 
+}
+
+.milkdown milkdown-link-edit > .link-edit {
+  @apply bg-gray-50 border border-gray-300 text-gray-900 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white;
+}
+
+.milkdown milkdown-code-block .cm-editor {
+  @apply bg-gray-50 border border-gray-300 text-gray-900 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white;
+}
+
+.ͼo .cm-activeLineGutter {
+  @apply bg-gray-200 dark:bg-gray-600;
+}
+
+.ͼo .cm-activeLine {
+  @apply bg-gray-200 dark:bg-gray-600;
+}
+
+.cm-content {
+  padding-left: 0px !important;
+  padding-right: 0px !important;
+}
+
+.milkdown milkdown-code-block .list-wrapper {
+  @apply bg-gray-50  border border-gray-300 text-gray-900 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white;
+}
+
+.milkdown milkdown-code-block .language-list-item:hover {
+  @apply bg-gray-200 dark:bg-gray-600;
+}
+
+.milkdown milkdown-code-block .tools .language-button {
+  @apply bg-gray-50 border border-gray-300 text-gray-900 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white;
+}
+
+.milkdown milkdown-code-block .tools .language-button:hover {
+  @apply bg-gray-200 dark:bg-gray-600;
+}
+
+.milkdown::selection {
+  background-color: #6b7280;
+}
+
+.ͼ4 .cm-line ::selection, .ͼ4 .cm-line::selection {
+  background-color: #6b7280 !important;
+}
+
 </style>

custom/tsconfig.json

@@ -1,17 +1,14 @@
 {
   "compilerOptions": {
-    "baseUrl": ".", // This should point to your project root
+    "baseUrl": ".",
     "paths": {
       "@/*": [
-        // "node_modules/adminforth/dist/spa/src/*"
         "../../../adminforth/spa/src/*"
       ],
       "*": [
-        // "node_modules/adminforth/dist/spa/node_modules/*"
         "../../../adminforth/spa/node_modules/*"
       ],
       "@@/*": [
-        // "node_modules/adminforth/dist/spa/src/*"
         "."
       ]
     }

index.ts

@@ -67,7 +67,7 @@ export default class MarkdownPlugin extends AdminForthPlugin {
           Please configure adapter in such way that it will store objects publicly (e.g.  for S3 use 'public-read' ACL).  
         `);
       }
-      this.uploadPlugin = plugin;
+      this.uploadPlugin = plugin as AdminForthPlugin;
     }
 
     column.components.show = {
@@ -139,7 +139,8 @@ export default class MarkdownPlugin extends AdminForthPlugin {
                     [options.attachments.attachmentRecordIdFieldName]: recordId,
                     [options.attachments.attachmentResourceIdFieldName]: resourceConfig.resourceId,
                   },
-                  adminUser
+                  adminUser,
+                  response: {} as any
                 }
               );
               console.log('Successfully created record for:', s3Path);
@@ -169,6 +170,7 @@ export default class MarkdownPlugin extends AdminForthPlugin {
               recordId: a[attachmentPrimaryKeyField.name],
               adminUser,
               record: a,
+              response: {} as any
             }
           )
         }))