nostr/lume
1
0
Fork 0
mirror of https://github.com/luminous-devs/lume.git synced 2024-09-14 09:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

better structure

Browse Source
This commit is contained in:
Ren Amamiya 2023-05-10 16:17:38 +07:00
parent 1a30c10806
commit e7bcf6c3f8
94 changed files with 533 additions and 403 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.prettierrc
View File

@ -9,7 +9,6 @@
"bracketSpacing": true,
"bracketSameLine": false,
"importOrder": [
"^@lume/(.*)$",
"^@app/(.*)$",
"^@shared/(.*)$",
"^@icons/(.*)$",

5
src/app/channel/components/blacklist.tsx
View File

@ -1,5 +1,6 @@
import MutedItem from '@lume/app/channel/components/mutedItem';
import MuteIcon from '@lume/shared/icons/mute';
import MutedItem from '@app/channel/components/mutedItem';
import MuteIcon from '@icons/mute';
import { Popover, Transition } from '@headlessui/react';
import { Fragment } from 'react';

21
src/app/channel/components/createModal.tsx
View File

@ -1,12 +1,15 @@
import { AvatarUploader } from '@lume/shared/avatarUploader';
import CancelIcon from '@lume/shared/icons/cancel';
import PlusIcon from '@lume/shared/icons/plus';
import { Image } from '@lume/shared/image';
import { RelayContext } from '@lume/shared/relayProvider';
import { DEFAULT_AVATAR, WRITEONLY_RELAYS } from '@lume/stores/constants';
import { dateToUnix } from '@lume/utils/getDate';
import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
import { createChannel } from '@lume/utils/storage';
import { AvatarUploader } from '@shared/avatarUploader';
import { Image } from '@shared/image';
import { RelayContext } from '@shared/relayProvider';
import CancelIcon from '@icons/cancel';
import PlusIcon from '@icons/plus';
import { DEFAULT_AVATAR, WRITEONLY_RELAYS } from '@stores/constants';
import { dateToUnix } from '@utils/date';
import { useActiveAccount } from '@utils/hooks/useActiveAccount';
import { createChannel } from '@utils/storage';
import { Dialog, Transition } from '@headlessui/react';
import { getEventHash, signEvent } from 'nostr-tools';

5
src/app/channel/components/item.tsx
View File

@ -1,5 +1,6 @@
import { useChannelProfile } from '@lume/utils/hooks/useChannelProfile';
import { usePageContext } from '@lume/utils/hooks/usePageContext';
import { useChannelProfile } from '@app/channel/hooks/useChannelProfile';
import { usePageContext } from '@utils/hooks/usePageContext';
import { twMerge } from 'tailwind-merge';

7
src/app/channel/components/list.tsx
View File

@ -1,6 +1,7 @@
import ChannelCreateModal from '@lume/app/channel/components/createModal';
import ChannelsListItem from '@lume/app/channel/components/item';
import { getChannels } from '@lume/utils/storage';
import ChannelCreateModal from '@app/channel/components/createModal';
import ChannelsListItem from '@app/channel/components/item';
import { getChannels } from '@utils/storage';
import useSWR from 'swr';

5
src/app/channel/components/members.tsx
View File

@ -1,5 +1,6 @@
import MiniMember from '@lume/app/channel/components/miniMember';
import { channelMembersAtom } from '@lume/stores/channel';
import MiniMember from '@app/channel/components/miniMember';
import { channelMembersAtom } from '@stores/channel';
import { useAtomValue } from 'jotai';

10
src/app/channel/components/messageList.tsx
View File

@ -1,6 +1,8 @@
import ChannelMessageItem from '@lume/app/channel/components/messages/item';
import { sortedChannelMessagesAtom } from '@lume/stores/channel';
import { hoursAgo } from '@lume/utils/getDate';
import ChannelMessageItem from '@app/channel/components/messages/item';
import { sortedChannelMessagesAtom } from '@stores/channel';
import { getHourAgo } from '@utils/date';
import { useAtomValue } from 'jotai';
import { useCallback, useRef } from 'react';
@ -39,7 +41,7 @@ export default function ChannelMessageList() {
</div>
<div className="relative flex justify-center">
<div className="inline-flex items-center gap-x-1.5 rounded-full bg-zinc-900 px-3 py-1.5 text-xs font-medium text-zinc-400 shadow-sm ring-1 ring-inset ring-zinc-800">
{hoursAgo(24, now.current).toLocaleDateString('en-US', {
{getHourAgo(24, now.current).toLocaleDateString('en-US', {
weekday: 'long',
year: 'numeric',
month: 'long',

20
src/app/channel/components/messages/form.tsx
View File

@ -1,11 +1,15 @@
import UserReply from '@lume/app/channel/components/messages/userReply';
import { ImagePicker } from '@lume/shared/form/imagePicker';
import CancelIcon from '@lume/shared/icons/cancel';
import { RelayContext } from '@lume/shared/relayProvider';
import { channelContentAtom, channelReplyAtom } from '@lume/stores/channel';
import { WRITEONLY_RELAYS } from '@lume/stores/constants';
import { dateToUnix } from '@lume/utils/getDate';
import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
import UserReply from '@app/channel/components/messages/userReply';
import { ImagePicker } from '@shared/form/imagePicker';
import { RelayContext } from '@shared/relayProvider';
import CancelIcon from '@icons/cancel';
import { channelContentAtom, channelReplyAtom } from '@stores/channel';
import { WRITEONLY_RELAYS } from '@stores/constants';
import { dateToUnix } from '@utils/date';
import { useActiveAccount } from '@utils/hooks/useActiveAccount';
import { useAtom, useAtomValue } from 'jotai';
import { useResetAtom } from 'jotai/utils';

19
src/app/channel/components/messages/hideButton.tsx
View File

@ -1,11 +1,14 @@
import CancelIcon from '@lume/shared/icons/cancel';
import HideIcon from '@lume/shared/icons/hide';
import { RelayContext } from '@lume/shared/relayProvider';
import { Tooltip } from '@lume/shared/tooltip';
import { channelMessagesAtom } from '@lume/stores/channel';
import { WRITEONLY_RELAYS } from '@lume/stores/constants';
import { dateToUnix } from '@lume/utils/getDate';
import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
import { RelayContext } from '@shared/relayProvider';
import { Tooltip } from '@shared/tooltip';
import CancelIcon from '@icons/cancel';
import HideIcon from '@icons/hide';
import { channelMessagesAtom } from '@stores/channel';
import { WRITEONLY_RELAYS } from '@stores/constants';
import { dateToUnix } from '@utils/date';
import { useActiveAccount } from '@utils/hooks/useActiveAccount';
import { Dialog, Transition } from '@headlessui/react';
import { useAtom } from 'jotai';

11
src/app/channel/components/messages/item.tsx
View File

@ -1,8 +1,9 @@
import MessageHideButton from '@lume/app/channel/components/messages/hideButton';
import MessageMuteButton from '@lume/app/channel/components/messages/muteButton';
import MessageReplyButton from '@lume/app/channel/components/messages/replyButton';
import ChannelMessageUser from '@lume/app/channel/components/messages/user';
import { noteParser } from '@lume/utils/parser';
import MessageHideButton from '@app/channel/components/messages/hideButton';
import MessageMuteButton from '@app/channel/components/messages/muteButton';
import MessageReplyButton from '@app/channel/components/messages/replyButton';
import ChannelMessageUser from '@app/channel/components/messages/user';
import { noteParser } from '@utils/parser';
import { useMemo } from 'react';

19
src/app/channel/components/messages/muteButton.tsx
View File

@ -1,11 +1,14 @@
import CancelIcon from '@lume/shared/icons/cancel';
import MuteIcon from '@lume/shared/icons/mute';
import { RelayContext } from '@lume/shared/relayProvider';
import { Tooltip } from '@lume/shared/tooltip';
import { channelMessagesAtom } from '@lume/stores/channel';
import { WRITEONLY_RELAYS } from '@lume/stores/constants';
import { dateToUnix } from '@lume/utils/getDate';
import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
import { RelayContext } from '@shared/relayProvider';
import { Tooltip } from '@shared/tooltip';
import CancelIcon from '@icons/cancel';
import MuteIcon from '@icons/mute';
import { channelMessagesAtom } from '@stores/channel';
import { WRITEONLY_RELAYS } from '@stores/constants';
import { dateToUnix } from '@utils/date';
import { useActiveAccount } from '@utils/hooks/useActiveAccount';
import { Dialog, Transition } from '@headlessui/react';
import { useAtom } from 'jotai';

8
src/app/channel/components/messages/replyButton.tsx
View File

@ -1,6 +1,8 @@
import ReplyMessageIcon from '@lume/shared/icons/replyMessage';
import { Tooltip } from '@lume/shared/tooltip';
import { channelReplyAtom } from '@lume/stores/channel';
import { Tooltip } from '@shared/tooltip';
import ReplyMessageIcon from '@icons/replyMessage';
import { channelReplyAtom } from '@stores/channel';
import { useSetAtom } from 'jotai';

10
src/app/channel/components/messages/user.tsx
View File

@ -1,7 +1,9 @@
import { Image } from '@lume/shared/image';
import { DEFAULT_AVATAR, IMGPROXY_URL } from '@lume/stores/constants';
import { useProfile } from '@lume/utils/hooks/useProfile';
import { shortenKey } from '@lume/utils/shortenKey';
import { Image } from '@shared/image';
import { DEFAULT_AVATAR, IMGPROXY_URL } from '@stores/constants';
import { useProfile } from '@utils/hooks/useProfile';
import { shortenKey } from '@utils/shortenKey';
import dayjs from 'dayjs';
import relativeTime from 'dayjs/plugin/relativeTime';

10
src/app/channel/components/messages/userReply.tsx
View File

@ -1,7 +1,9 @@
import { Image } from '@lume/shared/image';
import { DEFAULT_AVATAR, IMGPROXY_URL } from '@lume/stores/constants';
import { useProfile } from '@lume/utils/hooks/useProfile';
import { shortenKey } from '@lume/utils/shortenKey';
import { Image } from '@shared/image';
import { DEFAULT_AVATAR, IMGPROXY_URL } from '@stores/constants';
import { useProfile } from '@utils/hooks/useProfile';
import { shortenKey } from '@utils/shortenKey';
export default function UserReply({ pubkey }: { pubkey: string }) {
const { user, isError, isLoading } = useProfile(pubkey);

11
src/app/channel/components/metadata.tsx
View File

@ -1,7 +1,10 @@
import CopyIcon from '@lume/shared/icons/copy';
import { Image } from '@lume/shared/image';
import { DEFAULT_AVATAR } from '@lume/stores/constants';
import { useChannelProfile } from '@lume/utils/hooks/useChannelProfile';
import { useChannelProfile } from '@app/channel/hooks/useChannelProfile';
import { Image } from '@shared/image';
import CopyIcon from '@icons/copy';
import { DEFAULT_AVATAR } from '@stores/constants';
import { nip19 } from 'nostr-tools';

8
src/app/channel/components/miniMember.tsx
View File

@ -1,6 +1,8 @@
import { Image } from '@lume/shared/image';
import { DEFAULT_AVATAR } from '@lume/stores/constants';
import { useProfile } from '@lume/utils/hooks/useProfile';
import { Image } from '@shared/image';
import { DEFAULT_AVATAR } from '@stores/constants';
import { useProfile } from '@utils/hooks/useProfile';
export default function MiniMember({ pubkey }: { pubkey: string }) {
const { user, isError, isLoading } = useProfile(pubkey);

14
src/app/channel/components/mutedItem.tsx
View File

@ -1,7 +1,9 @@
import { Image } from '@lume/shared/image';
import { DEFAULT_AVATAR } from '@lume/stores/constants';
import { useProfile } from '@lume/utils/hooks/useProfile';
import { shortenKey } from '@lume/utils/shortenKey';
import { Image } from '@shared/image';
import { DEFAULT_AVATAR } from '@stores/constants';
import { useProfile } from '@utils/hooks/useProfile';
import { shortenKey } from '@utils/shortenKey';
import { useState } from 'react';
@ -10,7 +12,7 @@ export default function MutedItem({ data }: { data: any }) {
const [status, setStatus] = useState(data.status);
const unmute = async () => {
const { updateItemInBlacklist } = await import('@lume/utils/storage');
const { updateItemInBlacklist } = await import('@utils/storage');
const res = await updateItemInBlacklist(data.content, 0);
if (res) {
setStatus(0);
@ -18,7 +20,7 @@ export default function MutedItem({ data }: { data: any }) {
};
const mute = async () => {
const { updateItemInBlacklist } = await import('@lume/utils/storage');
const { updateItemInBlacklist } = await import('@utils/storage');
const res = await updateItemInBlacklist(data.content, 1);
if (res) {
setStatus(1);

21
src/app/channel/components/updateModal.tsx
View File

@ -1,12 +1,15 @@
import { AvatarUploader } from '@lume/shared/avatarUploader';
import CancelIcon from '@lume/shared/icons/cancel';
import EditIcon from '@lume/shared/icons/edit';
import { Image } from '@lume/shared/image';
import { RelayContext } from '@lume/shared/relayProvider';
import { DEFAULT_AVATAR, WRITEONLY_RELAYS } from '@lume/stores/constants';
import { dateToUnix } from '@lume/utils/getDate';
import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
import { getChannel, updateChannelMetadata } from '@lume/utils/storage';
import { AvatarUploader } from '@shared/avatarUploader';
import { Image } from '@shared/image';
import { RelayContext } from '@shared/relayProvider';
import CancelIcon from '@icons/cancel';
import EditIcon from '@icons/edit';
import { DEFAULT_AVATAR, WRITEONLY_RELAYS } from '@stores/constants';
import { dateToUnix } from '@utils/date';
import { useActiveAccount } from '@utils/hooks/useActiveAccount';
import { getChannel, updateChannelMetadata } from '@utils/storage';
import { Dialog, Transition } from '@headlessui/react';
import { getEventHash, signEvent } from 'nostr-tools';

8
src/utils/hooks/useChannelProfile.tsx → src/app/channel/hooks/useChannelProfile.tsx
View File

@ -1,6 +1,8 @@
import { RelayContext } from '@lume/shared/relayProvider';
import { READONLY_RELAYS } from '@lume/stores/constants';
import { getChannel } from '@lume/utils/storage';
import { RelayContext } from '@shared/relayProvider';
import { READONLY_RELAYS } from '@stores/constants';
import { getChannel } from '@utils/storage';
import { useContext } from 'react';
import useSWR from 'swr';

6
src/app/channel/layout.tsx
View File

@ -1,6 +1,6 @@
import AppHeader from '@lume/shared/appHeader';
import MultiAccounts from '@lume/shared/multiAccounts';
import Navigation from '@lume/shared/navigation';
import AppHeader from '@shared/appHeader';
import MultiAccounts from '@shared/multiAccounts';
import Navigation from '@shared/navigation';
export function LayoutChannel({ children }: { children: React.ReactNode }) {
return (

33
src/app/channel/pages/index.page.tsx
View File

@ -1,16 +1,19 @@
import ChannelBlackList from '@lume/app/channel/components/blacklist';
import ChannelMembers from '@lume/app/channel/components/members';
import ChannelMessageForm from '@lume/app/channel/components/messages/form';
import ChannelMetadata from '@lume/app/channel/components/metadata';
import ChannelUpdateModal from '@lume/app/channel/components/updateModal';
import { RelayContext } from '@lume/shared/relayProvider';
import { channelMessagesAtom, channelReplyAtom } from '@lume/stores/channel';
import { READONLY_RELAYS } from '@lume/stores/constants';
import { dateToUnix, hoursAgo } from '@lume/utils/getDate';
import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
import { usePageContext } from '@lume/utils/hooks/usePageContext';
import { getActiveBlacklist, getBlacklist } from '@lume/utils/storage';
import { arrayObjToPureArr } from '@lume/utils/transform';
import ChannelBlackList from '@app/channel/components/blacklist';
import ChannelMembers from '@app/channel/components/members';
import ChannelMessageForm from '@app/channel/components/messages/form';
import ChannelMetadata from '@app/channel/components/metadata';
import ChannelUpdateModal from '@app/channel/components/updateModal';
import { RelayContext } from '@shared/relayProvider';
import { channelMessagesAtom, channelReplyAtom } from '@stores/channel';
import { READONLY_RELAYS } from '@stores/constants';
import { dateToUnix, getHourAgo } from '@utils/date';
import { useActiveAccount } from '@utils/hooks/useActiveAccount';
import { usePageContext } from '@utils/hooks/usePageContext';
import { getActiveBlacklist, getBlacklist } from '@utils/storage';
import { arrayObjToPureArr } from '@utils/transform';
import { useSetAtom } from 'jotai';
import { useResetAtom } from 'jotai/utils';
@ -30,7 +33,7 @@ const fetchHided = async ([, id]) => {
return array;
};
const ChannelMessageList = lazy(() => import('@lume/app/channel/components/messageList'));
const ChannelMessageList = lazy(() => import('@app/channel/components/messageList'));
export function Page() {
const pool: any = useContext(RelayContext);
@ -57,7 +60,7 @@ export function Page() {
{
'#e': [key],
kinds: [42],
since: dateToUnix(hoursAgo(24, now.current)),
since: dateToUnix(getHourAgo(24, now.current)),
limit: 20,
},
],

12
src/app/chat/components/item.tsx
View File

@ -1,8 +1,10 @@
import { Image } from '@lume/shared/image';
import { DEFAULT_AVATAR } from '@lume/stores/constants';
import { usePageContext } from '@lume/utils/hooks/usePageContext';
import { useProfile } from '@lume/utils/hooks/useProfile';
import { shortenKey } from '@lume/utils/shortenKey';
import { Image } from '@shared/image';
import { DEFAULT_AVATAR } from '@stores/constants';
import { usePageContext } from '@utils/hooks/usePageContext';
import { useProfile } from '@utils/hooks/useProfile';
import { shortenKey } from '@utils/shortenKey';
import { twMerge } from 'tailwind-merge';

9
src/app/chat/components/list.tsx
View File

@ -1,7 +1,8 @@
import ChatsListItem from '@lume/app/chat/components/item';
import ChatsListSelfItem from '@lume/app/chat/components/self';
import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
import { getChats } from '@lume/utils/storage';
import ChatsListItem from '@app/chat/components/item';
import ChatsListSelfItem from '@app/chat/components/self';
import { useActiveAccount } from '@utils/hooks/useActiveAccount';
import { getChats } from '@utils/storage';
import useSWR from 'swr';

8
src/app/chat/components/messageList.tsx
View File

@ -1,6 +1,8 @@
import { ChatMessageItem } from '@lume/app/chat/components/messages/item';
import { sortedChatMessagesAtom } from '@lume/stores/chat';
import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
import { ChatMessageItem } from '@app/chat/components/messages/item';
import { sortedChatMessagesAtom } from '@stores/chat';
import { useActiveAccount } from '@utils/hooks/useActiveAccount';
import { useAtomValue } from 'jotai';
import { useCallback, useRef } from 'react';

14
src/app/chat/components/messages/form.tsx
View File

@ -1,9 +1,11 @@
import { ImagePicker } from '@lume/shared/form/imagePicker';
import { RelayContext } from '@lume/shared/relayProvider';
import { chatContentAtom } from '@lume/stores/chat';
import { WRITEONLY_RELAYS } from '@lume/stores/constants';
import { dateToUnix } from '@lume/utils/getDate';
import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
import { ImagePicker } from '@shared/form/imagePicker';
import { RelayContext } from '@shared/relayProvider';
import { chatContentAtom } from '@stores/chat';
import { WRITEONLY_RELAYS } from '@stores/constants';
import { dateToUnix } from '@utils/date';
import { useActiveAccount } from '@utils/hooks/useActiveAccount';
import { useAtom } from 'jotai';
import { useResetAtom } from 'jotai/utils';

11
src/app/chat/components/messages/item.tsx
View File

@ -1,8 +1,9 @@
import ChatMessageUser from '@lume/app/chat/components/messages/user';
import ImagePreview from '@lume/app/note/components/preview/image';
import VideoPreview from '@lume/app/note/components/preview/video';
import { useDecryptMessage } from '@lume/utils/hooks/useDecryptMessage';
import { noteParser } from '@lume/utils/parser';
import ChatMessageUser from '@app/chat/components/messages/user';
import { useDecryptMessage } from '@app/chat/hooks/useDecryptMessage';
import ImagePreview from '@app/note/components/preview/image';
import VideoPreview from '@app/note/components/preview/video';
import { noteParser } from '@utils/parser';
import { memo } from 'react';

10
src/app/chat/components/messages/user.tsx
View File

@ -1,7 +1,9 @@
import { Image } from '@lume/shared/image';
import { DEFAULT_AVATAR, IMGPROXY_URL } from '@lume/stores/constants';
import { useProfile } from '@lume/utils/hooks/useProfile';
import { shortenKey } from '@lume/utils/shortenKey';
import { Image } from '@shared/image';
import { DEFAULT_AVATAR, IMGPROXY_URL } from '@stores/constants';
import { useProfile } from '@utils/hooks/useProfile';
import { shortenKey } from '@utils/shortenKey';
import dayjs from 'dayjs';
import relativeTime from 'dayjs/plugin/relativeTime';

12
src/app/chat/components/self.tsx
View File

@ -1,8 +1,10 @@
import { Image } from '@lume/shared/image';
import { DEFAULT_AVATAR } from '@lume/stores/constants';
import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
import { usePageContext } from '@lume/utils/hooks/usePageContext';
import { shortenKey } from '@lume/utils/shortenKey';
import { Image } from '@shared/image';
import { DEFAULT_AVATAR } from '@stores/constants';
import { useActiveAccount } from '@utils/hooks/useActiveAccount';
import { usePageContext } from '@utils/hooks/usePageContext';
import { shortenKey } from '@utils/shortenKey';
import { twMerge } from 'tailwind-merge';

0
src/utils/hooks/useDecryptMessage.tsx → src/app/chat/hooks/useDecryptMessage.tsx
View File

6
src/app/chat/layout.tsx
View File

@ -1,6 +1,6 @@
import AppHeader from '@lume/shared/appHeader';
import MultiAccounts from '@lume/shared/multiAccounts';
import Navigation from '@lume/shared/navigation';
import AppHeader from '@shared/appHeader';
import MultiAccounts from '@shared/multiAccounts';
import Navigation from '@shared/navigation';
export function LayoutChat({ children }: { children: React.ReactNode }) {
return (

17
src/app/chat/pages/index.page.tsx
View File

@ -1,16 +1,19 @@
import ChatMessageForm from '@lume/app/chat/components/messages/form';
import { RelayContext } from '@lume/shared/relayProvider';
import { chatMessagesAtom } from '@lume/stores/chat';
import { READONLY_RELAYS } from '@lume/stores/constants';
import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
import { usePageContext } from '@lume/utils/hooks/usePageContext';
import ChatMessageForm from '@app/chat/components/messages/form';
import { RelayContext } from '@shared/relayProvider';
import { chatMessagesAtom } from '@stores/chat';
import { READONLY_RELAYS } from '@stores/constants';
import { useActiveAccount } from '@utils/hooks/useActiveAccount';
import { usePageContext } from '@utils/hooks/usePageContext';
import { useSetAtom } from 'jotai';
import { useResetAtom } from 'jotai/utils';
import { Suspense, lazy, useContext, useEffect } from 'react';
import useSWRSubscription from 'swr/subscription';
const ChatMessageList = lazy(() => import('@lume/app/chat/components/messageList'));
const ChatMessageList = lazy(() => import('@app/chat/components/messageList'));
export function Page() {
const pool: any = useContext(RelayContext);

2
src/app/index/pages/index.page.tsx
View File

@ -1,4 +1,4 @@
import { getActiveAccount } from '@lume/utils/storage';
import { getActiveAccount } from '@utils/storage';
import useSWR from 'swr';
import { navigate } from 'vite-plugin-ssr/client/router';

21
src/app/inital-data/pages/index.page.tsx
View File

@ -1,7 +1,10 @@
import LumeIcon from '@lume/shared/icons/lume';
import { RelayContext } from '@lume/shared/relayProvider';
import { READONLY_RELAYS } from '@lume/stores/constants';
import { dateToUnix, hoursAgo } from '@lume/utils/getDate';
import { RelayContext } from '@shared/relayProvider';
import LumeIcon from '@icons/lume';
import { READONLY_RELAYS } from '@stores/constants';
import { dateToUnix, getHourAgo } from '@utils/date';
import {
addToBlacklist,
countTotalLongNotes,
@ -11,8 +14,8 @@ import {
getActiveAccount,
getLastLogin,
updateLastLogin,
} from '@lume/utils/storage';
import { getParentID, nip02ToArray } from '@lume/utils/transform';
} from '@utils/storage';
import { getParentID, nip02ToArray } from '@utils/transform';
import { useContext, useEffect, useRef } from 'react';
import { navigate } from 'vite-plugin-ssr/client/router';
@ -38,12 +41,12 @@ export function Page() {
let sinceLongNotes: number;
if (notes === 0) {
sinceNotes = dateToUnix(hoursAgo(48, now.current));
sinceNotes = dateToUnix(getHourAgo(48, now.current));
} else {
if (parseInt(lastLogin) > 0) {
sinceNotes = parseInt(lastLogin);
} else {
sinceNotes = dateToUnix(hoursAgo(48, now.current));
sinceNotes = dateToUnix(getHourAgo(48, now.current));
}
}
@ -174,7 +177,7 @@ export function Page() {
() => {
updateLastLogin(dateToUnix(now.current));
timeout = setTimeout(() => {
navigate('/app/daily', { overwriteLastHistoryEntry: true });
navigate('/app/radar', { overwriteLastHistoryEntry: true });
}, 5000);
}
);

17
src/app/note/components/base.tsx
View File

@ -1,11 +1,12 @@
import { Kind1 } from '@lume/app/note/components/kind1';
import { Kind1063 } from '@lume/app/note/components/kind1063';
import NoteMetadata from '@lume/app/note/components/metadata';
import { NoteParent } from '@lume/app/note/components/parent';
import { NoteDefaultUser } from '@lume/app/note/components/user/default';
import { NoteWrapper } from '@lume/app/note/components/wrapper';
import { noteParser } from '@lume/utils/parser';
import { isTagsIncludeID } from '@lume/utils/transform';
import { Kind1 } from '@app/note/components/kind1';
import { Kind1063 } from '@app/note/components/kind1063';
import NoteMetadata from '@app/note/components/metadata';
import { NoteParent } from '@app/note/components/parent';
import { NoteDefaultUser } from '@app/note/components/user/default';
import { NoteWrapper } from '@app/note/components/wrapper';
import { noteParser } from '@utils/parser';
import { isTagsIncludeID } from '@utils/transform';
import { useMemo } from 'react';

8
src/app/note/components/kind1.tsx
View File

@ -1,7 +1,7 @@
import { MentionNote } from '@lume/app/note/components/mentions/note';
import { MentionUser } from '@lume/app/note/components/mentions/user';
import ImagePreview from '@lume/app/note/components/preview/image';
import VideoPreview from '@lume/app/note/components/preview/video';
import { MentionNote } from '@app/note/components/mentions/note';
import { MentionUser } from '@app/note/components/mentions/user';
import ImagePreview from '@app/note/components/preview/image';
import VideoPreview from '@app/note/components/preview/video';
import ReactMarkdown from 'react-markdown';
import remarkGfm from 'remark-gfm';

2
src/app/note/components/kind1063.tsx
View File

@ -1,4 +1,4 @@
import { Image } from '@lume/shared/image';
import { Image } from '@shared/image';
function isImage(url: string) {
return /\.(jpg|jpeg|gif|png|webp|avif)$/.test(url);

19
src/app/note/components/mentions/note.tsx
View File

@ -1,11 +1,14 @@
import { Kind1 } from '@lume/app/note/components/kind1';
import { Kind1063 } from '@lume/app/note/components/kind1063';
import { NoteSkeleton } from '@lume/app/note/components/skeleton';
import { NoteDefaultUser } from '@lume/app/note/components/user/default';
import { NoteWrapper } from '@lume/app/note/components/wrapper';
import { RelayContext } from '@lume/shared/relayProvider';
import { READONLY_RELAYS } from '@lume/stores/constants';
import { noteParser } from '@lume/utils/parser';
import { Kind1 } from '@app/note/components/kind1';
import { Kind1063 } from '@app/note/components/kind1063';
import { NoteSkeleton } from '@app/note/components/skeleton';
import { NoteDefaultUser } from '@app/note/components/user/default';
import { NoteWrapper } from '@app/note/components/wrapper';
import { RelayContext } from '@shared/relayProvider';
import { READONLY_RELAYS } from '@stores/constants';
import { noteParser } from '@utils/parser';
import { memo, useContext } from 'react';
import useSWRSubscription from 'swr/subscription';

4
src/app/note/components/mentions/user.tsx
View File

@ -1,5 +1,5 @@
import { useProfile } from '@lume/utils/hooks/useProfile';
import { shortenKey } from '@lume/utils/shortenKey';
import { useProfile } from '@utils/hooks/useProfile';
import { shortenKey } from '@utils/shortenKey';
export function MentionUser(props: { children: any[] }) {
const pubkey = props.children[0];

15
src/app/note/components/metadata.tsx
View File

@ -1,9 +1,12 @@
import NoteLike from '@lume/app/note/components/metadata/like';
import NoteReply from '@lume/app/note/components/metadata/reply';
import NoteRepost from '@lume/app/note/components/metadata/repost';
import ZapIcon from '@lume/shared/icons/zap';
import { RelayContext } from '@lume/shared/relayProvider';
import { READONLY_RELAYS } from '@lume/stores/constants';
import NoteLike from '@app/note/components/metadata/like';
import NoteReply from '@app/note/components/metadata/reply';
import NoteRepost from '@app/note/components/metadata/repost';
import { RelayContext } from '@shared/relayProvider';
import ZapIcon from '@icons/zap';
import { READONLY_RELAYS } from '@stores/constants';
import { useContext, useState } from 'react';
import useSWRSubscription from 'swr/subscription';

13
src/app/note/components/metadata/like.tsx
View File

@ -1,8 +1,11 @@
import LikeIcon from '@lume/shared/icons/like';
import { RelayContext } from '@lume/shared/relayProvider';
import { WRITEONLY_RELAYS } from '@lume/stores/constants';
import { dateToUnix } from '@lume/utils/getDate';
import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
import { RelayContext } from '@shared/relayProvider';
import LikeIcon from '@icons/like';
import { WRITEONLY_RELAYS } from '@stores/constants';
import { dateToUnix } from '@utils/date';
import { useActiveAccount } from '@utils/hooks/useActiveAccount';
import { getEventHash, signEvent } from 'nostr-tools';
import { useContext, useEffect, useState } from 'react';

15
src/app/note/components/metadata/reply.tsx
View File

@ -1,9 +1,12 @@
import ReplyIcon from '@lume/shared/icons/reply';
import { Image } from '@lume/shared/image';
import { RelayContext } from '@lume/shared/relayProvider';
import { WRITEONLY_RELAYS } from '@lume/stores/constants';
import { dateToUnix } from '@lume/utils/getDate';
import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
import { Image } from '@shared/image';
import { RelayContext } from '@shared/relayProvider';
import ReplyIcon from '@icons/reply';
import { WRITEONLY_RELAYS } from '@stores/constants';
import { dateToUnix } from '@utils/date';
import { useActiveAccount } from '@utils/hooks/useActiveAccount';
import { Dialog, Transition } from '@headlessui/react';
import { getEventHash, signEvent } from 'nostr-tools';

13
src/app/note/components/metadata/repost.tsx
View File

@ -1,8 +1,11 @@
import RepostIcon from '@lume/shared/icons/repost';
import { RelayContext } from '@lume/shared/relayProvider';
import { WRITEONLY_RELAYS } from '@lume/stores/constants';
import { dateToUnix } from '@lume/utils/getDate';
import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
import { RelayContext } from '@shared/relayProvider';
import RepostIcon from '@icons/repost';
import { WRITEONLY_RELAYS } from '@stores/constants';
import { dateToUnix } from '@utils/date';
import { useActiveAccount } from '@utils/hooks/useActiveAccount';
import { getEventHash, signEvent } from 'nostr-tools';
import { useContext, useEffect, useState } from 'react';

19
src/app/note/components/parent.tsx
View File

@ -1,11 +1,14 @@
import { Kind1 } from '@lume/app/note/components/kind1';
import { Kind1063 } from '@lume/app/note/components/kind1063';
import NoteMetadata from '@lume/app/note/components/metadata';
import { NoteSkeleton } from '@lume/app/note/components/skeleton';
import { NoteDefaultUser } from '@lume/app/note/components/user/default';
import { RelayContext } from '@lume/shared/relayProvider';
import { READONLY_RELAYS } from '@lume/stores/constants';
import { noteParser } from '@lume/utils/parser';
import { Kind1 } from '@app/note/components/kind1';
import { Kind1063 } from '@app/note/components/kind1063';
import NoteMetadata from '@app/note/components/metadata';
import { NoteSkeleton } from '@app/note/components/skeleton';
import { NoteDefaultUser } from '@app/note/components/user/default';
import { RelayContext } from '@shared/relayProvider';
import { READONLY_RELAYS } from '@stores/constants';
import { noteParser } from '@utils/parser';
import { memo, useContext } from 'react';
import useSWRSubscription from 'swr/subscription';

2
src/app/note/components/preview/image.tsx
View File

@ -1,4 +1,4 @@
import { Image } from '@lume/shared/image';
import { Image } from '@shared/image';
export default function ImagePreview({ urls }: { urls: string[] }) {
return (

9
src/app/note/components/quoteRepost.tsx
View File

@ -1,7 +1,8 @@
import { RootNote } from '@lume/app/note/components/rootNote';
import { NoteRepostUser } from '@lume/app/note/components/user/repost';
import { NoteWrapper } from '@lume/app/note/components/wrapper';
import { getQuoteID } from '@lume/utils/transform';
import { RootNote } from '@app/note/components/rootNote';
import { NoteRepostUser } from '@app/note/components/user/repost';
import { NoteWrapper } from '@app/note/components/wrapper';
import { getQuoteID } from '@utils/transform';
export function NoteQuoteRepost({ event }: { event: any }) {
const rootID = getQuoteID(event.tags);

12
src/app/note/components/replies/form.tsx
View File

@ -1,8 +1,10 @@
import { Image } from '@lume/shared/image';
import { RelayContext } from '@lume/shared/relayProvider';
import { WRITEONLY_RELAYS } from '@lume/stores/constants';
import { dateToUnix } from '@lume/utils/getDate';
import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
import { Image } from '@shared/image';
import { RelayContext } from '@shared/relayProvider';
import { WRITEONLY_RELAYS } from '@stores/constants';
import { dateToUnix } from '@utils/date';
import { useActiveAccount } from '@utils/hooks/useActiveAccount';
import { getEventHash, signEvent } from 'nostr-tools';
import { useContext, useState } from 'react';

7
src/app/note/components/replies/item.tsx
View File

@ -1,6 +1,7 @@
import { Kind1 } from '@lume/app/note/components/kind1';
import NoteReplyUser from '@lume/app/note/components/user/reply';
import { noteParser } from '@lume/utils/parser';
import { Kind1 } from '@app/note/components/kind1';
import NoteReplyUser from '@app/note/components/user/reply';
import { noteParser } from '@utils/parser';
export default function Reply({ data }: { data: any }) {
const content = noteParser(data);

13
src/app/note/components/replies/list.tsx
View File

@ -1,8 +1,11 @@
import NoteReplyForm from '@lume/app/note/components/replies/form';
import Reply from '@lume/app/note/components/replies/item';
import { RelayContext } from '@lume/shared/relayProvider';
import { READONLY_RELAYS } from '@lume/stores/constants';
import { sortEvents } from '@lume/utils/transform';
import NoteReplyForm from '@app/note/components/replies/form';
import Reply from '@app/note/components/replies/item';
import { RelayContext } from '@shared/relayProvider';
import { READONLY_RELAYS } from '@stores/constants';
import { sortEvents } from '@utils/transform';
import { useContext } from 'react';
import useSWRSubscription from 'swr/subscription';

19
src/app/note/components/rootNote.tsx
View File

@ -1,11 +1,14 @@
import { Kind1 } from '@lume/app/note/components/kind1';
import { Kind1063 } from '@lume/app/note/components/kind1063';
import NoteMetadata from '@lume/app/note/components/metadata';
import { NoteSkeleton } from '@lume/app/note/components/skeleton';
import { NoteDefaultUser } from '@lume/app/note/components/user/default';
import { RelayContext } from '@lume/shared/relayProvider';
import { READONLY_RELAYS } from '@lume/stores/constants';
import { noteParser } from '@lume/utils/parser';
import { Kind1 } from '@app/note/components/kind1';
import { Kind1063 } from '@app/note/components/kind1063';
import NoteMetadata from '@app/note/components/metadata';
import { NoteSkeleton } from '@app/note/components/skeleton';
import { NoteDefaultUser } from '@app/note/components/user/default';
import { RelayContext } from '@shared/relayProvider';
import { READONLY_RELAYS } from '@stores/constants';
import { noteParser } from '@utils/parser';
import { memo, useContext } from 'react';
import useSWRSubscription from 'swr/subscription';

10
src/app/note/components/user/default.tsx
View File

@ -1,7 +1,9 @@
import { Image } from '@lume/shared/image';
import { DEFAULT_AVATAR, IMGPROXY_URL } from '@lume/stores/constants';
import { useProfile } from '@lume/utils/hooks/useProfile';
import { shortenKey } from '@lume/utils/shortenKey';
import { Image } from '@shared/image';
import { DEFAULT_AVATAR, IMGPROXY_URL } from '@stores/constants';
import { useProfile } from '@utils/hooks/useProfile';
import { shortenKey } from '@utils/shortenKey';
import dayjs from 'dayjs';
import relativeTime from 'dayjs/plugin/relativeTime';

10
src/app/note/components/user/reply.tsx
View File

@ -1,7 +1,9 @@
import { Image } from '@lume/shared/image';
import { DEFAULT_AVATAR, IMGPROXY_URL } from '@lume/stores/constants';
import { useProfile } from '@lume/utils/hooks/useProfile';
import { shortenKey } from '@lume/utils/shortenKey';
import { Image } from '@shared/image';
import { DEFAULT_AVATAR, IMGPROXY_URL } from '@stores/constants';
import { useProfile } from '@utils/hooks/useProfile';
import { shortenKey } from '@utils/shortenKey';
import dayjs from 'dayjs';
import relativeTime from 'dayjs/plugin/relativeTime';

8
src/app/note/components/user/repost.tsx
View File

@ -1,6 +1,8 @@
import { Image } from '@lume/shared/image';
import { DEFAULT_AVATAR, IMGPROXY_URL } from '@lume/stores/constants';
import { useProfile } from '@lume/utils/hooks/useProfile';
import { Image } from '@shared/image';
import { DEFAULT_AVATAR, IMGPROXY_URL } from '@stores/constants';
import { useProfile } from '@utils/hooks/useProfile';
import dayjs from 'dayjs';
import relativeTime from 'dayjs/plugin/relativeTime';

6
src/app/note/layout.tsx
View File

@ -1,6 +1,6 @@
import AppHeader from '@lume/shared/appHeader';
import MultiAccounts from '@lume/shared/multiAccounts';
import Navigation from '@lume/shared/navigation';
import AppHeader from '@shared/appHeader';
import MultiAccounts from '@shared/multiAccounts';
import Navigation from '@shared/navigation';
export function LayoutNewsfeed({ children }: { children: React.ReactNode }) {
return (

19
src/app/note/pages/index.page.tsx
View File

@ -1,11 +1,14 @@
import { Kind1 } from '@lume/app/note/components/kind1';
import NoteMetadata from '@lume/app/note/components/metadata';
import RepliesList from '@lume/app/note/components/replies/list';
import { NoteDefaultUser } from '@lume/app/note/components/user/default';
import { RelayContext } from '@lume/shared/relayProvider';
import { READONLY_RELAYS } from '@lume/stores/constants';
import { usePageContext } from '@lume/utils/hooks/usePageContext';
import { noteParser } from '@lume/utils/parser';
import { Kind1 } from '@app/note/components/kind1';
import NoteMetadata from '@app/note/components/metadata';
import RepliesList from '@app/note/components/replies/list';
import { NoteDefaultUser } from '@app/note/components/user/default';
import { RelayContext } from '@shared/relayProvider';
import { READONLY_RELAYS } from '@stores/constants';
import { usePageContext } from '@utils/hooks/usePageContext';
import { noteParser } from '@utils/parser';
import { useContext } from 'react';
import useSWRSubscription from 'swr/subscription';

0
src/app/daily/_default.page.tsx → src/app/radar/_default.page.tsx
View File

2
src/app/daily/components/header.tsx → src/app/radar/components/header.tsx
View File

@ -1,4 +1,4 @@
import { CreateViewModal } from '@lume/app/daily/components/views/createModal';
import { CreateViewModal } from '@app/radar/components/views/createModal';
export function Header() {
return (

4
src/app/daily/components/views/createModal.tsx → src/app/radar/components/views/createModal.tsx
View File

@ -1,5 +1,5 @@
import CancelIcon from '@lume/shared/icons/cancel';
import PlusIcon from '@lume/shared/icons/plus';
import CancelIcon from '@icons/cancel';
import PlusIcon from '@icons/plus';
import { Dialog, Transition } from '@headlessui/react';
import { Fragment, useState } from 'react';

6
src/app/daily/layout.tsx → src/app/radar/layout.tsx
View File

@ -1,6 +1,6 @@
import AppHeader from '@lume/shared/appHeader';
import MultiAccounts from '@lume/shared/multiAccounts';
import Navigation from '@lume/shared/navigation';
import AppHeader from '@shared/appHeader';
import MultiAccounts from '@shared/multiAccounts';
import Navigation from '@shared/navigation';
export function LayoutNewsfeed({ children }: { children: React.ReactNode }) {
return (

11
src/app/daily/pages/index.page.tsx → src/app/radar/pages/index.page.tsx
View File

@ -1,8 +1,9 @@
import { Header } from '@lume/app/daily/components/header';
import { NoteBase } from '@lume/app/note/components/base';
import { NoteQuoteRepost } from '@lume/app/note/components/quoteRepost';
import { NoteSkeleton } from '@lume/app/note/components/skeleton';
import { getNotes } from '@lume/utils/storage';
import { NoteBase } from '@app/note/components/base';
import { NoteQuoteRepost } from '@app/note/components/quoteRepost';
import { NoteSkeleton } from '@app/note/components/skeleton';
import { Header } from '@app/radar/components/header';
import { getNotes } from '@utils/storage';
import { useInfiniteQuery } from '@tanstack/react-query';
import { useVirtualizer } from '@tanstack/react-virtual';

2
src/app/myspace/pages/index.page.tsx → src/app/space/pages/index.page.tsx
View File

@ -1,7 +1,7 @@
export function Page() {
return (
<div>
<p>MySpace</p>
<p>Space</p>
</div>
);
}

10
src/auth/components/user.tsx
View File

@ -1,7 +1,9 @@
import { Image } from '@lume/shared/image';
import { DEFAULT_AVATAR } from '@lume/stores/constants';
import { useProfile } from '@lume/utils/hooks/useProfile';
import { shortenKey } from '@lume/utils/shortenKey';
import { Image } from '@shared/image';
import { DEFAULT_AVATAR } from '@stores/constants';
import { useProfile } from '@utils/hooks/useProfile';
import { shortenKey } from '@utils/shortenKey';
export default function User({ pubkey }: { pubkey: string }) {
const { user } = useProfile(pubkey);

4
src/auth/layout.tsx
View File

@ -1,5 +1,5 @@
import ArrowLeftIcon from '@lume/shared/icons/arrowLeft';
import ArrowRightIcon from '@lume/shared/icons/arrowRight';
import ArrowLeftIcon from '@icons/arrowLeft';
import ArrowRightIcon from '@icons/arrowRight';
import useSWR from 'swr';

7
src/auth/pages/create/index.page.tsx
View File

@ -1,6 +1,7 @@
import EyeOffIcon from '@lume/shared/icons/eyeOff';
import EyeOnIcon from '@lume/shared/icons/eyeOn';
import { onboardingAtom } from '@lume/stores/onboarding';
import EyeOffIcon from '@icons/eyeOff';
import EyeOnIcon from '@icons/eyeOn';
import { onboardingAtom } from '@stores/onboarding';
import { useSetAtom } from 'jotai';
import { generatePrivateKey, getPublicKey, nip19 } from 'nostr-tools';

9
src/auth/pages/create/step-2/index.page.tsx
View File

@ -1,7 +1,8 @@
import { AvatarUploader } from '@lume/shared/avatarUploader';
import { Image } from '@lume/shared/image';
import { DEFAULT_AVATAR } from '@lume/stores/constants';
import { onboardingAtom } from '@lume/stores/onboarding';
import { AvatarUploader } from '@shared/avatarUploader';
import { Image } from '@shared/image';
import { DEFAULT_AVATAR } from '@stores/constants';
import { onboardingAtom } from '@stores/onboarding';
import { useAtom } from 'jotai';
import { useEffect, useState } from 'react';

18
src/auth/pages/create/step-3/index.page.tsx
View File

@ -1,16 +1,20 @@
import User from '@lume/auth/components/user';
import CheckCircleIcon from '@lume/shared/icons/checkCircle';
import { RelayContext } from '@lume/shared/relayProvider';
import { WRITEONLY_RELAYS } from '@lume/stores/constants';
import { onboardingAtom } from '@lume/stores/onboarding';
import { createAccount, createPleb } from '@lume/utils/storage';
import { arrayToNIP02 } from '@lume/utils/transform';
import { RelayContext } from '@shared/relayProvider';
import CheckCircleIcon from '@icons/checkCircle';
import { WRITEONLY_RELAYS } from '@stores/constants';
import { onboardingAtom } from '@stores/onboarding';
import { createAccount, createPleb } from '@utils/storage';
import { arrayToNIP02 } from '@utils/transform';
import { useAtom } from 'jotai';
import { getEventHash, signEvent } from 'nostr-tools';
import { useContext, useState } from 'react';
import { navigate } from 'vite-plugin-ssr/client/router';
import User from '../../../components/user';
const initialList = [
{ pubkey: '82341f882b6eabcd2ba7f1ef90aad961cf074af15b9ef44a09f9d2a8fbfbe6a2' },
{ pubkey: 'a341f45ff9758f570a21b000c17d4e53a3a497c8397f26c0e6d61e5acffc7a98' },

2
src/auth/pages/import/index.page.tsx
View File

@ -1,4 +1,4 @@
import { onboardingAtom } from '@lume/stores/onboarding';
import { onboardingAtom } from '@stores/onboarding';
import { useSetAtom } from 'jotai';
import { getPublicKey, nip19 } from 'nostr-tools';

14
src/auth/pages/import/step-2/index.page.tsx
View File

@ -1,9 +1,11 @@
import { Image } from '@lume/shared/image';
import { RelayContext } from '@lume/shared/relayProvider';
import { DEFAULT_AVATAR, READONLY_RELAYS } from '@lume/stores/constants';
import { onboardingAtom } from '@lume/stores/onboarding';
import { shortenKey } from '@lume/utils/shortenKey';
import { createAccount, createPleb } from '@lume/utils/storage';
import { Image } from '@shared/image';
import { RelayContext } from '@shared/relayProvider';
import { DEFAULT_AVATAR, READONLY_RELAYS } from '@stores/constants';
import { onboardingAtom } from '@stores/onboarding';
import { shortenKey } from '@utils/shortenKey';
import { createAccount, createPleb } from '@utils/storage';
import { useAtom } from 'jotai';
import { getPublicKey } from 'nostr-tools';

5
src/auth/pages/index/index.page.tsx
View File

@ -1,5 +1,6 @@
import ArrowRightIcon from '@lume/shared/icons/arrowRight';
import { Image } from '@lume/shared/image';
import { Image } from '@shared/image';
import ArrowRightIcon from '@icons/arrowRight';
const PLEBS = [
'https://133332.xyz/p.jpg',

8
src/renderer/_default.page.client.tsx
View File

@ -1,11 +1,11 @@
import '@lume/renderer/index.css';
import { Shell } from '@lume/renderer/shell';
import { PageContextClient } from '@lume/renderer/types';
import { StrictMode } from 'react';
import { Root, createRoot, hydrateRoot } from 'react-dom/client';
import 'vidstack/styles/defaults.css';
import './index.css';
import { Shell } from './shell';
import { PageContextClient } from './types';
export const clientRouting = true;
export const hydrationCanBeAborted = true;

6
src/renderer/_default.page.server.tsx
View File

@ -1,10 +1,10 @@
import { Shell } from '@lume/renderer/shell';
import { PageContextServer } from '@lume/renderer/types';
import { StrictMode } from 'react';
import ReactDOMServer from 'react-dom/server';
import { dangerouslySkipEscape, escapeInject } from 'vite-plugin-ssr/server';
import { Shell } from './shell';
import { PageContextServer } from './types';
export const passToClient = ['pageProps'];
export function render(pageContext: PageContextServer) {

7
src/renderer/shell.tsx
View File

@ -1,10 +1,11 @@
import { PageContext } from '@lume/renderer/types';
import { RelayProvider } from '@lume/shared/relayProvider';
import { PageContextProvider } from '@lume/utils/hooks/usePageContext';
import { RelayProvider } from '@shared/relayProvider';
import { PageContextProvider } from '@utils/hooks/usePageContext';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { LayoutDefault } from './layoutDefault';
import { PageContext } from './types';
const queryClient = new QueryClient();

5
src/shared/accounts/active.tsx
View File

@ -1,5 +1,6 @@
import { Image } from '@lume/shared/image';
import { DEFAULT_AVATAR } from '@lume/stores/constants';
import { Image } from '@shared/image';
import { DEFAULT_AVATAR } from '@stores/constants';
export default function ActiveAccount({ user }: { user: any }) {
const userData = JSON.parse(user.metadata);

5
src/shared/accounts/inactive.tsx
View File

@ -1,5 +1,6 @@
import { Image } from '@lume/shared/image';
import { DEFAULT_AVATAR } from '@lume/stores/constants';
import { Image } from '@shared/image';
import { DEFAULT_AVATAR } from '@stores/constants';
export default function InactiveAccount({ user }: { user: any }) {
const userData = JSON.parse(user.metadata);

2
src/shared/activeLink.tsx
View File

@ -1,4 +1,4 @@
import { usePageContext } from '@lume/utils/hooks/usePageContext';
import { usePageContext } from '@utils/hooks/usePageContext';
import { twMerge } from 'tailwind-merge';

6
src/shared/appHeader.tsx
View File

@ -1,6 +1,6 @@
import ArrowLeftIcon from '@lume/shared/icons/arrowLeft';
import ArrowRightIcon from '@lume/shared/icons/arrowRight';
import RefreshIcon from '@lume/shared/icons/refresh';
import ArrowLeftIcon from '@icons/arrowLeft';
import ArrowRightIcon from '@icons/arrowRight';
import RefreshIcon from '@icons/refresh';
export default function AppHeader() {
const goBack = () => {

2
src/shared/avatarUploader.tsx
View File

@ -1,4 +1,4 @@
import { createBlobFromFile } from '@lume/utils/createBlobFromFile';
import { createBlobFromFile } from '@utils/createBlobFromFile';
import { open } from '@tauri-apps/api/dialog';
import { Body, fetch } from '@tauri-apps/api/http';

19
src/shared/composer/modal.tsx
View File

@ -1,11 +1,14 @@
import { Post } from '@lume/shared/composer/types/post';
import { User } from '@lume/shared/composer/user';
import CancelIcon from '@lume/shared/icons/cancel';
import ChevronDownIcon from '@lume/shared/icons/chevronDown';
import ChevronRightIcon from '@lume/shared/icons/chevronRight';
import ComposeIcon from '@lume/shared/icons/compose';
import { composerAtom } from '@lume/stores/composer';
import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
import { Post } from '@shared/composer/types/post';
import { User } from '@shared/composer/user';
import CancelIcon from '@icons/cancel';
import ChevronDownIcon from '@icons/chevronDown';
import ChevronRightIcon from '@icons/chevronRight';
import ComposeIcon from '@icons/compose';
import { composerAtom } from '@stores/composer';
import { useActiveAccount } from '@utils/hooks/useActiveAccount';
import { Dialog, Transition } from '@headlessui/react';
import { useAtom } from 'jotai';

5
src/shared/composer/user.tsx
View File

@ -1,5 +1,6 @@
import { Image } from '@lume/shared/image';
import { DEFAULT_AVATAR, IMGPROXY_URL } from '@lume/stores/constants';
import { Image } from '@shared/image';
import { DEFAULT_AVATAR, IMGPROXY_URL } from '@stores/constants';
export function User({ data }: { data: any }) {
const metadata = JSON.parse(data.metadata);

19
src/shared/eventCollector.tsx
View File

@ -1,11 +1,14 @@
import HeartBeatIcon from '@lume/shared/icons/heartbeat';
import { RelayContext } from '@lume/shared/relayProvider';
import { READONLY_RELAYS } from '@lume/stores/constants';
import { hasNewerNoteAtom } from '@lume/stores/note';
import { dateToUnix } from '@lume/utils/getDate';
import { useActiveAccount } from '@lume/utils/hooks/useActiveAccount';
import { createChat, createNote, updateAccount } from '@lume/utils/storage';
import { getParentID, nip02ToArray } from '@lume/utils/transform';
import { RelayContext } from '@shared/relayProvider';
import HeartBeatIcon from '@icons/heartbeat';
import { READONLY_RELAYS } from '@stores/constants';
import { hasNewerNoteAtom } from '@stores/note';
import { dateToUnix } from '@utils/date';
import { useActiveAccount } from '@utils/hooks/useActiveAccount';
import { createChat, createNote, updateAccount } from '@utils/storage';
import { getParentID, nip02ToArray } from '@utils/transform';
import { useSetAtom } from 'jotai';
import { useContext, useRef } from 'react';

12
src/shared/form/imagePicker.tsx
View File

@ -1,8 +1,10 @@
import PlusIcon from '@lume/shared/icons/plus';
import { channelContentAtom } from '@lume/stores/channel';
import { chatContentAtom } from '@lume/stores/chat';
import { noteContentAtom } from '@lume/stores/note';
import { createBlobFromFile } from '@lume/utils/createBlobFromFile';
import PlusIcon from '@icons/plus';
import { channelContentAtom } from '@stores/channel';
import { chatContentAtom } from '@stores/chat';
import { noteContentAtom } from '@stores/note';
import { createBlobFromFile } from '@utils/createBlobFromFile';
import { open } from '@tauri-apps/api/dialog';
import { Body, fetch } from '@tauri-apps/api/http';

2
src/shared/image.tsx
View File

@ -1,4 +1,4 @@
import { DEFAULT_AVATAR } from '@lume/stores/constants';
import { DEFAULT_AVATAR } from '@stores/constants';
export function Image(props) {
const addImageFallback = (event) => {

15
src/shared/multiAccounts.tsx
View File

@ -1,9 +1,12 @@
import ActiveAccount from '@lume/shared/accounts/active';
import InactiveAccount from '@lume/shared/accounts/inactive';
import BellIcon from '@lume/shared/icons/bell';
import PlusIcon from '@lume/shared/icons/plus';
import { APP_VERSION } from '@lume/stores/constants';
import { getAccounts, getActiveAccount } from '@lume/utils/storage';
import ActiveAccount from '@shared/accounts/active';
import InactiveAccount from '@shared/accounts/inactive';
import BellIcon from '@icons/bell';
import PlusIcon from '@icons/plus';
import { APP_VERSION } from '@stores/constants';
import { getAccounts, getActiveAccount } from '@utils/storage';
import useSWR from 'swr';

28
src/shared/navigation.tsx
View File

@ -1,12 +1,14 @@
import ChannelsList from '@lume/app/channel/components/list';
import ChatsList from '@lume/app/chat/components/list';
import ActiveLink from '@lume/shared/activeLink';
import { ComposerModal } from '@lume/shared/composer/modal';
import EventCollector from '@lume/shared/eventCollector';
import MyspaceIcon from '@lume/shared/icons/myspace';
import NavArrowDownIcon from '@lume/shared/icons/navArrowDown';
import ThreadsIcon from '@lume/shared/icons/threads';
import WorldIcon from '@lume/shared/icons/world';
import ChannelsList from '@app/channel/components/list';
import ChatsList from '@app/chat/components/list';
import ActiveLink from '@shared/activeLink';
import { ComposerModal } from '@shared/composer/modal';
import EventCollector from '@shared/eventCollector';
import MyspaceIcon from '@icons/myspace';
import NavArrowDownIcon from '@icons/navArrowDown';
import ThreadsIcon from '@icons/threads';
import WorldIcon from '@icons/world';
import { Disclosure } from '@headlessui/react';
@ -24,14 +26,14 @@ export default function Navigation() {
</div>
<div className="flex flex-col text-zinc-400">
<ActiveLink
href="/app/daily"
href="/app/radar"
className="flex h-8 items-center gap-2.5 rounded-md px-2.5 text-[13px] font-semibold hover:text-zinc-200"
activeClassName=""
>
<span className="inline-flex h-5 w-5 items-center justify-center rounded bg-zinc-900">
<WorldIcon width={12} height={12} className="text-zinc-200" />
</span>
<span>Daily</span>
<span>Radar</span>
</ActiveLink>
<ActiveLink
href="/app/threads"
@ -44,14 +46,14 @@ export default function Navigation() {
<span>Threads</span>
</ActiveLink>
<ActiveLink
href="/app/myspace"
href="/app/space"
className="flex h-8 items-center gap-2.5 rounded-md px-2.5 text-[13px] font-semibold hover:text-zinc-200"
activeClassName=""
>
<span className="inline-flex h-5 w-5 items-center justify-center rounded bg-zinc-900">
<MyspaceIcon width={12} height={12} className="text-zinc-200" />
</span>
<span>MySpace</span>
<span>Space</span>
</ActiveLink>
</div>
</div>

2
src/shared/networkStatusIndicator.tsx
View File

@ -1,4 +1,4 @@
import { useNetworkStatus } from '@lume/utils/hooks/useNetworkStatus';
import { useNetworkStatus } from '@utils/hooks/useNetworkStatus';
export function NetworkStatusIndicator() {
const isOnline = useNetworkStatus();

7
src/shared/profile/followers.tsx
View File

@ -1,6 +1,7 @@
import { RelayContext } from '@lume/shared/relaysProvider';
import { UserFollow } from '@lume/shared/user/follow';
import { READONLY_RELAYS } from '@lume/stores/constants';
import { RelayContext } from '@shared/relaysProvider';
import { UserFollow } from '@shared/user/follow';
import { READONLY_RELAYS } from '@stores/constants';
import destr from 'destr';
import { Author } from 'nostr-relaypool';

7
src/shared/profile/follows.tsx
View File

@ -1,6 +1,7 @@
import { RelayContext } from '@lume/shared/relaysProvider';
import { UserFollow } from '@lume/shared/user/follow';
import { READONLY_RELAYS } from '@lume/stores/constants';
import { RelayContext } from '@shared/relaysProvider';
import { UserFollow } from '@shared/user/follow';
import { READONLY_RELAYS } from '@stores/constants';
import { Author } from 'nostr-relaypool';
import { useContext, useEffect, useState } from 'react';

10
src/shared/profile/metadata.tsx
View File

@ -1,7 +1,9 @@
import { Image } from '@lume/shared/image';
import { RelayContext } from '@lume/shared/relayProvider';
import { DEFAULT_AVATAR, READONLY_RELAYS } from '@lume/stores/constants';
import { shortenKey } from '@lume/utils/shortenKey';
import { Image } from '@shared/image';
import { RelayContext } from '@shared/relayProvider';
import { DEFAULT_AVATAR, READONLY_RELAYS } from '@stores/constants';
import { shortenKey } from '@utils/shortenKey';
import destr from 'destr';
import { Author } from 'nostr-relaypool';

7
src/shared/profile/notes.tsx
View File

@ -1,6 +1,7 @@
import { NoteBase } from '@lume/shared/note/base';
import { RelayContext } from '@lume/shared/relaysProvider';
import { READONLY_RELAYS } from '@lume/stores/constants';
import { NoteBase } from '@shared/note/base';
import { RelayContext } from '@shared/relaysProvider';
import { READONLY_RELAYS } from '@stores/constants';
import { Author } from 'nostr-relaypool';
import { useContext, useEffect, useState } from 'react';

2
src/shared/relayProvider.tsx
View File

@ -1,4 +1,4 @@
import { FULL_RELAYS } from '@lume/stores/constants';
import { FULL_RELAYS } from '@stores/constants';
import { RelayPool } from 'nostr-relaypool';
import { createContext } from 'react';

22
src/utils/date.tsx Normal file
View File

@ -0,0 +1,22 @@
// get X days ago with user provided date
export function getDayAgo(numOfDays, date = new Date()) {
const days = new Date(date.getTime());
days.setDate(date.getDate() - numOfDays);
return days;
}
// get X hours ago with user provided date
export function getHourAgo(numOfHours, date = new Date()) {
const hours = new Date(date.getTime());
hours.setHours(date.getHours() - numOfHours);
return hours;
}
// convert date to unix timestamp
export function dateToUnix(_date?: Date) {
const date = _date || new Date();
return Math.floor(date.getTime() / 1000);
}

22
src/utils/getDate.tsx
View File

@ -1,22 +0,0 @@
// get X days ago with user provided date
export function daysAgo(numOfDays, date = new Date()) {
const daysAgo = new Date(date.getTime());
daysAgo.setDate(date.getDate() - numOfDays);
return daysAgo;
}
// get X hours ago with user provided date
export function hoursAgo(numOfHours, date = new Date()) {
const hoursAgo = new Date(date.getTime());
hoursAgo.setHours(date.getHours() - numOfHours);
return hoursAgo;
}
// convert date to unix timestamp
export function dateToUnix(_date?: Date) {
const date = _date || new Date();
return Math.floor(date.getTime() / 1000);
}

2
src/utils/hooks/useActiveAccount.tsx
View File

@ -1,4 +1,4 @@
import { getActiveAccount } from '@lume/utils/storage';
import { getActiveAccount } from '@utils/storage';
import useSWR from 'swr';

5
src/utils/hooks/useProfile.tsx
View File

@ -1,5 +1,6 @@
import { METADATA_SERVICE } from '@lume/stores/constants';
import { createPleb, getPleb } from '@lume/utils/storage';
import { METADATA_SERVICE } from '@stores/constants';
import { createPleb, getPleb } from '@utils/storage';
import useSWR from 'swr';

1
tsconfig.json
View File

@ -2,7 +2,6 @@
"compilerOptions": {
"baseUrl": "./",
"paths": {
"@lume/*": ["src/*"],
"@app/*": ["src/app/*"],
"@shared/*": ["src/shared/*"],
"@icons/*": ["src/shared/icons/*"],