make login more fancy

2025-04-10 04:39:19 +02:00 · 2023-02-07 17:04:19 -06:00 · 2023-02-07 17:04:19 -06:00 · f69a120c22
commit f69a120c22
parent 2c3c45991d
6 changed files with 124 additions and 126 deletions
--- a/src/components/icons.tsx
+++ b/src/components/icons.tsx
@ -20,9 +20,9 @@ export const GlobalIcon = createIcon({
  defaultProps,
 });

-export const HomeIcon = createIcon({
-  displayName: "home-line",
-  d: "M21 20a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V9.49a1 1 0 0 1 .386-.79l8-6.222a1 1 0 0 1 1.228 0l8 6.222a1 1 0 0 1 .386.79V20zm-2-1V9.978l-7-5.444-7 5.444V19h14z",
+export const FeedIcon = createIcon({
+  displayName: "feed-icon",
+  d: "M16 18v2H5v-2h11zm5-7v2H3v-2h18zm-2-7v2H8V4h11z",
  defaultProps,
 });

@ -117,13 +117,19 @@ export const RelayIcon = createIcon({
 });

 export const ExternalLinkIcon = createIcon({
-  displayName: "eternal-link-icon",
+  displayName: "external-link-icon",
  d: "M10 6v2H5v11h11v-5h2v6a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V7a1 1 0 0 1 1-1h6zm11-3v8h-2V6.413l-7.793 7.794-1.414-1.414L17.585 5H13V3h8z",
  defaultProps,
 });

 export const SearchIcon = createIcon({
-  displayName: "eternal-link-icon",
+  displayName: "search-icon",
  d: "M18.031 16.617l4.283 4.282-1.415 1.415-4.282-4.283A8.96 8.96 0 0 1 11 20c-4.968 0-9-4.032-9-9s4.032-9 9-9 9 4.032 9 9a8.96 8.96 0 0 1-1.969 5.617zm-2.006-.742A6.977 6.977 0 0 0 18 11c0-3.868-3.133-7-7-7-3.868 0-7 3.132-7 7 0 3.867 3.132 7 7 7a6.977 6.977 0 0 0 4.875-1.975l.15-.15z",
  defaultProps,
 });
+
+export const ShareIcon = createIcon({
+  displayName: "share-icon",
+  d: "M13.12 17.023l-4.199-2.29a4 4 0 1 1 0-5.465l4.2-2.29a4 4 0 1 1 .959 1.755l-4.2 2.29a4.008 4.008 0 0 1 0 1.954l4.199 2.29a4 4 0 1 1-.959 1.755zM6 14a2 2 0 1 0 0-4 2 2 0 0 0 0 4zm11-6a2 2 0 1 0 0-4 2 2 0 0 0 0 4zm0 12a2 2 0 1 0 0-4 2 2 0 0 0 0 4z",
+  defaultProps,
+});
--- a/src/components/note/index.tsx
+++ b/src/components/note/index.tsx
@ -1,7 +1,7 @@
 import React from "react";
 import { Link as RouterLink } from "react-router-dom";
 import moment from "moment";
-import { Box, Card, CardBody, CardHeader, Flex, Heading, Link } from "@chakra-ui/react";
+import { Box, Card, CardBody, CardFooter, CardHeader, Flex, Heading, Link } from "@chakra-ui/react";
 import { NostrEvent } from "../../types/nostr-event";
 import { UserAvatarLink } from "../user-avatar-link";
 import { Bech32Prefix, normalizeToBech32 } from "../../helpers/nip-19";
@ -29,23 +29,15 @@ export const Note = React.memo(({ event }: NoteProps) => {
  return (
    <Card padding="2" variant="outline">
      <CardHeader padding="0" mb="2">
-        <Flex gap="2">
-          <Flex flex="1" gap="2">
-            <UserAvatarLink pubkey={event.pubkey} size={isMobile ? "xs" : "sm"} />
+        <Flex flex="1" gap="2" alignItems="center" wrap="wrap">
+          <UserAvatarLink pubkey={event.pubkey} size={isMobile ? "xs" : "sm"} />

-            <Box>
-              <Heading size="sm" display="inline">
-                <UserLink pubkey={event.pubkey} />
-              </Heading>
-              <span> </span>
-              <Link as={RouterLink} to={`/n/${normalizeToBech32(event.id, Bech32Prefix.Note)}`} whiteSpace="nowrap">
-                {moment(event.created_at * 1000).fromNow()}
-              </Link>
-            </Box>
-          </Flex>
-          <UserTipButton pubkey={event.pubkey} size="xs" />
-          <NoteRelays event={event} size="xs" />
-          <NoteMenu event={event} />
+          <Heading size="sm" display="inline">
+            <UserLink pubkey={event.pubkey} />
+          </Heading>
+          <Link as={RouterLink} to={`/n/${normalizeToBech32(event.id, Bech32Prefix.Note)}`} whiteSpace="nowrap">
+            {moment(event.created_at * 1000).fromNow()}
+          </Link>
        </Flex>
      </CardHeader>
      <CardBody padding="0">
@ -53,6 +45,11 @@ export const Note = React.memo(({ event }: NoteProps) => {
          <NoteContents event={event} trusted={following.includes(event.pubkey)} />
        </Box>
      </CardBody>
+      <CardFooter padding="0" display="flex" gap="2" justifyContent="flex-end">
+        <UserTipButton pubkey={event.pubkey} size="xs" />
+        <NoteRelays event={event} size="xs" />
+        <NoteMenu event={event} />
+      </CardFooter>
    </Card>
  );
 });
--- a/src/components/note/note-menu.tsx
+++ b/src/components/note/note-menu.tsx
@ -15,7 +15,7 @@ import { Bech32Prefix, normalizeToBech32 } from "../../helpers/nip-19";
 import { NostrEvent } from "../../types/nostr-event";
 import { MenuIconButton } from "../menu-icon-button";

-import { ClipboardIcon, CodeIcon, IMAGE_ICONS } from "../icons";
+import { ClipboardIcon, CodeIcon, IMAGE_ICONS, ShareIcon } from "../icons";
 import { getReferences } from "../../helpers/nostr-event";

 export const NoteMenu = ({ event }: { event: NostrEvent }) => {
@ -26,6 +26,10 @@ export const NoteMenu = ({ event }: { event: NostrEvent }) => {
  return (
    <>
      <MenuIconButton>
+        {/* TODO: should open the post modal and mention the note/relay */}
+        {/* <MenuItem icon={<ShareIcon />} onClick={() => console.log("Share Note", event)}>
+          Repost
+        </MenuItem> */}
        <MenuItem
          as="a"
          icon={<Avatar src={IMAGE_ICONS.nostrGuruIcon} size="xs" />}
@ -73,8 +77,10 @@ export const NoteMenu = ({ event }: { event: NostrEvent }) => {
          <ModalContent>
            <ModalHeader>Raw Event</ModalHeader>
            <ModalCloseButton />
-            <ModalBody overflow="auto">
+            <ModalBody overflow="auto" fontSize="sm" padding="2">
+              Raw JSON:
              <pre>{JSON.stringify(event, null, 2)}</pre>
+              Parsed Refs:
              <pre>{JSON.stringify(getReferences(event), null, 2)}</pre>
            </ModalBody>
          </ModalContent>
--- a/src/components/note/note-relays.tsx
+++ b/src/components/note/note-relays.tsx
@ -10,7 +10,6 @@ import {
  PopoverTrigger,
  Text,
  Flex,
-  Portal,
  PopoverFooter,
 } from "@chakra-ui/react";
 import { nostrPostAction } from "../../classes/nostr-post-action";
@ -68,26 +67,24 @@ export const NoteRelays = memo(({ event, ...props }: NoteRelaysProps) => {
      <PopoverTrigger>
        <IconButton title="Note Relays" icon={<RelayIcon />} size={props.size ?? "sm"} aria-label="Note Relays" />
      </PopoverTrigger>
-      <Portal>
-        <PopoverContent>
-          <PopoverArrow />
-          <PopoverBody>
-            {relays.map((url) => (
-              <Text key={url}>{url}</Text>
-            ))}
-          </PopoverBody>
-          <PopoverFooter>
-            <Flex gap="2">
-              <Button size="xs" onClick={queryRelays} isLoading={querying} leftIcon={<SearchIcon />}>
-                Search
-              </Button>
-              <Button size="xs" onClick={broadcast} isLoading={broadcasting} leftIcon={<RelayIcon />}>
-                Broadcast
-              </Button>
-            </Flex>
-          </PopoverFooter>
-        </PopoverContent>
-      </Portal>
+      <PopoverContent>
+        <PopoverArrow />
+        <PopoverBody>
+          {relays.map((url) => (
+            <Text key={url}>{url}</Text>
+          ))}
+        </PopoverBody>
+        <PopoverFooter>
+          <Flex gap="2">
+            <Button size="xs" onClick={queryRelays} isLoading={querying} leftIcon={<SearchIcon />}>
+              Search
+            </Button>
+            <Button size="xs" onClick={broadcast} isLoading={broadcasting} leftIcon={<RelayIcon />}>
+              Broadcast
+            </Button>
+          </Flex>
+        </PopoverFooter>
+      </PopoverContent>
    </Popover>
  );
 });
--- a/src/components/page.tsx
+++ b/src/components/page.tsx
@ -1,7 +1,7 @@
 import React from "react";
 import { Avatar, Button, Container, Flex, Heading, IconButton, LinkOverlay, VStack } from "@chakra-ui/react";
 import { Link, useNavigate } from "react-router-dom";
-import { HomeIcon, LogoutIcon, ProfileIcon, SettingsIcon } from "./icons";
+import { FeedIcon, LogoutIcon, ProfileIcon, SettingsIcon } from "./icons";
 import { ErrorBoundary } from "./error-boundary";
 import { ConnectedRelays } from "./connected-relays";

@ -10,84 +10,75 @@ import identity from "../services/identity";
 import { FollowingList } from "./following-list";
 import { ReloadPrompt } from "./reload-prompt";

-const MobileLayout = ({ children }: { children: React.ReactNode }) => {
-  const navigate = useNavigate();
-
-  return (
-    <Flex direction="column" height="100%">
-      <ReloadPrompt />
-      <Flex flexGrow={1} direction="column" overflow="hidden">
-        {children}
-      </Flex>
-      <Flex flexShrink={0} gap="2" padding="2">
-        <IconButton icon={<HomeIcon />} aria-label="Home" onClick={() => navigate("/")} flexGrow="1" size="lg" />
-        <IconButton
-          icon={<ProfileIcon />}
-          aria-label="Profile"
-          onClick={() => navigate(`/profile`)}
-          flexGrow="1"
-          size="lg"
-        />
-        <IconButton
-          icon={<SettingsIcon />}
-          aria-label="Settings"
-          onClick={() => navigate("/settings")}
-          flexGrow="1"
-          size="lg"
-        />
-      </Flex>
-    </Flex>
-  );
-};
-const DesktopLayout = ({ children }: { children: React.ReactNode }) => {
-  const navigate = useNavigate();
-
-  return (
-    <>
-      <Container
-        size="lg"
-        display="flex"
-        gap="2"
-        flexDirection="column"
-        height="100vh"
-        overflow="hidden"
-        position="relative"
-      >
-        <ReloadPrompt />
-        <Flex gap="4" grow={1} overflow="hidden">
-          <VStack width="15rem" pt="2" alignItems="stretch" flexShrink={0}>
-            <Flex gap="2" alignItems="center" position="relative">
-              <LinkOverlay as={Link} to="/" />
-              <Avatar src="/apple-touch-icon.png" size="sm" />
-              <Heading size="md">noStrudel</Heading>
-            </Flex>
-            <Button onClick={() => navigate("/")} leftIcon={<HomeIcon />}>
-              Home
-            </Button>
-            <Button onClick={() => navigate("/settings")} leftIcon={<SettingsIcon />}>
-              Settings
-            </Button>
-            <Button onClick={() => identity.logout()} leftIcon={<LogoutIcon />}>
-              Logout
-            </Button>
-            <ConnectedRelays />
-          </VStack>
-          <Flex flexGrow={1} direction="column" overflow="hidden">
-            <ErrorBoundary>{children}</ErrorBoundary>
-          </Flex>
-          <VStack width="15rem" pt="2" alignItems="stretch" flexShrink={0}>
-            <Heading size="md">Following</Heading>
-            <FollowingList />
-          </VStack>
-        </Flex>
-      </Container>
-    </>
-  );
-};
-
 export const Page = ({ children }: { children: React.ReactNode }) => {
+  const navigate = useNavigate();
  const isMobile = useIsMobile();
-  const Layout = isMobile ? MobileLayout : DesktopLayout;

-  return <Layout>{children}</Layout>;
+  if (isMobile) {
+    return (
+      <Flex direction="column" height="100%">
+        <ReloadPrompt />
+        <Flex flexGrow={1} direction="column" overflow="hidden">
+          {children}
+        </Flex>
+        <Flex flexShrink={0} gap="2" padding="2">
+          <IconButton icon={<FeedIcon />} aria-label="Home" onClick={() => navigate("/")} flexGrow="1" size="lg" />
+          <IconButton
+            icon={<ProfileIcon />}
+            aria-label="Profile"
+            onClick={() => navigate(`/profile`)}
+            flexGrow="1"
+            size="lg"
+          />
+          <IconButton
+            icon={<SettingsIcon />}
+            aria-label="Settings"
+            onClick={() => navigate("/settings")}
+            flexGrow="1"
+            size="lg"
+          />
+        </Flex>
+      </Flex>
+    );
+  }
+
+  return (
+    <Container
+      size="lg"
+      display="flex"
+      gap="2"
+      flexDirection="column"
+      height="100vh"
+      overflow="hidden"
+      position="relative"
+    >
+      <ReloadPrompt />
+      <Flex gap="4" grow={1} overflow="hidden">
+        <VStack width="15rem" pt="2" alignItems="stretch" flexShrink={0}>
+          <Flex gap="2" alignItems="center" position="relative">
+            <LinkOverlay as={Link} to="/" />
+            <Avatar src="/apple-touch-icon.png" size="sm" />
+            <Heading size="md">noStrudel</Heading>
+          </Flex>
+          <Button onClick={() => navigate("/")} leftIcon={<FeedIcon />}>
+            Home
+          </Button>
+          <Button onClick={() => navigate("/settings")} leftIcon={<SettingsIcon />}>
+            Settings
+          </Button>
+          <Button onClick={() => identity.logout()} leftIcon={<LogoutIcon />}>
+            Logout
+          </Button>
+          <ConnectedRelays />
+        </VStack>
+        <Flex flexGrow={1} direction="column" overflow="hidden">
+          <ErrorBoundary>{children}</ErrorBoundary>
+        </Flex>
+        <VStack width="15rem" pt="2" alignItems="stretch" flexShrink={0}>
+          <Heading size="md">Following</Heading>
+          <FollowingList />
+        </VStack>
+      </Flex>
+    </Container>
+  );
 };
--- a/src/views/login.tsx
+++ b/src/views/login.tsx
@ -1,4 +1,4 @@
-import { Button, Flex, Heading, Spinner } from "@chakra-ui/react";
+import { Avatar, Button, Flex, Heading, Spinner } from "@chakra-ui/react";
 import { Navigate, useLocation } from "react-router-dom";
 import useSubject from "../hooks/use-subject";
 import identity from "../services/identity";
@ -12,8 +12,9 @@ export const LoginView = () => {
  if (setup) return <Navigate to={location.state?.from ?? "/"} replace />;

  return (
-    <Flex direction="column" alignItems="center" justifyContent="center">
-      <Heading>Login</Heading>
+    <Flex direction="column" alignItems="center" justifyContent="center" gap="4" height="80%">
+      <Avatar src="/apple-touch-icon.png" size="lg" />
+      <Heading>noStrudel</Heading>
      <Button onClick={() => identity.loginWithExtension()}>Use browser extension</Button>
    </Flex>
  );