setShowMoreMenu(false)}>
- {nextImageData && !isVideo(nextImageData.url) && (
- 
- )}
- {nextImageData && isVideo(nextImageData.url) && (
-
- )}
-
-
- );
-};
-
-export default DetailsView;
diff --git a/src/components/Login/Login.css b/src/components/Login/Login.css
new file mode 100644
index 0000000..95b8e4d
--- /dev/null
+++ b/src/components/Login/Login.css
@@ -0,0 +1,42 @@
+.login-dialog {
+ display: flex;
+ flex-direction: column;
+ padding: 2em;
+ border-radius: 20px;
+ background-color: #111;
+ z-index: 200;
+ position: fixed;
+ top: 50%;
+ left: 50%;
+ transform: translate(-50%, -50%);
+ gap: 24px;
+}
+
+.login-dialog input[type='text'] {
+ min-width: 20em;
+ display: block;
+ width: 100%;
+ background-color: #111;
+ border-radius: 8px;
+ border: 1px solid #222;
+ height: 3em;
+ font-family: unset;
+ font-size: unset;
+ padding: 0.1em;
+ padding-left: 0.5em;
+ box-sizing: border-box;
+}
+
+.login-dialog .login-address {
+ display: flex;
+ flex-direction: row;
+ gap: 8px;
+}
+
+.login-dialog .login-extension {
+ align-self: center;
+}
+
+.login-dialog .login-extension button {
+ height: 3em;
+}
diff --git a/src/components/Login/Login.tsx b/src/components/Login/Login.tsx
new file mode 100644
index 0000000..5959d78
--- /dev/null
+++ b/src/components/Login/Login.tsx
@@ -0,0 +1,82 @@
+import { useState } from 'react';
+import './Login.css';
+import { useBunkerLogin, useExtensionLogin } from '../../ngine/context';
+import { useGlobalState } from '../../utils/globalState';
+
+type LoginProps = {
+ onClose: () => void;
+};
+
+const Login = ({ onClose }: LoginProps) => {
+ const [address, setAddress] = useState('');
+ const [_, setState] = useGlobalState();
+ const bunkerLogin = useBunkerLogin();
+ const extensionLogin = useExtensionLogin();
+ /*
+
+ const onLogin = async () => {
+ const user = await bunkerLogin('florian@nsec.app'); ///bunker://b7c6f6915cfa9a62fff6a1f02604de88c23c6c6c6d1b8f62c7cc10749f307e81?relay=wss://relay.nsec.app'); //florian@nsec.app
+ //const user = await extensionLogin();
+ if (user) {
+
+ console.log(user.npub);
+ setState({ userNPub: user.npub, profile: user.profile });
+ }
+ else {
+ console.error('Error loging in');
+ }
+/*
+ setAutoLogin(true);
+
+
+
+ const result = await nip);
+ if (!result) {
+ console.error('Login failed.');
+ return;
+ }
+
+ setState({ userNPub: result.npub });
+
+};
+*/
+ const loginWithAddress = async () => {
+ const user = await bunkerLogin(address);
+ if (user) {
+ setState({ userNPub: user.npub, profile: user.profile });
+ onClose();
+ } else {
+ console.error('Error loging in');
+ }
+ };
+
+ const loginWithExtension = async () => {
+ const user = await extensionLogin();
+ if (user) {
+ setState({ userNPub: user.npub, profile: user.profile });
+ onClose();
+ } else {
+ console.error('Error loging in');
+ }
+ };
+
+ return (
+
- {isVideo(currentImageData.url) ? (
-
- ) : (
- 
- )}
-
-
-
- {currentImageData?.content}
}
-
-
- {state.userNPub && (
- <>
-
-
- {currentImageData.tags.length > 0 && (
- currentImage && heartClick(currentImageData)}>
-
- {(activeProfile?.lud06 || activeProfile?.lud16) && (
- currentImage && zapClick(currentImageData)}>
-
- )}
-
- )}
- {nextImageData?.noteId && (
-
- {
- e.stopPropagation();
- setShowMoreMenu(s => !s);
- }}
- >
-
- }
-
- {uniq(currentImageData?.tags).map(t => (
- <>
- {
- setCurrentImage(undefined);
- nav({ ...currentSettings, tags: [t], npubs: [] });
- }}
- >
- {t}
- {' '}
-
- ))}
-
- )}
-
+
+ );
+};
+
+export default Login;
diff --git a/src/components/Settings.tsx b/src/components/Settings.tsx
index 6b24088..d07efb1 100644
--- a/src/components/Settings.tsx
+++ b/src/components/Settings.tsx
@@ -4,10 +4,10 @@ import useNav from '../utils/useNav';
import CloseButton from './CloseButton/CloseButton';
import TagEditor, { Tag } from './TagEditor';
import { defaultHashTags } from './env';
-import { useNDK } from '@nostr-dev-kit/ndk-react';
import { createImgProxyUrl } from './nostrImageDownload';
import { useGlobalState } from '../utils/globalState';
import { ViewMode } from './SlideShow';
+import useProfile from '../ngine/hooks/useProfile';
type SettingsProps = {
onClose: () => void;
@@ -18,7 +18,6 @@ type Mode = 'all' | 'tags' | 'user';
const SettingsDialog = ({ onClose, setViewMode }: SettingsProps) => {
const { nav, currentSettings } = useNav();
- const { getProfile } = useNDK();
const [state, setState] = useGlobalState();
const [showAdult, setShowAdult] = useState(currentSettings.showAdult || false);
const [showReplies, setShowReplies] = useState(currentSettings.showReplies || false);
@@ -66,7 +65,7 @@ const SettingsDialog = ({ onClose, setViewMode }: SettingsProps) => {
onClose();
};
- const activeProfile = npubs.length > 0 ? getProfile(npubs[0]) : undefined;
+ const activeProfile = useProfile(npubs[0]);
return (
<>
diff --git a/src/components/SlideShow.tsx b/src/components/SlideShow.tsx
index f551021..abbd7f3 100644
--- a/src/components/SlideShow.tsx
+++ b/src/components/SlideShow.tsx
@@ -1,4 +1,3 @@
-import { useNDK } from '@nostr-dev-kit/ndk-react';
import './SlideShow.css';
import React, { useEffect, useRef, useState } from 'react';
import {
@@ -6,21 +5,20 @@ import {
buildFilter,
extractImageUrls,
isImage,
- isAdultRelated,
- isReply,
isVideo,
prepareContent,
Post,
createImgProxyUrl,
+ isReply,
+ isAdultRelated,
} from './nostrImageDownload';
-import { blockedPublicKeys, adultContentTags, adultNPubs, mixedAdultNPubs } from './env';
+import { adultContentTags, adultNPubs, blockedPublicKeys, mixedAdultNPubs } from './env';
import Settings from './Settings';
import SlideView from './SlideView';
import { nip19 } from 'nostr-tools';
import uniqBy from 'lodash/uniqBy';
import AdultContentInfo from './AdultContentInfo';
import useNav from '../utils/useNav';
-import { NDKEvent } from '@nostr-dev-kit/ndk';
import { useGlobalState } from '../utils/globalState';
import useAutoLogin from '../utils/useAutoLogin';
import IconUser from './Icons/IconUser';
@@ -33,6 +31,9 @@ import IconHeart from './Icons/IconHeart';
import IconBolt from './Icons/IconBolt';
import IconSearch from './Icons/IconSearch';
import GridView from './GridView';
+import useEvents from '../ngine/hooks/useEvents';
+import { NDKSubscriptionCacheUsage } from '@nostr-dev-kit/ndk';
+import Login from './Login/Login';
// type AlbyNostr = typeof window.nostr & { enabled: boolean };
@@ -72,30 +73,65 @@ FEATURES:
export type ViewMode = 'grid' | 'slideshow' | 'scroll';
const SlideShow = () => {
- const { ndk, loginWithNip07, getProfile } = useNDK();
const [posts, setPosts] = useStateLogin
+
+ setAddress(e.target.value)}
+ >
+
+
+
+
+
+
{state.userNPub && state.profile ? (
@@ -266,7 +292,7 @@ const SlideShow = () => {
)
) : (
-