diff --git a/app/~/(dashboard)/Sidebar/SyncBar/SyncButton.tsx b/app/~/(dashboard)/Sidebar/SyncBar/SyncButton.tsx index 77f7e356..162be977 100644 --- a/app/~/(dashboard)/Sidebar/SyncBar/SyncButton.tsx +++ b/app/~/(dashboard)/Sidebar/SyncBar/SyncButton.tsx @@ -29,7 +29,7 @@ export function SyncButton({}: Props) {
-
Push
+
Sync
 diff --git a/app/~/(dashboard)/objects/[nodeId]/page.tsx b/app/~/(dashboard)/objects/[nodeId]/page.tsx index b709b36b..4234132e 100644 --- a/app/~/(dashboard)/objects/[nodeId]/page.tsx +++ b/app/~/(dashboard)/objects/[nodeId]/page.tsx @@ -5,30 +5,11 @@ import { ELECTRIC_BASE_URL } from '@/lib/constants' import { db } from '@/lib/local-db' import { Node } from '@/lib/model' import { store } from '@/store' -import { Shape, ShapeStream } from '@electric-sql/client' -import { useLiveQuery } from '@electric-sql/pglite-react' -import { useShape } from '@electric-sql/react' import { useQuery } from '@tanstack/react-query' import { useParams } from 'next/navigation' export const dynamic = 'force-static' -// const stream = new ShapeStream({ -// url: `${ELECTRIC_BASE_URL}/v1/shape/site`, -// }) - -// stream.subscribe((messages) => { -// console.log('=======messages:', messages) -// // -// }) - -// const shape = new Shape(stream) - -// shape.subscribe((data) => { -// console.log('rows=data========:', data) -// // rows is an array of the latest value of each row in a shape. -// }) - export default function Page() { const params = useParams() diff --git a/components/ContentRender/SlateContent.tsx b/components/ContentRender/SlateContent.tsx index 98149328..680d2154 100644 --- a/components/ContentRender/SlateContent.tsx +++ b/components/ContentRender/SlateContent.tsx @@ -22,10 +22,17 @@ import { Editable } from 'slate-react' export function SlateContent() { return ( { - // console.log('=====element:', element) switch (element.type) { case ELEMENT_P: + if (element.listStyleType == 'disc') { + return ( + + ) + } return (
{children} diff --git a/components/SiteContext.tsx b/components/SiteContext.tsx index 347e1bc7..9c99afe3 100644 --- a/components/SiteContext.tsx +++ b/components/SiteContext.tsx @@ -1,78 +1,10 @@ 'use client' import { createContext, PropsWithChildren, useContext, useEffect } from 'react' -import { ELECTRIC_BASE_URL, isServer } from '@/lib/constants' +import { isServer } from '@/lib/constants' import { runWorker } from '@/lib/worker' -import { PGlite } from '@electric-sql/pglite' -import { electricSync } from '@electric-sql/pglite-sync' -import { live } from '@electric-sql/pglite/live' import { Site } from '@penxio/types' -async function runPG() { - console.log('init.........') - - const db = await PGlite.create({ - dataDir: 'idb://penx', - extensions: { - electric: electricSync({ debug: true }), - live, - }, - }) - - return - await db.electric.syncShapeToTable({ - shape: { - url: `${ELECTRIC_BASE_URL}/v1/shape/node`, - }, - - table: 'node', - primaryKey: ['id'], - }) - - await db.exec(` - CREATE TABLE IF NOT EXISTS node ( - id UUID PRIMARY KEY DEFAULT gen_random_uuid(), - userId UUID, - parentId UUID, - databaseId UUID, - type TEXT NOT NULL, - element JSONB NOT NULL, - props JSONB, - collapsed BOOLEAN DEFAULT FALSE, - folded BOOLEAN DEFAULT TRUE, - children JSONB, - createdAt TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - updatedAt TIMESTAMP DEFAULT CURRENT_TIMESTAMP - ); - - CREATE INDEX IF NOT EXISTS idx_userId ON node(userId); - CREATE INDEX IF NOT EXISTS idx_type ON node(type); - `) - - // await db.exec(` - // INSERT INTO node (id, userId, parentId, databaseId, type, element, props, collapsed, folded, children, createdAt, updatedAt) - // VALUES ( - // gen_random_uuid(), - // '550e8400-e29b-41d4-a716-446655440000', - // NULL, - // '550e8400-e29b-41d4-a716-446655440001', - // 'exampleType', - // '{"key": "value"}', - // '{"propKey": "propValue"}', - // FALSE, - // TRUE, - // NULL, - // CURRENT_TIMESTAMP, - // CURRENT_TIMESTAMP - // ); - // `) - - const ret = await db.query(` - SELECT * from node; -`) - console.log('=====ret:', ret) -} - let inited = false if (!isServer) { setTimeout(() => { diff --git a/components/plate-ui/table-cell-element.tsx b/components/plate-ui/table-cell-element.tsx index 717537d9..c6625bd4 100644 --- a/components/plate-ui/table-cell-element.tsx +++ b/components/plate-ui/table-cell-element.tsx @@ -139,3 +139,4 @@ TableCellElement.displayName = 'TableCellElement'; export const TableCellHeaderElement = withProps(TableCellElement, { isHeader: true, }); + diff --git a/custom-types.ts b/custom-types.ts index 1d04b6f3..78a4e063 100644 --- a/custom-types.ts +++ b/custom-types.ts @@ -16,6 +16,7 @@ declare module 'slate' { type?: any id?: string nodeType?: string + listStyleType?: string } } } diff --git a/lib/fetchers.ts b/lib/fetchers.ts index 717e05b2..228e1ea9 100644 --- a/lib/fetchers.ts +++ b/lib/fetchers.ts @@ -2,7 +2,7 @@ import prisma from '@/lib/prisma' import { getSite as getSiteInfo } from '@/server/lib/getSite' import ky from 'ky' import { unstable_cache } from 'next/cache' -import { PostStatus, RESPACE_BASE_URI } from './constants' +import { isProd, PostStatus, RESPACE_BASE_URI } from './constants' import { SpaceType } from './types' import { getUrl } from './utils' @@ -46,7 +46,7 @@ export async function getPosts() { }, [`posts`], { - revalidate: 3600 * 24, + revalidate: isProd ? 3600 * 24 : 10, tags: [`posts`], }, )() diff --git a/package.json b/package.json index 02ec5b69..1f19d416 100644 --- a/package.json +++ b/package.json @@ -19,15 +19,8 @@ "@dnd-kit/core": "^6.1.0", "@dnd-kit/sortable": "^7.0.2", "@dnd-kit/utilities": "^3.2.2", - "@electric-sql/client": "^0.6.5", - "@electric-sql/pglite": "^0.2.12", - "@electric-sql/pglite-react": "^0.2.12", - "@electric-sql/pglite-sync": "^0.2.13", - "@electric-sql/react": "^0.4.7", "@faker-js/faker": "^9.2.0", "@floating-ui/react": "^0.25.4", - "@fower/color-helper": "^2.1.1", - "@fower/utils": "^2.1.1", "@glideapps/glide-data-grid": "^6.0.3", "@hookform/resolvers": "^3.9.0", "@penxio/types": "^0.0.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d7fcf535..cff3a201 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -23,33 +23,12 @@ importers: '@dnd-kit/utilities': specifier: ^3.2.2 version: 3.2.2(react@18.2.0) - '@electric-sql/client': - specifier: ^0.6.5 - version: 0.6.5 - '@electric-sql/pglite': - specifier: ^0.2.12 - version: 0.2.12 - '@electric-sql/pglite-react': - specifier: ^0.2.12 - version: 0.2.12(@electric-sql/pglite@0.2.12)(react@18.2.0) - '@electric-sql/pglite-sync': - specifier: ^0.2.13 - version: 0.2.13(@electric-sql/pglite@0.2.12) - '@electric-sql/react': - specifier: ^0.4.7 - version: 0.4.7(react@18.2.0) '@faker-js/faker': specifier: ^9.2.0 version: 9.2.0 '@floating-ui/react': specifier: ^0.25.4 version: 0.25.4(react-dom@18.2.0(react@18.2.0))(react@18.2.0) - '@fower/color-helper': - specifier: ^2.1.1 - version: 2.1.1 - '@fower/utils': - specifier: ^2.1.1 - version: 2.1.1 '@glideapps/glide-data-grid': specifier: ^6.0.3 version: 6.0.3(lodash@4.17.21)(marked@4.3.0)(react-dom@18.2.0(react@18.2.0))(react-responsive-carousel@3.2.23)(react@18.2.0) @@ -1512,31 +1491,6 @@ packages: peerDependencies: tailwindcss: '*' - '@electric-sql/client@0.6.5': - resolution: {integrity: sha512-0fCudhoNoryFRoIR2WU79gfSabrTeZvHVT7tfZAy/CzBk4TdWGRPJsYaEqd9IclCnRipoGO+5hUFYSBHdHqlBA==} - - '@electric-sql/pglite-react@0.2.12': - resolution: {integrity: sha512-j489fJeCZ1jw6S88L9hPoBxEkqaOhd/U1bi/AomXa2tDv/E36eNK2ZCTYVrb1TAoaAZgYf92dBv+m4VrDb8RDA==} - peerDependencies: - '@electric-sql/pglite': ^0.2.12 - react: ^18.0.0 - - '@electric-sql/pglite-sync@0.2.13': - resolution: {integrity: sha512-c+CQkr0mhDRV78x+M87h/UsNl/IHF7Nvpjd1540xozkY2D2PGEhDMIhUX6Frw5IrNN7NWw9C8NsBFHEPRWs3MQ==} - peerDependencies: - '@electric-sql/pglite': ^0.2.12 - - '@electric-sql/pglite@0.2.12': - resolution: {integrity: sha512-J/X42ujcoFEbOkgRyoNqZB5qcqrnJRWVlwpH3fKYoJkTz49N91uAK/rDSSG/85WRas9nC9mdV4FnMTxnQWE/rw==} - - '@electric-sql/react@0.4.7': - resolution: {integrity: sha512-TTlAd2dV9tgeeXW41B5GFK3oKRudvlD2+n/m+wqqqPVg54HlxFs0F2HwSpjbwgKYu88z7Ejwq3yluFb3Ixc3kg==} - peerDependencies: - react: ^18.3.1 - peerDependenciesMeta: - react: - optional: true - '@emoji-mart/data@1.2.1': resolution: {integrity: sha512-no2pQMWiBy6gpBEiqGeU77/bFejDqUTRY7KX+0+iur13op3bqUsXdnwoZs6Xb1zbv0gAj5VvS1PWoUUckSr5Dw==} @@ -1633,14 +1587,6 @@ packages: '@floating-ui/utils@0.2.8': resolution: {integrity: sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==} - '@fower/color-helper@2.1.1': - resolution: {integrity: sha512-yj60kBVxcpxW4FaCNu+tYZ24p8Zo4OnN535aHM2469CLuOZ9szXYFiaim5L1VTzTaWOLA+QkXaMJyK7BTPme5g==} - engines: {node: '>=10'} - - '@fower/utils@2.1.1': - resolution: {integrity: sha512-27G/xCd910KGdgBOaVAhRvJjkncrCBOWC2OzvIY5Hd1tvOFym2ZNJcf7WU1Xj17gpqOgxCXbfgohhlAwXlckMQ==} - engines: {node: '>=10'} - '@glideapps/glide-data-grid@6.0.3': resolution: {integrity: sha512-YXKggiNOaEemf0jP0jORq2EQKz+zXms+6mGzZc+q0mLMjmgzzoGLOQC1uYcynXSj1R61bd27JcPFsoH+Gj37Vg==} peerDependencies: @@ -2917,11 +2863,6 @@ packages: '@types/react': optional: true - '@rollup/rollup-darwin-arm64@4.24.3': - resolution: {integrity: sha512-QPW2YmkWLlvqmOa2OwrfqLJqkHm7kJCIMq9kOz40Zo9Ipi40kf9ONG5Sz76zszrmIZZ4hgRIkez69YnTHgEz1w==} - cpu: [arm64] - os: [darwin] - '@rtsao/scc@1.1.0': resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==} @@ -3249,9 +3190,6 @@ packages: '@types/stack-utils@2.0.3': resolution: {integrity: sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==} - '@types/string-hash@1.1.3': - resolution: {integrity: sha512-p6skq756fJWiA59g2Uss+cMl6tpoDGuCBuxG0SI1t0NwJmYOU66LAMS6QiCgu7cUh3/hYCaMl5phcCW1JP5wOA==} - '@types/tough-cookie@4.0.5': resolution: {integrity: sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==} @@ -8532,9 +8470,6 @@ packages: resolution: {integrity: sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==} engines: {node: '>=4'} - string-hash@1.1.3: - resolution: {integrity: sha512-kJUvRUFK49aub+a7T1nNE66EJbZBMnBgoC1UbCZ5n6bsZKBRga4KgBRTMn/pFkeCZSYtNeSyMxPDM0AXWELk2A==} - string-width@4.2.3: resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==} engines: {node: '>=8'} @@ -10601,29 +10536,6 @@ snapshots: transitivePeerDependencies: - supports-color - '@electric-sql/client@0.6.5': - optionalDependencies: - '@rollup/rollup-darwin-arm64': 4.24.3 - - '@electric-sql/pglite-react@0.2.12(@electric-sql/pglite@0.2.12)(react@18.2.0)': - dependencies: - '@electric-sql/pglite': 0.2.12 - react: 18.2.0 - - '@electric-sql/pglite-sync@0.2.13(@electric-sql/pglite@0.2.12)': - dependencies: - '@electric-sql/client': 0.6.5 - '@electric-sql/pglite': 0.2.12 - - '@electric-sql/pglite@0.2.12': {} - - '@electric-sql/react@0.4.7(react@18.2.0)': - dependencies: - '@electric-sql/client': 0.6.5 - use-sync-external-store: 1.2.2(react@18.2.0) - optionalDependencies: - react: 18.2.0 - '@emoji-mart/data@1.2.1': {} '@emotion/hash@0.9.2': {} @@ -10729,13 +10641,6 @@ snapshots: '@floating-ui/utils@0.2.8': {} - '@fower/color-helper@2.1.1': {} - - '@fower/utils@2.1.1': - dependencies: - '@types/string-hash': 1.1.3 - string-hash: 1.1.3 - '@glideapps/glide-data-grid@6.0.3(lodash@4.17.21)(marked@4.3.0)(react-dom@18.2.0(react@18.2.0))(react-responsive-carousel@3.2.23)(react@18.2.0)': dependencies: '@linaria/react': 4.5.4(react@18.2.0) @@ -12348,9 +12253,6 @@ snapshots: optionalDependencies: '@types/react': 18.3.12 - '@rollup/rollup-darwin-arm64@4.24.3': - optional: true - '@rtsao/scc@1.1.0': {} '@rushstack/eslint-patch@1.10.4': {} @@ -12728,8 +12630,6 @@ snapshots: '@types/stack-utils@2.0.3': {} - '@types/string-hash@1.1.3': {} - '@types/tough-cookie@4.0.5': {} '@types/trusted-types@2.0.7': {} @@ -19278,8 +19178,6 @@ snapshots: strict-uri-encode@2.0.0: {} - string-hash@1.1.3: {} - string-width@4.2.3: dependencies: emoji-regex: 8.0.0