docs: update documentation website link in README files

chore: Switch to pnpm and create individual package for docs
chore: remove unused image files from documentation
2026-07-31 01:48:35 +08:00 · 2025-10-31 14:27:39 +00:00 · 2025-10-31 13:46:31 +00:00 · 2025-10-31 11:14:43 +00:00 · 2025-10-31 11:03:19 +00:00 · 2025-10-31 10:57:37 +00:00
63 changed files with 7936 additions and 2596 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,98 +1,108 @@
-name: Release Obsidian plugin
+name: Release

 on:
-  push:
-    tags:
-      - "*"
+    push:
+        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:
-    runs-on: ubuntu-latest
+    build:
+        name: release
+        runs-on: ubuntu-latest

-    steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version: "16.x"
+        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
+            #            - name: Generate changelog
+            #              id: changelog
+            #              uses: saadmk11/changelog-ci@v1.1.2
+            #              with:
+            #                  github_token: ${{ secrets.REPO_ACCESS_TOKEN }}
+            #                  release_version: ${{ github.ref }}
+            #                  changelog_filename: CHANGELOG.md

-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
-          VERSION: ${{ github.ref }}
-        with:
-          tag_name: ${{ github.ref }}
-          release_name: ${{ github.ref }}
-          draft: false
-          prerelease: false
+            -   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

-      - name: Upload zip file
-        id: upload-zip
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./${{ env.PLUGIN_NAME }}.zip
-          asset_name: ${{ env.PLUGIN_NAME }}-${{ steps.build.outputs.tag_name }}.zip
-          asset_content_type: application/zip
+            -   name: Create Release
+                id: create_release
+                uses: actions/create-release@v1
+                env:
+                    GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+                    VERSION: ${{ github.ref }}
+                with:
+                    tag_name: ${{ github.ref }}
+                    release_name: ${{ github.ref }}
+                    body_path: ${{ env.CHANGELOG_FILENAME }}
+                    draft: false
+                    prerelease: false

-      - name: Upload main.js
-        id: upload-main
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./main.js
-          asset_name: main.js
-          asset_content_type: text/javascript
+            -   name: Upload zip file
+                id: upload-zip
+                uses: actions/upload-release-asset@v1
+                env:
+                    GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+                with:
+                    upload_url: ${{ steps.create_release.outputs.upload_url }}
+                    asset_path: ./${{ env.PLUGIN_NAME }}.zip
+                    asset_name: ${{ env.PLUGIN_NAME }}-${{ steps.build.outputs.tag_name }}.zip
+                    asset_content_type: application/zip

-      - name: Upload manifest.json
-        id: upload-manifest
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./manifest.json
-          asset_name: manifest.json
-          asset_content_type: application/json
+            -   name: Upload main.js
+                id: upload-main
+                uses: actions/upload-release-asset@v1
+                env:
+                    GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+                with:
+                    upload_url: ${{ steps.create_release.outputs.upload_url }}
+                    asset_path: ./main.js
+                    asset_name: main.js
+                    asset_content_type: text/javascript

-      - name: Upload markdown template
-        id: upload-md
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./obsidian_template.md
-          asset_name: template.md
-          asset_content_type: text/markdown
+            -   name: Upload manifest.json
+                id: upload-manifest
+                uses: actions/upload-release-asset@v1
+                env:
+                    GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+                with:
+                    upload_url: ${{ steps.create_release.outputs.upload_url }}
+                    asset_path: ./manifest.json
+                    asset_name: manifest.json
+                    asset_content_type: application/json

-      # - 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
+            -   name: Upload markdown template
+                id: upload-md
+                uses: actions/upload-release-asset@v1
+                env:
+                    GITHUB_TOKEN: ${{ secrets.REPO_ACCESS_TOKEN }}
+                with:
+                    upload_url: ${{ steps.create_release.outputs.upload_url }}
+                    asset_path: ./obsidian_template.md
+                    asset_name: template.md
+                    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
--- a/.github/workflows/test.yml
+++ b/.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
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,11 @@ data.json

 # Exclude macOS Finder (System Explorer) View States
 .DS_Store
-.history
+.history
+
+# local data
+local-data
+
+# vitepress
+docs/.vitepress/dist
+docs/.vitepress/cache
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -0,0 +1,6 @@
+## Feature
+
+- Better debugging information for upload failures.
+- Support synchronising Obsidian callouts as Notion callout blocks.
+- 优化控制台输出的调试信息。
+- 支持将 Obsidian Callout 同步为 Notion Callout 区块。
--- a/README-zh.md
+++ b/README-zh.md
@@ -1,201 +1,20 @@
-# Obsidian share to NotionNext
-感谢[原作者](https://github.com/EasyChris/obsidian-to-notion)开发出了这么好用的插件，能够将obsidian同步到notion。 但是原仓库只能同步Name和Tags信息，如果像我一样通过[NotionNext](https://github.com/tangly1024/NotionNext)来搭建自己的网页，就有一些局限性。每次导入之后都需要进行大量的修改。
+# Obsidian to NotionNext

-所以我在[原作者](https://github.com/EasyChris/obsidian-to-notion)的基础之上，增加了匹配[NotionNext](https://github.com/tangly1024/NotionNext)模板的功能。这样可以直接在Obsidian编辑，整理好之后一键发布。
-## 更新说明
-### 0.1.7
- [x] 删除了设置中`convert tags`的选项。 你现在可以直接添加tags，而不需要考虑是否开启tags选项。如果你不需要tags，可以直接删除tags选项或者留白。
+[![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/)

-## 使用方式
-### 注意事项
-本插件现在暂时只能用于匹配[NotionNext](https://github.com/tangly1024/NotionNext)。如果你不是使用这个模板，你只会无限返回`error 400`. 
+使用 Notion API 将文件从 Obsidian 分享到任何 Notion 数据库。此插件支持通用 Notion 数据库、NotionNext 博客模板和完全自定义的数据库模式。

-所以没有NotionNext需求的，请使用原作者的[Obsidian-to-notion](https://github.com/EasyChris/obsidian-to-notion)
+**详细说明请访问[文档网站](https://obsidian-to-notionnext.pages.dev/)。**

-### 准备安装
-在安装插件之前，你必须配置好了以下内容：
+## 功能特性

-1. 你的NotionNext数据库。
-2. 根据原作者的readme.md，配置好了Notion API，并且已经和你的NotionNext仓库关联。
-3. NotionNext Database ID
-4. 你的NotionNext数据库有如下内容：
-    - type
-    - title
-    - slug
-    - category
-    - tags
-    - date
-    - status
-    - summary
-    - password
-    - icon
-   
-在最新的0.0.6版本，我还增加了以下内容：
- titleicon： 标题的emoji图标,暂时只能支持emoji
- coverurl： 封面图片的url， url可以是任何一种图片的url， 例如jpg，png，svg等等。
+- **多种数据库类型**：支持通用、NotionNext 和自定义数据库。
+- **自定义属性**：在自定义数据库中，可将任何 frontmatter 键映射到任何 Notion 属性。
+- **灵活同步**：即时选择要同步到哪个数据库。

-**如果你是直接复制的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.
-# 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 📜， 默认是📜
-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
-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
---
-
-Contents Below
-
-
-```
-模板使用如下：
-![](https://minioapi.pjx.ac.cn/img1/2023/09/354b950e5777b48832c2475e4a31f2cc.gif)
-
-**插件预览如下**
-![](https://minioapi.pjx.ac.cn/img1/2023/09/d6199619b68fab218fca8ae0cebece78.gif)
-
---
-
-**以下为原README.md**
-
-非常感谢原作者的开发，我只是在原作者的基础之上进行了修改，增加了一些功能。如果你觉得这个插件对你有帮助，可以给[原作者](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)
-[![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)
-
-Obsidian share to Notion [English](README.md)
-
-将obsidian文件一键分享到Notion,并在obsidian中添加Notion分享链接
-
-如果能对你有所帮助，欢迎给一个star支持。
-
-![](./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。
-转到 [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)
-
-将`integration`添加到你的新建的数据库中
-
-![](./doc/6.gif)
-
-#### 注意
-
-数据库的第一个自定义名称必须是 "Name"，否则同步会失败。
-
-![](https://afox-1256168983.cos.ap-shanghai.myqcloud.com/20220618102029.png)
-
-
-
-
-### 第三步：复制database ID
-
-```
-https://www.notion.so/myworkspace/a8aec43384f447ed84390e8e42c2e089?v=...
-                                  |--------- Database ID --------|
-
-```
-
-
-
-## 打开插件配置
-将得到的 `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 ID，它将分享到页面链接如：https://your_user_name.notion.site/myworkspace/a8aec43384f447ed84390。不需要重定向网址。
-
-## 同步图片
-
-使用 [Obsidian Image Auto Upload Plugin](https://github.com/renmu123/obsidian-image-auto-upload-plugin) 插件，配置你自己的 cos 或者 oss，将图片存储到你自己的云存储，然后在 obsidian 中使用图片链接即可。该插件会自动帮你上传图片，并替换成链接。
-
-# 请我喝杯咖啡
-
-[顿顿饭](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)
-
-[GitHub - obsidianmd/obsidian-api](https://github.com/obsidianmd/obsidian-api)
-
-[GitHub - zhaohongxuan/obsidian-weread-plugin: Obsidian Weread Plugin is an plugin to sync Weread(微信读书) hightlights and annotations into your Obsidian Vault.](https://github.com/zhaohongxuan/obsidian-weread-plugin)
+此插件是 EasyChris 的原创作品 [obsidian-to-notion](https://github.com/EasyChris/obsidian-to-notion) 的一个分支，增加了新功能并支持更灵活的数据库配置。
--- a/README.md
+++ b/README.md
@@ -1,283 +1,21 @@
-# Obsidian to NotionNext 
-[中文文档](README-zh.md)
+# Obsidian to NotionNext

-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.
+[![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/)

-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.
-## Update
-### 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.
+[中文版](README-zh.md)
+Share files from Obsidian to any Notion database using the Notion API. This plugin supports general Notion databases, NotionNext blog templates, and fully custom database schemas.

+**For detailed instructions, please visit the [documentation website](https://obsidian-to-notionnext.pages.dev/).**

-## How to Use
-### 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`.
+## Features

-For those without a NotionNext requirement, please use the original [Obsidian-to-notion](https://github.com/EasyChris/obsidian-to-notion).
+- **Multiple Database Types**: Supports General, NotionNext, and Custom databases.
+- **Custom Properties**: Map any frontmatter key to any Notion property in custom databases.
+- **Flexible Syncing**: Choose which database to sync to on-the-fly.

-### 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
-4. Your NotionNext database should have the following contents:
-    - type
-    - title
-    - slug
-    - category
-    - tags
-    - date
-    - status
-    - summary
-    - password
-    - icon
-   
-From version 0.0.6, I also add the following contents:
-	- 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.
+## Acknowledgment

-**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.
-# 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 📜， 默认是📜
-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
-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
---
-
-Contents Below
-
-```
-Usage of the template is as follows:
-![](https://minioapi.pjx.ac.cn/img1/2023/09/354b950e5777b48832c2475e4a31f2cc.gif)
-
-**Plugin preview is shown below**
-![](https://minioapi.pjx.ac.cn/img1/2023/09/d6199619b68fab218fca8ae0cebece78.gif)
-
---
-
-**Original README.md**
-
-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
-
-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
- [x] support for auto copy the share link to clipboard
- [x] support for mobile
- [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.
-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:
-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)
-
-Add `integration` to your new database
-
-![](./doc/6.gif)
-
-### Step 3: Copy the database ID
-
-```
-https://www.notion.so/myworkspace/a8aec43384f447ed84390e8e42c2e089?v=...
-                                  | --------- Database ID --------|
-
-```
-
-
-
-## 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
-![](./doc/4.png)
-A share link will be automatically generated after successful upload
-![](./doc/5.png)
-
-
-## Banner URL [option]
-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)
-
-Add tags to your notion page
-
-![](./doc/10.png)
-
-* open plugin convert tags
-
-![](./doc/8.png)
-
-* add tags in the head 
-
-```markdown
---
-tags: [tag1,tag2]
---
-
-this is test tags
-
-```
-
-
-```markdown
---
-tags:
-  - tag4
---
-
-this is test tags
-
-```
-
-![](./doc/9.png)
-
-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: 
-https://www.notion.so/myworkspace/a8aec43384f447ed84390 
-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: 
-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
-
-```
-git clone https://github.com/EasyChris/obsidian-to-notion.git
-yarn install
-yarn dev
-```
-
-## Release
-
-```
-node update-version.js
-./release.sh
-```
-```
-
-
-
-
-# Thanks
-[Development Process | Obsidian Plugin Development Documentation](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)
-
-[GitHub - obsidianmd/obsidian-api](https://github.com/obsidianmd/obsidian-api)
-
-[GitHub - Easychris/obsidian-to-notion: Obsidian Weread Plugin is an plugin to sync Weread(微信读书) hightlights and annotations into your Obsidian Vault.](https://github.dev/zhaohongxuan/obsidian-weread-plugin)
-
-[GitHub - Quorafind/Obsidian-Memos: A quick capture plugin for Obsidian, all data from your notes.](https://github.com/Quorafind/Obsidian-Memos)
-
-[https://github.com/jannikbuscha/obsidian-to-notion](https://github.com/jannikbuscha)
-
-# License
-GNU GPLv3
+This plugin is a fork of the original [obsidian-to-notion](https://github.com/EasyChris/obsidian-to-notion) by EasyChris, with added features and support for more flexible database configurations.
--- a/doc/1.gif
+++ b/doc/1.gif
--- a/doc/10.png
+++ b/doc/10.png
--- a/doc/2.png
+++ b/doc/2.png
--- a/doc/3.gif
+++ b/doc/3.gif
--- a/doc/4.png
+++ b/doc/4.png
--- a/doc/5.png
+++ b/doc/5.png
--- a/doc/6.gif
+++ b/doc/6.gif
--- a/doc/7.png
+++ b/doc/7.png
--- a/doc/8.png
+++ b/doc/8.png
--- a/doc/9.png
+++ b/doc/9.png
--- a/docs/.vitepress/config.ts
+++ b/docs/.vitepress/config.ts
@@ -0,0 +1,69 @@
+import { defineConfig } from 'vitepress'
+import { withSidebar } from 'vitepress-sidebar';
+
+// https://vitepress.dev/reference/site-config
+const vitePressOptions = {
+  title: "Obsidian to NotionNext",
+  description: "A plugin to share files to any Notion database using the Notion API.",
+
+  themeConfig: {
+    socialLinks: [
+      { icon: 'github', link: 'https://github.com/jxpeng98/obsidian-to-NotionNext' }
+    ]
+  },
+  locales: {
+    root: {
+      label: 'English',
+      lang: 'en',
+      link: '/en/',
+      themeConfig: {
+        nav: [
+          { text: 'Home', link: '/en/' },
+          { text: 'Guide', link: '/en/01-getting-started' }
+        ],
+      }
+    },
+    zh: {
+      label: '简体中文',
+      lang: 'zh-CN',
+      link: '/zh/',
+      themeConfig: {
+        nav: [
+          { text: '首页', link: '/zh/' },
+          { text: '指南', link: '/zh/01-getting-started' }
+        ],
+      }
+    }
+  }
+};
+
+
+const commonSidebarOptions = {
+  documentRootPath: '/',
+  useTitleFromFrontmatter: true,
+  frontmatterTitleFieldName: 'title',
+  collapsed: true,
+  removePrefixAfterOrdering: true,
+  prefixSeparator: '-',
+  hyphenToSpace: true,
+  useFolderTitleFromIndexFile: true,
+  useFolderLinkFromIndexFile: true,
+  sortMenusByName: false,
+};
+
+const vitePressSidebarOptions = [
+  {
+    ...commonSidebarOptions,
+    scanStartPath: '/en',
+    basePath: '/',
+    resolvePath: '/en/'
+  },
+  {
+    ...commonSidebarOptions,
+    scanStartPath: '/zh',
+    basePath: '/',
+    resolvePath: '/zh/',
+  }
+];
+
+export default defineConfig(withSidebar(vitePressOptions, vitePressSidebarOptions));
--- a/docs/en/01-getting-started.md
+++ b/docs/en/01-getting-started.md
@@ -0,0 +1,45 @@
+---
+title: Getting Started
+description: Guide to setting up the Obsidian to NotionNext plugin
+---
+
+# Getting Started
+
+## Get Notion API Token
+
+Before using the plugin, you need to obtain an API Token from Notion to allow the plugin to access your Notion account.
+
+1. Go to the [Notion API](https://www.notion.so/profile/integrations) page to create a new integration. You need to be logged into your Notion account.
+2. Click on `+ New integration`.
+![new-integration](https://r2imga.jxpeng.dev/2025/10/3d12358494c000ab7035820e1e836934.png)
+3. Fill in the required information:
+![integration-info](https://r2imga.jxpeng.dev/2025/10/645b8182105e5e64e61bd263394534d6.png)
+4. Integration successfully created.
+![success](https://r2imga.jxpeng.dev/2025/10/57ea92c48efc15b95a69f3663424f5ae.png)
+5. Enter the "Configure integration settings" page and **prepare to copy the API Token,** which you will need in the plugin settings.
+![configure-integration](https://r2imga.jxpeng.dev/2025/10/4a50e55c35e47f905fb7fe63af5c8402.png)
+
+::: warning
+**⚠️ Note:** Keep your API Token secure and do not share it with others, as it grants access to your Notion data.
+:::
+
+## Create a Notion Database and Connect Integration
+
+Next, you need to create a Notion database to store the notes synced from Obsidian.
+
+1. In your Notion workspace, click on `Create a new page` to create a new page.
+![create-new-page](https://r2imga.jxpeng.dev/2025/10/1f092ef1d8c5a25aeb75694d654810a1.png)
+
+2. create a new page and select the `Database - Full page` option.
+![new-database](https://r2imga.jxpeng.dev/2025/10/73b700fc65a53f2ff518b58832bf9757.png)
+
+3. Click the `...` menu in the top-right corner of the database page, go to `Connections`, and connect your newly created integration.
+![connect-integration](https://r2imga.jxpeng.dev/2025/10/e8d9be4718f6f5c76fdc3bee7d694d23.png)
+
+4. Click `Share` -> `Publish` to publish the database to the web.
+![publish](https://r2imga.jxpeng.dev/2025/10/4b1d3f597d67508ee67d20a62151200f.png)
+
+5. Click and copy the **Database ID**.
+![database-id](https://r2imga.jxpeng.dev/2025/10/d8f22c1daf5063305256e5e50210adf9.png)
+
+Next, you can proceed to install and configure the plugin in Obsidian by following the [Installation Guide](./02-installation.md).
--- a/docs/en/02-installation.md
+++ b/docs/en/02-installation.md
@@ -0,0 +1,28 @@
+---
+title: Installation
+description: Guide to installing the Obsidian to NotionNext plugin
+---
+
+# Installation
+
+Once you have completed the previous section setup on the Notion side, you can install and configure the plugin in Obsidian.
+
+1. Open Obsidian's `Settings`.
+![obsidian](https://r2imga.jxpeng.dev/2025/10/6f80d5126391162dd7cc98de87d3c1b2.png)
+
+2. Navigate to `Community plugins`.
+![community-plugins](https://r2imga.jxpeng.dev/2025/10/adf7dd7d292dcc331d7625b8f409f222.png)
+::: tip
+If you haven't enabled community plugins before, you may need to turn off `Safe mode` first (`Turn on Community plugins`).
+:::
+
+3. Go to `Community plugins` -> `Browse`.
+![browse](https://r2imga.jxpeng.dev/2025/10/e4f170f966902999fe2137196d8b6f9c.png)
+
+4. Search for "NotionNext" and click `Install`.
+![install](https://r2imga.jxpeng.dev/2025/10/1b0fcf15bc80aeb3714d9c97cbc6d5b0.png)  
+
+5. After installation, enable the plugin.
+![enable](https://r2imga.jxpeng.dev/2025/10/6c7a7ee7d6e5861a3f0867c826e3f2c0.png)  
+
+Now, once enabled, you can find the "Share to NotionNext" settings in the plugin settings tab to begin [configuring your databases](./03-configuration.md) in the next step.
--- a/docs/en/03-configuration.md
+++ b/docs/en/03-configuration.md
@@ -0,0 +1,112 @@
+---
+title: Configuration
+description: Guide to configuring Notion databases in the Obsidian to NotionNext plugin
+---
+
+# Database Configuration
+
+After installing the plugin and obtaining the Notion API token and Database ID, you can proceed to configure the databases you want to sync with.
+
+First, open the plugin settings in Obsidian.
+![open-plugin-settings](https://r2imga.jxpeng.dev/2025/10/d2cfc05a86a8f014354fbd4e8456ccdc.png)
+
+Click "Add new database" to start creating a new database configuration.
+
+![add-database](https://r2img.jxpeng.dev/2024/07/115f47b4180d04fb362b931f8092b5fb.png)
+
+In the plugin settings, you can add and configure the Notion databases you want to sync with. The plugin supports three types of database configurations.
+
+- [Database Configuration](#database-configuration)
+  - [1️⃣ General Database](#1️⃣-general-database)
+  - [2️⃣ NotionNext Database](#2️⃣-notionnext-database)
+  - [3️⃣ Custom Database](#3️⃣-custom-database)
+  - [Finalizing Configuration](#finalizing-configuration)
+
+## 1️⃣ General Database
+
+This is the most basic database type and is suitable for most users.
+
+**Configuration:**
+
+- **Full Name**: A name for this database configuration.
+- **Notion API Token**: The API token you obtained in the first step.
+- **Database ID**: The database ID you obtained in the second step.
+
+**Notion Database Requirements:**
+
+- Must contain a `Title` property named `title`.
+- Must contain a `Multi-select` property named `tags`.
+![notion-general](https://r2imga.jxpeng.dev/2025/10/3abc05f71a1bd81bdc00fd988dd71108.png)
+
+Then, fill in the configuration fields as shown below:
+
+- **Database Full Name**: the name you want to give this database to recognise it in the database list (e.g. "Learning Database").
+- **Database Abbreviate Name**: a short abbreviation for this database (e.g. "learning").
+- **Notion Tags Sync**: enable this option if you want to sync tags columns from Obsidian to Notion (**if you enable this option, make sure you add tags in your notes**).
+- **Customise title property**: the property in your Notion database that you want to use as the primary column (default is `title`).
+- **Notion API Token**: the API token you obtained in the first step.
+- **Database ID**: the database ID you obtained in the second step.
+
+![general](https://r2imga.jxpeng.dev/2025/10/9697de930e530c55081e07835e224782.png)
+
+## 2️⃣ NotionNext Database
+
+This type is specifically designed for users of the [NotionNext](https://github.com/tangly1024/NotionNext) blog system, with properties preset to match the NotionNext template.
+
+Config the database similarly to the General Database type:
+
+- **Database Full Name**: A name for this database configuration.
+- **Database Abbreviate Name**: A short abbreviation for this database.
+- **Notion API Token**: The API token you obtained in the first step.
+- **Database ID**: The database ID you obtained in the second step.
+
+![notionnext](https://r2imga.jxpeng.dev/2025/10/5b1b3b3fb4ef9a76f4fed26fcc6c426b.png)
+
+## 3️⃣ Custom Database
+
+This type offers maximum flexibility for advanced users. It allows you to map any frontmatter metadata from your Obsidian notes to any property in your Notion database.
+
+You should first config the database similarly to the General Database type:
+- **Database Full Name**: A name for this database configuration.
+- **Database Abbreviate Name**: A short abbreviation for this database.
+- **Notion API Token**: The API token you obtained in the first step.
+- **Database ID**: The database ID you obtained in the second step.
+
+![custom](https://r2imga.jxpeng.dev/2025/10/667335d7fd2cfa96e307be3df79e157e.png)
+
+Once you have filled in the basic configuration, you can start to add new properties.
+
+You can click the `Add New Property` button to create a new property mapping.
+
+First, you need to add the title property mapping, which is required for the Notion database to function correctly.
+
+![title-property](https://r2imga.jxpeng.dev/2025/10/2ad52037476d3f86f3c4cfbed507f74b.png)
+
+::: tip
+Remember to set the "Notion Property" to the property name in your Notion database (case-sensitive) and the "Frontmatter Key" to the key in your Obsidian note's frontmatter.
+:::
+
+After adding the title property, you can continue to add more properties as needed.
+![property-1](https://r2imga.jxpeng.dev/2025/10/d4c0bcc3abbc741dd34ce22e589d6223.png)
+
+For now, the plugin supports the following Notion property types:
+- Text
+- Number
+- Select
+- Multi-select
+- Date
+- Files & Media
+- Checkbox
+- URL
+- Email
+- Phone Number
+
+![types](https://r2imga.jxpeng.dev/2025/10/81d321693dfd046ad3386e4507d60792.png)
+
+::: info
+Relation and Rollup types are not supported yet.
+:::
+
+## Finalizing Configuration
+
+After configuring your database, make sure to save your settings. You can now start syncing your Obsidian notes to the configured Notion database by using the "Share to NotionNext" command from the command palette or the note context menu.
--- a/docs/en/04-sync.md
+++ b/docs/en/04-sync.md
@@ -0,0 +1,12 @@
+---
+title: Syncing Notes
+description: How to sync your Obsidian notes to Notion using the NotionNext plugin
+---
+
+# Syncing Notes
+
+After configuring your Notion database in the plugin settings, you can start syncing your Obsidian notes to Notion.
+
+To sync a note, open the note you want to sync and use the "Share to NotionNext" command from the command palette or the note context menu. This will create a new page in your Notion database with the content of your Obsidian note.
+
+You can also set up automatic syncing for specific notes or folders by configuring the plugin settings. This way, any changes you make to your Obsidian notes will be automatically reflected in Notion.
--- a/docs/en/05-troubleshooting.md
+++ b/docs/en/05-troubleshooting.md
@@ -0,0 +1,10 @@
+---
+title: Troubleshooting
+description: Common issues and solutions for the Obsidian to NotionNext plugin
+---
+
+# Troubleshooting
+
+If the problem persists, you can [open an issue on GitHub](https://github.com/jxpeng98/obsidian-to-NotionNext/issues) with detailed error information and the steps you took.
+
+You can find the error logs in Obsidian by going to developer tools (`Ctrl+Shift+I` or `Cmd+Option+I`) and checking the console for any error messages related to the NotionNext plugin.
--- a/docs/en/index.md
+++ b/docs/en/index.md
@@ -0,0 +1,21 @@
+---
+title: Introduction
+description: Share files to any Notion database using the Notion API
+order: 0
+---
+
+# Obsidian to NotionNext
+
+In this documentation, you will find guides and instructions on how to set up and use the Obsidian to NotionNext plugin. This plugin allows you to share your Obsidian notes directly to Notion databases using the Notion API.
+
+This guide will walk you through the process of setting up the Obsidian to NotionNext plugin.
+
+[Getting Started](./01-getting-started.md)
+
+[Installation](./02-installation.md)
+
+[Configuration](./03-configuration.md)
+
+[Syncing Notes](./04-sync.md)
+
+[Troubleshooting](./05-troubleshooting.md)
--- a/docs/index.md
+++ b/docs/index.md
@@ -0,0 +1,29 @@
+---
+# https://vitepress.dev/reference/default-theme-home-page
+layout: home
+
+hero:
+  name: "Obsidian to NotionNext"
+  text: "Share files to any Notion database using the Notion API"
+  tagline: Support All Notion databases, including NotionNext and General Notion databases, and customise the database list.
+  actions:
+    - theme: brand
+      text: Get Started
+      link: /en/
+    - theme: brand
+      text: 现在开始
+      link: /zh/
+    - theme: alt
+      text: View on GitHub
+      link: https://github.com/jxpeng98/obsidian-to-NotionNext
+
+features:
+  - title: All Notion Databases
+    details: Support for both general and NotionNext-specific databases.
+  - title: Custom Properties
+    details: Customize database properties to fit your workflow.
+  - title: Long Note Sync
+    details: Sync long notes seamlessly.
+  - title: Callout Support
+    details: Obsidian callouts are converted to Notion callout blocks.
+---
--- a/docs/package.json
+++ b/docs/package.json
@@ -0,0 +1,17 @@
+{
+    "name": "obsidian-to-notionnext-docs",
+    "private": true,
+    "engines": {
+        "node": ">=20"
+    },
+    "scripts": {
+        "dev": "vitepress dev",
+        "build": "vitepress build",
+        "preview": "vitepress preview"
+    },
+    "devDependencies": {
+        "vitepress": "^2.0.0-alpha.12",
+        "vitepress-sidebar": "^1.33.0",
+        "vue": "^3.5.22"
+    }
+}
--- a/docs/pnpm-lock.yaml
+++ b/docs/pnpm-lock.yaml
--- a/docs/zh/01-getting-started.md
+++ b/docs/zh/01-getting-started.md
@@ -0,0 +1,45 @@
+---
+title: 开始使用
+description: Obsidian to NotionNext 插件设置指南
+---
+
+# 开始使用
+
+## 获取 Notion API 令牌
+
+在使用本插件前，你需要从 Notion 获取一个 API 令牌（Token），以授权插件访问你的 Notion 账户。
+
+1. 前往 [Notion API](https://www.notion.so/profile/integrations) 页面来创建一个新的集成（integration）。你需要先登录你的 Notion 账户。
+2. 点击 `+ New integration`。
+![new-integration](https://r2imga.jxpeng.dev/2025/10/3d12358494c000ab7035820e1e836934.png)
+3. 填写一些基本信息：
+![integration-info](https://r2imga.jxpeng.dev/2025/10/645b8182105e5e64e61bd263394534d6.png)
+4. 成功创建集成。
+![success](https://r2imga.jxpeng.dev/2025/10/57ea92c48efc15b95a69f3663424f5ae.png)
+5. 进入“配置集成设置”页面，**准备好复制 API 令牌**，你很快就会在插件设置中用到它。
+![configure-integration](https://r2imga.jxpeng.dev/2025/10/4a50e55c35e47f905fb7fe63af5c8402.png)
+
+::: warning
+**⚠️ 注意：** 请妥善保管你的 API 令牌，不要与他人分享，因为它授予了访问你 Notion 数据的权限。
+:::
+
+## 创建 Notion 数据库并连接集成
+
+接下来，你需要创建一个 Notion 数据库，用于存放从 Obsidian 同步过来的笔记。
+
+1. 在你的 Notion 工作区中，点击 `Create a new page` 来创建一个新页面。
+![create-new-page](https://r2imga.jxpeng.dev/2025/10/1f092ef1d8c5a25aeb75694d654810a1.png)
+
+2. 创建一个新页面后，选择 `Database - Full page` 选项。
+![new-database](https://r2imga.jxpeng.dev/2025/10/73b700fc65a53f2ff518b58832bf9757.png)
+
+3. 点击数据库页面右上角的 `...` 菜单，进入 `Connections`，然后连接你刚刚创建的集成。
+![connect-integration](https://r2imga.jxpeng.dev/2025/10/e8d9be4718f6f5c76fdc3bee7d694d23.png)
+
+4. 点击 `Share` -> `Publish`，将数据库发布到网络。
+![publish](https://r2imga.jxpeng.dev/2025/10/4b1d3f597d67508ee67d20a62151200f.png)
+
+5. 点击并复制 **数据库 ID**。
+![database-id](https://r2imga.jxpeng.dev/2025/10/d8f22c1daf5063305256e5e50210adf9.png)
+
+接下来，你可以根据[安装指南](./02-installation.md)在 Obsidian 中安装和配置插件了。
--- a/docs/zh/02-installation.md
+++ b/docs/zh/02-installation.md
@@ -0,0 +1,28 @@
+---
+title: 安装插件
+description: 如何安装 Obsidian to NotionNext 插件
+---
+
+# 安装插件
+
+当你在 Notion 端完成上一章节的设置后，就可以在 Obsidian 里安装和配置插件了。
+
+1. 打开 Obsidian 的 `设置`。
+![obsidian](https://r2imga.jxpeng.dev/2025/10/6f80d5126391162dd7cc98de87d3c1b2.png)
+
+2. 找到 `第三方插件` 菜单。
+![community-plugins](https://r2imga.jxpeng.dev/2025/10/adf7dd7d292dcc331d7625b8f409f222.png)
+::: tip
+如果你之前没有启用过第三方插件，可能需要先关闭 `安全模式`（点击 `打开社区插件`）。
+:::
+
+3. 进入 `社区插件` -> `浏览`。
+![browse](https://r2imga.jxpeng.dev/2025/10/e4f170f966902999fe2137196d8b6f9c.png)
+
+4. 搜索 "NotionNext" 并点击 `安装`。
+![install](https://r2imga.jxpeng.dev/2025/10/1b0fcf15bc80aeb3714d9c97cbc6d5b0.png)  
+
+5. 安装完成后，记得 `启用` 插件。
+![enable](https://r2imga.jxpeng.dev/2025/10/6c7a7ee7d6e5861a3f0867c826e3f2c0.png)  
+
+启用后，你就可以在插件设置列表中找到 "Share to NotionNext"，并在下一步开始[配置你的数据库](./03-configuration.md)了。
--- a/docs/zh/03-configuration.md
+++ b/docs/zh/03-configuration.md
@@ -0,0 +1,112 @@
+---
+title: 配置数据库
+description: 在 Obsidian to NotionNext 插件中配置 Notion 数据库的指南
+---
+
+# 配置数据库
+
+在安装好插件并获取了 Notion API 令牌和数据库 ID 之后，你就可以开始配置要同步的数据库了。
+
+首先，在 Obsidian 中打开插件设置。
+![open-plugin-settings](https://r2imga.jxpeng.dev/2025/10/d2cfc05a86a8f014354fbd4e8456ccdc.png)
+
+点击 “添加新数据库” 来创建一个新的数据库配置。
+
+![add-database](https://r2img.jxpeng.dev/2024/07/115f47b4180d04fb362b931f8092b5fb.png)
+
+插件支持三种类型的数据库配置，你可以根据自己的需求选择。
+
+- [数据库配置](#数据库配置)
+  - [1️⃣ 通用数据库](#1️⃣-通用数据库)
+  - [2️⃣ NotionNext 数据库](#2️⃣-notionnext-数据库)
+  - [3️⃣ 自定义数据库](#3️⃣-自定义数据库)
+  - [完成配置](#完成配置)
+
+## 1️⃣ 通用数据库
+
+这是最基础的数据库类型，适合大多数用户。
+
+**配置项：**
+
+- **数据库全名**: 给这个数据库配置起一个容易识别的名字。
+- **Notion API 令牌**: 你在第一步中获取的 API 令牌。
+- **数据库 ID**: 你在第二步中获取的数据库 ID。
+
+**Notion 数据库要求：**
+
+- 必须包含一个名为 `title` 的 `Title` 属性。
+- 必须包含一个名为 `tags` 的 `Multi-select` 属性。
+![notion-general](https://r2imga.jxpeng.dev/2025/10/3abc05f71a1bd81bdc00fd988dd71108.png)
+
+然后，像下面这样填写配置字段：
+
+- **数据库全名 (Database Full Name)**: 你希望这个数据库在列表中显示的名字（例如：“学习资料库”）。
+- **数据库简称 (Database Abbreviate Name)**: 一个简短的别名（例如：“learning”）。
+- **同步 Notion 标签 (Notion Tags Sync)**: 如果希望将 Obsidian 的标签同步到 Notion，请启用此选项（**启用后，请确保你的笔记中包含 `tags`**）。
+- **自定义标题属性 (Customise title property)**: 你想用作主列的 Notion 数据库属性（默认为 `title`）。
+- **Notion API 令牌 (Notion API Token)**: 你在第一步中获取的 API 令牌。
+- **数据库 ID (Database ID)**: 你在第二步中获取的数据库 ID。
+
+![general](https://r2imga.jxpeng.dev/2025/10/9697de930e530c55081e07835e224782.png)
+
+## 2️⃣ NotionNext 数据库
+
+这个类型是为 [NotionNext](https://github.com/tangly1024/NotionNext) 博客系统的用户量身定制的，其属性已预设好以匹配 NotionNext 模板。
+
+配置方式与通用数据库类似：
+
+- **数据库全名**: 为这个数据库配置起一个名字。
+- **数据库简称**: 一个简短的别名。
+- **Notion API 令牌**: 你在第一步中获取的 API 令牌。
+- **数据库 ID**: 你在第二步中获取的数据库 ID。
+
+![notionnext](https://r2imga.jxpeng.dev/2025/10/5b1b3b3fb4ef9a76f4fed26fcc6c426b.png)
+
+## 3️⃣ 自定义数据库
+
+这个类型为高级用户提供了极大的灵活性，允许你将 Obsidian 笔记中的任何 frontmatter 元数据映射到 Notion 数据库的任意属性。
+
+首先，你需要像配置通用数据库一样填写基本信息：
+- **数据库全名**: 为这个数据库配置起一个名字。
+- **数据库简称**: 一个简短的别名。
+- **Notion API 令牌**: 你在第一步中获取的 API 令牌。
+- **数据库 ID**: 你在第二步中获取的数据库 ID。
+
+![custom](https://r2imga.jxpeng.dev/2025/10/667335d7fd2cfa96e307be3df79e157e.png)
+
+填写完基本配置后，你就可以开始添加新的属性映射了。
+
+你可以点击 `Add New Property` 按钮来创建一个新的属性映射。
+
+首先，你需要添加标题属性的映射，这是 Notion 数据库正常工作所必需的。
+
+![title-property](https://r2imga.jxpeng.dev/2025/10/2ad52037476d3f86f3c4cfbed507f74b.png)
+
+::: tip
+请记住，"Notion 属性 (Notion Property)" 需要填写你在 Notion 数据库中的属性名称（区分大小写），而 "Frontmatter 键 (Frontmatter Key)" 则是你 Obsidian 笔记 frontmatter 中的键。
+:::
+
+添加完标题属性后，你可以根据需要继续添加更多属性。
+![property-1](https://r2imga.jxpeng.dev/2025/10/d4c0bcc3abbc741dd34ce22e589d6223.png)
+
+目前，插件支持以下 Notion 属性类型：
+- Text
+- Number
+- Select
+- Multi-select
+- Date
+- Files & Media
+- Checkbox
+- URL
+- Email
+- Phone Number
+
+![types](https://r2imga.jxpeng.dev/2025/10/81d321693dfd046ad3386e4507d60792.png)
+
+::: info
+关联（Relation）和汇总（Rollup）类型暂时还不支持。
+:::
+
+## 完成配置
+
+配置完数据库后，请确保保存你的设置。现在，你可以通过命令面板或笔记右键菜单中的 “Share to NotionNext” 命令，开始将你的 Obsidian 笔记同步到配置好的 Notion 数据库了。
--- a/docs/zh/04-sync.md
+++ b/docs/zh/04-sync.md
@@ -0,0 +1,12 @@
+---
+title: 同步笔记
+description: 如何使用 NotionNext 插件将你的 Obsidian 笔记同步到 Notion
+---
+
+# 同步笔记
+
+在插件设置中配置好你的 Notion 数据库后，你就可以开始将 Obsidian 笔记同步到 Notion 了。
+
+要同步一篇笔记，只需打开你想要同步的笔记，然后从命令面板（`Ctrl/Cmd + P`）或笔记的右键菜单中选择 “Share to NotionNext” 命令。这会在你的 Notion 数据库中创建一个新页面，内容与你的 Obsidian 笔记完全一致。
+
+你还可以为特定的笔记或文件夹设置自动同步。这样，你在 Obsidian 中对这些笔记所做的任何更改，都会自动反映到 Notion 中，非常方便。
--- a/docs/zh/05-troubleshooting.md
+++ b/docs/zh/05-troubleshooting.md
@@ -0,0 +1,10 @@
+---
+title: 问题排查
+description: Obsidian to NotionNext 插件的常见问题与解决方案
+---
+
+# 问题排查
+
+如果问题依然存在，你可以在 GitHub 上[提交一个 Issue](https://github.com/jxpeng98/obsidian-to-NotionNext/issues)，并附上详细的错误信息和你的操作步骤，我会尽快帮助你。
+
+你也可以通过 `Ctrl+Shift+I` (Windows/Linux) 或 `Cmd+Option+I` (Mac) 打开 Obsidian 的开发者工具，在控制台（Console）中查看是否有与 NotionNext 插件相关的错误日志，这对于定位问题非常有帮助。
--- a/docs/zh/index.md
+++ b/docs/zh/index.md
@@ -0,0 +1,21 @@
+---
+title: 介绍
+description: 使用 Notion API 将文件分享到任何 Notion 数据库
+order: 0
+---
+
+# Obsidian to NotionNext
+
+在这份文档中，你将找到关于如何设置和使用 Obsidian to NotionNext 插件的指南和说明。这款插件可以让你使用 Notion API 将你的 Obsidian 笔记直接分享到 Notion 数据库。
+
+本指南将引导你完成设置 Obsidian to NotionNext 插件的全过程。
+
+[开始使用](./01-getting-started.md)
+
+[安装插件](./02-installation.md)
+
+[配置数据库](./03-configuration.md)
+
+[同步笔记](./04-sync.md)
+
+[问题排查](./05-troubleshooting.md)
--- a/esbuild.config.mjs
+++ b/esbuild.config.mjs
@@ -1,58 +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({
-		banner: {
-			js: banner,
-		},
-		entryPoints: ['src/main.ts'],
-		bundle: true,
-		external: [
-			'obsidian',
-			'electron',
-			'@codemirror/autocomplete',
-			'@codemirror/closebrackets',
-			'@codemirror/collab',
-			'@codemirror/commands',
-			'@codemirror/comment',
-			'@codemirror/fold',
-			'@codemirror/gutter',
-			'@codemirror/highlight',
-			'@codemirror/history',
-			'@codemirror/language',
-			'@codemirror/lint',
-			'@codemirror/matchbrackets',
-			'@codemirror/panel',
-			'@codemirror/rangeset',
-			'@codemirror/rectangular-selection',
-			'@codemirror/search',
-			'@codemirror/state',
-			'@codemirror/stream-parser',
-			'@codemirror/text',
-			'@codemirror/tooltip',
-			'@codemirror/view',
-			...builtins
-		],
-		format: 'cjs',
-		target: 'es2016',
-		logLevel: "info",
-		sourcemap: prod ? false : 'inline',
-		treeShaking: true,
-		outfile: 'main.js',
-	});
+	banner: {
+		js: banner,
+	},
+	entryPoints: ["src/main.ts"],
+	bundle: true,
+	external: [
+		"obsidian",
+		"electron",
+		"@codemirror/autocomplete",
+		"@codemirror/closebrackets",
+		"@codemirror/collab",
+		"@codemirror/commands",
+		"@codemirror/comment",
+		"@codemirror/fold",
+		"@codemirror/gutter",
+		"@codemirror/highlight",
+		"@codemirror/history",
+		"@codemirror/language",
+		"@codemirror/lint",
+		"@codemirror/matchbrackets",
+		"@codemirror/panel",
+		"@codemirror/rangeset",
+		"@codemirror/rectangular-selection",
+		"@codemirror/search",
+		"@codemirror/state",
+		"@codemirror/stream-parser",
+		"@codemirror/text",
+		"@codemirror/tooltip",
+		"@codemirror/view",
+		...builtins,
+	],
+	format: "cjs",
+	target: "es2016",
+	logLevel: "info",
+	sourcemap: prod ? false : "inline",
+	treeShaking: true,
+	outfile: "main.js",
+});

-	if (!prod) {
-		await ctx.watch();
-	} else {
-		await ctx.rebuild()
-		ctx.dispose().then(r => console.log('Build completed'), e => console.error(e));
-	}
+if (!prod) {
+	await ctx.watch();
+} else {
+	await ctx.rebuild();
+	ctx.dispose().then(
+		(r) => console.log("Build completed"),
+		(e) => console.error(e),
+	);
+}
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
  "id": "share-to-notionnext",
  "name": "Share to NotionNext",
-  "version": "0.1.7",
+  "version": "2.7.0",
  "minAppVersion": "0.0.1",
  "description": "Shares obsidian md file to notion with notion api for NotionNext web deploy, originally created by EasyChris/obsidian-to-notion.",
  "author": "EasyChris, jxpeng98",
--- a/obsidian_template.md
+++ b/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， 默认是空，可直接删除
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
  "name": "share-to-notionnext",
-  "version": "0.1.7",
+  "version": "2.7.0",
  "type": "module",
-  "description": "Shares obsidian md file to notion with notion api for NotionNext web deploy, originally created by EasyChris/obsidian-to-notion.",
+  "description": "Share files to any Notion database using the Notion API, originally created by EasyChris/obsidian-to-notion.",
  "main": "main.js",
  "scripts": {
    "dev": "node esbuild.config.mjs",
@@ -10,25 +10,24 @@
    "version": "node version-bump.mjs && git add manifest.json versions.json"
  },
  "keywords": [],
-  "author": "",
+  "author": "Jiaxin PENG",
  "license": "GNU GPLv3",
  "devDependencies": {
    "@types/node": "^20.5.7",
-    "@types/yaml-front-matter": "^4.1.0",
-    "@typescript-eslint/eslint-plugin": "^6.5.0",
-    "@typescript-eslint/parser": "^6.5.0",
-    "builtin-modules": "^3.2.0",
-    "esbuild": "0.19.2",
-    "obsidian": "latest",
+    "@types/yaml-front-matter": "^4.1.3",
+    "@typescript-eslint/eslint-plugin": "^6.16.0",
+    "@typescript-eslint/parser": "^6.16.0",
+    "builtin-modules": "^3.3.0",
+    "esbuild": "0.19.5",
+    "obsidian": "^1.6.6",
    "tslib": "2.6.2",
    "typescript": "5.2.2"
  },
  "dependencies": {
-    "@tryfabric/martian": "^1.2.0",
-    "https-proxy-agent": "^7.0.1",
-    "process": "^0.11.10",
+    "@jxpeng98/martian": "^1.3.1",
+    "https-proxy-agent": "^7.0.2",
    "remark-math": "^6.0.0",
-    "yaml": "^2.2.2",
+    "yaml": "^2.3.4",
    "yaml-front-matter": "^4.1.1"
  }
-}
+}
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/release.sh
+++ b/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
--- a/src/Message.ts
+++ b/src/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]
-}
--- a/src/Upload2Notion.ts
+++ b/src/Upload2Notion.ts
@@ -1,251 +0,0 @@
-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";
-
-export class Upload2Notion {
-	plugin: MyPlugin;
-	notion: Client;
-	agent: any;
-	constructor(plugin: MyPlugin) {
-		this.plugin = plugin;
-	}
-
-	async deletePage(notionID: string) {
-		return requestUrl({
-			url: `https://api.notion.com/v1/blocks/${notionID}`,
-			method: 'DELETE',
-			headers: {
-				'Content-Type': 'application/json',
-				'Authorization': 'Bearer ' + this.plugin.settings.notionAPI,
-				'Notion-Version': '2022-06-28',
-			},
-			body: ''
-		});
-	}
-
-	async getDataBase(databaseID: string) {
-		const response = await requestUrl({
-			url: `https://api.notion.com/v1/databases/${databaseID}`,
-			method: 'GET',
-			headers: {
-				'Authorization': 'Bearer ' + this.plugin.settings.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
-		}
-	}
-
-	// 因为需要解析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 databasecover = await this.getDataBase(this.plugin.settings.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 bodyString: any = {
-			parent: {
-				database_id: this.plugin.settings.databaseID
-			},
-			icon: {
-				emoji: emoji || '📜'
-			},
-			properties: {
-				title: {
-					title: [
-						{
-							text: {
-								content: title
-							},
-						},
-					],
-				},
-				tags: {
-					multi_select: tags && true ? 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 (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 ' + this.plugin.settings.notionAPI,
-					'Notion-Version': '2022-06-28',
-				},
-				body: JSON.stringify(bodyString),
-			})
-		} catch (error) {
-			new Notice(`network error ${error}`)
-		}
-	}
-
-	async syncMarkdownToNotion(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, settings: any): Promise<any> {
-		let res: any
-		const yamlContent: any = yamlFrontMatter.loadFront(markdown);
-		const __content = yamlContent.__content
-		const file2Block = markdownToBlocks(__content);
-		const frontmasster = app.metadataCache.getFileCache(nowFile)?.frontmatter
-		const notionID = frontmasster ? frontmasster.notionID : null
-
-		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 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) {
-		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`)
-		}
-		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}`)
-		// }
-	}
-}
--- a/src/commands/FuzzySuggester.ts
+++ b/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 })
+    }
+
+}
--- a/src/commands/NotionCommands.ts
+++ b/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 });
+	}
+
+
+}
--- a/src/lang/I18n.ts
+++ b/src/lang/I18n.ts
@@ -0,0 +1,49 @@
+import {en} from "./locale/en";
+import {zh} from "./locale/zh";
+import {ja} from "./locale/ja";
+
+export const I18n: {[key: string]:any} = {
+	en,
+	zh,
+	ja,
+};
+
+class I18nManager {
+	private currentLanguage: string;
+
+	constructor() {
+		this.currentLanguage = this.detectLanguage();
+	}
+
+	// return the language to use
+	private detectLanguage(): string {
+		const storedLanguage = window.localStorage.getItem("language");
+		if (storedLanguage && this.isLanguageSupported(storedLanguage)) {
+			console.log(`Using stored language: ${storedLanguage}`);
+			return storedLanguage;
+		}
+
+		const browserLanguage = window.navigator.language.split("-")[0];
+		if (this.isLanguageSupported(browserLanguage)) {
+			console.log(`Using browser language: ${browserLanguage}`);
+			return browserLanguage;
+		}
+
+		// Default to English if no match is found
+		console.log("Using default language: en");
+		return "en";
+	}
+
+	private isLanguageSupported(lang: string): boolean {
+		return Object.prototype.hasOwnProperty.call(I18n, lang);
+	}
+
+	// Get the i18n configuration for the current language
+	public getConfig(): any {
+		return I18n[this.currentLanguage];
+	}
+}
+
+export const i18nManager = new I18nManager();
+
+export const i18nConfig = i18nManager.getConfig();
--- a/src/lang/locale/en.ts
+++ b/src/lang/locale/en.ts
@@ -0,0 +1,83 @@
+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",
+	NotionLinkDisplay: "Notion Link Display",
+	NotionLinkDisplayDesc: "Default is ON, if you want to hide the link in the front matter, please turn it off",
+	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-preffix": "Sync to ",
+	"sync-success": "success",
+	"sync-fail": "failed",
+	"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",
+	CopyErrorMessage: "Auto copy failed, please copy it manually",
+	BlockUploaded: "All blocks uploaded",
+	ExtraBlockUploaded: "Extra blocks uploaded",
+	CheckConsole: "Check the console for more information \n opt+cmd+i/ctrl+shift+i",
+	"reach-mobile-limit": "The number of blocks exceeds the limit of 100, please use the desktop plugin",
+}
--- a/src/lang/locale/ja.ts
+++ b/src/lang/locale/ja.ts
@@ -0,0 +1,74 @@
+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を入力",
+	NotionLinkDisplay: "Notionリンク表示",
+	NotionLinkDisplayDesc: "デフォルトはONです。front matterにリンクを非表示にしたい場合は、オフにしてください",
+    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: "新しいプロパティを追加してください",
+    CopyErrorMessage: "自動コピーに失敗しました",
+	BlockUploaded: "ブロックがアップロードされました",
+	ExtraBlockUploaded: "追加ブロックがアップロードされました",
+	CheckConsole: "詳細情報を確認するには、コンソールを開いてください \n opt+cmd+i/ctrl+shift+i",
+};
--- a/src/lang/locale/zh.ts
+++ b/src/lang/locale/zh.ts
@@ -0,0 +1,77 @@
+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",
+	NotionLinkDisplay: "Notion 链接显示",
+	NotionLinkDisplayDesc: "默认开启，如果你不想在front matter中显示链接，请关闭",
+	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数据库匹配的新属性",
+	CopyErrorMessage: "复制链接失败，请手动复制",
+	BlockUploaded: "所有内容已成功上传",
+	ExtraBlockUploaded: "额外内容已成功上传",
+	CheckConsole: "opt+cmd+i/ctrl+shift+i，\n打开控制台查看更多信息",
+}
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,241 +1,86 @@
-import {App, Editor, MarkdownView, Notice, Plugin, PluginSettingTab, Setting} from "obsidian";
-import {addIcons} from 'src/icon';
-import {Upload2Notion} from "src/Upload2Notion";
-import {NoticeMConfig} from "src/Message";
-
+import { App, Editor, MarkdownView, Notice, Plugin, PluginSettingTab, Setting } from "obsidian";
+import { addIcons } from 'src/ui/icon';
+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!

-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.
-				await this.upload();
-			}
-		);
+    settings: PluginSettings;
+    commands: ribbonCommands;
+    app: App;

-		// 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");
+    async onload() {
+        await this.loadSettings();
+        this.commands = new ribbonCommands(this);

-		this.addCommand({
-			id: "share-to-notionnext",
-			name: "share to notionnext",
-			editorCallback: async (editor: Editor, view: MarkdownView) => {
-				await this.upload()
-			},
-		});
+        addIcons();
+        // This creates an icon in the left ribbon.
+        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.

-		// This adds a settings tab so the user can configure various aspects of the plugin
-		this.addSettingTab(new ObsidianSettingTab(this.app, this));
+        // 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 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);
+    onunload() {
+    }

-				if (markDownData) {
-					const { basename } = nowFile;
-					const upload = new Upload2Notion(this);
-					const res = await upload.syncMarkdownToNotion(basename, 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 loadSettings() {
+        this.settings = Object.assign(
+            {},
+            DEFAULT_SETTINGS,
+            await this.loadData()
+        );
+    }

-	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 = ''
+    async saveSettings() {
+        await this.saveData(this.settings);
+    }

-		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 addDatabaseDetails(dbDetails: DatabaseDetails) {
+        this.settings.databaseDetails = {
+            ...this.settings.databaseDetails,
+            [dbDetails.abName]: dbDetails,
+        };

-	async loadSettings() {
-		this.settings = Object.assign(
-			{},
-			DEFAULT_SETTINGS,
-			await this.loadData()
-		);
-	}
+        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();
+    }

-	async saveSettings() {
-		await this.saveData(this.settings);
-	}
 }

-class ObsidianSettingTab extends PluginSettingTab {
-	plugin: ObsidianSyncNotionPlugin;
-
-	constructor(app: App, plugin: ObsidianSyncNotionPlugin) {
-		super(app, plugin);
-		this.plugin = plugin;
-	}
-
-	display(): void {
-		const { containerEl } = this;
-
-		containerEl.empty();
-
-		new Setting(containerEl)
-			.setName("Notion API Token")
-			.setDesc("It's a secret")
-			.addText((text) =>{
-				text.inputEl.type = 'password';
-				return text
-					.setPlaceholder("Enter your Notion API Token")
-					.setValue(this.plugin.settings.notionAPI)
-					.onChange(async (value) => {
-						this.plugin.settings.notionAPI = value;
-						await this.plugin.saveSettings();
-					})
-			});


-		const notionDatabaseID = new Setting(containerEl)
-			.setName("Database ID")
-			.setDesc("It's a secret")
-			.addText((text) => {
-					text.inputEl.type = 'password';
-					return text
-					.setPlaceholder("Enter your Database ID")
-					.setValue(this.plugin.settings.databaseID)
-					.onChange(async (value) => {
-						this.plugin.settings.databaseID = value;
-						await this.plugin.saveSettings();
-					})
-			}
-			);
-
-			// 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();
-			// 		})
-			// );
-
-	}
-}
--- a/src/ui/DeleteModal.ts
+++ b/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();
+	}
+
+}
--- a/src/ui/EditModal.ts
+++ b/src/ui/EditModal.ts
@@ -0,0 +1,349 @@
+import { App, ButtonComponent, Setting } from "obsidian";
+import { customProperty, SettingModal } from "./settingModal";
+import ObsidianSyncNotionPlugin from "../main";
+import { DatabaseDetails, ObsidianSettingTab } from "./settingTabs";
+import { i18nConfig } from "../lang/I18n";
+
+export class EditModal extends SettingModal {
+	propertyLines: Setting[] = []; // Store all property line settings
+	[key: string]: any; // Index signature
+	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.map(prop => ({ ...prop })); // Ensure deep copy
+			// 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.map(prop => ({ ...prop })); // Ensure deep copy
+			// 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;
+					// console.log(this.dataTemp);
+					// console.log(this.dataPrev);
+					this.close();
+				});
+		}
+		);
+		saveButton.addExtraButton((button) => {
+			return button
+				.setTooltip('Cancel')
+				.setIcon('cross')
+				.onClick(() => {
+					// console.log(this.dataTemp);
+					// console.log(this.dataPrev);
+					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)
+
+						})
+				);
+
+
+			// 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 custom properties
+			this.initializePropertyLines(nextTabs, this.dataTemp.customPropertiesTemp);
+		}
+	}
+
+	initializePropertyLines(containerEl: HTMLElement, properties: customProperty[]): void {
+		if (!containerEl) {
+			console.error('Failed to initialize property lines: containerEl is null');
+			return;
+		}
+
+		new Setting(containerEl)
+			.setName("Add New Property")
+			.setDesc("Click to add a new property")
+			.addButton(button => {
+				return button
+					.setButtonText('Add')
+					.setTooltip('Add one more property')
+					.onClick(() => {
+						this.createPropertyLine(containerEl, properties);
+					});
+			});
+
+		properties.forEach(property => {
+			this.updatePropertyLine(containerEl, property, properties);
+		});
+	}
+
+
+	updatePropertyLine(containerEl: HTMLElement, property: customProperty, properties: customProperty[]) {
+		let isExistingProperty = property !== null;
+		const propertyIndex = isExistingProperty ? property.index : properties.length;
+
+		const propertyLine = new Setting(containerEl)
+			.setName(propertyIndex === 0 ? i18nConfig.CustomPropertyFirstColumn : `${i18nConfig.CustomProperty} ${propertyIndex}`)
+			.setDesc(propertyIndex === 0 ? i18nConfig.CustomPropertyFirstColumnDesc : "");
+
+		propertyLine.addText(text => {
+			text.setPlaceholder(i18nConfig.CustomPropertyName)
+				.setValue(isExistingProperty ? property.customName : "")
+				.onChange(value => {
+					const actualIndex = properties.findIndex(p => p.index === propertyIndex);
+					if (actualIndex !== -1) {
+						properties[actualIndex].customName = value;
+					} else {
+						properties.push({ customName: value, customType: '', index: propertyIndex });
+						isExistingProperty = true;
+					}
+				});
+		});
+
+		propertyLine.addDropdown((dropdown) => {
+			const options: Record<string, string> = {
+				'rich_text': 'Text',
+				'number': 'Number',
+				'select': 'Select',
+				'multi_select': 'Multi-Select',
+				'date': 'Date',
+				'files': 'Files & Media',
+				'checkbox': 'Checkbox',
+				'url': 'URL',
+				'email': 'Email',
+				'phone_number': 'Phone Number'
+			};
+
+			if (propertyIndex === 0) {
+				dropdown.addOption('title', 'Title');
+			} else {
+				Object.keys(options).forEach(key => {
+					dropdown.addOption(key, options[key]);
+				});
+			}
+
+			dropdown.setValue(isExistingProperty ? property.customType : "")
+				.onChange(value => {
+					const actualIndex = properties.findIndex(p => p.index === propertyIndex);
+					if (actualIndex !== -1) {
+						properties[actualIndex].customType = value;
+					} else if (!isExistingProperty) {
+						properties.push({ customName: '', customType: value, index: propertyIndex });
+						isExistingProperty = true; // Update the flag to prevent re-adding
+					}
+				});
+		});
+
+		if (propertyIndex > 0) {
+			propertyLine.addButton(button => {
+				return button
+					.setTooltip("Delete")
+					.setIcon("trash")
+					.onClick(() => {
+						console.log('Deleting property', properties[propertyIndex]);
+						this.deleteProperty(propertyIndex, properties);
+					});
+			});
+		}
+
+		this.propertyLines.push(propertyLine);
+		this.updatePropertyLines();
+
+	}
+
+	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);
+	}
+}
--- a/src/ui/PreviewModal.ts
+++ b/src/ui/PreviewModal.ts
@@ -0,0 +1,178 @@
+import { App, ExtraButtonComponent, Modal, Notice, Setting } from "obsidian";
+import ObsidianSyncNotionPlugin from "../main";
+import { DatabaseDetails, ObsidianSettingTab } from "./settingTabs";
+import { customProperty } from "./settingModal";
+import { i18nConfig } from "../lang/I18n";
+
+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 customPrv = previewEl.createDiv("custom-tabs");
+
+			this.previewPropertyLine(previewEl, this.dbDetails.customProperties);
+		}
+
+	}
+
+
+	onOpen() {
+		this.display()
+	}
+
+
+	previewPropertyLine(containerEl: HTMLElement, properties: customProperty[]): void {
+
+		properties.forEach((property, index) => {
+			const propertyLine = new Setting(containerEl)
+				.setName(index === 0 ? i18nConfig.CustomPropertyFirstColumn : `${i18nConfig.CustomProperty} ${index}`)
+				.setDesc(index === 0 ? i18nConfig.CustomPropertyFirstColumnDesc : "");
+
+			propertyLine.addText(text => {
+				text.setPlaceholder(i18nConfig.CustomPropertyName)
+					.setValue(property.customName)
+					.setDisabled(true);
+			});
+
+			propertyLine.addDropdown((dropdown) => {
+				const options: Record<string, string> = {
+					'title': 'Title',
+					'rich_text': 'Text',
+					'number': 'Number',
+					'select': 'Select',
+					'multi_select': 'Multi-Select',
+					'date': 'Date',
+					'files': 'Files & Media',
+					'checkbox': 'Checkbox',
+					'url': 'URL',
+					'email': 'Email',
+					'phone_number': 'Phone Number',
+					// Additional options can be added here
+				};
+
+				// Populate dropdown with options
+				Object.keys(options).forEach(key => {
+					dropdown.addOption(key, options[key]);
+				});
+
+				dropdown.setValue(property.customType)
+					.setDisabled(true); // Disable dropdown to prevent changes
+			});
+		});
+	}
+
+}
--- a/src/ui/icon.ts
+++ b/src/ui/icon.ts
--- a/src/ui/settingModal.ts
+++ b/src/ui/settingModal.ts
@@ -0,0 +1,377 @@
+import {
+	Modal,
+	Setting,
+	ButtonComponent, App
+} from 'obsidian';
+
+import { i18nConfig } from "../lang/I18n";
+import ObsidianSyncNotionPlugin from "../main";
+import { DatabaseDetails, ObsidianSettingTab } from "./settingTabs";
+
+export interface customProperty {
+	customName: string;
+	customType: string;
+	index: number;
+}
+
+export class SettingModal extends Modal {
+	propertyLines: Setting[] = []; // Store all property line settings
+	properties: customProperty[] = []; // Array to store property values and types
+	[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');
+
+
+		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.data.saved) ? this.updateContentBasedOnSelection(this.data.databaseFormat, nextTabs) : 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.data.customProperties = this.properties;
+					this.close();
+				});
+		}
+		);
+		saveButton.addExtraButton((button) => {
+			return button
+				.setTooltip('Cancel')
+				.setIcon('cross')
+				.onClick(() => {
+					this.data.saved = false;
+					// this.data.customProperties = this.properties;
+					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)
+
+						})
+				);
+
+
+			// 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 one more property')
+						.setButtonText('Add New Property')
+						.onClick(async () => {
+							const customTabs = nextTabs.createDiv("custom-tabs");
+							this.createPropertyLine(customTabs, this.properties);
+						});
+				}
+				);
+		}
+	}
+
+
+	onOpen() {
+		// add console log to check if the modal is opened
+		this.display()
+	}
+
+	createPropertyLine(containerEl: HTMLElement, properties: customProperty[]): void {
+		const propertyIndex = properties.length;
+
+		properties.push({ customName: "", customType: "", index: propertyIndex });
+
+		const propertyLine = new Setting(containerEl)
+			.setName(propertyIndex === 0 ? i18nConfig.CustomPropertyFirstColumn : `${i18nConfig.CustomProperty} ${propertyIndex}`)
+			.setDesc(propertyIndex === 0 ? i18nConfig.CustomPropertyFirstColumnDesc : "");
+
+		propertyLine.addText(text => {
+			text.setPlaceholder(i18nConfig.CustomPropertyName)
+				.setValue("")
+				.onChange(value => {
+					let actualIndex = properties.findIndex(p => p.index === propertyIndex);
+					if (actualIndex !== -1) {
+						properties[actualIndex].customName = value;
+					}
+				});
+		});
+
+
+		propertyLine.addDropdown((dropdown) => {
+			const options: Record<string, string> = {
+				'rich_text': 'Text',
+				'number': 'Number',
+				'select': 'Select',
+				'multi_select': 'Multi-Select',
+				'date': 'Date',
+				'files': 'Files & Media',
+				'checkbox': 'Checkbox',
+				'url': 'URL',
+				'email': 'Email',
+				'phone_number': 'Phone Number',
+				// 'formula': 'Formula',
+				// 'relation': 'Relation',
+				// 'rollup': 'Rollup',
+				// 'created_time': 'Created time',
+				// 'created_by': 'Created by',
+				// 'last_edited_time': 'Last Edited Time',
+				// 'last_edited_by': 'Last Edited By',
+			};
+
+			const currentProperty = properties[propertyIndex];
+
+			if (propertyIndex === 0) {
+				dropdown.addOption("title", "Title");
+			} else {
+				Object.keys(options).forEach(key => {
+					dropdown.addOption(key, options[key]);
+				});
+			}
+			dropdown.setValue("")
+				.onChange(value => {
+					if (currentProperty) {
+						currentProperty.customType = value;
+						// Retrieve the index of currentProperty from the properties array
+						const updatedIndex = properties.findIndex(p => p === currentProperty);
+						console.log(`Updated value at index ${updatedIndex}: ${value}`);
+					} else {
+						console.log("Property not found, may have been deleted.");
+					}
+				});
+		});
+
+
+		if (propertyIndex > 0) {
+			propertyLine.addButton(button => {
+				return button
+					.setTooltip("Delete")
+					.setIcon("trash")
+					.onClick(() => {
+						this.deleteProperty(propertyIndex, properties);
+					});
+			});
+		}
+
+		this.propertyLines.push(propertyLine);
+		this.updatePropertyLines(); // Ensure property lines are updated after creation
+	}
+
+	deleteProperty(propertyIndex: number, properties: customProperty[]): void {
+		let actualIndex = properties.findIndex(p => p.index === propertyIndex);
+		if (actualIndex !== -1) {
+			properties.splice(actualIndex, 1);
+			if (this.propertyLines[actualIndex]) {
+				this.propertyLines[actualIndex].settingEl.remove();
+				this.propertyLines.splice(actualIndex, 1);
+			}
+			// Update indices in the properties array
+			properties.forEach((prop, idx) => {
+				prop.index = idx;
+			});
+
+			this.updatePropertyLines();
+		}
+	}
+
+	updatePropertyLines() {
+		this.propertyLines.forEach((line, idx) => {
+			line.setName(idx === 0 ? i18nConfig.CustomPropertyFirstColumn : `${i18nConfig.CustomProperty} ${idx}`);
+		});
+	}
+
+	// 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();
+						})
+				);
+		}
+	}
+}
--- a/src/ui/settingTabs.ts
+++ b/src/ui/settingTabs.ts
@@ -0,0 +1,307 @@
+import { App, ButtonComponent, PluginSettingTab, Setting } from "obsidian";
+import { i18nConfig } from "../lang/I18n";
+import ObsidianSyncNotionPlugin from "../main";
+import { SettingModal } from "./settingModal";
+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;
+	NotionLinkDisplay: boolean;
+	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, index: number }[];
+	// customValues: string;
+	saved: boolean;
+}
+
+export const DEFAULT_SETTINGS: PluginSettings = {
+	NextButton: true,
+	notionAPINext: "",
+	databaseIDNext: "",
+	bannerUrl: "",
+	notionUser: "",
+	NotionLinkDisplay: true,
+	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')
+
+		this.createSettingEl(containerEl, i18nConfig.NotionLinkDisplay, i18nConfig.NotionLinkDisplayDesc, 'toggle', i18nConfig.NotionLinkDisplay, this.plugin.settings.NotionLinkDisplay, 'NotionLinkDisplay')
+
+
+		// 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();
+
+	}
+
+	// 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);
+
+									console.log(dbDetails.fullName + " deleted");
+
+									this.plugin.commands.updateCommand();
+
+									this.display()
+								}
+							}
+
+							modal.open();
+
+						});
+				});
+		}
+	}
+}
+
+
--- a/src/upload/Upload2Notion.ts
+++ b/src/upload/Upload2Notion.ts
@@ -0,0 +1,628 @@
+import { App, TFile } from "obsidian";
+import { markdownToBlocks } from "@jxpeng98/martian";
+import * as yamlFrontMatter from "yaml-front-matter";
+import { LIMITS, paragraph } from "@jxpeng98/martian";
+import MyPlugin from "src/main";
+import { DatabaseDetails } from "../ui/settingTabs";
+import { updateYamlInfo } from "./updateYaml";
+import { UploadBase, NotionPageResponse } from "./common/UploadBase";
+
+export type DatasetType = "general" | "next" | "custom";
+
+interface BaseSyncRequest {
+	dataset: DatasetType;
+	markdown: string;
+	nowFile: TFile;
+	app: App;
+}
+
+interface GeneralSyncRequest extends BaseSyncRequest {
+	dataset: "general";
+	title: string;
+	cover: string;
+	tags: string[];
+}
+
+interface NextSyncRequest extends BaseSyncRequest {
+	dataset: "next";
+	title: string;
+	emoji: string;
+	cover: string;
+	tags: string[];
+	type: string;
+	slug: string;
+	stats: string;
+	category: string;
+	summary: string;
+	password: string;
+	favicon: string;
+	datetime: string;
+}
+
+interface CustomSyncRequest extends BaseSyncRequest {
+	dataset: "custom";
+	cover: string;
+	customValues: Record<string, string>;
+}
+
+export type SyncRequest =
+	| GeneralSyncRequest
+	| NextSyncRequest
+	| CustomSyncRequest;
+
+interface GeneralParams {
+	title: string;
+	cover?: string;
+	tags: string[];
+	childArr: any[];
+	notionId?: string;
+}
+
+interface NextParams {
+	title: string;
+	emoji: string;
+	cover?: string;
+	tags: string[];
+	type: string;
+	slug: string;
+	stats: string;
+	category: string;
+	summary: string;
+	password: string;
+	favicon: string;
+	datetime: string;
+	childArr: any[];
+	notionId?: string;
+}
+
+interface CustomParams {
+	cover?: string;
+	customValues: Record<string, string>;
+	childArr: any[];
+	notionId?: string;
+}
+
+export class Upload2Notion extends UploadBase {
+
+	constructor(plugin: MyPlugin, dbDetails: DatabaseDetails) {
+		super(plugin, dbDetails);
+	}
+
+	async sync(request: SyncRequest): Promise<NotionPageResponse> {
+		const startedAt = Date.now();
+
+		let response: NotionPageResponse;
+
+		switch (request.dataset) {
+			case "general":
+				response = await this.handleGeneral(request);
+				break;
+			case "next":
+				response = await this.handleNext(request);
+				break;
+			case "custom":
+				response = await this.handleCustom(request);
+				break;
+			default:
+				throw new Error(`Unsupported dataset type: ${(request as any).dataset}`);
+		}
+
+		if (response.response && response.response.status === 200) {
+			await updateYamlInfo(
+				request.markdown,
+				request.nowFile,
+				response.data,
+				request.app,
+				this.plugin,
+				this.dbDetails,
+			);
+		} else {
+			console.log(`[Upload2Notion] Sync failed`, response.data);
+		}
+
+		return response;
+	}
+
+	private async handleGeneral(request: GeneralSyncRequest): Promise<NotionPageResponse> {
+		console.log(`[Upload2Notion] Handling general dataset`, {
+			cover: request.cover,
+			tags: request.tags,
+		});
+		const blocks = this.buildBlocks(request.markdown, {
+			notionLimits: {truncate: false},
+		});
+		const notionId = this.getNotionId(request.app, request.nowFile);
+		this.debugLog("Upload2Notion", "General dataset payload prepared", {
+			blockCount: blocks.length,
+			notionId: notionId ?? null,
+			tagCount: request.tags?.length ?? 0,
+		});
+
+		return this.upsertGeneral({
+			title: request.title,
+			cover: request.cover,
+			tags: request.tags || [],
+			childArr: blocks,
+			notionId,
+		});
+	}
+
+	private async handleNext(request: NextSyncRequest): Promise<NotionPageResponse> {
+		console.log(`[Upload2Notion] Handling next dataset`, {
+			type: request.type,
+			slug: request.slug,
+			category: request.category,
+		});
+		const blocks = this.buildBlocks(request.markdown, {
+			notionLimits: {truncate: false},
+		});
+		this.splitRichTextParagraphs(blocks);
+		const notionId = this.getNotionId(request.app, request.nowFile);
+		this.debugLog("Upload2Notion", "Next dataset payload prepared", {
+			blockCount: blocks.length,
+			notionId: notionId ?? null,
+			hasEmoji: !!request.emoji,
+			tags: request.tags || [],
+		});
+
+		return this.upsertNext({
+			title: request.title,
+			emoji: request.emoji,
+			cover: request.cover,
+			tags: request.tags || [],
+			type: request.type,
+			slug: request.slug,
+			stats: request.stats,
+			category: request.category,
+			summary: request.summary,
+			password: request.password,
+			favicon: request.favicon,
+			datetime: request.datetime,
+			childArr: blocks,
+			notionId,
+		});
+	}
+
+	private async handleCustom(request: CustomSyncRequest): Promise<NotionPageResponse> {
+		console.log(`[Upload2Notion] Handling custom dataset`, {
+			customKeys: Object.keys(request.customValues || {}),
+		});
+		const blocks = this.buildBlocks(request.markdown, {
+			strictImageUrls: true,
+			notionLimits: {truncate: false},
+		});
+		const notionId = this.getNotionId(request.app, request.nowFile);
+		this.debugLog("Upload2Notion", "Custom dataset payload prepared", {
+			blockCount: blocks.length,
+			notionId: notionId ?? null,
+			customValueKeys: Object.keys(request.customValues || {}),
+		});
+
+		return this.upsertCustom({
+			cover: request.cover,
+			customValues: request.customValues,
+			childArr: blocks,
+			notionId,
+		});
+	}
+
+	private buildBlocks(markdown: string, options: Record<string, unknown>): any[] {
+		const yamlContent: any = yamlFrontMatter.loadFront(markdown);
+		const content = yamlContent.__content;
+		const blocks = markdownToBlocks(content, options);
+		this.debugLog("Upload2Notion", "Converted markdown to blocks", {
+			blockCount: blocks.length,
+			firstBlockTypes: blocks.slice(0, 5).map((block: any) => block?.type),
+			options,
+		});
+		return blocks;
+	}
+
+	private getNotionId(app: App, nowFile: TFile): string | undefined {
+		const frontMatter = app.metadataCache.getFileCache(nowFile)?.frontmatter;
+		if (!frontMatter) {
+			this.debugLog("Upload2Notion", "No frontmatter found when resolving Notion ID", {
+				filePath: nowFile.path,
+			});
+			return undefined;
+		}
+		const {abName} = this.dbDetails;
+		const notionIDKey = `NotionID-${abName}`;
+		const notionId = frontMatter[notionIDKey];
+		return notionId ? String(notionId) : undefined;
+	}
+
+	private splitRichTextParagraphs(blocks: any[]): void {
+		blocks.forEach((block, index) => {
+			if (
+				block.type === "paragraph" &&
+				block.paragraph.rich_text.length > LIMITS.RICH_TEXT_ARRAYS
+			) {
+				console.log(`[Upload2Notion] Splitting rich text paragraph`, {
+					index,
+					length: block.paragraph.rich_text.length,
+				});
+				const paragraphChunks = this.chunkArray<any>(block.paragraph.rich_text, 100);
+				const newParagraphBlocks = paragraphChunks.map((chunk) => paragraph(chunk));
+				blocks.splice(index, 1, ...newParagraphBlocks);
+			}
+		});
+	}
+
+	private chunkArray<T>(items: T[], size: number): T[][] {
+		const result: T[][] = [];
+		for (let i = 0; i < items.length; i += size) {
+			result.push(items.slice(i, i + size));
+		}
+		return result;
+	}
+
+	private async upsertGeneral(params: GeneralParams): Promise<NotionPageResponse> {
+		const {firstChunk, extraChunks} = this.prepareBlocks(params.childArr);
+		const cover = params.notionId
+			? await this.resolveCoverForUpdate(params.cover)
+			: params.cover;
+		this.debugLog("Upload2Notion", "Upserting general page", {
+			title: params.title,
+			blockCount: params.childArr.length,
+			firstChunkSize: firstChunk.length,
+			extraChunkCount: extraChunks.length,
+			cover: cover ?? null,
+			notionIdExisting: params.notionId ?? null,
+			tagList: params.tags,
+		});
+
+		if (params.notionId) {
+			console.log(`[Upload2Notion] Deleting existing Notion page`, {
+				notionId: params.notionId,
+			});
+			await this.deletePage(params.notionId);
+		}
+
+		const body = this.buildGeneralBody({
+			title: params.title,
+			tags: params.tags,
+			firstChunk,
+		});
+		this.applyCover(body, cover);
+		console.log(body);
+		return this.submitPage(body, extraChunks);
+	}
+
+	private async upsertNext(params: NextParams): Promise<NotionPageResponse> {
+		const {firstChunk, extraChunks} = this.prepareBlocks(params.childArr);
+		const cover = params.notionId
+			? await this.resolveCoverForUpdate(params.cover)
+			: params.cover;
+		this.debugLog("Upload2Notion", "Upserting NotionNext page", {
+			title: params.title,
+			type: params.type,
+			slug: params.slug,
+			blockCount: params.childArr.length,
+			firstChunkSize: firstChunk.length,
+			extraChunkCount: extraChunks.length,
+			cover: cover ?? null,
+			hasEmoji: !!params.emoji,
+			notionIdExisting: params.notionId ?? null,
+		});
+
+		if (params.notionId) {
+			await this.deletePage(params.notionId);
+		}
+
+		const body = this.buildNextBody({
+			firstChunk,
+			title: params.title,
+			emoji: params.emoji,
+			tags: params.tags,
+			type: params.type,
+			slug: params.slug,
+			stats: params.stats,
+			category: params.category,
+			summary: params.summary,
+			password: params.password,
+			favicon: params.favicon,
+			datetime: params.datetime,
+		});
+		this.applyCover(body, cover);
+		console.log(body);
+		return this.submitPage(body, extraChunks);
+	}
+
+	private async upsertCustom(params: CustomParams): Promise<NotionPageResponse> {
+		const {firstChunk, extraChunks} = this.prepareBlocks(params.childArr);
+		const cover = params.notionId
+			? await this.resolveCoverForUpdate(params.cover)
+			: params.cover;
+		this.debugLog("Upload2Notion", "Upserting custom page", {
+			blockCount: params.childArr.length,
+			firstChunkSize: firstChunk.length,
+			extraChunkCount: extraChunks.length,
+			cover: cover ?? null,
+			notionIdExisting: params.notionId ?? null,
+			customValueKeys: Object.keys(params.customValues || {}),
+		});
+
+		if (params.notionId) {
+			await this.deletePage(params.notionId);
+		}
+
+		const body = this.buildCustomBody({
+			customValues: params.customValues,
+			firstChunk,
+		});
+		this.applyCover(body, cover);
+		console.log(body);
+		return this.submitPage(body, extraChunks);
+	}
+
+	private buildGeneralBody(params: {title: string; tags: string[]; firstChunk: any[]}): any {
+		const {
+			databaseID,
+			customTitleButton,
+			customTitleName,
+			tagButton,
+		} = this.dbDetails;
+
+		return {
+			parent: {
+				database_id: databaseID,
+			},
+			properties: {
+				[customTitleButton ? customTitleName : "title"]: {
+					title: [
+						{
+							text: {
+								content: params.title,
+							},
+						},
+					],
+				},
+				...(tagButton
+					? {
+						tags: {
+							multi_select:
+								params.tags && params.tags.length > 0
+									? params.tags.map((tag) => ({name: tag}))
+									: [],
+						},
+					}
+					: {}),
+			},
+			children: params.firstChunk,
+		};
+	}
+
+	private buildNextBody(params: {
+		firstChunk: any[];
+		title: string;
+		emoji: string;
+		tags: string[];
+		type: string;
+		slug: string;
+		stats: string;
+		category: string;
+		summary: string;
+		password: string;
+		favicon: string;
+		datetime: string;
+	}): any {
+		const {databaseID} = this.dbDetails;
+
+		const pageProperties: any = {
+			parent: {
+				database_id: databaseID,
+			},
+			properties: {
+				title: {
+					title: [
+						{
+							text: {
+								content: params.title,
+							},
+						},
+					],
+				},
+				type: {
+					select: {
+						name: params.type || "Post",
+					},
+				},
+				status: {
+					select: {
+						name: params.stats || "Draft",
+					},
+				},
+				category: {
+					select: {
+						name: params.category || "Obsidian",
+					},
+				},
+				password: {
+					rich_text: [
+						{
+							text: {
+								content: params.password || "",
+							},
+						},
+					],
+				},
+				icon: {
+					rich_text: [
+						{
+							text: {
+								content: params.favicon || "",
+							},
+						},
+					],
+				},
+				date: {
+					date: {
+						start: params.datetime || new Date().toISOString(),
+					},
+				},
+			},
+		};
+
+		if (params.tags && params.tags.length > 0) {
+			pageProperties.properties.tags = {
+				multi_select: params.tags.map((tag) => ({name: tag})),
+			};
+		}
+
+		if (params.emoji) {
+			pageProperties.icon = {
+				emoji: params.emoji,
+			};
+		}
+
+		if (params.slug) {
+			pageProperties.properties.slug = {
+				rich_text: [
+					{
+						text: {
+							content: params.slug,
+						},
+					},
+				],
+			};
+		}
+
+		if (params.summary) {
+			pageProperties.properties.summary = {
+				rich_text: [
+					{
+						text: {
+							content: params.summary,
+						},
+					},
+				],
+			};
+		}
+
+		return {
+			...pageProperties,
+			children: params.firstChunk,
+		};
+	}
+
+	private buildCustomBody(params: {
+		customValues: Record<string, string>;
+		firstChunk: any[];
+	}): any {
+		const {customProperties, databaseID} = this.dbDetails;
+		const properties: { [key: string]: any } = {};
+
+		if (customProperties) {
+			customProperties.forEach(({customName, customType}) => {
+				if (params.customValues[customName] !== undefined) {
+					const propertyValue = this.buildCustomProperty(customName, customType, params.customValues);
+					if (propertyValue !== undefined) {
+						properties[customName] = propertyValue;
+					}
+				}
+			});
+		}
+
+		return {
+			parent: {
+				database_id: databaseID,
+			},
+			properties,
+			children: params.firstChunk,
+		};
+	}
+
+	private buildCustomProperty(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: string) => ({
+							name: url,
+							type: "external",
+							external: {
+								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: string) => ({name: item}))
+						: [{name: value}],
+				};
+			case "relation":
+				return {
+					relation: Array.isArray(value)
+						? value.map((item: string) => ({id: item}))
+						: [{id: value}],
+				};
+			default:
+				return undefined;
+		}
+	}
+}
--- a/src/upload/common/UploadBase.ts
+++ b/src/upload/common/UploadBase.ts
@@ -0,0 +1,248 @@
+import { Notice, requestUrl } from "obsidian";
+import MyPlugin from "src/main";
+import { DatabaseDetails } from "../../ui/settingTabs";
+import { i18nConfig } from "../../lang/I18n";
+
+export interface NotionPageResponse {
+	response: any;
+	data: any;
+}
+
+interface PreparedBlocks {
+	firstChunk: any[];
+	extraChunks: any[][];
+}
+
+export abstract class UploadBase {
+	protected plugin: MyPlugin;
+	protected dbDetails: DatabaseDetails;
+
+	protected 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: "",
+			throw: false,
+		}).catch((error) =>
+			this.handleRequestError(error, `Deleting Notion page ${notionID}`),
+		);
+	}
+
+	protected prepareBlocks(childArr: any[]): PreparedBlocks {
+		this.stripCodeAnnotations(childArr);
+
+		const childArrLength = childArr.length;
+
+		if (childArrLength <= 100) {
+			this.debugLog("UploadBase", "Blocks fit into a single request", {
+				totalBlocks: childArrLength,
+			});
+			return {
+				firstChunk: childArr,
+				extraChunks: [],
+			};
+		}
+
+		const extraChunks: any[][] = [];
+		for (let i = 100; i < childArr.length; i += 100) {
+			extraChunks.push(childArr.slice(i, i + 100));
+		}
+
+		this.debugLog("UploadBase", "Blocks split into multiple chunks", {
+			totalBlocks: childArrLength,
+			firstChunkSize: 100,
+			extraChunkCount: extraChunks.length,
+			lastChunkSize: extraChunks[extraChunks.length - 1].length,
+		});
+
+		return {
+			firstChunk: childArr.slice(0, 100),
+			extraChunks,
+		};
+	}
+
+	protected applyCover(body: any, cover?: string) {
+		if (cover) {
+			body.cover = {
+				type: "external",
+				external: {
+					url: cover,
+				},
+			};
+		} else if (!body.cover && this.plugin.settings.bannerUrl) {
+			body.cover = {
+				type: "external",
+				external: {
+					url: this.plugin.settings.bannerUrl,
+				},
+			};
+		}
+
+		this.debugLog("UploadBase", "Cover applied to payload", {
+			chosenCover: body.cover?.external?.url ?? null,
+			defaultBannerUsed: !cover && !!this.plugin.settings.bannerUrl,
+		});
+	}
+
+	protected async resolveCoverForUpdate(cover?: string): Promise<string | undefined> {
+		if (cover) {
+			this.debugLog("UploadBase", "Existing cover retained for update", {
+				cover,
+			});
+			return cover;
+		}
+		const databaseCover = await this.fetchDatabaseCover();
+		return databaseCover ?? undefined;
+	}
+
+	protected async submitPage(body: any, extraChunks: any[][]): Promise<NotionPageResponse> {
+		const {notionAPI} = this.dbDetails;
+		const startedAt = Date.now();
+
+		const response = await requestUrl({
+			url: `https://api.notion.com/v1/pages`,
+			method: "POST",
+			headers: {
+				"Content-Type": "application/json",
+				Authorization: "Bearer " + notionAPI,
+				"Notion-Version": "2022-06-28",
+			},
+			body: JSON.stringify(body),
+			throw: false,
+		}).catch((error) =>
+			this.handleRequestError(error, "Creating Notion page"),
+		);
+
+		const data = await response.json;
+		this.debugLog("UploadBase", "Page creation response received", {
+			status: response.status,
+			durationMs: Date.now() - startedAt,
+			notionUrl: data?.url ?? null,
+			pageId: data?.id ?? null,
+		});
+
+		if (response.status !== 200) {
+			new Notice(`Error ${data.status}: ${data.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
+			console.log(`Error message: \n ${data.message}`);
+		} else {
+			if (extraChunks.length > 0) {
+				await this.appendExtraBlocks(data.id, extraChunks);
+			}
+		}
+
+		return {response, data};
+	}
+
+	private stripCodeAnnotations(childArr: any[]) {
+		childArr.forEach((block: any) => {
+			if (block.type === "code") {
+				block.code.rich_text.forEach((item: any) => {
+					if (item.type === "text" && item.annotations) {
+						delete item.annotations;
+					}
+				});
+			}
+		});
+	}
+
+	private async appendExtraBlocks(pageId: string, extraChunks: any[][]) {
+		const {notionAPI} = this.dbDetails;
+
+		for (let i = 0; i < extraChunks.length; i++) {
+			const chunk = extraChunks[i];
+			const extraBlocks = {
+				children: chunk,
+			};
+
+			const extraResponse = await requestUrl({
+				url: `https://api.notion.com/v1/blocks/${pageId}/children`,
+				method: "PATCH",
+				headers: {
+					"Content-Type": "application/json",
+					Authorization: "Bearer " + notionAPI,
+					"Notion-Version": "2022-06-28",
+				},
+				body: JSON.stringify(extraBlocks),
+				throw: false,
+			}).catch((error) =>
+				this.handleRequestError(error, `Appending blocks to page ${pageId}`),
+			);
+
+			const extraData: any = await extraResponse.json;
+
+			if (extraResponse.status !== 200) {
+				new Notice(`Error ${extraData.status}: ${extraData.code} \n ${i18nConfig["CheckConsole"]}`, 5000);
+				console.log(`Error message: \n ${extraData.message}`);
+			} else {
+				console.log(`${i18nConfig["ExtraBlockUploaded"]} to page: ${pageId}`);
+				if (i === extraChunks.length - 1) {
+					console.log(`${i18nConfig["BlockUploaded"]} to page: ${pageId}`);
+					new Notice(`${i18nConfig["BlockUploaded"]} page: ${pageId}`, 5000);
+				}
+			}
+		}
+	}
+
+	private async fetchDatabaseCover(): Promise<string | null> {
+		const {notionAPI, databaseID} = 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",
+			},
+			throw: false,
+		}).catch((error) =>
+			this.handleRequestError(error, `Fetching database ${databaseID}`),
+		);
+
+		if (response.json.cover && response.json.cover.external) {
+			return response.json.cover.external.url;
+		}
+
+		return null;
+	}
+
+	protected debugLog(context: string, message: string, payload?: Record<string, unknown>): void {
+		if (payload) {
+			console.log(`[${context}] ${message}`, payload);
+		} else {
+			console.log(`[${context}] ${message}`);
+		}
+	}
+
+	protected maskValue(value?: string, visibleChars = 4): string | undefined {
+		if (!value) {
+			return value;
+		}
+		if (value.length <= visibleChars * 2) {
+			return `${value.slice(0, visibleChars)}***`;
+		}
+		return `${value.slice(0, visibleChars)}***${value.slice(-visibleChars)}`;
+	}
+
+	private handleRequestError(error: unknown, context: string): never {
+		const message = error instanceof Error && error.message
+			? error.message
+			: String(error);
+		console.error(`[UploadBase] ${context} failed`, {
+			message,
+			error,
+		});
+		throw new Error(
+			`${context} failed: ${message}. Please check your network connection or proxy settings.`,
+		);
+	}
+}
--- a/src/upload/common/getMarkdownCustom.ts
+++ b/src/upload/common/getMarkdownCustom.ts
@@ -0,0 +1,62 @@
+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
+		// Only collect data 'Relation' should be handled separately in the function buildBodyString
+		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] =
+				(FileCache.frontmatter && FileCache.frontmatter[titleProperty.customName]) ?
+					FileCache.frontmatter[titleProperty.customName] : // use the front matter value if it exists
+					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;
+	}
+}
--- a/src/upload/common/getMarkdownGeneral.ts
+++ b/src/upload/common/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;
+	}
+}
--- a/src/upload/common/getMarkdownNext.ts
+++ b/src/upload/common/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;
+    }
+}
--- a/src/upload/updateYaml.ts
+++ b/src/upload/updateYaml.ts
@@ -0,0 +1,44 @@
+import { App, Notice, TFile } from "obsidian";
+import ObsidianSyncNotionPlugin from "../main";
+import { DatabaseDetails } from "../ui/settingTabs";
+import { i18nConfig } from "src/lang/I18n";
+
+export async function updateYamlInfo(
+    yamlContent: string,
+    nowFile: TFile,
+    res: any,
+    app: App,
+    plugin: ObsidianSyncNotionPlugin,
+    dbDetails: DatabaseDetails,
+) {
+    let { url, id } = res;
+    // replace www to notionID
+    const { notionUser, NotionLinkDisplay } = 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;
+        (NotionLinkDisplay) ? yamlContent[linkKey] = url : null;
+    });
+
+    try {
+        await navigator.clipboard.writeText(url)
+    } catch (error) {
+        console.log(error)
+        new Notice(`${i18nConfig.CopyErrorMessage}`);
+    }
+}
--- a/src/upload/uploadCommand.ts
+++ b/src/upload/uploadCommand.ts
@@ -0,0 +1,295 @@
+import {i18nConfig} from "../lang/I18n";
+import {App, Notice} from "obsidian";
+import {Upload2Notion} from "./Upload2Notion";
+import type {NotionPageResponse} from "./common/UploadBase";
+import {DatabaseDetails, PluginSettings} from "../ui/settingTabs";
+import ObsidianSyncNotionPlugin from "../main";
+import {getNowFileMarkdownContentNext} from "./common/getMarkdownNext";
+import {getNowFileMarkdownContentGeneral} from "./common/getMarkdownGeneral";
+import {getNowFileMarkdownContentCustom} from "./common/getMarkdownCustom";
+
+const SYNC_ERROR_NOTICE_DURATION = 8000;
+
+function extractErrorMessage(error: unknown): string {
+	if (error instanceof Error && error.message) {
+		return error.message;
+	}
+	return String(error);
+}
+
+function notifySyncError(prefix: string, basename: string, error: unknown): void {
+	const errorMessage = extractErrorMessage(error);
+	console.error(`${prefix} Sync failed`, error);
+	new Notice(
+		`${i18nConfig["sync-fail"]} ${basename}. ${errorMessage}\n${i18nConfig["CheckConsole"]}`,
+		SYNC_ERROR_NOTICE_DURATION,
+	);
+}
+
+function logCommandDebug(context: string, message: string, payload?: Record<string, unknown>): void {
+	if (payload) {
+		console.log(`[${context}] ${message}`, payload);
+	} else {
+		console.log(`[${context}] ${message}`);
+	}
+}
+
+export async function uploadCommandNext(
+	plugin: ObsidianSyncNotionPlugin,
+	settings: PluginSettings,
+	dbDetails: DatabaseDetails,
+	app: App,
+) {
+
+	const {notionAPI, databaseID} = dbDetails;
+	console.log(`[uploadCommandNext] ${new Date().toISOString()} Triggered for file`, app.workspace.getActiveFile()?.path);
+
+	// 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);
+
+	logCommandDebug("uploadCommandNext", "Metadata extracted from markdown", {
+		hasMarkdown: !!markDownData,
+		markdownLength: markDownData?.length ?? 0,
+		tagCount: tags?.length ?? 0,
+		coverIncluded: !!cover,
+		hasEmoji: !!emoji,
+		type,
+		slug,
+		hasPassword: !!paword,
+		datetime,
+	});
+
+	if (markDownData) {
+		const {basename} = nowFile;
+		logCommandDebug("uploadCommandNext", "Preparing to upload", {
+			filename: basename,
+			filePath: nowFile.path,
+		});
+
+		const upload = new Upload2Notion(plugin, dbDetails);
+		let res: NotionPageResponse;
+		try {
+			res = await upload.sync({
+				dataset: "next",
+				title: basename,
+				emoji: emoji || "",
+				cover: cover || "",
+				tags: tags || [],
+				type: type || "",
+				slug: slug || "",
+				stats: stats || "",
+				category: category || "",
+				summary: summary || "",
+				password: paword || "",
+				favicon: favicon || "",
+				datetime: datetime || "",
+				markdown: markDownData,
+				nowFile,
+				app,
+			});
+		} catch (error: unknown) {
+			notifySyncError("[uploadCommandNext]", basename, error);
+			logCommandDebug("uploadCommandNext", "Sync threw error", {
+				filename: basename,
+				error: extractErrorMessage(error),
+			});
+			return;
+		}
+
+		const {response} = res;
+		if (response.status === 200) {
+			new Notice(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`).noticeEl.style.color = "green";
+			
+			logCommandDebug("uploadCommandNext", "Sync succeeded", {
+				filename: basename,
+				status: response.status,
+				pageId: res.data?.id ?? null,
+				pageUrl: res.data?.url ?? null,
+			});
+		} else {
+			new Notice(`${i18nConfig["sync-fail"]} ${basename}`, 5000);
+			console.log(`${i18nConfig["sync-fail"]} ${basename}`);
+			logCommandDebug("uploadCommandNext", "Sync failed with status", {
+				filename: basename,
+				status: response.status,
+				errorCode: res.data?.code ?? null,
+				errorStatus: res.data?.status ?? null,
+			});
+		}
+
+	}
+}
+
+
+export async function uploadCommandGeneral(
+	plugin: ObsidianSyncNotionPlugin,
+	settings: PluginSettings,
+	dbDetails: DatabaseDetails,
+	app: App,
+) {
+
+	const {notionAPI, databaseID} = dbDetails;
+	console.log(`[uploadCommandGeneral] ${new Date().toISOString()} Triggered for file`, app.workspace.getActiveFile()?.path);
+
+	// 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)
+
+	new Notice(`Start upload ${nowFile.basename}`);
+	console.log(`Start upload ${nowFile.basename}`);
+
+	if (markDownData) {
+		const {basename} = nowFile;
+		logCommandDebug("uploadCommandGeneral", "Preparing to upload", {
+			filename: basename,
+			markdownLength: markDownData.length,
+			tagCount: tags?.length ?? 0,
+			hasCover: !!cover,
+		});
+
+		const upload = new Upload2Notion(plugin, dbDetails);
+		let res: NotionPageResponse;
+		try {
+			res = await upload.sync({
+				dataset: "general",
+				title: basename,
+				cover: cover || "",
+				tags: tags || [],
+				markdown: markDownData,
+				nowFile,
+				app,
+			});
+		} catch (error: unknown) {
+			notifySyncError("[uploadCommandGeneral]", basename, error);
+			logCommandDebug("uploadCommandGeneral", "Sync threw error", {
+				filename: basename,
+				error: extractErrorMessage(error),
+			});
+			return;
+		}
+
+		const {response} = res;
+		if (response.status === 200) {
+			new Notice(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`).noticeEl.style.color = "green";
+			
+			logCommandDebug("uploadCommandGeneral", "Sync succeeded", {
+				filename: basename,
+				status: response.status,
+				pageId: res.data?.id ?? null,
+				pageUrl: res.data?.url ?? null,
+			});
+		} else {
+			new Notice(`${i18nConfig["sync-fail"]} ${basename}`, 5000);
+			console.log(`${i18nConfig["sync-fail"]} ${basename}`);
+			logCommandDebug("uploadCommandGeneral", "Sync failed with status", {
+				filename: basename,
+				status: response.status,
+				errorCode: res.data?.code ?? null,
+				errorStatus: res.data?.status ?? null,
+			});
+		}
+
+	}
+}
+
+
+export async function uploadCommandCustom(
+	plugin: ObsidianSyncNotionPlugin,
+	settings: PluginSettings,
+	dbDetails: DatabaseDetails,
+	app: App,
+) {
+
+	const {notionAPI, databaseID} = dbDetails;
+	console.log(`[uploadCommandCustom] ${new Date().toISOString()} Triggered for file`, app.workspace.getActiveFile()?.path);
+
+	// 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)
+
+	new Notice(`Start upload ${nowFile.basename}`);
+	console.log(`Start upload ${nowFile.basename}`);
+
+	if (markDownData) {
+		const {basename} = nowFile;
+		logCommandDebug("uploadCommandCustom", "Preparing to upload", {
+			filename: basename,
+			markdownLength: markDownData.length,
+			hasCover: !!cover,
+			customValueKeys: Object.keys(customValues || {}),
+		});
+
+		const upload = new Upload2Notion(plugin, dbDetails);
+		let res: NotionPageResponse;
+		try {
+			res = await upload.sync({
+				dataset: "custom",
+				cover: cover || "",
+				customValues,
+				markdown: markDownData,
+				nowFile,
+				app,
+			});
+		} catch (error: unknown) {
+			notifySyncError("[uploadCommandCustom]", basename, error);
+			logCommandDebug("uploadCommandCustom", "Sync threw error", {
+				filename: basename,
+				error: extractErrorMessage(error),
+			});
+			return;
+		}
+
+		const {response} = res;
+
+		if (response.status === 200) {
+			new Notice(`${i18nConfig["sync-preffix"]} ${basename} ${i18nConfig["sync-success"]}`).noticeEl.style.color = "green";
+			
+			logCommandDebug("uploadCommandCustom", "Sync succeeded", {
+				filename: basename,
+				status: response.status,
+				pageId: res.data?.id ?? null,
+				pageUrl: res.data?.url ?? null,
+			});
+		} else {
+			new Notice(`${i18nConfig["sync-fail"]} ${basename}`, 5000);
+			console.log(`${i18nConfig["sync-fail"]} ${basename}`);
+			logCommandDebug("uploadCommandCustom", "Sync failed with status", {
+				filename: basename,
+				status: response.status,
+				errorCode: res.data?.code ?? null,
+				errorStatus: res.data?.status ?? null,
+			});
+		}
+
+	}
+}
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,6 +3,8 @@
    "baseUrl": ".",
    "inlineSourceMap": true,
    "inlineSources": true,
+	  "resolveJsonModule": true,
+	  "allowSyntheticDefaultImports": true,
    "module": "ESNext",
    "target": "ES6",
    "allowJs": true,
@@ -17,8 +19,8 @@
    ]
  },
  "include": [
-    "**/*.ts"
-,
-    "src/Upload2Notion.ts"
+    "**/*.ts",
+    "src/Upload2Notion.ts",
+    "src/*.ts"
  ]
 }
--- a/update-version.js
+++ b/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));
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Jiaxin Peng	99a40375f5	docs: update documentation website link in README files	2025-10-31 14:27:39 +00:00
Jiaxin Peng	7282fc6955	chore: Switch to pnpm and create individual package for docs	2025-10-31 13:46:31 +00:00
Jiaxin Peng	770061e826	chore: remove unused image files from documentation	2025-10-31 11:14:43 +00:00
Jiaxin Peng	de7b7dd28d	Merge pull request #65 from jxpeng98/docs add doc website	2025-10-31 11:03:19 +00:00
Jiaxin Peng	1c6c3fb0d9	chore: add vitepress package	2025-10-31 10:57:37 +00:00
Jiaxin Peng	ca0935bfe8	docs: update README to reflect new features and improved database support	2025-10-31 10:56:47 +00:00
Jiaxin Peng	e944721415	docs: add documentation for Obsidian to NotionNext plugin setup and usage	2025-10-31 10:47:34 +00:00
Jiaxin Peng	db66ef137c	Update version to 2.7.0	2025-10-27 23:21:30 +00:00
Jiaxin Peng	a152201510	Merge pull request #64 from jxpeng98/callout-support feat: callout support	2025-10-27 23:20:27 +00:00
Jiaxin Peng	abb699fe4d	docs: add support for converting Obsidian callouts to Notion callout blocks	2025-10-27 23:17:55 +00:00
Jiaxin Peng	cf6c80df0f	update yarn.lock	2025-10-27 23:14:43 +00:00
Jiaxin Peng	cf884de554	refactor: remove redundant debug logs from upload commands and base class	2025-10-27 23:12:25 +00:00
Jiaxin Peng	8eb4694342	refactor: removing redundant debug logs	2025-10-27 22:57:28 +00:00
Jiaxin Peng	6c0f6cea30	feat: enhance logging and error handling in upload commands and base class	2025-10-27 22:34:46 +00:00
Jiaxin Peng	8af4816f87	chore: update martian dependency version to 1.3.1	2025-10-27 20:44:23 +00:00
Jiaxin Peng	f6d24daa52	chore: bump martian dependency version to 1.3.0	2025-10-27 13:40:42 +00:00
Jiaxin Peng	da72846903	Update version to 2.6.0	2025-10-06 23:25:29 +01:00
Jiaxin Peng	8e08c4325d	Update version to 2.6.0	2025-10-06 23:22:00 +01:00
Jiaxin Peng	ebb7a290e8	Merge pull request #61 from jxpeng98/unify-upload-functions unify three databases with single upload file	2025-10-06 23:19:55 +01:00
Jiaxin Peng	24e68fc798	unify three databases with single upload file	2025-10-06 23:18:01 +01:00
Jiaxin Peng	78d2a29c8a	Update README.md img links	2025-07-20 12:19:10 +01:00
Jiaxin Peng	1156bd3809	Merge pull request #58 from jxpeng98/notion-relation update img links	2025-07-20 12:17:56 +01:00
Jiaxin Peng	b46e24f1ed	update img links	2025-07-20 12:16:10 +01:00
Jiaxin Peng	a950e2e301	Update version to 2.5.0	2024-11-20 22:19:38 +00:00
Jiaxin Peng	aac7bc154a	feat: consistent sync function (requestUrl) for desktop and mobile	2024-11-20 22:19:03 +00:00
Jiaxin Peng	a573ef728d	chore: remove node-fetch and change the platform back to browser.	2024-11-20 22:17:49 +00:00
Jiaxin Peng	1344c14933	Update version to 2.4.3	2024-10-22 10:29:09 +01:00
Jiaxin Peng	c1f4ecd14b	Update version to 2.4.3	2024-10-22 10:27:49 +01:00
Jiaxin Peng	5942876c92	fix: cannot parse title from front matter	2024-10-22 10:27:33 +01:00
Jiaxin Peng	3218eb9fba	Update version to 2.4.2	2024-09-19 13:50:51 +01:00
Jiaxin Peng	48566eca20	Merge pull request #37 from jxpeng98/pluggin-does-not-appear-on-mac fix: obsidian language not set in English, Chinese and Japanese	2024-09-19 13:49:08 +01:00
Jiaxin Peng	8bd8346423	fix: obsidian language not set in English, Chinese and Japanese	2024-09-19 13:47:57 +01:00
Jiaxin Peng	00411e9599	Merge pull request #35 from jxpeng98/mobile-fail-to-start feat: separate mobile sync from desktop version	2024-09-03 12:19:23 +01:00
Jiaxin Peng	296125f6b4	chore: remove process from dependencies	2024-09-03 12:15:36 +01:00
Jiaxin Peng	1b385ccd0a	solve: the fail to load of mobile caused by the node version	2024-09-01 23:26:22 +01:00
Jiaxin Peng	a90e4871bb	Backup mobile requesturl after version 2.4.1	2024-09-01 22:57:03 +01:00
Jiaxin Peng	885ccba027	fix: test the desktop function for next and general	2024-08-31 23:43:19 +01:00
Jiaxin Peng	f282dde1b7	fix: test the desktop function of custom database with platform function	2024-08-31 00:00:09 +01:00
Jiaxin Peng	bc166d8db1	Update version to 2.4.1	2024-08-28 20:31:28 +01:00
Jiaxin Peng	7612637951	Merge pull request #34 from jxpeng98/code-highlight-issue fix code highlight issue	2024-08-28 20:30:49 +01:00
Jiaxin Peng	e8b1617916	fix item type error for iteration	2024-08-28 20:30:05 +01:00
Jiaxin Peng	fd29ed820e	fix code highlight issue	2024-08-28 20:26:06 +01:00
Jiaxin Peng	1f58670906	Update version to 2.4.0	2024-08-19 11:24:23 +01:00
Jiaxin Peng	fc47d36e8d	Merge pull request #32 from jxpeng98/long-notes-support Long notes support	2024-08-18 22:39:00 +01:00
Jiaxin Peng	cd4e610c46	modify type of pageProperties	2024-08-18 18:42:59 +01:00
Jiaxin Peng	b05c248c44	feat: support long notes syncing	2024-08-18 17:16:08 +01:00
Jiaxin Peng	800e218dee	Update version to 2.3.5	2024-08-18 13:08:04 +01:00
Jiaxin Peng	3b774552af	update martian	2024-08-18 13:07:52 +01:00
Jiaxin Peng	b8a02c49f1	Update version to 2.3.4	2024-07-28 01:13:39 +01:00
Jiaxin Peng	046a67f22c	Merge pull request #29 from jxpeng98/debug-general General: use node-fetch to post notes	2024-07-28 01:08:08 +01:00
Jiaxin Peng	426f05dfbd	General: use node-fetch to post notes	2024-07-28 01:07:35 +01:00
Jiaxin Peng	0addaa0d7f	Merge pull request #28 from jxpeng98/debug-next Next: use node-fetch to post notes for a better debug	2024-07-28 00:54:05 +01:00
Jiaxin Peng	1d5792c966	Next: use node-fetch to post notes for a better debug	2024-07-28 00:52:27 +01:00
Jiaxin Peng	193d3f6f87	Merge pull request #27 from jxpeng98/better-debug custom: node-fetch replaces requestUrl	2024-07-27 23:37:27 +01:00
Jiaxin Peng	e9c2b4aada	Custom: use node-fetch to post notes rather than requestUrl for better debug	2024-07-27 23:36:00 +01:00
Jiaxin Peng	b5ac42e6e3	use node-fetch to post notes for a better debug	2024-07-27 22:28:21 +01:00
Jiaxin Peng	60d002677b	use json to parse the error information	2024-07-27 21:38:09 +01:00
Jiaxin Peng	3c3ec6881e	Update version to 2.3.3	2024-07-15 14:19:11 +01:00
Jiaxin Peng	a80155fafc	Merge pull request #26 from jxpeng98/notice-info change the success notice colour	2024-07-15 14:17:01 +01:00
Jiaxin Peng	3a814b8390	feat: change the success notice colour	2024-07-15 14:15:10 +01:00
Jiaxin Peng	bb522db9a2	fix: readme gif link update	2024-07-15 14:13:09 +01:00
Jiaxin Peng	201f72ae0e	update notice	2024-07-14 23:57:01 +01:00
Jiaxin Peng	be6f192dd8	Update readme file	2024-07-14 21:51:53 +01:00
Jiaxin Peng	4ce1019094	Update Readme links	2024-07-14 20:27:02 +01:00
Jiaxin Peng	095c608511	update readme with new instruction	2024-07-14 17:58:21 +01:00
Jiaxin Peng	2d8d7fb11a	Update version to 2.3.2	2024-07-14 17:52:59 +01:00
Jiaxin Peng	36725cb699	fix: Text property in custom database	2024-07-14 17:52:43 +01:00
Jiaxin Peng	654e7e854d	更新 README.md	2024-07-10 00:32:00 +01:00
Jiaxin Peng	fa67f08512	Update version to 2.3.1	2024-07-05 09:50:31 +01:00
Jiaxin Peng	7e42ef49a7	Merge pull request #24 from jxpeng98/notion-link feat: add notion link display	2024-07-05 09:49:27 +01:00
Jiaxin Peng	5a95aa0acc	feat: add notion link display	2024-07-05 09:48:35 +01:00
Jiaxin Peng	ded01ce678	Update version to 2.3.0	2024-07-04 20:57:35 +01:00
Jiaxin Peng	3535d9fc70	Merge pull request #23 from jxpeng98/edit-modal edit modal update for customised database	2024-07-04 20:55:41 +01:00
Jiaxin Peng	9c93e38aff	reformat code and update readme file	2024-07-04 20:51:07 +01:00
Jiaxin Peng	bfde5dfe1a	finish the edit modal	2024-07-04 20:28:28 +01:00
Jiaxin Peng	d8eb3c8984	feat: cancel function works well	2024-07-04 18:12:31 +01:00
Jiaxin Peng	1cee2b67a6	update edit modal with better display setting.	2024-07-04 17:06:23 +01:00
Jiaxin Peng	82529ce56a	back up for edit modal	2024-07-04 10:00:46 +01:00
Jiaxin Peng	70f30f0713	Add support for notion link display in the front matter.	2024-07-03 22:35:47 +01:00
Jiaxin Peng	24ebb0bf8a	Back up edit modal	2024-07-03 22:01:46 +01:00
Jiaxin Peng	d7372c7c55	Improve preview function for customised database	2024-07-03 16:05:24 +01:00
Jiaxin Peng	f7bcf71020	create retrieve function to get all created properties for customised database	2024-07-03 14:26:02 +01:00
Jiaxin Peng	72146afe48	update settingModal.ts refactor the customise database and improve the creating logic	2024-07-03 13:39:56 +01:00
Jiaxin Peng	9bcdb42edb	settingmodal save mapping for reference	2024-07-03 11:06:54 +01:00
Jiaxin Peng	16e0827991	update the basic function of edit modal	2024-07-03 08:47:33 +01:00
Jiaxin Peng	863a6fb0dc	more clear logic customised database setting code	2024-07-02 23:56:35 +01:00
Jiaxin Peng	5799ffe79b	Update custom function and adjust the custom interface ui	2024-07-02 23:48:37 +01:00
Jiaxin Peng	a8ebab7fcb	change tags titleicon and summary to optional function in next database	2024-03-17 14:36:55 +00:00
Jiaxin Peng	e0ec27ad07	update readme	2024-03-12 22:04:34 +00:00
Jiaxin Peng	85220105b0	update README	2024-03-08 15:23:17 +00:00
Jiaxin Peng	9afdb24a82	typo	2024-02-26 11:57:28 +00:00
Jiaxin Peng	3c7ab13995	update readme	2024-02-26 11:53:02 +00:00
Jiaxin Peng	31b72f3bd3	Update version to 2.2.4	2024-02-19 23:08:47 +00:00
Jiaxin Peng	ee5aada1b9	Update version to 2.2.3	2024-02-19 20:51:47 +00:00
Jiaxin Peng	9e15044f6a	Update version to 2.2.2	2024-02-16 23:10:22 +00:00
Jiaxin Peng	9d891dae55	Update version to 2.2.1	2024-01-29 20:43:14 +00:00
Jiaxin Peng	bc665253ec	Update version to 2.2.0	2024-01-29 19:03:09 +00:00
Jiaxin Peng	125c75f7c0	Merge pull request #13 from jxpeng98/custom add the customisation function	2024-01-29 19:01:37 +00:00
Jiaxin Peng	8248640b5f	fix the extra argument in the uploadcommand	2024-01-29 11:55:52 +00:00
Jiaxin Peng	0198898086	update the readme and changelog	2024-01-29 11:53:18 +00:00
Jiaxin Peng	8c6aea8250	Complete the basic function of customisation	2024-01-29 11:12:07 +00:00
Jiaxin Peng	a179d3da52	almost finish the structure	2024-01-29 00:55:06 +00:00
Jiaxin Peng	569d8eb699	fix the error of the display of title custom button	2024-01-28 00:26:58 +00:00
Jiaxin Peng	2a58dd3258	complete the custom ui design	2024-01-28 00:11:11 +00:00
Jiaxin Peng	8c65e471eb	Update version to 2.1.2	2024-01-09 11:44:40 +00:00
Jiaxin Peng	388693d5b4	Update version to 2.1.1	2024-01-09 11:38:03 +00:00
Jiaxin Peng	dda6710fe9	remove redundant settingtabs	2024-01-09 11:37:47 +00:00
Jiaxin Peng	76ea9a4aee	Update version to 2.1.0	2024-01-09 11:34:11 +00:00
Jiaxin Peng	856f83e8a1	Add confirmation delete button and modify edit modal interface.	2024-01-09 11:33:39 +00:00
Jiaxin Peng	f670dd972a	Update version to 2.0.1	2024-01-03 00:37:47 +00:00
Jiaxin Peng	e6de2d036a	add preview and edit function	2024-01-03 00:37:34 +00:00
Jiaxin Peng	dd131f5df1	readme update	2023-12-29 00:41:02 +00:00
Jiaxin Peng	a9fb81fc1b	readme error	2023-12-29 00:39:18 +00:00
Jiaxin Peng	4f21e3ff91	Update version to 2.0.0	2023-12-29 00:36:48 +00:00
Jiaxin Peng	4abbbecd37	modify the notionapi variable	2023-12-29 00:36:29 +00:00
Jiaxin Peng	35746f1c51	Merge pull request #12 from jxpeng98/add-button rebuild the plugin and add new button for multi database support	2023-12-29 00:26:16 +00:00
Jiaxin Peng	9ac64268fc	Merge branch 'master' into add-button	2023-12-29 00:26:02 +00:00
Jiaxin Peng	3123d91e97	complete the new version for add button	2023-12-29 00:21:21 +00:00
Jiaxin Peng	cf08703fea	complete the basic notionnext function	2023-12-28 00:55:06 +00:00
Jiaxin Peng	fb463ceaae	modify language map	2023-12-27 00:48:39 +00:00
Jiaxin Peng	306573d81e	merge 1.1.2	2023-12-27 00:37:54 +00:00
Jiaxin Peng	fb5f7b502d	finish some command coding	2023-12-27 00:27:32 +00:00
Jiaxin Peng	59c15f1206	modify setting modal	2023-12-26 21:19:24 +00:00
Jiaxin Peng	370444fb94	basic display of modal	2023-12-26 09:03:29 +00:00
Jiaxin Peng	11aaf14c0b	update general tabs	2023-12-25 22:47:24 +00:00
Jiaxin Peng	f3fb251cf7	set the class next tabs	2023-12-25 22:43:11 +00:00
Jiaxin Peng	913fa4dd03	Update version to 1.1.2	2023-12-06 15:22:53 +00:00
Jiaxin Peng	f638310f31	modify workflow	2023-12-06 15:22:09 +00:00
Jiaxin Peng	c2421f7a84	add the property 'status' for NotionNext	2023-12-06 15:19:57 +00:00
Jiaxin Peng	6c30d0c2b4	adjust the limitation of blocks	2023-12-06 14:40:15 +00:00
Jiaxin Peng	ccb5a20abe	add custom frontmatter	2023-11-23 22:11:04 +00:00
Jiaxin Peng	630e3a20c2	Update version to 1.1.1	2023-11-23 11:54:50 +00:00
Jiaxin Peng	040b72b760	Update version to 1.1.0	2023-11-20 22:01:20 +00:00
Jiaxin Peng	7df4b5e9c8	Merge pull request #9 from jxpeng98/package-test package update and add tag syncing button	2023-11-20 21:59:53 +00:00
Jiaxin Peng	3f35a56b6e	rebuild the locale file and add tag button to control tag syncing function	2023-11-20 21:57:30 +00:00
Jiaxin Peng	3c7e266a35	setting tab bug fix	2023-11-20 17:07:04 +00:00
Jiaxin Peng	8201c706ea	remove block limit and update packages	2023-11-16 21:09:31 +00:00
Jiaxin Peng	4433ea449d	Update version to 1.0.1	2023-11-16 13:55:14 +00:00
Jiaxin Peng	96126d1334	Jump to version 1.0.0	2023-11-16 13:32:07 +00:00
Jiaxin Peng	b3702a9cc1	Update version to 1.0.0	2023-11-16 13:29:29 +00:00
Jiaxin Peng	ba9b477db7	Update version to 0.2.7	2023-11-16 13:27:48 +00:00
Jiaxin Peng	fb6951cfdf	Update version to 0.3.5	2023-11-16 13:25:56 +00:00
Jiaxin Peng	6454c0417d	Update version to 0.3.4	2023-11-16 13:10:53 +00:00
Jiaxin Peng	35f19a9f43	modify the action file	2023-11-16 13:10:27 +00:00
Jiaxin Peng	8e32e8f0f5	Update version to 0.3.3	2023-11-16 12:59:41 +00:00
Jiaxin Peng	880f256ae1	Update version to 0.3.2	2023-11-16 12:55:01 +00:00
Jiaxin Peng	bf9c3f2933	Update version to 0.3.1	2023-11-16 11:58:58 +00:00
Jiaxin Peng	2ac354299a	update action file	2023-11-16 11:58:44 +00:00
Jiaxin Peng	8317abb667	Update version to 0.3.0	2023-11-16 11:50:36 +00:00
Jiaxin Peng	d74634aca6	Merge pull request #7 from jxpeng98/custom-title Custom title	2023-11-16 11:48:14 +00:00
Jiaxin Peng	d400b92263	update readme	2023-11-16 11:44:45 +00:00
Jiaxin Peng	e7fa597e5a	update translate	2023-11-16 11:14:19 +00:00
Jiaxin Peng	6ce689ba96	complete the basic customisation feature	2023-11-16 01:00:52 +00:00
Jiaxin Peng	b978cf7e01	complete the setting ui	2023-11-16 00:02:35 +00:00
Jiaxin Peng	4e3c88f129	reorganise the code for add new setting container	2023-11-15 12:25:30 +00:00
Jiaxin Peng	6550bca70f	reorganise the setting coding	2023-11-15 09:34:22 +00:00
Jiaxin Peng	662edbb84c	remove the collapse details	2023-11-15 00:16:19 +00:00
Jiaxin Peng	671936ee41	add some details for collapse	2023-11-15 00:15:52 +00:00
Jiaxin Peng	2b16ea76c6	update the setting ui	2023-11-14 23:27:38 +00:00
Jiaxin Peng	399a02187f	update packages and complete the setting UI	2023-11-14 15:42:30 +00:00
Jiaxin Peng	eee349509a	Update version to 0.2.6	2023-11-12 21:02:00 +00:00
Jiaxin Peng	57c0941fed	Merge pull request #6 from jxpeng98/add-button Add switch button	2023-11-12 21:00:43 +00:00
Jiaxin Peng	8734af6dbf	add switch button	2023-11-12 20:59:39 +00:00
Jiaxin Peng	041a78fb52	add button to display the command in the command palette	2023-11-11 00:29:35 +00:00
Jiaxin Peng	afec5d8364	Update version to 0.2.5	2023-11-05 20:49:28 +00:00
Jiaxin Peng	75926a38d4	Update version to 0.2.4	2023-11-05 20:46:42 +00:00
Jiaxin Peng	793dd67e0a	Update version to 0.2.3	2023-11-05 20:44:51 +00:00
Jiaxin Peng	f235c80d18	update readme	2023-11-05 20:44:42 +00:00
Jiaxin Peng	f33315a4b6	fix github action bug	2023-11-05 20:43:47 +00:00
Jiaxin Peng	b62bd4ba2e	Update version to 0.2.2	2023-11-05 17:58:19 +00:00
Jiaxin Peng	402d15a38b	Merge pull request #5 from jxpeng98/general-database General database	2023-11-05 17:57:21 +00:00
Jiaxin Peng	87f1ce0146	update readme and settingtabs	2023-11-05 17:50:51 +00:00
Jiaxin Peng	398b785e03	update the script and support both notionnext and general database	2023-11-05 17:32:10 +00:00
Jiaxin Peng	8617878582	restructure the code for further feature	2023-11-04 22:37:02 +00:00
Jiaxin Peng	ae9e0c14fb	modify the directory structure and rename the function	2023-11-02 14:32:25 +00:00
Jiaxin Peng	9be9b18efb	Update version to 0.2.0	2023-11-01 23:24:34 +00:00
Jiaxin Peng	588f57205b	Modified the template and rebuilt the interactive logic	2023-11-01 23:24:18 +00:00
Jiaxin Peng	cfbedea91d	Update version to 0.1.10	2023-11-01 10:32:35 +00:00
Jiaxin Peng	4cd6557444	chinese support in settings	2023-11-01 10:32:22 +00:00
Jiaxin Peng	407688c303	Update version to 0.1.9	2023-11-01 09:53:29 +00:00
Jiaxin Peng	84b998aa93	initialise the NNon value and add i18n	2023-11-01 09:53:14 +00:00
Jiaxin Peng	4b6f1a1f1d	Update version to 0.1.8	2023-10-31 23:56:50 +00:00