diff --git a/src-tauri/migrations/20230811074423_rename_blocks_to_widgets.sql b/src-tauri/migrations/20230811074423_rename_blocks_to_widgets.sql
new file mode 100644
index 00000000..b267ba0f
--- /dev/null
+++ b/src-tauri/migrations/20230811074423_rename_blocks_to_widgets.sql
@@ -0,0 +1,3 @@
+-- Add migration script here
+ALTER TABLE blocks
+RENAME TO widgets;
\ No newline at end of file
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 500fc652..a075319b 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -110,6 +110,12 @@ fn main() {
sql: include_str!("../migrations/20230808085847_add_relays_table.sql"),
kind: MigrationKind::Up,
},
+ Migration {
+ version: 20230811074423,
+ description: "rename blocks to widgets",
+ sql: include_str!("../migrations/20230811074423_rename_blocks_to_widgets.sql"),
+ kind: MigrationKind::Up,
+ },
],
)
.build(),
diff --git a/src/app/auth/onboarding/step-2.tsx b/src/app/auth/onboarding/step-2.tsx
index aed63ea2..6ef68d62 100644
--- a/src/app/auth/onboarding/step-2.tsx
+++ b/src/app/auth/onboarding/step-2.tsx
@@ -1,7 +1,7 @@
import { useEffect, useState } from 'react';
import { Link, useNavigate } from 'react-router-dom';
-import { createBlock } from '@libs/storage';
+import { createWidget } from '@libs/storage';
import { ArrowRightCircleIcon, CheckCircleIcon, LoaderIcon } from '@shared/icons';
@@ -50,7 +50,7 @@ export function OnboardStep2Screen() {
setLoading(true);
for (const tag of tags) {
- await createBlock(BLOCK_KINDS.hashtag, tag, tag.replace('#', ''));
+ await createWidget(BLOCK_KINDS.hashtag, tag, tag.replace('#', ''));
}
setTimeout(() => navigate('/auth/onboarding/step-3', { replace: true }), 1000);
diff --git a/src/app/space/components/blocks/feed.tsx b/src/app/space/components/blocks/feed.tsx
index e8341ea5..e529fdaf 100644
--- a/src/app/space/components/blocks/feed.tsx
+++ b/src/app/space/components/blocks/feed.tsx
@@ -9,11 +9,11 @@ import { NoteKindUnsupport } from '@shared/notes/kinds/unsupport';
import { NoteSkeleton } from '@shared/notes/skeleton';
import { TitleBar } from '@shared/titleBar';
-import { Block, LumeEvent } from '@utils/types';
+import { LumeEvent, Widget } from '@utils/types';
const ITEM_PER_PAGE = 10;
-export function FeedBlock({ params }: { params: Block }) {
+export function FeedBlock({ params }: { params: Widget }) {
const { status, data, fetchNextPage, hasNextPage, isFetchingNextPage } =
useInfiniteQuery({
queryKey: ['newsfeed', params.content],
diff --git a/src/app/space/components/blocks/hashtag.tsx b/src/app/space/components/blocks/hashtag.tsx
index 005fcda9..dfc56260 100644
--- a/src/app/space/components/blocks/hashtag.tsx
+++ b/src/app/space/components/blocks/hashtag.tsx
@@ -8,9 +8,9 @@ import { NoteKind_1, NoteSkeleton } from '@shared/notes';
import { TitleBar } from '@shared/titleBar';
import { nHoursAgo } from '@utils/date';
-import { Block, LumeEvent } from '@utils/types';
+import { LumeEvent, Widget } from '@utils/types';
-export function HashtagBlock({ params }: { params: Block }) {
+export function HashtagBlock({ params }: { params: Widget }) {
const { relayUrls, fetcher } = useNDK();
const { status, data } = useQuery(['hashtag', params.content], async () => {
const events = (await fetcher.fetchAllEvents(
diff --git a/src/app/space/components/blocks/image.tsx b/src/app/space/components/blocks/image.tsx
index d0a80cae..a1c9ddcd 100644
--- a/src/app/space/components/blocks/image.tsx
+++ b/src/app/space/components/blocks/image.tsx
@@ -1,13 +1,13 @@
import { CancelIcon } from '@shared/icons';
import { Image } from '@shared/image';
-import { useBlocks } from '@stores/blocks';
import { DEFAULT_AVATAR } from '@stores/constants';
+import { useWidgets } from '@stores/widgets';
-import { Block } from '@utils/types';
+import { Widget } from '@utils/types';
-export function ImageBlock({ params }: { params: Block }) {
- const removeBlock = useBlocks((state) => state.removeBlock);
+export function ImageBlock({ params }: { params: Widget }) {
+ const remove = useWidgets((state) => state.removeWidget);
return (
@@ -17,7 +17,7 @@ export function ImageBlock({ params }: { params: Block }) {
{params.title}