change tags titleicon and summary to optional function in next database

add the customisation function

.github/workflows/CI.yml

@@ -1,26 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - "*"
-
-env:
-  PLUGIN_NAME: share-to-notionnext
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
-
-      - name: Build
-        id: build
-        run: |
-          npm install
-          npm run build

.github/workflows/release.yml

@@ -1,98 +1,108 @@
-name: Release Obsidian plugin
+name: Release
 
 on:
-  push:
+    push:
-    tags:
+        tags:
-      - "*"
+            - "*"
 
 env:
-  PLUGIN_NAME: share-to-notionnext # Change this to match the id of your plugin.
+    PLUGIN_NAME: share-to-notionnext # Change this to match the id of your plugin.
-
+    CHANGELOG_FILENAME: CHANGELOG.md
 jobs:
-  build:
+    build:
-    runs-on: ubuntu-latest
+        name: release
+        runs-on: ubuntu-latest
 
-    steps:
+        steps:
-      - uses: actions/checkout@v2
+            -   uses: actions/checkout@v4
-      - name: Use Node.js
+            -   name: Use Node.js
-        uses: actions/setup-node@v1
+                uses: actions/setup-node@v3
-        with:
+                with:
-          node-version: "14.x"
+                    node-version: "18"
 
-      - name: Build
+            #            - name: Generate changelog
-        id: build
+            #              id: changelog
-        run: |
+            #              uses: saadmk11/changelog-ci@v1.1.2
-          npm install
+            #              with:
-          npm run build
+            #                  github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
-          mkdir ${{ env.PLUGIN_NAME }}
+            #                  release_version: ${{ github.ref }}
-          cp main.js manifest.json styles.css ${{ env.PLUGIN_NAME }}
+            #                  changelog_filename: CHANGELOG.md
-          zip -r ${{ env.PLUGIN_NAME }}.zip ${{ env.PLUGIN_NAME }}
-          ls
-          echo "::set-output name=tag_name::$(git tag --sort version:refname | tail -n 1)"
 
-      - name: Create Release
+            -   name: Build
-        id: create_release
+                id: build
-        uses: actions/create-release@v1
+                run: |
-        env:
+                    npm install
-          GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+                    npm run build
-          VERSION: ${{ github.ref }}
+                    mkdir ${{ env.PLUGIN_NAME }}
-        with:
+                    cp main.js manifest.json ${{ env.PLUGIN_NAME }}
-          tag_name: ${{ github.ref }}
+                    zip -r ${{ env.PLUGIN_NAME }}.zip ${{ env.PLUGIN_NAME }}
-          release_name: ${{ github.ref }}
+                    ls
-          draft: false
+                    echo "tag_name=$(git tag --sort version:refname | tail -n 1)" >> $GITHUB_OUTPUT
-          prerelease: false
 
-      - name: Upload zip file
+            -   name: Create Release
-        id: upload-zip
+                id: create_release
-        uses: actions/upload-release-asset@v1
+                uses: actions/create-release@v1
-        env:
+                env:
-          GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+                    GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
-        with:
+                    VERSION: ${{ github.ref }}
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
+                with:
-          asset_path: ./${{ env.PLUGIN_NAME }}.zip
+                    tag_name: ${{ github.ref }}
-          asset_name: ${{ env.PLUGIN_NAME }}-${{ steps.build.outputs.tag_name }}.zip
+                    release_name: ${{ github.ref }}
-          asset_content_type: application/zip
+                    body_path: ${{ env.CHANGELOG_FILENAME }}
+                    draft: false
+                    prerelease: false
 
-      - name: Upload main.js
+            -   name: Upload zip file
-        id: upload-main
+                id: upload-zip
-        uses: actions/upload-release-asset@v1
+                uses: actions/upload-release-asset@v1
-        env:
+                env:
-          GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+                    GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
-        with:
+                with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
+                    upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./main.js
+                    asset_path: ./${{ env.PLUGIN_NAME }}.zip
-          asset_name: main.js
+                    asset_name: ${{ env.PLUGIN_NAME }}-${{ steps.build.outputs.tag_name }}.zip
-          asset_content_type: text/javascript
+                    asset_content_type: application/zip
 
-      - name: Upload manifest.json
+            -   name: Upload main.js
-        id: upload-manifest
+                id: upload-main
-        uses: actions/upload-release-asset@v1
+                uses: actions/upload-release-asset@v1
-        env:
+                env:
-          GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+                    GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
-        with:
+                with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
+                    upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./manifest.json
+                    asset_path: ./main.js
-          asset_name: manifest.json
+                    asset_name: main.js
-          asset_content_type: application/json
+                    asset_content_type: text/javascript
 
-      - name: Upload markdown template
+            -   name: Upload manifest.json
-        id: upload-md
+                id: upload-manifest
-        uses: actions/upload-release-asset@v1
+                uses: actions/upload-release-asset@v1
-        env:
+                env:
-          GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+                    GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
-        with:
+                with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
+                    upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./obsidian_template.md
+                    asset_path: ./manifest.json
-          asset_name: template.md
+                    asset_name: manifest.json
-          asset_content_type: text/markdown
+                    asset_content_type: application/json
 
-      # - name: Upload styles.css
+            -   name: Upload markdown template
-      #   id: upload-css
+                id: upload-md
-      #   uses: actions/upload-release-asset@v1
+                uses: actions/upload-release-asset@v1
-      #   env:
+                env:
-      #     GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+                    GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
-      #   with:
+                with:
-      #     upload_url: ${{ steps.create_release.outputs.upload_url }}
+                    upload_url: ${{ steps.create_release.outputs.upload_url }}
-      #     asset_path: ./styles.css
+                    asset_path: ./obsidian_template.md
-      #     asset_name: styles.css
+                    asset_name: template.md
-      #     asset_content_type: text/css
+                    asset_content_type: text/markdown
+
+            # - name: Upload styles.css
+            #   id: upload-css
+            #   uses: actions/upload-release-asset@v1
+            #   env:
+            #     GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+            #   with:
+            #     upload_url: ${{ steps.create_release.outputs.upload_url }}
+            #     asset_path: ./styles.css
+            #     asset_name: styles.css
+            #     asset_content_type: text/css

.github/workflows/test.yml

@@ -0,0 +1,32 @@
+name: Test and Build
+
+on:
+    push:
+        branches:
+            - "*"
+
+env:
+    PLUGIN_NAME: share-to-notionnext # Change this to match the id of your plugin.
+
+jobs:
+    build:
+        name: test
+        runs-on: ubuntu-latest
+
+        steps:
+            - uses: actions/checkout@v4
+            - name: Use Node.js
+              uses: actions/setup-node@v3
+              with:
+                  node-version: "18"
+
+            - name: Build
+              id: build
+              run: |
+                  npm install
+                  npm run build
+                  mkdir ${{ env.PLUGIN_NAME }}
+                  cp main.js manifest.json ${{ env.PLUGIN_NAME }}
+                  zip -r ${{ env.PLUGIN_NAME }}.zip ${{ env.PLUGIN_NAME }}
+                  ls
+                  echo "tag_name=$(git tag --sort version:refname | tail -n 1)" >> $GITHUB_OUTPUT

CHANGELOG.md

@@ -0,0 +1,5 @@
+- Update NotionNext function that 
+  - `tags`, `titleicon`, `slug` and `summary` are now optional. You can remove them from the frontmatter if you don't need them.
+
+- 更新 NotionNext 同步功能
+  - `tags`, `titleicon`, `slug` 和 `summary` 现在不是必选项了。你可以从你的模板中删除这些字段。

Message.ts

@@ -1,23 +0,0 @@
-export const NoticeMsg: {[key: string]:any} = {
-  "en": {
-    "notion-logo": "Share to NotionNext",
-    "sync-success": "Sync to NotionNext success: \n",
-    "sync-fail": "Sync to NotionNext fail: \n",
-    "open-notion": "Please open the file that needs to be synchronized",
-    "config-secrets-notion-api": "Please set up the notion API in the settings tab.",
-    "config-secrets-database-id": "Please set up the database id in the settings tab.",
-    "set-tags-fail": "Set tags fail,please check the frontmatter of the file or close the tag switch in the settings tab.",
-  },
-  "zh": {
-    "notion-logo": "分享到NotionNext",
-    "sync-success": "同步到NotionNext成功:\n",
-    "sync-fail": "同步到NotionNext失败: \n",
-    "open-file": "请打开需要同步的文件",
-    "set-tags-fail": "设置标签失败,请检查文件的frontmatter,或者在插件设置中关闭设置tags开关",
-  },
-}
-
-
-export const NoticeMConfig = (lang:any) :any => {
-  return NoticeMsg[lang]
-}

README-zh.md

@@ -1,15 +1,109 @@
 # Obsidian share to NotionNext
+
 感谢[原作者](https://github.com/EasyChris/obsidian-to-notion)开发出了这么好用的插件，能够将obsidian同步到notion。 但是原仓库只能同步Name和Tags信息，如果像我一样通过[NotionNext](https://github.com/tangly1024/NotionNext)来搭建自己的网页，就有一些局限性。每次导入之后都需要进行大量的修改。
 
 所以我在[原作者](https://github.com/EasyChris/obsidian-to-notion)的基础之上，增加了匹配[NotionNext](https://github.com/tangly1024/NotionNext)模板的功能。这样可以直接在Obsidian编辑，整理好之后一键发布。
 
+## 更新说明
+### 1.1.2
+- 修复了一个拼写错误，导致无法同步`status`到NotionNext。现在你可以使用`stats`或者`status`来同步文章的状态到NotionNext。这个更新不会影响到同步到General数据库的功能。
+- **`stats`和`status`都可以使用，但是你只能使用其中一个。**
+
+```yaml
+stats: Draft # Draft, Invisible, Published, default is Draft， 默认是Draft
+# or 
+status: Draft # Draft, Invisible, Published, default is Draft， 默认是Draft
+# both of them will work, but you can only use one of them.
+```
+
+### 1.1.1
+- 修复了在日语系统下，无法显示设置按钮的错误。
+- 增加日语翻译。
+### 1.1.0
+- 修复设置中自定义标题的显示问题。
+- 增加了标签同步的控制按钮。以减少空标签集造成的上传失败。
+
+如果你不想使用同步标签功能，你可以在设置中关闭。不论你在md文件表头添加了tags与否，都不会将标签同步到Notion数据库中。
+
+如果你需要同步标签到Notion数据库中，**你需要通过如下格式添加表填到md表头中。**
+
+```yaml
+tags: #空标签，选项1
+tags: [test,test1,test2] # 用中括号将所有的标签括起来，选项2
+tags: 
+  - test
+  - test1
+  - test2 # 每个标签单独一行，选项3
+```
+
+### 1.0.1
+
+- 修复了自定义标题在设置菜单中显示错误的问题。
+
+### 1.0.0 (大更新)
+
+- 这个版本开始，你可以**任意修改第一列表头的名字 (标题列，默认：'title')**。 （**注意：你必须保证你的Notion数据库中有'tags‘这一列的存在，并且在markdown文件中把`tags:`添加到你的YAML表头中。否则会返回`400 错误`。但是你可以`tags:`设置为空。**）
+
+  ![](https://minioapi.pjx.ac.cn/img1/2023/11/4a298b9be3990e9d2201bf2f50ca5a0a.png)
+例如这样：
+  ![](https://minioapi.pjx.ac.cn/img1/2023/11/4cd8d79cd9dd9dde299e39c666cb3473.gif)
+- 增加了一个控制按钮来控制是否开启当前数据库同步命令的功能。如果你关闭了这个按钮，你在上传命令列表中就不会出现当前数据库的选项。
+
+![](https://minioapi.pjx.ac.cn/img1/2023/11/becb60fc44783842da4b3cf4c322f363.gif)
+
+### 0.2.6
+
+- 增加一个按钮用来控制是否在名列列表中显示如下数据库。
+
+![](https://minioapi.pjx.ac.cn/img1/2023/11/147c6a4eaa34da41a6f102558ed77106.png)
+如果你关闭普通数据库的按钮，你在上传命令列表中就不会出现普通数据库的选项。如果你关闭NotionNext数据库的按钮，你在上传命令列表中就不会出现NotionNext数据库的选项。
+
+![](https://minioapi.pjx.ac.cn/img1/2023/11/70b8e4fc2148688ccbd6cfc53ce339a2.png)
+
+### 0.2.3
+
+- 修复了一个bug，现在可以正常更新了。
+
+### 0.2.2
+
+- 支持NotionNext 和 普通Notion 数据库的同步。
+- 你可以有一个NotionNext和一个普通Notion数据库。
+- 普通Notion数据库的同步方式和原作者的一样，只同步`title`和`tags`。**如果使用普通数据库功能，你需要保证你的数据库中有`title`和`tags`这两个表头。必须使用小写。**
+
+![](https://minioapi.pjx.ac.cn/img1/2023/11/712a12081d855aa60f82a7b46913ab7e.gif)
+
+![](https://minioapi.pjx.ac.cn/img1/2023/11/9de76cecceef74c78884ddfc1c221659.gif)
+
+### 0.2.1
+
+- 重构代码。
+
+### 0.2.0
+
+- 从这个版本开始，重构了交互逻辑。现在当你点击左侧的按钮，会弹出可同步的数据库选项。你可以选择你想要同步的数据库，然后点击同步按钮。**但是，现在仅支持同步单个数据库，如果你的数据库不是NotionNext，你可以不用更新。**
+
+### 0.1.10
+
+- 修正了设置中的中文显示。
+
+### 0.1.8
+
+- 重新整理了代码，增加了一个仓库转换按钮为之后的多数据库支持作准备。**但是现在还不支持多数据库，如果你的数据库不是NotionNext，你可以不用更新。**
+
+### 0.1.7
+
+- [x] 删除了设置中`convert tags`的选项。 你现在可以直接添加tags，而不需要考虑是否开启tags选项。如果你不需要tags，可以直接删除tags选项或者留白。
+
 ## 使用方式
+
 ### 注意事项
-本插件现在暂时只能用于匹配[NotionNext](https://github.com/tangly1024/NotionNext)。如果你不是使用这个模板，你只会无限返回`error 400`. 
+
+本插件现在暂时只能用于匹配[NotionNext](https://github.com/tangly1024/NotionNext)。如果你不是使用这个模板，你只会无限返回`error 400`.
 
 所以没有NotionNext需求的，请使用原作者的[Obsidian-to-notion](https://github.com/EasyChris/obsidian-to-notion)
 
 ### 准备安装
+
 在安装插件之前，你必须配置好了以下内容：
 
 1. 你的NotionNext数据库。
@@ -26,27 +120,35 @@
     - summary
     - password
     - icon
-   
+
 在最新的0.0.6版本，我还增加了以下内容：
+
 - titleicon： 标题的emoji图标,暂时只能支持emoji
 - coverurl： 封面图片的url， url可以是任何一种图片的url， 例如jpg，png，svg等等。
 
 **如果你是直接复制的NotionNext的模板，这些内容应该已经有了。我在原作者的基础之上对本插件的内容进行了更改，所以你只需要保证你的数据库有如上内容，并且所有的字母都是小写！！！**
 
-
 **⚠️⚠️⚠️:表头全部小写！！！顺序无所谓！**
 
 ### 安装插件
+
+#### 社区插件市场下载
+
+打开`Obsidian -> 设置 -> 社区插件 -> 浏览 -> 搜索Share to NotionNext`, 然后点击安装。
+
+#### 手动安装
+
 1. 关闭Obsidian
 2. 从Release下载插件文件，解压到你的obsidian插件目录下。
 3. 重新打开Obsidian，进入设置，启用插件。
 4. 在设置中，找到Obsidian to NotionNext，填入你的NotionNext Database ID 和 API token。
 
 ### 使用插件
+
 在仓库中我上传了一个模板，你可以直接复制到你的模板文件夹中。然后使用Obsidian的模板功能一键生成新笔记。
 
-
 如果你不想使用模板，你也可以直接在Obsidian中创建一个新的文件，然后复制下边的内容。然后保存。
+
 ```markdown
 ---
 # default value has been set.
@@ -58,6 +160,7 @@
 # 现在阶段一定不要修改表头的名字， please do not change the name of the header in YAML front matter
 # !!!!!!!!!!!!
 titleicon: 📎 # emoji icon, default is 📜， 默认是📜
+date: 2023-07-23 # default is today， 默认是今天。 Format is YYYY-MM-DD， 格式是YYYY-MM-DD
 coverurl: https://img.jxpeng.dev/2023/08/843e27a210847f05a0f7cfb121fec100.jpg # default is empty， 默认是空
 type: Post # Post or Page, default is Post， 默认是Post
 slug: test # slug for url, default is empty， 默认是空
@@ -76,12 +179,12 @@ Contents Below
 
 
 ```
+
 模板使用如下：
-![](https://img.jxpeng.dev/2023/08/5ba5e7aeb86650c060c620786371717c.mp4)
+![](https://minioapi.pjx.ac.cn/img1/2023/09/354b950e5777b48832c2475e4a31f2cc.gif)
 
 **插件预览如下**
-![](https://img.jxpeng.dev/2023/08/7edefe36899b7431a65db891f429a137.mp4)
+![](https://minioapi.pjx.ac.cn/img1/2023/09/d6199619b68fab218fca8ae0cebece78.gif)
-
 
 ---
 
@@ -90,6 +193,7 @@ Contents Below
 非常感谢原作者的开发，我只是在原作者的基础之上进行了修改，增加了一些功能。如果你觉得这个插件对你有帮助，可以给[原作者](https://github.com/EasyChris/obsidian-to-notion)一个star。
 
 # Obsidian to Notion
+
 [![](https://github.com/Easychris/obsidian-to-notion/actions/workflows/CI.yml/badge.svg)](https://github.com/Easychris/obsidian-to-notion/actions/workflows/CI.yml)
 [![Release Obsidian plugin](https://github.com/Easychris/obsidian-to-notion/actions/workflows/release.yml/badge.svg)](https://github.com/Easychris/obsidian-to-notion/actions/workflows/release.yml)
 [![GitHub license](https://camo.githubusercontent.com/400c4e52df43f6a0ab8a89b74b1a78d1a64da56a7848b9110c9d2991bb7c3105/68747470733a2f2f696d672e736869656c64732e696f2f62616467652f4c6963656e73652d47504c76332d626c75652e737667)](https://raw.githubusercontent.com/EasyChris/obsidian-to-notion/master/LICENSE)
@@ -105,31 +209,40 @@ Obsidian share to Notion [English](README.md)
 ![](./doc/1.gif)
 
 # 使用方式
+
 ## 安装插件
 
 ### 市场下载
+
 插件市场搜索 noiton 即可下载
 
 ![](https://afox-1256168983.cos.ap-shanghai.myqcloud.com/20220628214145.png)
+
 ### BRAT
+
 插件中中心搜索 BRAT
 添加 `EasyChris/obsidian-to-notion` 到 BRAT 插件安装列表中
 返回插件中心启用即可
+
 ### 手动安装
+
 ```
 cd YOUR_OBSIDIAN_FOLDER/.obsidian/plugins/
 git clone https://github.com/EasyChris/obsidian-to-notion.git
 ```
 
-
 ## 申请 Notion API
+
 官方参考文档：[https://developers.notion.com/docs](https://developers.notion.com/docs)
-### 第 1 步：创建integration。
+
+### 第 1 步：创建integration
+
 转到 [https://www.notion.com/my-integrations](https://www.notion.com/my-integrations)
 创建完成之后，复制`secrets toekn`
 ![](https://files.readme.io/2ec137d-093ad49-create-integration.gif)
 
 ### 第2步：与你的集成共享一个数据库
+
 新建一个的page（权限为公开）
 在page中新建一个数据库 -> 需要`full page database`
 ![](./doc/3.gif)
@@ -144,9 +257,6 @@ git clone https://github.com/EasyChris/obsidian-to-notion.git
 
 ![](https://afox-1256168983.cos.ap-shanghai.myqcloud.com/20220618102029.png)
 
-
-
-
 ### 第三步：复制database ID
 
 ```
@@ -155,27 +265,28 @@ https://www.notion.so/myworkspace/a8aec43384f447ed84390e8e42c2e089?v=...
 
 ```
 
-
-
 ## 打开插件配置
+
 将得到的 `NOTION_API_KEY` 和 `DATABASE_ID`填入配置当中
 ![](./doc/2.png)
 
 ## 上传文件内容到notion
+
 点击上传notion的按钮
 ![](./doc/4.png)
 上传成功之后会自动生成一个分享链接
 ![](./doc/5.png)
 
-
 ## 页面 Banner 链接[可选]
+
 默认可以不填写
 横幅URL必须是图像URL，例如：https：//i.imgur.com/xxx.jpg
 
 ## Notion ID [可选]
+
 Notion ID是你想分享文件的页面ID。
-如果你不写它，notion将分享到默认的链接，如：https://www.notion.so/myworkspace/a8aec43384f447ed84390，访问这个页面将重定向到你的网站页面。
+如果你不写它，notion将分享到默认的链接，如：<https://www.notion.so/myworkspace/a8aec43384f447ed84390，访问这个页面将重定向到你的网站页面。>
-如果你写了Notion ID，它将分享到页面链接如：https://your_user_name.notion.site/myworkspace/a8aec43384f447ed84390。不需要重定向网址。
+如果你写了Notion ID，它将分享到页面链接如：<https://your_user_name.notion.site/myworkspace/a8aec43384f447ed84390。不需要重定向网址。>
 
 ## 同步图片
 
@@ -186,6 +297,7 @@ Notion ID是你想分享文件的页面ID。
 [顿顿饭](https://dun.mianbaoduo.com/@easy)
 
 # 感谢
+
 [开发流程 | Obsidian 插件开发文档](https://luhaifeng666.github.io/obsidian-plugin-docs-zh/zh/getting-started/development-workflow.html)
 
 [GitHub - devbean/obsidian-wordpress: An obsidian plugin for publishing docs to WordPress.](https://github.com/devbean/obsidian-wordpress)

README.md

@@ -1,18 +1,290 @@
-# Obsidian to NotionNext 
+# Obsidian to NotionNext
+
+[![Test](https://github.com/jxpeng98/obsidian-to-NotionNext/actions/workflows/test.yml/badge.svg)](https://github.com/jxpeng98/obsidian-to-NotionNext/actions/workflows/test.yml)
+[![Release](https://github.com/jxpeng98/obsidian-to-NotionNext/actions/workflows/release.yml/badge.svg)](https://github.com/jxpeng98/obsidian-to-NotionNext/actions/workflows/release.yml)
+[![Obsidian Downloads](https://img.shields.io/badge/dynamic/json?logo=obsidian&color=%23483699&label=downloads&query=%24%5B%22share-to-notionnext%22%5D.downloads&url=https%3A%2F%2Fraw.githubusercontent.com%2Fobsidianmd%2Fobsidian-releases%2Fmaster%2Fcommunity-plugin-stats.json)](https://GitHub.com/jxpeng98/obsidian-to-NotionNext/releases/)
+[![GitHub release (with filter)](https://img.shields.io/github/package-json/v/jxpeng98/obsidian-to-NotionNext)](https://github.com/jxpeng98/obsidian-to-NotionNext/releases/)
+
+[//]: # ([![Github all releases](https://img.shields.io/github/downloads/jxpeng98/obsidian-to-NotionNext/total.svg)](https://GitHub.com/jxpeng98/obsidian-to-NotionNext/releases/))
+
+
 [中文文档](README-zh.md)
 
-Thanks to the [original author](https://github.com/EasyChris/obsidian-to-notion) for developing such a useful plugin that can synchronize Obsidian to Notion. However, the original repository can only sync Name and Tags information. For those like me who use [NotionNext](https://github.com/tangly1024/NotionNext) to set up their website, this presents some limitations. Every time I import, I need to make a lot of modifications.
+**Now, support both NotionNext and General databases with customised properties.**
+
+**现在支持NotionNext和普通Notion数据库，可自定义数据库列表。**
+
+## TODO List
+
+- [ ] Modify the Edit function for the custom properties. 改进自定义属性的编辑功能
+- [ ] Support group upload with one click 支持一键多数据库上传
+- [x] Support custom properties for Notion General database. 支持自定义属性
+- [x] Support preview for database details in plugin settings. 支持预览数据库详情
+- [x] Support edit for database details in plugin settings. 支持编辑数据库详情
+
+## How to use
+You need seven steps to use this plugin in your Obsidian.
+1. Create a database in your Notion workspace.
+Open Notion, clink the `+` button on the left side, and 'Add a page' -> select 'Table' -> 'New database'.
+2. On the right-top corner, click the 'Share' -> 'Publish' -> 'Publish' -> copy the database id from the URL.
+3. go to [Notion API](https://www.notion.com/my-integrations) to create a new integration, and copy the token.
+4. Go back to your created Notion database, click the right-top '...' -> connections -> connect to -> find the integration you created and connect it.
+5. Go to obsidian settings -> community plugins -> search 'NotionNext' -> install it.
+6. Create a database in the plugin settings, and fill in the database details and all properties you want to sync (**Note: the name of the properties is case-sensitive.**).
+   - There are three type of database that you can use:
+	 - NotionNext: the database for the NotionNext template.(**All the properties are in lowercase**)
+	 - General: the database for the general Notion database (**Only have `title` and `tags` columns**)
+	 - Custom: the database for the custom properties (You can customise the properties you want to sync)
+7. Create a new note in Obsidian, and fill in the frontmatter with the properties you want to sync.
+
+## 使用方法
+如果你想使用这个插件，你需要完成下边的七个步骤。
+1. 首先在你的Notion中创建一个数据库。
+2. 点击右上角的'分享' -> '发布' -> '发布' -> 然后复制URL中的数据库ID。(版本不同，可能id的形式也不同。只需要复制在？之前的纯数字部分应该就可以了)
+3. 去[Notion API](https://www.notion.com/my-integrations)创建一个新的API，然后复制token。
+4. 回到你创建的Notion数据库，点击右上角的'...' -> 连接 -> 连接到 -> 把你刚才创建的API绑定到你的数据库
+5. 回到Obsidian的设置 -> 社区插件 -> 搜索'NotionNext' -> 安装
+6. 在插件设置中创建一个数据库，然后填写数据库的详情和你想要同步的属性 (**注意：Notion会识别表头的大小写，一定要和notion中的表头保持大小写一致**)。
+   - 你可以使用三种类型的数据库：
+	 - NotionNext: 用于NotionNext模板的数据库。(**默认全部小写**)
+	 - General: 用于普通的Notion数据库（**只有`title`和`tags`两个属性**）
+	 - Custom: 用于自定义属性的数据库（你可以自定义你想要同步的属性）
+7. 在Obsidian中创建一个新的笔记，然后在frontmatter中写入你想要的属性。
+
+## Example
+```plain
+---
+# default value has been set.
+# for any unwanted value, you can delete it or set it to empty.
+# for example, if you donot want to set password, you can delete password: "1234" or set it to password: ""
+# 我已经在插件中设置了默认值，如果有不需要的选项，可以直接删除。
+# 例如你不需要密码选项，你可以将password: "1234"删除，或者将它设置为空。
+# !!!!!!!!!!!!
+# 现在阶段一定不要修改表头的名字， please do not change the name of the header in YAML front matter 
+# !!!!!!!!!!!!
+titleicon: 📎 # emoji icon, default is 📜， 默认是📜
+date: 2023-07-23 # default is today， 默认是今天。 Format is YYYY-MM-DD， 格式是YYYY-MM-DD
+coverurl: https://img.jxpeng.dev/2023/08/843e27a210847f05a0f7cfb121fec100.jpg # default is empty， 默认是空
+type: Post # Post or Page, default is Post， 默认是Post
+slug: test # slug for url, default is empty， 默认是空
+status: Draft # Draft, Invisible, Published, default is Draft， 默认是Draft 
+category: test # default is 'Obsidian'， 默认是'Obsidian'
+summary: this is a summary for test post # default is empty， 默认是空
+icon: fa-solid fa-camera # you can ignore this, default is empty， 默认是空，可直接删除
+password: "1234" # if you donot want to set password, you can delete this line, default is empty， 默认是空，可直接删除
+# 现在必须开启tags选项，否则会报错
+tags:
+  - test  # tags for post
+  - web # add more tags if you want
+---
+```
+<details> <summary> Update </summary>
+
+### 2.2.5
+
+- Update NotionNext function that 
+  - `tags`, `titleicon`, `slug` and `summary` are now optional. You can remove them from the frontmatter if you don't need them.
+
+
+### 2.2.3
+
+- Fix a bug that 'text' property cannot be synchronized. 修复了一个无法同步'text'属性的bug。
+
+### 2.2.2
+
+- Fix the setting description of database. 修复数据库设置的描述错误。
+
+### 2.2.1
+
+- improve the localisation for the custom properties setting. 改进自定义属性设置的本地化。
+
+**Warning: the edit function for the custom properties is not perfect for now. You need to re-enter all the properties if you want to edit the properties.**
+
+**注意：自定义属性的编辑功能现在还不完善。如果你想编辑属性，你需要重新输入所有的属性。**
+
+### 2.2.0 (Big Update)
+
+- add the support for custom properties in the Notion General database. 支持自定义属性
+	- [x] `title`, which is the first column of the database
+	- [x] 'Text'
+	- [x] 'Number'
+	- [x] 'Date'
+	- [x] 'Checkbox'
+	- [x] 'Select'
+	- [x] 'Multi-select'
+	- [x] 'URL'
+	- [x] 'Email'
+	- [x] 'Phone'
+	- [x] 'File' (**Only support external embedded files**)
+
+</details>
+
+![](https://minioapi.pjx.ac.cn/img1/2024/01/0cd99007409feede77bf5a3291e88af3.png)
+- Once you create the properties, you can preview the database details in the plugin settings.
+![](https://minioapi.pjx.ac.cn/img1/2024/01/665139962cc4cee2a0cb576b508b29f2.png)
+
+---
+
+## Acknowledgement
+
+Thanks to the [original author](https://github.com/EasyChris/obsidian-to-notion) for developing such a useful plugin that can synchronize Obsidian to Notion. However, the original repository can only sync Name and Tag information. For those like me who use [NotionNext](https://github.com/tangly1024/NotionNext) to set up their website, this presents some limitations. Every time I import, I need to make a lot of modifications.
 
 Thus, based on the [original author's work](https://github.com/EasyChris/obsidian-to-notion), I've added a feature to match the [NotionNext](https://github.com/tangly1024/NotionNext) template. This way, you can edit directly in Obsidian and publish with a single click after organizing.
 
-## How to Use
+---
+
+<details> <summary> Archive Update </summary>
+
+### 2.1.0
+
+- add confirmation interface for deleting a database 增加删除数据库的确认界面
+- fix the typo in the edit database modal 修复编辑数据库界面的标题错误
+- improve the logic for the database editing 改进数据库编辑界面的逻辑
+
+### 2.0.1
+
+- Add the preview and edit function for database details in the plugin settings. 增加插件设置中数据库详情的预览和编辑功能。
+![](https://minioapi.pjx.ac.cn/img1/2024/01/952f1e579daeac35b257ff7d744b0a3d.png)
+  - Preview:
+  ![](https://minioapi.pjx.ac.cn/img1/2024/01/952f1e579daeac35b257ff7d744b0a3d.png)
+
+  - Edit:
+	![](https://minioapi.pjx.ac.cn/img1/2024/01/ded3d62660f5488c76488304a3fb269e.png)
+  
+### 2.0.0 (Big Update)
+
+- redesign the plugin settings UI. From this version, the settings UI will be separated into two parts: 
+  - one for general settings: bannerUrl and your notion username (ID)
+  - one for database list: You can add new database or delete the database.
+- 重新设计了插件设置界面。从这个版本开始，设置界面将被分成两部分：
+  - 一部分是通用设置：bannerUrl和你的notion用户名（ID）
+  - 一部分是数据库列表：你可以添加新的数据库或者删除数据库。
+
+![](https://minioapi.pjx.ac.cn/img1/2023/12/f7e89241f45cfee6b902ec4b69dd6f63.png)
+
+- You can add more databases in the plugin settings.
+- 你可以在插件设置中添加更多的数据库。
+
+![](https://minioapi.pjx.ac.cn/img1/2023/12/023bf46ebbc92c3991d2c443c575bc80.gif)
+
+- You can sync one note to multiple databases.
+- 你可以将一个笔记同步到多个数据库中。
+
+![](https://minioapi.pjx.ac.cn/img1/2023/12/75f793bad756162e46bf41e54166eb32.png)
+
+**Note: You need to add your previous database in the new template.**
+**注意：你需要将之前的数据库添加到新的模板中。**
+
+### 1.1.2
+- Fix the typo that you cannot sync the markdown file `status` in the frontmatter to NotionNext. You can use `stats` or `status` to sync the status of the post to NotionNext. This update will not affect the function of syncing to General database. 
+- 修复了一个拼写错误，导致无法同步`status`到NotionNext。现在你可以使用`stats`或者`status`来同步文章的状态到NotionNext。这个更新不会影响到同步到General数据库的功能。
+- **Both `stats` and `status` will work, but you can only use one of them.**
+- **`stats`和`status`都可以使用，但是你只能使用其中一个。**
+
+For example, 
+```yaml
+stats: Draft # Draft, Invisible, Published, default is Draft， 默认是Draft
+# or 
+status: Draft # Draft, Invisible, Published, default is Draft， 默认是Draft
+# both of them will work, but you can only use one of them.
+```
+
+### 1.1.1
+- Fix the setting display bug in Japanese.
+- Add Japanese translation.
+
+### 1.1.0
+- Fix the custom name setting tab display bug. 
+- Add a toggle to control whether to sync `tags` since the empty tags may cause the syncing error.
+
+If you switch off the `tags` function in the plugin settings, it will ignore the `tags` in your frontmatter. 
+
+If you prefer to sync tags to Notion database, you can switch on the `tags` function in the plugin settings. **You can only use the following format for tags:**
+
+```yaml
+tags: #empty tags, option 1
+tags: [test,test1,test2] # use the square brackets, option 2
+tags: 
+  - test
+  - test1
+  - test2 # use the dash option 3
+```
+
+### 1.0.1
+
+- Fix the custom name element display bug in the settings.
+
+### 1.0.0 (Big Update)
+
+- From this version, you can **modify the first column name (title column, default: 'title')** as you want. (**Note: You need to have the 'tags' column in your Notion General database, and add `tags:` in your markdown frontmatter. If not, you will receive `network error 400`. But you can leave the `tags:` blank.**)
+
+![](https://minioapi.pjx.ac.cn/img1/2023/11/4a298b9be3990e9d2201bf2f50ca5a0a.png)
+Like this:
+![](https://minioapi.pjx.ac.cn/img1/2023/11/4cd8d79cd9dd9dde299e39c666cb3473.gif)
+
+- Add a switch button to control whether display the setting tabs in the plugin settings for both NotionNext and Notion General databases.
+
+![](https://minioapi.pjx.ac.cn/img1/2023/11/becb60fc44783842da4b3cf4c322f363.gif)
+
+### 0.2.6
+
+- Add a switch button to control whether to show the upload command in the command palette.
+
+<!-- ![](https://minioapi.pjx.ac.cn/img1/2023/11/147c6a4eaa34da41a6f102558ed77106.png)
+If you turn off the button for the General database, you won't see the option for the General database in the upload command list.
+
+If you turn off the button for the NotionNext database, you won't see the option for the NotionNext database in the upload command list.
+
+![](https://minioapi.pjx.ac.cn/img1/2023/11/70b8e4fc2148688ccbd6cfc53ce339a2.png) -->
+
+### 0.2.3
+
+- Fix the bug, now you can update normally.
+
+### 0.2.2
+
+- Support both NotionNext and General Notion database.
+- You can have one NotionNext and one General Notion database.
+- General Notion database can only have `title` and `tags` columns, and `tags` columns should be the multi-selected property. **the name of the columns is case sensitive. You should use small letter.**
+
+![](https://minioapi.pjx.ac.cn/img1/2023/11/712a12081d855aa60f82a7b46913ab7e.gif)
+
+![](https://minioapi.pjx.ac.cn/img1/2023/11/9de76cecceef74c78884ddfc1c221659.gif)
+
+### 0.2.1
+
+- Restructure the code
+
+### 0.2.0
+
+- From this version, the interactive logic has been rewritten. When you click the ribbon icon, it will display the sync command for all presetting NotionNext databases. You can choose the database you want to sync to. **However, only NotionNext database is supported for now.**
+
+### 0.1.10
+
+- Fix the Chinese support in the settings.
+
+### 0.1.8
+
+- Rebuild the uploadCommand function, and add one button to select the different databases. **However, only NotionNext database is supported for now.**  
+
+### 0.1.7
+
+- [x] Removed the `convert tag` option. Now, you can directly add tags in the YAML front matter. If you don't want to add tags, you can delete the tags in the YAML front matter or leave the tags blank.
+
+</details>
+
+<details> <summary> Previous How to Use </summary>
+
 ### Precautions
+
 For now, this plugin is exclusively for [NotionNext](https://github.com/tangly1024/NotionNext). If you're not using this template, you'll keep receiving `error 400`.
 
 For those without a NotionNext requirement, please use the original [Obsidian-to-notion](https://github.com/EasyChris/obsidian-to-notion).
 
 ### Pre-Installation Steps
+
 Before installing the plugin, you must have set up the following:
+
 1. Your NotionNext database.
 2. According to the original author's readme.md, set up the Notion API, and it should already be associated with your NotionNext repository.
 3. NotionNext Database ID
@@ -27,26 +299,36 @@ Before installing the plugin, you must have set up the following:
     - summary
     - password
     - icon
-   
+
-In version 0.0.6, I also add the following contents:
+From version 0.0.6, I also add the following contents:
-	- titleicon: the unique icon for each post, it can only support emoji currently. 
+ - titleicon: the unique icon for each post, it can only support emoji currently.
-	- cover url: the cover image for each post, it should be end with a type of image, such as .jpg, .png, .gif, etc.
+ - cover url: the cover image for each post, it should be end with a type of image, such as .jpg, .png, .gif, etc.
 
 **If you've directly copied the NotionNext template, these contents should already exist. I've made changes to this plugin based on the original author's work. All you need to ensure is that your database has the above content, and every letter is in lowercase!!!**
 
 **⚠️⚠️⚠️: All headers are in lowercase!!! The order doesn't matter!**
 
 ### Plugin Installation
+
+#### Install via Community Plugins
+
+Open `Obsidian settings -> Community Plugins -> Browse -> NotionNext -> Share to NotionNext`
+
+#### Mannually Install
+
 1. Close Obsidian.
 2. Download the plugin file from Release and unzip it into your Obsidian plugin directory.
 3. Re-open Obsidian, go to settings, and enable the plugin.
 4. In the settings, find Obsidian to NotionNext, and enter your NotionNext Database ID and API token.
 
 ### How to Use
+
 ### Using the Plugin
+
 In the repository, I have uploaded a template which you can directly copy into your template folder. After that, use Obsidian's template feature to create a new note with one click.
 
 If you don't want to use the template, you can also directly create a new file in Obsidian and then copy the content below. Then save it.
+
 ```markdown
 ---
 # default value has been set.
@@ -58,10 +340,11 @@ If you don't want to use the template, you can also directly create a new file i
 # 现在阶段一定不要修改表头的名字， please do not change the name of the header in YAML front matter
 # !!!!!!!!!!!!
 titleicon: 📎 # emoji icon, default is 📜， 默认是📜
+date: 2023-07-23 # default is today， 默认是今天。 Format is YYYY-MM-DD， 格式是YYYY-MM-DD
 coverurl: https://img.jxpeng.dev/2023/08/843e27a210847f05a0f7cfb121fec100.jpg # default is empty， 默认是空
 type: Post # Post or Page, default is Post， 默认是Post
 slug: test # slug for url, default is empty， 默认是空
-stats: Draft # Draft, Invisible, Published, default is Draft， 默认是Draft
+stats: Draft # Draft, Invisible, Published, default is Draft， 默认是Draft 
 category: test # default is 'Obsidian'， 默认是'Obsidian'
 summary: this is a summary for test post # default is empty， 默认是空
 icon: fa-solid fa-camera # you can ignore this, default is empty， 默认是空，可直接删除
@@ -75,26 +358,29 @@ tags:
 Contents Below
 
 ```
+
 Usage of the template is as follows:
-![](https://img.jxpeng.dev/2023/08/189384bf03c562030f4828343e1b7a6c.gif)
+![](https://minioapi.pjx.ac.cn/img1/2023/09/354b950e5777b48832c2475e4a31f2cc.gif)
 
 **Plugin preview is shown below**
-![](https://img.jxpeng.dev/2023/08/6063dd06eea4ee6939b5058dd129a698.gif)
+![](https://minioapi.pjx.ac.cn/img1/2023/09/d6199619b68fab218fca8ae0cebece78.gif)
+
+</details>
 
 ---
 
-**Original README.md**
+<details> <summary> Original README.md </summary>
 
 Many Thanks for the original author's work. I've only made some changes to the original author's work. If you find this plugin useful, please give the [original author](https://github.com/EasyChris/obsidian-to-notion) a star.
 
 # Obsidian to Notion
+
 [![](https://github.com/Easychris/obsidian-to-notion/actions/workflows/CI.yml/badge.svg)](https://github.com/Easychris/obsidian-to-notion/actions/workflows/CI.yml)
 [![Release Obsidian plugin](https://github.com/Easychris/obsidian-to-notion/actions/workflows/release.yml/badge.svg)](https://github.com/Easychris/obsidian-to-notion/actions/workflows/release.yml)
 [![GitHub license](https://img.shields.io/github/license/EasyChris/obsidian-to-notion)](https://raw.githubusercontent.com/EasyChris/obsidian-to-notion/master/LICENSE)
 [![Github all releases](https://img.shields.io/github/downloads/Easychris/obsidian-to-notion/total.svg)](https://GitHub.com/Easychris/obsidian-to-notion/releases/)
 [![GitLab latest release](https://badgen.net/github/release/Easychris/obsidian-to-notion/)](https://github.com/Easychris/obsidian-to-notion/releases)
 
-
 Share of obsidian to Notion [中文文档](README-zh.md)
 
 Sharing files from Obsidian to Notion with a single click, and Obsidian will automatically add the Notion share link
@@ -104,7 +390,9 @@ You are welcome to offer it a star if it can benefit you.
 ![](./doc/1.gif)
 
 # TODO
+
 ### [TODO Board](https://github.com/users/EasyChris/projects/3/views/1)
+
 - [x] support for custom page banner
 - [x] update the exsit page
 - [x] support for mult language
@@ -113,41 +401,47 @@ You are welcome to offer it a star if it can benefit you.
 - [x] support tags thank for [@jannikbuscha](https://github.com/jannikbuscha)
 - [ ] transfer the bi-link format like [[]] into the format that Notion supports.
 
-
 # How to use
+
 ## Install the plugin
 
 ### Marketplace download
+
 Open obsidian setting -> Add plugin -> Search -> notion
 
 ![](https://afox-1256168983.cos.ap-shanghai.myqcloud.com/20220628214145.png)
 
 ### BRAT
+
 Enter `BRAT` into the plugin market center to find it.
 Add `EasyChris/obsidian-to-notion` to the list of BRAT plugins that have been installed.
 Return to the plugin center and turn it on.
+
 ### Manual installation
+
 ```
 cd YOUR_OBSIDIAN_FOLDER/.obsidian/plugins/
 git clone https://github.com/EasyChris/obsidian-to-notion.git
 ```
 
-
 ## Apply Notion API
+
 Official reference documentation: [https://developers.notion.com/docs](https://developers.notion.com/docs)
-### Step 1: Create integration.
+
+### Step 1: Create integration
+
 Go to [https://www.notion.com/my-integrations](https://www.notion.com/my-integrations)
 Once created, copy `secrets toekn`
 ![](https://files.readme.io/2ec137d-093ad49-create-integration.gif)
 
-#### Note:
+#### Note
+
 database first custom name must be "Name", otherwise sync to notion will be failed
 
 ![](https://afox-1256168983.cos.ap-shanghai.myqcloud.com/20220618102029.png)
 
-
-
 ### Step 2: Share a database with your integration
+
 Create a new page (with public permissions)
 Create a new database in the page -> you need `full page database`
 ![](./doc/3.gif)
@@ -164,25 +458,25 @@ https://www.notion.so/myworkspace/a8aec43384f447ed84390e8e42c2e089?v=...
 
 ```
 
-
-
 ## Open the plugin configuration
+
 Fill the configuration with the `NOTION_API_KEY` and `DATABASE_ID` you got
 ![](./doc/2.png)
 
 ## Upload file content to notion
-Click the upload notion button
+
+Click the uploadCommand notion button
 ![](./doc/4.png)
-A share link will be automatically generated after successful upload
+A share link will be automatically generated after successful uploadCommand
 ![](./doc/5.png)
 
-
 ## Banner URL [option]
-Banner url must be a image url like: https://i.imgur.com/xxx.jpg
+
+Banner url must be a image url like: <https://i.imgur.com/xxx.jpg>
 If you don't want to use banner, leave it blank
 
-
 ## Convert Tags [option]
+
 Transfer the Obsidian tags to the Notion table.
 It requires the column with the name 'Tags'.
 ![](./doc/7.png)
@@ -191,11 +485,11 @@ Add tags to your notion page
 
 ![](./doc/10.png)
 
-* open plugin convert tags
+- open plugin convert tags
 
 ![](./doc/8.png)
 
-* add tags in the head 
+- add tags in the head
 
 ```markdown
 ---
@@ -206,7 +500,6 @@ this is test tags
 
 ```
 
-
 ```markdown
 ---
 tags:
@@ -219,26 +512,22 @@ this is test tags
 
 ![](./doc/9.png)
 
-Thanks for [@jannikbuscha](https://github.com/jannikbuscha) contribution 
+Thanks for [@jannikbuscha](https://github.com/jannikbuscha) contribution
-
 
 ## Notion ID [option]
+
 Notion ID is the your notion site ID that you want to share the file to.
-if you don't write it, notion will share to the default link like: 
+if you don't write it, notion will share to the default link like:
-https://www.notion.so/myworkspace/a8aec43384f447ed84390 
+<https://www.notion.so/myworkspace/a8aec43384f447ed84390>
-that visit this page need to redirect to your site url 
+that visit this page need to redirect to your site url
-if you write the Notion ID, it will share to the page link like: 
+if you write the Notion ID, it will share to the page link like:
-https://your_user_name.notion.site/myworkspace/a8aec43384f447ed84390. 
+<https://your_user_name.notion.site/myworkspace/a8aec43384f447ed84390>.
 The visiter don't need to redirect url.
 
-
-
 ## Sync image to Notion
 
 To sync images to your oss or cos bucket, use the [Obsidian Image Auto Upload Plugin](https://github.com/renmu123/obsidian-image-auto-upload-plugin).
 
-
-
 # Development
 
 ```
@@ -253,9 +542,6 @@ yarn dev
 node update-version.js
 ./release.sh
 ```
-```
-
-
 
 
 # Thanks
@@ -273,3 +559,6 @@ node update-version.js
 
 # License
 GNU GPLv3
+
+
+</details>

Upload2Notion.ts

@@ -1,203 +0,0 @@
-import { Notice, requestUrl,TFile,normalizePath, App } from "obsidian";
-import { Client } from "@notionhq/client";
-import { markdownToBlocks,  } from "@tryfabric/martian";
-import * as yamlFrontMatter from "yaml-front-matter";
-import * as yaml from "yaml"
-import MyPlugin from "main";
-export class Upload2Notion {
-	app: MyPlugin;
-	notion: Client;
-	agent: any;
-	constructor(app: MyPlugin) {
-		this.app = app;
-	}
-
-	async deletePage(notionID:string){
-		const response = await requestUrl({
-			url: `https://api.notion.com/v1/blocks/${notionID}`,
-			method: 'DELETE',
-			headers: {
-				'Content-Type': 'application/json',
-				'Authorization': 'Bearer ' + this.app.settings.notionAPI,
-				'Notion-Version': '2022-06-28',
-			},
-			body: ''
-		})
-		return response;
-	}
-
-	// 因为需要解析notion的block进行对比，非常的麻烦，
-	// 暂时就直接删除，新建一个page
-	async updatePage(notionID:string, title:string, allowTags:boolean, emoji:string, cover:string, tags:string[], type:string, slug:string, stats:string, category:string, summary:string, paword:string, favicon:string, datetime:string, childArr:any) {
-		await this.deletePage(notionID)
-		const res = await this.createPage(title, allowTags, emoji,cover, tags, type, slug, stats, category, summary, paword, favicon, datetime, childArr)
-		return res
-	}
-
-	async createPage(title:string, allowTags:boolean, emoji:string, cover:string, tags:string[], type:string, slug:string, stats:string, category:string, summary:string, pawrod:string, favicon:string, datetime:string, childArr: any) {
-		const bodyString:any = {
-			parent: {
-				database_id: this.app.settings.databaseID
-			},
-			icon: {
-				emoji: emoji || '📜'
-			},
-			cover: {
-				external: {
-					url: cover || ''
-				}
-			},
-			properties: {
-				title: {
-					title: [
-						{
-							text: {
-								content: title
-							},
-						},
-					],
-				},
-				tags: {
-					multi_select: allowTags && tags !== undefined ? tags.map(tag => {
-						return {"name": tag}
-					}) : [],
-				},
-				type: {
-					select: {
-						name: type || 'Post'
-					}
-				},
-				slug: {
-					rich_text: [
-						{
-							text: {
-								content: slug || ''
-							}
-						}
-					]
-				},
-				status: {
-					select: {
-						name: stats || 'Draft'
-					}
-				},
-				category: {
-					select: {
-						name: category || 'Obsidian'
-					}
-				},
-				summary: {
-					rich_text: [
-						{
-							text: {
-								content: summary || ''
-							}
-						}
-					]
-				},
-				password: {
-					rich_text: [
-						{
-							text: {
-								content: pawrod || ''
-							}
-						}
-					]
-				},
-				icon: {
-					rich_text: [
-						{
-							text: {
-								content: favicon || ''
-							}
-						}
-					]
-				},
-				date: {
-					date: {
-						start: datetime || new Date().toISOString()
-					}
-				}
-			},
-			children: childArr,
-		}
-
-		if(this.app.settings.bannerUrl) {
-			bodyString.cover = {
-				type: "external",
-				external: {
-					url: this.app.settings.bannerUrl
-				}
-			}
-		}
-
-		try {
-			const response = await requestUrl({
-				url: `https://api.notion.com/v1/pages`,
-				method: 'POST',
-				headers: {
-					'Content-Type': 'application/json',
-					// 'User-Agent': 'obsidian.md',
-					'Authorization': 'Bearer ' + this.app.settings.notionAPI,
-					'Notion-Version': '2022-06-28',
-				},
-				body: JSON.stringify(bodyString),
-			})
-			return response;
-		} catch (error) {
-				new Notice(`network error ${error}`)
-		}
-	}
-
-	async syncMarkdownToNotion(title:string, allowTags:boolean, emoji:string, cover:string, tags:string[], type:string, slug:string, stats:string, category:string, summary:string, paword:string, favicon:string, datetime:string, markdown: string, nowFile: TFile, app:App, settings:any): Promise<any> {
-		let res:any
-		const yamlObj:any = yamlFrontMatter.loadFront(markdown);
-		const __content = yamlObj.__content
-		const file2Block = markdownToBlocks(__content);
-		const frontmasster =await app.metadataCache.getFileCache(nowFile)?.frontmatter
-		const notionID = frontmasster ? frontmasster.notionID : null
-
-		if(notionID){
-				res = await this.updatePage(notionID, title, allowTags, emoji, cover, tags, type, slug, stats, category, summary, paword, favicon, datetime, file2Block);
-		} else {
-				res = await this.createPage(title, allowTags, emoji, cover, tags, type, slug, stats, category, summary, paword, favicon, datetime, file2Block);
-		}
-		if (res.status === 200) {
-			await this.updateYamlInfo(markdown, nowFile, res, app, settings)
-		} else {
-			new Notice(`${res.text}`)
-		}
-		return res
-	}
-
-	async updateYamlInfo(yamlContent: string, nowFile: TFile, res: any,app:App, settings:any) {
-		const yamlObj:any = yamlFrontMatter.loadFront(yamlContent);
-		let {url, id} = res.json
-		// replace www to notionID
-		const {notionID} = settings;
-		if(notionID!=="") {
-			// replace url str "www" to notionID
-			url  = url.replace("www.notion.so", `${notionID}.notion.site`)
-		}
-		yamlObj.link = url;
-		try {
-			await navigator.clipboard.writeText(url)
-		} catch (error) {
-			new Notice(`复制链接失败，请手动复制${error}`)
-		}
-		yamlObj.notionID = id;
-		const __content = yamlObj.__content;
-		delete yamlObj.__content
-		const yamlhead = yaml.stringify(yamlObj)
-		//  if yamlhead hava last \n  remove it
-		const yamlhead_remove_n = yamlhead.replace(/\n$/, '')
-		// if __content have start \n remove it
-		const __content_remove_n = __content.replace(/^\n/, '')
-		const content = '---\n' +yamlhead_remove_n +'\n---\n' + __content_remove_n;
-		try {
-			await nowFile.vault.modify(nowFile, content)
-		} catch (error) {
-			new Notice(`write file error ${error}`)
-		}
-	}
-}

esbuild.config.mjs

@@ -1,52 +1,60 @@
 import esbuild from "esbuild";
 import process from "process";
-import builtins from 'builtin-modules'
+import builtins from "builtin-modules";
 
-const banner =
+const banner = `/*
-`/*
 THIS IS A GENERATED/BUNDLED FILE BY ESBUILD
 if you want to view the source, please visit the github repository of this plugin
 */
 `;
+const prod = process.argv[2] === "production";
 
-const prod = (process.argv[2] === 'production');
+const ctx = await esbuild.context({
-
-esbuild.build({
 	banner: {
 		js: banner,
 	},
-	entryPoints: ['main.ts'],
+	entryPoints: ["src/main.ts"],
 	bundle: true,
 	external: [
-		'obsidian',
+		"obsidian",
-		'electron',
+		"electron",
-		'@codemirror/autocomplete',
+		"@codemirror/autocomplete",
-		'@codemirror/closebrackets',
+		"@codemirror/closebrackets",
-		'@codemirror/collab',
+		"@codemirror/collab",
-		'@codemirror/commands',
+		"@codemirror/commands",
-		'@codemirror/comment',
+		"@codemirror/comment",
-		'@codemirror/fold',
+		"@codemirror/fold",
-		'@codemirror/gutter',
+		"@codemirror/gutter",
-		'@codemirror/highlight',
+		"@codemirror/highlight",
-		'@codemirror/history',
+		"@codemirror/history",
-		'@codemirror/language',
+		"@codemirror/language",
-		'@codemirror/lint',
+		"@codemirror/lint",
-		'@codemirror/matchbrackets',
+		"@codemirror/matchbrackets",
-		'@codemirror/panel',
+		"@codemirror/panel",
-		'@codemirror/rangeset',
+		"@codemirror/rangeset",
-		'@codemirror/rectangular-selection',
+		"@codemirror/rectangular-selection",
-		'@codemirror/search',
+		"@codemirror/search",
-		'@codemirror/state',
+		"@codemirror/state",
-		'@codemirror/stream-parser',
+		"@codemirror/stream-parser",
-		'@codemirror/text',
+		"@codemirror/text",
-		'@codemirror/tooltip',
+		"@codemirror/tooltip",
-		'@codemirror/view',
+		"@codemirror/view",
-		...builtins],
+		...builtins,
-	format: 'cjs',
+	],
-	watch: !prod,
+	format: "cjs",
-	target: 'es2016',
+	target: "es2016",
 	logLevel: "info",
-	sourcemap: prod ? false : 'inline',
+	sourcemap: prod ? false : "inline",
 	treeShaking: true,
-	outfile: 'main.js',
+	outfile: "main.js",
-}).catch(() => process.exit(1));
+});
+
+if (!prod) {
+	await ctx.watch();
+} else {
+	await ctx.rebuild();
+	ctx.dispose().then(
+		(r) => console.log("Build completed"),
+		(e) => console.error(e),
+	);
+}

main.ts

@@ -1,259 +0,0 @@
-import {
-	App,
-	Editor,
-	MarkdownView,
-	Modal,
-	Notice,
-	Plugin,
-	PluginSettingTab,
-	Setting,
-	normalizePath
-} from "obsidian";
-import {addIcons}  from 'icon';
-import { Upload2Notion } from "Upload2Notion";
-import {NoticeMConfig} from "Message";
-import { CLIENT_RENEG_LIMIT } from "tls";
-
-
-// Remember to rename these classes and interfaces!
-
-interface PluginSettings {
-	notionAPI: string;
-	databaseID: string;
-	bannerUrl: string;
-	notionID: string;
-	proxy: string;
-	allowTags: boolean;
-}
-
-const langConfig =  NoticeMConfig( window.localStorage.getItem('language') || 'en')
-
-const DEFAULT_SETTINGS: PluginSettings = {
-	notionAPI: "",
-	databaseID: "",
-	bannerUrl: "",
-	notionID: "",
-	proxy: "",
-	allowTags: false
-};
-
-export default class ObsidianSyncNotionPlugin extends Plugin {
-	settings: PluginSettings;
-	async onload() {
-		await this.loadSettings();
-		addIcons();
-		// This creates an icon in the left ribbon.
-		const ribbonIconEl = this.addRibbonIcon(
-			"notion-logo",
-			"Share to NotionNext",
-			async (evt: MouseEvent) => {
-				// Called when the user clicks the icon.
-				this.upload();
-			}
-		);
-
-		// This adds a status bar item to the bottom of the app. Does not work on mobile apps.
-		const statusBarItemEl = this.addStatusBarItem();
-		// statusBarItemEl.setText("share to notion");
-
-		this.addCommand({
-			id: "share-to-notionnext",
-			name: "share to notionnext",
-			editorCallback: async (editor: Editor, view: MarkdownView) => {
-				this.upload()
-			},
-		});
-
-
-		// This adds a settings tab so the user can configure various aspects of the plugin
-		this.addSettingTab(new SampleSettingTab(this.app, this));
-
-	}
-
-	onunload() {}
-
-	async upload(){
-		const { notionAPI, databaseID, allowTags } = this.settings;
-				if (notionAPI === "" || databaseID === "") {
-					new Notice(
-						"Please set up the notion API and database ID in the settings tab."
-					);
-					return;
-				}
-				const { markDownData, nowFile, emoji, cover, tags, type, slug, stats, category, summary, paword, favicon, datetime } =await this.getNowFileMarkdownContent(this.app);
-
-				if (markDownData) {
-					const { basename } = nowFile;
-					const upload = new Upload2Notion(this);
-					const res = await upload.syncMarkdownToNotion(basename, allowTags, emoji, cover, tags, type, slug, stats, category, summary, paword, favicon, datetime, markDownData, nowFile, this.app, this.settings)
-					if(res.status === 200){
-						new Notice(`${langConfig["sync-success"]}${basename}`)
-					}else {
-						new Notice(`${langConfig["sync-fail"]}${basename}`, 5000)
-					}
-				}
-	}
-
-	async getNowFileMarkdownContent(app: App) {
-		const nowFile = app.workspace.getActiveFile();
-		const { allowTags } = this.settings;
-		let emoji = ''
-		let cover = ''
-		let tags = []
-		let type = ''
-		let slug = ''
-		let stats = ''
-		let category = ''
-		let summary = ''
-		let paword = ''
-		let favicon = ''
-		let datetime = ''
-
-		const FileCache = app.metadataCache.getFileCache(nowFile)
-		try {
-			if(allowTags) {
-				emoji = FileCache.frontmatter.titleicon;
-				cover = FileCache.frontmatter.coverurl;
-				tags = FileCache.frontmatter.tags;
-				type = FileCache.frontmatter.type;
-				slug = FileCache.frontmatter.slug;
-				stats = FileCache.frontmatter.stats;
-				category = FileCache.frontmatter.category;
-				summary = FileCache.frontmatter.summary;
-				paword = FileCache.frontmatter.password;
-				favicon = FileCache.frontmatter.icon;
-				datetime = FileCache.frontmatter.date;
-			}
-		} catch (error) {
-			new Notice(langConfig["set-tags-fail"]);
-		}
-		if (nowFile) {
-			const markDownData = await nowFile.vault.read(nowFile);
-			return {
-				markDownData,
-				nowFile,
-				emoji,
-				cover,
-				tags,
-				type,
-				slug,
-				stats,
-				category,
-				summary,
-				paword,
-				favicon,
-				datetime,
-			};
-		} else {
-			new Notice(langConfig["open-file"]);
-			return;
-		}
-	}
-
-	async loadSettings() {
-		this.settings = Object.assign(
-			{},
-			DEFAULT_SETTINGS,
-			await this.loadData()
-		);
-	}
-
-	async saveSettings() {
-		await this.saveData(this.settings);
-	}
-}
-
-class SampleSettingTab extends PluginSettingTab {
-	plugin: ObsidianSyncNotionPlugin;
-
-	constructor(app: App, plugin: ObsidianSyncNotionPlugin) {
-		super(app, plugin);
-		this.plugin = plugin;
-	}
-
-	display(): void {
-		const { containerEl } = this;
-
-		containerEl.empty();
-
-		containerEl.createEl("h2", {
-			text: "Settings for obsidian to NotionNext plugin.",
-		});
-
-		new Setting(containerEl)
-			.setName("Notion API Token")
-			.setDesc("It's a secret")
-			.addText((text) =>{
-				let t = text
-				.setPlaceholder("Enter your Notion API Token")
-				.setValue(this.plugin.settings.notionAPI)
-				.onChange(async (value) => {
-					this.plugin.settings.notionAPI = value;
-					await this.plugin.saveSettings();
-				})
-				// t.inputEl.type = 'password'
-				return t
-			});
-
-
-		const notionDatabaseID = new Setting(containerEl)
-			.setName("Database ID")
-			.setDesc("It's a secret")
-			.addText((text) => {
-				let t = text
-				.setPlaceholder("Enter your Database ID")
-				.setValue(this.plugin.settings.databaseID)
-				.onChange(async (value) => {
-					this.plugin.settings.databaseID = value;
-					await this.plugin.saveSettings();
-				})
-				// t.inputEl.type = 'password'
-				return t
-			}
-
-			);
-
-			// notionDatabaseID.controlEl.querySelector('input').type='password'
-
-			new Setting(containerEl)
-			.setName("Banner url(optional)")
-			.setDesc("page banner url(optional), default is empty, if you want to show a banner, please enter the url(like:https://raw.githubusercontent.com/EasyChris/obsidian-to-notion/ae7a9ac6cf427f3ca338a409ce6967ced9506f12/doc/2.png)")
-			.addText((text) =>
-				text
-					.setPlaceholder("Enter banner pic url: ")
-					.setValue(this.plugin.settings.bannerUrl)
-					.onChange(async (value) => {
-						this.plugin.settings.bannerUrl = value;
-						await this.plugin.saveSettings();
-					})
-			);
-
-
-			new Setting(containerEl)
-			.setName("Notion ID(optional)")
-			.setDesc("Your notion ID(optional),share link likes:https://username.notion.site/,your notion id is [username]")
-			.addText((text) =>
-				text
-					.setPlaceholder("Enter notion ID(options) ")
-					.setValue(this.plugin.settings.notionID)
-					.onChange(async (value) => {
-						this.plugin.settings.notionID = value;
-						await this.plugin.saveSettings();
-					})
-			);
-
-
-			new Setting(containerEl)
-			.setName("Convert tags(optional)")
-			.setDesc("Transfer the Obsidian tags to the Notion table. It requires the column with the name 'Tags'")
-			.addToggle((toggle) =>
-				toggle
-					.setValue(this.plugin.settings.allowTags)
-					.onChange(async (value) => {
-						this.plugin.settings.allowTags = value;
-						await this.plugin.saveSettings();
-					})
-			);
-
-	}
-}

manifest.json

@@ -1,10 +1,10 @@
 {
   "id": "share-to-notionnext",
   "name": "Share to NotionNext",
-  "version": "0.0.6",
+  "version": "2.2.5",
   "minAppVersion": "0.0.1",
-  "description": "This is a  plugin for Obsidian. This plugin shares obsidian md file to notion with notion api for NotionNext web deploy.",
+  "description": "Shares obsidian md file to notion with notion api for NotionNext web deploy, originally created by EasyChris/obsidian-to-notion.",
-  "author": "jxpeng98",
+  "author": "EasyChris, jxpeng98",
-  "authorUrl": "https://github.com/jxpeng98/obsidian-to-NotionNext",
+  "authorUrl": "https://github.com/jxpeng98",
   "isDesktopOnly": false
 }

obsidian_template.md

@@ -8,10 +8,11 @@
 # 现在阶段一定不要修改表头的名字， please do not change the name of the header in YAML front matter
 # !!!!!!!!!!!!
 titleicon: 📎 # default is 📜， 默认是📜
+date: 2023-07-23 # default is today， 默认是今天。 Format is YYYY-MM-DD， 格式是YYYY-MM-DD
 coverurl: https://img.jxpeng.dev/2023/08/843e27a210847f05a0f7cfb121fec100.jpg # default is empty， 默认是空
 type: Post # Post or Page, default is Post， 默认是Post
 slug: test # slug for url, default is empty， 默认是空
-stats: Draft # Draft, Invisible, Published, default is Draft， 默认是Draft
+status: Draft # Draft, Invisible, Published, default is Draft， 默认是Draft
 category: test # default is 'Obsidian'， 默认是'Obsidian'
 summary: this is a summary for test post # default is empty， 默认是空
 icon: fa-solid fa-camera # you can ignore this, default is empty， 默认是空，可直接删除

package.json

@@ -1,8 +1,8 @@
 {
   "name": "share-to-notionnext",
-  "version": "0.0.6",
+  "version": "2.2.5",
   "type": "module",
-  "description": "This is a plugin for Obsidian. This plugin share obsidian md file to notion with notion api for NotionNext web deploy.",
+  "description": "Shares obsidian md file to notion with notion api for NotionNext web deploy, originally created by EasyChris/obsidian-to-notion.",
   "main": "main.js",
   "scripts": {
     "dev": "node esbuild.config.mjs",
@@ -13,20 +13,22 @@
   "author": "",
   "license": "GNU GPLv3",
   "devDependencies": {
-    "@types/node": "^17.0.35",
+    "@types/node": "^20.5.7",
-    "@types/yaml-front-matter": "^4.1.0",
+    "@types/yaml-front-matter": "^4.1.3",
-    "@typescript-eslint/eslint-plugin": "^5.2.0",
+    "@typescript-eslint/eslint-plugin": "^6.16.0",
-    "@typescript-eslint/parser": "^5.2.0",
+    "@typescript-eslint/parser": "^6.16.0",
-    "builtin-modules": "^3.2.0",
+    "builtin-modules": "^3.3.0",
-    "esbuild": "0.13.12",
+    "esbuild": "0.19.5",
     "obsidian": "latest",
-    "tslib": "2.3.1",
+    "tslib": "2.6.2",
-    "typescript": "4.4.4"
+    "typescript": "5.2.2"
   },
   "dependencies": {
-    "@tryfabric/martian": "^1.2.0",
+    "@tryfabric/martian": "^1.2.4",
-    "https-proxy-agent": "^5.0.1",
+    "https-proxy-agent": "^7.0.2",
-    "yaml": "^2.2.2",
+    "process": "^0.11.10",
+    "remark-math": "^6.0.0",
+    "yaml": "^2.3.4",
     "yaml-front-matter": "^4.1.1"
   }
 }

release.sh

@@ -3,4 +3,4 @@ node update-version.js $1
 git add .
 git commit -m "Update version to $1"
 git tag -a $1 -m $1
-git push origin $1
+git push origin $1

src/commands/FuzzySuggester.ts

@@ -0,0 +1,51 @@
+import { FuzzySuggestModal, FuzzyMatch } from 'obsidian';
+import MyPlugin from "../main";
+import { i18nConfig } from "../lang/I18n";
+
+/**
+ * Simple interface for what should be displayed and stored for suggester
+ */
+export interface DatabaseList {
+    name: string,        // specific database name
+    match: any               //
+}
+
+
+export class FuzzySuggester extends FuzzySuggestModal<DatabaseList>{
+    private plugin: MyPlugin;
+    private data: DatabaseList[];
+    private callback: any;
+
+    constructor(plugin: MyPlugin) {
+        super(plugin.app);
+        this.plugin = plugin;
+        this.setPlaceholder(i18nConfig.PlaceHolder);
+    }
+
+    setSuggesterData(suggesterData: Array<DatabaseList>): void { this.data = suggesterData }
+
+    async display(callBack: (item: DatabaseList, evt: MouseEvent | KeyboardEvent) => void): Promise<any> {
+        this.callback = callBack;
+        this.open();
+    }
+
+    // Store the data
+    getItems(): DatabaseList[] {
+        return this.data
+    }
+
+    getItemText(item: DatabaseList): string {
+        return item.name
+    }
+
+    onChooseItem(item: DatabaseList, evt: MouseEvent | KeyboardEvent): void { }
+
+    onChooseSuggestion(item: FuzzyMatch<DatabaseList>, evt: MouseEvent | KeyboardEvent): void {
+        this.callback(item.item, evt)
+    }
+
+    renderSuggestion(item: FuzzyMatch<DatabaseList>, el: HTMLElement): void {
+        el.createEl('div', { text: item.item.name })
+    }
+
+}

src/commands/NotionCommands.ts

@@ -0,0 +1,107 @@
+import { i18nConfig } from "src/lang/I18n";
+import {Editor, MarkdownView, setTooltip} from "obsidian";
+import { FuzzySuggester, DatabaseList } from "./FuzzySuggester";
+import {uploadCommandCustom, uploadCommandGeneral, uploadCommandNext} from "../upload/uploadCommand";
+import ObsidianSyncNotionPlugin from "src/main";
+import {DatabaseDetails} from "../ui/settingTabs";
+
+
+interface Command {
+	id: string;
+	name: string;
+	editorCallback: (editor: Editor, view: MarkdownView) => Promise<void>;
+}
+
+
+// create the commands list
+export default class RibbonCommands {
+	plugin: ObsidianSyncNotionPlugin;
+
+	Ncommand: Command[] = [];
+
+	constructor(plugin: ObsidianSyncNotionPlugin) {
+		this.plugin = plugin;
+
+		// iterate through the database detail
+
+		for (let key in this.plugin.settings.databaseDetails) {
+			let dbDetails = this.plugin.settings.databaseDetails[key];
+			this.addCommandForDatabase(dbDetails);
+		}
+
+		// Register all the commands
+		this.Ncommand.forEach(command => {
+			this.plugin.addCommand(
+				{
+					id: command.id,
+					name: command.name,
+					editorCallback: command.editorCallback,
+				}
+			);
+		});
+	}
+
+	async ribbonDisplay() {
+		const NcommandList: DatabaseList[] = [];
+
+		this.Ncommand.map(command => NcommandList.push(
+			{
+				name: command.name,
+				match: command.editorCallback
+			}
+		)
+		);
+
+		const fusg = new FuzzySuggester(this.plugin);
+
+		fusg.setSuggesterData(NcommandList);
+		await fusg.display(async (results) => { await results.match() })
+	};
+
+	// if the setting has been changed, try to rebuild the command list
+	async updateCommand() {
+
+		this.Ncommand = [];
+
+		for (let key in this.plugin.settings.databaseDetails) {
+			let dbDetails = this.plugin.settings.databaseDetails[key];
+			this.addCommandForDatabase(dbDetails);
+		}
+
+		this.Ncommand.forEach(command => {
+			this.plugin.addCommand(
+				{
+					id: command.id,
+					name: command.name,
+					editorCallback: command.editorCallback,
+				}
+			);
+		});
+	}
+
+	private addCommandForDatabase(dbDetails: DatabaseDetails) {
+		// Example logic - adjust based on your specific requirements
+		let commandId = `share-to-${dbDetails.abName}`;
+		let commandName = `Share to ${dbDetails.fullName} (${dbDetails.abName})`; // or use a translated name
+
+		let editorCallback: (editor: Editor, view: MarkdownView) => Promise<void>;
+		if (dbDetails.format === 'next') {
+			editorCallback = async (editor, view) => {
+				await uploadCommandNext(this.plugin, this.plugin.settings, dbDetails, this.plugin.app);
+			};
+		} else if (dbDetails.format === 'general') {
+			editorCallback = async (editor, view) => {
+				await uploadCommandGeneral(this.plugin, this.plugin.settings, dbDetails, this.plugin.app);
+			};
+		}
+		else if (dbDetails.format === 'custom') {
+			editorCallback = async (editor, view) => {
+				await uploadCommandCustom(this.plugin, this.plugin.settings, dbDetails, this.plugin.app);
+			};
+		}
+
+		this.Ncommand.push({ id: commandId, name: commandName, editorCallback });
+	}
+
+
+}

src/lang/I18n.ts

@@ -0,0 +1,17 @@
+import {en} from "./locale/en";
+import {zh} from "./locale/zh";
+import {ja} from "./locale/ja";
+
+export const I18n: {[key: string]:any} = {
+	en,
+	zh,
+	ja,
+};
+
+export const I18nConfig = (lang: string): any => {
+    return I18n[lang];
+};
+
+const storedLanguage = window.localStorage.getItem("language");
+
+export const i18nConfig = I18n[storedLanguage || window.navigator.language.split('-')[0] || "en"];

src/lang/locale/en.ts

@@ -0,0 +1,76 @@
+export const en = {
+	databaseFormat: "Database Format",
+	databaseFormatDesc: "Select the database format you want to sync to NotionNext or General",
+	databaseNext: "NotionNext",
+	databaseGeneral: "General",
+	databaseCustom: "Custom",
+	databaseFullName: "Database Full Name",
+	databaseFullNameDesc: "Please give a full name for your database",
+	databaseFullNameText: "Enter your database full name",
+	databaseAbbreviateName: "Database Abbreviate Name",
+	databaseAbbreviateNameDesc: "Please give a nick name for your database",
+	databaseAbbreviateNameText: "Enter your database nick name",
+	ribbonIcon: "Share to NotionNext",
+	GeneralSetting: "General information Settings",
+	CommandID: "share-to-notionnext",
+	CommandName: "Share to NotionNext Database",
+	CommandIDGeneral: "share-to-notion",
+	CommandNameGeneral: "Share to Notion General Database",
+	NotionNextButton: "NotionNext Sync",
+	NotionNextButtonDesc: "Open this option, Sync to NotionNext command will be displayed in the command palette (default: ON)",
+	NotionNextSettingHeader: "NotionNext Database Settings",
+	NotionAPI: "Notion API Token",
+	NotionAPIDesc: "Generate from https://www.notion.so/my-integrations",
+	NotionAPIText: "Enter your Notion API Token",
+	DatabaseID: "Database ID",
+	DatabaseIDDesc: "Collect from the top-right Share --> Publish",
+	DatabaseIDText: "Enter your Database ID",
+	BannerUrl: "Banner url (optional)",
+	BannerUrlDesc:
+"Default is empty, if you want to show a banner, please enter the url (like: https://abc.com/b.png)",
+	BannerUrlText: "Enter your banner url",
+	NotionUser: "Notion ID (username, optional)",
+	NotionUserDesc:
+"Collect from share link likes:https://username.notion.site. Your notion id is [username]",
+	NotionUserText: "Enter your notion ID",
+	NotionGeneralSettingHeader: "General Notion Database Settings",
+	NotionGeneralButton: "Notion General Sync",
+	NotionGeneralButtonDesc: "Open this option, Sync to Notion General Database command will be displayed in the command palette (default: ON)",
+	NotionTagButton: "Notion Tags Sync",
+	NotionTagButtonDesc: "Sync Tags to Notion General Database (default: ON)",
+	NotionCustomTitle: "Customise title property",
+	NotionCustomTitleDesc: "Modify the column name of the Notion database (default: OFF)",
+	NotionCustomTitleName: "Preferred title name",
+	NotionCustomTitleNameDesc: "Enter the preferred title name for the first column of the Notion database (default: title)",
+	NotionCustomTitleText: "Enter the name",
+	NotionCustomValues: "Customise values property",
+	NotionCustomValuesDesc: "Modify the column name of the Notion database，one per line",
+	NotionCustomValuesText: "Enter all properties that you want to sync",
+	NotYetFinish:
+"Not finished. This function will be available in the next version",
+	PlaceHolder: "Enter database Name",
+	"notion-logo": "Share to NotionNext",
+	"sync-success": "Sync to NotionNext success: \n",
+	"sync-fail": "Sync to NotionNext fail: \n",
+	"open-notion": "Please open the file that needs to be synchronized",
+	"config-secrets-notion-api":
+"Please set up the notion API in the settings tab.",
+	"config-secrets-database-id":
+"Please set up the database id in the settings tab.",
+	"set-tags-fail":
+"Set tags fail,please check the frontmatter of the file or close the tag switch in the settings tab.",
+	NNonMissing:
+"The 'NNon' property is missing in the settings. Please set it up.",
+	"set-api-id":
+"Please set up the notion API and database ID in the settings tab.",
+	NotionCustomSettingHeader: "Notion Custom Database Settings",
+	NotionCustomButton: "Notion Customised command switch",
+	NotionCustomButtonDesc: "Open this option, Sync to Notion Customised Database command will be displayed in the command palette",
+	CustomPropertyName: "Property Name",
+	CustomPropertyFirstColumn: "Title Column",
+	CustomPropertyFirstColumnDesc: "The title of the page, must be the first property",
+	CustomProperty: "Property",
+	AddCustomProperty: "Add Custom Property",
+	AddNewProperty: "Add New Property",
+	AddNewPropertyDesc: "Add new property match with your notion database",
+}

src/lang/locale/ja.ts

@@ -0,0 +1,68 @@
+export const ja = {
+	databaseFormat: "データベース形式",
+	databaseFormatDesc: "同期したいデータベース形式を選択してください",
+	databaseNext: "NotionNext",
+	databaseGeneral: "一般的なNotion",
+	databaseCustom: "カスタム",
+	databaseFullName: "データベースの全称",
+	databaseFullNameDesc: "データベースの全称を入力してください",
+	databaseFullNameText: "データベースの全称を入力",
+	databaseAbbreviateName: "データベースの略称",
+	databaseAbbreviateNameDesc: "データベースの略称を入力してください",
+	databaseAbbreviateNameText: "データベースの略称を入力",
+    ribbonIcon: "NotionNextで共有",
+    GeneralSetting: "一般設定",
+    CommandID: "share-to-notionnext",
+    CommandName: "NotionNextデータベースに共有",
+    CommandIDGeneral: "share-to-notion",
+    CommandNameGeneral: "一般的なNotionデータベースに共有",
+    NotionNextButton: "NotionNext同期",
+    NotionNextButtonDesc: "このオプションを開くと、NotionNext同期コマンドがコマンドパレットに表示されます（デフォルト：ON）",
+    NotionNextSettingHeader: "NotionNextデータベース設定",
+    NotionAPI: "Notion API トークン",
+    NotionAPIDesc: "https://www.notion.so/my-integrations から生成してください",
+    NotionAPIText: "Notion API トークンを入力",
+    DatabaseID: "データベースID",
+	DatabaseIDDesc: "右上の共有 --> 公開から取得してください",
+    DatabaseIDText: "データベースIDを入力",
+    BannerUrl: "バナーのURL（任意）",
+    BannerUrlDesc: "デフォルトは空白です。バナーを表示したい場合は、URLを入力してください（例：https://abc.com/b.png）",
+    BannerUrlText: "バナーのURLを入力",
+    NotionUser: "Notion ID（ユーザー名、任意）",
+    NotionUserDesc: "共有リンクから取得（例：https://username.notion.site）。Notion IDは[username]です",
+    NotionUserText: "Notion IDを入力",
+    NotionGeneralSettingHeader: "一般的なNotionデータベース設定",
+    NotionGeneralButton: "一般的なNotion同期",
+    NotionGeneralButtonDesc: "このオプションを開くと、一般的なNotionデータベース同期コマンドがコマンドパレットに表示されます（デフォルト：ON）",
+    NotionTagButton: "Notionタグ同期",
+    NotionTagButtonDesc: "タグを一般的なNotionデータベースに同期（デフォルト：ON）",
+    NotionCustomTitle: "タイトルのカスタマイズ",
+    NotionCustomTitleDesc: "Notionデータベースの列名を変更（デフォルト：OFF）",
+    NotionCustomTitleName: "希望のタイトル名",
+    NotionCustomTitleNameDesc: "Notionデータベースの最初の列のための希望のタイトル名を入力（デフォルト：title）",
+    NotionCustomTitleText: "名前を入力",
+    NotionCustomValues: "値のカスタマイズ",
+    NotionCustomValuesDesc: "Notionデータベースの列名を変更、1行に1つ",
+    NotionCustomValuesText: "同期したいすべてのプロパティを入力",
+    NotYetFinish: "未完了。この機能は次のバージョンで利用可能になります",
+    PlaceHolder: "データベース名を入力",
+    "notion-logo": "NotionNextで共有",
+    "sync-success": "NotionNextへの同期に成功：\n",
+    "sync-fail": "NotionNextへの同期に失敗：\n",
+    "open-notion": "同期が必要なファイルを開いてください",
+    "config-secrets-notion-api": "設定タブでNotion APIを設定してください",
+    "config-secrets-database-id": "設定タブでデータベースIDを設定してください",
+    "set-tags-fail": "タグの設定に失敗。ファイルのfrontmatterを確認するか、設定タブでタグのスイッチをオフにしてください",
+    NNonMissing: "設定に 'NNon' プロパティがありません。設定してください",
+    "set-api-id": "設定タブでNotion APIおよびデータベースIDを設定してください",
+    NotionCustomSettingHeader: "Notionカスタムデータベース設定",
+    NotionCustomButton: "Notionカスタマイズコマンドの切り替え",
+    NotionCustomButtonDesc: "このオプションを開くと、Notionカスタムデータベース同期コマンドがコマンドパレットに表示されます",
+	CustomPropertyName: "カスタムプロパティ名",
+	CustomPropertyFirstColumn: "最初の列のカスタムプロパティ名",
+	CustomPropertyFirstColumnDesc: "最初の列のカスタムプロパティ名を入力してください",
+	CustomProperty: "カスタムプロパティ",
+	AddCustomProperty: "カスタムプロパティを追加",
+	AddNewProperty: "新しいプロパティを追加",
+	AddNewPropertyDesc: "新しいプロパティを追加してください",
+};

src/lang/locale/zh.ts

@@ -0,0 +1,71 @@
+export const zh = {
+	databaseFormat: "数据库格式",
+	databaseFormatDesc: "选择你想要同步的数据库格式Next 或者 普通",
+	databaseNext: "NotionNext",
+	databaseGeneral: "普通",
+	databaseCustom: "自定义",
+	databaseFullName: "数据库全称",
+	databaseFullNameDesc: "给你的数据库起一个全称",
+	databaseFullNameText: "输入你的数据库全称",
+	databaseAbbreviateName: "数据库简称",
+	databaseAbbreviateNameDesc: "给你的数据库起一个简称",
+	databaseAbbreviateNameText: "输入你的数据库简称",
+	ribbonIcon: "分享到 NotionNext",
+	GeneralSetting: "通用设置",
+	CommandID: "share-to-notionnext",
+	CommandName: "分享到 NotionNext",
+	CommandIDGeneral: "share-to-notion",
+	CommandNameGeneral: "分享到 Notion 普通数据库",
+	NotionNextButton: "NotionNext 同步",
+	NotionNextButtonDesc: "打开此选项，NotionNext 同步将显示在命令面板中（默认：开）",
+	NotionNextSettingHeader: "NotionNext 数据库参数设置",
+	NotionAPI: "Notion API 令牌",
+	NotionAPIDesc: "从 https://www.notion.so/my-integrations 生成",
+	NotionAPIText: "输入你的 Notion API 令牌",
+	DatabaseID: "数据库 ID",
+	DatabaseIDDesc: "从右上角的分享 --> 发布中获取",
+	DatabaseIDText: "输入你的数据库 ID",
+	BannerUrl: "封面图片地址（可选）",
+	BannerUrlDesc:
+		"默认为空，如果你想显示封面图片，请输入图片地址（例如：https://abc.com/b.png）",
+	BannerUrlText: "输入你的封面图片地址",
+	NotionUser: "Notion ID（用户名，可选）",
+	NotionUserDesc:
+		"数据库分享链接类似：https://username.notion.site/。你的 Notion ID 是 [username]",
+	NotionUserText: "输入你的 Notion ID",
+	NotionGeneralSettingHeader: "普通 Notion 数据库设置",
+	NotionGeneralButton: "普通数据库同步",
+	NotionGeneralButtonDesc: "打开此选项，同步到普通数据库命令将显示在命令面板中（默认：开）",
+	NotionTagButton: "标签同步开关",
+	NotionTagButtonDesc: "将标签同步到普通数据库（默认：开）",
+	NotionCustomTitle: "修改 Notion 数据库表头开关",
+	NotionCustomTitleDesc: "自定义Notion 数据库第一列表头名（默认：关）",
+	NotionCustomTitleName: "想要修改的表头名",
+	NotionCustomTitleNameDesc: "输入你想要修改的notion数据库的表头名（默认：title）",
+	NotionCustomTitleText: "输入表头名",
+	NotionCustomValues: "自定义Notion 数据库表头",
+	NotionCustomValuesDesc: "自定义Notion 数据库表头，每行一个",
+	NotionCustomValuesText: "输入你想要同步的所有属性",
+	NotYetFinish: "未完成。此功能将在之后版本中提供",
+	PlaceHolder: "输入数据库名称",
+	"notion-logo": "分享到NotionNext",
+	"sync-success": "同步到NotionNext成功:\n",
+	"sync-fail": "同步到NotionNext失败: \n",
+	"open-file": "请打开需要同步的文件",
+	"config-secrets-notion-api": "请在插件设置中添加notion API",
+	"config-secrets-database-id": "请在插件设置中添加database id",
+	"set-tags-fail":
+		"设置标签失败,请检查文件的frontmatter,或者在插件设置中关闭设置tags开关",
+	NNonMissing: "未设置'NNon'属性，请在插件设置中选择NotionNext数据库。",
+	"set-api-id": "请在插件设置中设置notion API和database ID",
+	NotionCustomSettingHeader: "Notion 自定义数据库设置",
+	NotionCustomButton: "Notion 自定义数据库同步命令开关",
+	NotionCustomButtonDesc: "打开此选项，同步到自定义数据库命令将显示在命令面板中",
+	CustomPropertyName: "自定义属性名",
+	CustomPropertyFirstColumn: "第一列属性名",
+	CustomPropertyFirstColumnDesc: "第一列必须为标题属性名",
+	CustomProperty: "自定义属性",
+	AddCustomProperty: "添加自定义属性",
+	AddNewProperty: "添加新属性",
+	AddNewPropertyDesc: "添加一个和Notion数据库匹配的新属性",
+}

src/main.ts

@@ -0,0 +1,89 @@
+import { App, Editor, MarkdownView, Notice, Plugin, PluginSettingTab, Setting } from "obsidian";
+import { addIcons } from 'src/ui/icon';
+import { Upload2NotionGeneral } from "src/upload/upload_general/Upload2NotionGeneral";
+import { Upload2NotionNext } from "src/upload/upload_next/Upload2NotionNext";
+import { i18nConfig } from "src/lang/I18n";
+import ribbonCommands from "src/commands/NotionCommands";
+import { ObsidianSettingTab, PluginSettings, DEFAULT_SETTINGS, DatabaseDetails } from "src/ui/settingTabs";
+
+// Remember to rename these classes and interfaces!
+
+
+export default class ObsidianSyncNotionPlugin extends Plugin {
+    settings: PluginSettings;
+    commands: ribbonCommands;
+    app: App;
+
+    async onload() {
+        await this.loadSettings();
+        this.commands = new ribbonCommands(this);
+
+        addIcons();
+        // This creates an icon in the left ribbon.
+        const ribbonIconEl = this.addRibbonIcon(
+            "notion-logo",
+            i18nConfig.ribbonIcon,
+            async (evt: MouseEvent) => {
+                // Called when the user clicks the icon.
+                // await this.uploadCommand();
+                await this.commands.ribbonDisplay();
+            }
+        );
+
+        // This adds a status bar item to the bottom of the app. Does not work on mobile apps.
+
+        // const statusBarItemEl = this.addStatusBarItem();
+        // // statusBarItemEl.setText("share to notion");
+
+        // This adds a settings tab so the user can configure various aspects of the plugin
+        this.addSettingTab(new ObsidianSettingTab(this.app, this));
+
+    }
+
+    onunload() {
+    }
+
+    async loadSettings() {
+        this.settings = Object.assign(
+            {},
+            DEFAULT_SETTINGS,
+            await this.loadData()
+        );
+    }
+
+    async saveSettings() {
+        await this.saveData(this.settings);
+    }
+
+	async addDatabaseDetails(dbDetails: DatabaseDetails) {
+		this.settings.databaseDetails = {
+			...this.settings.databaseDetails,
+			[dbDetails.abName]: dbDetails,
+		};
+
+		await this.saveSettings();
+	}
+
+	async deleteDatabaseDetails(dbDetails: DatabaseDetails) {
+		delete this.settings.databaseDetails[dbDetails.abName];
+
+		await this.saveSettings();
+	}
+
+	async updateDatabaseDetails(dbDetails: DatabaseDetails) {
+		// delete the old database details
+		delete this.settings.databaseDetails[dbDetails.abName];
+
+		this.settings.databaseDetails = {
+			...this.settings.databaseDetails,
+			[dbDetails.abName]: dbDetails,
+		};
+
+		await this.saveSettings();
+	}
+	
+}
+
+
+
+

src/ui/CustomModal.ts

@@ -0,0 +1,162 @@
+import {App, Modal, Setting} from "obsidian";
+import ObsidianSyncNotionPlugin from "../main";
+import {ObsidianSettingTab} from "./settingTabs";
+import {i18nConfig} from "../lang/I18n";
+
+export class CustomModal extends Modal {
+	propertyLines: Setting[] = []; // Store all property line settings
+	properties: { customName: string, customType: string }[] = []; // Array to store property values and types
+	plugin: ObsidianSyncNotionPlugin;
+	settingTab: ObsidianSettingTab;
+
+	constructor(app: App) {
+		super(app);
+	}
+
+	createPropertyLine(containerEl: HTMLElement): void {
+		const propertyIndex = this.properties.length;
+		this.properties.push({customName: "", customType: ""}); // Initialize with empty values
+
+		const propertyLine = new Setting(containerEl)
+
+		if (propertyIndex === 0) {
+			propertyLine
+				.setName(i18nConfig.CustomPropertyFirstColumn)
+				.setDesc(i18nConfig.CustomPropertyFirstColumnDesc)
+
+				propertyLine.addText((text) => {
+					text
+						.setPlaceholder("Property name")
+						.setValue("")
+						.onChange(async (value) => {
+							this.properties[propertyIndex].customName = value; // Update the customValue of the specific property
+						});
+
+				}
+			)
+
+			propertyLine.addDropdown((dropdown) => {
+					dropdown
+						.addOption("title", "Title")
+						.setValue("")
+						.onChange(async (value) => {
+							this.properties[propertyIndex].customType = value; // Update the customType of the specific property
+						});
+				}
+		)
+		} else {
+			propertyLine
+			.setName(i18nConfig.CustomProperty + (propertyIndex))
+
+		propertyLine.addText((text) => {
+				text
+					.setPlaceholder(i18nConfig.CustomPropertyName)
+					.setValue("")
+					.onChange(async (value) => {
+						this.properties[propertyIndex].customName = value; // Update the customValue of the specific property
+					});
+			}
+		)
+
+		propertyLine.addDropdown((dropdown) => {
+				dropdown
+					// .addOption("none", '')
+					.addOption("text", "Text")
+					.addOption("number", "Number")
+					.addOption("select", "Select")
+					.addOption("multi_select", "Multi-Select")
+					.addOption("date", "Date")
+					// .addOption("person", "Person")
+					.addOption("files", "Files & Media")
+					.addOption("checkbox", "Checkbox")
+					.addOption("url", "URL")
+					.addOption("email", "Email")
+					.addOption("phone_number", "Phone Number")
+					// .addOption("formula", "Formula")
+					// .addOption("relation", "Relation")
+					// .addOption("rollup", "Rollup")
+					// .addOption("created_time", "Created time")
+					// .addOption("created_by", "Created by")
+					// .addOption("last_edited_time", "Last Edited Time")
+					// .addOption("last_edited_by", "Last Edited By")
+					.setValue("")
+					.onChange(async (value) => {
+						this.properties[propertyIndex].customType = value; // Update the customType of the specific property
+					});
+			}
+		)
+
+		propertyLine.addButton((button) => {
+				return button
+					.setTooltip("Delete")
+					.setIcon("trash")
+					.onClick(async () => {
+						// Handle the deletion of this property line
+						this.propertyLines = this.propertyLines.filter(line => line !== propertyLine);
+						this.properties.splice(propertyIndex, 1); // Remove the property from the array
+						propertyLine.settingEl.remove();
+					});
+			}
+		);
+		}
+		this.propertyLines.push(propertyLine);
+	}
+
+
+	display(): void {
+
+		this.containerEl.addClass("custom-modal");
+		this.titleEl.setText(i18nConfig.AddCustomProperty);
+
+		let {contentEl} = this;
+		contentEl.empty();
+
+		const customDiv = contentEl.createDiv("custom-div");
+
+		new Setting(customDiv)
+			.setName(i18nConfig.AddNewProperty)
+			.setDesc(i18nConfig.AddNewPropertyDesc)
+			.addButton((button) => {
+				return button
+					.setTooltip("Add")
+					.setIcon("plus")
+					.onClick(async () => {
+						const customTabs = customDiv.createDiv("custom-tabs");
+						this.createPropertyLine(customTabs);
+					});
+			});
+
+
+		let footerEl = this.contentEl.createDiv("save-custom-value");
+		let saveButton = new Setting(footerEl)
+		saveButton.addButton((button) => {
+				return button
+					.setTooltip("Save")
+					.setIcon("checkmark")
+					.onClick(async () => {
+						this.close();
+					});
+			}
+		);
+
+		saveButton.addExtraButton((button) => {
+				return button
+					.setTooltip("Cancel")
+					.setIcon("cross")
+					.onClick(async () => {
+						this.close();
+					});
+			}
+		);
+	}
+
+	onOpen(): void {
+		this.display();
+	}
+
+	onClose(): void {
+		const {contentEl} = this;
+
+		contentEl.empty();
+	}
+}

src/ui/DeleteModal.ts

@@ -0,0 +1,64 @@
+import {App, ButtonComponent, Modal, Setting} from "obsidian";
+import {DatabaseDetails, ObsidianSettingTab} from "./settingTabs";
+import ObsidianSyncNotionPlugin from "../main";
+
+export class DeleteModal extends Modal {
+	data: Record<string, any> = {
+		deleted: false,
+	}
+	plugin: ObsidianSyncNotionPlugin;
+	settingTab: ObsidianSettingTab;
+	dbDetails: DatabaseDetails
+
+	constructor(app: App, plugin: ObsidianSyncNotionPlugin, settingTab: ObsidianSettingTab, dbDetails: DatabaseDetails) {
+		super(app);
+		this.plugin = plugin;
+		this.settingTab = settingTab;
+		this.dbDetails = dbDetails;
+	}
+
+	display() {
+		this.containerEl.addClass("delete-modal");
+		this.titleEl.setText('Delete Database');
+
+		let {contentEl} = this;
+		contentEl.empty();
+
+		const deleteDiv = contentEl.createDiv('delete-div');
+		deleteDiv.createEl('h4', {text: 'Are you sure you want to delete the following database?'});
+		deleteDiv.createEl('h2', {text: this.dbDetails.fullName + ' (' + this.dbDetails.abName + ', ' + this.dbDetails.format +')'});
+
+
+		// add delete button
+		let footerEl = contentEl.createDiv('save-button');
+		let deleteButton = new Setting(footerEl)
+
+		deleteButton
+			.addButton((button: ButtonComponent): ButtonComponent => {
+				return button
+					.setTooltip("Delete")
+					.setIcon("trash")
+					.onClick(async () => {
+						this.data.deleted = true;
+						this.close();
+					})
+			});
+
+		deleteButton.addExtraButton((button) => {
+			return button
+				.setTooltip('Cancel')
+				.setIcon('cross')
+				.onClick(() => {
+					this.data.deleted = false;
+					this.close();
+				});
+		});
+
+	}
+
+
+	onOpen() {
+		this.display();
+	}
+
+}

src/ui/EditModal.ts

@@ -0,0 +1,275 @@
+import {App, ButtonComponent, Modal, Setting} from "obsidian";
+import {SettingModal} from "./settingModal";
+import ObsidianSyncNotionPlugin from "../main";
+import {DatabaseDetails, ObsidianSettingTab} from "./settingTabs";
+import {i18nConfig} from "../lang/I18n";
+import {CustomModal} from "./CustomModal";
+
+export class EditModal extends SettingModal {
+	dataTemp: Record<string, any> = {
+		databaseFormatTemp: '',
+		// databaseFormatTempInd: false,
+		databaseFullNameTemp: '',
+		// databaseFullNameTempInd: false,
+		databaseAbbreviateNameTemp: '',
+		// databaseAbbreviateNameTempInd: false,
+		notionAPITemp: '',
+		// notionAPITempInd: false,
+		databaseIDTemp: '',
+		// databaseIDTempInd: false,
+		tagButtonTemp: false,
+		// tagButtonTempInd: false,
+		customTitleButtonTemp: false,
+		// customTitleButtonTempInd: false,
+		customTitleNameTemp: '',
+		customPropertiesTemp: [],
+		// customTitleNameTempInd: false,
+		// customValues: '',
+		savedTemp: false,
+		savedTempInd: false,
+	};
+	dataPrev: Record<string, any> = {
+		databaseFormatPrev: '',
+		// databaseFormatPrevInd: false,
+		databaseFullNamePrev: '',
+		// databaseFullNamePrevInd: false,
+		databaseAbbreviateNamePrev: '',
+		// databaseAbbreviateNamePrevInd: false,
+		notionAPIPrev: '',
+		// notionAPIPrevInd: false,
+		databaseIDPrev: '',
+		// databaseIDPrevInd: false,
+		tagButtonPrev: false,
+		// tagButtonPrevInd: false,
+		customTitleButtonPrev: false,
+		// customTitleButtonPrevInd: false,
+		customTitleNamePrev: '',
+		customPropertiesPrev: [],
+		// customTitleNamePrevInd: false,
+		// customValues: '',
+		savedPrev: false,
+		savedPrevInd: false,
+	};
+
+
+	plugin: ObsidianSyncNotionPlugin;
+	settingTab: ObsidianSettingTab;
+	dbDetails: DatabaseDetails;
+
+	constructor(app: App, plugin: ObsidianSyncNotionPlugin, settingTab: ObsidianSettingTab, dbDetails: DatabaseDetails) {
+		super(app, plugin, settingTab);
+		this.plugin = plugin;
+		this.settingTab = settingTab;
+		if (dbDetails) {
+			// Temp details
+			this.dataTemp.databaseFormatTemp = dbDetails.format;
+			this.dataTemp.databaseFullNameTemp = dbDetails.fullName;
+			this.dataTemp.databaseAbbreviateNameTemp = dbDetails.abName;
+			this.dataTemp.notionAPITemp = dbDetails.notionAPI;
+			this.dataTemp.databaseIDTemp = dbDetails.databaseID;
+			this.dataTemp.tagButtonTemp = dbDetails.tagButton;
+			this.dataTemp.customTitleButtonTemp = dbDetails.customTitleButton;
+			this.dataTemp.customTitleNameTemp = dbDetails.customTitleName;
+			this.dataTemp.customPropertiesTemp = dbDetails.customProperties;
+			// this.dataTemp.customValues = dbDetails.customValues;
+			this.dataTemp.savedTemp = dbDetails.saved;
+
+			// Prev details
+			this.dataPrev.databaseFormatPrev = dbDetails.format;
+			this.dataPrev.databaseFullNamePrev = dbDetails.fullName;
+			this.dataPrev.databaseAbbreviateNamePrev = dbDetails.abName;
+			this.dataPrev.notionAPIPrev = dbDetails.notionAPI;
+			this.dataPrev.databaseIDPrev = dbDetails.databaseID;
+			this.dataPrev.tagButtonPrev = dbDetails.tagButton;
+			this.dataPrev.customTitleButtonPrev = dbDetails.customTitleButton;
+			this.dataPrev.customTitleNamePrev = dbDetails.customTitleName;
+			this.dataPrev.customPropertiesPrev = dbDetails.customProperties;
+			// this.dataTemp.customValues = dbDetails.customValues;
+			this.dataPrev.savedPrev = dbDetails.saved;
+		}
+	}
+
+
+	display(): void {
+		this.containerEl.addClass("edit-modal");
+		this.titleEl.setText('Edit Database');
+
+		let {contentEl} = this;
+		contentEl.empty();
+
+		const editDiv = contentEl.createDiv('edit-div');
+		const nextTabs = contentEl.createDiv('next-tabs');
+
+			new Setting(editDiv)
+				.setName(i18nConfig.databaseFormat)
+				.setDesc(i18nConfig.databaseFormatDesc)
+				.addDropdown((component) => {
+					component
+						.addOption('none', '')
+						.addOption('general', i18nConfig.databaseGeneral)
+						.addOption('next', i18nConfig.databaseNext)
+						.addOption('custom', i18nConfig.databaseCustom)
+						.setValue(this.dataTemp.databaseFormatTemp)
+						.onChange(async (value) => {
+							this.dataTemp.databaseFormatTemp = value;
+							nextTabs.empty();
+							this.updateContentBasedOnSelection(value, nextTabs);
+						});
+
+					// Initialize content based on the current dropdown value
+					this.updateContentBasedOnSelection(this.dataTemp.databaseFormatTemp, nextTabs);
+				});
+
+
+		// add save button
+		let footerEl = contentEl.createDiv('save-button');
+		let saveButton = new Setting(footerEl)
+		saveButton.addButton((button: ButtonComponent) => {
+				return button
+					.setTooltip('Save')
+					.setIcon('checkmark')
+					.onClick(async () => {
+						this.dataTemp.savedTempInd = true;
+						this.dataTemp.savedTemp = true;
+						this.close();
+					});
+			}
+		);
+		saveButton.addExtraButton((button) => {
+				return button
+					.setTooltip('Cancel')
+					.setIcon('cross')
+					.onClick(() => {
+						this.dataTemp.savedTempInd = false;
+						this.close();
+					});
+			}
+		);
+
+	}
+
+	onOpen(): void {
+		this.display()
+	}
+
+
+	updateContentBasedOnSelection(value: string, nextTabs: HTMLElement): void {
+		// Clear existing content
+		nextTabs.empty();
+
+		// Generate content based on the selected value
+		if (value === 'general') {
+			nextTabs.createEl('h3', { text: i18nConfig.NotionGeneralSettingHeader });
+
+			// add full name
+			this.createSettingEl(nextTabs, i18nConfig.databaseFullName, i18nConfig.databaseFullNameDesc, 'text', i18nConfig.databaseFullNameText, this.dataTemp.databaseFullNameTemp,'dataTemp', 'databaseFullNameTemp')
+
+			// add abbreviate name
+			this.createSettingEl(nextTabs, i18nConfig.databaseAbbreviateName, i18nConfig.databaseAbbreviateNameDesc, 'text', i18nConfig.databaseAbbreviateNameText, this.dataTemp.databaseAbbreviateNameTemp, 'dataTemp','databaseAbbreviateNameTemp')
+
+			// tag button
+			this.createSettingEl(nextTabs, i18nConfig.NotionTagButton, i18nConfig.NotionTagButtonDesc, 'toggle', i18nConfig.NotionCustomTitleText, this.dataTemp.tagButtonTemp, 'dataTemp','tagButtonTemp')
+
+			// add custom title button
+
+			new Setting(nextTabs)
+				.setName(i18nConfig.NotionCustomTitle)
+				.setDesc(i18nConfig.NotionCustomTitleDesc)
+				.addToggle((toggle) =>
+					toggle
+						.setValue(this.dataTemp.customTitleButtonTemp)
+						.onChange(async (value) => {
+							this.dataTemp.customTitleButtonTemp = value;
+
+							this.updateSettingEl(CustomNameEl, value)
+
+							// this.updateSettingEl(CustomValuesEl, value)
+
+							// await this.plugin.saveSettings();
+							// await this.plugin.commands.updateCommand();
+						})
+				);
+
+
+			// add custom title name
+			const CustomNameEl = this.createStyleDiv('custom-name', (this.dataTemp.customTitleButtonTemp), nextTabs);
+			this.createSettingEl(CustomNameEl, i18nConfig.NotionCustomTitleName, i18nConfig.NotionCustomTitleNameDesc, 'text', i18nConfig.NotionCustomTitleText, this.dataTemp.customTitleNameTemp,'dataTemp', 'customTitleNameTemp')
+
+
+			// add api key
+			this.createSettingEl(nextTabs, i18nConfig.NotionAPI, i18nConfig.NotionAPIDesc, 'password', i18nConfig.NotionAPIText, this.dataTemp.notionAPITemp, 'dataTemp','notionAPITemp')
+
+			// add database id
+			this.createSettingEl(nextTabs, i18nConfig.DatabaseID, i18nConfig.DatabaseIDDesc, 'password', i18nConfig.DatabaseIDText, this.dataTemp.databaseIDTemp, 'dataTemp','databaseIDTemp')
+
+
+		} else if (value === 'next') {
+
+			nextTabs.createEl('h3', { text: i18nConfig.NotionNextSettingHeader });
+
+			// add full name
+			this.createSettingEl(nextTabs, i18nConfig.databaseFullName, i18nConfig.databaseFullNameDesc, 'text', i18nConfig.databaseFullNameText, this.dataTemp.databaseFullNameTemp, 'dataTemp','databaseFullNameTemp')
+
+			// add abbreviate name
+			this.createSettingEl(nextTabs, i18nConfig.databaseAbbreviateName, i18nConfig.databaseAbbreviateNameDesc, 'text', i18nConfig.databaseAbbreviateNameText, this.dataTemp.databaseAbbreviateNameTemp, 'dataTemp','databaseAbbreviateNameTemp')
+
+			// add api key
+			this.createSettingEl(nextTabs, i18nConfig.NotionAPI, i18nConfig.NotionAPIDesc, 'password', i18nConfig.NotionAPIText, this.dataTemp.notionAPITemp, 'dataTemp','notionAPITemp')
+
+			// add database id
+			this.createSettingEl(nextTabs, i18nConfig.DatabaseID, i18nConfig.DatabaseIDDesc, 'password', i18nConfig.DatabaseIDText, this.dataTemp.databaseIDTemp, 'dataTemp','databaseIDTemp')
+
+		} else if (value === 'custom') {
+
+			nextTabs.createEl('h3', {text: i18nConfig.NotionCustomSettingHeader});
+
+			// add full name
+			this.createSettingEl(nextTabs, i18nConfig.databaseFullName, i18nConfig.databaseFullNameDesc, 'text', i18nConfig.databaseFullNameText, this.dataTemp.databaseFullNameTemp, 'dataTemp', 'databaseFullNameTemp')
+
+			// add abbreviate name
+			this.createSettingEl(nextTabs, i18nConfig.databaseAbbreviateName, i18nConfig.databaseAbbreviateNameDesc, 'text', i18nConfig.databaseAbbreviateNameText, this.dataTemp.databaseAbbreviateNameTemp, 'dataTemp', 'databaseAbbreviateNameTemp')
+
+			// add api key
+			this.createSettingEl(nextTabs, i18nConfig.NotionAPI, i18nConfig.NotionAPIDesc, 'password', i18nConfig.NotionAPIText, this.dataTemp.notionAPITemp, 'dataTemp', 'notionAPITemp')
+
+			// add database id
+			this.createSettingEl(nextTabs, i18nConfig.DatabaseID, i18nConfig.DatabaseIDDesc, 'password', i18nConfig.DatabaseIDText, this.dataTemp.databaseIDTemp, 'dataTemp', 'databaseIDTemp')
+
+			// add new property button
+			new Setting(nextTabs)
+				.setName(i18nConfig.NotionCustomValues)
+				.setDesc(i18nConfig.NotionCustomValuesDesc)
+				.addButton((button: ButtonComponent) => {
+						return button
+							.setTooltip('Add new property')
+							.setIcon('plus')
+							.onClick(async () => {
+								let customModal = new CustomModal(this.app);
+
+								customModal.onClose = () => {
+
+									this.renderCustomPreview(customModal.properties, nextTabs)
+									this.dataTemp.customPropertiesTemp = customModal.properties;
+								}
+
+								customModal.open();
+							});
+					}
+				);
+		}
+
+	}
+
+
+	createStyleDiv(className: string, commandValue: boolean = false, parentEl: HTMLElement): HTMLDivElement {
+		return super.createStyleDiv(className, commandValue, parentEl);
+	}
+
+	updateSettingEl(element: HTMLElement, commandValue: boolean) {
+		super.updateSettingEl(element, commandValue);
+	}
+
+	createSettingEl(contentEl: HTMLElement, name: string, desc: string, type: string, placeholder: string, holderValue: any, dataRecord: string, settingsKey: string): Setting {
+		return super.createSettingEl(contentEl, name, desc, type, placeholder, holderValue, dataRecord, settingsKey);
+	}
+}

src/ui/PreviewModal.ts

@@ -0,0 +1,139 @@
+import {App, ExtraButtonComponent, Modal, Notice, Setting} from "obsidian";
+import ObsidianSyncNotionPlugin from "../main";
+import {DatabaseDetails, ObsidianSettingTab} from "./settingTabs";
+
+export class PreviewModal extends Modal {
+	plugin: ObsidianSyncNotionPlugin;
+	settingTab: ObsidianSettingTab;
+	dbDetails: DatabaseDetails;
+
+	constructor(app:App, plugin: ObsidianSyncNotionPlugin, settingTab: ObsidianSettingTab, dbDetails: DatabaseDetails) {
+		super(app);
+		this.plugin = plugin;
+		this.settingTab = settingTab;
+		this.dbDetails = dbDetails;
+	}
+
+
+	display(): void {
+		this.containerEl.addClass('preview-modal')
+		this.titleEl.setText('Preview')
+
+		let { contentEl } = this;
+
+		const previewEl = contentEl.createDiv('preview-content')
+
+		const dbFormatEl = new Setting(previewEl)
+			dbFormatEl
+			.setName('Database Format')
+				.addText(text => text
+					.setValue(this.dbDetails.format)
+					.setDisabled(true));
+
+		const dbFullEl = new Setting(previewEl)
+			dbFullEl
+			.setName('Database Full Name')
+				.addText(text => text
+					.setValue(this.dbDetails.fullName)
+					.setDisabled(true));
+
+		const dbAbbrEl = new Setting(previewEl)
+			dbAbbrEl
+			.setName('Database Abbreviate Name')
+				.addText(text => text
+					.setValue(this.dbDetails.abName)
+					.setDisabled(true));
+		// .controlEl.createEl('p', { text: this.dbDetails.abName })
+
+		// Setting for toggle and copy buttons
+		new Setting(previewEl)
+			.setName('Notion API Key')
+			.addExtraButton((button: ExtraButtonComponent) => {
+				let isApiKeyVisible = false;
+
+				return button
+					.setTooltip('Toggle API Key Visibility')
+					.setIcon('eye')
+					.onClick(() => {
+						isApiKeyVisible = !isApiKeyVisible;
+						button.setIcon(isApiKeyVisible ? 'eye-off' : 'eye');
+						apiKeySetting.settingEl.style.display = isApiKeyVisible ? '' : 'none'; // Toggle visibility
+					});
+			})
+
+
+		// Setting for displaying the API key
+		const apiKeySetting = new Setting(previewEl)
+
+		apiKeySetting.infoEl.createEl('p', { text: this.dbDetails.notionAPI })
+
+
+		apiKeySetting
+			.addExtraButton((button: ExtraButtonComponent) => {
+				return button
+					.setTooltip('Copy API Key')
+					.setIcon('clipboard')
+					.onClick(() => {
+						navigator.clipboard.writeText(this.dbDetails.notionAPI)
+						new Notice('API Key copied to clipboard');
+					});
+			});
+
+		apiKeySetting.settingEl.style.display = 'none'; // Hide initially
+
+
+
+		new Setting(previewEl)
+			.setName('Database ID')
+			.addExtraButton((button: ExtraButtonComponent) => {
+				let isDbIdVisible = false;
+
+				return button
+					.setTooltip('Toggle Database ID Visibility')
+					.setIcon('eye')
+					.onClick(() => {
+
+						isDbIdVisible = !isDbIdVisible;
+						button.setIcon(isDbIdVisible ? 'eye-off' : 'eye');
+						dbIdSetting.settingEl.style.display = isDbIdVisible ? '' : 'none'; // Toggle visibility
+					});
+			})
+
+		const dbIdSetting = new Setting(previewEl)
+
+		dbIdSetting.infoEl.createEl('p', { text: this.dbDetails.databaseID })
+
+		dbIdSetting
+			.addExtraButton((button: ExtraButtonComponent) => {
+				return button
+					.setTooltip('Copy Database ID')
+					.setIcon('clipboard')
+					.onClick(() => {
+						navigator.clipboard.writeText(this.dbDetails.databaseID)
+						new Notice('Database ID copied to clipboard');
+					});
+			});
+
+		dbIdSetting.settingEl.style.display = 'none'; // Hide initially
+
+		// Preview the custom properties
+
+		if (this.dbDetails.format === 'custom') {
+
+			const customPropertiesEl = new Setting(previewEl)
+			customPropertiesEl
+				.setName('Custom Properties')
+				.addTextArea(text => text
+					.setValue(JSON.stringify(this.dbDetails.customProperties, null, 2))
+					.setDisabled(true));
+		}
+
+	}
+
+
+	onOpen() {
+		this.display()
+	}
+
+
+}

src/ui/icon.ts

@@ -3,7 +3,7 @@ import { addIcon } from 'obsidian';
 const icons: Record<string, string> = {
   'notion-logo': `
   <!-- License: Apache. Made by lawnchairlauncher: https://github.com/lawnchairlauncher/lawnicons -->
-<svg width="100px" height="100px" viewBox="0 0 192 192" xmlns="http://www.w3.org/2000/svg" fill="none"><path fill="#000000" fill-rule="evenodd" d="m138.462 21.522 27.784 19.588.044.033.275.201c1.713 1.256 3.349 2.455 4.452 3.83 1.411 1.76 1.884 3.644 1.884 5.877v104.706c0 3.587-.635 7.178-3.058 9.934-2.451 2.789-6.145 4.067-10.732 4.394l-.018.001-98.629 5.971-.021.001c-3.242.154-6.094.035-8.669-.907-2.688-.984-4.719-2.727-6.604-5.129l-.01-.012-19.979-25.979-.012-.017c-3.81-5.086-5.723-9.348-5.723-14.509V34.509c0-3.12.688-6.394 2.745-9.033 2.124-2.727 5.356-4.328 9.503-4.686l.058-.005 84.854-4.344c5.192-.445 8.938-.576 12.286.185 3.459.787 6.208 2.452 9.57 4.896ZM56.43 157.336h.002v3.3c0 1.904.47 2.337.613 2.452.296.235 1.203.652 3.642.518l97.449-5.371c1.928-.106 2.256-.649 2.348-.801l.005-.008c.29-.476.486-1.407.486-3.357V60.001c0-1.635-.334-2.218-.421-2.327l-.005-.007-.002-.003-.006-.002a.117.117 0 0 1-.012-.004c-.053-.019-.263-.078-.724-.037l-.057.005-101.622 5.668c-.624.056-.973.163-1.152.242-.142.062-.173.104-.181.116l-.002.002c-.066.085-.36.586-.36 2.321v91.361Zm9.085-106.705 87.074-4.506-21.028-15.375-.039-.031c-1.259-.98-2.507-1.854-4.12-2.46-1.588-.597-3.695-.993-6.669-.734l-.05.005-87.009 4.898h-.01a6.453 6.453 0 0 0-.893.116L49.934 48.56c2.037 1.646 3.109 2.146 4.337 2.367 1.538.277 3.52.167 7.722-.115l3.522-.237v.056Zm-34.231-3.586v83.893c0 .538.175 1.061.498 1.49l13.174 17.464V61.224a2.47 2.47 0 0 0-.877-1.889l-.08-.068-12.715-12.222Zm109.871 35.062c.451 2.04 0 4.082-2.041 4.315l-3.393.673v49.881c-2.947 1.586-5.66 2.492-7.927 2.492-3.622 0-4.528-1.134-7.239-4.53l-.003-.003L98.36 100.02v33.78l7.02 1.59s0 4.082-5.664 4.082l-15.615.906c-.455-.91 0-3.176 1.582-3.627l4.078-1.131V90.955l-5.66-.459c-.454-2.04.677-4.987 3.85-5.216l16.754-1.128 23.09 35.367V88.231l-5.885-.677c-.455-2.499 1.356-4.315 3.618-4.536l15.627-.91v-.001Z" clip-rule="evenodd"/></svg>
+<svg width="110px" height="110px" viewBox="0 0 192 192" xmlns="http://www.w3.org/2000/svg" fill="none"><path fill="#817f7a" fill-rule="evenodd" d="m138.462 21.522 27.784 19.588.044.033.275.201c1.713 1.256 3.349 2.455 4.452 3.83 1.411 1.76 1.884 3.644 1.884 5.877v104.706c0 3.587-.635 7.178-3.058 9.934-2.451 2.789-6.145 4.067-10.732 4.394l-.018.001-98.629 5.971-.021.001c-3.242.154-6.094.035-8.669-.907-2.688-.984-4.719-2.727-6.604-5.129l-.01-.012-19.979-25.979-.012-.017c-3.81-5.086-5.723-9.348-5.723-14.509V34.509c0-3.12.688-6.394 2.745-9.033 2.124-2.727 5.356-4.328 9.503-4.686l.058-.005 84.854-4.344c5.192-.445 8.938-.576 12.286.185 3.459.787 6.208 2.452 9.57 4.896ZM56.43 157.336h.002v3.3c0 1.904.47 2.337.613 2.452.296.235 1.203.652 3.642.518l97.449-5.371c1.928-.106 2.256-.649 2.348-.801l.005-.008c.29-.476.486-1.407.486-3.357V60.001c0-1.635-.334-2.218-.421-2.327l-.005-.007-.002-.003-.006-.002a.117.117 0 0 1-.012-.004c-.053-.019-.263-.078-.724-.037l-.057.005-101.622 5.668c-.624.056-.973.163-1.152.242-.142.062-.173.104-.181.116l-.002.002c-.066.085-.36.586-.36 2.321v91.361Zm9.085-106.705 87.074-4.506-21.028-15.375-.039-.031c-1.259-.98-2.507-1.854-4.12-2.46-1.588-.597-3.695-.993-6.669-.734l-.05.005-87.009 4.898h-.01a6.453 6.453 0 0 0-.893.116L49.934 48.56c2.037 1.646 3.109 2.146 4.337 2.367 1.538.277 3.52.167 7.722-.115l3.522-.237v.056Zm-34.231-3.586v83.893c0 .538.175 1.061.498 1.49l13.174 17.464V61.224a2.47 2.47 0 0 0-.877-1.889l-.08-.068-12.715-12.222Zm109.871 35.062c.451 2.04 0 4.082-2.041 4.315l-3.393.673v49.881c-2.947 1.586-5.66 2.492-7.927 2.492-3.622 0-4.528-1.134-7.239-4.53l-.003-.003L98.36 100.02v33.78l7.02 1.59s0 4.082-5.664 4.082l-15.615.906c-.455-.91 0-3.176 1.582-3.627l4.078-1.131V90.955l-5.66-.459c-.454-2.04.677-4.987 3.85-5.216l16.754-1.128 23.09 35.367V88.231l-5.885-.677c-.455-2.499 1.356-4.315 3.618-4.536l15.627-.91v-.001Z" clip-rule="evenodd"/></svg>
   `
 };
 

src/ui/settingModal.ts

@@ -0,0 +1,314 @@
+import {
+	Modal,
+	Setting,
+	PluginSettingTab,
+	ButtonComponent, App
+} from 'obsidian';
+
+import {i18nConfig} from "../lang/I18n";
+import ObsidianSyncNotionPlugin from "../main";
+import {DatabaseDetails, ObsidianSettingTab} from "./settingTabs";
+import {CustomModal} from "./CustomModal";
+
+
+export class SettingModal extends Modal {
+	[key: string]: any; // Index signature
+	data: Record<string, any> = {
+		databaseFormat: 'none',
+		databaseFullName: '',
+		databaseAbbreviateName: '',
+		notionAPI: '',
+		databaseID: '',
+		tagButton: true,
+		customTitleButton: false,
+		customTitleName: '',
+		customProperties: [],
+		// customValues: '',
+		saved: false,
+	};
+	plugin: ObsidianSyncNotionPlugin;
+	settingTab: ObsidianSettingTab;
+
+	constructor(app: App, plugin: ObsidianSyncNotionPlugin, settingTab: ObsidianSettingTab, dbDetails?: DatabaseDetails) {
+		super(app);
+		this.plugin = plugin;
+		this.settingTab = settingTab;
+		this.properties = [];
+		if (dbDetails) {
+			this.data.databaseFormat = dbDetails.format;
+			this.data.databaseFullName = dbDetails.fullName;
+			this.data.databaseAbbreviateName = dbDetails.abName;
+			this.data.notionAPI = dbDetails.notionAPI;
+			this.data.databaseID = dbDetails.databaseID;
+			this.data.tagButton = dbDetails.tagButton;
+			this.data.customTitleButton = dbDetails.customTitleButton;
+			this.data.customTitleName = dbDetails.customTitleName;
+			this.data.customProperties = dbDetails.customProperties;
+			// this.data.customValues = dbDetails.customValues;
+			this.data.saved = dbDetails.saved;
+		}
+
+	}
+
+	display(): void {
+		this.containerEl.addClass("settings-modal");
+		this.titleEl.setText('Add new database');
+
+		// create the dropdown button to select the database format
+		let {contentEl} = this;
+		contentEl.empty();
+
+		const settingDiv = contentEl.createDiv('setting-div');
+		const nextTabs = contentEl.createDiv('next-tabs');
+
+
+		if (this.data.saved) {
+			new Setting(settingDiv)
+				.setName(i18nConfig.databaseFormat)
+				.setDesc(i18nConfig.databaseFormatDesc)
+				.addDropdown((component) => {
+					component
+						.addOption('none', '')
+						.addOption('general', i18nConfig.databaseGeneral)
+						.addOption('next', i18nConfig.databaseNext)
+						.addOption('custom', i18nConfig.databaseCustom)
+						.setValue(this.data.databaseFormat)
+						.onChange(async (value) => {
+							this.data.databaseFormat = value;
+							nextTabs.empty();
+							this.updateContentBasedOnSelection(value, nextTabs);
+						});
+
+					// Initialize content based on the current dropdown value
+					this.updateContentBasedOnSelection(this.data.databaseFormat, nextTabs);
+				});
+
+		} else {
+			new Setting(settingDiv)
+				.setName(i18nConfig.databaseFormat)
+				.setDesc(i18nConfig.databaseFormatDesc)
+				.addDropdown((component) => {
+					component
+						.addOption('none', '')
+						.addOption('general', i18nConfig.databaseGeneral)
+						.addOption('next', i18nConfig.databaseNext)
+						.addOption('custom', i18nConfig.databaseCustom)
+						.setValue(this.data.databaseFormat)
+						.onChange(async (value) => {
+							this.data.databaseFormat = value;
+							nextTabs.empty();
+							this.updateContentBasedOnSelection(value, nextTabs);
+						});
+
+					// Initialize content based on the current dropdown value
+					this.updateContentBasedOnSelection(this.plugin.settings.databaseFormat, nextTabs);
+				});
+		}
+
+
+		// add save button
+		let footerEl = contentEl.createDiv('save-button');
+		let saveButton = new Setting(footerEl)
+		saveButton.addButton((button: ButtonComponent) => {
+				return button
+					.setTooltip('Save')
+					.setIcon('checkmark')
+					.onClick(async () => {
+						this.data.saved = true;
+						this.close();
+					});
+			}
+		);
+		saveButton.addExtraButton((button) => {
+				return button
+					.setTooltip('Cancel')
+					.setIcon('cross')
+					.onClick(() => {
+						this.data.saved = false;
+						this.close();
+					});
+			}
+		);
+	}
+
+	updateContentBasedOnSelection(value: string, nextTabs: HTMLElement): void {
+		// Clear existing content
+		nextTabs.empty();
+
+		// Generate content based on the selected value
+		if (value === 'general') {
+			nextTabs.createEl('h3', {text: i18nConfig.NotionGeneralSettingHeader});
+
+			// add full name
+			this.createSettingEl(nextTabs, i18nConfig.databaseFullName, i18nConfig.databaseFullNameDesc, 'text', i18nConfig.databaseFullNameText, this.data.databaseFullName, 'data', 'databaseFullName')
+
+			// add abbreviate name
+			this.createSettingEl(nextTabs, i18nConfig.databaseAbbreviateName, i18nConfig.databaseAbbreviateNameDesc, 'text', i18nConfig.databaseAbbreviateNameText, this.data.databaseAbbreviateName, 'data', 'databaseAbbreviateName')
+
+			// tag button
+			this.createSettingEl(nextTabs, i18nConfig.NotionTagButton, i18nConfig.NotionTagButtonDesc, 'toggle', i18nConfig.NotionCustomTitleText, this.data.tagButton, 'data', 'tagButton')
+
+			// add custom title button
+
+			new Setting(nextTabs)
+				.setName(i18nConfig.NotionCustomTitle)
+				.setDesc(i18nConfig.NotionCustomTitleDesc)
+				.addToggle((toggle) =>
+					toggle
+						.setValue(this.data.customTitleButton)
+						.onChange(async (value) => {
+							this.data.customTitleButton = value;
+
+							this.updateSettingEl(CustomNameEl, value)
+
+							// this.updateSettingEl(CustomValuesEl, value)
+
+							// await this.plugin.saveSettings();
+							// await this.plugin.commands.updateCommand();
+						})
+				);
+
+
+			// add custom title name
+			const CustomNameEl = this.createStyleDiv('custom-name', (this.data.customTitleButton), nextTabs);
+			this.createSettingEl(CustomNameEl, i18nConfig.NotionCustomTitleName, i18nConfig.NotionCustomTitleNameDesc, 'text', i18nConfig.NotionCustomTitleText, this.data.customTitleName, 'data', 'customTitleName')
+
+
+			// add api key
+			this.createSettingEl(nextTabs, i18nConfig.NotionAPI, i18nConfig.NotionAPIDesc, 'password', i18nConfig.NotionAPIText, this.data.notionAPI, 'data', 'notionAPI')
+
+			// add database id
+			this.createSettingEl(nextTabs, i18nConfig.DatabaseID, i18nConfig.DatabaseIDDesc, 'password', i18nConfig.DatabaseIDText, this.data.databaseID, 'data', 'databaseID')
+
+
+		} else if (value === 'next') {
+
+			nextTabs.createEl('h3', {text: i18nConfig.NotionNextSettingHeader});
+
+			// add full name
+			this.createSettingEl(nextTabs, i18nConfig.databaseFullName, i18nConfig.databaseFullNameDesc, 'text', i18nConfig.databaseFullNameText, this.data.databaseFullName, 'data', 'databaseFullName')
+
+			// add abbreviate name
+			this.createSettingEl(nextTabs, i18nConfig.databaseAbbreviateName, i18nConfig.databaseAbbreviateNameDesc, 'text', i18nConfig.databaseAbbreviateNameText, this.data.databaseAbbreviateName, 'data', 'databaseAbbreviateName')
+
+			// add api key
+			this.createSettingEl(nextTabs, i18nConfig.NotionAPI, i18nConfig.NotionAPIDesc, 'password', i18nConfig.NotionAPIText, this.data.notionAPI, 'data', 'notionAPI')
+
+
+			// add database id
+			this.createSettingEl(nextTabs, i18nConfig.DatabaseID, i18nConfig.DatabaseIDDesc, 'password', i18nConfig.DatabaseIDText, this.data.databaseID, 'data', 'databaseID')
+
+		} else if (value === 'custom') {
+
+			nextTabs.createEl('h3', {text: i18nConfig.NotionCustomSettingHeader});
+
+			// add full name
+			this.createSettingEl(nextTabs, i18nConfig.databaseFullName, i18nConfig.databaseFullNameDesc, 'text', i18nConfig.databaseFullNameText, this.data.databaseFullName, 'data', 'databaseFullName')
+
+			// add abbreviate name
+			this.createSettingEl(nextTabs, i18nConfig.databaseAbbreviateName, i18nConfig.databaseAbbreviateNameDesc, 'text', i18nConfig.databaseAbbreviateNameText, this.data.databaseAbbreviateName, 'data', 'databaseAbbreviateName')
+
+			// add api key
+			this.createSettingEl(nextTabs, i18nConfig.NotionAPI, i18nConfig.NotionAPIDesc, 'password', i18nConfig.NotionAPIText, this.data.notionAPI, 'data', 'notionAPI')
+
+			// add database id
+			this.createSettingEl(nextTabs, i18nConfig.DatabaseID, i18nConfig.DatabaseIDDesc, 'password', i18nConfig.DatabaseIDText, this.data.databaseID, 'data', 'databaseID')
+
+			// add new property button
+			new Setting(nextTabs)
+				.setName(i18nConfig.NotionCustomValues)
+				.setDesc(i18nConfig.NotionCustomValuesDesc)
+				.addButton((button: ButtonComponent) => {
+						return button
+							.setTooltip('Add new property')
+							.setIcon('plus')
+							.onClick(async () => {
+								let customModal = new CustomModal(this.app);
+
+								customModal.onClose = () => {
+
+									this.renderCustomPreview(customModal.properties, nextTabs)
+									this.data.customProperties = customModal.properties;
+								}
+
+								customModal.open();
+							});
+					}
+				);
+		}
+
+	}
+
+
+	onOpen() {
+		// add console log to check if the modal is opened
+		this.display()
+	}
+
+	renderCustomPreview(properties: any[], nextTabs: HTMLElement) {
+		const previewContainer = nextTabs.createDiv('preview-container');
+
+		properties.forEach((property: { customName: any; customType: any; }) => {
+			const propertyEl = previewContainer.createEl('div', {cls: 'property-preview'});
+			propertyEl.createEl('span', {text: `Property: ${property.customName}, Type: ${property.customType}`});
+		});
+
+	}
+
+
+	// create a function to create a div with a style for pop over elements
+	public createStyleDiv(className: string, commandValue: boolean = false, parentEl: HTMLElement) {
+		return parentEl.createDiv(className, (div) => {
+			this.updateSettingEl(div, commandValue);
+		});
+	}
+
+	// update the setting display style in the setting tab
+	public updateSettingEl(element: HTMLElement, commandValue: boolean) {
+		element.style.borderTop = commandValue ? "1px solid var(--background-modifier-border)" : "none";
+		element.style.paddingTop = commandValue ? "0.75em" : "0";
+		element.style.display = commandValue ? "block" : "none";
+		element.style.alignItems = "center";
+	}
+
+	// function to add one setting element in the setting tab.
+	public createSettingEl(contentEl: HTMLElement, name: string, desc: string, type: string, placeholder: string, holderValue: any, dataRecord: string, settingsKey: string) {
+		if (type === 'password') {
+			return new Setting(contentEl)
+				.setName(name)
+				.setDesc(desc)
+				.addText((text) => {
+					text.inputEl.type = type;
+					return text
+						.setPlaceholder(placeholder)
+						.setValue(holderValue)
+						.onChange(async (value) => {
+							this[dataRecord][settingsKey] = value; // Update the settings dictionary							await this.plugin.saveSettings();
+						})
+				});
+		} else if (type === 'toggle') {
+			return new Setting(contentEl)
+				.setName(name)
+				.setDesc(desc)
+				.addToggle((toggle) =>
+					toggle
+						.setValue(holderValue)
+						.onChange(async (value) => {
+							this[dataRecord][settingsKey] = value; // Update the settings dictionary							await this.plugin.saveSettings();
+						})
+				);
+		} else if (type === 'text') {
+			return new Setting(contentEl)
+				.setName(name)
+				.setDesc(desc)
+				.addText((text) =>
+					text
+						.setPlaceholder(placeholder)
+						.setValue(holderValue)
+						.onChange(async (value) => {
+							this[dataRecord][settingsKey] = value; // Update the settings dictionary							await this.plugin.saveSettings();
+						})
+				);
+		}
+	}
+}

src/ui/settingTabs.ts

@@ -0,0 +1,334 @@
+import {App, ButtonComponent, Modal, PluginSettingTab, Setting} from "obsidian";
+import {i18nConfig} from "../lang/I18n";
+import ObsidianSyncNotionPlugin from "../main";
+import {SettingModal} from "./settingModal";
+import {set} from "yaml/dist/schema/yaml-1.1/set";
+import {PreviewModal} from "./PreviewModal";
+import {EditModal} from "./EditModal";
+import {DeleteModal} from "./DeleteModal";
+
+export interface PluginSettings {
+    NextButton: boolean;
+    notionAPINext: string;
+    databaseIDNext: string;
+    bannerUrl: string;
+    notionUser: string;
+    proxy: string;
+    GeneralButton: boolean;
+    tagButton: boolean;
+    customTitleButton: boolean;
+    customTitleName: string;
+    notionAPIGeneral: string;
+    databaseIDGeneral: string;
+    CustomButton: boolean;
+    CustomValues: string;
+    notionAPICustom: string;
+    databaseIDCustom: string;
+    [key: string]: any;
+	databaseDetails: Record<string, DatabaseDetails>
+}
+
+export interface DatabaseDetails {
+	format: string;
+	fullName: string;
+	abName: string;
+	notionAPI: string;
+	databaseID: string;
+	tagButton: boolean;
+	customTitleButton: boolean;
+	customTitleName: string;
+	customProperties:{ customName: string, customType: string }[];
+	// customValues: string;
+	saved: boolean;
+}
+
+export const DEFAULT_SETTINGS: PluginSettings = {
+    NextButton: true,
+    notionAPINext: "",
+    databaseIDNext: "",
+    bannerUrl: "",
+    notionUser: "",
+    proxy: "",
+    GeneralButton: true,
+    tagButton: true,
+    customTitleButton: false,
+    customTitleName: "",
+    notionAPIGeneral: "",
+    databaseIDGeneral: "",
+    CustomButton: false,
+    CustomValues: "",
+    notionAPICustom: "",
+    databaseIDCustom: "",
+	databaseDetails: {},
+};
+
+
+export class ObsidianSettingTab extends PluginSettingTab {
+    plugin: ObsidianSyncNotionPlugin;
+	databaseEl: HTMLDivElement;
+
+    constructor(app: App, plugin: ObsidianSyncNotionPlugin) {
+        super(app, plugin);
+        this.plugin = plugin;
+    }
+
+    display(): void {
+        const { containerEl } = this;
+
+        containerEl.empty();
+
+        // General Settings
+        containerEl.createEl('h2', { text: i18nConfig.GeneralSetting });
+
+        this.createSettingEl(containerEl, i18nConfig.BannerUrl, i18nConfig.BannerUrlDesc, 'text', i18nConfig.BannerUrlText, this.plugin.settings.bannerUrl, 'bannerUrl')
+
+        this.createSettingEl(containerEl, i18nConfig.NotionUser, i18nConfig.NotionUserDesc, 'text', i18nConfig.NotionUserText, this.plugin.settings.notionUser, 'notionUser')
+
+
+		// add new button
+
+		new Setting(containerEl)
+			.setName("Add New Database")
+			.setDesc("Add New Database")
+			.addButton((button: ButtonComponent): ButtonComponent => {
+				return button
+					.setTooltip("Add New Database")
+					.setIcon("plus")
+					.onClick(async () => {
+						let modal = new SettingModal(this.app, this.plugin, this);
+
+						modal.onClose = () => {
+							if (modal.data.saved) {
+								const dbDetails = {
+									format: modal.data.databaseFormat,
+									fullName: modal.data.databaseFullName,
+									abName: modal.data.databaseAbbreviateName,
+									notionAPI: modal.data.notionAPI,
+									databaseID: modal.data.databaseID,
+									tagButton: modal.data.tagButton,
+									customTitleButton: modal.data.customTitleButton,
+									customTitleName: modal.data.customTitleName,
+									customProperties: modal.data.customProperties,
+									// customValues: modal.data.customValues,
+									saved: modal.data.saved,
+								}
+
+								this.plugin.addDatabaseDetails(dbDetails);
+
+								this.plugin.commands.updateCommand();
+
+								this.display()
+							}
+						}
+
+						modal.open();
+					});
+			});
+
+		// new section to display all created database
+		containerEl.createEl('h2', {text: "Database List"});
+
+		this.databaseEl = containerEl.createDiv('database-list');
+		// list all created database
+		this.showDatabase();
+
+
+
+
+
+		// // notion next database settings
+		//
+		// const NextTabs = new SettingNextTabs(this.app, this.plugin, this);
+		//
+		// NextTabs.display();
+		//
+		//
+        // // General Database Settings
+		// const GeneralTabs = new SettingGeneralTabs(this.app, this.plugin, this);
+		//
+		// GeneralTabs.display();
+
+
+        // Custom Database Settings
+
+        // containerEl.createEl('h2', {text: i18nConfig.NotionCustomSettingHeader});
+        //
+        // new Setting(containerEl)
+        // 	.setName(i18nConfig.NotionCustomButton)
+        // 	.setDesc(i18nConfig.NotionCustomButtonDesc)
+        // 	.addToggle((toggle) =>
+        // 		toggle
+        // 			.setValue(this.plugin.settings.CustomButton)
+        // 			.onChange(async (value) => {
+        // 				this.plugin.settings.CustomButton = value;
+        // 				await this.plugin.saveSettings();
+        // 			})
+        // 	);
+    }
+
+    // create a function to create a div with a style for pop over elements
+    public createStyleDiv(className: string, commandValue: boolean = false) {
+        return this.containerEl.createDiv(className, (div) => {
+            this.updateSettingEl(div, commandValue);
+        });
+    }
+    // update the setting display style in the setting tab
+    public updateSettingEl(element: HTMLElement, commandValue: boolean) {
+        element.style.borderTop = commandValue ? "1px solid var(--background-modifier-border)" : "none";
+        element.style.paddingTop = commandValue ? "0.75em" : "0";
+        element.style.display = commandValue ? "block" : "none";
+        element.style.alignItems = "center";
+    }
+
+    // function to add one setting element in the setting tab.
+    public createSettingEl(containerEl: HTMLElement, name: string, desc: string, type: string, placeholder: string, holderValue: any, settingsKey: string) {
+        if (type === 'password') {
+            return new Setting(containerEl)
+                .setName(name)
+                .setDesc(desc)
+                .addText((text) => {
+                    text.inputEl.type = type;
+                    return text
+                        .setPlaceholder(placeholder)
+                        .setValue(holderValue)
+                        .onChange(async (value) => {
+                            this.plugin.settings[settingsKey] = value; // Update the plugin settings directly
+                            await this.plugin.saveSettings();
+                        })
+                });
+        } else if (type === 'toggle') {
+            return new Setting(containerEl)
+                .setName(name)
+                .setDesc(desc)
+                .addToggle((toggle) =>
+                    toggle
+                        .setValue(holderValue)
+                        .onChange(async (value) => {
+                            this.plugin.settings[settingsKey] = value; // Update the plugin settings directly
+                            await this.plugin.saveSettings();
+                            await this.plugin.commands.updateCommand();
+                        })
+                );
+        } else if (type === 'text') {
+            return new Setting(containerEl)
+                .setName(name)
+                .setDesc(desc)
+                .addText((text) =>
+                    text
+                        .setPlaceholder(placeholder)
+                        .setValue(holderValue)
+                        .onChange(async (value) => {
+                            this.plugin.settings[settingsKey] = value; // Update the plugin settings directly
+                            await this.plugin.saveSettings();
+                            await this.plugin.commands.updateCommand();
+                        })
+                );
+        }
+    }
+
+	// function to show all the database details
+	showDatabase() {
+		this.databaseEl.empty();
+
+		for (let key in this.plugin.settings.databaseDetails) {
+			let dbDetails = this.plugin.settings.databaseDetails[key];
+
+			const databaseDiv = this.databaseEl.createDiv('database-div');
+
+			let settingEl = new Setting(databaseDiv)
+				.setName(`${dbDetails.fullName} (${dbDetails.abName})`)
+				.setDesc(dbDetails.format)
+
+
+				// add a button for preview data
+				settingEl
+				.addButton((button: ButtonComponent): ButtonComponent => {
+					return button
+						.setTooltip("Preview Database")
+						.setIcon("eye")
+						.onClick(async () => {
+							let modal = new PreviewModal(this.app, this.plugin, this, dbDetails);
+
+							modal.open();
+						});
+				});
+
+				// add a button for edit data
+				settingEl
+				.addButton((button: ButtonComponent): ButtonComponent => {
+					return button
+						.setTooltip("Edit Database")
+						.setIcon("pencil")
+						.onClick(async () => {
+							let modal = new EditModal(this.app, this.plugin, this, dbDetails);
+
+							modal.onClose = () => {
+								if (modal.dataTemp.savedTempInd) {
+									const dbDetailsNew: DatabaseDetails = {
+										format: modal.dataTemp.databaseFormatTemp,
+										fullName: modal.dataTemp.databaseFullNameTemp,
+										abName: modal.dataTemp.databaseAbbreviateNameTemp,
+										notionAPI: modal.dataTemp.notionAPITemp,
+										databaseID: modal.dataTemp.databaseIDTemp,
+										tagButton: modal.dataTemp.tagButtonTemp,
+										customTitleButton: modal.dataTemp.customTitleButtonTemp,
+										customTitleName: modal.dataTemp.customTitleNameTemp,
+										customProperties: modal.dataTemp.customPropertiesTemp,
+										// customValues: modal.data.customValues,
+										saved: modal.dataTemp.savedTemp,
+									}
+
+									const dbDetailsPrev: DatabaseDetails = {
+										format: modal.dataPrev.databaseFormatPrev,
+										fullName: modal.dataPrev.databaseFullNamePrev,
+										abName: modal.dataPrev.databaseAbbreviateNamePrev,
+										notionAPI: modal.dataPrev.notionAPIPrev,
+										databaseID: modal.dataPrev.databaseIDPrev,
+										tagButton: modal.dataPrev.tagButtonPrev,
+										customTitleButton: modal.dataPrev.customTitleButtonPrev,
+										customTitleName: modal.dataPrev.customTitleNamePrev,
+										customProperties: modal.dataPrev.customPropertiesPrev,
+										// customValues: modal.data.customValues,
+										saved: modal.dataPrev.savedPrev,
+									}
+
+									this.plugin.deleteDatabaseDetails(dbDetailsPrev);
+									this.plugin.updateDatabaseDetails(dbDetailsNew);
+
+									this.plugin.commands.updateCommand();
+
+									this.display()
+								}
+							}
+
+							modal.open();
+						});
+				});
+
+				settingEl
+				.addButton((button: ButtonComponent): ButtonComponent => {
+					return button
+						.setTooltip("Delete Database")
+						.setIcon("trash")
+						.onClick(async () => {
+							let modal = new DeleteModal(this.app, this.plugin, this, dbDetails);
+
+							modal.onClose = () => {
+								if (modal.data.deleted) {
+									this.plugin.deleteDatabaseDetails(dbDetails);
+
+									this.plugin.commands.updateCommand();
+
+									this.display()
+								}
+							}
+
+							modal.open();
+
+						});
+				});
+		}
+	}
+}
+
+

src/upload/updateYaml.ts

@@ -0,0 +1,55 @@
+import { App, Notice, TFile } from "obsidian";
+import ObsidianSyncNotionPlugin from "../main";
+import {DatabaseDetails} from "../ui/settingTabs";
+
+export async function updateYamlInfo(
+    yamlContent: string,
+    nowFile: TFile,
+    res: any,
+    app: App,
+    plugin: ObsidianSyncNotionPlugin,
+	dbDetails: DatabaseDetails,
+) {
+    let { url, id } = res.json
+    // replace www to notionID
+    const { notionUser } = plugin.settings;
+	const { abName } = dbDetails
+	const notionIDKey = `NotionID-${abName}`;
+	const linkKey = `link-${abName}`;
+
+    if (notionUser !== "") {
+        // replace url str "www" to notionID
+        url = url.replace("www.notion.so", `${notionUser}.notion.site`)
+    }
+
+    await app.fileManager.processFrontMatter(nowFile, yamlContent => {
+        if (yamlContent[notionIDKey]) {
+            delete yamlContent[notionIDKey]
+        }
+        if (yamlContent[linkKey]) {
+            delete yamlContent[linkKey]
+        }
+        // add new notionID and link
+        yamlContent[notionIDKey] = id;
+        yamlContent[linkKey] = url;
+    });
+
+    try {
+        await navigator.clipboard.writeText(url)
+    } catch (error) {
+        new Notice(`复制链接失败，请手动复制${error}`)
+    }
+    // const __content = yamlContent.__content;
+    // delete yamlContent.__content
+    // const yamlhead = yaml.stringify(yamlContent)
+    // //  if yamlhead hava last \n  remove it
+    // const yamlhead_remove_n = yamlhead.replace(/\n$/, '')
+    // // if __content have start \n remove it
+    // const __content_remove_n = __content.replace(/^\n/, '')
+    // const content = '---\n' +yamlhead_remove_n +'\n---\n' + __content_remove_n;
+    // try {
+    // 	await nowFile.vault.modify(nowFile, content)
+    // } catch (error) {
+    // 	new Notice(`write file error ${error}`)
+    // }
+}

src/upload/uploadCommand.ts

@@ -0,0 +1,131 @@
+import {i18nConfig} from "../lang/I18n";
+import {App, Notice} from "obsidian";
+import {Upload2NotionNext} from "./upload_next/Upload2NotionNext";
+import {Upload2NotionGeneral} from "./upload_general/Upload2NotionGeneral";
+import {Upload2NotionCustom} from "./upoload_custom/Upload2NotionCustom";
+import {DatabaseDetails, PluginSettings} from "../ui/settingTabs";
+import ObsidianSyncNotionPlugin from "../main";
+import {getNowFileMarkdownContentNext} from "./upload_next/getMarkdownNext";
+import {getNowFileMarkdownContentGeneral} from "./upload_general/getMarkdownGeneral";
+import {getNowFileMarkdownContentCustom} from "./upoload_custom/getMarkdownCustom";
+
+export async function uploadCommandNext(
+	plugin: ObsidianSyncNotionPlugin,
+	settings: PluginSettings,
+	dbDetails: DatabaseDetails,
+	app: App,
+) {
+
+	const {notionAPI, databaseID} = dbDetails;
+
+	// Check if NNon exists
+	// if (NNon === undefined) {
+	//     const NNonmessage = i18nConfig.NNonMissing;
+	//     new Notice(NNonmessage);
+	//     return;
+	// }
+
+	// Check if the user has set up the Notion API and database ID
+	if (notionAPI === "" || databaseID === "") {
+		const setAPIMessage = i18nConfig["set-api-id"];
+		new Notice(setAPIMessage);
+		return;
+	}
+
+	const {
+		markDownData,
+		nowFile,
+		emoji,
+		cover,
+		tags,
+		type,
+		slug,
+		stats,
+		category,
+		summary,
+		paword,
+		favicon,
+		datetime
+	} = await getNowFileMarkdownContentNext(app, settings)
+
+	if (markDownData) {
+		const {basename} = nowFile;
+		const upload = new Upload2NotionNext(plugin, dbDetails);
+		const res = await upload.syncMarkdownToNotionNext(basename, emoji, cover, tags, type, slug, stats, category, summary, paword, favicon, datetime, markDownData, nowFile, this.app);
+
+		if (res.status === 200) {
+			new Notice(`${i18nConfig["sync-success"]}${basename}`);
+		} else {
+			new Notice(`${i18nConfig["sync-fail"]}${basename}`, 5000);
+		}
+
+	}
+}
+
+
+export async function uploadCommandGeneral(
+	plugin: ObsidianSyncNotionPlugin,
+	settings: PluginSettings,
+	dbDetails: DatabaseDetails,
+	app: App,
+) {
+
+	const {notionAPI, databaseID} = dbDetails;
+
+	// Check if the user has set up the Notion API and database ID
+	if (notionAPI === "" || databaseID === "") {
+		const setAPIMessage = i18nConfig["set-api-id"];
+		new Notice(setAPIMessage);
+		return;
+	}
+
+	const {markDownData, nowFile, cover, tags} = await getNowFileMarkdownContentGeneral(app, settings)
+
+	if (markDownData) {
+		const {basename} = nowFile;
+
+		const upload = new Upload2NotionGeneral(plugin, dbDetails);
+		const res = await upload.syncMarkdownToNotionGeneral(basename, cover, tags, markDownData, nowFile, this.app);
+
+		if (res.status === 200) {
+			new Notice(`${i18nConfig["sync-success"]}${basename}`);
+		} else {
+			new Notice(`${i18nConfig["sync-fail"]}${basename}`, 5000);
+		}
+
+	}
+}
+
+
+export async function uploadCommandCustom(
+	plugin: ObsidianSyncNotionPlugin,
+	settings: PluginSettings,
+	dbDetails: DatabaseDetails,
+	app: App,
+) {
+
+	const {notionAPI, databaseID} = settings;
+
+	// Check if the user has set up the Notion API and database ID
+	if (notionAPI === "" || databaseID === "") {
+		const setAPIMessage = i18nConfig["set-api-id"];
+		new Notice(setAPIMessage);
+		return;
+	}
+
+	const {markDownData, nowFile, cover, customValues} = await getNowFileMarkdownContentCustom(app, dbDetails)
+
+	if (markDownData) {
+		const { basename} = nowFile;
+
+		const upload = new Upload2NotionCustom(plugin, dbDetails);
+		const res = await upload.syncMarkdownToNotionCustom(cover, customValues, markDownData, nowFile, this.app);
+
+		if (res.status === 200) {
+			new Notice(`${i18nConfig["sync-success"]}${basename}`);
+		} else {
+			new Notice(`${i18nConfig["sync-fail"]}${basename}`, 5000);
+		}
+
+	}
+}

src/upload/upload_general/BaseUpload2NotionGeneral.ts

@@ -0,0 +1,96 @@
+import {App, Notice, requestUrl, TFile} from "obsidian";
+import {Client} from '@notionhq/client';
+import {markdownToBlocks,} from "@tryfabric/martian";
+import * as yamlFrontMatter from "yaml-front-matter";
+// import * as yaml from "yaml"
+import MyPlugin from "src/main";
+import {DatabaseDetails} from "../../ui/settingTabs";
+
+export class UploadBaseGeneral {
+	plugin: MyPlugin;
+	notion: Client;
+	agent: any;
+	dbDetails: DatabaseDetails
+
+	constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) {
+		this.plugin = plugin;
+		this.dbDetails = dbDetails
+	}
+
+	async deletePage(notionID: string) {
+
+		const {notionAPI} = this.dbDetails
+		return requestUrl({
+			url: `https://api.notion.com/v1/blocks/${notionID}`,
+			method: 'DELETE',
+			headers: {
+				'Content-Type': 'application/json',
+				'Authorization': 'Bearer ' + notionAPI,
+				'Notion-Version': '2022-06-28',
+			},
+			body: ''
+		});
+	}
+
+	async getDataBase(databaseID: string) {
+		const {notionAPI} = this.dbDetails
+		const response = await requestUrl({
+				url: `https://api.notion.com/v1/databases/${databaseID}`,
+				method: 'GET',
+				headers: {
+					'Authorization': 'Bearer ' + notionAPI,
+					'Notion-Version': '2022-06-28',
+				}
+			}
+		)
+
+		// Check if cover is present in the JSON response and then get the URL
+		if (response.json.cover && response.json.cover.external) {
+			return response.json.cover.external.url;
+		} else {
+			return null;  // or some other default value, if you prefer
+		}
+	}
+
+	// async updateYamlInfo(yamlContent: string, nowFile: TFile, res: any, app: App, settings: any) {
+	//     let {url, id} = res.json
+	//     // replace www to notionID
+	//     const {notionUser} = this.plugin.settings;
+	//
+	//     if (notionUser !== "") {
+	//         // replace url str "www" to notionID
+	//         url = url.replace("www.notion.so", `${notionUser}.notion.site`)
+	//     }
+	//
+	//     await app.fileManager.processFrontMatter(nowFile, yamlContent => {
+	//         if (yamlContent['notionID']) {
+	//             delete yamlContent['notionID']
+	//         }
+	//         if (yamlContent['link']) {
+	//             delete yamlContent['link']
+	//         }
+	//         // add new notionID and link
+	//         yamlContent.notionID = id;
+	//         yamlContent.link = url;
+	//     });
+	//
+	//     try {
+	//         await navigator.clipboard.writeText(url)
+	//     } catch (error) {
+	//         new Notice(`复制链接失败，请手动复制${error}`)
+	//     }
+	//     // const __content = yamlContent.__content;
+	//     // delete yamlContent.__content
+	//     // const yamlhead = yaml.stringify(yamlContent)
+	//     // //  if yamlhead hava last \n  remove it
+	//     // const yamlhead_remove_n = yamlhead.replace(/\n$/, '')
+	//     // // if __content have start \n remove it
+	//     // const __content_remove_n = __content.replace(/^\n/, '')
+	//     // const content = '---\n' +yamlhead_remove_n +'\n---\n' + __content_remove_n;
+	//     // try {
+	//     // 	await nowFile.vault.modify(nowFile, content)
+	//     // } catch (error) {
+	//     // 	new Notice(`write file error ${error}`)
+	//     // }
+	// }
+}

src/upload/upload_general/Upload2NotionGeneral.ts

@@ -0,0 +1,164 @@
+import { App, Notice, requestUrl, TFile } from "obsidian";
+import { Client } from "@notionhq/client";
+import { markdownToBlocks } from "@tryfabric/martian";
+import * as yamlFrontMatter from "yaml-front-matter";
+// import * as yaml from "yaml"
+import MyPlugin from "src/main";
+import {DatabaseDetails, PluginSettings} from "../../ui/settingTabs";
+import { UploadBaseGeneral } from "./BaseUpload2NotionGeneral";
+import { updateYamlInfo } from "../updateYaml";
+
+export class Upload2NotionGeneral extends UploadBaseGeneral {
+	settings: PluginSettings;
+	dbDetails: DatabaseDetails;
+
+	constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) {
+		super(plugin, dbDetails);
+		this.dbDetails = dbDetails;
+	}
+
+	// 因为需要解析notion的block进行对比，非常的麻烦，
+	// 暂时就直接删除，新建一个page
+	async updatePage(
+		notionID: string,
+		title: string,
+		cover: string,
+		tags: string[],
+		childArr: any,
+	) {
+		await this.deletePage(notionID);
+
+		const { databaseID } = this.dbDetails;
+
+		const databaseCover = await this.getDataBase(
+			databaseID,
+		);
+
+		if (cover == null) {
+			cover = databaseCover;
+		}
+
+		return await this.createPage(title, cover, tags, childArr);
+	}
+
+	async createPage(
+		title: string,
+		cover: string,
+		tags: string[],
+		childArr: any,
+	) {
+
+		const {
+			databaseID,
+			customTitleButton,
+			customTitleName,
+			tagButton,
+			notionAPI
+		} = this.dbDetails;
+
+		const bodyString: any = {
+			parent: {
+				database_id: databaseID,
+			},
+			properties: {
+				[customTitleButton
+					? customTitleName
+					: "title"]: {
+					title: [
+						{
+							text: {
+								content: title,
+							},
+						},
+					],
+				},
+				...(tagButton
+					? {
+						tags: {
+							multi_select: tags && true ? tags.map((tag) => ({ name: tag })) : [],
+						},
+					}
+					: {}),
+			},
+			children: childArr,
+		};
+
+		if (cover) {
+			bodyString.cover = {
+				type: "external",
+				external: {
+					url: cover,
+				},
+			};
+		}
+
+		if (!bodyString.cover && this.plugin.settings.bannerUrl) {
+			bodyString.cover = {
+				type: "external",
+				external: {
+					url: this.plugin.settings.bannerUrl,
+				},
+			};
+		}
+
+		try {
+			return await requestUrl({
+				url: `https://api.notion.com/v1/pages`,
+				method: "POST",
+				headers: {
+					"Content-Type": "application/json",
+					// 'User-Agent': 'obsidian.md',
+					Authorization:
+						"Bearer " + notionAPI,
+					"Notion-Version": "2022-06-28",
+				},
+				body: JSON.stringify(bodyString),
+			});
+		} catch (error) {
+			new Notice(`network error ${error}`);
+		}
+	}
+
+	async syncMarkdownToNotionGeneral(
+		title: string,
+		cover: string,
+		tags: string[],
+		markdown: string,
+		nowFile: TFile,
+		app: App,
+	): Promise<any> {
+		const options = {
+			notionLimits: {
+				truncate: false,
+			}
+		}
+		let res: any;
+		const yamlContent: any = yamlFrontMatter.loadFront(markdown);
+		const __content = yamlContent.__content;
+		const file2Block = markdownToBlocks(__content, options);
+		const frontmasster =
+			app.metadataCache.getFileCache(nowFile)?.frontmatter;
+		const {abName} = this.dbDetails
+		const notionIDKey = `NotionID-${abName}`;
+		const notionID = frontmasster ? frontmasster[notionIDKey] : null;
+
+
+		if (notionID) {
+			res = await this.updatePage(
+				notionID,
+				title,
+				cover,
+				tags,
+				file2Block,
+			);
+		} else {
+			res = await this.createPage(title, cover, tags, file2Block);
+		}
+		if (res.status === 200) {
+			await updateYamlInfo(markdown, nowFile, res, app, this.plugin, this.dbDetails);
+		} else {
+			new Notice(`${res.text}`);
+		}
+		return res;
+	}
+}

src/upload/upload_general/getMarkdownGeneral.ts

@@ -0,0 +1,33 @@
+import {App, Notice} from "obsidian";
+import {i18nConfig} from "../../lang/I18n";
+import {PluginSettings} from "../../ui/settingTabs";
+
+export async function getNowFileMarkdownContentGeneral(
+	app: App,
+	settings: PluginSettings,
+) {
+	const nowFile = app.workspace.getActiveFile();
+	let cover = '';
+	let tags = [];
+
+	const FileCache = app.metadataCache.getFileCache(nowFile);
+	try {
+		cover = FileCache.frontmatter.coverurl;
+		tags = FileCache.frontmatter.tags;
+	} catch (error) {
+		new Notice(i18nConfig["set-tags-fail"]);
+	}
+
+	if (nowFile) {
+		const markDownData = await nowFile.vault.read(nowFile);
+		return {
+			markDownData,
+			nowFile,
+			cover,
+			tags,
+		};
+	} else {
+		new Notice(i18nConfig["open-file"]);
+		return;
+	}
+}

src/upload/upload_next/BaseUpload2NotionNext.ts

@@ -0,0 +1,96 @@
+import { App, Notice, requestUrl, TFile } from "obsidian";
+import { Client } from '@notionhq/client';
+import { markdownToBlocks, } from "@tryfabric/martian";
+import * as yamlFrontMatter from "yaml-front-matter";
+// import * as yaml from "yaml"
+import MyPlugin from "src/main";
+import {DatabaseDetails} from "../../ui/settingTabs";
+
+export class UploadBaseNext {
+    plugin: MyPlugin;
+    notion: Client;
+    agent: any;
+	dbDetails: DatabaseDetails
+
+    constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) {
+        this.plugin = plugin;
+		this.dbDetails = dbDetails
+    }
+
+    async deletePage(notionID: string) {
+		const {notionAPI} = this.dbDetails
+        return requestUrl({
+            url: `https://api.notion.com/v1/blocks/${notionID}`,
+            method: 'DELETE',
+            headers: {
+                'Content-Type': 'application/json',
+                'Authorization': 'Bearer ' + notionAPI,
+                'Notion-Version': '2022-06-28',
+            },
+            body: ''
+        });
+    }
+
+    async getDataBase(databaseID: string) {
+		const {notionAPI} = this.dbDetails
+
+        const response = await requestUrl({
+            url: `https://api.notion.com/v1/databases/${databaseID}`,
+            method: 'GET',
+            headers: {
+                'Authorization': 'Bearer ' + notionAPI,
+                'Notion-Version': '2022-06-28',
+            }
+        }
+        )
+
+        // Check if cover is present in the JSON response and then get the URL
+        if (response.json.cover && response.json.cover.external) {
+            return response.json.cover.external.url;
+        } else {
+            return null;  // or some other default value, if you prefer
+        }
+    }
+
+    // async updateYamlInfo(yamlContent: string, nowFile: TFile, res: any, app: App, settings: any) {
+    //     let {url, id} = res.json
+    //     // replace www to notionID
+    //     const { notionUser} = this.plugin.settings;
+    //
+    //     if (notionUser !== "") {
+    //         // replace url str "www" to notionID
+    //         url = url.replace("www.notion.so", `${notionUser}.notion.site`)
+    //     }
+    //
+    //     await app.fileManager.processFrontMatter(nowFile, yamlContent => {
+    //         if (yamlContent['notionID']) {
+    //             delete yamlContent['notionID']
+    //         }
+    //         if (yamlContent['link']) {
+    //             delete yamlContent['link']
+    //         }
+    //         // add new notionID and link
+    //         yamlContent.notionID = id;
+    //         yamlContent.link = url;
+    //     });
+    //
+    //     try {
+    //         await navigator.clipboard.writeText(url)
+    //     } catch (error) {
+    //         new Notice(`复制链接失败，请手动复制${error}`)
+    //     }
+    //     // const __content = yamlContent.__content;
+    //     // delete yamlContent.__content
+    //     // const yamlhead = yaml.stringify(yamlContent)
+    //     // //  if yamlhead hava last \n  remove it
+    //     // const yamlhead_remove_n = yamlhead.replace(/\n$/, '')
+    //     // // if __content have start \n remove it
+    //     // const __content_remove_n = __content.replace(/^\n/, '')
+    //     // const content = '---\n' +yamlhead_remove_n +'\n---\n' + __content_remove_n;
+    //     // try {
+    //     // 	await nowFile.vault.modify(nowFile, content)
+    //     // } catch (error) {
+    //     // 	new Notice(`write file error ${error}`)
+    //     // }
+    // }
+}

src/upload/upload_next/Upload2NotionNext.ts

@@ -0,0 +1,320 @@
+import { UploadBaseNext } from "./BaseUpload2NotionNext";
+import { App, Notice, requestUrl, TFile } from "obsidian";
+import { Client } from '@notionhq/client';
+import { markdownToBlocks, } from "@tryfabric/martian";
+import * as yamlFrontMatter from "yaml-front-matter";
+// import * as yaml from "yaml"
+import MyPlugin from "src/main";
+import {DatabaseDetails, PluginSettings} from "../../ui/settingTabs";
+import { updateYamlInfo } from "../updateYaml";
+import {LIMITS, paragraph} from "@tryfabric/martian/src/notion";
+
+export class Upload2NotionNext extends UploadBaseNext {
+    settings: PluginSettings;
+	dbDetails: DatabaseDetails
+
+    constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) {
+        super(plugin, dbDetails);
+		this.dbDetails = dbDetails
+    }
+
+    // 因为需要解析notion的block进行对比，非常的麻烦，
+    // 暂时就直接删除，新建一个page
+    async updatePage(
+        notionID: string,
+        title: string,
+        emoji: string,
+        cover: string,
+        tags: string[],
+        type: string,
+        slug: string,
+        stats: string,
+        category: string,
+        summary: string,
+        paword: string,
+        favicon: string,
+        datetime: string,
+        childArr: any
+    ) {
+        await this.deletePage(notionID)
+
+		const { databaseID} = this.dbDetails
+
+        const databaseCover = await this.getDataBase(databaseID)
+
+        if (cover == null) {
+            cover = databaseCover
+        }
+
+        return await this.createPage(
+            title,
+            emoji,
+            cover,
+            tags,
+            type,
+            slug,
+            stats,
+            category,
+            summary,
+            paword,
+            favicon,
+            datetime,
+            childArr)
+    }
+
+    async createPage(
+        title: string,
+        emoji: string,
+        cover: string,
+        tags: string[],
+        type: string,
+        slug: string,
+        stats: string,
+        category: string,
+        summary: string,
+        pawrod: string,
+        favicon: string,
+        datetime: string,
+        childArr: any
+    ) {
+
+		const {
+			databaseID,
+			notionAPI
+		} = this.dbDetails
+
+
+        const bodyString: any = {
+            parent: {
+                database_id: databaseID,
+            },
+            properties: {
+                title: {
+                    title: [
+                        {
+                            text: {
+                                content: title
+                            },
+                        },
+                    ],
+                },
+                type: {
+                    select: {
+                        name: type || 'Post'
+                    }
+                },
+                status: {
+                    select: {
+                        name: stats || 'Draft'
+                    }
+                },
+                category: {
+                    select: {
+                        name: category || 'Obsidian'
+                    }
+                },
+
+                password: {
+                    rich_text: [
+                        {
+                            text: {
+                                content: pawrod || ''
+                            }
+                        }
+                    ]
+                },
+                icon: {
+                    rich_text: [
+                        {
+                            text: {
+                                content: favicon || ''
+                            }
+                        }
+                    ]
+                },
+                date: {
+                    date: {
+                        start: datetime || new Date().toISOString()
+                    }
+                }
+            },
+            children: childArr,
+        }
+
+		// add tags
+		if (tags) {
+			bodyString.properties.tags = {
+				multi_select: tags.map(tag => {
+					return { "name": tag }
+				})
+			}
+		}
+
+		// add title icon
+		if (emoji) {
+				bodyString.icon = {
+					emoji: emoji
+				}
+		}
+
+		// add slug
+		if (slug) {
+			bodyString.properties.slug = {
+				rich_text: [
+					{
+						text: {
+							content: slug
+						}
+					}
+				]
+			}
+		}
+
+		// check if summary is available
+		if (summary) {
+			bodyString.properties.summary = {
+				rich_text: [
+					{
+						text: {
+							content: summary
+						}
+					}
+				]
+			}
+		}
+
+
+
+
+        if (cover) {
+            bodyString.cover = {
+                type: "external",
+                external: {
+                    url: cover
+                }
+            }
+        }
+
+        if (!bodyString.cover && this.plugin.settings.bannerUrl) {
+            bodyString.cover = {
+                type: "external",
+                external: {
+                    url: this.plugin.settings.bannerUrl
+                }
+            }
+        }
+
+        try {
+            return await requestUrl({
+                url: `https://api.notion.com/v1/pages`,
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    // 'User-Agent': 'obsidian.md',
+                    'Authorization': 'Bearer ' + notionAPI,
+                    'Notion-Version': '2022-06-28',
+                },
+                body: JSON.stringify(bodyString),
+            })
+        } catch (error) {
+            new Notice(`network error ${error}`)
+        }
+    }
+
+    async syncMarkdownToNotionNext(
+        title: string,
+        emoji: string,
+        cover: string,
+        tags: string[],
+        type: string,
+        slug: string,
+        stats: string,
+        category: string,
+        summary: string,
+        paword: string,
+        favicon: string,
+        datetime: string,
+        markdown: string,
+        nowFile: TFile,
+        app: App,
+    ): Promise<any> {
+		const options = {
+			notionLimits: {
+				truncate: false,
+			}
+		}
+        let res: any
+        const yamlContent: any = yamlFrontMatter.loadFront(markdown);
+        const __content = yamlContent.__content
+        const file2Block = markdownToBlocks(__content, options);
+        const frontmasster = app.metadataCache.getFileCache(nowFile)?.frontmatter
+		const {abName} = this.dbDetails
+		const notionIDKey = `NotionID-${abName}`;
+		const notionID = frontmasster ? frontmasster[notionIDKey] : null;
+
+
+		// increase the limits
+		// Motivated by https://github.com/tryfabric/martian/issues/51
+		file2Block.forEach((block,index) => {
+			if (
+				block.type === 'paragraph' &&
+				block.paragraph.rich_text.length > LIMITS.RICH_TEXT_ARRAYS
+			) {
+
+				const newParagraphBlocks: any[] = []
+				const chunk:any = []
+				const richTextChunks = chunk(block.paragraph.rich_text, 100)
+
+				richTextChunks.forEach((chunk: any) => {
+					newParagraphBlocks.push(paragraph(chunk))
+				})
+
+				file2Block.splice(index, 1, ...newParagraphBlocks)
+
+			}
+		})
+
+        if (notionID) {
+            res = await this.updatePage(
+                notionID,
+                title,
+                emoji,
+                cover,
+                tags,
+                type,
+                slug,
+                stats,
+                category,
+                summary,
+                paword,
+                favicon,
+                datetime,
+                file2Block
+            );
+        } else {
+            res = await this.createPage(
+                title,
+                emoji,
+                cover,
+                tags,
+                type,
+                slug,
+                stats,
+                category,
+                summary,
+                paword,
+                favicon,
+                datetime,
+                file2Block
+            );
+        }
+
+        if (res.status === 200) {
+            await updateYamlInfo(markdown, nowFile, res, app, this.plugin, this.dbDetails)
+        } else {
+            new Notice(`${res.text}`)
+        }
+        return res
+    }
+}
+

src/upload/upload_next/getMarkdownNext.ts

@@ -0,0 +1,60 @@
+import { App, Notice } from "obsidian";
+import { i18nConfig } from "../../lang/I18n";
+import { PluginSettings } from "../../ui/settingTabs";
+
+export async function getNowFileMarkdownContentNext(
+    app: App,
+    settings: PluginSettings,
+) {
+    const nowFile = app.workspace.getActiveFile();
+    let emoji = '';
+    let cover = '';
+    let tags = [];
+    let type = '';
+    let slug = '';
+    let stats = '';
+	let status = '';
+    let category = '';
+    let summary = '';
+    let paword = '';
+    let favicon = '';
+    let datetime = '';
+
+    const FileCache = app.metadataCache.getFileCache(nowFile);
+    try {
+        emoji = FileCache.frontmatter.titleicon;
+        cover = FileCache.frontmatter.coverurl;
+        tags = FileCache.frontmatter.tags;
+        type = FileCache.frontmatter.type;
+        slug = FileCache.frontmatter.slug;
+        stats = FileCache.frontmatter.stats || FileCache.frontmatter.status;
+        category = FileCache.frontmatter.category;
+        summary = FileCache.frontmatter.summary;
+        paword = FileCache.frontmatter.password;
+        favicon = FileCache.frontmatter.icon;
+        datetime = FileCache.frontmatter.date;
+    } catch (error) {
+        new Notice(i18nConfig["set-tags-fail"]);
+    }
+    if (nowFile) {
+        const markDownData = await nowFile.vault.read(nowFile);
+        return {
+            markDownData,
+            nowFile,
+            emoji,
+            cover,
+            tags,
+            type,
+            slug,
+            stats,
+            category,
+            summary,
+            paword,
+            favicon,
+            datetime,
+        };
+    } else {
+        new Notice(i18nConfig["open-file"]);
+        return;
+    }
+}

src/upload/upoload_custom/BaseUpload2NotionCustom.ts

@@ -0,0 +1,95 @@
+import {App, Notice, requestUrl, TFile} from "obsidian";
+import {Client} from '@notionhq/client';
+import {markdownToBlocks,} from "@tryfabric/martian";
+import * as yamlFrontMatter from "yaml-front-matter";
+// import * as yaml from "yaml"
+import MyPlugin from "src/main";
+import {DatabaseDetails} from "../../ui/settingTabs";
+
+export class UploadBaseCustom {
+    plugin: MyPlugin;
+    notion: Client;
+    agent: any;
+	dbDetails: DatabaseDetails
+
+    constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) {
+        this.plugin = plugin;
+		this.dbDetails = dbDetails
+    }
+
+    async deletePage(notionID: string) {
+		const {notionAPI} = this.dbDetails
+        return requestUrl({
+            url: `https://api.notion.com/v1/blocks/${notionID}`,
+            method: 'DELETE',
+            headers: {
+                'Content-Type': 'application/json',
+                'Authorization': 'Bearer ' + notionAPI,
+                'Notion-Version': '2022-06-28',
+            },
+            body: ''
+        });
+    }
+
+    async getDataBase(databaseID: string) {
+		const {notionAPI} = this.dbDetails
+        const response = await requestUrl({
+                url: `https://api.notion.com/v1/databases/${databaseID}`,
+                method: 'GET',
+                headers: {
+                    'Authorization': 'Bearer ' + notionAPI,
+                    'Notion-Version': '2022-06-28',
+                }
+            }
+        )
+
+        // Check if cover is present in the JSON response and then get the URL
+        if (response.json.cover && response.json.cover.external) {
+            return response.json.cover.external.url;
+        } else {
+            return null;  // or some other default value, if you prefer
+        }
+    }
+
+    // async updateYamlInfo(yamlContent: string, nowFile: TFile, res: any, app: App, settings: any) {
+    //     let {url, id} = res.json
+    //     // replace www to notionID
+    //     const {notionUser} = this.plugin.settings;
+    //
+    //     if (notionUser !== "") {
+    //         // replace url str "www" to notionID
+    //         url = url.replace("www.notion.so", `${notionUser}.notion.site`)
+    //     }
+    //
+    //     await app.fileManager.processFrontMatter(nowFile, yamlContent => {
+    //         if (yamlContent['notionID']) {
+    //             delete yamlContent['notionID']
+    //         }
+    //         if (yamlContent['link']) {
+    //             delete yamlContent['link']
+    //         }
+    //         // add new notionID and link
+    //         yamlContent.notionID = id;
+    //         yamlContent.link = url;
+    //     });
+    //
+    //     try {
+    //         await navigator.clipboard.writeText(url)
+    //     } catch (error) {
+    //         new Notice(`复制链接失败，请手动复制${error}`)
+    //     }
+    //     // const __content = yamlContent.__content;
+    //     // delete yamlContent.__content
+    //     // const yamlhead = yaml.stringify(yamlContent)
+    //     // //  if yamlhead hava last \n  remove it
+    //     // const yamlhead_remove_n = yamlhead.replace(/\n$/, '')
+    //     // // if __content have start \n remove it
+    //     // const __content_remove_n = __content.replace(/^\n/, '')
+    //     // const content = '---\n' +yamlhead_remove_n +'\n---\n' + __content_remove_n;
+    //     // try {
+    //     // 	await nowFile.vault.modify(nowFile, content)
+    //     // } catch (error) {
+    //     // 	new Notice(`write file error ${error}`)
+    //     // }
+    // }
+}

src/upload/upoload_custom/Upload2NotionCustom.ts

@@ -0,0 +1,236 @@
+import {App, Notice, requestUrl, TFile} from "obsidian";
+import {markdownToBlocks} from "@tryfabric/martian";
+import * as yamlFrontMatter from "yaml-front-matter";
+// import * as yaml from "yaml"
+import MyPlugin from "src/main";
+import {DatabaseDetails, PluginSettings} from "../../ui/settingTabs";
+import {updateYamlInfo} from "../updateYaml";
+import {UploadBaseCustom} from "./BaseUpload2NotionCustom";
+
+export class Upload2NotionCustom extends UploadBaseCustom {
+	settings: PluginSettings;
+	dbDetails: DatabaseDetails;
+
+	constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) {
+		super(plugin, dbDetails);
+		this.dbDetails = dbDetails;
+	}
+
+	// 因为需要解析notion的block进行对比，非常的麻烦，
+	// 暂时就直接删除，新建一个page
+	async updatePage(
+		notionID: string,
+		cover: string,
+		customValues: Record<string, string>,
+		childArr: any,
+	) {
+		await this.deletePage(notionID);
+
+		const {databaseID} = this.dbDetails;
+
+		const databaseCover = await this.getDataBase(
+			databaseID
+		);
+
+		if (cover == null) {
+			cover = databaseCover;
+		}
+
+		return await this.createPage(cover, customValues, childArr);
+	}
+
+	async createPage(
+		cover: string,
+		customValues: Record<string, string>,
+		childArr: any,
+	) {
+
+		const {
+			databaseID,
+			customProperties,
+			notionAPI
+		} = this.dbDetails;
+
+		const bodyString: any = this.buildBodyString(customProperties, customValues, childArr);
+
+		if (cover) {
+			bodyString.cover = {
+				type: "external",
+				external: {
+					url: cover,
+				},
+			};
+		}
+
+		if (!bodyString.cover && this.plugin.settings.bannerUrl) {
+			bodyString.cover = {
+				type: "external",
+				external: {
+					url: this.plugin.settings.bannerUrl,
+				},
+			};
+		}
+
+		try {
+			return await requestUrl({
+				url: `https://api.notion.com/v1/pages`,
+				method: "POST",
+				headers: {
+					"Content-Type": "application/json",
+					// 'User-Agent': 'obsidian.md',
+					Authorization:
+						"Bearer " + notionAPI,
+					"Notion-Version": "2022-06-28",
+				},
+				body: JSON.stringify(bodyString),
+			});
+		} catch (error) {
+			new Notice(`network error ${error}`);
+		}
+	}
+
+	async syncMarkdownToNotionCustom(
+		cover: string,
+		customValues: Record<string, string>,
+		markdown: string,
+		nowFile: TFile,
+		app: App,
+	): Promise<any> {
+		const options = {
+			notionLimits: {
+				truncate: false,
+			}
+		}
+		let res: any;
+		const yamlContent: any = yamlFrontMatter.loadFront(markdown);
+		const __content = yamlContent.__content;
+		const file2Block = markdownToBlocks(__content, options);
+		const frontmasster =
+			app.metadataCache.getFileCache(nowFile)?.frontmatter;
+		const {abName} = this.dbDetails
+		const notionIDKey = `NotionID-${abName}`;
+		const notionID = frontmasster ? frontmasster[notionIDKey] : null;
+
+		if (notionID) {
+			res = await this.updatePage(
+				notionID,
+				cover,
+				customValues,
+				file2Block,
+			);
+		} else {
+			res = await this.createPage(cover, customValues, file2Block);
+		}
+		if (res.status === 200) {
+			await updateYamlInfo(markdown, nowFile, res, app, this.plugin, this.dbDetails);
+		} else {
+			new Notice(`${res.text}`);
+		}
+		return res;
+	}
+
+	private buildPropertyObject(customName: string, customType: string, customValues: Record<string, any>) {
+		const value = customValues[customName] || '';
+
+		switch (customType) {
+			case "title":
+				return {
+					title: [
+						{
+							text: {
+								content: value,
+							},
+						},
+					],
+				};
+			case "rich_text":
+				return {
+					rich_text: [
+						{
+							text: {
+								content: value || '',
+							},
+						},
+					],
+				};
+			case "date":
+				return {
+					date: {
+						start: value || new Date().toISOString(),
+					},
+				};
+			case "number":
+				return {
+					number: Number(value),
+				};
+			case "phone_number":
+				return {
+					phone_number: value,
+				};
+			case "email":
+				return {
+					email: value,
+				};
+			case "url":
+				return {
+					url: value,
+				};
+			case "files":
+				return {
+					files: Array.isArray(value) ? value.map(url => ({
+						name: url,
+						type: "external",
+						external: {
+							url: url,
+						},
+					})) : [
+						{
+							name: value,
+							type: "external",
+							external: {
+								url: value,
+							},
+						},
+					],
+				};
+			case "checkbox":
+				return {
+					checkbox: Boolean(value) || false,
+				};
+			case "select":
+				return {
+					select: {
+						name: value,
+					},
+				};
+			case "multi_select":
+				return {
+					multi_select: Array.isArray(value) ? value.map(item => ({name: item})) : [{name: value}],
+				};
+		}
+	}
+
+	private buildBodyString(
+		customProperties: { customName: string; customType: string }[],
+		customValues: Record<string, string>,
+		childArr: any,
+	) {
+
+		const properties: { [key: string]: any } = {};
+
+		customProperties.forEach(({customName, customType}) => {
+			properties[customName] = this.buildPropertyObject(customName, customType, customValues);
+			}
+		);
+
+
+		return {
+			parent: {
+				database_id: this.dbDetails.databaseID,
+			},
+			properties,
+			children: childArr,
+		};
+	}
+
+}

src/upload/upoload_custom/getMarkdownCustom.ts

@@ -0,0 +1,57 @@
+import {App, Notice} from "obsidian";
+import {i18nConfig} from "../../lang/I18n";
+import {DatabaseDetails} from "../../ui/settingTabs";
+
+export async function getNowFileMarkdownContentCustom(
+	app: App,
+	dbDetails: DatabaseDetails,
+) {
+	const nowFile = app.workspace.getActiveFile();
+	if (!nowFile) {
+		new Notice(i18nConfig["open-file"]);
+		return;
+	}
+	let cover = '';
+	let customValues: Record<string, any> = {};
+
+	const FileCache = app.metadataCache.getFileCache(nowFile);
+	try {
+		cover = FileCache.frontmatter.coverurl;
+
+		// Get custom property names from dbDetails excluding the title type property
+		const customPropertyNames = dbDetails.customProperties
+			.filter(property => property.customType !== 'title') // Exclude 'title' type property
+			.map(property => property.customName);
+
+		// Extract custom values from the front matter based on the names
+		customPropertyNames.forEach(propertyName => {
+			if (FileCache.frontmatter && FileCache.frontmatter[propertyName] !== undefined) {
+				customValues[propertyName] = FileCache.frontmatter[propertyName];
+			}
+		});
+
+		// Check if any of the customProperties has a customType of 'title'
+		const titleProperty = dbDetails.customProperties.find(property => property.customType === 'title');
+
+		// If a 'title' type property exists, use the file's basename as its value
+		if (titleProperty) {
+			customValues[titleProperty.customName] = nowFile.basename; // Use 'basename' for the file name without extension
+		}
+
+	} catch (error) {
+		new Notice(i18nConfig["set-tags-fail"]);
+	}
+
+	if (nowFile) {
+		const markDownData = await nowFile.vault.read(nowFile);
+		return {
+			markDownData,
+			nowFile,
+			cover,
+			customValues,
+		};
+	} else {
+		new Notice(i18nConfig["open-file"]);
+		return;
+	}
+}

tsconfig.json

@@ -3,6 +3,8 @@
     "baseUrl": ".",
     "inlineSourceMap": true,
     "inlineSources": true,
+	  "resolveJsonModule": true,
+	  "allowSyntheticDefaultImports": true,
     "module": "ESNext",
     "target": "ES6",
     "allowJs": true,
@@ -17,6 +19,8 @@
     ]
   },
   "include": [
-    "**/*.ts"
+    "**/*.ts",
-, "Upload2Notion.ts"  ]
+    "src/Upload2Notion.ts",
+    "src/*.ts"
+  ]
 }

update-version.js

@@ -1,11 +1,10 @@
 // update package.json version
-import fs from 'fs';
+import fs from "fs";
 
-const packageJson = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
+const packageJson = JSON.parse(fs.readFileSync("./package.json", "utf8"));
 
 console.log(packageJson.version);
 
-
 // get node args
 const args = process.argv.slice(2);
 
@@ -13,14 +12,13 @@ packageJson.version = args[0];
 
 console.log(packageJson.version);
 
-
 // write package.json
-fs.writeFileSync('./package.json', JSON.stringify(packageJson, null, 2));
+fs.writeFileSync("./package.json", JSON.stringify(packageJson, null, 2));
 
 // read manifest.json
-const manifestJson = JSON.parse(fs.readFileSync('./manifest.json', 'utf8'));
+const manifestJson = JSON.parse(fs.readFileSync("./manifest.json", "utf8"));
 
 manifestJson.version = args[0];
 
 // write manifest.json
-fs.writeFileSync('./manifest.json', JSON.stringify(manifestJson, null, 2));
+fs.writeFileSync("./manifest.json", JSON.stringify(manifestJson, null, 2));