diff --git a/public/.well-known/nostr.json b/public/.well-known/nostr.json index b5312f4..9e66bf0 100644 --- a/public/.well-known/nostr.json +++ b/public/.well-known/nostr.json @@ -2,6 +2,7 @@ "names": { "degmods": "f4bf1fb5ba8be839f70c7331733e309f780822b311f63e01f9dc8abbb428f8d5", "degmodsreposter": "7382a4cc21742ac3e3581f1c653a41f912e985e6a941439377803b866042e53f", + "degmodsreport": "ca2734bb5e59427dd5d66f59dde3b4a045110b7a12eb99a4a862bf012b7850d9", "freakoverse": "3cea4806b1e1a9829d30d5cb8a78011d4271c6474eb31531ec91f28110fe3f40", "nostrdev": "27487c9600b16b24a1bfb0519cfe4a5d1ad84959e3cce5d6d7a99d48660a1f78", "Merlin": "76dd32f31619b8e35e9f32e015224b633a0df8be8d5613c25b8838a370407698", diff --git a/src/components/Banner.tsx b/src/components/Banner.tsx index a398389..5ad4813 100644 --- a/src/components/Banner.tsx +++ b/src/components/Banner.tsx @@ -6,8 +6,8 @@ export const Banner = () => {

- DEG Mods is currently in pre-alpha (Learn more). - Check out its funding campaign (Learn more). + DEG Mods is currently in alpha (Learn more). + Check out its funding campaign (Learn more). (Soon on Kickstarter)

) diff --git a/src/components/ProfileSection.tsx b/src/components/ProfileSection.tsx index c2ab74a..58a82c5 100644 --- a/src/components/ProfileSection.tsx +++ b/src/components/ProfileSection.tsx @@ -182,7 +182,7 @@ export const Profile = ({ profile }: ProfileProps) => { - + @@ -231,7 +231,9 @@ type QRButtonWithPopUpProps = { pubkey: string } -const QRButtonWithPopUp = ({ pubkey }: QRButtonWithPopUpProps) => { +export const ProfileQRButtonWithPopUp = ({ + pubkey +}: QRButtonWithPopUpProps) => { const [isOpen, setIsOpen] = useState(false) const nprofile = nip19.nprofileEncode({ diff --git a/src/components/SVGs.tsx b/src/components/SVGs.tsx new file mode 100644 index 0000000..a1e8661 --- /dev/null +++ b/src/components/SVGs.tsx @@ -0,0 +1,51 @@ +export const ProfileSVG = (props: React.SVGProps) => ( + + + +) + +export const RelaySVG = (props: React.SVGProps) => ( + + + +) + +export const PreferenceSVG = (props: React.SVGProps) => ( + + + +) + +export const AdminSVG = (props: React.SVGProps) => ( + + + +) diff --git a/src/controllers/relay.ts b/src/controllers/relay.ts index 0811cd6..bc347bc 100644 --- a/src/controllers/relay.ts +++ b/src/controllers/relay.ts @@ -109,10 +109,24 @@ export class RelayController { ) // Wait for all relay connection attempts to settle (either fulfilled or rejected) - await Promise.allSettled([appRelayPromise, ...relayPromises]) + const results = await Promise.allSettled([ + appRelayPromise, + ...relayPromises + ]) + + // Extract non-null values from fulfilled promises in a single pass + const relays = results.reduce((acc, result) => { + if (result.status === 'fulfilled') { + const value = result.value + if (value) { + acc.push(value) + } + } + return acc + }, []) // If no relays are connected, log an error and return an empty array - if (this.connectedRelays.length === 0) { + if (relays.length === 0) { log(this.debug, LogType.Error, 'No relay is connected!') return [] } @@ -120,7 +134,7 @@ export class RelayController { const publishedOnRelays: string[] = [] // Track relays where the event was successfully published // Create promises to publish the event to each connected relay - const publishPromises = this.connectedRelays.map((relay) => { + const publishPromises = relays.map((relay) => { log( this.debug, LogType.Info, @@ -311,7 +325,7 @@ export class RelayController { const publishedOnRelays: string[] = [] // Track relays where the event was successfully published // Create promises to publish the event to each connected relay - const publishPromises = this.connectedRelays.map((relay) => { + const publishPromises = relays.map((relay) => { log( this.debug, LogType.Info, diff --git a/src/layout/socialNav.tsx b/src/layout/socialNav.tsx index d010325..022f555 100644 --- a/src/layout/socialNav.tsx +++ b/src/layout/socialNav.tsx @@ -33,6 +33,7 @@ export const SocialNav = () => { ( +const NavButton = ({ to, isActive, svgPath, viewBox = '0 0 512 512' }: NavButtonProps) => ( ( > ( -) +); + + diff --git a/src/pages/mod/index.tsx b/src/pages/mod/index.tsx index b0763d6..bcce8bd 100644 --- a/src/pages/mod/index.tsx +++ b/src/pages/mod/index.tsx @@ -1167,6 +1167,7 @@ const Download = ({ Download + {/*temporarily commented out the WoT rating for download links within a mod post

Ratings (WIP):

@@ -1331,7 +1332,7 @@ const Download = ({
- + */}

{ - const location = useLocation() - const userState = useAppSelector((state) => state.user) - - return ( -

-
-
-
- - {location.pathname === appRoutes.settingsProfile && ( - - )} - {location.pathname === appRoutes.settingsRelays && ( - - )} - {location.pathname === appRoutes.settingsPreferences && ( - - )} - {location.pathname === appRoutes.settingsAdmin && } - {userState.auth && userState.user?.pubkey && ( - - )} -
-
-
-
- ) -} - -const SettingTabs = () => { - const location = useLocation() - const [isAdmin, setIsAdmin] = useState(false) - const userState = useAppSelector((state) => state.user) - - useEffect(() => { - MetadataController.getInstance().then((controller) => { - if (userState.auth && userState.user?.npub) { - setIsAdmin( - controller.adminNpubs.includes(userState.user.npub as string) - ) - } else { - setIsAdmin(false) - } - }) - }, [userState]) - - const handleSignOut = () => { - logout() - } - - return ( -
-
-
-

Settings (WIP)

-
-
- - - - - Profile - - - - - - Relays - - - - - - Preference - - {isAdmin && ( - - - - - Admin - - )} -
- - {userState.auth && - userState.auth.method === AuthMethod.Local && - userState.auth.localNsec && ( -
- -

- NOTICE: Make sure you save your private key (nsec) somewhere - safe. -

-
- - -
-

- WARNING: Do not sign-out without saving your nsec somewhere - safe. Otherwise, you'll lose access to your "account". -

-
- )} - - {userState.auth && ( - - )} -
-
- ) -} - -const ProfileSettings = () => { - return ( -
-
-
-
-
-
- -
-
-
-
-
-
-
-
-

User name

-

- nip5handle@domain.com -

-
-
-
- -
-
-

- npub1address -

-
-
-
- - - -
-
- - - -
-
- - - -
-
-
-
-

- user bio, this is a long string of temporary text that would - be replaced with the user bio from their metada address -

-
-
-
-
-
- {}} - /> - {}} - /> - {}} - /> - {}} - /> - {}} - /> -
-
- -
-
-
-
- ) -} - -const RelaySettings = () => { - return ( -
-
-
-
- -
- {usersRelays.map((relay, index) => ( - - ))} -
-
- -
- {}} - /> - - -
- -
-
- -

- We recommend adding one of our relays if you're planning to - frequently use DEG Mods, for a better experience. -

-
-
- {degmodsRelays.map((relay, index) => ( - - ))} -
-
- -
-
- -

- Relays we recommend using as they support the same functionalities - that our relays provide. -

-
-
- {recommendRelays.map((relay, index) => ( - - ))} -
-
-
- ) -} - -const RelayListItem = ({ - item, - isOwnRelay -}: { - item: RelayItem - isOwnRelay?: boolean -}) => { - return ( -
-
-
-
-
-

{item.url}

-
- - - - - - - {item.subscribedTitle && ( - - - - )} -
-
-
- {isOwnRelay && ( -
- - -
- )} - {!isOwnRelay && ( - - )} -
-
- ) -} - -// todo: use components from Input.tsx -const PreferencesSetting = () => { - return ( -
-
-
-
-
-

Notifications

-
-
- - -
-
- - -
-
- - -
-
- - -
-
- - -
-
-
-
-

Not Safe For Work (NSFW)

-
-
- - -
-
-
-
-

Web of Trust (WoT) level

-
-

- This affects what posts you see, reactions, DMs, and - notifications. Learn more: Link -

-
- -

10

-
-
- - -
-
-
- -
-
-
-
- ) -} - -// todo: use components from Input.tsx -const AdminSetting = () => { - return ( -
-
-
-
-
-

Slider Featured Mods

- -
-
- - -
-
- - -
-
-
-
-

Featured Games

- -
-
- - -
-
- - -
-
-
-
-

Featured Mods

- -
-
- - -
-
- - -
-
-
-
-

Blog writers

- -
-
- - -
-
- - -
-
-
- -
-
-
-
- ) -} - -interface RelayItem { - url: string - backgroundColor: string - readTitle: string - writeTitle: string - subscribedTitle: string -} - -const usersRelays: RelayItem[] = [ - { - url: 'wss://relay.wibblywobbly.com', - backgroundColor: '#cd4d45', - readTitle: 'Read', - writeTitle: 'Write', - subscribedTitle: '' - }, - { - url: 'wss://relay.wibblywobbly.com', - backgroundColor: '#60ae60', - readTitle: 'Read', - writeTitle: 'Write', - subscribedTitle: 'Paid (Subscribed)' - }, - { - url: 'wss://relay.degmods.com', - backgroundColor: '#60ae60', - readTitle: 'Read', - writeTitle: 'Write', - subscribedTitle: '' - } -] - -const degmodsRelays: RelayItem[] = [ - { - url: 'wss://relay1.degmods.com', - backgroundColor: '#60ae60', - readTitle: 'Read', - writeTitle: 'Write', - subscribedTitle: '' - }, - { - url: 'wss://relay2.degmods.com', - backgroundColor: '#60ae60', - readTitle: 'Read', - writeTitle: 'Write', - subscribedTitle: '' - } -] - -const recommendRelays: RelayItem[] = [ - { - url: 'wss://relay1.degmods.com', - backgroundColor: '#60ae60', - readTitle: 'Read', - writeTitle: 'Write', - subscribedTitle: '' - }, - { - url: 'wss://relay2.degmods.com', - backgroundColor: '#60ae60', - readTitle: 'Read', - writeTitle: 'Write', - subscribedTitle: '' - } -] diff --git a/src/pages/settings/admin.tsx b/src/pages/settings/admin.tsx new file mode 100644 index 0000000..70253a2 --- /dev/null +++ b/src/pages/settings/admin.tsx @@ -0,0 +1,234 @@ +// todo: use components from Input.tsx +export const AdminSetting = () => { + return ( +
+
+
+
+
+

Slider Featured Mods

+ +
+
+ + +
+
+ + +
+
+
+
+

Featured Games

+ +
+
+ + +
+
+ + +
+
+
+
+

Featured Mods

+ +
+
+ + +
+
+ + +
+
+
+
+

Blog writers

+ +
+
+ + +
+
+ + +
+
+
+ +
+
+
+
+ ) +} diff --git a/src/pages/settings/index.tsx b/src/pages/settings/index.tsx new file mode 100644 index 0000000..1fe2351 --- /dev/null +++ b/src/pages/settings/index.tsx @@ -0,0 +1,164 @@ +import { AdminSVG, PreferenceSVG, ProfileSVG, RelaySVG } from 'components/SVGs' +import { MetadataController } from 'controllers' +import { useAppSelector } from 'hooks' +import { logout } from 'nostr-login' +import { useEffect, useState } from 'react' +import { Link, useLocation } from 'react-router-dom' +import { toast } from 'react-toastify' +import { appRoutes } from 'routes' +import { AuthMethod } from 'store/reducers/user' +import { copyTextToClipboard } from 'utils' +import { ProfileSettings } from './profile' +import { RelaySettings } from './relay' +import { PreferencesSetting } from './preference' +import { AdminSetting } from './admin' +import { ProfileSection } from 'components/ProfileSection' + +export const SettingsPage = () => { + const location = useLocation() + const userState = useAppSelector((state) => state.user) + + return ( +
+
+
+
+ + {location.pathname === appRoutes.settingsProfile && ( + + )} + {location.pathname === appRoutes.settingsRelays && ( + + )} + {location.pathname === appRoutes.settingsPreferences && ( + + )} + {location.pathname === appRoutes.settingsAdmin && } + {userState.auth && userState.user?.pubkey && ( + + )} +
+
+
+
+ ) +} + +const SettingTabs = () => { + const location = useLocation() + const [isAdmin, setIsAdmin] = useState(false) + const userState = useAppSelector((state) => state.user) + + useEffect(() => { + MetadataController.getInstance().then((controller) => { + if (userState.auth && userState.user?.npub) { + setIsAdmin( + controller.adminNpubs.includes(userState.user.npub as string) + ) + } else { + setIsAdmin(false) + } + }) + }, [userState]) + + const handleSignOut = () => { + logout() + } + + const navLinks = [ + { path: appRoutes.settingsProfile, label: 'Profile', icon: }, + { path: appRoutes.settingsRelays, label: 'Relays', icon: }, + { + path: appRoutes.settingsPreferences, + label: 'Preferences', + icon: + } + ] + + if (isAdmin) { + navLinks.push({ + path: appRoutes.settingsAdmin, + label: 'Admin', + icon: + }) + } + + const renderNavLink = (path: string, label: string, icon: JSX.Element) => ( + + {icon} + {label} + + ) + + return ( +
+
+
+

Settings (WIP)

+
+
+ {navLinks.map(({ path, label, icon }) => + renderNavLink(path, label, icon) + )} +
+ + {userState.auth && + userState.auth.method === AuthMethod.Local && + userState.auth.localNsec && ( +
+ +

+ NOTICE: Make sure you save your private key (nsec) somewhere + safe. +

+
+ + +
+

+ WARNING: Do not sign-out without saving your nsec somewhere + safe. Otherwise, you'll lose access to your "account". +

+
+ )} + + {userState.auth && ( + + )} +
+
+ ) +} diff --git a/src/pages/settings/preference.tsx b/src/pages/settings/preference.tsx new file mode 100644 index 0000000..170cabf --- /dev/null +++ b/src/pages/settings/preference.tsx @@ -0,0 +1,124 @@ +// todo: use components from Input.tsx +export const PreferencesSetting = () => { + return ( +
+
+
+
+
+

Notifications

+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+

Not Safe For Work (NSFW)

+
+
+ + +
+
+
+
+

Web of Trust (WoT) level

+
+

+ This affects what posts you see, reactions, DMs, and + notifications. Learn more: Link +

+
+ +

10

+
+
+ + +
+
+
+ +
+
+
+
+ ) +} diff --git a/src/pages/settings/profile.tsx b/src/pages/settings/profile.tsx new file mode 100644 index 0000000..dbf6d65 --- /dev/null +++ b/src/pages/settings/profile.tsx @@ -0,0 +1,344 @@ +import { InputField } from 'components/Inputs' +import { ProfileQRButtonWithPopUp } from 'components/ProfileSection' +import { useAppDispatch, useAppSelector } from 'hooks' +import { kinds, nip19, UnsignedEvent, Event } from 'nostr-tools' +import { useEffect, useState } from 'react' +import { Link } from 'react-router-dom' +import { toast } from 'react-toastify' +import { appRoutes, getProfilePageRoute } from 'routes' +import { copyTextToClipboard, log, LogType, now, npubToHex } from 'utils' +import 'styles/profile.css' +import { + NDKEvent, + NDKUserProfile, + profileFromEvent, + serializeProfile +} from '@nostr-dev-kit/ndk' +import { RelayController } from 'controllers' +import { LoadingSpinner } from 'components/LoadingSpinner' +import { setUser } from 'store/reducers/user' + +type FormState = { + name: string + displayName: string + bio: string + picture: string + banner: string + nip05: string + lud16: string +} + +const defaultFormState: FormState = { + name: '', + displayName: '', + bio: '', + picture: '', + banner: '', + nip05: '', + lud16: '' +} + +export const ProfileSettings = () => { + const dispatch = useAppDispatch() + const userState = useAppSelector((state) => state.user) + + const [isPublishing, setIsPublishing] = useState(false) + const [formState, setFormState] = useState(defaultFormState) + + useEffect(() => { + if (userState.auth && userState.user) { + const { + name, + displayName, + about, + bio, + image, + picture, + banner, + nip05, + lud16 + } = userState.user + + setFormState({ + name: name || '', + displayName: displayName || '', + bio: bio || about || '', + picture: typeof picture === 'string' ? picture : image || '', + banner: banner || '', + nip05: nip05 || '', + lud16: lud16 || '' + }) + } else { + setFormState(defaultFormState) + } + }, [userState]) + + const handleInputChange = (field: string, value: string) => { + setFormState((prev) => ({ + ...prev, + [field]: value + })) + } + + const banner = + formState.banner || '/assets/img/DEGMods%20Placeholder%20Img.png' + + const picture = + formState.picture || '/assets/img/DEG%20Mods%20Default%20PP.png' + + const name = formState.displayName || formState.name || 'User name' + + const nip05 = formState.nip05 || 'nip5handle@domain.com' + + const npub = (userState.user?.npub as string) || 'npub1address' + + const bio = + formState.bio || + 'user bio, this is a long string of temporary text that would be replaced with the user bio from their metadata address' + + // In case user is not logged in clicking on profile link will navigate to homepage + let profileRoute = appRoutes.home + if (userState.auth && userState.user) { + const hexPubkey = npubToHex(userState.user.npub as string) + + if (hexPubkey) { + profileRoute = getProfilePageRoute( + nip19.nprofileEncode({ + pubkey: hexPubkey + }) + ) + } + } + + const handleCopy = async () => { + copyTextToClipboard(npub).then((isCopied) => { + if (isCopied) { + toast.success('Npub copied to clipboard!') + } else { + toast.error( + 'Failed to copy, look into console for more details on error!' + ) + } + }) + } + + const handlePublish = async () => { + if (!userState.auth && !userState.user?.pubkey) return + + setIsPublishing(true) + + const prevProfile = userState.user as NDKUserProfile + const updatedProfile = { + ...prevProfile, + name: formState.name, + displayName: formState.displayName, + bio: formState.bio, + picture: formState.picture, + banner: formState.banner, + nip05: formState.nip05, + lud16: formState.lud16 + } + + const serializedProfile = serializeProfile(updatedProfile) + + const unsignedEvent: UnsignedEvent = { + kind: kinds.Metadata, + tags: [], + content: serializedProfile, + created_at: now(), + pubkey: userState.user?.pubkey as string + } + + const signedEvent = await window.nostr + ?.signEvent(unsignedEvent) + .then((event) => event as Event) + .catch((err) => { + toast.error('Failed to sign the event!') + log(true, LogType.Error, 'Failed to sign the event!', err) + return null + }) + + if (!signedEvent) { + setIsPublishing(false) + return + } + + const publishedOnRelays = await RelayController.getInstance().publish( + signedEvent as Event + ) + + // Handle cases where publishing failed or succeeded + if (publishedOnRelays.length === 0) { + toast.error('Failed to publish event on any relay') + } else { + toast.success( + `Event published successfully to the following relays\n\n${publishedOnRelays.join( + '\n' + )}` + ) + + const ndkEvent = new NDKEvent(undefined, signedEvent) + const userProfile = profileFromEvent(ndkEvent) + dispatch(setUser(userProfile)) + } + + setIsPublishing(false) + } + + return ( + <> + {isPublishing && } +
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+

{name}

+

{nip05}

+
+
+
+ +
+
+

+ {npub} +

+
+
+
+ + + +
+ {typeof userState.user?.pubkey === 'string' && ( + + )} +
+
+
+

{bio}

+
+
+
+
+
+ + + + + + + +
+
+ +
+
+
+
+ + ) +} diff --git a/src/pages/settings/relay.tsx b/src/pages/settings/relay.tsx new file mode 100644 index 0000000..508b21c --- /dev/null +++ b/src/pages/settings/relay.tsx @@ -0,0 +1,242 @@ +import { InputField } from 'components/Inputs' + +export const RelaySettings = () => { + return ( +
+
+
+
+ +
+ {usersRelays.map((relay, index) => ( + + ))} +
+
+ +
+ {}} + /> + + +
+ +
+
+ +

+ We recommend adding one of our relays if you're planning to + frequently use DEG Mods, for a better experience. +

+
+
+ {degmodsRelays.map((relay, index) => ( + + ))} +
+
+ +
+
+ +

+ Relays we recommend using as they support the same functionalities + that our relays provide. +

+
+
+ {recommendRelays.map((relay, index) => ( + + ))} +
+
+
+ ) +} + +const RelayListItem = ({ + item, + isOwnRelay +}: { + item: RelayItem + isOwnRelay?: boolean +}) => { + return ( +
+
+
+
+
+

{item.url}

+
+ + + + + + + {item.subscribedTitle && ( + + + + )} +
+
+
+ {isOwnRelay && ( +
+ + +
+ )} + {!isOwnRelay && ( + + )} +
+
+ ) +} + +interface RelayItem { + url: string + backgroundColor: string + readTitle: string + writeTitle: string + subscribedTitle: string +} + +const usersRelays: RelayItem[] = [ + { + url: 'wss://relay.wibblywobbly.com', + backgroundColor: '#cd4d45', + readTitle: 'Read', + writeTitle: 'Write', + subscribedTitle: '' + }, + { + url: 'wss://relay.wibblywobbly.com', + backgroundColor: '#60ae60', + readTitle: 'Read', + writeTitle: 'Write', + subscribedTitle: 'Paid (Subscribed)' + }, + { + url: 'wss://relay.degmods.com', + backgroundColor: '#60ae60', + readTitle: 'Read', + writeTitle: 'Write', + subscribedTitle: '' + } +] + +const degmodsRelays: RelayItem[] = [ + { + url: 'wss://relay1.degmods.com', + backgroundColor: '#60ae60', + readTitle: 'Read', + writeTitle: 'Write', + subscribedTitle: '' + }, + { + url: 'wss://relay2.degmods.com', + backgroundColor: '#60ae60', + readTitle: 'Read', + writeTitle: 'Write', + subscribedTitle: '' + } +] + +const recommendRelays: RelayItem[] = [ + { + url: 'wss://relay1.degmods.com', + backgroundColor: '#60ae60', + readTitle: 'Read', + writeTitle: 'Write', + subscribedTitle: '' + }, + { + url: 'wss://relay2.degmods.com', + backgroundColor: '#60ae60', + readTitle: 'Read', + writeTitle: 'Write', + subscribedTitle: '' + } +] diff --git a/src/styles/cardGames.css b/src/styles/cardGames.css index b440c9e..faee847 100644 --- a/src/styles/cardGames.css +++ b/src/styles/cardGames.css @@ -4,6 +4,7 @@ flex-direction: column; grid-gap: 10px; text-decoration: unset; + cursor: pointer; } .cardGameMainWrapperLink:hover { diff --git a/src/styles/popup.css b/src/styles/popup.css index 2c03c5c..27801ee 100644 --- a/src/styles/popup.css +++ b/src/styles/popup.css @@ -186,6 +186,7 @@ flex-direction: row; grid-gap: 10px; text-align: center; + flex-wrap: wrap; } .btnMain.pUMCB_ZapsInsideAmountOptionsBtn { @@ -431,6 +432,7 @@ border-top: solid 1px #ffffff10; padding: 10px 0 0 0; margin: 10px 0 0 0; + white-space: break-spaces; } .BTCAddressPopZapTextSpan { diff --git a/src/styles/styles.css b/src/styles/styles.css index d9a719f..79f8f23 100644 --- a/src/styles/styles.css +++ b/src/styles/styles.css @@ -409,6 +409,7 @@ h6 { .labelDescriptionMain { color: rgba(255, 255, 255, 0.35); font-size: 14px; + white-space: break-spaces; } .btnMain.btnMainRemove {