diff --git a/package.json b/package.json index 69f57f0a..160c3621 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "dependencies": { "@capacitor/app": "1.1.1", "@floating-ui/react": "0.26.1", - "@plebbit/plebbit-react-hooks": "https://github.com/plebbit/plebbit-react-hooks.git#176d361ce4dfecc4fdc3c3675a9777099d47d8ce", + "@plebbit/plebbit-react-hooks": "https://github.com/plebbit/plebbit-react-hooks.git#6d0d38ad52ce77715cb05be6cec55d691f5f013d", "@testing-library/jest-dom": "5.14.1", "@testing-library/react": "13.0.0", "@testing-library/user-event": "13.2.1", diff --git a/public/translations/ar/default.json b/public/translations/ar/default.json index cb8d44a1..9aa81b5f 100644 --- a/public/translations/ar/default.json +++ b/public/translations/ar/default.json @@ -300,5 +300,7 @@ "undelete": "إلغاء الحذف", "loading_comments": "تحميل التعليقات", "you_blocked_community": "لقد حظرت هذه المجتمعة", - "show": "اظهر" + "show": "اظهر", + "plebbit_options": "خيارات plebbit", + "general": "عام" } \ No newline at end of file diff --git a/public/translations/bn/default.json b/public/translations/bn/default.json index 8319722d..27e36ea8 100644 --- a/public/translations/bn/default.json +++ b/public/translations/bn/default.json @@ -300,5 +300,7 @@ "undelete": "মুছে ফেলা প্রত্যাহার", "loading_comments": "মন্তব্য লোড হচ্ছে", "you_blocked_community": "আপনি এই সম্প্রদায়টি ব্লক করেছেন", - "show": "দেখান" + "show": "দেখান", + "plebbit_options": "প্লেবিট বিকল্প", + "general": "সাধারণ" } \ No newline at end of file diff --git a/public/translations/cs/default.json b/public/translations/cs/default.json index 219bdebb..9b3d45d9 100644 --- a/public/translations/cs/default.json +++ b/public/translations/cs/default.json @@ -300,5 +300,7 @@ "undelete": "Obnovit smazání", "loading_comments": "Načítání komentářů", "you_blocked_community": "Zablokovali jste tuto komunitu", - "show": "ukázat" + "show": "ukázat", + "plebbit_options": "plebbit možnosti", + "general": "obecné" } \ No newline at end of file diff --git a/public/translations/da/default.json b/public/translations/da/default.json index 19a4943c..3b9a9f2d 100644 --- a/public/translations/da/default.json +++ b/public/translations/da/default.json @@ -300,5 +300,7 @@ "undelete": "Gendan sletning", "loading_comments": "Indlæser kommentarer", "you_blocked_community": "Du har blokeret dette fællesskab", - "show": "vise" + "show": "vise", + "plebbit_options": "plebbit indstillinger", + "general": "almindelig" } \ No newline at end of file diff --git a/public/translations/de/default.json b/public/translations/de/default.json index 8f2645f8..b615cc2a 100644 --- a/public/translations/de/default.json +++ b/public/translations/de/default.json @@ -300,5 +300,7 @@ "undelete": "Wiederherstellen", "loading_comments": "Lade Kommentare", "you_blocked_community": "Du hast diese Gemeinschaft blockiert", - "show": "zeigen" + "show": "zeigen", + "plebbit_options": "plebbit optionen", + "general": "allgemein" } \ No newline at end of file diff --git a/public/translations/el/default.json b/public/translations/el/default.json index d2600da2..4a3df98d 100644 --- a/public/translations/el/default.json +++ b/public/translations/el/default.json @@ -300,5 +300,7 @@ "undelete": "Ανάκτηση διαγραφής", "loading_comments": "Φόρτωση σχολίων", "you_blocked_community": "Έχετε αποκλείσει αυτή την κοινότητα", - "show": "εμφάνιση" + "show": "εμφάνιση", + "plebbit_options": "επιλογές plebbit", + "general": "γενικός" } \ No newline at end of file diff --git a/public/translations/en/default.json b/public/translations/en/default.json index 447346c1..d876acd4 100644 --- a/public/translations/en/default.json +++ b/public/translations/en/default.json @@ -300,5 +300,7 @@ "undelete": "Undelete", "loading_comments": "Loading comments", "you_blocked_community": "You blocked this community", - "show": "show" + "show": "show", + "plebbit_options": "plebbit options", + "general": "general" } \ No newline at end of file diff --git a/public/translations/es/default.json b/public/translations/es/default.json index 0cc32f3f..e3de8195 100644 --- a/public/translations/es/default.json +++ b/public/translations/es/default.json @@ -300,5 +300,7 @@ "undelete": "Recuperar", "loading_comments": "Cargando comentarios", "you_blocked_community": "Has bloqueado esta comunidad", - "show": "mostrar" + "show": "mostrar", + "plebbit_options": "opciones plebbit", + "general": "general" } \ No newline at end of file diff --git a/public/translations/fa/default.json b/public/translations/fa/default.json index 9fea160b..b0a7da2e 100644 --- a/public/translations/fa/default.json +++ b/public/translations/fa/default.json @@ -300,5 +300,7 @@ "undelete": "بازیابی", "loading_comments": "بارگذاری نظرات", "you_blocked_community": "شما این انجمن را مسدود کرده‌اید", - "show": "نمایش" + "show": "نمایش", + "plebbit_options": "گزینه های plebbit", + "general": "عمومی" } \ No newline at end of file diff --git a/public/translations/fi/default.json b/public/translations/fi/default.json index 07b5d713..6929250d 100644 --- a/public/translations/fi/default.json +++ b/public/translations/fi/default.json @@ -300,5 +300,7 @@ "undelete": "Palauta", "loading_comments": "Ladataan kommentteja", "you_blocked_community": "Olet estänyt tämän yhteisön", - "show": "näyttää" + "show": "näyttää", + "plebbit_options": "plebbit-vaihtoehdot", + "general": "yleinen" } \ No newline at end of file diff --git a/public/translations/fil/default.json b/public/translations/fil/default.json index 505ccb71..bdff3af7 100644 --- a/public/translations/fil/default.json +++ b/public/translations/fil/default.json @@ -300,5 +300,7 @@ "undelete": "I-undelete", "loading_comments": "Naglo-load ng mga komento", "you_blocked_community": "I-block mo ang komunidad na ito", - "show": "ipakita" + "show": "ipakita", + "plebbit_options": "mga pagpipilian ng plebbit", + "general": "pangkalahatan" } \ No newline at end of file diff --git a/public/translations/fr/default.json b/public/translations/fr/default.json index e7a9226b..deb955c6 100644 --- a/public/translations/fr/default.json +++ b/public/translations/fr/default.json @@ -300,5 +300,7 @@ "undelete": "Récupérer", "loading_comments": "Chargement des commentaires", "you_blocked_community": "Vous avez bloqué cette communauté", - "show": "montrer" + "show": "montrer", + "plebbit_options": "options plebbit", + "general": "général" } \ No newline at end of file diff --git a/public/translations/he/default.json b/public/translations/he/default.json index 70f56825..d8ae3824 100644 --- a/public/translations/he/default.json +++ b/public/translations/he/default.json @@ -300,5 +300,7 @@ "undelete": "שחזור מחיקה", "loading_comments": "טוען תגובות", "you_blocked_community": "חסמת את הקהילה הזו", - "show": "תצוגה" + "show": "תצוגה", + "plebbit_options": "אפשרויות plebbit", + "general": "כללי" } \ No newline at end of file diff --git a/public/translations/hi/default.json b/public/translations/hi/default.json index d086ca9c..cf9bab4a 100644 --- a/public/translations/hi/default.json +++ b/public/translations/hi/default.json @@ -300,5 +300,7 @@ "undelete": "डिलीट को वापस लाओ", "loading_comments": "टिप्पणियाँ लोड हो रही हैं", "you_blocked_community": "आपने इस समुदाय को ब्लॉक कर दिया है", - "show": "दिखाएँ" + "show": "दिखाएँ", + "plebbit_options": "plebbit विकल्प", + "general": "सामान्य" } \ No newline at end of file diff --git a/public/translations/hu/default.json b/public/translations/hu/default.json index 7b7a9102..45799f52 100644 --- a/public/translations/hu/default.json +++ b/public/translations/hu/default.json @@ -300,5 +300,7 @@ "undelete": "Visszaállítás", "loading_comments": "Megjegyzések betöltése", "you_blocked_community": "Blokkoltad ezt a közösséget", - "show": "mutat" + "show": "mutat", + "plebbit_options": "plebbit lehetőségek", + "general": "általános" } \ No newline at end of file diff --git a/public/translations/id/default.json b/public/translations/id/default.json index 98513015..c178cd7a 100644 --- a/public/translations/id/default.json +++ b/public/translations/id/default.json @@ -300,5 +300,7 @@ "undelete": "Batalkan penghapusan", "loading_comments": "Memuat komentar", "you_blocked_community": "Anda telah memblokir komunitas ini", - "show": "menunjukkan" + "show": "menunjukkan", + "plebbit_options": "opsi plebbit", + "general": "umum" } \ No newline at end of file diff --git a/public/translations/it/default.json b/public/translations/it/default.json index a7e215b5..960fe8fc 100644 --- a/public/translations/it/default.json +++ b/public/translations/it/default.json @@ -300,5 +300,7 @@ "undelete": "Annulla eliminazione", "loading_comments": "Caricamento commenti", "you_blocked_community": "Hai bloccato questa comunità", - "show": "mostra" + "show": "mostra", + "plebbit_options": "opzioni plebbit", + "general": "generali" } \ No newline at end of file diff --git a/public/translations/ja/default.json b/public/translations/ja/default.json index 5de0216b..aabdeb53 100644 --- a/public/translations/ja/default.json +++ b/public/translations/ja/default.json @@ -300,5 +300,7 @@ "undelete": "削除を取り消す", "loading_comments": "コメントを読み込み中", "you_blocked_community": "このコミュニティをブロックしました", - "show": "表示" + "show": "表示", + "plebbit_options": "plebbitのオプション", + "general": "一般的な" } \ No newline at end of file diff --git a/public/translations/ko/default.json b/public/translations/ko/default.json index c22f3ac2..83b273b8 100644 --- a/public/translations/ko/default.json +++ b/public/translations/ko/default.json @@ -300,5 +300,7 @@ "undelete": "삭제 취소", "loading_comments": "댓글 로드 중", "you_blocked_community": "이 커뮤니티를 차단했습니다", - "show": "보여주다" + "show": "보여주다", + "plebbit_options": "plebbit 옵션", + "general": "일반" } \ No newline at end of file diff --git a/public/translations/mr/default.json b/public/translations/mr/default.json index 6d00702f..5fe49b3b 100644 --- a/public/translations/mr/default.json +++ b/public/translations/mr/default.json @@ -300,5 +300,7 @@ "undelete": "डिलीट करा", "loading_comments": "टिप्पणी लोड होत आहे", "you_blocked_community": "तुम्ही ह्या समुदायाला ब्लॉक केलं आहे", - "show": "दाखवा" + "show": "दाखवा", + "plebbit_options": "प्लेबिट पर्याय", + "general": "सामान्य" } \ No newline at end of file diff --git a/public/translations/nl/default.json b/public/translations/nl/default.json index 778a6786..4fc7cebb 100644 --- a/public/translations/nl/default.json +++ b/public/translations/nl/default.json @@ -300,5 +300,7 @@ "undelete": "Herstellen", "loading_comments": "Reacties laden", "you_blocked_community": "U hebt deze gemeenschap geblokkeerd", - "show": "tonen" + "show": "tonen", + "plebbit_options": "plebbit-opties", + "general": "algemeen" } \ No newline at end of file diff --git a/public/translations/no/default.json b/public/translations/no/default.json index 13406736..76c293d8 100644 --- a/public/translations/no/default.json +++ b/public/translations/no/default.json @@ -300,5 +300,7 @@ "undelete": "Gjenopprette", "loading_comments": "Laster inn kommentarer", "you_blocked_community": "Du har blokkert dette fellesskapet", - "show": "vise" + "show": "vise", + "plebbit_options": "plebbit alternativer", + "general": "generell" } \ No newline at end of file diff --git a/public/translations/pl/default.json b/public/translations/pl/default.json index 624ab992..677168e4 100644 --- a/public/translations/pl/default.json +++ b/public/translations/pl/default.json @@ -300,5 +300,7 @@ "undelete": "Przywróć", "loading_comments": "Ładowanie komentarzy", "you_blocked_community": "Zablokowałeś tę społeczność", - "show": "pokazać" + "show": "pokazać", + "plebbit_options": "opcje plebbit", + "general": "ogólny" } \ No newline at end of file diff --git a/public/translations/pt/default.json b/public/translations/pt/default.json index 21cfa3a6..d6e47665 100644 --- a/public/translations/pt/default.json +++ b/public/translations/pt/default.json @@ -300,5 +300,7 @@ "undelete": "Recuperar", "loading_comments": "Carregando comentários", "you_blocked_community": "Você bloqueou esta comunidade", - "show": "mostrar" + "show": "mostrar", + "plebbit_options": "opções plebbit", + "general": "geral" } \ No newline at end of file diff --git a/public/translations/ro/default.json b/public/translations/ro/default.json index ebf4c5f2..eece302f 100644 --- a/public/translations/ro/default.json +++ b/public/translations/ro/default.json @@ -300,5 +300,7 @@ "undelete": "Recuperare", "loading_comments": "Se încarcă comentariile", "you_blocked_community": "Ați blocat această comunitate", - "show": "arată" + "show": "arată", + "plebbit_options": "opțiuni plebbit", + "general": "general" } \ No newline at end of file diff --git a/public/translations/ru/default.json b/public/translations/ru/default.json index 70f65bb4..17f962cf 100644 --- a/public/translations/ru/default.json +++ b/public/translations/ru/default.json @@ -300,5 +300,7 @@ "undelete": "Восстановить", "loading_comments": "Загрузка комментариев", "you_blocked_community": "Вы заблокировали это сообщество", - "show": "показать" + "show": "показать", + "plebbit_options": "опции plebbit", + "general": "общий" } \ No newline at end of file diff --git a/public/translations/sq/default.json b/public/translations/sq/default.json index 2eae99b3..a754c303 100644 --- a/public/translations/sq/default.json +++ b/public/translations/sq/default.json @@ -300,5 +300,7 @@ "undelete": "Rikuperimi", "loading_comments": "Duke u ngarkuar komentet", "you_blocked_community": "Ju keni bllokuar këtë komunitet", - "show": "shfaq" + "show": "shfaq", + "plebbit_options": "opsione plebbit", + "general": "i përgjithshëm" } \ No newline at end of file diff --git a/public/translations/sv/default.json b/public/translations/sv/default.json index 9ac2558f..e61967cf 100644 --- a/public/translations/sv/default.json +++ b/public/translations/sv/default.json @@ -300,5 +300,7 @@ "undelete": "Ångra radering", "loading_comments": "Laddar kommentarer", "you_blocked_community": "Du har blockerat den här gemenskapen", - "show": "visa" + "show": "visa", + "plebbit_options": "plebbit-alternativ", + "general": "allmän" } \ No newline at end of file diff --git a/public/translations/te/default.json b/public/translations/te/default.json index e9f9f5fe..761955a5 100644 --- a/public/translations/te/default.json +++ b/public/translations/te/default.json @@ -300,5 +300,7 @@ "undelete": "తొలగించడం రద్దు చేయండి", "loading_comments": "వ్యాఖ్యలను లోడ్ అవుతోంది", "you_blocked_community": "ఈ సముదాయాన్ని మీరు నిరోధించారు", - "show": "చూపించు" + "show": "చూపించు", + "plebbit_options": "plebbit ఎంపికలు", + "general": "సాధారణ" } \ No newline at end of file diff --git a/public/translations/th/default.json b/public/translations/th/default.json index 6f14d0ab..07fff626 100644 --- a/public/translations/th/default.json +++ b/public/translations/th/default.json @@ -300,5 +300,7 @@ "undelete": "ยกเลิกการลบ", "loading_comments": "กำลังโหลดความคิดเห็น", "you_blocked_community": "คุณบล็อกชุมชนนี้แล้ว", - "show": "แสดง" + "show": "แสดง", + "plebbit_options": "ตัวเลือก plebbit", + "general": "ทั่วไป" } \ No newline at end of file diff --git a/public/translations/tr/default.json b/public/translations/tr/default.json index 74fb8252..2e2fd8ec 100644 --- a/public/translations/tr/default.json +++ b/public/translations/tr/default.json @@ -300,5 +300,7 @@ "undelete": "Silme işlemini geri al", "loading_comments": "Yorumlar yükleniyor", "you_blocked_community": "Bu topluluğu engellediniz", - "show": "göstermek" + "show": "göstermek", + "plebbit_options": "plebbit seçenekleri", + "general": "genel" } \ No newline at end of file diff --git a/public/translations/uk/default.json b/public/translations/uk/default.json index 1ab04f44..6c3729f1 100644 --- a/public/translations/uk/default.json +++ b/public/translations/uk/default.json @@ -300,5 +300,7 @@ "undelete": "Скасувати видалення", "loading_comments": "Завантаження коментарів", "you_blocked_community": "Ви заблокували цю спільноту", - "show": "показати" + "show": "показати", + "plebbit_options": "плебіт варіанти", + "general": "загальний" } \ No newline at end of file diff --git a/public/translations/ur/default.json b/public/translations/ur/default.json index 70aad673..a6e5ef65 100644 --- a/public/translations/ur/default.json +++ b/public/translations/ur/default.json @@ -300,5 +300,7 @@ "undelete": "حذف کو واپس لائیں", "loading_comments": "تبصرے لوڈ ہو رہے ہیں", "you_blocked_community": "آپ نے یہ سماج بلاک کر دی ہے", - "show": "دکھائیں" + "show": "دکھائیں", + "plebbit_options": "پلیبٹ اختیارات", + "general": "عام" } \ No newline at end of file diff --git a/public/translations/vi/default.json b/public/translations/vi/default.json index 97c1ec01..5b6f29c1 100644 --- a/public/translations/vi/default.json +++ b/public/translations/vi/default.json @@ -300,5 +300,7 @@ "undelete": "Khôi phục", "loading_comments": "Đang tải bình luận", "you_blocked_community": "Bạn đã chặn cộng đồng này", - "show": "hiển thị" + "show": "hiển thị", + "plebbit_options": "tùy chọn plebbit", + "general": "chung" } \ No newline at end of file diff --git a/public/translations/zh/default.json b/public/translations/zh/default.json index f38d1368..9567ac8f 100644 --- a/public/translations/zh/default.json +++ b/public/translations/zh/default.json @@ -300,5 +300,7 @@ "undelete": "取消删除", "loading_comments": "正在加载评论", "you_blocked_community": "您已封锁了此社区", - "show": "显示" + "show": "显示", + "plebbit_options": "plebbit选项", + "general": "一般" } \ No newline at end of file diff --git a/src/app.tsx b/src/app.tsx index b08be450..c7cf68b9 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -113,6 +113,7 @@ const App = () => { } /> } /> + } /> } /> diff --git a/src/components/header/header.module.css b/src/components/header/header.module.css index ad85da1a..bd2daa5c 100644 --- a/src/components/header/header.module.css +++ b/src/components/header/header.module.css @@ -131,7 +131,7 @@ .tabMenu li .choice { color: var(--text-primary); background-color: var(--background-secondary); - border-bottom: 0px solid var(--border-primary); + border-bottom: 1px solid var(--border-primary); } .tabs { diff --git a/src/components/header/header.tsx b/src/components/header/header.tsx index 2aecd3b7..d6c970a4 100644 --- a/src/components/header/header.tsx +++ b/src/components/header/header.tsx @@ -34,6 +34,7 @@ import { isSubplebbitsVoteView, isSubplebbitsOwnerView, isProfileUpvotedView, + isSettingsPlebbitOptionsView, } from '../../lib/utils/view-utils'; import useTheme from '../../hooks/use-theme'; import { TimeFilterKey } from '../../hooks/use-time-filter'; @@ -243,6 +244,26 @@ const SubplebbitsHeaderTabs = () => { ); }; +const SettingsHeaderTabs = () => { + const { t } = useTranslation(); + const isInSettingsPlebbitOptionsView = isSettingsPlebbitOptionsView(useLocation().pathname); + + return ( + <> +
  • + + {t('general')} + +
    • +
  • + + {t('plebbit_options')} + +
    • + + ); +}; + const HeaderTabs = () => { const { t } = useTranslation(); const params = useParams(); @@ -260,6 +281,8 @@ const HeaderTabs = () => { const isInSubplebbitSubmitView = isSubplebbitSubmitView(location.pathname, params); const isInSubplebbitsView = isSubplebbitsView(location.pathname); const isInCreateSubplebbitView = isCreateSubplebbitView(location.pathname); + const isInSettingsView = isSettingsView(location.pathname); + const isInSettingsPlebbitOptionsView = isSettingsPlebbitOptionsView(location.pathname); if (isInPostView) { return ; @@ -273,6 +296,8 @@ const HeaderTabs = () => { return ; } else if (isInSubplebbitsView && !isInCreateSubplebbitView) { return ; + } else if (isInSettingsView || isInSettingsPlebbitOptionsView) { + return ; } return null; }; @@ -288,6 +313,7 @@ const HeaderTitle = ({ title, shortAddress }: { title: string; shortAddress: str const isInPostView = isPostView(location.pathname, params); const isInProfileView = isProfileView(location.pathname); const isInSettingsView = isSettingsView(location.pathname); + const isInSettingsPlebbitOptionsView = isSettingsPlebbitOptionsView(location.pathname); const isInSubmitView = isSubmitView(location.pathname); const isInSubplebbitView = isSubplebbitView(location.pathname, params); const isInSubplebbitSubmitView = isSubplebbitSubmitView(location.pathname, params); @@ -317,7 +343,7 @@ const HeaderTitle = ({ title, shortAddress }: { title: string; shortAddress: str ); } else if (isInSubmitView) { return submitTitle; - } else if (isInSettingsView) { + } else if (isInSettingsView || isInSettingsPlebbitOptionsView) { return t('preferences'); } else if (isInProfileView) { return profileTitle; @@ -360,7 +386,7 @@ const Header = () => { const isInSubplebbitSettingsView = isSubplebbitSettingsView(location.pathname, params); const isInNotFoundView = useNotFoundStore((state) => state.isNotFound); - const hasFewTabs = isInPostView || isInSubmitView || isInSubplebbitSubmitView || isInSubplebbitSettingsView || isInSettingsView || isInInboxView; + const hasFewTabs = isInPostView || isInSubmitView || isInSubplebbitSubmitView || isInSubplebbitSettingsView || isInSettingsView || isInInboxView || isInSettingsView; const hasStickyHeader = isInHomeView || isInNotFoundView || diff --git a/src/components/post/post.tsx b/src/components/post/post.tsx index 1b6098ab..2dd3c0c0 100644 --- a/src/components/post/post.tsx +++ b/src/components/post/post.tsx @@ -34,7 +34,7 @@ const PostAuthor = ({ authorAddress, authorRole, cid, displayName, index, shortA const isAuthorModerator = authorRole === 'moderator'; const moderatorClass = `${isAuthorOwner ? styles.owner : isAuthorAdmin ? styles.admin : isAuthorModerator ? styles.moderator : ''}`; const authorRoleInitial = (isAuthorOwner && 'O') || (isAuthorAdmin && 'A') || (isAuthorModerator && 'M') || ''; - const shortDisplayName = displayName?.length > 20 ? displayName?.slice(0, 20) + '...' : displayName; + const shortDisplayName = displayName?.trim().length > 20 ? displayName?.trim().slice(0, 20).trim() + '...' : displayName?.trim(); return ( <> diff --git a/src/components/topbar/topbar.tsx b/src/components/topbar/topbar.tsx index 90a9fa8e..4c4b1860 100644 --- a/src/components/topbar/topbar.tsx +++ b/src/components/topbar/topbar.tsx @@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next'; import { useAccount } from '@plebbit/plebbit-react-hooks'; import Plebbit from '@plebbit/plebbit-js/dist/browser/index.js'; import styles from './topbar.module.css'; -import { useDefaultSubplebbitAddresses } from '../../lib/utils/addresses-utils'; +import { useDefaultSubplebbitAddresses } from '../../hooks/use-default-subplebbits'; import useTimeFilter, { TimeFilterKey } from '../../hooks/use-time-filter'; import { isAllView, isHomeView, isSubplebbitView } from '../../lib/utils/view-utils'; diff --git a/src/hooks/use-default-subplebbits.ts b/src/hooks/use-default-subplebbits.ts index 9bf9173f..1e64fac6 100644 --- a/src/hooks/use-default-subplebbits.ts +++ b/src/hooks/use-default-subplebbits.ts @@ -1,4 +1,7 @@ -import { useState, useEffect } from 'react'; +import { useEffect, useMemo, useState } from 'react'; +import { useParams } from 'react-router-dom'; +import { useAccount } from '@plebbit/plebbit-react-hooks'; +import Plebbit from '@plebbit/plebbit-js/dist/browser/index.js'; interface Subplebbit { title?: string; @@ -7,9 +10,13 @@ interface Subplebbit { features?: string[]; } +export interface SubplebbitWithDisplay extends Subplebbit { + displayAddress: string; +} + let cache: Subplebbit[] | null = null; -const useDefaultSubplebbits = () => { +export const useDefaultSubplebbits = () => { const [subplebbits, setSubplebbits] = useState([]); useEffect(() => { @@ -33,4 +40,68 @@ const useDefaultSubplebbits = () => { return cache || subplebbits; }; -export default useDefaultSubplebbits; +export const useDefaultSubplebbitAddresses = () => { + const defaultSubplebbits = useDefaultSubplebbits(); + return useMemo(() => defaultSubplebbits.map((subplebbit: Subplebbit) => subplebbit.address), [defaultSubplebbits]); +}; + +export const useDefaultAndSubscriptionsSubplebbitAddresses = () => { + const subscriptions = useAccount()?.subscriptions ?? []; + const defaultSubplebbitAddresses = useDefaultSubplebbitAddresses(); + + return useMemo(() => { + const subplebbitAddresses = new Set(defaultSubplebbitAddresses); + + subscriptions.forEach((address: string) => { + subplebbitAddresses.add(address); + }); + + return Array.from(subplebbitAddresses); + }, [subscriptions, defaultSubplebbitAddresses]); +}; + +export const useDefaultAndSubscriptionsSubplebbits = (): SubplebbitWithDisplay[] => { + const account = useAccount(); + const { subplebbitAddress: subplebbitAddressParam } = useParams(); + const defaultSubplebbits = useDefaultSubplebbits(); + + return useMemo(() => { + const subplebbitsObj: { [key: string]: SubplebbitWithDisplay } = {}; + + const addSubplebbit = (subplebbit: Subplebbit) => { + let displayAddress = subplebbit.address.includes('.') ? subplebbit.address : Plebbit.getShortAddress(subplebbit.address); + + // Append title in parentheses only if the address doesn't contain '.' + if (!subplebbit.address.includes('.') && subplebbit.title) { + displayAddress += ` (${subplebbit.title})`; + } + + if (displayAddress.length > 40) { + displayAddress = displayAddress.substring(0, 37) + '...'; + } + + subplebbitsObj[subplebbit.address] = { ...subplebbit, displayAddress }; + }; + + // Add default subplebbits + defaultSubplebbits.forEach((subplebbit) => { + if (subplebbit.address) { + addSubplebbit(subplebbit); + } + }); + + // Add subscribed subplebbits + account?.subscriptions?.forEach((address: string) => { + if (!subplebbitsObj[address]) { + addSubplebbit({ address }); + } + }); + + // Add the current subplebbit if not already in the list + if (subplebbitAddressParam && !subplebbitsObj[subplebbitAddressParam]) { + addSubplebbit({ address: subplebbitAddressParam }); + } + + return Object.values(subplebbitsObj); + }, [account?.subscriptions, defaultSubplebbits, subplebbitAddressParam]); +}; diff --git a/src/lib/utils/addresses-utils.ts b/src/lib/utils/addresses-utils.ts deleted file mode 100644 index 3fa7d031..00000000 --- a/src/lib/utils/addresses-utils.ts +++ /dev/null @@ -1,72 +0,0 @@ -import { useMemo } from 'react'; -import { useParams } from 'react-router-dom'; -import { useAccount } from '@plebbit/plebbit-react-hooks'; -import Plebbit from '@plebbit/plebbit-js/dist/browser/index.js'; -import useDefaultSubplebbits from '../../hooks/use-default-subplebbits'; - -interface Subplebbit { - title?: string; - address: string; - tags?: string[]; - features?: string[]; -} - -export interface SubplebbitWithDisplay extends Subplebbit { - displayAddress: string; -} - -export const getRandomSubplebbits = (addresses: string[], count: number) => { - let shuffled = addresses.sort(() => 0.5 - Math.random()); - return shuffled.slice(0, count); -}; - -export const useDefaultSubplebbitAddresses = () => { - const defaultSubplebbits = useDefaultSubplebbits(); - return useMemo(() => defaultSubplebbits.map((subplebbit: Subplebbit) => subplebbit.address), [defaultSubplebbits]); -}; - -export const useDefaultAndSubscriptionsSubplebbits = (): SubplebbitWithDisplay[] => { - const account = useAccount(); - const { subplebbitAddress: subplebbitAddressParam } = useParams(); - const defaultSubplebbits = useDefaultSubplebbits(); - - return useMemo(() => { - const subplebbitsObj: { [key: string]: SubplebbitWithDisplay } = {}; - - const addSubplebbit = (subplebbit: Subplebbit) => { - let displayAddress = subplebbit.address.includes('.') ? subplebbit.address : Plebbit.getShortAddress(subplebbit.address); - - // Append title in parentheses only if the address doesn't contain '.' - if (!subplebbit.address.includes('.') && subplebbit.title) { - displayAddress += ` (${subplebbit.title})`; - } - - if (displayAddress.length > 40) { - displayAddress = displayAddress.substring(0, 37) + '...'; - } - - subplebbitsObj[subplebbit.address] = { ...subplebbit, displayAddress }; - }; - - // Add default subplebbits - defaultSubplebbits.forEach((subplebbit) => { - if (subplebbit.address) { - addSubplebbit(subplebbit); - } - }); - - // Add subscribed subplebbits - account?.subscriptions?.forEach((address: string) => { - if (!subplebbitsObj[address]) { - addSubplebbit({ address }); - } - }); - - // Add the current subplebbit if not already in the list - if (subplebbitAddressParam && !subplebbitsObj[subplebbitAddressParam]) { - addSubplebbit({ address: subplebbitAddressParam }); - } - - return Object.values(subplebbitsObj); - }, [account?.subscriptions, defaultSubplebbits, subplebbitAddressParam]); -}; diff --git a/src/lib/utils/media-utils.ts b/src/lib/utils/media-utils.ts index 4b8df255..7822d706 100644 --- a/src/lib/utils/media-utils.ts +++ b/src/lib/utils/media-utils.ts @@ -55,7 +55,8 @@ export const getLinkMediaInfo = memoize( let mime: string | undefined; try { - mime = extName(url.pathname.slice(url.pathname.lastIndexOf('/') + 1))[0]?.mime; + const fileName = url.pathname.slice(url.pathname.lastIndexOf('/') + 1).toLowerCase(); + mime = extName(fileName)[0]?.mime; if (mime) { if (mime.startsWith('image')) { type = mime === 'image/gif' ? 'gif' : 'image'; diff --git a/src/lib/utils/view-utils.ts b/src/lib/utils/view-utils.ts index 12c56139..e31bbb2a 100644 --- a/src/lib/utils/view-utils.ts +++ b/src/lib/utils/view-utils.ts @@ -126,6 +126,10 @@ export const isSettingsView = (pathname: string): boolean => { return pathname === '/settings'; }; +export const isSettingsPlebbitOptionsView = (pathname: string): boolean => { + return pathname === '/settings/plebbit-options'; +}; + export const isSubmitView = (pathname: string): boolean => { return pathname === '/submit'; }; diff --git a/src/views/all/all.tsx b/src/views/all/all.tsx index 707535fe..e7e8a9c2 100644 --- a/src/views/all/all.tsx +++ b/src/views/all/all.tsx @@ -7,7 +7,7 @@ import styles from '../home/home.module.css'; import LoadingEllipsis from '../../components/loading-ellipsis'; import Post from '../../components/post'; import Sidebar from '../../components/sidebar'; -import { useDefaultSubplebbitAddresses } from '../../lib/utils/addresses-utils'; +import { useDefaultSubplebbitAddresses } from '../../hooks/use-default-subplebbits'; import useFeedStateString from '../../hooks/use-feed-state-string'; import useTimeFilter, { TimeFilterKey } from '../../hooks/use-time-filter'; import _ from 'lodash'; diff --git a/src/views/home/home.tsx b/src/views/home/home.tsx index 1619bbd5..038472d0 100644 --- a/src/views/home/home.tsx +++ b/src/views/home/home.tsx @@ -1,13 +1,13 @@ -import { useEffect, useRef, useState } from 'react'; +import { useEffect, useRef } from 'react'; import { useParams } from 'react-router-dom'; import { Virtuoso, VirtuosoHandle, StateSnapshot } from 'react-virtuoso'; -import { useAccount, useFeed } from '@plebbit/plebbit-react-hooks'; +import { useFeed } from '@plebbit/plebbit-react-hooks'; import { useTranslation } from 'react-i18next'; import styles from './home.module.css'; import LoadingEllipsis from '../../components/loading-ellipsis'; import Post from '../../components/post'; import Sidebar from '../../components/sidebar'; -import { useDefaultSubplebbitAddresses } from '../../lib/utils/addresses-utils'; +import { useDefaultAndSubscriptionsSubplebbitAddresses } from '../../hooks/use-default-subplebbits'; import useFeedStateString from '../../hooks/use-feed-state-string'; import useTimeFilter, { TimeFilterKey } from '../../hooks/use-time-filter'; @@ -15,16 +15,7 @@ const lastVirtuosoStates: { [key: string]: StateSnapshot } = {}; const Home = () => { const { t } = useTranslation(); - const account = useAccount(); - const defaultSubplebbitAddresses = useDefaultSubplebbitAddresses(); - const [subplebbitAddresses, setSubplebbitAddresses] = useState(undefined); - - useEffect(() => { - if (defaultSubplebbitAddresses && account?.subscriptions) { - setSubplebbitAddresses(defaultSubplebbitAddresses.concat(account.subscriptions)); - } - }, [defaultSubplebbitAddresses, account?.subscriptions]); - + const subplebbitAddresses = useDefaultAndSubscriptionsSubplebbitAddresses(); const params = useParams<{ sortType?: string; timeFilterName?: string }>(); const sortType = params?.sortType || 'hot'; const timeFilterName = params.timeFilterName as TimeFilterKey; diff --git a/src/views/settings/plebbit-options/index.ts b/src/views/settings/plebbit-options/index.ts new file mode 100644 index 00000000..705f8559 --- /dev/null +++ b/src/views/settings/plebbit-options/index.ts @@ -0,0 +1 @@ +export { default } from './plebbit-options'; diff --git a/src/views/settings/plebbit-options/plebbit-options.module.css b/src/views/settings/plebbit-options/plebbit-options.module.css new file mode 100644 index 00000000..892e90d2 --- /dev/null +++ b/src/views/settings/plebbit-options/plebbit-options.module.css @@ -0,0 +1,77 @@ +.content { + margin: 7px 5px 40px 5px; + font-size: 12px; + color: var(--text); + width: 100%; +} + +.category { + display: flex; + align-items: flex-start; +} + +.categoryTitle { + flex: 0 0 169px; + height: 100%; + padding: 10px; + font-weight: bold; + text-align: right; + text-transform: lowercase; +} + +.categorySettings { + flex-grow: 1; + padding: 10px 0; +} + +.settingTitle { + font-style: italic; +} + +.content input[type="text"], .content textarea { + padding: 2px; + box-shadow: var(--box-shadow-input); +} + +.content input[type="text"], .content textarea { + width: 210px; +} + +.content textarea { + height: 80px; + font-family: Arial, Helvetica, sans-serif; +} + +.content button { + vertical-align: top; + margin-left: 5px; + cursor: pointer; +} + +.ipfsGatewaysSettings textarea { + margin-bottom: 5px; +} + +.blockchainProvidersSettings input[type="text"] { + margin-bottom: 5px; +} + +.plebbitRpcSettingsInfo { + padding: 5px 20px 0 0; + word-break: break-word; +} + +.plebbitRpcSettingsInfo ol { + padding-bottom: 5px; + padding-left: 40px; +} + +@media (max-width: 640px) { + .categoryTitle { + flex: 0 0 65px; + } + + .categorySettings input { + width: 35vw; + } +} \ No newline at end of file diff --git a/src/views/settings/plebbit-options/plebbit-options.tsx b/src/views/settings/plebbit-options/plebbit-options.tsx new file mode 100644 index 00000000..069fbd57 --- /dev/null +++ b/src/views/settings/plebbit-options/plebbit-options.tsx @@ -0,0 +1,146 @@ +import { useState } from 'react'; +import { useAccount } from '@plebbit/plebbit-react-hooks'; +import styles from './plebbit-options.module.css'; +import { useTranslation } from 'react-i18next'; + +const isElectron = window.isElectron === true; + +const IPFSGatewaysSettings = ({ ipfsGatewayUrls, mediaIpfsGatewayUrl }: { ipfsGatewayUrls: any; mediaIpfsGatewayUrl: any }) => { + const { t } = useTranslation(); + const ipfsGatewayUrlsDefaultValue = ipfsGatewayUrls?.join('\n'); + + return ( +
    +
    +