From 36b2acba6a0ab67e85bc19bf02285ad8e0181eba Mon Sep 17 00:00:00 2001 From: Ren Amamiya <123083837+reyamir@users.noreply.github.com> Date: Fri, 11 Aug 2023 15:25:33 +0700 Subject: [PATCH] rename blocks to widgets --- ...0230811074423_rename_blocks_to_widgets.sql | 3 ++ src-tauri/src/main.rs | 6 +++ src/app/auth/onboarding/step-2.tsx | 4 +- src/app/space/components/blocks/feed.tsx | 4 +- src/app/space/components/blocks/hashtag.tsx | 4 +- src/app/space/components/blocks/image.tsx | 10 ++--- src/app/space/components/blocks/thread.tsx | 4 +- src/app/space/components/blocks/user.tsx | 4 +- src/app/space/components/modals/feed.tsx | 4 +- src/app/space/components/modals/hashtag.tsx | 4 +- src/app/space/components/modals/image.tsx | 4 +- src/app/space/index.tsx | 35 ++++++++++-------- src/libs/storage.tsx | 27 +++++++------- src/shared/notes/actions.tsx | 6 +-- src/shared/notes/hashtag.tsx | 6 +-- src/shared/notes/mentions/note.tsx | 6 +-- src/shared/notes/mentions/user.tsx | 6 +-- src/shared/notes/metadata.tsx | 6 +-- src/shared/titleBar.tsx | 6 +-- src/stores/blocks.tsx | 37 ------------------- src/stores/widgets.tsx | 37 +++++++++++++++++++ src/utils/types.d.ts | 2 +- 22 files changed, 118 insertions(+), 107 deletions(-) create mode 100644 src-tauri/migrations/20230811074423_rename_blocks_to_widgets.sql delete mode 100644 src/stores/blocks.tsx create mode 100644 src/stores/widgets.tsx 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}