Some styling and organization imporvements in feeds mostly

public/next.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>

public/vercel.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 283 64"><path fill="black" d="M141 16c-11 0-19 7-19 18s9 18 20 18c7 0 13-3 16-7l-7-5c-2 3-6 4-9 4-5 0-9-3-10-7h28v-3c0-11-8-18-19-18zm-9 15c1-4 4-7 9-7s8 3 9 7h-18zm117-15c-11 0-19 7-19 18s9 18 20 18c6 0 12-3 16-7l-8-5c-2 3-5 4-8 4-5 0-9-3-11-7h28l1-3c0-11-8-18-19-18zm-10 15c2-4 5-7 10-7s8 3 9 7h-19zm-39 3c0 6 4 10 10 10 4 0 7-2 9-5l8 5c-3 5-9 8-17 8-11 0-19-7-19-18s8-18 19-18c8 0 14 3 17 8l-8 5c-2-3-5-5-9-5-6 0-10 4-10 10zm83-29v46h-9V5h9zM37 0l37 64H0L37 0zm92 5-27 48L74 5h10l18 30 17-30h10zm59 12v10l-3-1c-6 0-10 4-10 10v15h-9V17h9v9c0-5 6-9 13-9z"/></svg>

src/components/BottomBar.js

@@ -11,13 +11,13 @@ const BottomBar = () => {
 
     return (
         <div className='min-bottom-bar:hidden fixed bottom-0 left-0 right-0 bg-gray-800 p-2 flex justify-around items-center z-20 border-t-2 border-gray-700'>
-            <div onClick={() => router.push('/')} className={`cursor-pointer px-4 py-3 rounded-lg ${isActive('/') ? 'bg-gray-700' : ''}`}>
+            <div onClick={() => router.push('/')} className={`hover:bg-gray-700 cursor-pointer px-4 py-3 rounded-lg ${isActive('/') ? 'bg-gray-700' : ''}`}>
                 <i className="pi pi-home text-2xl" />
             </div>
-            <div onClick={() => router.push('/content')} className={`cursor-pointer px-4 py-3 rounded-lg ${isActive('/content') ? 'bg-gray-700' : ''}`}>
+            <div onClick={() => router.push('/content')} className={`hover:bg-gray-700 cursor-pointer px-4 py-3 rounded-lg ${isActive('/content') ? 'bg-gray-700' : ''}`}>
                 <i className="pi pi-video text-2xl" />
             </div>
-            <div onClick={() => router.push('/feed?channel=global')} className={`cursor-pointer px-4 py-3 rounded-lg ${isActive('/feed') ? 'bg-gray-700' : ''}`}>
+            <div onClick={() => router.push('/feed?channel=global')} className={`hover:bg-gray-700 cursor-pointer px-4 py-3 rounded-lg ${isActive('/feed') ? 'bg-gray-700' : ''}`}>
                 <i className="pi pi-comments text-2xl" />
             </div>
         </div>

src/components/feeds/GlobalFeed.js

@@ -11,7 +11,7 @@ import { useRouter } from 'next/router';
 import { useCommunityNotes } from '@/hooks/nostr/useCommunityNotes';
 import { useNDKContext } from '@/context/NDKContext';
 import { findKind0Fields } from '@/utils/nostr';
-import NostrIcon from '../../../public/nostr.png';
+import NostrIcon from '../../../public/images/nostr.png';
 import Image from 'next/image';
 import { useImageProxy } from '@/hooks/useImageProxy';
 import { nip19 } from 'nostr-tools';
@@ -54,7 +54,28 @@ const GlobalFeed = () => {
     }, [nostrData]);
 
     const fetchAuthor = async (pubkey) => {
-        // ... (keep the existing fetchAuthor function)
+        try {
+            await ndk.connect();
+
+            const filter = {
+                kinds: [0],
+                authors: [pubkey]
+            }
+
+            const author = await ndk.fetchEvent(filter);
+            if (author) {
+                try {
+                    const fields = await findKind0Fields(JSON.parse(author.content));
+                    return fields;
+                } catch (error) {
+                    console.error('Error fetching author:', error);
+                }
+            } else {
+                return null;
+            }
+        } catch (error) {
+            console.error('Error fetching author:', error);
+        }
     }
 
     if (discordLoading || stackerNewsLoading || nostrLoading) {
@@ -69,6 +90,17 @@ const GlobalFeed = () => {
         return <div className="text-red-500 text-center p-4">Failed to load feed. Please try again later.</div>;
     }
 
+    const getAvatarImage = (item) => {
+        if (item.type === 'discord') {
+            return item.avatar ? returnImageProxy(item.avatar) : null;
+        } else if (item.type === 'nostr') {
+            return authorData[item.pubkey]?.avatar ? returnImageProxy(authorData[item.pubkey]?.avatar) : null;
+        } else if (item.type === 'stackernews') {
+            return item.user.image ? returnImageProxy(item.user.image) : null;
+        }
+        return null;
+    };
+
     const combinedFeed = [
         ...(discordData || []).map(item => ({ ...item, type: 'discord' })),
         ...(stackerNewsData || []).map(item => ({ ...item, type: 'stackernews' })),
@@ -83,8 +115,7 @@ const GlobalFeed = () => {
         <div className="flex flex-row w-full items-center justify-between p-4 bg-gray-800 rounded-t-lg">
             <div className="flex flex-row items-center">
                 <Avatar 
-                    image={item.type === 'discord' ? item.avatar : 
-                           item.type === 'nostr' ? authorData[item.pubkey]?.avatar : null} 
+                    image={getAvatarImage(item)}
                     icon={item.type === 'stackernews' ? "pi pi-user" : null} 
                     shape="circle" 
                     size="large" 

src/components/feeds/NostrFeed.js

@@ -8,7 +8,7 @@ import { useCommunityNotes } from '@/hooks/nostr/useCommunityNotes';
 import { useRouter } from 'next/router';
 import { useNDKContext } from '@/context/NDKContext';
 import { findKind0Fields } from '@/utils/nostr';
-import NostrIcon from '../../../public/nostr.png';
+import NostrIcon from '../../../public/images/nostr.png';
 import Image from 'next/image';
 import { useImageProxy } from '@/hooks/useImageProxy';
 import { nip19 } from 'nostr-tools';

src/components/menutab/CommunityMenuTab.js

@@ -2,8 +2,8 @@ import React, { useState, useEffect } from 'react';
 import { Button } from 'primereact/button';
 import { TabMenu } from 'primereact/tabmenu';
 import Image from 'next/image';
-import StackerNewsIcon from '../../../public/sn.svg';
-import NostrIcon from '../../../public/nostr.png';
+import StackerNewsIcon from '../../../public/images/sn.svg';
+import NostrIcon from '../../../public/images/nostr.png';
 
 const CommunityMenuTab = ({ selectedTopic, onTabChange }) => {
     const allItems = ['global', 'nostr', 'discord', 'stackernews'];

src/pages/feed.js

@@ -9,9 +9,9 @@ import GlobalFeed from '@/components/feeds/GlobalFeed';
 import { useRouter } from 'next/router';
 import { Message } from 'primereact/message';
 import { Tag } from 'primereact/tag';
-import StackerNewsIcon from '../../public/sn.svg';
-import NostrIcon from '../../public/nostr.png';
-
+import StackerNewsIcon from '../../public/images/sn.svg';
+import NostrIcon from '../../public/images/nostr.png';
+import { Button } from 'primereact/button';
 const Feed = () => {
     const [selectedTopic, setSelectedTopic] = useState('global');
     const [searchQuery, setSearchQuery] = useState('');
@@ -50,20 +50,21 @@ const Feed = () => {
     };
 
     return (
-        <div className="bg-gray-900 h-full w-[100vw] min-bottom-bar:w-[87vw]">
+        <div className="bg-gray-900 h-[100vh] w-[100vw] min-bottom-bar:w-[87vw]">
             <div className="w-fit mx-4 pt-4 flex flex-col items-start">
-                <div className='mb-4 flex flex-row items-center'>
-                    <h1 className="text-3xl font-bold ml-1">Community</h1>
-                    <Tag 
+                <div className='mb-4 flex flex-row items-end'>
+                    <h2 className="font-bold ml-1 mb-0">Community</h2>
+                    <Button 
                         icon={getTagIcon(title)}
-                        className='ml-2 text-sm p-2 text-[#f8f8ff] flex items-center'
+                        className='ml-2 text-sm p-2 py-1 flex items-center cursor-default hover:bg-transparent'
+                        outlined
                         severity={{
                             'global': 'success',
                             'discord': 'primary',
                             'stackernews': 'warning',
-                            'nostr': 'info'
+                            'nostr': 'help'
                         }[title] || 'info'}
-                        value={`${title}`} 
+                        label={`${title}`} 
                     />
                 </div>
                 <InputText

tailwind.config.js

@@ -26,7 +26,7 @@ module.exports = {
       },
       fontSize: {
         'h1': ['2.25rem', { lineHeight: '2.5rem' }],
-        'h2': ['1.5rem', { lineHeight: '2rem' }],
+        'h2': ['1.75rem', { lineHeight: '2rem' }],
         'h3': ['1.25rem', { lineHeight: '1.75rem' }],
       },
     },